Ticket #672: blist-account-tag-olafurw.patch

bitlbee-3.0.5/root_commands.c

@@ -1065 +1065 @@
         cmd_set_real( irc, cmd, &irc->b->set, NULL );
 }
 
+// Sets the visibility variables based on the command given
+static void set_visibility( char *cmd, int *online, int *away, int *offline )
+{
+        if( g_strcasecmp( cmd, "all" ) == 0 )
+        {
+                *online = *offline = *away = 1;
+        }
+        else if( g_strcasecmp( cmd, "offline" ) == 0 )
+        {
+                *offline = 1;
+        }
+        else if( g_strcasecmp( cmd, "away" ) == 0 )
+        {
+                *away = 1;
+        }
+        else if( g_strcasecmp( cmd, "online" ) == 0 )
+        {
+                *online = 1;
+        }
+}
+
 static void cmd_blist( irc_t *irc, char **cmd )
 {
         int online = 0, away = 0, offline = 0;
         GSList *l;
         char s[256];
         char *format;
+        char *tag = 0;
         int n_online = 0, n_away = 0, n_offline = 0;
-        
-        if( cmd[1] && g_strcasecmp( cmd[1], "all" ) == 0 )
-                online = offline = away = 1;
-        else if( cmd[1] && g_strcasecmp( cmd[1], "offline" ) == 0 )
-                offline = 1;
-        else if( cmd[1] && g_strcasecmp( cmd[1], "away" ) == 0 )
-                away = 1;
-        else if( cmd[1] && g_strcasecmp( cmd[1], "online" ) == 0 )
-                online = 1;
+
+        // User is specifing an account tag and visibility
+        // > blist fb all
+        // > blist msn away
+        if( cmd[1] && cmd[2] )
+        {
+                tag = cmd[1];
+                set_visibility(cmd[2], &online, &away, &offline );
+        }
+        // User is either specifing only visibility
+        // > blist all
+        // > blist away
+        // Or only specifying account tag
+        // > blist fb
+        // > blist msn
+        else if( cmd[1] )
+        {
+                // Only visibility
+                if( g_strcasecmp( cmd[1], "all" ) == 0 ||
+                    g_strcasecmp( cmd[1], "offline" ) == 0 ||
+                    g_strcasecmp( cmd[1], "away" ) == 0 ||
+                    g_strcasecmp( cmd[1], "online" ) == 0 )
+                {
+                        set_visibility(cmd[1], &online, &away, &offline );
+                }
+                // Only tag
+                else
+                {
+                        tag = cmd[1];
+                        online = away = 1;
+                }
+        }
+        // User is not specifying anything
+        // > blist
         else
+        {
                 online = away = 1;
+        }
         
         if( strchr( irc->umode, 'b' ) != NULL )
                 format = "%s\t%s\t%s";
@@ -1104 +1153 @@
                     ( bu->flags & ( BEE_USER_ONLINE | BEE_USER_AWAY ) ) != BEE_USER_ONLINE )
                         continue;
                 
-                if( online == 1 )
+                if( ( online == 1 && !tag ) ||
+                    ( online == 1 && g_strcasecmp( tag, bu->ic->acc->tag ) == 0 ) )
                 {
                         char st[256] = "Online";
                         
@@ -1113 +1163 @@
                         
                         g_snprintf( s, sizeof( s ) - 1, "%s %s", bu->handle, bu->ic->acc->tag );
                         irc_rootmsg( irc, format, iu->nick, s, st );
+                        n_online ++;
                 }
-                
-                n_online ++;
         }
 
         for( l = irc->users; l; l = l->next )
@@ -1127 +1176 @@
                     !( bu->flags & BEE_USER_ONLINE ) || !( bu->flags & BEE_USER_AWAY ) )
                         continue;
                 
-                if( away == 1 )
+                if( ( away == 1 && !tag ) ||
+                    ( away == 1 && g_strcasecmp( tag, bu->ic->acc->tag ) == 0 ) )
                 {
                         g_snprintf( s, sizeof( s ) - 1, "%s %s", bu->handle, bu->ic->acc->tag );
                         irc_rootmsg( irc, format, iu->nick, s, irc_user_get_away( iu ) );
+                        n_away ++;
                 }
-                n_away ++;
         }
         
         for( l = irc->users; l; l = l->next )
@@ -1144 +1194 @@
                     bu->flags & BEE_USER_ONLINE )
                         continue;
                 
-                if( offline == 1 )
+                if( ( offline == 1 && !tag ) || 
+                    ( offline == 1 && g_strcasecmp( tag, bu->ic->acc->tag ) == 0 ) )
                 {
                         g_snprintf( s, sizeof( s ) - 1, "%s %s", bu->handle, bu->ic->acc->tag );
                         irc_rootmsg( irc, format, iu->nick, s, "Offline" );
+                        n_offline ++;
                 }
-                n_offline ++;
         }
         
         irc_rootmsg( irc, "%d buddies (%d available, %d away, %d offline)", n_online + n_away + n_offline, n_online, n_away, n_offline );