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 d1321947b2bb54979ecf8618a19556ae05581321..39ebb28cc2799f13956496e4ec9bac58f63069cb 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))
@@ -45,7 +45,7 @@ class CommandSajoin : public Command
                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;
@@ -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))
@@ -66,7 +66,7 @@ class CommandSajoin : public Command
                        Channel* chan = ServerInstance->FindChan(channel);
                        if ((chan) && (chan->HasUser(dest)))
                        {
-                               user->SendText(":" + user->server->GetName() + " NOTICE " + user->nick + " :*** " + dest->nick + " is already on " + channel);
+                               user->WriteRemoteNotice("*** " + dest->nick + " is already on " + channel);
                                return CMD_FAILURE;
                        }
 
@@ -96,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]);
        }
 };
 
@@ -121,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);
        }
 };