Changeset b1f818b

Timestamp:

2010-07-11T12:21:59Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

2e0eaac

Parents:

133cdff

Message:

Use bee_user structs in all nick_* functions. Prepare for a nick_get() with
more flexible nickname generation.

Files:

• irc_im.c (modified) (3 diffs)
• nick.c (modified) (10 diffs)
• nick.h (modified) (1 diff)
• root_commands.c (modified) (3 diffs)
• storage_xml.c (modified) (1 diff)

irc_im.c

@@ -50 +50 @@
         
         memset( nick, 0, MAX_NICK_LENGTH + 1 );
-        strcpy( nick, nick_get( bu->ic->acc, bu->handle ) );
+        strcpy( nick, nick_get( bu ) );
         
         bu->ui_data = iu = irc_user_new( irc, nick );
@@ -294 +294 @@
                 return TRUE;
         
-        if( nick_saved( bu->ic->acc, bu->handle ) )
+        if( nick_saved( bu ) )
                 /* The user already assigned a nickname to this person. */
                 return TRUE;
@@ -319 +319 @@
                    If rejoining a channel, maybe we got this nick already
                    (and dedupe would only add an underscore. */
-                nick_dedupe( bu->ic->acc, bu->handle, newnick );
+                nick_dedupe( bu, newnick );
                 irc_user_set_nick( iu, newnick );
         }

nick.c

@@ -2 +2 @@
   * BitlBee -- An IRC to other IM-networks gateway                     *
   *                                                                    *
-  * Copyright 2002-2007 Wilmer van der Gaast and others                *
+  * Copyright 2002-2010 Wilmer van der Gaast and others                *
   \********************************************************************/
 
@@ -42 +42 @@
 }
 
-void nick_set( account_t *acc, const char *handle, const char *nick )
+void nick_set_raw( account_t *acc, const char *handle, const char *nick )
 {
         char *store_handle, *store_nick = g_malloc( MAX_NICK_LENGTH + 1 );
         
         store_handle = clean_handle( handle );
-        store_nick[MAX_NICK_LENGTH] = 0;
+        store_nick[MAX_NICK_LENGTH] = '\0';
         strncpy( store_nick, nick, MAX_NICK_LENGTH );
         nick_strip( store_nick );
@@ -54 +54 @@
 }
 
-char *nick_get( account_t *acc, const char *handle )
+void nick_set( bee_user_t *bu, const char *nick )
+{
+        nick_set_raw( bu->ic->acc, bu->handle, nick );
+}
+
+char *nick_get( bee_user_t *bu )
 {
         static char nick[MAX_NICK_LENGTH+1];
@@ -61 +66 @@
         memset( nick, 0, MAX_NICK_LENGTH + 1 );
         
-        store_handle = clean_handle( handle );
+        store_handle = clean_handle( bu->handle );
         /* Find out if we stored a nick for this person already. If not, try
            to generate a sane nick automatically. */
-        if( ( found_nick = g_hash_table_lookup( acc->nicks, store_handle ) ) )
+        if( ( found_nick = g_hash_table_lookup( bu->ic->acc->nicks, store_handle ) ) )
         {
                 strncpy( nick, found_nick, MAX_NICK_LENGTH );
@@ -72 +77 @@
                 char *s;
                 
-                g_snprintf( nick, MAX_NICK_LENGTH, "%s", handle );
+                g_snprintf( nick, MAX_NICK_LENGTH, "%s", bu->handle );
                 if( ( s = strchr( nick, '@' ) ) )
                         while( *s )
@@ -78 +83 @@
                 
                 nick_strip( nick );
-                if( set_getbool( &acc->bee->set, "lcnicks" ) )
+                if( set_getbool( &bu->bee->set, "lcnicks" ) )
                         nick_lc( nick );
         }
@@ -85 +90 @@
         /* Make sure the nick doesn't collide with an existing one by adding
            underscores and that kind of stuff, if necessary. */
-        nick_dedupe( acc, handle, nick );
+        nick_dedupe( bu, nick );
         
         return nick;
 }
 
-void nick_dedupe( account_t *acc, const char *handle, char nick[MAX_NICK_LENGTH+1] )
-{
-        irc_t *irc = (irc_t*) acc->bee->ui_data;
+char *nick_gen( bee_user_t *bu )
+{
+        return NULL;
+}
+
+void nick_dedupe( bee_user_t *bu, char nick[MAX_NICK_LENGTH+1] )
+{
+        irc_t *irc = (irc_t*) bu->bee->ui_data;
         int inf_protection = 256;
         
@@ -119 +129 @@
                                           "Please send all the following lines in your report:" );
                         
-                        irc_usermsg( irc, "Trying to get a sane nick for handle %s", handle );
+                        irc_usermsg( irc, "Trying to get a sane nick for handle %s", bu->handle );
                         for( i = 0; i < MAX_NICK_LENGTH; i ++ )
                                 irc_usermsg( irc, "Char %d: %c/%d", i, nick[i], nick[i] );
@@ -136 +146 @@
 /* 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 )
+int nick_saved( bee_user_t *bu )
 {
         char *store_handle, *found;
         
-        store_handle = clean_handle( handle );
-        found = g_hash_table_lookup( acc->nicks, store_handle );
+        store_handle = clean_handle( bu->handle );
+        found = g_hash_table_lookup( bu->ic->acc->nicks, store_handle );
         g_free( store_handle );
         
@@ -147 +157 @@
 }
 
-void nick_del( account_t *acc, const char *handle )
-{
-        g_hash_table_remove( acc->nicks, handle );
+void nick_del( bee_user_t *bu )
+{
+        g_hash_table_remove( bu->ic->acc->nicks, bu->handle );
 }
 

nick.h

@@ -24 +24 @@
 */
 
-void nick_set( account_t *acc, const char *handle, const char *nick );
-char *nick_get( account_t *acc, const char *handle );
-void nick_dedupe( account_t *acc, const char *handle, char nick[MAX_NICK_LENGTH+1] );
-int nick_saved( account_t *acc, const char *handle );
-void nick_del( account_t *acc, const char *handle );
+void nick_set_raw( account_t *acc, const char *handle, const char *nick );
+void nick_set( bee_user_t *bu, const char *nick );
+char *nick_get( bee_user_t *bu );
+char *nick_gen( bee_user_t *bu );
+void nick_dedupe( bee_user_t *bu, char nick[MAX_NICK_LENGTH+1] );
+int nick_saved( bee_user_t *bu );
+void nick_del( bee_user_t *bu );
 void nick_strip( char *nick );
 

root_commands.c

@@ -615 +615 @@
                 else
                 {
-                        nick_set( a, cmd[2], cmd[3] );
+                        nick_set_raw( a, cmd[2], cmd[3] );
                 }
         }
@@ -643 +643 @@
         
         bu->ic->acc->prpl->remove_buddy( bu->ic, bu->handle, NULL );
-        nick_del( bu->ic->acc, bu->handle );
+        nick_del( bu );
         //TODO(wilmer): bee_user_free() and/or let the IM mod do it? irc_user_free( irc, cmd[1] );
         
@@ -728 +728 @@
                 else if( iu->bu )
                 {
-                        nick_set( iu->bu->ic->acc, iu->bu->handle, cmd[2] );
+                        nick_set( iu->bu, cmd[2] );
                 }
                 

storage_xml.c

@@ -197 +197 @@
                 if( xd->current_account && handle && nick )
                 {
-                        nick_set( xd->current_account, handle, nick );
+                        nick_set_raw( xd->current_account, handle, nick );
                 }
                 else