Changeset d06eabf

Timestamp:

2007-06-04T13:22:05Z (17 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

e0e2a71

Parents:

54f2f55

Message:

Added imcb_buddy_nick_hint so the Jabber conference module can suggest sane
nicknames for chatroom participants. There'll probably be a lot of
underscores now, but this is by far the cleanest way to implement this, I
think. At least now whispers will work properly. Also using this function
call to set names for ICQ contacts in a slightly saner way.

Files:

• nick.c (modified) (3 diffs)
• nick.h (modified) (1 diff)
• protocols/jabber/conference.c (modified) (1 diff)
• protocols/jabber/iq.c (modified) (1 diff)
• protocols/nogaim.c (modified) (2 diffs)
• protocols/nogaim.h (modified) (1 diff)
• protocols/oscar/oscar.c (modified) (1 diff)

nick.c

@@ -57 +57 @@
         static char nick[MAX_NICK_LENGTH+1];
         char *store_handle, *found_nick;
-        int inf_protection = 256;
         
         memset( nick, 0, MAX_NICK_LENGTH + 1 );
@@ -82 +81 @@
         }
         g_free( store_handle );
+        
+        /* 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 );
+        
+        return nick;
+}
+
+void nick_dedupe( account_t *acc, const char *handle, char nick[MAX_NICK_LENGTH+1] )
+{
+        int inf_protection = 256;
         
         /* Now, find out if the nick is already in use at the moment, and make
@@ -120 +130 @@
                 }
         }
-        
-        return nick;
 }
 

nick.h

@@ -26 +26 @@
 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 );

protocols/jabber/conference.c

@@ -160 +160 @@
                 imcb_chat_add_buddy( chat, bud->ext_jid );
                 if( s ) *s = '/';
+                
+                if( bud != jc->me )
+                        imcb_buddy_nick_hint( ic, bud->ext_jid, bud->resource );
         }
         else if( type ) /* This only gets called if type is NULL or "unavailable" */

protocols/jabber/iq.c

@@ -373 +373 @@
                                                                    group->text : NULL );
                                 
-                                imcb_rename_buddy( ic, jid, name );
+                                if( name )
+                                {
+                                        imcb_rename_buddy( ic, jid, name );
+                                        imcb_buddy_nick_hint( ic, jid, name );
+                                }
                         }
                         else if( strcmp( sub, "remove" ) == 0 )

protocols/nogaim.c

@@ -428 +428 @@
 {
         user_t *u = user_findhandle( ic, handle );
-        char *s, newnick[MAX_NICK_LENGTH+1];
         
         if( !u || !realname ) return;
@@ -440 +439 @@
                 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 );
-                        }
-                }
-        }
-}
-
+        }
+}
+
+/* Mainly meant for ICQ (and now also for Jabber conferences) to allow IM
+   modules to suggest a nickname for a handle. */
+void imcb_buddy_nick_hint( struct im_connection *ic, char *handle, char *nick )
+{
+        user_t *u = user_findhandle( ic, handle );
+        char newnick[MAX_NICK_LENGTH+1];
+        
+        if( !u->online && !nick_saved( ic->acc, handle ) )
+        {
+                /* Only do this if the person isn't online yet (which should
+                   be the case if we just added it) and if the user hasn't
+                   assigned a nickname to this buddy already. */
+                
+                strcpy( newnick, nick );
+                
+                /* 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 );
+                
+                nick_dedupe( ic->acc, handle, newnick );
+                
+                u->nick = g_strdup( newnick );
+        }
+}
 
 /* prpl.c */

protocols/nogaim.h

@@ -194 +194 @@
 G_MODULE_EXPORT struct buddy *imcb_find_buddy( struct im_connection *ic, char *handle );
 G_MODULE_EXPORT void imcb_rename_buddy( struct im_connection *ic, char *handle, char *realname );
+G_MODULE_EXPORT void imcb_buddy_nick_hint( struct im_connection *ic, char *handle, char *nick );
 
 /* Buddy activity */

protocols/oscar/oscar.c

@@ -2022 +2022 @@
                                         
                                         if (realname) {
+                                                imcb_buddy_nick_hint(ic, curitem->name, realname);
                                                 imcb_rename_buddy(ic, curitem->name, realname);
                                                 g_free(realname);