Changeset 2f53ada

Timestamp:

2010-03-27T15:16:16Z (15 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

280c56a

Parents:

b919363

Message:

/WHO

Files:

• irc.h (modified) (1 diff)
• irc_commands.c (modified) (4 diffs)
• irc_send.c (modified) (1 diff)

irc.h

@@ -170 +170 @@
 void irc_send_topic( irc_channel_t *ic, gboolean topic_change );
 void irc_send_whois( irc_user_t *iu );
+void irc_send_who( irc_t *irc, GSList *l, const char *channel );
 
 /* irc_user.c */

irc_commands.c

@@ -214 +214 @@
                         irc_send_num( irc, 502, ":Don't touch their modes" );
         }
+}
+
+static void irc_cmd_who( irc_t *irc, char **cmd )
+{
+        char *channel = cmd[1];
+        irc_channel_t *ic;
+        struct groupchat *c;
+        GList *l;
+        
+        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
+                irc_send_num( irc, 403, "%s :No such channel", channel );
 }
 
@@ -300 +315 @@
                 irc_send( irc, cmd[1], cmd[2], ( g_strcasecmp( cmd[0], "NOTICE" ) == 0 ) ? OPT_AWAY : 0 );
         }
-}
-
-static void irc_cmd_who( irc_t *irc, char **cmd )
-{
-        char *channel = cmd[1];
-        user_t *u = irc->users;
-        struct groupchat *c;
-        GList *l;
-        
-        if( !channel || *channel == '0' || *channel == '*' || !*channel )
-                while( u )
-                {
-                        irc_send_num( irc, 352, "%s %s %s %s %s %c :0 %s", u->online ? irc->channel : "*", u->user, u->host, irc->myhost, u->nick, u->online ? ( u->away ? 'G' : 'H' ) : 'G', u->realname );
-                        u = u->next;
-                }
-        else if( g_strcasecmp( channel, irc->channel ) == 0 )
-                while( u )
-                {
-                        if( u->online )
-                                irc_send_num( irc, 352, "%s %s %s %s %s %c :0 %s", channel, u->user, u->host, irc->myhost, u->nick, u->away ? 'G' : 'H', u->realname );
-                        u = u->next;
-                }
-        else if( ( c = irc_chat_by_channel( irc, channel ) ) )
-                for( l = c->in_room; l; l = l->next )
-                {
-                        if( ( u = user_findhandle( c->ic, l->data ) ) )
-                                irc_send_num( irc, 352, "%s %s %s %s %s %c :0 %s", channel, u->user, u->host, irc->myhost, u->nick, u->away ? 'G' : 'H', u->realname );
-                }
-        else if( ( u = user_find( irc, channel ) ) )
-                irc_send_num( irc, 352, "%s %s %s %s %s %c :0 %s", channel, u->user, u->host, irc->myhost, u->nick, u->online ? ( u->away ? 'G' : 'H' ) : 'G', u->realname );
-        
-        irc_send_num( irc, 315, "%s :End of /WHO list", channel?channel:"**" );
 }
 
@@ -571 +554 @@
         { "motd",        0, irc_cmd_motd,        IRC_CMD_LOGGED_IN },
         { "mode",        1, irc_cmd_mode,        IRC_CMD_LOGGED_IN },
+        { "who",         0, irc_cmd_who,         IRC_CMD_LOGGED_IN },
 #if 0
         { "oper",        2, irc_cmd_oper,        IRC_CMD_LOGGED_IN },
@@ -576 +560 @@
         { "privmsg",     1, irc_cmd_privmsg,     IRC_CMD_LOGGED_IN },
         { "notice",      1, irc_cmd_privmsg,     IRC_CMD_LOGGED_IN },
-        { "who",         0, irc_cmd_who,         IRC_CMD_LOGGED_IN },
         { "userhost",    1, irc_cmd_userhost,    IRC_CMD_LOGGED_IN },
         { "ison",        1, irc_cmd_ison,        IRC_CMD_LOGGED_IN },

irc_send.c

@@ -225 +225 @@
         irc_send_num( irc, 318, "%s :End of /WHOIS list", iu->nick );
 }
+
+void irc_send_who( irc_t *irc, GSList *l, const char *channel )
+{
+        while( l )
+        {
+                irc_user_t *iu = l->data;
+                /* TODO(wilmer): Restore away/channel information here */
+                irc_send_num( irc, 352, "%s %s %s %s %s %c :0 %s",
+                              "*", iu->user, iu->host, irc->root->host,
+                              iu->nick, 'H', iu->fullname );
+                l = l->next;
+        }
+        
+        irc_send_num( irc, 315, "%s :End of /WHO list", channel );
+}