Changeset 559 in code for trunk

Timestamp:

Jun 14, 2021, 7:44:38 PM (4 years ago)

Author:

contact

Message:

Add support for account-tag

Location:

trunk

Files:

• downstream.go (modified) (3 diffs)
• upstream.go (modified) (3 diffs)

trunk/downstream.go

@@ -132 +132 @@
 // require support from all upstreams to be enabled
 var needAllDownstreamCaps = map[string]string{
+        "account-tag":   "",
         "away-notify":   "",
         "extended-join": "",
@@ -376 +377 @@
                         case "time":
                                 supported = dc.caps["server-time"]
+                        case "account":
+                                supported = dc.caps["account"]
                         }
                         if !supported {
@@ -1951 +1954 @@
                         echoTags := tags.Copy()
                         echoTags["time"] = irc.TagValue(time.Now().UTC().Format(serverTimeLayout))
+                        if uc.account != "" {
+                                echoTags["account"] = irc.TagValue(uc.account)
+                        }
                         echoMsg := &irc.Message{
                                 Tags: echoTags,

trunk/upstream.go

@@ -22 +22 @@
 // requested when supported.
 var permanentUpstreamCaps = map[string]bool{
+        "account-tag":      true,
         "away-notify":      true,
         "batch":            true,
@@ -95 +96 @@
         batches       map[string]batch
         away          bool
+        account       string
         nextLabelID   uint64
 
@@ -535 +537 @@
                 })
         case irc.RPL_LOGGEDIN:
-                var account string
-                if err := parseMessageParams(msg, nil, nil, &account); err != nil {
-                        return err
-                }
-                uc.logger.Printf("logged in with account %q", account)
+                if err := parseMessageParams(msg, nil, nil, &uc.account); err != nil {
+                        return err
+                }
+                uc.logger.Printf("logged in with account %q", uc.account)
         case irc.RPL_LOGGEDOUT:
+                uc.account = ""
                 uc.logger.Printf("logged out")
         case irc.ERR_NICKLOCKED, irc.RPL_SASLSUCCESS, irc.ERR_SASLFAIL, irc.ERR_SASLTOOLONG, irc.ERR_SASLABORTED: