Changeset 139 in code for trunk/downstream.go

Timestamp:

Mar 25, 2020, 8:40:08 AM (5 years ago)

Author:

delthas

Message:

Add MODE arguments support

• Add RPL_ISUPPORT support with CHANMODES, CHANTYPES, PREFIX parsing
• Add support for channel mode state with mode arguments
• Add upstream support for RPL_UMODEIS, RPL_CHANNELMODEIS
• Request channel MODE on upstream channel JOIN
• Use sane default channel mode and channel mode types

File:

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

trunk/downstream.go

@@ -852 +852 @@
                 }
 
-                uc, upstreamName, err := dc.unmarshalEntity(name)
-                if err != nil {
-                        return err
-                }
-
-                if uc.isChannel(upstreamName) {
-                        // TODO: handle MODE channel mode arguments
-                        if modeStr != "" {
-                                uc.SendMessage(&irc.Message{
-                                        Command: "MODE",
-                                        Params:  []string{upstreamName, modeStr},
-                                })
-                        } else {
-                                ch, ok := uc.channels[upstreamName]
-                                if !ok {
-                                        return ircError{&irc.Message{
-                                                Command: irc.ERR_NOSUCHCHANNEL,
-                                                Params:  []string{dc.nick, name, "No such channel"},
-                                        }}
-                                }
-
-                                dc.SendMessage(&irc.Message{
-                                        Prefix:  dc.srv.prefix(),
-                                        Command: irc.RPL_CHANNELMODEIS,
-                                        Params:  []string{dc.nick, name, string(ch.modes)},
-                                })
-                        }
-                } else {
-                        if name != dc.nick {
-                                return ircError{&irc.Message{
-                                        Command: irc.ERR_USERSDONTMATCH,
-                                        Params:  []string{dc.nick, "Cannot change mode for other users"},
-                                }}
-                        }
-
+                if name == dc.nick {
                         if modeStr != "" {
                                 dc.forEachUpstream(func(uc *upstreamConn) {
@@ -901 +867 @@
                                 })
                         }
+                        return nil
+                }
+
+                uc, upstreamName, err := dc.unmarshalEntity(name)
+                if err != nil {
+                        return err
+                }
+
+                if !uc.isChannel(upstreamName) {
+                        return ircError{&irc.Message{
+                                Command: irc.ERR_USERSDONTMATCH,
+                                Params:  []string{dc.nick, "Cannot change mode for other users"},
+                        }}
+                }
+
+                if modeStr != "" {
+                        params := []string{upstreamName, modeStr}
+                        params = append(params, msg.Params[2:]...)
+                        uc.SendMessage(&irc.Message{
+                                Command: "MODE",
+                                Params:  params,
+                        })
+                } else {
+                        ch, ok := uc.channels[upstreamName]
+                        if !ok {
+                                return ircError{&irc.Message{
+                                        Command: irc.ERR_NOSUCHCHANNEL,
+                                        Params:  []string{dc.nick, name, "No such channel"},
+                                }}
+                        }
+
+                        if ch.modes == nil {
+                                // we haven't received the initial RPL_CHANNELMODEIS yet
+                                // ignore the request, we will broadcast the modes later when we receive RPL_CHANNELMODEIS
+                                return nil
+                        }
+
+                        modeStr, modeParams := ch.modes.Format()
+                        params := []string{dc.nick, name, modeStr}
+                        params = append(params, modeParams...)
+
+                        dc.SendMessage(&irc.Message{
+                                Prefix:  dc.srv.prefix(),
+                                Command: irc.RPL_CHANNELMODEIS,
+                                Params:  params,
+                        })
                 }
         case "WHO":