From 1b913608855b27864adc5feae16b726822acb7c6 Mon Sep 17 00:00:00 2001
From: Shivaram Lingamneni <slingamn@cs.stanford.edu>
Date: Mon, 30 Nov 2020 16:43:36 -0500
Subject: [PATCH] fix incorrect TAGMSG relaying

---
 irc/message_cache.go | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/irc/message_cache.go b/irc/message_cache.go
index 3bc59a10..64b08431 100644
--- a/irc/message_cache.go
+++ b/irc/message_cache.go
@@ -172,16 +172,20 @@ func (m *MessageCache) InitializeSplitMessage(server *Server, nickmask, accountN
 
 func (m *MessageCache) Send(session *Session) {
 	if m.fullTags != nil {
+		// Initialize() path:
 		if session.capabilities.Has(caps.MessageTags) {
 			session.sendBytes(m.fullTags, false)
-		} else if !(session.capabilities.Has(caps.ServerTime) || session.capabilities.Has(caps.AccountTag)) {
-			if m.plain != nil {
+		} else if m.plain != nil {
+			// plain == nil indicates a TAGMSG
+			if !(session.capabilities.Has(caps.ServerTime) || session.capabilities.Has(caps.AccountTag)) {
 				session.sendBytes(m.plain, false)
+			} else {
+				// slowpath
+				session.sendFromClientInternal(false, m.time, m.msgid, m.source, m.accountName, nil, m.command, m.params...)
 			}
-		} else {
-			session.sendFromClientInternal(false, m.time, m.msgid, m.source, m.accountName, nil, m.command, m.params...)
 		}
 	} else if m.fullTagsMultiline != nil {
+		// InitializeSplitMessage() path:
 		if session.capabilities.Has(caps.Multiline) {
 			for _, line := range m.fullTagsMultiline {
 				session.sendBytes(line, false)
@@ -191,6 +195,7 @@ func (m *MessageCache) Send(session *Session) {
 				session.sendBytes(line, false)
 			}
 		} else {
+			// slowpath
 			session.sendSplitMsgFromClientInternal(false, m.source, m.accountName, m.tags, m.command, m.target, m.splitMessage)
 		}
 	}