Changeset 2e0eaac

Timestamp:

2010-07-11T23:14:49Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

09dfb68

Parents:

b1f818b

Message:

First version of the nick_format setting.

Files:

• irc.c (modified) (1 diff)
• nick.c (modified) (4 diffs)
• protocols/account.c (modified) (1 diff)

irc.c

@@ -109 +109 @@
         s = set_add( &b->set, "handle_unknown", "add_channel", NULL, irc );
         s = set_add( &b->set, "lcnicks", "true", set_eval_bool, irc );
+        s = set_add( &b->set, "nick_format", "%-@handle", NULL, irc );
         s = set_add( &b->set, "offline_user_quits", "true", set_eval_bool, irc );
         s = set_add( &b->set, "ops", "both", set_eval_irc_channel_ops, irc );

nick.c

@@ -27 +27 @@
 #include "bitlbee.h"
 
+/* Character maps, _lc_[x] == _uc_[x] (but uppercase), according to the RFC's.
+   With one difference, we allow dashes. These are used to do uc/lc conversions
+   and strip invalid chars. */
+static char *nick_lc_chars = "0123456789abcdefghijklmnopqrstuvwxyz{}^`-_|";
+static char *nick_uc_chars = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ[]~`-_\\";
+
 /* Store handles in lower case and strip spaces, because AIM is braindead. */
 static char *clean_handle( const char *orig )
@@ -73 +79 @@
                 strncpy( nick, found_nick, MAX_NICK_LENGTH );
         }
+        else if( ( found_nick = nick_gen( bu ) ) )
+        {
+                strncpy( nick, found_nick, MAX_NICK_LENGTH );
+                g_free( found_nick );
+        }
         else
         {
+                /* Keep this fallback since nick_gen() can return NULL in some cases. */
                 char *s;
                 
@@ -97 +109 @@
 char *nick_gen( bee_user_t *bu )
 {
-        return NULL;
+        gboolean ok = FALSE; /* Set to true once the nick contains something unique. */
+        GString *ret = g_string_new( "" );
+        char *fmt = set_getstr( &bu->ic->acc->set, "nick_format" ) ? :
+                    set_getstr( &bu->bee->set, "nick_format" );
+        
+        while( fmt && *fmt && ret->len < MAX_NICK_LENGTH )
+        {
+                char *part, chop = '\0';
+                
+                if( *fmt != '%' )
+                {
+                        g_string_append_c( ret, *fmt );
+                        fmt ++;
+                        continue;
+                }
+                
+                fmt ++;
+                while( *fmt )
+                {
+                        /* -char means chop off everything from char */
+                        if( *fmt == '-' )
+                        {
+                                chop = fmt[1];
+                                if( chop == '\0' )
+                                        return NULL;
+                                fmt += 2;
+                        }
+                        else if( g_strncasecmp( fmt, "handle", 6 ) == 0 )
+                        {
+                                part = bu->handle;
+                                fmt += 6;
+                                ok |= TRUE;
+                                break;
+                        }
+                        else if( g_strncasecmp( fmt, "full_name", 9 ) == 0 )
+                        {
+                                part = bu->fullname;
+                                fmt += 9;
+                                ok |= part && *part;
+                                break;
+                        }
+                        else if( g_strncasecmp( fmt, "first_name", 10 ) == 0 )
+                        {
+                                part = bu->fullname;
+                                fmt += 10;
+                                ok |= part && *part;
+                                chop = ' ';
+                                break;
+                        }
+                        else
+                        {
+                                return NULL;
+                        }
+                }
+                
+                while( part && *part && *part != chop )
+                {
+                        if( strchr( nick_lc_chars, *part ) ||
+                            strchr( nick_uc_chars, *part ) )
+                                g_string_append_c( ret, *part );
+                        
+                        part ++;
+                }
+        }
+        
+        /* This returns NULL if the nick is empty or otherwise not ok. */
+        return g_string_free( ret, ret->len == 0 || !ok );
 }
 
@@ -163 +241 @@
 
 
-/* Character maps, _lc_[x] == _uc_[x] (but uppercase), according to the RFC's.
-   With one difference, we allow dashes. */
-
-static char *nick_lc_chars = "0123456789abcdefghijklmnopqrstuvwxyz{}^`-_|";
-static char *nick_uc_chars = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ[]~`-_\\";
-
 void nick_strip( char *nick )
 {

protocols/account.c

@@ -53 +53 @@
         
         s = set_add( &a->set, "auto_reconnect", "true", set_eval_bool, a );
+        
+        s = set_add( &a->set, "nick_format", NULL, NULL, a );
         
         s = set_add( &a->set, "nick_source", "handle", NULL, a );