rename -del

4 files changed, 32 insertions, 1 deletions

diff --git a/doc/user-guide/commands.xml b/doc/user-guide/commands.xml
index 2aa30546..b86328b5 100644
--- a/doc/user-guide/commands.xml
+++ b/doc/user-guide/commands.xml
@@ -1539,11 +1539,16 @@
 	<bitlbee-command name="rename">
 		<short-description>Rename (renick) a buddy</short-description>
 		<syntax>rename &lt;oldnick&gt; &lt;newnick&gt;</syntax>
+		<syntax>rename -del &lt;oldnick&gt;</syntax>
 
 		<description>
 			<para>
 				Renick a user in your buddy list. Very useful, in fact just very important, if you got a lot of people with stupid account names (or hard ICQ numbers).
 			</para>
+			
+			<para>
+				<emphasis>rename -del</emphasis> can be used to erase your manually set nickname for a contact and reset it to what was automatically generated.
+			</para>
 		</description>
 
 		<ircexample>
diff --git a/irc.h b/irc.h
index bae11a39..41d1ce3b 100644
--- a/irc.h
+++ b/irc.h
@@ -338,5 +338,6 @@ char *irc_format_timestamp( irc_t *irc, time_t msg_ts );
 
 /* irc_im.c */
 void bee_irc_channel_update( irc_t *irc, irc_channel_t *ic, irc_user_t *iu );
+void bee_irc_user_nick_reset( irc_user_t *iu );
 
 #endif
diff --git a/irc_im.c b/irc_im.c
index 40264b49..b0cd3bdf 100644
--- a/irc_im.c
+++ b/irc_im.c
@@ -362,6 +362,24 @@ static gboolean bee_irc_user_nick_update( irc_user_t *iu )
 	return TRUE;
 }
 
+void bee_irc_user_nick_reset( irc_user_t *iu )
+{
+	bee_user_t *bu = iu->bu;
+	bee_user_flags_t online;
+	
+	if( bu == FALSE )
+		return;
+	
+	/* In this case, pretend the user is offline. */
+	if( ( online = bu->flags & BEE_USER_ONLINE ) )
+		bu->flags &= ~BEE_USER_ONLINE;
+	
+	nick_del( bu );
+	bee_irc_user_nick_update( iu );
+	
+	bu->flags |= online;
+}
+
 /* IRC->IM calls */
 
 static gboolean bee_irc_user_privmsg_cb( gpointer data, gint fd, b_input_condition cond );
diff --git a/root_commands.c b/root_commands.c
index 207f9678..a7b626b8 100644
--- a/root_commands.c
+++ b/root_commands.c
@@ -773,13 +773,20 @@ static void cmd_info( irc_t *irc, char **cmd )
 static void cmd_rename( irc_t *irc, char **cmd )
 {
 	irc_user_t *iu, *old;
+	gboolean del = g_strcasecmp( cmd[1], "-del" ) == 0;
 	
-	iu = irc_user_by_name( irc, cmd[1] );
+	iu = irc_user_by_name( irc, cmd[del ? 2 : 1] );
 	
 	if( iu == NULL )
 	{
 		irc_usermsg( irc, "Nick `%s' does not exist", cmd[1] );
 	}
+	else if( del )
+	{
+		if( iu->bu )
+			bee_irc_user_nick_reset( iu );
+		irc_usermsg( irc, "Nickname reset to `%s'", iu->nick );
+	}
 	else if( iu == irc->user )
 	{
 		irc_usermsg( irc, "Use /nick to change your own nickname" );