Burned do_sjoin and rewrote it to be sane. This changes how Anope handles new channel creations drasitcally as we now truely track it all instead of hack around it by not initially tracking user joins to new channels

git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@2755 5417fbe8-f217-4b02-8779-1006273d7864

1 files changed, 160 insertions, 6 deletions

diff --git a/src/protocol/bahamut.c b/src/protocol/bahamut.c
index bd5a323dc..ac0647d41 100644
--- a/src/protocol/bahamut.c
+++ b/src/protocol/bahamut.c
@@ -48,9 +48,6 @@ IRCDVar myIrcd[] = {
 	 NULL,					  /* CAPAB Chan Modes			 */
 	 0,						 /* We support TOKENS */
 	 0,						 /* TIME STAMPS are BASE64 */
-	 0,						 /* SJOIN ban char */
-	 0,						 /* SJOIN except char */
-	 0,						 /* SJOIN invite char */
 	 0,						 /* Can remove User Channel Modes with SVSMODE */
 	 0,						 /* Sglines are not enforced until user reconnects */
 	 0,						 /* ts6 */
@@ -350,7 +347,163 @@ class BahamutIRCdProto : public IRCDProto
 /* EVENT: SJOIN */
 int anope_event_sjoin(const char *source, int ac, const char **av)
 {
-	do_sjoin(source, ac, av);
+	Channel *c = findchan(av[1]);
+	time_t ts = atol(av[0]);
+	bool was_created = false;
+	bool keep_their_modes = false;
+
+	if (!c)
+	{
+		c = new Channel(av[1], ts);
+		was_created = true;
+	}
+	/* Our creation time is newer than what the server gave us */
+	else if (c->creation_time > ts)
+	{
+		c->creation_time = ts;
+
+		/* Remove status from all of our users */
+		for (struct c_userlist *cu = c->users; cu; cu = cu->next)
+		{
+			c->RemoveMode(NULL, CMODE_OWNER, cu->user->nick);
+			c->RemoveMode(NULL, CMODE_PROTECT, cu->user->nick);
+			c->RemoveMode(NULL, CMODE_OP, cu->user->nick);
+			c->RemoveMode(NULL, CMODE_HALFOP, cu->user->nick);
+			c->RemoveMode(NULL, CMODE_VOICE, cu->user->nick);
+		}
+		if (c->ci)
+		{
+			/* Rejoin the bot to fix the TS */
+			if (c->ci->bi)
+			{
+				ircdproto->SendPart(c->ci->bi, c, "TS reop");
+				bot_join(c->ci);
+			}
+			/* Reset mlock */
+			check_modes(c);
+		}
+	}
+	/* Their TS is newer than ours, our modes > theirs, unset their modes if need be */
+	else
+		keep_their_modes = false;
+	
+	/* Mark the channel as syncing */
+	if (was_created)
+		c->SetFlag(CH_SYNCING);
+	
+	/* If we need to keep their modes, and this SJOIN string contains modes */
+	if (keep_their_modes && ac >= 4)
+	{
+		/* Set the modes internally */
+		ChanSetInternalModes(c, ac - 3, av + 2);
+	}
+
+	/* For a reason unknown to me, bahamut will send a SJOIN from the user joining a channel
+	 * if the channel already existed
+	 */
+	if (!was_created && ac == 2)
+	{
+		User *u = finduser(source);
+		if (!u)
+		{
+			if (debug)
+				alog("debug: SJOIN for nonexistant user %s on %s", source, c->name.c_str());
+		}
+		else
+		{
+			EventReturn MOD_RESULT;
+			FOREACH_RESULT(I_OnPreJoinChannel, OnPreJoinChannel(u, c));
+
+			/* Add the user to the channel */
+			c->JoinUser(u);
+
+			/* Now set whatever modes this user is allowed to have on the channel */
+			chan_set_correct_modes(u, c, 1);
+
+			/* Check to see if modules want the user to join, if they do
+			 * check to see if they are allowed to join (CheckKick will kick/ban them)
+			 * Don't trigger OnJoinChannel event then as the user will be destroyed
+			 */
+			if (MOD_RESULT == EVENT_STOP && (!c->ci || !c->ci->CheckKick(u)))
+			{
+				FOREACH_MOD(I_OnJoinChannel, OnJoinChannel(u, c));
+			}
+		}
+	}
+	else
+	{
+		spacesepstream sep(av[ac - 1]);
+		std::string buf;
+		while (sep.GetToken(buf))
+		{
+			std::list<ChannelMode *> Status;
+			Status.clear();
+			char ch;
+
+			/* Get prefixes from the nick */
+			while ((ch = ModeManager::GetStatusChar(buf[0])))
+			{
+				buf.erase(buf.begin());
+				ChannelMode *cm = ModeManager::FindChannelModeByChar(ch);
+				if (!cm)
+				{
+					alog("Recieved unknown mode prefix %c in SJOIN string", buf[0]);
+					continue;
+				}
+
+				Status.push_back(cm);
+			}
+
+			User *u = finduser(buf);
+			if (!u)
+			{
+				if (debug)
+					alog("debug: SJOIN for nonexistant user %s on %s", buf.c_str(), c->name.c_str());
+				continue;
+			}
+
+			EventReturn MOD_RESULT;
+			FOREACH_RESULT(I_OnPreJoinChannel, OnPreJoinChannel(u, c));
+
+			/* Add the user to the channel */
+			c->JoinUser(u);
+
+			/* Update their status internally on the channel
+			 * This will enforce secureops etc on the user
+			 */
+			for (std::list<ChannelMode *>::iterator it = Status.begin(); it != Status.end(); ++it)
+			{
+				c->SetModeInternal(*it, buf);
+			}
+
+			/* Now set whatever modes this user is allowed to have on the channel */
+			chan_set_correct_modes(u, c, 1);
+
+			/* Check to see if modules want the user to join, if they do
+			 * check to see if they are allowed to join (CheckKick will kick/ban them)
+			 * Don't trigger OnJoinChannel event then as the user will be destroyed
+			 */
+			if (MOD_RESULT != EVENT_STOP && c->ci && c->ci->CheckKick(u))
+				continue;
+
+			FOREACH_MOD(I_OnJoinChannel, OnJoinChannel(u, c));
+		}
+	}
+
+	/* Channel is done syncing */
+	if (was_created)
+	{
+		/* Unset the syncing flag */
+		c->UnsetFlag(CH_SYNCING);
+
+		/* If there are users in the channel they are allowed to be, set topic mlock etc. */
+		if (c->usercount)
+			c->Sync();
+		/* If there are no users in the channel, there is a ChanServ timer set to part the service bot
+		 * and destroy the channel soon
+		 */
+	}
+
 	return MOD_CONT;
 }
 
@@ -614,11 +767,11 @@ int anope_event_burst(const char *source, int ac, const char **av)
 	return MOD_CONT;
 }
 
-bool ChannelModeFlood::IsValid(const char *value)
+bool ChannelModeFlood::IsValid(const std::string &value)
 {
 	char *dp, *end;
 
-	if (value && *value != ':' && strtoul((*value == '*' ? value + 1 : value), &dp, 10) > 0 && *dp == ':' && *(++dp) && strtoul(dp, &end, 10) > 0 && !*end)
+	if (!value.empty() && value[0] != ':' && strtoul((value[0] == '*' ? value.c_str() + 1 : value.c_str()), &dp, 10) > 0 && *dp == ':' && *(++dp) && strtoul(dp, &end, 10) > 0 && !*end)
 		return true;
 
 	return false;
@@ -707,6 +860,7 @@ class ProtoBahamut : public Module
 		pmodule_ircd_var(myIrcd);
 		pmodule_ircd_useTSMode(0);
 
+		moduleAddIRCDMsgs();
 		moduleAddModes();
 
 		pmodule_ircd_proto(&ircd_proto);