Changeset 57c96f7

Timestamp:

2010-04-05T01:00:02Z (15 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

1f92a58

Parents:

0b5cc72

Message:

Restored the rename command.

Files:

• irc.h (modified) (1 diff)
• irc_channel.c (modified) (1 diff)
• irc_user.c (modified) (2 diffs)
• root_commands.c (modified) (3 diffs)

irc.h

@@ -205 +205 @@
 int irc_user_free( irc_t *irc, const char *nick );
 irc_user_t *irc_user_by_name( irc_t *irc, const char *nick );
-int irc_user_set_nick( irc_t *irc, const char *old, const char *new );
+int irc_user_set_nick( irc_user_t *iu, const char *new );
 gint irc_user_cmp( gconstpointer a_, gconstpointer b_ );
 

irc_channel.c

@@ -82 +82 @@
 int irc_channel_add_user( irc_channel_t *ic, irc_user_t *iu )
 {
-        if( !irc_channel_has_user( ic, iu ) )
+        if( irc_channel_has_user( ic, iu ) )
                 return 0;
         

irc_user.c

@@ -83 +83 @@
 }
 
-int irc_user_set_nick( irc_t *irc, const char *old, const char *new )
+int irc_user_set_nick( irc_user_t *iu, const char *new )
 {
-        irc_user_t *iu = irc_user_by_name( irc, old );
+        irc_t *irc = iu->irc;
         char key[strlen(new)+1];
         GSList *cl;
@@ -100 +100 @@
                    who's in the same channel like our user. */
                 if( iu == irc->user ||
-                    ( irc_channel_has_user( ic, irc->user ) &&
+                    ( ( ic->flags & IRC_CHANNEL_JOINED ) &&
                       irc_channel_has_user( ic, iu ) ) )
                 {

root_commands.c

@@ -648 +648 @@
         }
 }
+#endif
 
 static void cmd_rename( irc_t *irc, char **cmd )
 {
-        user_t *u;
-        
-        if( g_strcasecmp( cmd[1], irc->nick ) == 0 )
+        irc_user_t *iu;
+        
+        iu = irc_user_by_name( irc, cmd[1] );
+        
+        if( iu == NULL )
+        {
+                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( 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 ) )
+        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( !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
-        {
-                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] );
-                        
+        else
+        {
+                if( !irc_user_set_nick( iu, cmd[2] ) )
+                {
+                        irc_usermsg( irc, "Error while changing nick" );
+                        return;
+                }
+                
+                if( iu == irc->root )
+                {
                         /* 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->set, "root_nick", cmd[2] );
-                }
-                else if( u->send_handler == buddy_send_handler )
-                {
-                        nick_set( u->ic->acc, u->handle, cmd[2] );
+                                set_setstr( &irc->b->set, "root_nick", cmd[2] );
+                }
+                else if( iu->bu )
+                {
+                        nick_set( iu->bu->ic->acc, iu->bu->handle, cmd[2] );
                 }
                 
@@ -707 +696 @@
 }
 
+#if 0
 char *set_eval_root_nick( set_t *set, char *new_nick )
 {
@@ -1232 +1222 @@
         { "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 },