Unset all extensions and the topic when lowering TS on a channel

4 files changed, 50 insertions, 11 deletions

diff --git a/include/extensible.h b/include/extensible.h
index e062f66a5..4e6721414 100644
--- a/include/extensible.h
+++ b/include/extensible.h
@@ -94,6 +94,11 @@ class CoreExport Extensible : public classbase
 	virtual CullResult cull();
 	virtual ~Extensible();
 	void doUnhookExtensions(const std::vector<reference<ExtensionItem> >& toRemove);
+
+	/**
+	 * Free all extension items attached to this Extensible
+	 */
+	void FreeAllExtItems();
 };
 
 class CoreExport ExtensionManager
diff --git a/src/base.cpp b/src/base.cpp
index db8d9f3cf..211dc2015 100644
--- a/src/base.cpp
+++ b/src/base.cpp
@@ -187,12 +187,17 @@ Extensible::Extensible()
 
 CullResult Extensible::cull()
 {
+	FreeAllExtItems();
+	return classbase::cull();
+}
+
+void Extensible::FreeAllExtItems()
+{
 	for(ExtensibleStore::iterator i = extensions.begin(); i != extensions.end(); ++i)
 	{
 		i->first->free(i->second);
 	}
 	extensions.clear();
-	return classbase::cull();
 }
 
 Extensible::~Extensible()
diff --git a/src/modules/m_spanningtree/commands.h b/src/modules/m_spanningtree/commands.h
index 9690eba46..97322ed99 100644
--- a/src/modules/m_spanningtree/commands.h
+++ b/src/modules/m_spanningtree/commands.h
@@ -129,6 +129,15 @@ class CommandFJoin : public ServerCommand
 	 */
 	static void RemoveStatus(Channel* c);
 	static void ApplyModeStack(User* srcuser, Channel* c, irc::modestacker& stack);
+
+	/**
+	 * Lowers the TS on the given channel: removes all modes, unsets all extensions,
+	 * clears the topic and removes all pending invites.
+	 * @param chan The target channel whose TS to lower
+	 * @param TS The new TS to set
+	 * @param newname The new name of the channel; must be the same or a case change of the current name
+	 */
+	static void LowerTS(Channel* chan, time_t TS, const std::string& newname);
 	bool ProcessModeUUIDPair(const std::string& item, TreeSocket* src_socket, Channel* chan, irc::modestacker* modestack);
  public:
 	CommandFJoin(Module* Creator) : ServerCommand(Creator, "FJOIN", 3) { }
diff --git a/src/modules/m_spanningtree/fjoin.cpp b/src/modules/m_spanningtree/fjoin.cpp
index 47d8efb82..d697af63d 100644
--- a/src/modules/m_spanningtree/fjoin.cpp
+++ b/src/modules/m_spanningtree/fjoin.cpp
@@ -99,16 +99,8 @@ CmdResult CommandFJoin::Handle(User* srcuser, std::vector<std::string>& params)
 			}
 			else if (ourTS > TS)
 			{
-				/* Our TS greater than theirs, clear all our modes from the channel, accept theirs. */
-				if (Utils->AnnounceTSChange)
-					chan->WriteChannelWithServ(ServerInstance->Config->ServerName, "NOTICE %s :TS for %s changed from %lu to %lu", chan->name.c_str(), channel.c_str(), (unsigned long) ourTS, (unsigned long) TS);
-
-				// while the name is equal in case-insensitive compare, it might differ in case; use the remote version
-				chan->name = channel;
-				chan->age = TS;
-				chan->ClearInvites();
-
-				CommandFJoin::RemoveStatus(chan);
+				// Our TS is greater than theirs, remove all modes, extensions, etc. from the channel
+				LowerTS(chan, TS, channel);
 
 				// XXX: If the channel does not exist in the chan hash at this point, create it so the remote modes can be applied on it.
 				// This happens to 0-user permanent channels on the losing side, because those are removed (from the chan hash, then
@@ -248,3 +240,31 @@ void CommandFJoin::ApplyModeStack(User* srcuser, Channel* c, irc::modestacker& s
 		stackresult.erase(stackresult.begin() + 1, stackresult.end());
 	}
 }
+
+void CommandFJoin::LowerTS(Channel* chan, time_t TS, const std::string& newname)
+{
+	if (Utils->AnnounceTSChange)
+		chan->WriteChannelWithServ(ServerInstance->Config->ServerName, "NOTICE %s :TS for %s changed from %lu to %lu", chan->name.c_str(), newname.c_str(), (unsigned long) chan->age, (unsigned long) TS);
+
+	// While the name is equal in case-insensitive compare, it might differ in case; use the remote version
+	chan->name = newname;
+	chan->age = TS;
+
+	// Remove all pending invites
+	chan->ClearInvites();
+
+	// Clear all modes
+	CommandFJoin::RemoveStatus(chan);
+
+	// Unset all extensions
+	chan->FreeAllExtItems();
+
+	// Clear the topic, if it isn't empty then send a topic change message to local users
+	if (!chan->topic.empty())
+	{
+		chan->topic.clear();
+		chan->WriteChannelWithServ(ServerInstance->Config->ServerName, "TOPIC %s :", chan->name.c_str());
+	}
+	chan->setby.clear();
+	chan->topicset = 0;
+}