sad/soju
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add support for downstream LIST to a single upstream

Browse Source 
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.
This commit is contained in:
delthas 2020-05-08 20:27:21 +02:00 committed by Simon Ser
parent 2d47d7067f
commit a64e1d6761
No known key found for this signature in database
GPG Key ID: 0FDE7BE0E88F5E48
1 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
downstream.go
View File

@ -1220,8 +1220,13 @@ func (dc *downstreamConn) handleMessageRegistered(msg *irc.Message) error {
downstreamID: dc.id, downstreamID: dc.id,
pendingCommands: make(map[int64]*irc.Message), pendingCommands: make(map[int64]*irc.Message),
} }
var upstream *upstreamConn
var upstreamChannels map[int64][]string var upstreamChannels map[int64][]string
if len(msg.Params) > 0 { if len(msg.Params) > 0 {
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) upstreamChannels = make(map[int64][]string)
channels := strings.Split(msg.Params[0], ",") channels := strings.Split(msg.Params[0], ",")
for _, channel := range channels { for _, channel := range channels {
@ -1232,9 +1237,13 @@ func (dc *downstreamConn) handleMessageRegistered(msg *irc.Message) error {
upstreamChannels[uc.network.ID] = append(upstreamChannels[uc.network.ID], upstreamChannel) upstreamChannels[uc.network.ID] = append(upstreamChannels[uc.network.ID], upstreamChannel)
} }
} }
}
dc.user.pendingLISTs = append(dc.user.pendingLISTs, pl) dc.user.pendingLISTs = append(dc.user.pendingLISTs, pl)
dc.forEachUpstream(func(uc *upstreamConn) { dc.forEachUpstream(func(uc *upstreamConn) {
if upstream != nil && upstream != uc {
return
}
var params []string var params []string
if upstreamChannels != nil { if upstreamChannels != nil {
if channels, ok := upstreamChannels[uc.network.ID]; ok { if channels, ok := upstreamChannels[uc.network.ID]; ok {