Changeset 292 in code for trunk/downstream.go

Timestamp:

May 11, 2020, 10:25:49 AM (5 years ago)

Author:

delthas

Message:

Add support for multiple user channel memberships

User channel memberships are actually a set of memberships, not a single
value. This introduces memberships, a type representing a set of
memberships, stored as an array of memberships ordered by descending
rank.

This also adds multi-prefix to the permanent downstream and upstream
capabilities, so that we try to get all possible channel memberships.

File:

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

trunk/downstream.go

@@ -60 +60 @@
         "sasl":         "PLAIN",
         "server-time":  "",
+}
+
+// needAllDownstreamCaps is the list of downstream capabilities that
+// require support from all upstreams to be enabled
+var needAllDownstreamCaps = map[string]string{
+        "away-notify":  "",
+        "multi-prefix": "",
 }
 
@@ -597 +604 @@
 
 func (dc *downstreamConn) updateSupportedCaps() {
-        awayNotifySupported := true
+        supportedCaps := make(map[string]bool)
+        for cap := range needAllDownstreamCaps {
+                supportedCaps[cap] = true
+        }
         dc.forEachUpstream(func(uc *upstreamConn) {
-                awayNotifySupported = awayNotifySupported && uc.caps["away-notify"]
+                for cap, supported := range supportedCaps {
+                        supportedCaps[cap] = supported && uc.caps[cap]
+                }
         })
 
-        if awayNotifySupported {
-                dc.setSupportedCap("away-notify", "")
-        } else {
-                dc.unsetSupportedCap("away-notify")
+        for cap, supported := range supportedCaps {
+                if supported {
+                        dc.setSupportedCap(cap, needAllDownstreamCaps[cap])
+                } else {
+                        dc.unsetSupportedCap(cap)
+                }
         }
 }