X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Fcompat.cpp;h=1d573b8b426454b8380542b18cbdf17324b898b7;hb=ee4262d276606649489db02007c7a34e8ac75bc4;hp=a9e48a10c5dea404b152872aeb20e3ab506e6a52;hpb=27ecc025acf7b01f51b2ecc32c28180dc49d793c;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_spanningtree/compat.cpp b/src/modules/m_spanningtree/compat.cpp
index a9e48a10c..1d573b8b4 100644
--- a/src/modules/m_spanningtree/compat.cpp
+++ b/src/modules/m_spanningtree/compat.cpp
@@ -123,8 +123,10 @@ void TreeSocket::WriteLine(const std::string& original_line)
 				else if (command == "FTOPIC")
 				{
 					// Drop channel TS for FTOPIC
-					// :sid FTOPIC #target TS TopicTS ...
-					//     A      B       C  D
+					// :sid FTOPIC #target TS TopicTS setter :newtopic
+					//     A      B       C  D       E      F
+					// :uid FTOPIC #target TS TopicTS :newtopic
+					//     A      B       C  D       E
 					if (b == std::string::npos)
 						return;
 
@@ -136,7 +138,14 @@ void TreeSocket::WriteLine(const std::string& original_line)
 					if (d == std::string::npos)
 						return;
 
-					line.erase(c, d-c);
+					std::string::size_type e = line.find(' ', d + 1);
+					if (line[e+1] == ':')
+					{
+						line.erase(c, e-c);
+						line.erase(a+1, 1);
+					}
+					else
+						line.erase(c, d-c);
 				}
 				else if ((command == "PING") || (command == "PONG"))
 				{
@@ -268,6 +277,26 @@ bool TreeSocket::PreProcessOldProtocolMessage(User*& who, std::string& cmd, std:
 		params.insert(params.begin()+1, "operquit");
 		who = MyRoot->ServerUser;
 	}
+	else if ((cmd == "TOPIC") && (params.size() >= 2))
+	{
+		// :20DAAAAAC TOPIC #chan :new topic
+		cmd = "FTOPIC";
+		if (!InsertCurrentChannelTS(params))
+			return false;
+
+		params.insert(params.begin()+2, ConvToStr(ServerInstance->Time()));
+	}
+	else if (cmd == "MODENOTICE")
+	{
+		// MODENOTICE is always supported by 2.0 but it's optional in 2.2.
+		params.insert(params.begin(), "*");
+		params.insert(params.begin()+1, cmd);
+		cmd = "ENCAP";
+	}
+	else if (cmd == "RULES")
+	{
+		return false;
+	}
 
 	return true; // Passthru
 }