Only send JOIN message if we have channels to join

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

git-svn-id: file:///srv/svn/repo/suika/trunk@310 f0ae65fe-ee39-954e-97ec-027ff2717ef4
This commit is contained in:
contact 2020-06-03 15:18:57 +00:00
parent 6d56da1757
commit cc7baf5863

View File

@ -552,19 +552,21 @@ func (uc *upstreamConn) handleMessage(msg *irc.Message) error {
dc.updateSupportedCaps()
})
// 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)
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, ","),
},
})
}
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 {
return err