commit 6f6f42c

Hubert Hirtz  ·  2020-08-01 11:05:15 +0000 UTC
parent 26fb3be
Simplify color()
1 files changed,  +5, -4
+5, -4
 1@@ -257,9 +257,9 @@ func formatIRCMessage(nick, content string) (line string) {
 2 		content = strings.TrimSuffix(content[1:], "\x01")
 3 
 4 		if strings.HasPrefix(content, "ACTION") {
 5-			line = fmt.Sprintf("%s%s\x00%s", string(c[:]), nick, content[6:])
 6+			line = fmt.Sprintf("%s%s\x00%s", c, nick, content[6:])
 7 		} else {
 8-			line = fmt.Sprintf("\x1dCTCP request from\x1d %s%s\x00: %s", string(c[:]), nick, content)
 9+			line = fmt.Sprintf("\x1dCTCP request from\x1d %s%s\x00: %s", c, nick, content)
10 		}
11 
12 		return
13@@ -270,7 +270,7 @@ func formatIRCMessage(nick, content string) (line string) {
14 	return
15 }
16 
17-func color(nick string) (c [3]rune) {
18+func color(nick string) string {
19 	h := fnv.New32()
20 	_, _ = h.Write([]byte(nick))
21 
22@@ -283,9 +283,10 @@ func color(nick string) (c [3]rune) {
23 		sum++
24 	}
25 
26+	var c [3]rune
27 	c[0] = '\x03'
28 	c[1] = rune(sum/10) + '0'
29 	c[2] = rune(sum%10) + '0'
30 
31-	return
32+	return string(c[:])
33 }