Changeset 300 in code for trunk

Timestamp:

May 27, 2020, 9:45:13 PM (5 years ago)

Author:

delthas

Message:

Add support for upstream ban, invite, and exception lists

This does not try to marshal nicks in masks, for simplicity and
consistency with the current behaviour of marshaling MODE messages.

File:

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

trunk/upstream.go

@@ -1230 +1230 @@
                         })
                 })
+        case irc.RPL_BANLIST, irc.RPL_INVITELIST, irc.RPL_EXCEPTLIST:
+                var channel, mask string
+                if err := parseMessageParams(msg, nil, &channel, &mask); err != nil {
+                        return err
+                }
+                var addNick, addTime string
+                if len(msg.Params) >= 5 {
+                        addNick = msg.Params[3]
+                        addTime = msg.Params[4]
+                }
+
+                uc.forEachDownstreamByID(downstreamID, func(dc *downstreamConn) {
+                        channel := dc.marshalEntity(uc.network, channel)
+
+                        var params []string
+                        if addNick != "" && addTime != "" {
+                                addNick := dc.marshalEntity(uc.network, addNick)
+                                params = []string{dc.nick, channel, mask, addNick, addTime}
+                        } else {
+                                params = []string{dc.nick, channel, mask}
+                        }
+
+                        dc.SendMessage(&irc.Message{
+                                Prefix:  dc.srv.prefix(),
+                                Command: msg.Command,
+                                Params:  params,
+                        })
+                })
+        case irc.RPL_ENDOFBANLIST, irc.RPL_ENDOFINVITELIST, irc.RPL_ENDOFEXCEPTLIST:
+                var channel, trailing string
+                if err := parseMessageParams(msg, nil, &channel, &trailing); err != nil {
+                        return err
+                }
+
+                uc.forEachDownstreamByID(downstreamID, func(dc *downstreamConn) {
+                        upstreamChannel := dc.marshalEntity(uc.network, channel)
+                        dc.SendMessage(&irc.Message{
+                                Prefix:  dc.srv.prefix(),
+                                Command: msg.Command,
+                                Params:  []string{dc.nick, upstreamChannel, trailing},
+                        })
+                })
         case "TAGMSG":
                 // TODO: relay to downstream connections that accept message-tags