From a850602bccc5044e336efdec5254841d8c888ed5 Mon Sep 17 00:00:00 2001
From: Shivaram Lingamneni <slingamn@cs.stanford.edu>
Date: Wed, 5 Feb 2025 00:47:23 -0500
Subject: [PATCH] refactor 005 token generation

---
 irc/isupport/list.go      | 48 ++++++++++++++++++---------------------
 irc/isupport/list_test.go |  2 +-
 2 files changed, 23 insertions(+), 27 deletions(-)

diff --git a/irc/isupport/list.go b/irc/isupport/list.go
index 36b30d37..d54df127 100644
--- a/irc/isupport/list.go
+++ b/irc/isupport/list.go
@@ -5,7 +5,7 @@ package isupport
 
 import (
 	"fmt"
-	"sort"
+	"slices"
 	"strings"
 )
 
@@ -58,7 +58,7 @@ func getTokenString(name string, value string) string {
 
 // GetDifference returns the difference between two token lists.
 func (il *List) GetDifference(newil *List) [][]string {
-	var outTokens sort.StringSlice
+	var outTokens []string
 
 	// append removed tokens
 	for name := range il.Tokens {
@@ -84,7 +84,7 @@ func (il *List) GetDifference(newil *List) [][]string {
 		outTokens = append(outTokens, token)
 	}
 
-	sort.Sort(outTokens)
+	slices.Sort(outTokens)
 
 	// create output list
 	replies := make([][]string, 0)
@@ -117,38 +117,34 @@ func (il *List) GetDifference(newil *List) [][]string {
 
 // RegenerateCachedReply regenerates the cached RPL_ISUPPORT reply
 func (il *List) RegenerateCachedReply() (err error) {
-	il.CachedReply = make([][]string, 0)
-	var length int     // Length of the current cache
-	var cache []string // Token list cache
-
-	// make sure we get a sorted list of tokens, needed for tests and looks nice
-	var tokens sort.StringSlice
-	for name := range il.Tokens {
-		tokens = append(tokens, name)
-	}
-	sort.Sort(tokens)
-
-	for _, name := range tokens {
-		token := getTokenString(name, il.Tokens[name])
+	var tokens []string
+	for name, value := range il.Tokens {
+		token := getTokenString(name, value)
 		if token[0] == ':' || strings.Contains(token, " ") {
 			err = fmt.Errorf("bad isupport token (cannot contain spaces or start with :): %s", token)
 			continue
 		}
+		tokens = append(tokens, token)
+	}
+	// make sure we get a sorted list of tokens, needed for tests and looks nice
+	slices.Sort(tokens)
 
-		if len(token)+length <= maxLastArgLength {
-			// account for the space separating tokens
-			if len(cache) > 0 {
-				length++
-			}
-			cache = append(cache, token)
-			length += len(token)
-		}
+	var cache []string // Tokens in current line
+	var length int     // Length of the current line
 
-		if len(cache) == maxParameters || len(token)+length >= maxLastArgLength {
+	for _, token := range tokens {
+		// account for the space separating tokens
+		if len(cache) == maxParameters || (len(token)+1)+length > maxLastArgLength {
 			il.CachedReply = append(il.CachedReply, cache)
-			cache = make([]string, 0)
+			cache = nil
 			length = 0
 		}
+
+		if len(cache) > 0 {
+			length++
+		}
+		length += len(token)
+		cache = append(cache, token)
 	}
 
 	if len(cache) > 0 {
diff --git a/irc/isupport/list_test.go b/irc/isupport/list_test.go
index 47fb72ef..2041ea17 100644
--- a/irc/isupport/list_test.go
+++ b/irc/isupport/list_test.go
@@ -37,7 +37,7 @@ func TestISUPPORT(t *testing.T) {
 	}
 
 	if !reflect.DeepEqual(tListLong.CachedReply, longReplies) {
-		t.Errorf("Multiple output replies did not match, got [%v]", longReplies)
+		t.Errorf("Multiple output replies did not match, got [%v]", tListLong.CachedReply)
 	}
 
 	// create first list