Changeset 003a12b

Timestamp:

2010-04-14T13:35:41Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

4c3519a

Parents:

d7d677d

Message:

Restored all remaining IRC commands that make some sense to have at this
point.

Files:

• irc.h (modified) (1 diff)
• irc_commands.c (modified) (8 diffs)
• irc_im.c (modified) (2 diffs)
• irc_user.c (modified) (1 diff)

irc.h

@@ -210 +210 @@
 int irc_user_set_nick( irc_user_t *iu, const char *new );
 gint irc_user_cmp( gconstpointer a_, gconstpointer b_ );
+const char *irc_user_get_away( irc_user_t *iu );
 
 /* irc_util.c */

irc_commands.c

@@ -384 +384 @@
         irc_send_num( irc, 482, "%s :Invite impossible; User/Channel non-existent or incompatible", channel );
 }
+#endif
 
 static void irc_cmd_userhost( irc_t *irc, char **cmd )
 {
-        user_t *u;
         int i;
         
@@ -397 +397 @@
         
         for( i = 1; cmd[i]; i ++ )
-                if( ( u = user_find( irc, cmd[i] ) ) )
-                {
-                        if( u->online && u->away )
-                                irc_send_num( irc, 302, ":%s=-%s@%s", u->nick, u->user, u->host );
-                        else
-                                irc_send_num( irc, 302, ":%s=+%s@%s", u->nick, u->user, u->host );
-                }
+        {
+                irc_user_t *iu = irc_user_by_name( irc, cmd[i] );
+                
+                if( iu )
+                        irc_send_num( irc, 302, ":%s=%c%s@%s", iu->nick,
+                                      irc_user_get_away( iu ) ? '-' : '+',
+                                      iu->user, iu->host );
+        }
 }
 
 static void irc_cmd_ison( irc_t *irc, char **cmd )
 {
-        user_t *u;
         char buff[IRC_MAX_LINE];
         int lenleft, i;
@@ -424 +424 @@
                 while( *this )
                 {
+                        irc_user_t *iu;
+                        
                         if( ( next = strchr( this, ' ' ) ) )
                                 *next = 0;
                         
-                        if( ( u = user_find( irc, this ) ) && u->online )
-                        {
-                                lenleft -= strlen( u->nick ) + 1;
+                        if( ( iu = irc_user_by_name( irc, this ) ) &&
+                            iu->bu && iu->bu->flags & BEE_USER_ONLINE )
+                        {
+                                lenleft -= strlen( iu->nick ) + 1;
                                 
                                 if( lenleft < 0 )
                                         break;
                                 
-                                strcat( buff, u->nick );
+                                strcat( buff, iu->nick );
                                 strcat( buff, " " );
                         }
@@ -470 +473 @@
         {
                 char *nick;
-                user_t *u;
+                irc_user_t *iu;
                 
                 if( !cmd[i][0] || !cmd[i][1] )
@@ -478 +481 @@
                 nick_lc( nick );
                 
-                u = user_find( irc, nick );
+                iu = irc_user_by_name( irc, nick );
                 
                 if( cmd[i][0] == '+' )
@@ -485 +488 @@
                                 g_hash_table_insert( irc->watches, nick, nick );
                         
-                        if( u && u->online )
-                                irc_send_num( irc, 604, "%s %s %s %d :%s", u->nick, u->user, u->host, (int) time( NULL ), "is online" );
+                        if( iu && iu->bu && iu->bu->flags & BEE_USER_ONLINE )
+                                irc_send_num( irc, 604, "%s %s %s %d :%s", iu->nick, iu->user,
+                                              iu->host, (int) time( NULL ), "is online" );
                         else
-                                irc_send_num( irc, 605, "%s %s %s %d :%s", nick, "*", "*", (int) time( NULL ), "is offline" );
+                                irc_send_num( irc, 605, "%s %s %s %d :%s", nick, "*", "*",
+                                              (int) time( NULL ), "is offline" );
                 }
                 else if( cmd[i][0] == '-' )
@@ -505 +510 @@
 }
 
+#if 0
 static void irc_cmd_topic( irc_t *irc, char **cmd )
 {
@@ -610 +616 @@
         { "version",     0, irc_cmd_version,     IRC_CMD_LOGGED_IN },
         { "completions", 0, irc_cmd_completions, IRC_CMD_LOGGED_IN },
-        { "oper",        2, irc_cmd_oper,        IRC_CMD_LOGGED_IN },
+        { "userhost",    1, irc_cmd_userhost,    IRC_CMD_LOGGED_IN },
+        { "ison",        1, irc_cmd_ison,        IRC_CMD_LOGGED_IN },
+        { "watch",       1, irc_cmd_watch,       IRC_CMD_LOGGED_IN },
 #if 0
         { "invite",      2, irc_cmd_invite,      IRC_CMD_LOGGED_IN },
         { "notice",      1, irc_cmd_privmsg,     IRC_CMD_LOGGED_IN },
-        { "userhost",    1, irc_cmd_userhost,    IRC_CMD_LOGGED_IN },
-        { "ison",        1, irc_cmd_ison,        IRC_CMD_LOGGED_IN },
-        { "watch",       1, irc_cmd_watch,       IRC_CMD_LOGGED_IN },
         { "topic",       1, irc_cmd_topic,       IRC_CMD_LOGGED_IN },
 #endif
+        { "oper",        2, irc_cmd_oper,        IRC_CMD_LOGGED_IN },
         { "die",         0, NULL,                IRC_CMD_OPER_ONLY | IRC_CMD_TO_MASTER },
         { "deaf",        0, NULL,                IRC_CMD_OPER_ONLY | IRC_CMD_TO_MASTER },

irc_im.c

@@ -80 +80 @@
 {
         irc_t *irc = bee->ui_data;
+        irc_user_t *iu = bu->ui_data;
         irc_channel_t *ic = irc->channels->data; /* For now, just pick the first channel. */
         
@@ -85 +86 @@
         {
                 if( bu->flags & BEE_USER_ONLINE )
-                        irc_channel_add_user( ic, (irc_user_t*) bu->ui_data );
+                {
+                        if( g_hash_table_lookup( irc->watches, iu->key ) )
+                                irc_send_num( irc, 600, "%s %s %s %d :%s", iu->nick, iu->user,
+                                              iu->host, (int) time( NULL ), "logged online" );
+                        
+                        irc_channel_add_user( ic, iu );
+                }
                 else
-                        irc_channel_del_user( ic, (irc_user_t*) bu->ui_data );
+                {
+                        if( g_hash_table_lookup( irc->watches, iu->key ) )
+                                irc_send_num( irc, 601, "%s %s %s %d :%s", iu->nick, iu->user,
+                                              iu->host, (int) time( NULL ), "logged offline" );
+                        
+                        irc_channel_del_user( ic, iu );
+                }
         }
         

irc_user.c

@@ -133 +133 @@
 }
 
+const char *irc_user_get_away( irc_user_t *iu )
+{
+        irc_t *irc = iu->irc;
+        bee_user_t *bu = iu->bu;
+        
+        if( iu == irc->user )
+                return set_getstr( &irc->b->set, "away" );
+        else if( bu )
+        {
+                if( !bu->flags & BEE_USER_ONLINE )
+                        return "Offline";
+                else if( bu->flags & BEE_USER_AWAY )
+                        /* TODO: status msgs, etc. */
+                        return bu->status;
+        }
+        
+        return NULL;
+}
+
 /* User-type dependent functions, for root/NickServ: */
 static gboolean root_privmsg( irc_user_t *iu, const char *msg )