Changeset 303 in code for trunk/downstream.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/downstream.go (modified) (6 diffs)

trunk/downstream.go

@@ -251 +251 @@
 func (dc *downstreamConn) SendMessage(msg *irc.Message) {
         if !dc.caps["message-tags"] {
+                if msg.Command == "TAGMSG" {
+                        return
+                }
                 msg = msg.Copy()
                 for name := range msg.Tags {
@@ -275 +278 @@
 
         switch msg.Command {
-        case "PRIVMSG", "NOTICE":
+        case "PRIVMSG", "NOTICE", "TAGMSG":
                 msg.Params[0] = dc.marshalEntity(net, msg.Params[0])
         case "NICK":
@@ -1398 +1401 @@
                         return err
                 }
+                tags := copyClientTags(msg.Tags)
 
                 for _, name := range strings.Split(targetsStr, ",") {
@@ -1419 +1423 @@
                         }
                         uc.SendMessageLabeled(dc.id, &irc.Message{
+                                Tags:    tags,
                                 Command: "PRIVMSG",
                                 Params:  []string{upstreamName, unmarshaledText},
                         })
 
+                        echoTags := tags.Copy()
+                        echoTags["time"] = irc.TagValue(time.Now().UTC().Format(serverTimeLayout))
                         echoMsg := &irc.Message{
-                                Tags: irc.Tags{
-                                        "time": irc.TagValue(time.Now().UTC().Format(serverTimeLayout)),
-                                },
+                                Tags: echoTags,
                                 Prefix: &irc.Prefix{
                                         Name: uc.nick,
@@ -1441 +1446 @@
                         return err
                 }
+                tags := copyClientTags(msg.Tags)
 
                 for _, name := range strings.Split(targetsStr, ",") {
@@ -1453 +1459 @@
                         }
                         uc.SendMessageLabeled(dc.id, &irc.Message{
+                                Tags:    tags,
                                 Command: "NOTICE",
                                 Params:  []string{upstreamName, unmarshaledText},
+                        })
+                }
+        case "TAGMSG":
+                var targetsStr string
+                if err := parseMessageParams(msg, &targetsStr); err != nil {
+                        return err
+                }
+                tags := copyClientTags(msg.Tags)
+
+                for _, name := range strings.Split(targetsStr, ",") {
+                        uc, upstreamName, err := dc.unmarshalEntity(name)
+                        if err != nil {
+                                return err
+                        }
+
+                        uc.SendMessageLabeled(dc.id, &irc.Message{
+                                Tags:    tags,
+                                Command: "TAGMSG",
+                                Params:  []string{upstreamName},
                         })
                 }