Make SAJOIN/SAPART more spanningtree friendly, they are throwbacks to the inspircd 1.0 alpha days :S

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@6911 e03df62e-2008-0410-955e-edbf42e46eb7

1 files changed, 23 insertions, 12 deletions

diff --git a/src/modules/m_sapart.cpp b/src/modules/m_sapart.cpp
index b341b4c28..01df5c1be 100644
--- a/src/modules/m_sapart.cpp
+++ b/src/modules/m_sapart.cpp
@@ -43,27 +43,38 @@ class cmd_sapart : public command_t
 				return CMD_FAILURE;
 			}
 
-			if (!channel->PartUser(dest, dest->nick))
-				delete channel;
-			chanrec* n = ServerInstance->FindChan(parameters[1]);
-			if (!n)
+			/* For local clients, directly part them generating a PART message. For remote clients,
+			 * just return CMD_SUCCESS knowing the protocol module will route the SAPART to the users
+			 * local server and that will generate the PART instead
+			 */
+			if (IS_LOCAL(dest))
 			{
-				ServerInstance->WriteOpers("*** "+std::string(user->nick)+" used SAPART to make "+dest->nick+" part "+parameters[1]);
-				return CMD_SUCCESS;
-			}
-			else
-			{
-				if (!n->HasUser(dest))
+				if (!channel->PartUser(dest, dest->nick))
+					delete channel;
+				chanrec* n = ServerInstance->FindChan(parameters[1]);
+				if (!n)
 				{
 					ServerInstance->WriteOpers("*** "+std::string(user->nick)+" used SAPART to make "+dest->nick+" part "+parameters[1]);
 					return CMD_SUCCESS;
 				}
 				else
 				{
-					user->WriteServ("NOTICE %s :*** Unable to make %s part %s",user->nick, dest->nick, parameters[1]);
-					return CMD_FAILURE;
+					if (!n->HasUser(dest))
+					{
+						ServerInstance->WriteOpers("*** "+std::string(user->nick)+" used SAPART to make "+dest->nick+" part "+parameters[1]);
+						return CMD_SUCCESS;
+					}
+					else
+					{
+						user->WriteServ("NOTICE %s :*** Unable to make %s part %s",user->nick, dest->nick, parameters[1]);
+						return CMD_FAILURE;
+					}
 				}
 			}
+			else
+			{
+				ServerInstance->WriteOpers("*** "+std::string(user->nick)+" sent remote SAPART to make "+dest->nick+" part "+parameters[1]);
+			}
 
 			return CMD_SUCCESS;
 		}