From ab444a398061aea07ea757e755b0c9ce7b7d5311 Mon Sep 17 00:00:00 2001
From: Shivaram Lingamneni <slingamn@cs.stanford.edu>
Date: Wed, 18 Dec 2019 07:01:26 -0500
Subject: [PATCH] remove unnecessary uses of Casefold

---
 irc/client.go   | 21 ++++++---------------
 irc/config.go   |  2 +-
 irc/handlers.go |  2 +-
 3 files changed, 8 insertions(+), 17 deletions(-)

diff --git a/irc/client.go b/irc/client.go
index e3ef9034..f23035cb 100644
--- a/irc/client.go
+++ b/irc/client.go
@@ -948,12 +948,7 @@ func (client *Client) updateNickMaskNoMutex() {
 		return // pre-registration, don't bother generating the hostname
 	}
 
-	cfhostname, err := Casefold(client.hostname)
-	if err != nil {
-		client.server.logger.Error("internal", "hostname couldn't be casefolded", client.hostname, err.Error())
-		cfhostname = client.hostname // YOLO
-	}
-
+	cfhostname := strings.ToLower(client.hostname)
 	client.nickMaskString = fmt.Sprintf("%s!%s@%s", client.nick, client.username, client.hostname)
 	client.nickMaskCasefolded = fmt.Sprintf("%s!%s@%s", client.nickCasefolded, strings.ToLower(client.username), cfhostname)
 }
@@ -970,18 +965,14 @@ func (client *Client) AllNickmasks() (masks []string) {
 	username = strings.ToLower(username)
 
 	if len(vhost) > 0 {
-		cfvhost, err := Casefold(vhost)
-		if err == nil {
-			masks = append(masks, fmt.Sprintf("%s!%s@%s", nick, username, cfvhost))
-		}
+		cfvhost := strings.ToLower(vhost)
+		masks = append(masks, fmt.Sprintf("%s!%s@%s", nick, username, cfvhost))
 	}
 
 	var rawhostmask string
-	cfrawhost, err := Casefold(rawHostname)
-	if err == nil {
-		rawhostmask = fmt.Sprintf("%s!%s@%s", nick, username, cfrawhost)
-		masks = append(masks, rawhostmask)
-	}
+	cfrawhost := strings.ToLower(rawHostname)
+	rawhostmask = fmt.Sprintf("%s!%s@%s", nick, username, cfrawhost)
+	masks = append(masks, rawhostmask)
 
 	if cloakedHostname != "" {
 		masks = append(masks, fmt.Sprintf("%s!%s@%s", nick, username, cloakedHostname))
diff --git a/irc/config.go b/irc/config.go
index 464bcb00..533c4582 100644
--- a/irc/config.go
+++ b/irc/config.go
@@ -783,7 +783,7 @@ func LoadConfig(filename string) (config *Config, err error) {
 	}
 
 	// casefold/validate server name
-	config.Server.nameCasefolded, err = Casefold(config.Server.Name)
+	config.Server.nameCasefolded = strings.ToLower(config.Server.Name)
 	if err != nil {
 		return nil, fmt.Errorf("Server name isn't valid [%s]: %s", config.Server.Name, err.Error())
 	}
diff --git a/irc/handlers.go b/irc/handlers.go
index dbcc5cb7..43c3273f 100644
--- a/irc/handlers.go
+++ b/irc/handlers.go
@@ -2675,7 +2675,7 @@ func whoHandler(server *Server, client *Client, msg ircmsg.IrcMessage, rb *Respo
 	} else if mask[0] == '#' {
 		mask, err = CasefoldChannel(msg.Params[0])
 	} else {
-		mask, err = Casefold(mask)
+		mask, err = CanonicalizeMaskWildcard(mask)
 	}
 
 	if err != nil {