Don't update the idle timer when a user replies to a CTCP.

[user/henk/code/inspircd.git] / src / coremods / core_oper / cmd_kill.cpp

diff --git a/src/coremods/core_oper/cmd_kill.cpp b/src/coremods/core_oper/cmd_kill.cpp
index f024f6b0d195feebdc18d2e1b34a3a86ba9c2790..5572e5789f7f79014df847ef6637686bf3cdb70f 100644 (file)
--- a/src/coremods/core_oper/cmd_kill.cpp
+++ b/src/coremods/core_oper/cmd_kill.cpp
@@ -24,16 +24,32 @@
 
 CommandKill::CommandKill(Module* parent)
        : Command(parent, "KILL", 2, 2)
+       , protoev(parent, name)
 {
        flags_needed = 'o';
        syntax = "<nickname> <reason>";
        TRANSLATE2(TR_CUSTOM, TR_CUSTOM);
 }
 
+class KillMessage : public ClientProtocol::Message
+{
+ public:
+       KillMessage(ClientProtocol::EventProvider& protoev, User* user, LocalUser* target, const std::string& text)
+               : ClientProtocol::Message("KILL", NULL)
+       {
+               if (ServerInstance->Config->HideKillsServer.empty())
+                       SetSourceUser(user);
+               else
+                       SetSource(ServerInstance->Config->HideKillsServer);
+
+               PushParamRef(target->nick);
+               PushParamRef(text);
+       }
+};
 
 /** Handle /KILL
  */
-CmdResult CommandKill::Handle (const std::vector<std::string>& parameters, User *user)
+CmdResult CommandKill::Handle(User* user, const Params& parameters)
 {
        /* Allow comma seperated lists of users for /KILL (thanks w00t) */
        if (CommandParser::LoopCall(user, this, parameters, 0))
@@ -43,8 +59,8 @@ CmdResult CommandKill::Handle (const std::vector<std::string>& parameters, User
                return CMD_FAILURE;
        }
 
-       User *u = ServerInstance->FindNick(parameters[0]);
-       if (!u)
+       User* target = ServerInstance->FindNick(parameters[0]);
+       if (!target)
        {
                user->WriteNumeric(Numerics::NoSuchNick(parameters[0]));
                return CMD_FAILURE;
@@ -65,7 +81,7 @@ CmdResult CommandKill::Handle (const std::vector<std::string>& parameters, User
                 * and the other half not. This would be a bad thing. ;p -- w00t
                 */
                ModResult MOD_RESULT;
-               FIRST_MOD_RESULT(OnKill, MOD_RESULT, (user, u, parameters[1]));
+               FIRST_MOD_RESULT(OnKill, MOD_RESULT, (user, target, parameters[1]));
 
                if (MOD_RESULT == MOD_RES_DENY)
                        return CMD_FAILURE;
@@ -90,49 +106,35 @@ CmdResult CommandKill::Handle (const std::vector<std::string>& parameters, User
                killreason.assign(parameters[1], 0, ServerInstance->Config->Limits.MaxQuit);
        }
 
-       /*
-        * Now we need to decide whether or not to send a local or remote snotice. Currently this checking is a little flawed.
-        * No time to fix it right now, so left a note. -- w00t
-        */
-       if (!IS_LOCAL(u))
+       if ((!ServerInstance->Config->HideULineKills) || (!user->server->IsULine()))
        {
-               // remote kill
-               if ((!ServerInstance->Config->HideULineKills) || (!user->server->IsULine()))
-                       ServerInstance->SNO->WriteToSnoMask('K', "Remote kill by %s: %s (%s)", user->nick.c_str(), u->GetFullRealHost().c_str(), parameters[1].c_str());
-               this->lastuuid = u->uuid;
+               if (IS_LOCAL(user) && IS_LOCAL(target))
+                       ServerInstance->SNO->WriteGlobalSno('k', "Local kill by %s: %s (%s)", user->nick.c_str(), target->GetFullRealHost().c_str(), parameters[1].c_str());
+               else
+                       ServerInstance->SNO->WriteToSnoMask('K', "Remote kill by %s: %s (%s)", user->nick.c_str(), target->GetFullRealHost().c_str(), parameters[1].c_str());
        }
-       else
-       {
-               // local kill
-               /*
-                * XXX - this isn't entirely correct, servers A - B - C, oper on A, client on C. Oper kills client, A and B will get remote kill
-                * snotices, C will get a local kill snotice. this isn't accurate, and needs fixing at some stage. -- w00t
-                */
-               if ((!ServerInstance->Config->HideULineKills) || (!user->server->IsULine()))
-               {
-                       if (IS_LOCAL(user))
-                               ServerInstance->SNO->WriteGlobalSno('k',"Local Kill by %s: %s (%s)", user->nick.c_str(), u->GetFullRealHost().c_str(), parameters[1].c_str());
-                       else
-                               ServerInstance->SNO->WriteToSnoMask('k',"Local Kill by %s: %s (%s)", user->nick.c_str(), u->GetFullRealHost().c_str(), parameters[1].c_str());
-               }
-
-               ServerInstance->Logs->Log("KILL", LOG_DEFAULT, "LOCAL KILL: %s :%s!%s!%s (%s)", u->nick.c_str(), ServerInstance->Config->ServerName.c_str(), user->dhost.c_str(), user->nick.c_str(), parameters[1].c_str());
 
-               u->Write(":%s KILL %s :%s",
-                               ServerInstance->Config->HideKillsServer.empty() ? user->GetFullHost().c_str() : ServerInstance->Config->HideKillsServer.c_str(),
-                               u->nick.c_str(),
-                               parameters[1].c_str());
+       if (IS_LOCAL(target))
+       {
+               LocalUser* localu = IS_LOCAL(target);
+               KillMessage msg(protoev, user, localu, killreason);
+               ClientProtocol::Event killevent(protoev, msg);
+               localu->Send(killevent);
 
                this->lastuuid.clear();
        }
+       else
+       {
+               this->lastuuid = target->uuid;
+       }
 
        // send the quit out
-       ServerInstance->Users->QuitUser(u, killreason);
+       ServerInstance->Users->QuitUser(target, killreason);
 
        return CMD_SUCCESS;
 }
 
-RouteDescriptor CommandKill::GetRouting(User* user, const std::vector<std::string>& parameters)
+RouteDescriptor CommandKill::GetRouting(User* user, const Params& parameters)
 {
        // FindNick() doesn't work here because we quit the target user in Handle() which
        // removes it from the nicklist, so we check lastuuid: if it's empty then this KILL
@@ -143,7 +145,7 @@ RouteDescriptor CommandKill::GetRouting(User* user, const std::vector<std::strin
 }
 
 
-void CommandKill::EncodeParameter(std::string& param, int index)
+void CommandKill::EncodeParameter(std::string& param, unsigned int index)
 {
        // Manually translate the nick -> uuid (see above), and also the reason (params[1])
        // because we decorate it if the oper is local and want remote servers to see the