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

move ChannelOperator check into hasPrivs helper

Browse source
This commit is contained in:
Shivaram Lingamneni 2018-08-17 16:22:01 -04:00
parent a18283e2de
commit ac08ce0f20
1 changed files with 2 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
irc/modes.go
View file

@ -108,7 +108,6 @@ func (channel *Channel) ApplyChannelModeChanges(client *Client, isSamode bool, c
// so we only output one warning for each list type when full // so we only output one warning for each list type when full
listFullWarned := make(map[modes.Mode]bool) listFullWarned := make(map[modes.Mode]bool)
clientIsOp := channel.ClientIsAtLeast(client, modes.ChannelOperator)
var alreadySentPrivError bool var alreadySentPrivError bool
applied := make(modes.ModeChanges, 0) applied := make(modes.ModeChanges, 0)
@ -141,9 +140,9 @@ func (channel *Channel) ApplyChannelModeChanges(client *Client, isSamode bool, c
return channel.ClientIsAtLeast(client, change.Mode) return channel.ClientIsAtLeast(client, change.Mode)
case modes.BanMask: case modes.BanMask:
// #163: allow unprivileged users to list ban masks // #163: allow unprivileged users to list ban masks
return clientIsOp || isListOp(change) return isListOp(change) || channel.ClientIsAtLeast(client, modes.ChannelOperator)
default: default:
return clientIsOp return channel.ClientIsAtLeast(client, modes.ChannelOperator)
} }
} }