Changeset 276 in code for trunk

Timestamp:

Apr 29, 2020, 5:34:44 PM (5 years ago)

Author:

contact

Message:

Add support for away-notify

This makes use of cap-notify to dynamically advertise support for
away-notify. away-notify is advertised to downstream connections if all
upstreams support it.

Location:

trunk

Files:

• downstream.go (modified) (4 diffs)
• upstream.go (modified) (7 diffs)
• user.go (modified) (3 diffs)

trunk/downstream.go

@@ -54 +54 @@
 // capabilities.
 var permanentDownstreamCaps = map[string]string{
-        "batch": "",
-        "cap-notify": "",
+        "batch":        "",
+        "cap-notify":   "",
         "echo-message": "",
         "message-tags": "",
-        "sasl": "PLAIN",
-        "server-time": "",
+        "sasl":         "PLAIN",
+        "server-time":  "",
 }
 
@@ -89 +89 @@
         logger := &prefixLogger{srv.Logger, fmt.Sprintf("downstream %q: ", netConn.RemoteAddr())}
         dc := &downstreamConn{
-                conn: *newConn(srv, netConn, logger),
-                id:   id,
+                conn:          *newConn(srv, netConn, logger),
+                id:            id,
                 supportedCaps: make(map[string]string),
-                caps: make(map[string]bool),
+                caps:          make(map[string]bool),
         }
         dc.hostname = netConn.RemoteAddr().String()
@@ -459 +459 @@
                 for k, v := range dc.supportedCaps {
                         if dc.capVersion >= 302 && v != "" {
-                                caps = append(caps, k + "=" + v)
+                                caps = append(caps, k+"="+v)
                         } else {
                                 caps = append(caps, k)
@@ -594 +594 @@
                 Params:  []string{replyTo, "DEL", name},
         })
+}
+
+func (dc *downstreamConn) updateSupportedCaps() {
+        awayNotifySupported := true
+        dc.forEachUpstream(func(uc *upstreamConn) {
+                awayNotifySupported = awayNotifySupported && uc.awayNotifySupported
+        })
+
+        if awayNotifySupported {
+                dc.setSupportedCap("away-notify", "")
+        } else {
+                dc.unsetSupportedCap("away-notify")
+        }
 }
 

trunk/upstream.go

@@ -47 +47 @@
         modes      userModes
         channels   map[string]*upstreamChannel
-        caps       map[string]string
+        caps       map[string]string // available capabilities
         batches    map[string]batch
         away       bool
 
-        tagsSupported   bool
-        labelsSupported bool
-        nextLabelID     uint64
+        tagsSupported       bool
+        awayNotifySupported bool
+        labelsSupported     bool
+        nextLabelID         uint64
 
         saslClient  sasl.Client
@@ -318 +319 @@
 
                         requestCaps := make([]string, 0, 16)
-                        for _, c := range []string{"message-tags", "batch", "labeled-response", "server-time"} {
+                        for _, c := range []string{"message-tags", "batch", "labeled-response", "server-time", "away-notify"} {
                                 if _, ok := uc.caps[c]; ok {
                                         requestCaps = append(requestCaps, c)
@@ -450 +451 @@
                 uc.registered = true
                 uc.logger.Printf("connection registered")
+
+                uc.forEachDownstream(func(dc *downstreamConn) {
+                        dc.updateSupportedCaps()
+                })
 
                 for _, ch := range uc.network.channels {
@@ -1149 +1154 @@
                         })
                 })
+        case "AWAY":
+                if msg.Prefix == nil {
+                        return fmt.Errorf("expected a prefix")
+                }
+
+                uc.forEachDownstream(func(dc *downstreamConn) {
+                        if !dc.caps["away-notify"] {
+                                return
+                        }
+                        dc.SendMessage(&irc.Message{
+                                Prefix:  dc.marshalUserPrefix(uc.network, msg.Prefix),
+                                Command: "AWAY",
+                                Params:  msg.Params,
+                        })
+                })
         case "TAGMSG":
                 // TODO: relay to downstream connections that accept message-tags
@@ -1263 +1283 @@
 
 func (uc *upstreamConn) handleCapAck(name string, ok bool) error {
-        auth := &uc.network.SASL
         switch name {
         case "sasl":
@@ -1271 +1290 @@
                 }
 
+                auth := &uc.network.SASL
                 switch auth.Mechanism {
                 case "PLAIN":
@@ -1287 +1307 @@
         case "labeled-response":
                 uc.labelsSupported = ok
+        case "away-notify":
+                uc.awayNotifySupported = ok
         case "batch", "server-time":
                 // Nothing to do

trunk/user.go

@@ -256 +256 @@
 
                         uc.forEachDownstream(func(dc *downstreamConn) {
+                                dc.updateSupportedCaps()
                                 sendServiceNOTICE(dc, fmt.Sprintf("connected to %s", uc.network.GetName()))
                         })
@@ -271 +272 @@
 
                         uc.endPendingLISTs(true)
+
+                        uc.forEachDownstream(func(dc *downstreamConn) {
+                                dc.updateSupportedCaps()
+                        })
 
                         if uc.network.lastError == nil {
@@ -315 +320 @@
                                 uc.updateAway()
                         })
+
+                        dc.updateSupportedCaps()
                 case eventDownstreamDisconnected:
                         dc := e.dc