Changeset 40e6dac

Timestamp:

2010-07-24T15:46:59Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

e135cd09

Parents:

7989d40d

Message:

Adding account tags as a way to 100% uniquely identify an account.
protocol(screenname) doesn't do this and is a little bit long. These will
be used for nick_format and XML storage.

Files:

• protocols/account.c (modified) (6 diffs)
• protocols/account.h (modified) (2 diffs)
• root_commands.c (modified) (1 diff)

protocols/account.c

@@ -34 +34 @@
         account_t *a;
         set_t *s;
+        char tag[strlen(prpl->name)+10];
         
         if( bee->accounts )
@@ -65 +66 @@
         s->flags |= ACC_SET_NOSAVE | SET_NULL_OK;
         
+        s = set_add( &a->set, "tag", NULL, set_eval_account, a );
+        
         s = set_add( &a->set, "username", NULL, set_eval_account, a );
         s->flags |= ACC_SET_NOSAVE | ACC_SET_OFFLINE_ONLY;
         set_setstr( &a->set, "username", user );
+        
+        if( account_by_tag( bee, prpl->name ) )
+        {
+                int i;
+
+                for( i = 2; i < 10000; i ++ )
+                {
+                        sprintf( tag, "%s%d", prpl->name, i );
+                        if( !account_by_tag( bee, tag ) )
+                                break;
+                }
+        }
+        else
+        {
+                strcpy( tag, prpl->name );
+        }
+        set_setstr( &a->set, "tag", tag );
         
         a->nicks = g_hash_table_new_full( g_str_hash, g_str_equal, g_free, g_free );
@@ -130 +150 @@
                         return SET_INVALID;
                 }
+        }
+        else if( strcmp( set->key, "tag" ) == 0 )
+        {
+                account_t *oa;
+                
+                /* Enforce uniqueness. */
+                if( ( oa = account_by_tag( acc->bee, value ) ) && oa != acc )
+                        return SET_INVALID;
+                
+                g_free( acc->tag );
+                acc->tag = g_strdup( value );
+                return value;
         }
         else if( strcmp( set->key, "auto_connect" ) == 0 )
@@ -173 +205 @@
 }
 
-account_t *account_get( bee_t *bee, char *id )
+account_t *account_get( bee_t *bee, const char *id )
 {
         account_t *a, *ret = NULL;
         char *handle, *s;
         int nr;
+        
+        /* Tags get priority above anything else. */
+        if( ( a = account_by_tag( bee, id ) ) )
+                return a;
         
         /* This checks if the id string ends with (...) */
@@ -232 +268 @@
         
         return( ret );
+}
+
+account_t *account_by_tag( bee_t *bee, const char *tag )
+{
+        account_t *a;
+        
+        for( a = bee->accounts; a; a = a->next )
+                if( a->tag && g_strcasecmp( tag, a->tag ) == 0 )
+                        return a;
+        
+        return NULL;
 }
 
@@ -264 +311 @@
                         g_hash_table_destroy( a->nicks );
                         
+                        g_free( a->tag );
                         g_free( a->user );
                         g_free( a->pass );

protocols/account.h

@@ -33 +33 @@
         char *pass;
         char *server;
+        char *tag;
         
         int auto_connect;
@@ -48 +49 @@
 
 account_t *account_add( bee_t *bee, struct prpl *prpl, char *user, char *pass );
-account_t *account_get( bee_t *bee, char *id );
+account_t *account_get( bee_t *bee, const char *id );
+account_t *account_by_tag( bee_t *bee, const char *tag );
 void account_del( bee_t *bee, account_t *acc );
 void account_on( bee_t *bee, account_t *a );

root_commands.c

@@ -413 +413 @@
                                 con = "";
                         
-                        irc_usermsg( irc, "%2d. %s, %s%s", i, a->prpl->name, a->user, con );
+                        irc_usermsg( irc, "%2d (%s): %s, %s%s", i, a->tag, a->prpl->name, a->user, con );
                         
                         i ++;