Changeset 723 in code for trunk

Timestamp:

Nov 21, 2021, 10:00:57 AM (4 years ago)

Author:

contact

Message:

Send RPL_LOGGEDIN with bouncer account in multi-upstream mode

File:

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

trunk/downstream.go

@@ -1039 +1039 @@
 
 func (dc *downstreamConn) updateAccount() {
-        uc := dc.upstream()
-        if uc == nil || uc.account == dc.account || !dc.caps["sasl"] {
+        var account string
+        if dc.network == nil {
+                account = dc.user.Username
+        } else if uc := dc.upstream(); uc != nil {
+                account = uc.account
+        } else {
                 return
         }
 
-        if uc.account != "" {
+        if dc.account == account || !dc.caps["sasl"] {
+                return
+        }
+
+        if account != "" {
                 dc.SendMessage(&irc.Message{
                         Prefix:  dc.srv.prefix(),
                         Command: irc.RPL_LOGGEDIN,
-                        Params:  []string{dc.nick, dc.prefix().String(), uc.account, "You are logged in as " + uc.account},
+                        Params:  []string{dc.nick, dc.prefix().String(), account, "You are logged in as " + account},
                 })
         } else {
@@ -1058 +1066 @@
         }
 
-        dc.account = uc.account
+        dc.account = account
 }