From c495b5d9cf8bed4f07c0b77a1f9e98dcc1f62068 Mon Sep 17 00:00:00 2001
From: Peter Powell
Date: Thu, 6 Sep 2018 10:09:09 +0100
Subject: Implement support for IRCv3 client-to-client tags.

---
 src/modules/m_spanningtree/compat.cpp | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'src/modules/m_spanningtree/compat.cpp')

diff --git a/src/modules/m_spanningtree/compat.cpp b/src/modules/m_spanningtree/compat.cpp
index 17bc7cbc6..17b44f896 100644
--- a/src/modules/m_spanningtree/compat.cpp
+++ b/src/modules/m_spanningtree/compat.cpp
@@ -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;
-- 
cgit v1.3.1-10-gc9f91


From 9b732cb49dcd1b8d28881236f5afb93e47f19b94 Mon Sep 17 00:00:00 2001
From: Peter Powell
Date: Wed, 20 Mar 2019 18:25:17 +0000
Subject: Strip message tags correctly in the 1202 spanningtree compat layer.

---
 src/modules/m_spanningtree/compat.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/modules/m_spanningtree/compat.cpp')

diff --git a/src/modules/m_spanningtree/compat.cpp b/src/modules/m_spanningtree/compat.cpp
index 17b44f896..694b28d87 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);
-- 
cgit v1.3.1-10-gc9f91