X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmodules%2Fm_spanningtree%2Fcompat.cpp;h=aacae5deab8a65fc9781c056ee723c393b0ff303;hb=9f3502de449f3bd4a88163ddc39626305071531f;hp=17bc7cbc69eb90899b3d9c1ad8af0b2fe4a36081;hpb=93390f6ccbeeb5198217ef31a205c57e51d2dc18;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_spanningtree/compat.cpp b/src/modules/m_spanningtree/compat.cpp
index 17bc7cbc6..aacae5dea 100644
--- a/src/modules/m_spanningtree/compat.cpp
+++ b/src/modules/m_spanningtree/compat.cpp
@@ -42,7 +42,7 @@ void TreeSocket::WriteLine(const std::string& original_line)
 			if (line[0] == '@')
 			{
 				// The line contains tags which the 1202 protocol can't handle.
-				line.erase(0, a);
+				line.erase(0, a + 1);
 				a = line.find(' ');
 			}
 			std::string::size_type b = line.find(' ', a + 1);
@@ -309,6 +309,11 @@ void TreeSocket::WriteLine(const std::string& original_line)
 					push.append(line, 26, std::string::npos);
 					push.swap(line);
 				}
+				else if (command == "TAGMSG")
+				{
+					// Drop IRCv3 tag messages as v2 has no message tag support.
+					return;
+				}
 			}
 			WriteLineNoCompat(line);
 			return;
@@ -514,6 +519,11 @@ bool TreeSocket::PreProcessOldProtocolMessage(User*& who, std::string& cmd, Comm
 		// SVSWATCH was removed because nothing was using it, but better be sure
 		return false;
 	}
+	else if (cmd == "SVSSILENCE")
+	{
+		// SVSSILENCE was removed because nothing was using it, but better be sure
+		return false;
+	}
 	else if (cmd == "PUSH")
 	{
 		if ((params.size() != 2) || (!this->MyRoot))