Changeset 296 in code

Timestamp:

May 27, 2020, 9:42:38 PM (5 years ago)

Author:

delthas

Message:

Update downstream nicks in single-server mode and after NICK

Previously, the downstream nick was never changed, even when the
downstream sent a NICK message or was in single-server mode with a
different nick.

This adds support for updating the downstream nick in the following
cases:

• when a downstream sends NICK
• additionally, in single-server mode:
  • when a downstream connects and its single network is connected
  • when an upstream connects
  • when an upstream sends NICK

Location:

trunk

Files:

• downstream.go (modified) (3 diffs)
• upstream.go (modified) (1 diff)
• user.go (modified) (1 diff)

trunk/downstream.go

@@ -618 +618 @@
                         dc.unsetSupportedCap(cap)
                 }
+        }
+}
+
+func (dc *downstreamConn) updateNick() {
+        if uc := dc.upstream(); uc != nil && uc.nick != dc.nick {
+                dc.SendMessage(&irc.Message{
+                        Prefix:  dc.prefix(),
+                        Command: "NICK",
+                        Params:  []string{uc.nick},
+                })
+                dc.nick = uc.nick
         }
 }
@@ -778 +789 @@
         })
 
+        dc.updateNick()
+
         dc.forEachUpstream(func(uc *upstreamConn) {
                 for _, ch := range uc.channels {
@@ -936 +949 @@
                         uc.SendMessage(msg)
                 })
+
+                if dc.upstream() == nil && dc.nick != nick {
+                        dc.SendMessage(&irc.Message{
+                                Prefix:  dc.prefix(),
+                                Command: "NICK",
+                                Params:  []string{nick},
+                        })
+                        dc.nick = nick
+                }
         case "JOIN":
                 var namesStr string

trunk/upstream.go

@@ -657 +657 @@
                                 dc.SendMessage(dc.marshalMessage(msg, uc.network))
                         })
+                } else {
+                        uc.forEachDownstream(func(dc *downstreamConn) {
+                                dc.updateNick()
+                        })
                 }
         case "JOIN":

trunk/user.go

@@ -299 +299 @@
                                 dc.updateSupportedCaps()
                                 sendServiceNOTICE(dc, fmt.Sprintf("connected to %s", uc.network.GetName()))
+
+                                dc.updateNick()
                         })
                         uc.network.lastError = nil