Changeset 293 in code for trunk/upstream.go

Timestamp:

May 21, 2020, 8:36:54 PM (5 years ago)

Author:

delthas

Message:

Fix parsing MODE messages by updating channel memberships

Previously, we only considered channel modes in the modes of a MODE
messages, which means channel membership changes were ignored. This
resulted in bugs where users channel memberships would not be properly
updated and cached with wrong values. Further, mode arguments
representing entities were not properly marshaled.

This adds support for correctly parsing and updating channel memberships
when processing MODE messages. Mode arguments corresponding to channel
memberships updates are now also properly marshaled.

MODE messages can't be easily sent from history because marshaling these
messages require knowing about the upstream available channel types and
channel membership types, which is currently only possible when
connected. For now this is not an issue since we do not send MODE
messages in history.

File:

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

trunk/upstream.go

@@ -818 +818 @@
                         }
 
-                        if ch.modes != nil {
-                                if err := ch.modes.Apply(uc.availableChannelModes, modeStr, msg.Params[2:]...); err != nil {
-                                        return err
+                        needMarshaling, err := applyChannelModes(ch, modeStr, msg.Params[2:])
+                        if err != nil {
+                                return err
+                        }
+
+                        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)
+                                        }
                                 }
-                        }
-
-                        uc.produce(ch.Name, msg, nil)
+
+                                dc.SendMessage(&irc.Message{
+                                        Prefix:  dc.marshalUserPrefix(uc.network, msg.Prefix),
+                                        Command: "MODE",
+                                        Params:  params,
+                                })
+                        })
                 }
         case irc.RPL_UMODEIS:
@@ -857 +874 @@
                 firstMode := ch.modes == nil
                 ch.modes = make(map[byte]string)
-                if err := ch.modes.Apply(uc.availableChannelModes, modeStr, msg.Params[3:]...); err != nil {
+                if _, err := applyChannelModes(ch, modeStr, msg.Params[3:]); err != nil {
                         return err
                 }