Changes in root_commands.c [1f92a58:ba7d16f]

File:

• root_commands.c (modified) (25 diffs)

root_commands.c

@@ -32 +32 @@
 #include <string.h>
 
-void root_command_string( irc_t *irc, char *command )
+void root_command_string( irc_t *irc, user_t *u, char *command, int flags )
 {
         char *cmd[IRC_MAX_ARGS];
@@ -161 +161 @@
                 irc->status |= USTATUS_IDENTIFIED;
                 irc_umode_set( irc, "+R", 1 );
-                if( set_getbool( &irc->b->set, "auto_connect" ) )
+                if( set_getbool( &irc->set, "auto_connect" ) )
                         cmd_account( irc, account_on );
                 break;
@@ -201 +201 @@
         storage_status_t status;
         
-        status = storage_remove (irc->user->nick, cmd[1]);
+        status = storage_remove (irc->nick, cmd[1]);
         switch (status) {
         case STORAGE_NO_SUCH_USER:
@@ -213 +213 @@
                 irc->status &= ~USTATUS_IDENTIFIED;
                 irc_umode_set( irc, "-R", 1 );
-                irc_usermsg( irc, "Account `%s' removed", irc->user->nick );
+                irc_usermsg( irc, "Account `%s' removed", irc->nick );
                 break;
         default:
@@ -221 +221 @@
 }
 
-static void cmd_save( irc_t *irc, char **cmd )
-{
-        if( ( irc->status & USTATUS_IDENTIFIED ) == 0 )
-                irc_usermsg( irc, "Please create an account first" );
-        else if( storage_save( irc, NULL, TRUE ) == STORAGE_OK )
-                irc_usermsg( irc, "Configuration saved" );
-        else
-                irc_usermsg( irc, "Configuration could not be saved!" );
-}
-
 struct cmd_account_del_data
 {
@@ -242 +232 @@
         account_t *a;
         
-        for( a = cad->irc->b->accounts; a && a != cad->a; a = a->next );
+        for( a = cad->irc->accounts; a && a != cad->a; a = a->next );
         
         if( a == NULL )
@@ -254 +244 @@
         else
         {
-                account_del( cad->irc->b, a );
+                account_del( cad->irc, a );
                 irc_usermsg( cad->irc, "Account deleted" );
         }
@@ -295 +285 @@
                 set_name = set_full;
                 
-                head = &irc->b->set;
+                head = &irc->set;
         }
         else 
@@ -366 +356 @@
         account_t *a;
         
-        if( ( a = account_get( irc->b, id ) ) )
+        if( ( a = account_get( irc, id ) ) )
                 return &a->set;
         else
@@ -414 +404 @@
                 }
 
-                a = account_add( irc->b, prpl, cmd[3], cmd[4] );
+                a = account_add( irc, prpl, cmd[3], cmd[4] );
                 if( cmd[5] )
                 {
@@ -428 +418 @@
                 MIN_ARGS( 2 );
 
-                if( !( a = account_get( irc->b, cmd[2] ) ) )
+                if( !( a = account_get( irc, cmd[2] ) ) )
                 {
                         irc_usermsg( irc, "Invalid account" );
@@ -450 +440 @@
                                                "set' command. Are you sure you want to delete this "
                                                "account?", a->prpl->name, a->user );
-                        //query_add( irc, NULL, msg, cmd_account_del_yes, cmd_account_del_no, cad );
+                        query_add( irc, NULL, msg, cmd_account_del_yes, cmd_account_del_no, cad );
                         g_free( msg );
                 }
@@ -461 +451 @@
                         irc_usermsg( irc, "Account list:" );
                 
