Made Anope keep track of channels its clients are in if it splits from its uplink, then burst them back to its uplink once connection is reestablished.

Also made Anope use TS enforcement to change persistant channels creation time to the time they were registered.

6 files changed, 117 insertions, 223 deletions

diff --git a/modules/protocol/bahamut.cpp b/modules/protocol/bahamut.cpp
index 572b91367..9c3e107a4 100644
--- a/modules/protocol/bahamut.cpp
+++ b/modules/protocol/bahamut.cpp
@@ -197,6 +197,19 @@ class BahamutIRCdProto : public IRCDProto
 		send_cmd(user->nick, "SJOIN %ld %s", static_cast<long>(chantime), channel.c_str());
 	}
 
+	void SendJoin(BotInfo *user, const ChannelContainer *cc)
+	{
+		SendJoin(user, cc->chan->name, cc->chan->creation_time);
+		for (std::map<char, ChannelMode *>::iterator it = ModeManager::ChannelModesByChar.begin(), it_end = ModeManager::ChannelModesByChar.end(); it != it_end; ++it)
+		{
+			if (cc->Status->HasFlag(it->second->Name))
+			{
+				cc->chan->SetMode(user, it->second, user->nick);
+			}
+		}
+		cc->chan->SetModes(user, false, "%s", cc->chan->GetModes(true, true).c_str());
+	}
+
 	void SendAkill(const XLine *x)
 	{
 		// Calculate the time left before this would expire, capping it at 2 days
@@ -226,6 +239,11 @@ class BahamutIRCdProto : public IRCDProto
 		this->SendModeInternal(NULL, u, merge_args(ac, av));
 	}
 
