Remove m_silence pending a complete rewrite.

[user/henk/code/inspircd.git] / src / modules / m_spanningtree / compat.cpp

diff --git a/src/modules/m_spanningtree/compat.cpp b/src/modules/m_spanningtree/compat.cpp
index 17bc7cbc69eb90899b3d9c1ad8af0b2fe4a36081..aacae5deab8a65fc9781c056ee723c393b0ff303 100644 (file)
--- 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))