Changeset 277 in code for trunk

Timestamp:

Apr 29, 2020, 5:40:31 PM (5 years ago)

Author:

contact

Message:

Rename upstreamConn.caps to supportedCaps

For consistency with downstreamConn.

File:

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

trunk/upstream.go

@@ -41 +41 @@
         availableMemberships  []membership
 
-        registered bool
-        nick       string
-        username   string
-        realname   string
-        modes      userModes
-        channels   map[string]*upstreamChannel
-        caps       map[string]string // available capabilities
-        batches    map[string]batch
-        away       bool
+        registered    bool
+        nick          string
+        username      string
+        realname      string
+        modes         userModes
+        channels      map[string]*upstreamChannel
+        supportedCaps map[string]string
+        batches       map[string]batch
+        away          bool
 
         tagsSupported       bool
@@ -111 +111 @@
                 user:                     network.user,
                 channels:                 make(map[string]*upstreamChannel),
-                caps:                     make(map[string]string),
+                supportedCaps:            make(map[string]string),
                 batches:                  make(map[string]batch),
                 availableChannelTypes:    stdChannelTypes,
@@ -311 +311 @@
                                         v = kv[1]
                                 }
-                                uc.caps[k] = v
+                                uc.supportedCaps[k] = v
                         }
 
@@ -320 +320 @@
                         requestCaps := make([]string, 0, 16)
                         for _, c := range []string{"message-tags", "batch", "labeled-response", "server-time", "away-notify"} {
-                                if _, ok := uc.caps[c]; ok {
+                                if _, ok := uc.supportedCaps[c]; ok {
                                         requestCaps = append(requestCaps, c)
                                 }
@@ -1261 +1261 @@
         }
 
-        v, ok := uc.caps["sasl"]
+        v, ok := uc.supportedCaps["sasl"]
         if !ok {
                 return false