From 6223c9c8f8da33c27c07ee75d05bd17dacf401c0 Mon Sep 17 00:00:00 2001
From: Curtis McEnroe <june@causal.agency>
Date: Tue, 2 Jul 2019 21:41:52 -0400
Subject: Deal with ~users in colorGen

---
 color.c  | 5 +++--
 handle.c | 5 ++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/color.c b/color.c
index f713451..dad5647 100644
--- a/color.c
+++ b/color.c
@@ -29,8 +29,9 @@ static uint32_t hashChar(uint32_t hash, char ch) {
 enum IRCColor colorGen(const char *str) {
 	if (!str) return IRCDefault;
 	uint32_t hash = 0;
-	for (; str[0]; ++str) {
-		hash = hashChar(hash, str[0]);
+	if (*str == '~') str++;
+	for (; *str; ++str) {
+		hash = hashChar(hash, *str);
 	}
 	while (IRCBlack == (hash & IRCLightGray)) {
 		hash = hashChar(hash, '\0');
diff --git a/handle.c b/handle.c
index 4f9015c..e59960b 100644
--- a/handle.c
+++ b/handle.c
@@ -43,7 +43,7 @@ static void parse(
 		field = strsep(&prefix, "!");
 		if (nick) *nick = field;
 		field = strsep(&prefix, "@");
-		if (user) *user = (field && field[0] == '~' ? &field[1] : field);
+		if (user) *user = field;
 		if (host) *host = prefix;
 	}
 
@@ -164,7 +164,7 @@ static void handleReplyWhoisUser(char *prefix, char *params) {
 		prefix, NULL, NULL, NULL,
 		params, 6, 0, NULL, &nick, &user, &host, NULL, &real
 	);
-	whoisColor = colorGen(user[0] == '~' ? &user[1] : user);
+	whoisColor = colorGen(user);
 	uiFmt(
 		TagStatus, UIWarm,
 		"\3%d%s\3 is %s@%s, \"%s\"",
@@ -372,7 +372,6 @@ static void handleReplyWho(char *prefix, char *params) {
 		prefix, NULL, NULL, NULL,
 		params, 6, 0, NULL, &chan, &user, NULL, NULL, &nick
 	);
-	if (user[0] == '~') user = &user[1];
 	struct Tag tag = colorTag(tagFor(chan), chan);
 
 	tabAdd(tag, nick);
-- 
cgit 1.4.1

/option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/src/log/?id=8a58379ece89299bd831d92706da67499eb01225&amp;follow=1'>root</a>/<a href='/src/log/bin?id=8a58379ece89299bd831d92706da67499eb01225&amp;follow=1'>bin</a>/<a href='/src/log/bin/pbd.c?id=8a58379ece89299bd831d92706da67499eb01225&amp;follow=1'>pbd.c</a> (<a href='/src/log/bin/pbd.c?id=8a58379ece89299bd831d92706da67499eb01225'>unfollow</a>)</div><div class='content'><table class='list nowrap'><tr class='nohover'><th></th><th class='left'>Commit message (<a href='/src/log/bin/pbd.c?id=8a58379ece89299bd831d92706da67499eb01225&amp;showmsg=1&amp;follow=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2018-07-23 20:11:48 -0400'>2018-07-23</span></td><td><a href='/src/commit/install.sh?id=bfa0dc4c15f1d0f49bf087e292705f4840bae33d&amp;follow=1'>Remove nasm from install</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2018-07-23 20:09:10 -0400'>2018-07-23</span></td><td><a href='/src/commit/home/.ssh/config?id=e2dde3dbc37ee1ea47c0a630a74f6bb90ae7e7d3&amp;follow=1'>Add monday.local to ssh</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2018-07-23 16:24:45 -0400'>2018-07-23</span></td><td><a href='/src/commit/bin/Makefile?id=20dbebf02a2684b2f8d4acef8999d7238e1df6a8&amp;follow=1'>Restore LDLIBS alphabetical order</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2018-07-23 16:13:03 -0400'>2018-07-23</span></td><td><a href='/src/commit/bin/watch.c?id=df97ddc9338bef46b27732ac0d4550550b76d578&amp;follow=1'>Use EV_SET in watch</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2018-07-23 16:03:52 -0400'>2018-07-23</span></td><td><a href='/src/commit/bin/Makefile?id=03dabaf236130eb13a91d57dd59ff960e5d99abb&amp;follow=1'>Link with -lcurses</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2018-07-22 18:28:00 -0400'>2018-07-22</span></td><td><a href='/src/commit/bin/scheme.c?id=93cee413e4f07d327ab358f6914dc91ec069ea65&amp;follow=1'>Fix scheme indentation</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2018-07-16 14:14:52 -0400'>2018-07-16</span></td><td><a href='/src/commit/bin/glitch.c?id=3bdbfdc1c86bdb72ce4ee33160abedd7cc128ce2&amp;follow=1'>Add -m option to glitch</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2018-07-16 13:21:56 -0400'>2018-07-16</span></td><td><a href='/src/commit/bin/glitch.c?id=976add5cee793994dbab991a0ea147cbd13a6044&amp;follow=1'>malloc deflate buffer in glitch</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2018-07-16 13:17:07 -0400'>2018-07-16</span></td><td><a href='/src/commit/bin/pngo.c?id=381572e41c52eb3ac9419858d102bec5fc648dc5&amp;follow=1'>malloc the deflate buffer in pngo</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2018-07-05 18:34:09 -0400'>2018-07-05</span></td><td><a href='/src/commit/txt/music.md?id=b70fbb4c2d6d497d776bab859a772205d0b255bf&amp;follow=1'>Add shed blood</a></td><td>June McEnroe