Changeset 758 in code for trunk/downstream.go

Timestamp:

Dec 8, 2021, 5:23:46 PM (4 years ago)

Author:

contact

Message:

Don't forward duplicate JOIN commands

Closes: ​https://todo.sr.ht/~emersion/soju/171

File:

• trunk/downstream.go (modified) (1 diff)

trunk/downstream.go

@@ -1772 +1772 @@
                         }
 
-                        params := []string{upstreamName}
-                        if key != "" {
-                                params = append(params, key)
-                        }
-                        uc.SendMessageLabeled(ctx, dc.id, &irc.Message{
-                                Command: "JOIN",
-                                Params:  params,
-                        })
+                        // Most servers ignore duplicate JOIN messages. We ignore them here
+                        // because some clients automatically send JOIN messages in bulk
+                        // when reconnecting to the bouncer. We don't want to flood the
+                        // upstream connection with these.
+                        if !uc.channels.Has(upstreamName) {
+                                params := []string{upstreamName}
+                                if key != "" {
+                                        params = append(params, key)
+                                }
+                                uc.SendMessageLabeled(ctx, dc.id, &irc.Message{
+                                        Command: "JOIN",
+                                        Params:  params,
+                                })
+                        }
 
                         ch := uc.network.channels.Value(upstreamName)