+	void SendBOB()
+	{
+		send_cmd("", "BURST");
+	}
+
 	void SendEOB()
 	{
 		send_cmd("", "BURST 0");
@@ -290,56 +308,26 @@ int anope_event_sjoin(const Anope::string &source, int ac, const char **av)
 {
 	Channel *c = findchan(av[1]);
 	time_t ts = Anope::string(av[0]).is_number_only() ? convertTo<time_t>(av[0]) : 0;
-	bool was_created = false;
 	bool keep_their_modes = false;
 
 	if (!c)
 	{
 		c = new Channel(av[1], ts);
-		was_created = true;
+		c->SetFlag(CH_SYNCING);
 	}
 	/* Our creation time is newer than what the server gave us */
 	else if (c->creation_time > ts)
 	{
 		c->creation_time = ts;
+		c->Reset();
 
-		/* Remove status from all of our users */
-		for (std::list<Mode *>::const_iterator it = ModeManager::Modes.begin(), it_end = ModeManager::Modes.end(); it != it_end; ++it)
-		{
-			Mode *m = *it;
-
-			if (m->Type != MODE_STATUS)
-				continue;
-
-			ChannelMode *cm = debug_cast<ChannelMode *>(m);
-
-			for (CUserList::const_iterator uit = c->users.begin(), uit_end = c->users.end(); uit != uit_end; ++uit)
-			{
-				UserContainer *uc = *uit;
-
-				c->RemoveMode(NULL, cm, uc->user->nick);
-			}
-		}
-		if (c->ci)
-		{
-			/* Rejoin the bot to fix the TS */
-			if (c->ci->bi)
-			{
-				c->ci->bi->Part(c, "TS reop");
-				c->ci->bi->Join(c);
-			}
-			/* Reset mlock */
-			check_modes(c);
-		}
+		/* Reset mlock */
+		check_modes(c);
 	}
 	/* Their TS is newer than ours, our modes > theirs, unset their modes if need be */
-	else
+	else if (ts > c->creation_time)
 		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)
 	{
@@ -350,7 +338,7 @@ int anope_event_sjoin(const Anope::string &source, int ac, const char **av)
 	/* 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)
+	if (!c->HasFlag(CH_SYNCING) && ac == 2)
 	{
 		User *u = finduser(source);
 		if (!u)
@@ -396,7 +384,8 @@ int anope_event_sjoin(const Anope::string &source, int ac, const char **av)
 					continue;
 				}
 
-				Status.push_back(cm);
+				if (keep_their_modes)
+					Status.push_back(cm);
 			}
 
 			User *u = finduser(buf);
@@ -433,7 +422,7 @@ int anope_event_sjoin(const Anope::string &source, int ac, const char **av)
 	}
 
 	/* Channel is done syncing */
-	if (was_created)
+	if (c->HasFlag(CH_SYNCING))
 	{
 		/* Unset the syncing flag */
 		c->UnsetFlag(CH_SYNCING);
diff --git a/modules/protocol/inspircd11.cpp b/modules/protocol/inspircd11.cpp
index c06b74501..cc2c99fa6 100644
--- a/modules/protocol/inspircd11.cpp
+++ b/modules/protocol/inspircd11.cpp
@@ -185,6 +185,19 @@ class InspIRCdProto : public IRCDProto
 		send_cmd(user->nick, "JOIN %s %ld", channel.c_str(), static_cast<long>(chantime));
 	}
 
+	void SendJoin(BotInfo *user, const ChannelContainer *cc)
+	{
+		SendJoin(user, cc->chan->name, cc->chan->creation_time);
+		for (std::map<char, ChannelMode *>::iterator it = ModeManager::ChannelModesByChar.begin(), it_end = ModeManager::ChannelModesByChar.end(); it != it_end; ++it)
+		{
+			if (cc->Status->HasFlag(it->second->Name))
+			{
+				cc->chan->SetMode(user, it->second, user->nick);
+			}
+		}
+		cc->chan->SetModes(user, false, "%s", cc->chan->GetModes(true, true).c_str());
+	}
+
 	/* UNSQLINE */
 	void SendSQLineDel(const XLine *x)
 	{
@@ -270,6 +283,11 @@ class InspIRCdProto : public IRCDProto
 		send_cmd(source, "SVSPART %s %s", nick.c_str(), chan.c_str());
 	}
 
+	void SendBOB()
+	{
+		send_cmd("", "BURST %ld", time(NULL));
+	}
+
 	void SendEOB()
 	{
 		send_cmd("", "ENDBURST");
@@ -386,56 +404,26 @@ int anope_event_fjoin(const Anope::string &source, int ac, const char **av)
 {
 	Channel *c = findchan(av[0]);
 	time_t ts = Anope::string(av[1]).is_number_only() ? convertTo<time_t>(av[1]) : 0;
-	bool was_created = false;
 	bool keep_their_modes = true;
 
 	if (!c)
 	{
 		c = new Channel(av[0], ts);
-		was_created = true;
+		c->SetFlag(CH_SYNCING);
 	}
 	/* Our creation time is newer than what the server gave us */
 	else if (c->creation_time > ts)
 	{
 		c->creation_time = ts;
+		c->Reset();
 
-		/* Remove status from all of our users */
-		for (std::list<Mode *>::const_iterator it = ModeManager::Modes.begin(), it_end = ModeManager::Modes.end(); it != it_end; ++it)
-		{
-			Mode *m = *it;
-
-			if (m->Type != MODE_STATUS)
-				continue;
-
-			ChannelMode *cm = debug_cast<ChannelMode *>(m);
-
-			for (CUserList::const_iterator uit = c->users.begin(), uit_end = c->users.end(); uit != uit_end; ++uit)
-			{
-				UserContainer *uc = *uit;
-
-				c->RemoveMode(NULL, cm, uc->user->nick);
-			}
-		}
-		if (c->ci)
-		{
-			/* Rejoin the bot to fix the TS */
-			if (c->ci->bi)
-			{
-				c->ci->bi->Part(c, "TS reop");
-				c->ci->bi->Join(c);
-			}
-			/* Reset mlock */
-			check_modes(c);
-		}
+		/* Reset mlock */
+		check_modes(c);
 	}
 	/* Their TS is newer than ours, our modes > theirs, unset their modes if need be */
-	else
+	else if (ts > c->creation_time)
 		keep_their_modes = false;
 
-	/* Mark the channel as syncing */
-	if (was_created)
-		c->SetFlag(CH_SYNCING);
-
 	spacesepstream sep(av[ac - 1]);
 	Anope::string buf;
 	while (sep.GetToken(buf))
@@ -456,7 +444,8 @@ int anope_event_fjoin(const Anope::string &source, int ac, const char **av)
 			}
 
 			buf.erase(buf.begin());
-			Status.push_back(cm);
+			if (keep_their_modes)
+				Status.push_back(cm);
 		}
 
 		User *u = finduser(buf);
@@ -492,7 +481,7 @@ int anope_event_fjoin(const Anope::string &source, int ac, const char **av)
 	}
 
 	/* Channel is done syncing */
-	if (was_created)
+	if (c->HasFlag(CH_SYNCING))
 	{
 		/* Unset the syncing flag */
 		c->UnsetFlag(CH_SYNCING);
diff --git a/modules/protocol/inspircd12.cpp b/modules/protocol/inspircd12.cpp
index a78ead0a8..55a371700 100644
--- a/modules/protocol/inspircd12.cpp
+++ b/modules/protocol/inspircd12.cpp
@@ -185,6 +185,11 @@ class InspIRCdProto : public IRCDProto
 		send_cmd(TS6SID, "FJOIN %s %ld + :,%s", channel.c_str(), static_cast<long>(chantime), user->GetUID().c_str());
 	}
 
+	void SendJoin(BotInfo *user, const ChannelContainer *cc)
+	{
+		send_cmd(TS6SID, "FJOIN %s %ld +%s :%s,%s", cc->chan->name.c_str(), static_cast<long>(cc->chan->creation_time), cc->chan->GetModes(true, true).c_str(), cc->Status->BuildCharPrefixList().c_str(), user->GetUID().c_str());
+	}
+
 	/* UNSQLINE */
 	void SendSQLineDel(const XLine *x)
 	{
@@ -275,6 +280,11 @@ class InspIRCdProto : public IRCDProto
 		send_cmd(TS6SID, "METADATA %s swhois :%s", u->GetUID().c_str(), mask.c_str());
 	}
 
+	void SendBOB()
+	{
+		send_cmd(TS6SID, "BURST %ld", time(NULL));
+	}
+
 	void SendEOB()
 	{
 		send_cmd(TS6SID, "ENDBURST");
@@ -427,56 +437,26 @@ int anope_event_fjoin(const Anope::string &source, int ac, const char **av)
 {
 	Channel *c = findchan(av[0]);
 	time_t ts = Anope::string(av[1]).is_number_only() ? convertTo<time_t>(av[1]) : 0;
-	bool was_created = false;
 	bool keep_their_modes = true;
 
 	if (!c)
 	{
 		c = new Channel(av[0], ts);
-		was_created = true;
+		c->SetFlag(CH_SYNCING);
 	}
 	/* Our creation time is newer than what the server gave us */
 	else if (c->creation_time > ts)
 	{
 		c->creation_time = ts;
+		c->Reset();
 
-		/* Remove status from all of our users */
-		for (std::list<Mode *>::const_iterator it = ModeManager::Modes.begin(), it_end = ModeManager::Modes.end(); it != it_end; ++it)
-		{
-			Mode *m = *it;
-
-			if (m->Type != MODE_STATUS)
-				continue;
-
-			ChannelMode *cm = debug_cast<ChannelMode *>(m);
-
-			for (CUserList::const_iterator uit = c->users.begin(), uit_end = c->users.end(); uit != uit_end; ++uit)
-			{
-				UserContainer *uc = *uit;
-
-				c->RemoveMode(NULL, cm, uc->user->nick);
-			}
-		}
-		if (c->ci)
-		{
-			/* Rejoin the bot to fix the TS */
-			if (c->ci->bi)
-			{
-				c->ci->bi->Part(c, "TS reop");
-				c->ci->bi->Join(c);
-			}
-			/* Reset mlock */
-			check_modes(c);
-		}
+		/* Reset mlock */
+		check_modes(c);
 	}
 	/* Their TS is newer than ours, our modes > theirs, unset their modes if need be */
-	else
+	else if (ts > c->creation_time)
 		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 FJOIN string contains modes */
 	if (keep_their_modes && ac >= 4)
 	{
@@ -502,7 +482,8 @@ int anope_event_fjoin(const Anope::string &source, int ac, const char **av)
 			}
 
 			buf.erase(buf.begin());
-			Status.push_back(cm);
+			if (keep_their_modes)
+				Status.push_back(cm);
 		}
 		buf.erase(buf.begin());
 
@@ -539,7 +520,7 @@ int anope_event_fjoin(const Anope::string &source, int ac, const char **av)
 	}
 
 	/* Channel is done syncing */
-	if (was_created)
+	if (c->HasFlag(CH_SYNCING))
 	{
 		/* Unset the syncing flag */
 		c->UnsetFlag(CH_SYNCING);
diff --git a/modules/protocol/inspircd20.cpp b/modules/protocol/inspircd20.cpp
index c55bc7020..8a8748d49 100644
--- a/modules/protocol/inspircd20.cpp
+++ b/modules/protocol/inspircd20.cpp
@@ -183,6 +183,11 @@ class InspIRCdProto : public IRCDProto
 		send_cmd(TS6SID, "FJOIN %s %ld + :,%s", channel.c_str(), static_cast<long>(chantime), user->GetUID().c_str());
 	}
 
+	void SendJoin(BotInfo *user, const ChannelContainer *cc)
+	{
+		send_cmd(TS6SID, "FJOIN %s %ld +%s :%s,%s", cc->chan->name.c_str(), static_cast<long>(cc->chan->creation_time), cc->chan->GetModes(true, true).c_str(), cc->Status->BuildCharPrefixList().c_str(), user->GetUID().c_str());
+	}
+
 	/* UNSQLINE */
 	void SendSQLineDel(const XLine *x)
 	{
@@ -276,6 +281,11 @@ class InspIRCdProto : public IRCDProto
 		send_cmd(TS6SID, "METADATA %s swhois :%s", u->GetUID().c_str(), mask.c_str());
 	}
 
+	void SendBOB()
+	{
+		send_cmd(TS6SID, "BURST %ld", time(NULL));
+	}
+
 	void SendEOB()
 	{
 		send_cmd(TS6SID, "ENDBURST");
@@ -425,56 +435,26 @@ int anope_event_fjoin(const Anope::string &source, int ac, const char **av)
 {
 	Channel *c = findchan(av[0]);
 	time_t ts = Anope::string(av[1]).is_number_only() ? convertTo<time_t>(av[1]) : 0;
-	bool was_created = false;
 	bool keep_their_modes = true;
 
 	if (!c)
 	{
 		c = new Channel(av[0], ts);
-		was_created = true;
+		c->SetFlag(CH_SYNCING);
 	}
 	/* Our creation time is newer than what the server gave us */
 	else if (c->creation_time > ts)
 	{
 		c->creation_time = ts;
+		c->Reset();
 
-		/* Remove status from all of our users */
-		for (std::list<Mode *>::const_iterator it = ModeManager::Modes.begin(), it_end = ModeManager::Modes.end(); it != it_end; ++it)
-		{
-			Mode *m = *it;
-
-			if (m->Type != MODE_STATUS)
-				continue;
-
-			ChannelMode *cm = debug_cast<ChannelMode *>(m);
-
-			for (CUserList::const_iterator uit = c->users.begin(), uit_end = c->users.end(); uit != uit_end; ++uit)
-			{
-				 UserContainer *uc = *uit;
-
-				 c->RemoveMode(NULL, cm, uc->user->nick);
-			}
-		}
-		if (c->ci)
-		{
-			/* Rejoin the bot to fix the TS */
-			if (c->ci->bi)
-			{
-				c->ci->bi->Part(c, "TS reop");
-				c->ci->bi->Join(c);
-			}
-			/* Reset mlock */
-			check_modes(c);
-		}
+		/* Reset mlock */
+		check_modes(c);
 	}
-	/* Their TS is newer than ours, our modes > theirs, unset their modes if need be */
-	else
+	/* Their TS is newer than ours, our modes > theirs, unset their modes */
+	else if (ts > c->creation_time)
 		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 FJOIN string contains modes */
 	if (keep_their_modes && ac >= 4)
 	{
@@ -500,7 +480,8 @@ int anope_event_fjoin(const Anope::string &source, int ac, const char **av)
 			}
 
 			buf.erase(buf.begin());
-			Status.push_back(cm);
+			if (keep_their_modes)
+				Status.push_back(cm);
 		}
 		buf.erase(buf.begin());
 
@@ -537,7 +518,7 @@ int anope_event_fjoin(const Anope::string &source, int ac, const char **av)
 	}
 
 	/* Channel is done syncing */
-	if (was_created)
+	if (c->HasFlag(CH_SYNCING))
 	{
 		/* Unset the syncing flag */
 		c->UnsetFlag(CH_SYNCING);
diff --git a/modules/protocol/ratbox.cpp b/modules/protocol/ratbox.cpp
index 8db46a3d5..a26ee9598 100644
--- a/modules/protocol/ratbox.cpp
+++ b/modules/protocol/ratbox.cpp
@@ -145,6 +145,11 @@ class RatboxProto : public IRCDTS6Proto
 		send_cmd("", "SJOIN %ld %s + :%s", static_cast<long>(chantime), channel.c_str(), user->GetUID().c_str());
 	}
 
+	void SendJoin(const BotInfo *user, const ChannelContainer *cc)
+	{
+		send_cmd("", "SJOIN %ld %s +%s :%s%s", static_cast<long>(cc->chan->creation_time), cc->chan->name.c_str(), cc->chan->GetModes(true, true).c_str(), cc->Status->BuildModePrefixList().c_str(), user->GetUID().c_str());
+	}
+
 	void SendAkill(const XLine *x)
 	{
 		BotInfo *bi = OperServ;
@@ -281,56 +286,26 @@ int anope_event_sjoin(const Anope::string &source, int ac, const char **av)
 {
 	Channel *c = findchan(av[1]);
 	time_t ts = Anope::string(av[0]).is_number_only() ? convertTo<time_t>(av[0]) : 0;
-	bool was_created = false;
 	bool keep_their_modes = true;
 
 	if (!c)
 	{
 		c = new Channel(av[1], ts);
-		was_created = true;
+		c->SetFlag(CH_SYNCING);
 	}
 	/* Our creation time is newer than what the server gave us */
 	else if (c->creation_time > ts)
 	{
 		c->creation_time = ts;
+		c->Reset();
 
-		/* Remove status from all of our users */
-		for (std::list<Mode *>::const_iterator it = ModeManager::Modes.begin(), it_end = ModeManager::Modes.end(); it != it_end; ++it)
-		{
-			Mode *m = *it;
-
-			if (m->Type != MODE_STATUS)
-				continue;
-
-			ChannelMode *cm = debug_cast<ChannelMode *>(m);
-
-			for (CUserList::const_iterator uit = c->users.begin(), uit_end = c->users.end(); uit != uit_end; ++uit)
-			{
-				UserContainer *uc = *uit;
-
-				c->RemoveMode(NULL, cm, uc->user->nick);
-			}
-		}
-		if (c->ci)
-		{
-			/* Rejoin the bot to fix the TS */
-			if (c->ci->bi)
-			{
-				c->ci->bi->Part(c, "TS reop");
-				c->ci->bi->Join(c);
-			}
-			/* Reset mlock */
-			check_modes(c);
-		}
+		/* Reset mlock */
+		check_modes(c);
 	}
 	/* Their TS is newer than ours, our modes > theirs, unset their modes if need be */
-	else
+	else if (ts > c->creation_time)
 		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)
 	{
@@ -356,7 +331,8 @@ int anope_event_sjoin(const Anope::string &source, int ac, const char **av)
 				continue;
 			}
 
-			Status.push_back(cm);
+			if (keep_their_modes)
+				Status.push_back(cm);
 		}
 
 		User *u = finduser(buf);
@@ -392,7 +368,7 @@ int anope_event_sjoin(const Anope::string &source, int ac, const char **av)
 	}
 
 	/* Channel is done syncing */
