Changeset 310 in code for trunk/upstream.go

Timestamp:

Jun 3, 2020, 3:18:57 PM (5 years ago)

Author:

contact

Message:

Only send JOIN message if we have channels to join

Don't send a JOIN command to upstream server when no channels are configured.

File:

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

trunk/upstream.go

@@ -553 +553 @@
                 })
 
-                // TODO: split this into multiple messages if need be
-                var names, keys []string
-                for _, ch := range uc.network.channels {
-                        names = append(names, ch.Name)
-                        keys = append(keys, ch.Key)
-                }
-                uc.SendMessage(&irc.Message{
-                        Command: "JOIN",
-                        Params: []string{
-                                strings.Join(names, ","),
-                                strings.Join(keys, ","),
-                        },
-                })
+                if len(uc.network.channels) > 0 {
+                        // TODO: split this into multiple messages if need be
+                        var names, keys []string
+                        for _, ch := range uc.network.channels {
+                                names = append(names, ch.Name)
+                                keys = append(keys, ch.Key)
+                        }
+                        uc.SendMessage(&irc.Message{
+                                Command: "JOIN",
+                                Params: []string{
+                                        strings.Join(names, ","),
+                                        strings.Join(keys, ","),
+                                },
+                        })
+                }
         case irc.RPL_MYINFO:
                 if err := parseMessageParams(msg, nil, &uc.serverName, nil, &uc.availableUserModes, nil); err != nil {