Get rid of the OnRemoteKill hook, make use of GetRouting() and TR_CUSTOM to route...

[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 7c3d3512ad639eab79cbb56fdfd82952769ae428..205cd656976c7e3ee331bd99331fe26113184c56 100644 (file)
--- a/src/modules/m_sajoin.cpp
+++ b/src/modules/m_sajoin.cpp
@@ -45,10 +45,10 @@ class CommandSajoin : public Command
                                user->WriteNumeric(ERR_NOPRIVILEGES, "%s :Cannot use an SA command on a u-lined client",user->nick.c_str());
                                return CMD_FAILURE;
                        }
-                       if (IS_LOCAL(user) && !ServerInstance->IsChannel(parameters[1].c_str(), ServerInstance->Config->Limits.ChanMax))
+                       if (IS_LOCAL(user) && !ServerInstance->IsChannel(parameters[1]))
                        {
                                /* we didn't need to check this for each character ;) */
-                               user->WriteServ("NOTICE "+user->nick+" :*** Invalid characters in channel name or name too long");
+                               user->WriteNotice("*** Invalid characters in channel name or name too long");
                                return CMD_FAILURE;
                        }
 
@@ -69,13 +69,13 @@ class CommandSajoin : public Command
                                        }
                                        else
                                        {
-                                               user->WriteServ("NOTICE "+user->nick+" :*** Could not join "+dest->nick+" to "+parameters[1]+" (User is probably banned, or blocking modes)");
+                                               user->WriteNotice("*** Could not join "+dest->nick+" to "+parameters[1]+" (User is probably banned, or blocking modes)");
                                                return CMD_FAILURE;
                                        }
                                }
                                else
                                {
-                                       user->WriteServ("NOTICE "+user->nick+" :*** Could not join "+dest->nick+" to "+parameters[1]);
+                                       user->WriteNotice("*** Could not join "+dest->nick+" to "+parameters[1]);
                                        return CMD_FAILURE;
                                }
                        }
@@ -87,7 +87,7 @@ class CommandSajoin : public Command
                }
                else
                {
-                       user->WriteServ("NOTICE "+user->nick+" :*** No such nickname "+parameters[0]);
+                       user->WriteNotice("*** No such nickname "+parameters[0]);
                        return CMD_FAILURE;
                }
        }
@@ -110,12 +110,12 @@ class ModuleSajoin : public Module
        {
        }
 
-       void init()
+       void init() CXX11_OVERRIDE
        {
                ServerInstance->Modules->AddService(cmd);
        }
 
-       virtual Version GetVersion()
+       Version GetVersion() CXX11_OVERRIDE
        {
                return Version("Provides command SAJOIN to allow opers to force-join users to channels", VF_OPTCOMMON | VF_VENDOR);
        }