Changeset 728a981 for root_commands.c

Timestamp:

2006-03-24T15:16:38Z (18 years ago)

Author:

Jelmer Vernooij <jelmer@…>

Branches:

master

Children:

f32d557

Parents:

96ace1b (diff), 9b8a38b (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

[merge] Wilmer

File:

• root_commands.c (modified) (4 diffs)

root_commands.c

@@ -484 +484 @@
         account_t *a;
         
-        if( !cmd[2] )
+        if( !cmd[2] && ( a = account_get( irc, cmd[1] ) ) && a->gc )
+        {
+                char *format;
+                GSList *l;
+                
+                if( strchr( irc->umode, 'b' ) != NULL )
+                        format = "%s\t%s";
+                else
+                        format = "%-32.32  %-16.16s";
+                
+                irc_usermsg( irc, format, "Handle", "Nickname" );
+                for( l = a->gc->deny; l; l = l->next )
+                {
+                        user_t *u = user_findhandle( a->gc, l->data );
+                        irc_usermsg( irc, format, l->data, u ? u->nick : "(none)" );
+                }
+                irc_usermsg( irc, "End of list." );
+                
+                return;
+        }
+        else if( !cmd[2] )
         {
                 user_t *u = user_find( irc, cmd[1] );
@@ -523 +543 @@
         account_t *a;
         
-        if( !cmd[2] )
+        if( !cmd[2] && ( a = account_get( irc, cmd[1] ) ) && a->gc )
+        {
+                char *format;
+                GSList *l;
+                
+                if( strchr( irc->umode, 'b' ) != NULL )
+                        format = "%s\t%s";
+                else
+                        format = "%-32.32  %-16.16s";
+                
+                irc_usermsg( irc, format, "Handle", "Nickname" );
+                for( l = a->gc->deny; l; l = l->next )
+                {
+                        user_t *u = user_findhandle( a->gc, l->data );
+                        irc_usermsg( irc, format, l->data, u ? u->nick : "(none)" );
+                }
+                irc_usermsg( irc, "End of list." );
+                
+                return;
+        }
+        else if( !cmd[2] )
         {
                 user_t *u = user_find( irc, cmd[1] );
@@ -635 +675 @@
         int online = 0, away = 0, offline = 0;
         user_t *u;
-        char s[64];
+        char s[256];
+        char *format;
         int n_online = 0, n_away = 0, n_offline = 0;
         
@@ -649 +690 @@
                 online =  away = 1;
         
-        irc_usermsg( irc, "%-16.16s  %-40.40s  %s", "Nick", "User/Host/Network", "Status" );
-        
-        if( online == 1 ) for( u = irc->users; u; u = u->next ) if( u->gc && u->online && !u->away )
-        {
-                g_snprintf( s, 63, "%s@%s (%s)", u->user, u->host, u->gc->user->prpl->name );
-                irc_usermsg( irc, "%-16.16s  %-40.40s  %s", u->nick, s, "Online" );
+        if( strchr( irc->umode, 'b' ) != NULL )
+                format = "%s\t%s\t%s";
+        else
+                format = "%-16.16s  %-40.40s  %s";
+        
+        irc_usermsg( irc, format, "Nick", "User/Host/Network", "Status" );
+        
+        for( u = irc->users; u; u = u->next ) if( u->gc && u->online && !u->away )
+        {
+                if( online == 1 )
+                {
+                        g_snprintf( s, sizeof( s ) - 1, "%s@%s (%s)", u->user, u->host, u->gc->user->prpl->name );
+                        irc_usermsg( irc, format, u->nick, s, "Online" );
+                }
+                
                 n_online ++;
         }
 
-        if( away == 1 ) for( u = irc->users; u; u = u->next ) if( u->gc && u->online && u->away )
-        {
-                g_snprintf( s, 63, "%s@%s (%s)", u->user, u->host, u->gc->user->prpl->name );
-                irc_usermsg( irc, "%-16.16s  %-40.40s  %s", u->nick, s, u->away );
+        for( u = irc->users; u; u = u->next ) if( u->gc && u->online && u->away )
+        {
+                if( away == 1 )
+                {
+                        g_snprintf( s, sizeof( s ) - 1, "%s@%s (%s)", u->user, u->host, u->gc->user->prpl->name );
+                        irc_usermsg( irc, format, u->nick, s, u->away );
+                }
                 n_away ++;
         }
         
-        if( offline == 1 ) for( u = irc->users; u; u = u->next ) if( u->gc && !u->online )
-        {
-                g_snprintf( s, 63, "%s@%s (%s)", u->user, u->host, u->gc->user->prpl->name );
-                irc_usermsg( irc, "%-16.16s  %-40.40s  %s", u->nick, s, "Offline" );
+        for( u = irc->users; u; u = u->next ) if( u->gc && !u->online )
+        {
+                if( offline == 1 )
+                {
+                        g_snprintf( s, sizeof( s ) - 1, "%s@%s (%s)", u->user, u->host, u->gc->user->prpl->name );
+                        irc_usermsg( irc, format, u->nick, s, "Offline" );
+                }
                 n_offline ++;
         }