Changeset 278 in code for trunk/upstream.go

Timestamp:

Apr 29, 2020, 5:45:37 PM (5 years ago)

Author:

contact

Message:

Add upstreamConn.caps

Instead of adding one field per capability, let's just have a map, just
like downstreamConn.

File:

• trunk/upstream.go (modified) (5 diffs)

trunk/upstream.go

@@ -48 +48 @@
         channels      map[string]*upstreamChannel
         supportedCaps map[string]string
+        caps          map[string]bool
         batches       map[string]batch
         away          bool
-
-        tagsSupported       bool
-        awayNotifySupported bool
-        labelsSupported     bool
-        nextLabelID         uint64
+        nextLabelID   uint64
 
         saslClient  sasl.Client
@@ -112 +109 @@
                 channels:                 make(map[string]*upstreamChannel),
                 supportedCaps:            make(map[string]string),
+                caps:                     make(map[string]bool),
                 batches:                  make(map[string]batch),
                 availableChannelTypes:    stdChannelTypes,
@@ -1283 +1281 @@
 
 func (uc *upstreamConn) handleCapAck(name string, ok bool) error {
+        uc.caps[name] = ok
+
         switch name {
         case "sasl":
@@ -1303 +1303 @@
                         Params:  []string{auth.Mechanism},
                 })
-        case "message-tags":
-                uc.tagsSupported = ok
-        case "labeled-response":
-                uc.labelsSupported = ok
-        case "away-notify":
-                uc.awayNotifySupported = ok
-        case "batch", "server-time":
+        case "message-tags", "labeled-response", "away-notify", "batch", "server-time":
                 // Nothing to do
         default:
@@ -1333 +1327 @@
 
 func (uc *upstreamConn) SendMessageLabeled(downstreamID uint64, msg *irc.Message) {
-        if uc.labelsSupported {
+        if uc.caps["labeled-response"] {
                 if msg.Tags == nil {
                         msg.Tags = make(map[string]irc.TagValue)