Changeset ac2717b

Timestamp:

2010-08-14T10:55:20Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

136c2bb

Parents:

4ffd757

Message:

blist should only show contacts that are (or would be if they were online)
in the current channel.

Files:

• doc/user-guide/commands.xml (modified) (1 diff)
• irc.h (modified) (1 diff)
• irc_channel.c (modified) (1 diff)
• irc_im.c (modified) (3 diffs)
• root_commands.c (modified) (4 diffs)

doc/user-guide/commands.xml

@@ -1432 +1432 @@
         <bitlbee-command name="blist">
                 <syntax>blist [all|online|offline|away]</syntax>
-                <short-description>List all the buddies in your contact list</short-description>
-
-                <description>
-                        <para>
-                                You can get a better readable buddy list using the <emphasis>blist</emphasis> command. If you want a complete list (including the offline users) you can use the <emphasis>all</emphasis> argument.
+                <short-description>List all the buddies in the current channel</short-description>
+
+                <description>
+                        <para>
+                                You can get a more readable buddy list using the <emphasis>blist</emphasis> command. If you want a complete list (including the offline users) you can use the <emphasis>all</emphasis> argument.
                         </para>
                 </description>

irc.h

@@ -258 +258 @@
 void irc_channel_update_ops( irc_channel_t *ic, char *value );
 char *set_eval_irc_channel_ops( struct set *set, char *value );
+gboolean irc_channel_wants_user( irc_channel_t *ic, irc_user_t *iu );
 
 /* irc_commands.c */

irc_channel.c

@@ -726 +726 @@
 }
 
+/* Figure out if a channel is supposed to have the user, assuming s/he is
+   online or otherwise also selected by the show_users setting. Only works
+   for control channels, but does *not* check if this channel is of that
+   type. Beware! */
+gboolean irc_channel_wants_user( irc_channel_t *ic, irc_user_t *iu )
+{
+        struct irc_control_channel *icc = ic->data;
+        
+        if( iu->bu == NULL )
+                return FALSE;
+        
+        switch( icc->type )
+        {
+        case IRC_CC_TYPE_GROUP:
+                return iu->bu->group == icc->group;
+        case IRC_CC_TYPE_ACCOUNT:
+                return iu->bu->ic->acc == icc->account;
+        case IRC_CC_TYPE_PROTOCOL:
+                return iu->bu->ic->acc->prpl == icc->protocol;
+        case IRC_CC_TYPE_DEFAULT:
+        default:
+                return TRUE;
+        }
+}
+
 static gboolean control_channel_free( irc_channel_t *ic )
 {

irc_im.c

@@ -141 +141 @@
 void bee_irc_channel_update( irc_t *irc, irc_channel_t *ic, irc_user_t *iu )
 {
-        struct irc_control_channel *icc;
         GSList *l;
-        gboolean match = FALSE;
         
         if( ic == NULL )
@@ -168 +166 @@
         }
         
-        icc = ic->data;
-        
-        if( icc->type == IRC_CC_TYPE_DEFAULT )
-                match = TRUE;
-        else if( icc->type == IRC_CC_TYPE_GROUP )
-                match = iu->bu->group == icc->group;
-        else if( icc->type == IRC_CC_TYPE_ACCOUNT )
-                match = iu->bu->ic->acc == icc->account;
-        else if( icc->type == IRC_CC_TYPE_PROTOCOL )
-                match = iu->bu->ic->acc->prpl == icc->protocol;
-        
-        if( !match )
+        if( !irc_channel_wants_user( ic, iu ) )
         {
                 irc_channel_del_user( ic, iu, IRC_CDU_PART, NULL );
@@ -185 +172 @@
         else
         {
+                struct irc_control_channel *icc = ic->data;
                 int mode = 0;
                 

root_commands.c

@@ -1008 +1008 @@
         irc_usermsg( irc, format, "Nick", "Handle/Account", "Status" );
         
+        if( strcmp( set_getstr( &irc->root->last_channel->set, "type" ), "control" ) != 0 )
+                irc->root->last_channel = NULL;
+        
         for( l = irc->users; l; l = l->next )
         {
@@ -1013 +1016 @@
                 bee_user_t *bu = iu->bu;
                 
-                if( !bu || ( bu->flags & ( BEE_USER_ONLINE | BEE_USER_AWAY ) ) != BEE_USER_ONLINE )
+                if( !bu || ( irc->root->last_channel && !irc_channel_wants_user( irc->root->last_channel, iu ) ) ||
+                    ( bu->flags & ( BEE_USER_ONLINE | BEE_USER_AWAY ) ) != BEE_USER_ONLINE )
                         continue;
                 
@@ -1035 +1039 @@
                 bee_user_t *bu = iu->bu;
                 
-                if( !bu || !( bu->flags & BEE_USER_ONLINE ) || !( bu->flags & BEE_USER_AWAY ) )
+                if( !bu || ( irc->root->last_channel && !irc_channel_wants_user( irc->root->last_channel, iu ) ) ||
+                    !( bu->flags & BEE_USER_ONLINE ) || !( bu->flags & BEE_USER_AWAY ) )
                         continue;
                 
@@ -1051 +1056 @@
                 bee_user_t *bu = iu->bu;
                 
-                if( !bu || bu->flags & BEE_USER_ONLINE )
+                if( !bu || ( irc->root->last_channel && !irc_channel_wants_user( irc->root->last_channel, iu ) ) ||
+                    bu->flags & BEE_USER_ONLINE )
                         continue;