Some more text fixes and improvements (#1618).

[user/henk/code/inspircd.git] / src / modules / m_sakick.cpp

diff --git a/src/modules/m_sakick.cpp b/src/modules/m_sakick.cpp
index 911b826dc0ac25190bd74b6a04c5a0199d185d31..a323ed85c65cb0a6fda1952d0f72dff46fb48b07 100644 (file)
--- a/src/modules/m_sakick.cpp
+++ b/src/modules/m_sakick.cpp
@@ -27,11 +27,11 @@ class CommandSakick : public Command
  public:
        CommandSakick(Module* Creator) : Command(Creator,"SAKICK", 2, 3)
        {
-               flags_needed = 'o'; Penalty = 0; syntax = "<channel> <nick> [reason]";
+               flags_needed = 'o'; syntax = "<channel> <nick> [:<reason>]";
                TRANSLATE3(TR_TEXT, TR_NICK, TR_TEXT);
        }
 
-       CmdResult Handle (const std::vector<std::string>& parameters, User *user)
+       CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE
        {
                User* dest = ServerInstance->FindNick(parameters[1]);
                Channel* channel = ServerInstance->FindChan(parameters[0]);
@@ -42,7 +42,7 @@ class CommandSakick : public Command
 
                        if (dest->server->IsULine())
                        {
-                               user->WriteNumeric(ERR_NOPRIVILEGES, ":Cannot use an SA command on a u-lined client");
+                               user->WriteNumeric(ERR_NOPRIVILEGES, "Cannot use an SA command on a U-lined client");
                                return CMD_FAILURE;
                        }
 
@@ -73,12 +73,9 @@ class CommandSakick : public Command
                return CMD_FAILURE;
        }
 
-       RouteDescriptor GetRouting(User* user, const std::vector<std::string>& parameters)
+       RouteDescriptor GetRouting(User* user, const Params& parameters) CXX11_OVERRIDE
        {
-               User* dest = ServerInstance->FindNick(parameters[1]);
-               if (dest)
-                       return ROUTE_OPT_UCAST(dest->server);
-               return ROUTE_LOCALONLY;
+               return ROUTE_OPT_UCAST(parameters[1]);
        }
 };
 
@@ -93,7 +90,7 @@ class ModuleSakick : public Module
 
        Version GetVersion() CXX11_OVERRIDE
        {
-               return Version("Provides a SAKICK command", VF_OPTCOMMON|VF_VENDOR);
+               return Version("Provides the SAKICK command", VF_OPTCOMMON|VF_VENDOR);
        }
 };