Changeset 69 in code for trunk/bridge.go

Timestamp:

Feb 19, 2020, 5:25:19 PM (5 years ago)

Author:

contact

Message:

Add functions to translate between upstream and downstream names

File:

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

trunk/bridge.go

@@ -10 +10 @@
         }
 
+        downstreamName := dc.marshalChannel(ch.conn, ch.Name)
+
         dc.SendMessage(&irc.Message{
                 Prefix:  dc.prefix(),
                 Command: "JOIN",
-                Params:  []string{ch.Name},
+                Params:  []string{downstreamName},
         })
 
@@ -20 +22 @@
                         Prefix:  dc.srv.prefix(),
                         Command: irc.RPL_TOPIC,
-                        Params:  []string{dc.nick, ch.Name, ch.Topic},
+                        Params:  []string{dc.nick, downstreamName, ch.Topic},
                 })
         } else {
@@ -26 +28 @@
                         Prefix:  dc.srv.prefix(),
                         Command: irc.RPL_NOTOPIC,
-                        Params:  []string{dc.nick, ch.Name, "No topic is set"},
+                        Params:  []string{dc.nick, downstreamName, "No topic is set"},
                 })
         }
@@ -34 +36 @@
         // TODO: send multiple members in each message
         for nick, membership := range ch.Members {
-                s := nick
+                s := dc.marshalNick(ch.conn, nick)
                 if membership != 0 {
-                        s = string(membership) + nick
+                        s = string(membership) + s
                 }
 
@@ -42 +44 @@
                         Prefix:  dc.srv.prefix(),
                         Command: irc.RPL_NAMREPLY,
-                        Params:  []string{dc.nick, string(ch.Status), ch.Name, s},
+                        Params:  []string{dc.nick, string(ch.Status), downstreamName, s},
                 })
         }
@@ -49 +51 @@
                 Prefix:  dc.srv.prefix(),
                 Command: irc.RPL_ENDOFNAMES,
-                Params:  []string{dc.nick, ch.Name, "End of /NAMES list"},
+                Params:  []string{dc.nick, downstreamName, "End of /NAMES list"},
         })
 }