Changeset 268 in code for trunk/downstream.go

Timestamp:

Apr 24, 2020, 4:26:44 PM (5 years ago)

Author:

delthas

Message:

Unmarshal nicks in texts of PRIVMSG and NOTICE from downstreams

When writing a PRIVMSG or NOTICE on a channel, it is very common to use
autocompletion to mention other users on that channel. When using soju
in multi-network mode, all users will have their nicked suffixed by
/network. This suffix should be removed before sending it upstream.

This adds support for removing all /network suffixes in messages sent
to a channel of that network.

File:

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

trunk/downstream.go

@@ -198 +198 @@
         }
         return conn, name, nil
+}
+
+func (dc *downstreamConn) unmarshalText(uc *upstreamConn, text string) string {
+        if dc.upstream() != nil {
+                return text
+        }
+        // TODO: smarter parsing that ignores URLs
+        return strings.ReplaceAll(text, "/"+uc.network.GetName(), "")
 }
 
@@ -1234 +1242 @@
                         }
 
+                        unmarshaledText := text
+                        if uc.isChannel(upstreamName) {
+                                unmarshaledText = dc.unmarshalText(uc, text)
+                        }
                         uc.SendMessage(&irc.Message{
                                 Command: "PRIVMSG",
-                                Params:  []string{upstreamName, text},
+                                Params:  []string{upstreamName, unmarshaledText},
                         })
 
@@ -1262 +1274 @@
                         }
 
+                        unmarshaledText := text
+                        if uc.isChannel(upstreamName) {
+                                unmarshaledText = dc.unmarshalText(uc, text)
+                        }
                         uc.SendMessage(&irc.Message{
                                 Command: "NOTICE",
-                                Params:  []string{upstreamName, text},
+                                Params:  []string{upstreamName, unmarshaledText},
                         })
                 }