m_tline Minor improvements

[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 9cc6a72d295634bbd2f0ea37683c08f5ef7fad3e..0748c013b96344c698f60f42203b9cf101cb32ee 100644 (file)
--- a/src/modules/m_sajoin.cpp
+++ b/src/modules/m_sajoin.cpp
@@ -38,9 +38,9 @@ class CommandSajoin : public Command
                User* dest = ServerInstance->FindNick(parameters[0]);
                if ((dest) && (dest->registered == REG_ALL))
                {
-                       if (ServerInstance->ULine(dest->server))
+                       if (dest->server->IsULine())
                        {
-                               user->WriteNumeric(ERR_NOPRIVILEGES, "%s :Cannot use an SA command on a u-lined client",user->nick.c_str());
+                               user->WriteNumeric(ERR_NOPRIVILEGES, ":Cannot use an SA command on a u-lined client");
                                return CMD_FAILURE;
                        }
                        if (IS_LOCAL(user) && !ServerInstance->IsChannel(parameters[1]))
@@ -58,18 +58,10 @@ class CommandSajoin : public Command
                        if (localuser)
                        {
                                Channel* n = Channel::JoinUser(localuser, parameters[1], true);
-                               if (n)
+                               if (n && n->HasUser(dest))
                                {
-                                       if (n->HasUser(dest))
-                                       {
-                                               ServerInstance->SNO->WriteToSnoMask('a', user->nick+" used SAJOIN to make "+dest->nick+" join "+parameters[1]);
-                                               return CMD_SUCCESS;
-                                       }
-                                       else
-                                       {
-                                               user->WriteNotice("*** Could not join "+dest->nick+" to "+parameters[1]+" (User is probably banned, or blocking modes)");
-                                               return CMD_FAILURE;
-                                       }
+                                       ServerInstance->SNO->WriteGlobalSno('a', user->nick+" used SAJOIN to make "+dest->nick+" join "+parameters[1]);
+                                       return CMD_SUCCESS;
                                }
                                else
                                {
@@ -79,7 +71,6 @@ class CommandSajoin : public Command
                        }
                        else
                        {
-                               ServerInstance->SNO->WriteToSnoMask('a', user->nick+" sent remote SAJOIN to make "+dest->nick+" join "+parameters[1]);
                                return CMD_SUCCESS;
                        }
                }
@@ -108,11 +99,6 @@ class ModuleSajoin : public Module
        {
        }
 
-       void init() CXX11_OVERRIDE
-       {
-               ServerInstance->Modules->AddService(cmd);
-       }
-
        Version GetVersion() CXX11_OVERRIDE
        {
                return Version("Provides command SAJOIN to allow opers to force-join users to channels", VF_OPTCOMMON | VF_VENDOR);