Demote core_ison and core_userhost to commands in core_user.

[user/henk/code/inspircd.git] / src / coremods / core_user / cmd_part.cpp

diff --git a/src/coremods/core_user/cmd_part.cpp b/src/coremods/core_user/cmd_part.cpp
index 9f82c15a501d5e1641998de5009c616625249c02..9400eed9347cdd0526f43350d0cda66fd79f2ea1 100644 (file)
--- a/src/coremods/core_user/cmd_part.cpp
+++ b/src/coremods/core_user/cmd_part.cpp
@@ -25,10 +25,10 @@ CommandPart::CommandPart(Module* parent)
        : Command(parent, "PART", 1, 2)
 {
        Penalty = 5;
-       syntax = "<channel>{,<channel>} [<reason>]";
+       syntax = "<channel>[,<channel>]+ [:<reason>]";
 }
 
-CmdResult CommandPart::Handle (const std::vector<std::string>& parameters, User *user)
+CmdResult CommandPart::Handle(User* user, const Params& parameters)
 {
        std::string reason;
        if (parameters.size() > 1)
@@ -44,20 +44,22 @@ CmdResult CommandPart::Handle (const std::vector<std::string>& parameters, User
 
        Channel* c = ServerInstance->FindChan(parameters[0]);
 
-       if (c)
+       if (!c)
        {
-               c->PartUser(user, reason);
+               user->WriteNumeric(Numerics::NoSuchChannel(parameters[0]));
+               return CMD_FAILURE;
        }
-       else
+
+       if (!c->PartUser(user, reason))
        {
-               user->WriteNumeric(ERR_NOSUCHNICK, "%s :No such nick/channel", parameters[0].c_str());
+               user->WriteNumeric(ERR_NOTONCHANNEL, c->name, "You're not on that channel");
                return CMD_FAILURE;
        }
 
        return CMD_SUCCESS;
 }
 
-RouteDescriptor CommandPart::GetRouting(User* user, const std::vector<std::string>& parameters)
+RouteDescriptor CommandPart::GetRouting(User* user, const Params& parameters)
 {
        return (IS_LOCAL(user) ? ROUTE_LOCALONLY : ROUTE_BROADCAST);
 }