X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_sajoin.cpp;h=19606d4368caa290f932c7e3787bb2f55bf7c322;hb=226a95aab09b9e1f43f61e78179bfa1135816c2d;hp=2d6bb0f97e5ad9b787b00949abaf32185a28cdd9;hpb=26e7bb0b9a17a595d9935a1cae41b44504ad213e;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_sajoin.cpp b/src/modules/m_sajoin.cpp
index 2d6bb0f97..19606d436 100644
--- a/src/modules/m_sajoin.cpp
+++ b/src/modules/m_sajoin.cpp
@@ -48,19 +48,18 @@ class CommandSajoin : public Command
 			if (IS_LOCAL(user) && !ServerInstance->IsChannel(parameters[1].c_str(), ServerInstance->Config->Limits.ChanMax))
 			{
 				/* 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], 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))
@@ -70,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;
 				}
 			}
@@ -88,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;
 		}
 	}