-                for( a = irc->b->accounts; a; a = a->next )
+                for( a = irc->accounts; a; a = a->next )
                 {
                         char *con;
@@ -484 +474 @@
                 if( cmd[2] )
                 {
-                        if( ( a = account_get( irc->b, cmd[2] ) ) )
+                        if( ( a = account_get( irc, cmd[2] ) ) )
                         {
                                 if( a->ic )
@@ -493 +483 @@
                                 else
                                 {
-                                        account_on( irc->b, a );
+                                        account_on( irc, a );
                                 }
                         }
@@ -504 +494 @@
                 else
                 {
-                        if ( irc->b->accounts )
-                        {
+                        if ( irc->accounts ) {
                                 irc_usermsg( irc, "Trying to get all accounts connected..." );
                         
-                                for( a = irc->b->accounts; a; a = a->next )
+                                for( a = irc->accounts; a; a = a->next )
                                         if( !a->ic && a->auto_connect )
-                                                account_on( irc->b, a );
+                                                account_on( irc, a );
                         } 
                         else
@@ -524 +513 @@
                         irc_usermsg( irc, "Deactivating all active (re)connections..." );
                         
-                        for( a = irc->b->accounts; a; a = a->next )
+                        for( a = irc->accounts; a; a = a->next )
                         {
                                 if( a->ic )
-                                        account_off( irc->b, a );
+                                        account_off( irc, a );
                                 else if( a->reconnect )
                                         cancel_auto_reconnect( a );
                         }
                 }
-                else if( ( a = account_get( irc->b, cmd[2] ) ) )
+                else if( ( a = account_get( irc, cmd[2] ) ) )
                 {
                         if( a->ic )
                         {
-                                account_off( irc->b, a );
+                                account_off( irc, a );
                         }
                         else if( a->reconnect )
@@ -567 +556 @@
 }
 
-#if 0
 static void cmd_add( irc_t *irc, char **cmd )
 {
@@ -656 +644 @@
         }
 }
-#endif
 
 static void cmd_rename( irc_t *irc, char **cmd )
 {
-        irc_user_t *iu;
-        
-        iu = irc_user_by_name( irc, cmd[1] );
-        
-        if( iu == NULL )
+        user_t *u;
+        
+        if( g_strcasecmp( cmd[1], irc->nick ) == 0 )
+        {
+                irc_usermsg( irc, "Nick `%s' can't be changed", cmd[1] );
+        }
+        else if( g_strcasecmp( cmd[1], irc->channel ) == 0 )
+        {
+                if( strchr( CTYPES, cmd[2][0] ) && nick_ok( cmd[2] + 1 ) )
+                {
+                        u = user_find( irc, irc->nick );
+                        
+                        irc_part( irc, u, irc->channel );
+                        g_free( irc->channel );
+                        irc->channel = g_strdup( cmd[2] );
+                        irc_join( irc, u, irc->channel );
+                        
+                        if( strcmp( cmd[0], "set_rename" ) != 0 )
+                                set_setstr( &irc->set, "control_channel", cmd[2] );
+                }
+        }
+        else if( user_find( irc, cmd[2] ) && ( nick_cmp( cmd[1], cmd[2] ) != 0 ) )
+        {
+                irc_usermsg( irc, "Nick `%s' already exists", cmd[2] );
+        }
+        else if( !nick_ok( cmd[2] ) )
+        {
+                irc_usermsg( irc, "Nick `%s' is invalid", cmd[2] );
+        }
+        else if( !( u = user_find( irc, cmd[1] ) ) )
         {
                 irc_usermsg( irc, "Nick `%s' does not exist", cmd[1] );
         }
-        else if( iu == irc->user )
-        {
-                irc_usermsg( irc, "Nick `%s' can't be changed", cmd[1] );
-        }
-        else if( !nick_ok( cmd[2] ) )
-        {
-                irc_usermsg( irc, "Nick `%s' is invalid", cmd[2] );
-        }
-        else if( irc_user_by_name( irc, cmd[2] ) )
-        {
-                irc_usermsg( irc, "Nick `%s' already exists", cmd[2] );
-        }
-        else
-        {
-                if( !irc_user_set_nick( iu, cmd[2] ) )
-                {
-                        irc_usermsg( irc, "Error while changing nick" );
-                        return;
-                }
-                
-                if( iu == irc->root )
-                {
+        else
+        {
+                user_rename( irc, cmd[1], cmd[2] );
+                irc_write( irc, ":%s!%s@%s NICK %s", cmd[1], u->user, u->host, cmd[2] );
+                if( g_strcasecmp( cmd[1], irc->mynick ) == 0 )
+                {
+                        g_free( irc->mynick );
+                        irc->mynick = g_strdup( cmd[2] );
+                        
                         /* If we're called internally (user did "set root_nick"),
                            let's not go O(INF). :-) */
                         if( strcmp( cmd[0], "set_rename" ) != 0 )
-                                set_setstr( &irc->b->set, "root_nick", cmd[2] );
-                }
-                else if( iu->bu )
-                {
-                        nick_set( iu->bu->ic->acc, iu->bu->handle, cmd[2] );
+                                set_setstr( &irc->set, "root_nick", cmd[2] );
+                }
+                else if( u->send_handler == buddy_send_handler )
+                {
+                        nick_set( u->ic->acc, u->handle, cmd[2] );
                 }
                 
@@ -704 +703 @@
 }
 
-#if 0
 char *set_eval_root_nick( set_t *set, char *new_nick )
 {
@@ -915 +913 @@
 {
         cmd_set_real( irc, cmd, NULL, NULL );
+}
+
+static void cmd_save( irc_t *irc, char **cmd )
+{
+        if( ( irc->status & USTATUS_IDENTIFIED ) == 0 )
+                irc_usermsg( irc, "Please create an account first" );
+        else if( storage_save( irc, NULL, TRUE ) == STORAGE_OK )
+                irc_usermsg( irc, "Configuration saved" );
+        else
+                irc_usermsg( irc, "Configuration could not be saved!" );
 }
 
@@ -982 +990 @@
 }
 
+static void cmd_nick( irc_t *irc, char **cmd ) 
+{
+        account_t *a;
+
+        if( !cmd[1] || !( a = account_get( irc, cmd[1] ) ) )
+        {
+                irc_usermsg( irc, "Invalid account");
+        }
+        else if( !( a->ic && ( a->ic->flags & OPT_LOGGED_IN ) ) )
+        {
+                irc_usermsg( irc, "That account is not on-line" );
+        }
+        else if ( !cmd[2] ) 
+        {
+                irc_usermsg( irc, "Your name is `%s'" , a->ic->displayname ? a->ic->displayname : "NULL" );
+        }
+        else if ( !a->prpl->set_my_name ) 
+        {
+                irc_usermsg( irc, "Command `%s' not supported by this protocol", cmd[0] );
+        }
+        else
+        {
+                irc_usermsg( irc, "Setting your name to `%s'", cmd[2] );
+                
+                a->prpl->set_my_name( a->ic, cmd[2] );
+        }
+}
+
 static void cmd_qlist( irc_t *irc, char **cmd )
 {
@@ -1000 +1036 @@
                 else
                         irc_usermsg( irc, "%d, BitlBee: %s", num, q->question );
+}
+
+static void cmd_join_chat( irc_t *irc, char **cmd )
+{
+        irc_usermsg( irc, "This command is now obsolete. "
+                          "Please try the `chat' command instead." );
 }
 
@@ -1175 +1217 @@
         }
 }
-#endif
 
 const command_t commands[] = {
         { "help",           0, cmd_help,           0 }, 
-        { "account",        1, cmd_account,        0 },
         { "identify",       1, cmd_identify,       0 },
         { "register",       1, cmd_register,       0 },
         { "drop",           1, cmd_drop,           0 },
-        { "save",           0, cmd_save,           0 },
-#if 0
+        { "account",        1, cmd_account,        0 },
         { "add",            2, cmd_add,            0 },
         { "info",           1, cmd_info,           0 },
-#endif
         { "rename",         2, cmd_rename,         0 },
-#if 0
         { "remove",         1, cmd_remove,         0 },
         { "block",          1, cmd_block,          0 },
         { "allow",          1, cmd_allow,          0 },
+        { "save",           0, cmd_save,           0 },
         { "set",            0, cmd_set,            0 },
         { "yes",            0, cmd_yesno,          0 },
@@ -1202 +1240 @@
         { "chat",           1, cmd_chat,           0 },
         { "transfer",       0, cmd_transfer,       0 },
-#endif
         { NULL }
 };