X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_sajoin.cpp;h=205cd656976c7e3ee331bd99331fe26113184c56;hb=623ba6ae49f8e1e0958f921fa178af8a95797c1c;hp=63d51f86d41d53179b166abc51416d7599ffb7f8;hpb=e3e3a35899931d98e76023464f9b077b09ba828d;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_sajoin.cpp b/src/modules/m_sajoin.cpp
index 63d51f86d..205cd6569 100644
--- a/src/modules/m_sajoin.cpp
+++ b/src/modules/m_sajoin.cpp
@@ -30,6 +30,7 @@ class CommandSajoin : public Command
  public:
 	CommandSajoin(Module* Creator) : Command(Creator,"SAJOIN", 2)
 	{
+		allow_empty_last_param = false;
 		flags_needed = 'o'; Penalty = 0; syntax = "<nick> <channel>";
 		TRANSLATE3(TR_NICK, TR_TEXT, TR_END);
 	}
@@ -44,22 +45,21 @@ 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;
 			}
 
-			/* For local users, we send the JoinUser which may create a channel and set its TS.
+			/* 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 generate the users JOIN or FJOIN instead.
+			 * and then that server will handle the command.
 			 */
-			if (IS_LOCAL(dest))
+			LocalUser* localuser = IS_LOCAL(dest);
+			if (localuser)
 			{
-				Channel::JoinUser(dest, parameters[1].c_str(), true, "", false, ServerInstance->Time());
-				/* Fix for dotslasher and w00t - if the join didnt succeed, return CMD_FAILURE so that it doesnt propagate */
-				Channel* n = ServerInstance->FindChan(parameters[1]);
+				Channel* n = Channel::JoinUser(localuser, parameters[1], true);
 				if (n)
 				{
 					if (n->HasUser(dest))
@@ -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,20 +110,15 @@ class ModuleSajoin : public Module
 	{
 	}
 
-	void init()
+	void init() CXX11_OVERRIDE
 	{
 		ServerInstance->Modules->AddService(cmd);
 	}
 
-	virtual ~ModuleSajoin()
-	{
-	}
-
-	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);
 	}
-
 };
 
 MODULE_INIT(ModuleSajoin)