From ac08ce0f2044899c396f6c4498922901072c2c63 Mon Sep 17 00:00:00 2001 From: Shivaram Lingamneni Date: Fri, 17 Aug 2018 16:22:01 -0400 Subject: [PATCH] move ChannelOperator check into hasPrivs helper --- irc/modes.go | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/irc/modes.go b/irc/modes.go index 0fee6d78..461f8d78 100644 --- a/irc/modes.go +++ b/irc/modes.go @@ -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 listFullWarned := make(map[modes.Mode]bool) - clientIsOp := channel.ClientIsAtLeast(client, modes.ChannelOperator) var alreadySentPrivError bool applied := make(modes.ModeChanges, 0) @@ -141,9 +140,9 @@ func (channel *Channel) ApplyChannelModeChanges(client *Client, isSamode bool, c return channel.ClientIsAtLeast(client, change.Mode) case modes.BanMask: // #163: allow unprivileged users to list ban masks - return clientIsOp || isListOp(change) + return isListOp(change) || channel.ClientIsAtLeast(client, modes.ChannelOperator) default: - return clientIsOp + return channel.ClientIsAtLeast(client, modes.ChannelOperator) } }