Fix /WHO on single nicks.

2 files changed, 10 insertions, 2 deletions

diff --git a/irc_commands.c b/irc_commands.c
index 4b1bc741..7874f519 100644
--- a/irc_commands.c
+++ b/irc_commands.c
@@ -301,11 +301,19 @@ static void irc_cmd_who( irc_t *irc, char **cmd )
 {
 	char *channel = cmd[1];
 	irc_channel_t *ic;
+	irc_user_t *iu;
 	
 	if( !channel || *channel == '0' || *channel == '*' || !*channel )
 		irc_send_who( irc, irc->users, "**" );
 	else if( ( ic = irc_channel_by_name( irc, channel ) ) )
 		irc_send_who( irc, ic->users, channel );
+	else if( ( iu = irc_user_by_name( irc, channel ) ) )
+	{
+		/* Tiny hack! */
+		GSList *l = g_slist_append( NULL, iu );
+		irc_send_who( irc, l, channel );
+		g_slist_free( l );
+	}
 	else
 		irc_send_num( irc, 403, "%s :No such channel", channel );
 }
diff --git a/irc_send.c b/irc_send.c
index 76b54dd1..fa4e6815 100644
--- a/irc_send.c
+++ b/irc_send.c
@@ -263,7 +263,7 @@ void irc_send_whois( irc_user_t *iu )
 
 void irc_send_who( irc_t *irc, GSList *l, const char *channel )
 {
-	gboolean is_channel = strcmp( channel, "**" ) != 0;
+	gboolean is_channel = strchr( CTYPES, channel[0] ) != NULL;
 	
 	while( l )
 	{
@@ -272,7 +272,7 @@ void irc_send_who( irc_t *irc, GSList *l, const char *channel )
 			iu = ((irc_channel_user_t*)iu)->iu;
 		/* TODO(wilmer): Restore away/channel information here */
 		irc_send_num( irc, 352, "%s %s %s %s %s %c :0 %s",
-		              channel ? : "*", iu->user, iu->host, irc->root->host,
+		              is_channel ? channel : "*", iu->user, iu->host, irc->root->host,
 		              iu->nick, iu->flags & IRC_USER_AWAY ? 'G' : 'H',
 		              iu->fullname );
 		l = l->next;