Changeset a72af0d

Timestamp:

2010-08-25T00:18:27Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

3cd4016

Parents:

bd599b9

Message:

Fix /WHO on single nicks.

Files:

• irc_commands.c (modified) (2 diffs)
• irc_send.c (modified) (2 diffs)

irc_commands.c

@@ -302 +302 @@
         char *channel = cmd[1];
         irc_channel_t *ic;
+        irc_user_t *iu;
         
         if( !channel || *channel == '0' || *channel == '*' || !*channel )
@@ -307 +308 @@
         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 );

irc_send.c

@@ -264 +264 @@
 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 )
@@ -273 +273 @@
                 /* 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 );