Changeset badd148

Timestamp:

2010-07-12T23:22:53Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

db2cef1

Parents:

09dfb68

Message:

Reformat nicks whenever fullname/nick/group changes (but at least for now
still only for offline users).

Files:

• irc_im.c (modified) (4 diffs)
• nick.c (modified) (4 diffs)
• protocols/account.c (modified) (1 diff)
• unix.c (modified) (2 diffs)

irc_im.c

@@ -242 +242 @@
 }
 
-static gboolean bee_irc_user_nick_hint( bee_t *bee, bee_user_t *bu, const char *hint );
+static gboolean bee_irc_user_nick_update( irc_user_t *iu );
 
 static gboolean bee_irc_user_fullname( bee_t *bee, bee_user_t *bu )
@@ -265 +265 @@
         }
         
-        s = set_getstr( &bu->ic->acc->set, "nick_source" );
-        if( strcmp( s, "handle" ) != 0 )
-        {
-                char *name = g_strdup( bu->fullname );
-                
-                if( strcmp( s, "first_name" ) == 0 )
-                {
-                        int i;
-                        for( i = 0; name[i] && !isspace( name[i] ); i ++ ) {}
-                        name[i] = '\0';
-                }
-                
-                bee_irc_user_nick_hint( bee, bu, name );
-                
-                g_free( name );
-        }
+        bee_irc_user_nick_update( iu );
         
         return TRUE;
@@ -287 +272 @@
 static gboolean bee_irc_user_nick_hint( bee_t *bee, bee_user_t *bu, const char *hint )
 {
-        irc_user_t *iu = bu->ui_data;
-        char newnick[MAX_NICK_LENGTH+1], *translit;
+        bee_irc_user_nick_update( (irc_user_t*) bu->ui_data );
+        
+        return TRUE;
+}
+
+static gboolean bee_irc_user_group( bee_t *bee, bee_user_t *bu )
+{
+        irc_user_t *iu = (irc_user_t *) bu->ui_data;
+        irc_t *irc = (irc_t *) bee->ui_data;
+        
+        bee_irc_channel_update( irc, NULL, iu );
+        bee_irc_user_nick_update( iu );
+        
+        return TRUE;
+}
+
+static gboolean bee_irc_user_nick_update( irc_user_t *iu )
+{
+        bee_user_t *bu = iu->bu;
+        char *newnick;
         
         if( bu->flags & BEE_USER_ONLINE )
@@ -298 +301 @@
                 return TRUE;
         
-        /* Credits to Josay_ in #bitlbee for this idea. //TRANSLIT should
-           do lossy/approximate conversions, so letters with accents don't
-           just get stripped. Note that it depends on LC_CTYPE being set to
-           something other than C/POSIX. */
-        translit = g_convert( hint, -1, "ASCII//TRANSLIT//IGNORE", "UTF-8",
-                              NULL, NULL, NULL );
-        
-        strncpy( newnick, translit ? : hint, MAX_NICK_LENGTH );
-        newnick[MAX_NICK_LENGTH] = 0;
-        g_free( translit );
-        
-        /* Some processing to make sure this string is a valid IRC nickname. */
-        nick_strip( newnick );
-        if( set_getbool( &bee->set, "lcnicks" ) )
-                nick_lc( newnick );
+        newnick = nick_get( bu );
         
         if( strcmp( iu->nick, newnick ) != 0 )
         {
-                /* Only do this if newnick is different from the current one.
-                   If rejoining a channel, maybe we got this nick already
-                   (and dedupe would only add an underscore. */
                 nick_dedupe( bu, newnick );
                 irc_user_set_nick( iu, newnick );
         }
-        
-        return TRUE;
-}
-
-static gboolean bee_irc_user_group( bee_t *bee, bee_user_t *bu )
-{
-        irc_user_t *iu = (irc_user_t *) bu->ui_data;
-        irc_t *irc = (irc_t *) bee->ui_data;
-        
-        bee_irc_channel_update( irc, NULL, iu );
         
         return TRUE;

nick.c

@@ -116 +116 @@
         while( fmt && *fmt && ret->len < MAX_NICK_LENGTH )
         {
-                char *part, chop = '\0';
+                char *part, chop = '\0', *asc = NULL;
                 
                 if( *fmt != '%' )
@@ -177 +177 @@
                 }
                 
+                /* Credits to Josay_ in #bitlbee for this idea. //TRANSLIT
+                   should do lossy/approximate conversions, so letters with
+                   accents don't just get stripped. Note that it depends on
+                   LC_CTYPE being set to something other than C/POSIX. */
+                if( part )
+                        part = asc = g_convert( part, -1, "ASCII//TRANSLIT//IGNORE",
+                                                "UTF-8", NULL, NULL, NULL );
+                
                 while( part && *part && *part != chop )
                 {
@@ -185 +193 @@
                         part ++;
                 }
+                g_free( asc );
         }
         
@@ -195 +204 @@
         irc_t *irc = (irc_t*) bu->bee->ui_data;
         int inf_protection = 256;
+        irc_user_t *iu;
         
         /* Now, find out if the nick is already in use at the moment, and make
            subtle changes to make it unique. */
-        while( !nick_ok( nick ) || irc_user_by_name( irc, nick ) )
+        while( !nick_ok( nick ) ||
+               ( ( iu = irc_user_by_name( irc, nick ) ) && iu->bu != bu ) )
         {
                 if( strlen( nick ) < ( MAX_NICK_LENGTH - 1 ) )

protocols/account.c

@@ -55 +55 @@
         
         s = set_add( &a->set, "nick_format", NULL, NULL, a );
+        s->flags |= SET_NULL_OK;
         
         s = set_add( &a->set, "nick_source", "handle", NULL, a );

unix.c

@@ -39 +39 @@
 #include <sys/wait.h>
 #include <pwd.h>
+#include <locale.h>
 
 global_t global;        /* Against global namespace pollution */
@@ -51 +52 @@
         char *old_cwd = NULL;
         struct sigaction sig, old;
+        
+        /* Required to make iconv to ASCII//TRANSLIT work. This makes BitlBee
+           system-locale-sensitive. :-( */
+        setlocale( LC_CTYPE, "" );
         
         if( argc > 1 && strcmp( argv[1], "-x" ) == 0 )