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

Merge pull request #1670 from slingamn/snomasks

Browse Source 
fix #1669
This commit is contained in:
Shivaram Lingamneni 2021-05-30 21:25:22 -04:00 committed by GitHub
commit b9a1cd618e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
irc/sno/utils.go
View File

@ -4,6 +4,7 @@
package sno package sno
import ( import (
"sort"
"strings" "strings"
) )
@ -34,6 +35,10 @@ func (masks Masks) Contains(mask Mask) bool {
return false return false
} }
func (masks Masks) Sort() {
sort.Slice(masks, func(i, j int) bool { return masks[i] < masks[j] })
}
// Evaluate changes to snomasks made with MODE. There are several cases: // Evaluate changes to snomasks made with MODE. There are several cases:
// adding snomasks with `/mode +s a` or `/mode +s +a`, removing them with `/mode +s -a`, // adding snomasks with `/mode +s a` or `/mode +s +a`, removing them with `/mode +s -a`,
// adding all with `/mode +s *` or `/mode +s +*`, removing all with `/mode +s -*` or `/mode -s` // adding all with `/mode +s *` or `/mode +s +*`, removing all with `/mode +s -*` or `/mode -s`

1
irc/snomanager.go
View File

@ -109,6 +109,7 @@ func (m *SnoManager) MasksEnabled(client *Client) (result sno.Masks) {
} }
} }
} }
result.Sort()
return return
} }

2
irctest

@ -1 +1 @@
Subproject commit 7be29ad801675380b6ec37c49d87bc688f3695a0 Subproject commit a7d74369297e4c2d19ede914b5524d0dafb27173