Changeset 298 in code for trunk/downstream.go

Timestamp:

May 27, 2020, 9:43:46 PM (5 years ago)

Author:

delthas

Message:

Add support for downstream LIST to a single upstream

Sometimes, doing a LIST on a single upstream can be useful: if a user is
already connected to Rizon and freenode, sending a LIST will contain
tens of thousands of LIST replies that may not be useful if the user is
interested in another upstream.

This adds support for sending LIST */network, which follows the ELIST
M mask extension, that will only send LIST to that specific network. No
other masks are supported by this commit.

File:

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

trunk/downstream.go

@@ -1221 +1221 @@
                         pendingCommands: make(map[int64]*irc.Message),
                 }
+                var upstream *upstreamConn
                 var upstreamChannels map[int64][]string
                 if len(msg.Params) > 0 {
-                        upstreamChannels = make(map[int64][]string)
-                        channels := strings.Split(msg.Params[0], ",")
-                        for _, channel := range channels {
-                                uc, upstreamChannel, err := dc.unmarshalEntity(channel)
-                                if err != nil {
-                                        return err
+                        uc, upstreamMask, err := dc.unmarshalEntity(msg.Params[0])
+                        if err == nil && upstreamMask == "*" { // LIST */network: send LIST only to one network
+                                upstream = uc
+                        } else {
+                                upstreamChannels = make(map[int64][]string)
+                                channels := strings.Split(msg.Params[0], ",")
+                                for _, channel := range channels {
+                                        uc, upstreamChannel, err := dc.unmarshalEntity(channel)
+                                        if err != nil {
+                                                return err
+                                        }
+                                        upstreamChannels[uc.network.ID] = append(upstreamChannels[uc.network.ID], upstreamChannel)
                                 }
-                                upstreamChannels[uc.network.ID] = append(upstreamChannels[uc.network.ID], upstreamChannel)
                         }
                 }
@@ -1236 +1242 @@
                 dc.user.pendingLISTs = append(dc.user.pendingLISTs, pl)
                 dc.forEachUpstream(func(uc *upstreamConn) {
+                        if upstream != nil && upstream != uc {
+                                return
+                        }
                         var params []string
                         if upstreamChannels != nil {