Changeset b556e46

Timestamp:

2010-07-09T23:25:07Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

f3b6764

Parents:

c5bff81 (diff), 9a9b520 (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:

Merging main ui-fix.

Files:

• bitlbee.c (modified) (1 diff)
• doc/user-guide/commands.xml (modified) (1 diff)
• irc_commands.c (modified) (2 diffs)
• irc_im.c (modified) (5 diffs)
• irc_user.c (modified) (1 diff)
• protocols/bee.h (modified) (1 diff)
• protocols/bee_user.c (modified) (1 diff)
• protocols/nogaim.c (modified) (1 diff)
• root_commands.c (modified) (2 diffs)

bitlbee.c

@@ -372 +372 @@
         /* Try to save data for all active connections (if desired). */
         while( irc_connection_list != NULL )
-                irc_free( irc_connection_list->data );
+                irc_abort( irc_connection_list->data, FALSE,
+                           "BitlBee server shutting down" );
         
         /* We'll only reach this point when not running in inetd mode: */

doc/user-guide/commands.xml

@@ -1093 +1093 @@
         </bitlbee-setting>
 
+        <bitlbee-setting name="translate_to_nicks" type="boolean" scope="channel">
+                <default>true</default>
+
+                <description>
+                        <para>
+                                IRC's nickname namespace is quite limited compared to most IM protocols. Not any non-ASCII characters are allowed, in fact nicknames have to be mostly alpha-numeric. Also, BitlBee has to add underscores sometimes to avoid nickname collisions.
+                        </para>
+
+                        <para>
+                                While normally the BitlBee user is the only one seeing these names, they may be exposed to other chatroom participants for example when addressing someone in the channel (with or without tab completion). By default BitlBee will translate these stripped nicknames back to the original nick. If you don't want this, disable this setting.
+                        </para>
+                </description>
+        </bitlbee-setting>
+
         <bitlbee-setting name="type" type="string" scope="channel">
                 <default>control</default>

irc_commands.c

@@ -72 +72 @@
 static void irc_cmd_nick( irc_t *irc, char **cmd )
 {
-        if( irc_user_by_name( irc, cmd[1] ) )
-        {
-                irc_send_num( irc, 433, ":This nick is already in use" );
+        irc_user_t *iu;
+        
+        if( ( iu = irc_user_by_name( irc, cmd[1] ) ) && iu != irc->user )
+        {
+                irc_send_num( irc, 433, "%s :This nick is already in use", cmd[1] );
         }
         else if( !nick_ok( cmd[1] ) )
         {
                 /* [SH] Invalid characters. */
-                irc_send_num( irc, 432, ":This nick contains invalid characters" );
-        }
-        else if( irc->user->nick )
+                irc_send_num( irc, 432, "%s :This nick contains invalid characters", cmd[1] );
+        }
+        else if( irc->status & USTATUS_LOGGED_IN )
         {
                 if( irc->status & USTATUS_IDENTIFIED )
@@ -98 +100 @@
         else
         {
+                g_free( irc->user->nick );
                 irc->user->nick = g_strdup( cmd[1] );
                 

irc_im.c

@@ -603 +603 @@
 {
         struct groupchat *c = ic->data;
+        char *trans = NULL, *s;
         
         if( c == NULL )
                 return FALSE;
-        else if( set_getbool( &ic->irc->b->set, "paste_buffer" ) )
+        
+        if( set_getbool( &ic->set, "translate_to_nicks" ) )
+        {
+                char nick[MAX_NICK_LENGTH+1];
+                irc_user_t *iu;
+                
+                strncpy( nick, msg, MAX_NICK_LENGTH );
+                nick[MAX_NICK_LENGTH] = '\0';
+                if( ( s = strchr( nick, ':' ) ) || ( s = strchr( nick, ',' ) ) )
+                {
+                        *s = '\0';
+                        if( ( iu = irc_user_by_name( ic->irc, nick ) ) &&
+                            iu->bu->nick && irc_channel_has_user( ic, iu ) )
+                        {
+                                trans = g_strconcat( iu->bu->nick, msg + ( s - nick ), NULL );
+                                msg = trans;
+                        }
+                }
+        }
+        
+        if( set_getbool( &ic->irc->b->set, "paste_buffer" ) )
         {
                 int delay;
@@ -623 +644 @@
                 ic->pastebuf_timer = b_timeout_add( delay, bee_irc_channel_chat_privmsg_cb, ic );
                 
+                g_free( trans );
                 return TRUE;
         }
@@ -628 +650 @@
                 bee_chat_msg( ic->irc->b, c, msg, 0 );
         
+        g_free( trans );
         return TRUE;
 }
@@ -747 +770 @@
         set_add( &ic->set, "nick", NULL, NULL, ic );
         set_add( &ic->set, "room", NULL, NULL, ic );
+        set_add( &ic->set, "translate_to_nicks", "true", set_eval_bool, ic );
         
         /* chat_type == groupchat */
@@ -790 +814 @@
         set_del( &ic->set, "nick" );
         set_del( &ic->set, "room" );
+        set_del( &ic->set, "translate_to_nicks" );
         
         ic->flags &= ~IRC_CHANNEL_TEMP;

irc_user.c

@@ -121 +121 @@
 {
         irc_t *irc = iu->irc;
+        irc_user_t *new_iu;
         char key[strlen(new)+1];
         GSList *cl;
         
         strcpy( key, new );
-        if( iu == NULL || !nick_lc( key ) || irc_user_by_name( irc, new ) )
+        if( iu == NULL || !nick_lc( key ) ||
+            ( ( new_iu = irc_user_by_name( irc, new ) ) && new_iu != iu ) )
                 return 0;
         

protocols/bee.h

@@ -62 +62 @@
         char *handle;
         char *fullname;
+        char *nick;
         struct bee_group *group;
 

protocols/bee_user.c

@@ -60 +60 @@
         g_free( bu->handle );
         g_free( bu->fullname );
+        g_free( bu->nick );
         g_free( bu->status );
         g_free( bu->status_msg );

protocols/nogaim.c

@@ -427 +427 @@
         
         if( !bu || !nick ) return;
+        
+        g_free( bu->nick );
+        bu->nick = g_strdup( nick );
         
         if( bee->ui->user_nick_hint )

root_commands.c

@@ -680 +680 @@
 static void cmd_rename( irc_t *irc, char **cmd )
 {
-        irc_user_t *iu;
+        irc_user_t *iu, *old;
         
         iu = irc_user_by_name( irc, cmd[1] );
@@ -696 +696 @@
                 irc_usermsg( irc, "Nick `%s' is invalid", cmd[2] );
         }
-        else if( irc_user_by_name( irc, cmd[2] ) )
+        else if( ( old = irc_user_by_name( irc, cmd[2] ) ) && old != iu )
         {
                 irc_usermsg( irc, "Nick `%s' already exists", cmd[2] );