Changeset ac2717b for root_commands.c

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.

File:

• root_commands.c (modified) (4 diffs)

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;