Changeset 260 in code for trunk/downstream.go

Timestamp:

Apr 16, 2020, 3:19:00 PM (5 years ago)

Author:

contact

Message:

Make downstreamConn.marshal{Entity,UserPrefix} take a network

This will be used when sending history while upstream is disconnected.

File:

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

trunk/downstream.go

@@ -122 +122 @@
 }
 
+func isOurNick(net *network, nick string) bool {
+        // TODO: this doesn't account for nick changes
+        if net.conn != nil {
+                return nick == net.conn.nick
+        }
+        // We're not currently connected to the upstream connection, so we don't
+        // know whether this name is our nickname. Best-effort: use the network's
+        // configured nickname and hope it was the one being used when we were
+        // connected.
+        return nick == net.Nick
+}
+
 // marshalEntity converts an upstream entity name (ie. channel or nick) into a
 // downstream entity name.
@@ -127 +139 @@
 // This involves adding a "/<network>" suffix if the entity isn't the current
 // user.
-func (dc *downstreamConn) marshalEntity(uc *upstreamConn, name string) string {
+func (dc *downstreamConn) marshalEntity(net *network, name string) string {
         if dc.network != nil {
-                if dc.network != uc.network {
+                if dc.network != net {
                         panic("soju: tried to marshal an entity for another network")
                 }
                 return name
         }
-        if name == uc.nick {
+        if isOurNick(net, name) {
                 return dc.nick
         }
-        return name + "/" + uc.network.GetName()
-}
-
-func (dc *downstreamConn) marshalUserPrefix(uc *upstreamConn, prefix *irc.Prefix) *irc.Prefix {
-        if prefix.Name == uc.nick {
+        return name + "/" + net.GetName()
+}
+
+func (dc *downstreamConn) marshalUserPrefix(net *network, prefix *irc.Prefix) *irc.Prefix {
+        if isOurNick(net, prefix.Name) {
                 return dc.prefix()
         }
         if dc.network != nil {
-                if dc.network != uc.network {
+                if dc.network != net {
                         panic("soju: tried to marshal a user prefix for another network")
                 }
@@ -151 +163 @@
         }
         return &irc.Prefix{
-                Name: prefix.Name + "/" + uc.network.GetName(),
+                Name: prefix.Name + "/" + net.GetName(),
                 User: prefix.User,
                 Host: prefix.Host,
@@ -229 +241 @@
 func (dc *downstreamConn) marshalMessage(msg *irc.Message, uc *upstreamConn) *irc.Message {
         msg = msg.Copy()
-        msg.Prefix = dc.marshalUserPrefix(uc, msg.Prefix)
+        msg.Prefix = dc.marshalUserPrefix(uc.network, msg.Prefix)
 
         switch msg.Command {
         case "PRIVMSG", "NOTICE":
-                msg.Params[0] = dc.marshalEntity(uc, msg.Params[0])
+                msg.Params[0] = dc.marshalEntity(uc.network, msg.Params[0])
         case "NICK":
                 // Nick change for another user
-                msg.Params[0] = dc.marshalEntity(uc, msg.Params[0])
+                msg.Params[0] = dc.marshalEntity(uc.network, msg.Params[0])
         case "JOIN", "PART":
-                msg.Params[0] = dc.marshalEntity(uc, msg.Params[0])
+                msg.Params[0] = dc.marshalEntity(uc.network, msg.Params[0])
         case "KICK":
-                msg.Params[0] = dc.marshalEntity(uc, msg.Params[0])
-                msg.Params[1] = dc.marshalEntity(uc, msg.Params[1])
+                msg.Params[0] = dc.marshalEntity(uc.network, msg.Params[0])
+                msg.Params[1] = dc.marshalEntity(uc.network, msg.Params[1])
         case "TOPIC":
-                msg.Params[0] = dc.marshalEntity(uc, msg.Params[0])
+                msg.Params[0] = dc.marshalEntity(uc.network, msg.Params[0])
         case "MODE":
-                msg.Params[0] = dc.marshalEntity(uc, msg.Params[0])
+                msg.Params[0] = dc.marshalEntity(uc.network, msg.Params[0])
         case "QUIT":
                 // This space is intentinally left blank
@@ -663 +675 @@
                                         Prefix:  dc.prefix(),
                                         Command: "JOIN",
-                                        Params:  []string{dc.marshalEntity(ch.conn, ch.Name)},
+                                        Params:  []string{dc.marshalEntity(ch.conn.network, ch.Name)},
                                 })
 
@@ -714 +726 @@
                                 Prefix:  dc.srv.prefix(),
                                 Command: "BATCH",
-                                Params:  []string{"+" + batchRef, "chathistory", dc.marshalEntity(uc, target)},
+                                Params:  []string{"+" + batchRef, "chathistory", dc.marshalEntity(net, target)},
                         })
                 }