Merge pull request #1670 from slingamn/snomasks

fix #1669

irc/sno/utils.go

@@ -4,6 +4,7 @@
 package sno
 
 import (
+	"sort"
 	"strings"
 )
 
@@ -34,6 +35,10 @@ func (masks Masks) Contains(mask Mask) bool {
 	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:
 // 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`

irc/snomanager.go

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

irctest

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