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

fix #2002 (#2003)

Browse Source 
* fix #2002

`CS AMODE #channel +f nickname` is invalid, but was being accepted
incorrectly.

* simplify logic
This commit is contained in:
Shivaram Lingamneni 2022-11-06 11:41:29 -08:00 committed by GitHub
parent c3b3bf9941
commit e20c983b57
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
irc/chanserv.go
View File

@ -213,8 +213,17 @@ func csAmodeHandler(service *ircService, server *Server, client *Client, command
} }
modeChanges, unknown := modes.ParseChannelModeChanges(params[1:]...) modeChanges, unknown := modes.ParseChannelModeChanges(params[1:]...)
invalid := len(unknown) != 0
// #2002: +f takes an argument but is not a channel-user mode,
// check for anything valid as a channel mode change that is not valid
// as an AMODE change
for _, modeChange := range modeChanges {
if !utils.SliceContains(modes.ChannelUserModes, modeChange.Mode) {
invalid = true
}
}
var change modes.ModeChange var change modes.ModeChange
if len(modeChanges) > 1 || len(unknown) > 0 { if len(modeChanges) > 1 || invalid {
service.Notice(rb, client.t("Invalid mode change")) service.Notice(rb, client.t("Invalid mode change"))
return return
} else if len(modeChanges) == 1 { } else if len(modeChanges) == 1 {

9
irc/utils/types.go
View File

@ -34,3 +34,12 @@ func ReverseSlice[T any](results []T) {
results[i], results[j] = results[j], results[i] results[i], results[j] = results[j], results[i]
} }
} }
func SliceContains[T comparable](slice []T, elem T) (result bool) {
for _, t := range slice {
if elem == t {
return true
}
}
return false
}