Move SetNoticeMask(), FormatNoticeMasks() and ProcessNoticeMasks() from the User...

[user/henk/code/inspircd.git] / src / commands / cmd_kick.cpp

diff --git a/src/commands/cmd_kick.cpp b/src/commands/cmd_kick.cpp
index ecbdbad1e40b9c651c5d47e976929620b5c16794..b59eec0309ae181a6d1dadeddbc8736fadd3801f 100644 (file)
--- a/src/commands/cmd_kick.cpp
+++ b/src/commands/cmd_kick.cpp
@@ -38,6 +38,10 @@ class CommandKick : public Command
         * @return A value from CmdResult to indicate command success or failure.
         */
        CmdResult Handle(const std::vector<std::string>& parameters, User *user);
+       RouteDescriptor GetRouting(User* user, const std::vector<std::string>& parameters)
+       {
+               return (IS_LOCAL(user) ? ROUTE_LOCALONLY : ROUTE_BROADCAST);
+       }
 };
 
 /** Handle /KICK
@@ -48,7 +52,7 @@ CmdResult CommandKick::Handle (const std::vector<std::string>& parameters, User
        Channel* c = ServerInstance->FindChan(parameters[0]);
        User* u;
 
-       if (ServerInstance->Parser->LoopCall(user, this, parameters, 1))
+       if (CommandParser::LoopCall(user, this, parameters, 1))
                return CMD_SUCCESS;
 
        if (IS_LOCAL(user))
@@ -62,9 +66,11 @@ CmdResult CommandKick::Handle (const std::vector<std::string>& parameters, User
                return CMD_FAILURE;
        }
 
+       Membership* srcmemb = NULL;
        if (IS_LOCAL(user))
        {
-               if (!c->HasUser(user))
+               srcmemb = c->GetUser(user);
+               if (!srcmemb)
                {
                        user->WriteServ( "442 %s %s :You're not on that channel!", user->nick.c_str(), parameters[0].c_str());
                        return CMD_FAILURE;
@@ -86,7 +92,7 @@ CmdResult CommandKick::Handle (const std::vector<std::string>& parameters, User
                reason.assign(user->nick, 0, ServerInstance->Config->Limits.MaxKick);
        }
 
-       c->KickUser(user, u, reason);
+       c->KickUser(user, u, reason, srcmemb);
 
        return CMD_SUCCESS;
 }