Some more text fixes and improvements (#1618).

[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 406d9ffcd703127741e4535e085a10b45168cee8..39ebb28cc2799f13956496e4ec9bac58f63069cb 100644 (file)
--- a/src/modules/m_sajoin.cpp
+++ b/src/modules/m_sajoin.cpp
@@ -29,19 +29,23 @@ class CommandSajoin : public Command
        CommandSajoin(Module* Creator) : Command(Creator,"SAJOIN", 1)
        {
                allow_empty_last_param = false;
-               flags_needed = 'o'; Penalty = 0; syntax = "[<nick>] <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 std::string& channel = parameters.size() > 1 ? parameters[1] : parameters[0];
+               const unsigned int channelindex = (parameters.size() > 1) ? 1 : 0;
+               if (CommandParser::LoopCall(user, this, parameters, channelindex))
+                       return CMD_FAILURE;
+
+               const std::string& channel = parameters[channelindex];
                const std::string& nickname = parameters.size() > 1 ? parameters[0] : user->nick;
 
                User* dest = ServerInstance->FindNick(nickname);
                if ((dest) && (dest->registered == REG_ALL))
                {
-                       if (user != dest && !user->HasPrivPermission("users/sajoin-others", false))
+                       if (user != dest && !user->HasPrivPermission("users/sajoin-others"))
                        {
                                user->WriteNotice("*** You are not allowed to /SAJOIN other users (the privilege users/sajoin-others is needed to /SAJOIN others).");
                                return CMD_FAILURE;
@@ -49,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))
@@ -59,6 +63,13 @@ class CommandSajoin : public Command
                                return CMD_FAILURE;
                        }
 
+                       Channel* chan = ServerInstance->FindChan(channel);
+                       if ((chan) && (chan->HasUser(dest)))
+                       {
+                               user->WriteRemoteNotice("*** " + dest->nick + " is already on " + channel);
+                               return CMD_FAILURE;
+                       }
+
                        /* For local users, we call Channel::JoinUser which may create a channel and set its TS.
                         * For non-local users, we just return CMD_SUCCESS, knowing this will propagate it where it needs to be
                         * and then that server will handle the command.
@@ -66,8 +77,8 @@ class CommandSajoin : public Command
                        LocalUser* localuser = IS_LOCAL(dest);
                        if (localuser)
                        {
-                               Channel* n = Channel::JoinUser(localuser, channel, true);
-                               if (n && n->HasUser(dest))
+                               chan = Channel::JoinUser(localuser, channel, true);
+                               if (chan)
                                {
                                        ServerInstance->SNO->WriteGlobalSno('a', user->nick+" used SAJOIN to make "+dest->nick+" join "+channel);
                                        return CMD_SUCCESS;
@@ -85,17 +96,14 @@ class CommandSajoin : public Command
                }
                else
                {
-                       user->WriteNotice("*** No such nickname "+nickname);
+                       user->WriteNotice("*** No such nickname: '" + nickname + "'");
                        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[0]);
-               if (dest)
-                       return ROUTE_OPT_UCAST(dest->server);
-               return ROUTE_LOCALONLY;
+               return ROUTE_OPT_UCAST(parameters[0]);
        }
 };
 
@@ -110,7 +118,7 @@ class ModuleSajoin : public Module
 
        Version GetVersion() CXX11_OVERRIDE
        {
-               return Version("Provides command SAJOIN to allow opers to force-join users to channels", VF_OPTCOMMON | VF_VENDOR);
+               return Version("Provides the SAJOIN command, allows opers to force-join users to channels", VF_OPTCOMMON | VF_VENDOR);
        }
 };