-	if (was_created)
+	if (c->HasFlag(CH_SYNCING))
 	{
 		/* Unset the syncing flag */
 		c->UnsetFlag(CH_SYNCING);
diff --git a/modules/protocol/unreal32.cpp b/modules/protocol/unreal32.cpp
index 1e18e92f9..ff04e87eb 100644
--- a/modules/protocol/unreal32.cpp
+++ b/modules/protocol/unreal32.cpp
@@ -214,6 +214,12 @@ class UnrealIRCdProto : public IRCDProto
 		send_cmd(Config->ServerName, "~ %ld %s :%s", static_cast<long>(chantime), channel.c_str(), user->nick.c_str());
 	}
 
+	void SendJoin(BotInfo *user, const ChannelContainer *cc)
+	{
+		send_cmd(Config->ServerName, "~ %ld %s :%s%s", static_cast<long>(cc->chan->creation_time), cc->chan->name.c_str(), cc->Status->BuildModePrefixList().c_str(), user->nick.c_str());
+		cc->chan->SetModes(user, false, "%s", cc->chan->GetModes(true, true).c_str());
+	}
+
 	/* unsqline
 	*/
 	void SendSQLineDel(const XLine *x)
@@ -988,54 +994,25 @@ int anope_event_sjoin(const Anope::string &source, int ac, const char **av)
 	Channel *c = findchan(av[1]);
 	time_t ts = Anope::string(av[0]).is_number_only() ? convertTo<time_t>(av[0]) : 0;
 	bool keep_their_modes = true;
