Changeset eb50495

Timestamp:

2010-05-04T08:45:10Z (15 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

9438323

Parents:

9893da3

Message:

Show offline/away status better in /WHO and /WHOIS.

Files:

• irc.h (modified) (1 diff)
• irc_im.c (modified) (1 diff)
• irc_send.c (modified) (2 diffs)
• protocols/bee_user.c (modified) (1 diff)

irc.h

@@ -91 +91 @@
 {
         IRC_USER_PRIVATE = 1,
+        IRC_USER_AWAY = 2,
 } irc_user_flags_t;
 

irc_im.c

@@ -82 +82 @@
         irc_user_t *iu = bu->ui_data;
         irc_channel_t *ic = irc->channels->data; /* For now, just pick the first channel. */
+        
+        /* Do this outside the if below since away state can change without
+           the online state changing. */
+        iu->flags &= ~IRC_USER_AWAY;
+        if( bu->flags & BEE_USER_AWAY || !( bu->flags & BEE_USER_ONLINE ) )
+                iu->flags |= IRC_USER_AWAY;
         
         if( ( bu->flags & BEE_USER_ONLINE ) != ( old->flags & BEE_USER_ONLINE ) )

irc_send.c

@@ -231 +231 @@
                                 irc_send_num( irc, num, "%s :%s", iu->nick, bu->status ? : bu->status_msg );
                 }
+                else if( !( bu->flags & BEE_USER_ONLINE ) )
+                {
+                        irc_send_num( irc, 301, "%s :%s", iu->nick, "User is offline" );
+                }
         }
         else
@@ -252 +256 @@
                 irc_send_num( irc, 352, "%s %s %s %s %s %c :0 %s",
                               channel ? : "*", iu->user, iu->host, irc->root->host,
-                              iu->nick, 'H', iu->fullname );
+                              iu->nick, iu->flags & IRC_USER_AWAY ? 'G' : 'H',
+                              iu->fullname );
                 l = l->next;
         }

protocols/bee_user.c

@@ -42 +42 @@
         if( bee->ui->user_new )
                 bee->ui->user_new( bee, bu );
+        
+        /* Offline by default. This will set the right flags. */
+        imcb_buddy_status( ic, handle, 0, NULL, NULL );
         
         return bu;