1
0
Fork 0
forked from External/ergo

Merge pull request #1163 from slingamn/list_issue1161

fix #1161
This commit is contained in:
Shivaram Lingamneni 2020-06-30 17:43:48 -07:00 committed by GitHub
commit 79764cd549
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 16 additions and 22 deletions

View file

@ -1530,6 +1530,13 @@ func listHandler(server *Server, client *Client, msg ircmsg.IrcMessage, rb *Resp
}
}
nick := client.Nick()
rplList := func(channel *Channel) {
if members, name, topic := channel.listData(); members != 0 {
rb.Add(nil, client.server.name, RPL_LIST, nick, name, strconv.Itoa(members), topic)
}
}
clientIsOp := client.HasMode(modes.Operator)
if len(channels) == 0 {
for _, channel := range server.channels.Channels() {
@ -1537,7 +1544,7 @@ func listHandler(server *Server, client *Client, msg ircmsg.IrcMessage, rb *Resp
continue
}
if matcher.Matches(channel) {
client.RplList(channel, rb)
rplList(channel)
}
}
} else {
@ -1555,7 +1562,7 @@ func listHandler(server *Server, client *Client, msg ircmsg.IrcMessage, rb *Resp
continue
}
if matcher.Matches(channel) {
client.RplList(channel, rb)
rplList(channel)
}
}
}