Changeset 463 in code for trunk/downstream.go

Timestamp:

Mar 15, 2021, 10:41:37 PM (4 years ago)

Author:

contact

Message:

Passthrough some ISUPPORT tokens

File:

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

trunk/downstream.go

@@ -80 +80 @@
         "extended-join": "",
         "multi-prefix":  "",
+}
+
+// passthroughIsupport is the set of ISUPPORT tokens that are directly passed
+// through from the upstream server to downstream clients.
+//
+// This is only effective in single-upstream mode.
+var passthroughIsupport = map[string]bool{
+        "AWAYLEN":    true,
+        "CHANLIMIT":  true,
+        "CHANMODES":  true,
+        "CHANNELLEN": true,
+        "CHANTYPES":  true,
+        "EXCEPTS":    true,
+        "EXTBAN":     true,
+        "HOSTLEN":    true,
+        "INVEX":      true,
+        "KICKLEN":    true,
+        "MAXLIST":    true,
+        "MAXTARGETS": true,
+        "MODES":      true,
+        "NETWORK":    true,
+        "NICKLEN":    true,
+        "PREFIX":     true,
+        "SAFELIST":   true,
+        "TARGMAX":    true,
+        "TOPICLEN":   true,
+        "USERLEN":    true,
 }
 
@@ -881 +908 @@
         }
 
-        if uc := dc.upstream(); uc != nil && uc.isupport["NETWORK"] != nil {
-                isupport = append(isupport, fmt.Sprintf("NETWORK=%v", *uc.isupport["NETWORK"]))
+        if uc := dc.upstream(); uc != nil {
+                for k := range passthroughIsupport {
+                        v, ok := uc.isupport[k]
+                        if !ok {
+                                continue
+                        }
+                        if v != nil {
+                                isupport = append(isupport, fmt.Sprintf("%v=%v", k, *v))
+                        } else {
+                                isupport = append(isupport, k)
+                        }
+                }
         }
 
@@ -905 +942 @@
                 Params:  []string{dc.nick, dc.srv.Hostname, "soju", "aiwroO", "OovaimnqpsrtklbeI"},
         })
-        // TODO: other RPL_ISUPPORT tokens
-        dc.SendMessage(&irc.Message{
-                Prefix:  dc.srv.prefix(),
-                Command: irc.RPL_ISUPPORT,
-                Params:  append(append([]string{dc.nick}, isupport...), "are supported"),
-        })
+        for _, msg := range generateIsupport(dc.srv.prefix(), dc.nick, isupport) {
+                dc.SendMessage(msg)
+        }
         dc.SendMessage(&irc.Message{
                 Prefix:  dc.srv.prefix(),