Merge tag 'v2.0.27' into master.

[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 b8395f43ef43e01b6275a0b7d15e6520d16eeabe..2bc431ab3d6b7b9b6412e482df8ab5946536e29a 100644 (file)
--- a/src/coremods/core_user/cmd_part.cpp
+++ b/src/coremods/core_user/cmd_part.cpp
@@ -28,20 +28,14 @@ CommandPart::CommandPart(Module* parent)
        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 (IS_LOCAL(user))
-       {
-               if (!ServerInstance->Config->FixedPart.empty())
-                       reason = ServerInstance->Config->FixedPart;
-               else if (parameters.size() > 1)
-                       reason = ServerInstance->Config->PrefixPart + parameters[1] + ServerInstance->Config->SuffixPart;
-       }
-       else
+       if (parameters.size() > 1)
        {
-               if (parameters.size() > 1)
+               if (IS_LOCAL(user))
+                       msgwrap.Wrap(parameters[1], reason);
+               else
                        reason = parameters[1];
        }
 
@@ -50,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);
 }