Ticket #285: root_commands.c.diff

root_commands.c

@@ -779 +779 @@
 static void cmd_blist( irc_t *irc, char **cmd )
 {
         int online = 0, away = 0, offline = 0;
+        int bot = 0;
         user_t *u;
         char s[256];
         char *format;
@@ -795 +796 @@
         else
                 online =  away = 1;
         
-        if( strchr( irc->umode, 'b' ) != NULL )
+        if( strchr( irc->umode, 'b' ) != NULL ) {
                 format = "%s\t%s\t%s";
-        else
-                format = "%-16.16s  %-40.40s  %s";
+                bot = 1;
+                irc_usermsg( irc, format, "Nick", "User/Host/Network", "Status" );
+        } else {
+                format = "\003%c*\003 %-16.16s  %-40.40s %s";
+                irc_usermsg( irc, format, 7, "Nickname", "User/Host/Network", "Extra" );
+        }
         
-        irc_usermsg( irc, format, "Nick", "User/Host/Network", "Status" );
         
         for( u = irc->users; u; u = u->next ) if( u->ic && u->online && !u->away )
         {
                 if( online == 1 )
                 {
                         g_snprintf( s, sizeof( s ) - 1, "%s@%s (%s)", u->user, u->host, u->ic->acc->prpl->name );
-                        irc_usermsg( irc, format, u->nick, s, "Online" );
+                        if (bot)
+                                irc_usermsg( irc, format, u->nick, s, "Online" );
+                        else
+                                irc_usermsg( irc, format, '3', u->nick, s, "" );
                 }
                 
                 n_online ++;
@@ -818 +825 @@
                 if( away == 1 )
                 {
                         g_snprintf( s, sizeof( s ) - 1, "%s@%s (%s)", u->user, u->host, u->ic->acc->prpl->name );
-                        irc_usermsg( irc, format, u->nick, s, u->away );
+                        if (bot)
+                                irc_usermsg( irc, format, u->nick, s, u->away );
+                        else
+                                irc_usermsg( irc, format, '2', u->nick, s, u->away );
                 }
                 n_away ++;
         }
@@ -828 +838 @@
                 if( offline == 1 )
                 {
                         g_snprintf( s, sizeof( s ) - 1, "%s@%s (%s)", u->user, u->host, u->ic->acc->prpl->name );
-                        irc_usermsg( irc, format, u->nick, s, "Offline" );
+                        if (bot)
+                                irc_usermsg( irc, format, u->nick, s, "Offline" );
+                        else
+                                irc_usermsg( irc, format, '4', u->nick, s, "Offline" );
                 }
                 n_offline ++;
         }
@@ -931 +944 @@
         g_free( channel );
 }
 
+static void cmd_noop( irc_t *irc, char **cmd )
+{
+        /* This is just a function. Don't hurt it. */
+}
+
 const command_t commands[] = {
         { "help",           0, cmd_help,           0 }, 
         { "identify",       1, cmd_identify,       0 },
@@ -951 +969 @@
         { "nick",           1, cmd_nick,           0 },
         { "qlist",          0, cmd_qlist,          0 },
         { "join_chat",      2, cmd_join_chat,      0 },
+        { "noop",           0, cmd_noop,           0 },
         { NULL }
 };