Changeset 722 in code for trunk

Timestamp:

Nov 19, 2021, 6:21:48 PM (4 years ago)

Author:

contact

Message:

Use RPL_LOGGEDIN/OUT to mirror upstream status

This will allow clients to properly show/hide UI to login and
register.

Location:

trunk

Files:

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

trunk/downstream.go

@@ -259 +259 @@
         realname        string
         hostname        string
+        account         string   // RPL_LOGGEDIN/OUT state
         password        string   // empty after authentication
         network         *network // can be nil
@@ -760 +761 @@
                 } else if done {
                         dc.saslServer = nil
-                        dc.SendMessage(&irc.Message{
-                                Prefix:  dc.srv.prefix(),
-                                Command: irc.RPL_LOGGEDIN,
-                                Params:  []string{dc.nick, dc.prefix().String(), dc.user.Username, "You are now logged in"},
-                        })
+                        // Technically we should send RPL_LOGGEDIN here. However we use
+                        // RPL_LOGGEDIN to mirror the upstream connection status. Let's see
+                        // how many clients that breaks. See:
+                        // https://github.com/ircv3/ircv3-specifications/pull/476
                         dc.SendMessage(&irc.Message{
                                 Prefix:  dc.srv.prefix(),
@@ -1036 +1036 @@
                 dc.realname = uc.realname
         }
+}
+
+func (dc *downstreamConn) updateAccount() {
+        uc := dc.upstream()
+        if uc == nil || uc.account == dc.account || !dc.caps["sasl"] {
+                return
+        }
+
+        if uc.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},
+                })
+        } else {
+                dc.SendMessage(&irc.Message{
+                        Prefix:  dc.srv.prefix(),
+                        Command: irc.RPL_LOGGEDOUT,
+                        Params:  []string{dc.nick, dc.prefix().String(), "You are logged out"},
+                })
+        }
+
+        dc.account = uc.account
 }
 
@@ -1261 +1284 @@
         dc.updateNick()
         dc.updateRealname()
+        dc.updateAccount()
 
         if motd := dc.user.srv.Config().MOTD; motd != "" && dc.network == nil {

trunk/upstream.go

@@ -587 +587 @@
                 }
                 uc.logger.Printf("logged in with account %q", uc.account)
+                uc.forEachDownstream(func(dc *downstreamConn) {
+                        dc.updateAccount()
+                })
         case irc.RPL_LOGGEDOUT:
                 uc.account = ""
                 uc.logger.Printf("logged out")
+                uc.forEachDownstream(func(dc *downstreamConn) {
+                        dc.updateAccount()
+                })
         case irc.ERR_NICKLOCKED, irc.RPL_SASLSUCCESS, irc.ERR_SASLFAIL, irc.ERR_SASLTOOLONG, irc.ERR_SASLABORTED:
                 var info string

trunk/user.go

@@ -542 +542 @@
                                 dc.updateNick()
                                 dc.updateRealname()
+                                dc.updateAccount()
                         })
                         u.forEachDownstream(func(dc *downstreamConn) {