-	bool was_created = false;
 
 	if (!c)
 	{
 		c = new Channel(av[1], ts);
-		was_created = true;
+		c->SetFlag(CH_SYNCING);
 	}
 	/* Our creation time is newer than what the server gave us */
 	else if (c->creation_time > ts)
 	{
 		c->creation_time = ts;
+		c->Reset();
 
-		for (std::list<Mode *>::const_iterator it =ModeManager::Modes.begin(), it_end = ModeManager::Modes.end(); it != it_end; ++it)
-		{
-			Mode *m = *it;
-
-			if (m->Type != MODE_STATUS)
-				continue;
-
-			ChannelMode *cm = debug_cast<ChannelMode *>(m);
-
-			for (CUserList::const_iterator uit = c->users.begin(), uit_end = c->users.end(); uit != uit_end; ++uit)
-			{
-				UserContainer *uc = *uit;
-
-				c->RemoveMode(NULL, cm, uc->user->nick);
-			}
-		}
-		if (c->ci)
-		{
-			/* Rejoin the bot to fix the TS */
-			if (c->ci->bi)
-			{
-				c->ci->bi->Part(c, "TS reop");
-				c->ci->bi->Join(c);
-			}
-			/* Reset mlock */
-			check_modes(c);
-		}
+		/* Reset mlock */
+		check_modes(c);
 	}
 	/* Their TS is newer than ours, our modes > theirs, unset their modes if need be */
-	else
+	else if (ts > c->creation_time)
 		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)
 	{
@@ -1090,7 +1067,8 @@ int anope_event_sjoin(const Anope::string &source, int ac, const char **av)
 					continue;
 				}
 
-				Status.push_back(cm);
+				if (keep_their_modes)
+					Status.push_back(cm);
 			}
 
 			User *u = finduser(buf);
@@ -1127,7 +1105,7 @@ int anope_event_sjoin(const Anope::string &source, int ac, const char **av)
 	}
 
 	/* Channel is done syncing */
-	if (was_created)
+	if (c->HasFlag(CH_SYNCING))
 	{
 		/* Unset the syncing flag */
 		c->UnsetFlag(CH_SYNCING);