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 446b50c0b892e59a1c3b87b31db72dd3e45b92cb..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))
@@ -100,10 +116,10 @@ CmdResult CommandKill::Handle (const std::vector<std::string>& parameters, User
 
        if (IS_LOCAL(target))
        {
-               target->Write(":%s KILL %s :%s",
-                               ServerInstance->Config->HideKillsServer.empty() ? user->GetFullHost().c_str() : ServerInstance->Config->HideKillsServer.c_str(),
-                               target->nick.c_str(),
-                               parameters[1].c_str());
+               LocalUser* localu = IS_LOCAL(target);
+               KillMessage msg(protoev, user, localu, killreason);
+               ClientProtocol::Event killevent(protoev, msg);
+               localu->Send(killevent);
 
                this->lastuuid.clear();
        }
@@ -118,7 +134,7 @@ CmdResult CommandKill::Handle (const std::vector<std::string>& parameters, User
        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