Clean up the logic for parsing oper mode privileges.

[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 fd6729f53d429dd253da934db6e945c839522b5d..6b356d011cd93a7b28b43c6e41e33fac3c2d2dd4 100644 (file)
--- a/src/coremods/core_oper/cmd_kill.cpp
+++ b/src/coremods/core_oper/cmd_kill.cpp
@@ -1,9 +1,15 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
- *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
- *   Copyright (C) 2008 Craig Edwards <craigedwards@brainbox.cc>
+ *   Copyright (C) 2017-2018 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2016 Adam <Adam@anope.org>
+ *   Copyright (C) 2012-2014, 2018 Attila Molnar <attilamolnar@hush.com>
+ *   Copyright (C) 2012, 2019 Robby <robby@chatbelgie.be>
+ *   Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2009 Uli Schlachter <psychon@inspircd.org>
  *   Copyright (C) 2007 Robin Burchell <robin+git@viroteck.net>
+ *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2007 Craig Edwards <brain@inspircd.org>
  *
  * This file is part of InspIRCd.  InspIRCd is free software: you can
  * redistribute it and/or modify it under the terms of the GNU General Public
@@ -24,12 +30,28 @@
 
 CommandKill::CommandKill(Module* parent)
        : Command(parent, "KILL", 2, 2)
+       , protoev(parent, name)
 {
        flags_needed = 'o';
-       syntax = "<nickname> <reason>";
+       syntax = "<nick>[,<nick>]+ :<reason>";
        TRANSLATE2(TR_CUSTOM, TR_CUSTOM);
 }
 
+class KillMessage : public ClientProtocol::Message
+{
+ public:
+       KillMessage(ClientProtocol::EventProvider& protoev, User* user, LocalUser* target, const std::string& text, const std::string& hidenick)
+               : ClientProtocol::Message("KILL", NULL)
+       {
+               if (hidenick.empty())
+                       SetSourceUser(user);
+               else
+                       SetSource(hidenick);
+
+               PushParamRef(target->nick);
+               PushParamRef(text);
+       }
+};
 
 /** Handle /KILL
  */
@@ -71,10 +93,10 @@ CmdResult CommandKill::Handle(User* user, const Params& parameters)
                        return CMD_FAILURE;
 
                killreason = "Killed (";
-               if (!ServerInstance->Config->HideKillsServer.empty())
+               if (!hidenick.empty())
                {
                        // hidekills is on, use it
-                       killreason += ServerInstance->Config->HideKillsServer;
+                       killreason += hidenick;
                }
                else
                {
@@ -90,7 +112,7 @@ CmdResult CommandKill::Handle(User* user, const Params& parameters)
                killreason.assign(parameters[1], 0, ServerInstance->Config->Limits.MaxQuit);
        }
 
-       if ((!ServerInstance->Config->HideULineKills) || (!user->server->IsULine()))
+       if ((!hideuline) || (!user->server->IsULine()))
        {
                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());
@@ -100,10 +122,10 @@ CmdResult CommandKill::Handle(User* user, const Params& parameters)
 
        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, hidenick);
+               ClientProtocol::Event killevent(protoev, msg);
+               localu->Send(killevent);
 
                this->lastuuid.clear();
        }