GitHub/ergo
3
0
Fork 0
mirror of https://github.com/ergochat/ergo.git synced 2024-12-22 18:52:41 +01:00
Code Issues Projects Releases Wiki Activity

fix #514

Browse Source 
Also ensure that people can remove their own persistent modes via CS AMODE
This commit is contained in:
Shivaram Lingamneni 2019-05-23 18:33:41 -04:00
parent 678c8606b6
commit 0835ad6af5
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
irc/channel.go
View File

@ -395,7 +395,7 @@ func channelUserModeHasPrivsOver(clientMode modes.Mode, targetMode modes.Mode) b
return targetMode != modes.ChannelFounder && targetMode != modes.ChannelAdmin return targetMode != modes.ChannelFounder && targetMode != modes.ChannelAdmin
case modes.Halfop: case modes.Halfop:
// halfops cannot kick other halfops // halfops cannot kick other halfops
return targetMode != modes.ChannelFounder && targetMode != modes.ChannelAdmin && targetMode != modes.Halfop return targetMode == modes.Voice || targetMode == modes.Mode(0)
default: default:
// voice and unprivileged cannot kick anyone // voice and unprivileged cannot kick anyone
return false return false

3
irc/modes.go
View File

@ -277,6 +277,9 @@ func (channel *Channel) ProcessAccountToUmodeChange(client *Client, change modes
hasPrivs = true hasPrivs = true
} else if channelUserModeHasPrivsOver(clientMode, targetModeNow) && channelUserModeHasPrivsOver(clientMode, targetModeAfter) { } else if channelUserModeHasPrivsOver(clientMode, targetModeNow) && channelUserModeHasPrivsOver(clientMode, targetModeAfter) {
hasPrivs = true hasPrivs = true
} else if change.Op == modes.Remove && account == change.Arg {
// you can always de-op yourself
hasPrivs = true
} }
if !hasPrivs { if !hasPrivs {
return nil, errInsufficientPrivs return nil, errInsufficientPrivs