mirror
/
goirc
mirror of https://github.com/fluffle/goirc
1
0
Fork 0
Code Issues Releases Wiki Activity

Move capability sorting inside Slice() method

This commit is contained in:
Stefano 2022-03-16 12:27:39 +01:00
parent c2f4dcb7ed
commit e96dd34661
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
client/commands.go
View File

@ -2,7 +2,6 @@ package client
import ( import (
"fmt" "fmt"
"sort"
"strings" "strings"
) )
@ -317,9 +316,6 @@ func (conn *Conn) Cap(subcommmand string, capabilities ...string) {
if len(capabilities) == 0 { if len(capabilities) == 0 {
conn.Raw(CAP + " " + subcommmand) conn.Raw(CAP + " " + subcommmand)
} else { } else {
// make output predictable for testing
sort.Strings(capabilities)
cmdPrefix := CAP + " " + subcommmand + " :" cmdPrefix := CAP + " " + subcommmand + " :"
for _, args := range splitArgs(capabilities, defaultSplit-len(cmdPrefix)) { for _, args := range splitArgs(capabilities, defaultSplit-len(cmdPrefix)) {
conn.Raw(cmdPrefix + args) conn.Raw(cmdPrefix + args)

3
client/handlers.go
View File

@ -4,6 +4,7 @@ package client
// to manage tracking an irc connection etc. // to manage tracking an irc connection etc.
import ( import (
"sort"
"strings" "strings"
"sync" "sync"
"time" "time"
@ -147,6 +148,8 @@ func (c *capSet) Slice() []string {
capSlice = append(capSlice, cap) capSlice = append(capSlice, cap)
} }
// make output predictable for testing
sort.Strings(capSlice)
return capSlice return capSlice
} }