Changeset d323394c

Timestamp:

2007-04-20T04:49:30Z (18 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

61ae52c

Parents:

f0cb961

Message:

New code to use nicknames stored in ICQ contact lists.

Files:

• nick.c (modified) (5 diffs)
• nick.h (modified) (1 diff)
• protocols/nogaim.c (modified) (3 diffs)

nick.c

@@ -2 +2 @@
   * BitlBee -- An IRC to other IM-networks gateway                     *
   *                                                                    *
-  * Copyright 2002-2006 Wilmer van der Gaast and others                *
+  * Copyright 2002-2007 Wilmer van der Gaast and others                *
   \********************************************************************/
 
@@ -53 +53 @@
 }
 
-char *nick_get( account_t *acc, const char *handle, const char *realname )
+char *nick_get( account_t *acc, const char *handle )
 {
         static char nick[MAX_NICK_LENGTH+1];
@@ -76 +76 @@
                         while( *s )
                                 *(s++) = 0;
-                
-                /* All-digit handles (mainly ICQ UINs) aren't cool, try to
-                   use the realname instead. */
-                for( s = nick; *s && isdigit( *s ); s ++ );
-                if( !*s && realname && *realname )
-                        g_snprintf( nick, MAX_NICK_LENGTH, "%s", realname );
                 
                 nick_strip( nick );
@@ -130 +124 @@
 }
 
+/* Just check if there is a nickname set for this buddy or if we'd have to
+   generate one. */
+int nick_saved( account_t *acc, const char *handle )
+{
+        char *store_handle, *found;
+        
+        store_handle = clean_handle( handle );
+        found = g_hash_table_lookup( acc->nicks, store_handle );
+        g_free( store_handle );
+        
+        return found != NULL;
+}
+
 void nick_del( account_t *acc, const char *handle )
 {
@@ -176 +183 @@
 int nick_lc( char *nick )
 {
-        static char tab[256] = { 0 };
+        static char tab[128] = { 0 };
         int i;
         

nick.h

@@ -25 +25 @@
 
 void nick_set( account_t *acc, const char *handle, const char *nick );
-char *nick_get( account_t *acc, const char *handle, const char *realname );
+char *nick_get( account_t *acc, const char *handle );
+int nick_saved( account_t *acc, const char *handle );
 void nick_del( account_t *acc, const char *handle );
 void nick_strip( char *nick );

protocols/nogaim.c

@@ -372 +372 @@
         
         memset( nick, 0, MAX_NICK_LENGTH + 1 );
-        strcpy( nick, nick_get( ic->acc, handle, NULL ) );
+        strcpy( nick, nick_get( ic->acc, handle ) );
         
         u = user_add( ic->irc, nick );
@@ -426 +426 @@
 }
 
-
 void imcb_rename_buddy( struct im_connection *ic, char *handle, char *realname )
 {
         user_t *u = user_findhandle( ic, handle );
+        char *s, newnick[MAX_NICK_LENGTH+1];
         
         if( !u || !realname ) return;
@@ -441 +441 @@
                 if( ( ic->flags & OPT_LOGGED_IN ) && set_getbool( &ic->irc->set, "display_namechanges" ) )
                         imcb_log( ic, "User `%s' changed name to `%s'", u->nick, u->realname );
+                
+                if( !u->online && !nick_saved( ic->acc, handle ) )
+                {
+                        /* Detect numeric handles: */
+                        for( s = u->user; isdigit( *s ); s++ );
+                        
+                        if( *s == 0 )
+                        {
+                                /* If we reached the end of the string, it only contained numbers.
+                                   Seems to be an ICQ# then, so hopefully realname contains
+                                   something more useful. */
+                                strcpy( newnick, realname );
+                                
+                                /* Some processing to make sure this string is a valid IRC nickname. */
+                                nick_strip( newnick );
+                                if( set_getbool( &ic->irc->set, "lcnicks" ) )
+                                        nick_lc( newnick );
+                                
+                                u->nick = g_strdup( newnick );
+                        }
+                }
         }
 }