Changeset 338 in code for trunk

Timestamp:

Jun 12, 2020, 12:43:45 PM (5 years ago)

Author:

delthas

Message:

Fix sending messages from detached channels

Currently, a downstream receives MODE, RPL_CHANNELMODEIS and
RPL_CREATIONTIME messages from soju for detached channels. It should not
be sent any of these messages.

This adds a detach check to the handling of these messages to avoid
receiving these messages.

File:

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

trunk/upstream.go

@@ -859 +859 @@
 
                         uc.appendLog(ch.Name, msg)
-                        uc.forEachDownstream(func(dc *downstreamConn) {
-                                params := make([]string, len(msg.Params))
-                                params[0] = dc.marshalEntity(uc.network, name)
-                                params[1] = modeStr
-
-                                copy(params[2:], msg.Params[2:])
-                                for i, modeParam := range params[2:] {
-                                        if _, ok := needMarshaling[i]; ok {
-                                                params[2+i] = dc.marshalEntity(uc.network, modeParam)
+
+                        if ch, ok := uc.network.channels[name]; !ok || !ch.Detached {
+                                uc.forEachDownstream(func(dc *downstreamConn) {
+                                        params := make([]string, len(msg.Params))
+                                        params[0] = dc.marshalEntity(uc.network, name)
+                                        params[1] = modeStr
+
+                                        copy(params[2:], msg.Params[2:])
+                                        for i, modeParam := range params[2:] {
+                                                if _, ok := needMarshaling[i]; ok {
+                                                        params[2+i] = dc.marshalEntity(uc.network, modeParam)
+                                                }
                                         }
-                                }
-
-                                dc.SendMessage(&irc.Message{
-                                        Prefix:  dc.marshalUserPrefix(uc.network, msg.Prefix),
-                                        Command: "MODE",
-                                        Params:  params,
+
+                                        dc.SendMessage(&irc.Message{
+                                                Prefix:  dc.marshalUserPrefix(uc.network, msg.Prefix),
+                                                Command: "MODE",
+                                                Params:  params,
+                                        })
                                 })
-                        })
+                        }
                 }
         case irc.RPL_UMODEIS:
@@ -913 +916 @@
                 }
                 if firstMode {
-                        modeStr, modeParams := ch.modes.Format()
-
-                        uc.forEachDownstream(func(dc *downstreamConn) {
-                                params := []string{dc.nick, dc.marshalEntity(uc.network, channel), modeStr}
-                                params = append(params, modeParams...)
-
-                                dc.SendMessage(&irc.Message{
-                                        Prefix:  dc.srv.prefix(),
-                                        Command: irc.RPL_CHANNELMODEIS,
-                                        Params:  params,
+                        if c, ok := uc.network.channels[channel]; !ok || !c.Detached {
+                                modeStr, modeParams := ch.modes.Format()
+
+                                uc.forEachDownstream(func(dc *downstreamConn) {
+                                        params := []string{dc.nick, dc.marshalEntity(uc.network, channel), modeStr}
+                                        params = append(params, modeParams...)
+
+                                        dc.SendMessage(&irc.Message{
+                                                Prefix:  dc.srv.prefix(),
+                                                Command: irc.RPL_CHANNELMODEIS,
+                                                Params:  params,
+                                        })
                                 })
-                        })
+                        }
                 }
         case rpl_creationtime:
@@ -1049 +1054 @@
                 ch.complete = true
 
-                uc.forEachDownstream(func(dc *downstreamConn) {
-                        forwardChannel(dc, ch)
-                })
+                if c, ok := uc.network.channels[name]; !ok || !c.Detached {
+                        uc.forEachDownstream(func(dc *downstreamConn) {
+                                forwardChannel(dc, ch)
+                        })
+                }
         case irc.RPL_WHOREPLY:
                 var channel, username, host, server, nick, mode, trailing string