Changeset 448 in code

Timestamp:

Jan 31, 2021, 9:18:51 PM (4 years ago)

Author:

hubert

Message:

Request invite-notify to upstreams

... and do not forward INVITEs to downstreams that do not support the
capability.

The downstream capability can be permanent because there is no way for a
client to get the list of people invited to a channel, thus no state can
be corrupted.

Location:

trunk

Files:

• downstream.go (modified) (1 diff)
• upstream.go (modified) (2 diffs)

trunk/downstream.go

@@ -65 +65 @@
 // capabilities.
 var permanentDownstreamCaps = map[string]string{
-        "batch":        "",
-        "cap-notify":   "",
-        "echo-message": "",
-        "message-tags": "",
-        "sasl":         "PLAIN",
-        "server-time":  "",
+        "batch":         "",
+        "cap-notify":    "",
+        "echo-message":  "",
+        "invite-notify": "",
+        "message-tags":  "",
+        "sasl":          "PLAIN",
+        "server-time":   "",
 }
 

trunk/upstream.go

@@ -28 +28 @@
         "batch":            true,
         "extended-join":    true,
+        "invite-notify":    true,
         "labeled-response": true,
         "message-tags":     true,
@@ -1280 +1281 @@
                 }
 
+                weAreInvited := nick == uc.nick
+
                 uc.forEachDownstream(func(dc *downstreamConn) {
+                        if !weAreInvited && !dc.caps["invite-notify"] {
+                                return
+                        }
                         dc.SendMessage(&irc.Message{
                                 Prefix:  dc.marshalUserPrefix(uc.network, msg.Prefix),