Partially fixed earlier in #467
This commit is contained in:
Shivaram Lingamneni 2019-05-29 14:24:23 -04:00
parent 6b51bd6f15
commit 521d5bf50f
2 changed files with 9 additions and 6 deletions

@ -476,7 +476,7 @@ To unset this mode:
### +s - Secret
If this mode is set, it means that your channel should be marked as 'secret'. Your channel won't show up in `/LIST` or `/WHOIS`.
If this mode is set, it means that your channel should be marked as 'secret'. Your channel won't show up in `/LIST` or `/WHOIS`, and non-members won't be able to see its members with `/NAMES` or `/WHO`.
To set this mode:

@ -1954,17 +1954,20 @@ func namesHandler(server *Server, client *Client, msg ircmsg.IrcMessage, rb *Res
// TODO: in a post-federation world, process `target` (server to forward request to)
if len(channels) == 0 {
for _, channel := range server.channels.Channels() {
channel.Names(client, rb)
}
rb.Add(nil, server.name, RPL_ENDOFNAMES, client.Nick(), "*", client.t("End of NAMES list"))
return false
}
for _, chname := range channels {
success := false
channel := server.channels.Get(chname)
if channel != nil {
channel.Names(client, rb)
} else if chname != "" {
if !channel.flags.HasMode(modes.Secret) || channel.hasClient(client) || client.HasMode(modes.Operator) {
channel.Names(client, rb)
success = true
}
}
if !success { // channel.Names() sends this numeric itself on success
rb.Add(nil, server.name, RPL_ENDOFNAMES, client.Nick(), chname, client.t("End of NAMES list"))
}
}