Changeset 303 in code for trunk/upstream.go

Timestamp:

May 27, 2020, 9:48:08 PM (5 years ago)

Author:

delthas

Message:

Add support for TAGMSG and client message tags

Previously we dropped all TAGMSG as well as any client message tag sent
from downstream.

This adds support for properly forwarding TAGMSG and client message tags
from downstreams and upstreams.

TAGMSG messages are intentionally not logged, because they are currently
typically used for +typing, which can generate a lot of traffic and is
only useful for a few seconds after it is sent.

File:

• trunk/upstream.go (modified) (5 diffs)

trunk/upstream.go

@@ -321 +321 @@
                 })
                 return nil
-        case "NOTICE", "PRIVMSG":
+        case "NOTICE", "PRIVMSG", "TAGMSG":
                 if msg.Prefix == nil {
                         return fmt.Errorf("expected a prefix")
@@ -327 +327 @@
 
                 var entity, text string
-                if err := parseMessageParams(msg, &entity, &text); err != nil {
-                        return err
+                if msg.Command != "TAGMSG" {
+                        if err := parseMessageParams(msg, &entity, &text); err != nil {
+                                return err
+                        }
+                } else {
+                        if err := parseMessageParams(msg, &entity); err != nil {
+                                return err
+                        }
                 }
 
@@ -342 +348 @@
                 if msg.Prefix.User == "" && msg.Prefix.Host == "" { // server message
                         uc.produce("", msg, nil)
-                } else { // regular user NOTICE or PRIVMSG
+                } else { // regular user message
                         target := entity
                         if target == uc.nick {
@@ -1275 +1281 @@
                         })
                 }
-        case "TAGMSG":
-                // TODO: relay to downstream connections that accept message-tags
         case "ACK":
                 // Ignore
@@ -1488 +1492 @@
 }
 
+func (uc *upstreamConn) SendMessage(msg *irc.Message) {
+        if !uc.caps["message-tags"] {
+                msg = msg.Copy()
+                msg.Tags = nil
+        }
+
+        uc.conn.SendMessage(msg)
+}
+
 func (uc *upstreamConn) SendMessageLabeled(downstreamID uint64, msg *irc.Message) {
         if uc.caps["labeled-response"] {