Improve the handling of config X-lines and filters. (#1583)

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

diff --git a/src/modules/m_sajoin.cpp b/src/modules/m_sajoin.cpp
index 9d87360ece4f080f672c1210a072d1909c8f8cc7..f506a2e1c0cc713d1b6272fb9cb85a9ead77b7d9 100644 (file)
--- a/src/modules/m_sajoin.cpp
+++ b/src/modules/m_sajoin.cpp
@@ -29,11 +29,11 @@ class CommandSajoin : public Command
        CommandSajoin(Module* Creator) : Command(Creator,"SAJOIN", 1)
        {
                allow_empty_last_param = false;
-               flags_needed = 'o'; Penalty = 0; syntax = "[<nick>] <channel>[,<channel>]";
+               flags_needed = 'o'; syntax = "[<nick>] <channel>[,<channel>]+";
                TRANSLATE2(TR_NICK, TR_TEXT);
        }
 
-       CmdResult Handle (const std::vector<std::string>& parameters, User *user)
+       CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE
        {
                const unsigned int channelindex = (parameters.size() > 1) ? 1 : 0;
                if (CommandParser::LoopCall(user, this, parameters, channelindex))
@@ -53,7 +53,7 @@ class CommandSajoin : 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;
                        }
                        if (IS_LOCAL(user) && !ServerInstance->IsChannel(channel))
@@ -101,7 +101,7 @@ class CommandSajoin : public Command
                }
        }
 
-       RouteDescriptor GetRouting(User* user, const std::vector<std::string>& parameters)
+       RouteDescriptor GetRouting(User* user, const Params& parameters) CXX11_OVERRIDE
        {
                return ROUTE_OPT_UCAST(parameters[0]);
        }