Changeset 562 in code for trunk

Timestamp:

Jun 23, 2021, 4:17:30 PM (4 years ago)

Author:

contact

Message:

Unify downstream PRIVMSG and NOTICE handling

We were doing some things wrong here, e.g. not sending echo messages
for NOTICE.

File:

• trunk/downstream.go (modified) (6 diffs)

trunk/downstream.go

@@ -1906 +1906 @@
                         Params:  params,
                 })
-        case "PRIVMSG":
+        case "PRIVMSG", "NOTICE":
                 var targetsStr, text string
                 if err := parseMessageParams(msg, &targetsStr, &text); err != nil {
@@ -1919 +1919 @@
                         }
 
-                        if casemapASCII(name) == serviceNickCM {
+                        if msg.Command == "PRIVMSG" && casemapASCII(name) == serviceNickCM {
                                 if dc.caps["echo-message"] {
                                         echoTags := tags.Copy()
@@ -1926 +1926 @@
                                                 Tags:    echoTags,
                                                 Prefix:  dc.prefix(),
-                                                Command: "PRIVMSG",
+                                                Command: msg.Command,
                                                 Params:  []string{name, text},
                                         })
@@ -1939 +1939 @@
                         }
 
-                        if uc.network.casemap(upstreamName) == "nickserv" {
+                        if msg.Command == "PRIVMSG" && uc.network.casemap(upstreamName) == "nickserv" {
                                 dc.handleNickServPRIVMSG(uc, text)
                         }
@@ -1949 +1949 @@
                         uc.SendMessageLabeled(dc.id, &irc.Message{
                                 Tags:    tags,
-                                Command: "PRIVMSG",
+                                Command: msg.Command,
                                 Params:  []string{upstreamName, unmarshaledText},
                         })
@@ -1964 +1964 @@
                                         User: uc.username,
                                 },
-                                Command: "PRIVMSG",
+                                Command: msg.Command,
                                 Params:  []string{upstreamName, text},
                         }
                         uc.produce(upstreamName, echoMsg, dc)
-
-                        uc.updateChannelAutoDetach(upstreamName)
-                }
-        case "NOTICE":
-                var targetsStr, text string
-                if err := parseMessageParams(msg, &targetsStr, &text); 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
-                        }
-
-                        unmarshaledText := text
-                        if uc.isChannel(upstreamName) {
-                                unmarshaledText = dc.unmarshalText(uc, text)
-                        }
-                        uc.SendMessageLabeled(dc.id, &irc.Message{
-                                Tags:    tags,
-                                Command: "NOTICE",
-                                Params:  []string{upstreamName, unmarshaledText},
-                        })
 
                         uc.updateChannelAutoDetach(upstreamName)