Changeset 601e813 for root_commands.c

Timestamp:

2006-05-24T23:04:18Z (18 years ago)

Author:

Jelmer Vernooij <jelmer@…>

Branches:

master

Children:

80c1e4d

Parents:

46ad029 (diff), fc630f9 (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) (11 diffs)

root_commands.c

@@ -57 +57 @@
                                 s --;
                         }
+                        else
+                        {
+                                break;
+                        }
+                }
+                else if( *s == '\\' && ( ( !q && s[1] ) || ( q && q == s[1] ) ) )
+                {
+                        char *cpy;
+                        
+                        for( cpy = s; *cpy; cpy ++ )
+                                cpy[0] = cpy[1];
                 }
                 else if( *s == q )
@@ -245 +256 @@
                 int i = 0;
                 
+                if( strchr( irc->umode, 'b' ) )
+                        irc_usermsg( irc, "Account list:" );
+                
                 for( a = irc->accounts; a; a = a->next )
                 {
@@ -347 +361 @@
 {
         account_t *a;
+        int add_for_real = 1;
+        
+        if( g_strcasecmp( cmd[1], "-tmp" ) == 0 )
+        {
+                add_for_real = 0;
+                cmd ++;         /* So evil... :-D */
+        }
         
         if( !( a = account_get( irc, cmd[1] ) ) )
@@ -376 +397 @@
                 }
         }
-        a->gc->prpl->add_buddy( a->gc, cmd[2] );
+        
+        /* By making this optional, you can talk to people without having to
+           add them to your *real* (server-side) contact list. */
+        if( add_for_real )
+                a->gc->prpl->add_buddy( a->gc, cmd[2] );
+                
         add_buddy( a->gc, NULL, cmd[2], cmd[2] );
         
@@ -484 +510 @@
         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.32s  %-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] );
@@ -512 +558 @@
         else
         {
-                gc->prpl->rem_permit( gc, cmd[2] );
-                gc->prpl->add_deny( gc, cmd[2] );
-                irc_usermsg( irc, "Buddy `%s' moved from your permit- to your deny-list", cmd[2] );
+                bim_rem_allow( gc, cmd[2] );
+                bim_add_block( gc, cmd[2] );
+                irc_usermsg( irc, "Buddy `%s' moved from your allow- to your block-list", cmd[2] );
         }
 }
@@ -523 +569 @@
         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.32s  %-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] );
@@ -551 +617 @@
         else
         {
-                gc->prpl->rem_deny( gc, cmd[2] );
-                gc->prpl->add_permit( gc, cmd[2] );
-                
-                irc_usermsg( irc, "Buddy `%s' moved from your deny- to your permit-list", cmd[2] );
+                bim_rem_block( gc, cmd[2] );
+                bim_add_allow( gc, cmd[2] );
+                
+                irc_usermsg( irc, "Buddy `%s' moved from your block- to your allow-list", cmd[2] );
         }
 }
@@ -635 +701 @@
         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 +716 @@
                 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 ++;
         }
@@ -697 +779 @@
         else
         {
-                char utf8[1024];
-                
                 irc_usermsg( irc, "Setting your name to `%s'", cmd[2] );
                 
-                if( g_strncasecmp( set_getstr( irc, "charset" ), "none", 4 ) != 0 &&
-                    do_iconv( set_getstr( irc, "charset" ), "UTF-8", cmd[2], utf8, 0, 1024 ) != -1 )
-                        a->gc->prpl->set_info( a->gc, utf8 );
-                else
-                        a->gc->prpl->set_info( a->gc, cmd[2] );
+                a->gc->prpl->set_info( a->gc, cmd[2] );
         }
 }