CEF/ergo
1
0
Fork 0
forked from External/ergo
Code Pull requests Activity

Fix whois channel handling

Browse source
This commit is contained in:
Daniel Oaks 2018-04-18 01:11:12 +10:00
parent 3a00b64830
commit 40d6cd02da
1 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

12
irc/server.go
View file

@ -629,14 +629,16 @@ func (server *Server) splitMessage(original string, origIs512 bool) SplitMessage
// WhoisChannelsNames returns the common channel names between two users.
func (client *Client) WhoisChannelsNames(target *Client) []string {
isMultiPrefix := target.capabilities.Has(caps.MultiPrefix)
isMultiPrefix := client.capabilities.Has(caps.MultiPrefix)
var chstrs []string
for _, channel := range client.Channels() {
for _, channel := range target.Channels() {
// channel is secret and the target can't see it
if !target.flags[modes.Operator] && channel.HasMode(modes.Secret) && !channel.hasClient(target) {
continue
if !client.flags[modes.Operator] {
if (target.HasMode(modes.Invisible) || channel.HasMode(modes.Secret)) && !channel.hasClient(client) {
continue
}
}
chstrs = append(chstrs, channel.ClientPrefixes(client, isMultiPrefix)+channel.name)
chstrs = append(chstrs, channel.ClientPrefixes(target, isMultiPrefix)+channel.name)
}
return chstrs
}