Changeset 228fc18

Timestamp:

2010-05-23T14:31:30Z (15 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

3d93aed

Parents:

186bd04

Message:

Allow nick changes. (Based on patch from zibri) This mostly closes #6!

File:

• irc_commands.c (modified) (1 diff)

irc_commands.c

@@ -73 +73 @@
 static void irc_cmd_nick( irc_t *irc, char **cmd )
 {
-        if( irc->nick )
-        {
-                irc_reply( irc, 438, ":The hand of the deity is upon thee, thy nick may not change" );
+        if( irc->status & USTATUS_IDENTIFIED && irc->nick )
+        {
+                irc_reply( irc, 438, "%s %s :You can only change your nick if you're not "
+                           "logged in (i.e. pre-identify)", irc->nick, cmd[1] );
         }
         /* This is not clean, but for now it'll have to be like this... */
-        else if( ( nick_cmp( cmd[1], irc->mynick ) == 0 ) || ( nick_cmp( cmd[1], NS_NICK ) == 0 ) )
-        {
-                irc_reply( irc, 433, ":This nick is already in use" );
+        else if( ( nick_cmp( cmd[1], irc->mynick ) == 0 ) || ( nick_cmp( cmd[1], NS_NICK ) == 0 ) || ( user_find( irc, cmd[1] ) != NULL ) )
+        {
+                irc_reply( irc, 433, "%s :This nick is already in use", cmd[1] );
         }
         else if( !nick_ok( cmd[1] ) )
         {
                 /* [SH] Invalid characters. */
-                irc_reply( irc, 432, ":This nick contains invalid characters" );
+                irc_reply( irc, 432, "%s :This nick contains invalid characters", cmd[1] );
+        }
+        else if(irc->nick) 
+        {
+                if( user_find( irc, irc->nick ) )
+                        user_rename(irc, irc->nick, cmd[1]);
+
+                irc_write( irc, ":%s!%s@%s NICK %s", irc->nick, irc->user, irc->host, cmd[1] );
+                g_free(irc->nick);
+                irc->nick = g_strdup( cmd[1] );
         }
         else