Changeset f0cb961 for protocols

Timestamp:

2007-04-19T06:03:43Z (18 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

d323394c

Parents:

33dc261

Message:

More API changes: buddy list management. imcb_add_buddy() is now a *real*
callback, it's only called from inside IM-modules. This makes sure a buddy
only gets added to the BitlBee structures if the add was successful. This
gets rid of the weirdness described in #55. Unfortunately for now this
change breaks A) automatic renaming of ICQ contacts (if there are names
stored in the contact list) B) add -tmp.

Location:

protocols

Files:

• jabber/iq.c (modified) (1 diff)
• jabber/jabber_util.c (modified) (3 diffs)
• msn/msn_util.c (modified) (1 diff)
• msn/ns.c (modified) (5 diffs)
• nogaim.c (modified) (9 diffs)
• nogaim.h (modified) (1 diff)
• oscar/oscar.c (modified) (6 diffs)
• yahoo/libyahoo2.c (modified) (1 diff)
• yahoo/yahoo.c (modified) (2 diffs)

protocols/jabber/iq.c

@@ -360 +360 @@
         while( ( c = xt_find_node( c, "item" ) ) )
         {
+                struct xt_node *group = xt_find_node( node->children, "group" );
                 char *jid = xt_find_attr( c, "jid" );
                 char *name = xt_find_attr( c, "name" );
                 char *sub = xt_find_attr( c, "subscription" );
                 
-                if( !jid || !sub )
-                {
-                        /* Maybe warn. But how likely is this to happen in the first place? */
-                }
-                else if( initial )
-                {
-                        if( ( strcmp( sub, "both" ) == 0 || strcmp( sub, "to" ) == 0 ) )
-                                add_buddy( ic, NULL, jid, name );
-                }
-                else
-                {
-                        /* This is a roster push item. Find out what changed exactly. */
+                if( jid && sub )
+                {
                         if( ( strcmp( sub, "both" ) == 0 || strcmp( sub, "to" ) == 0 ) )
                         {
-                                if( find_buddy( ic, jid ) == NULL )
-                                        add_buddy( ic, NULL, jid, name );
-                                else if( name )
-                                        serv_buddy_rename( ic, jid, name );
+                                if( initial || imcb_find_buddy( ic, jid ) == NULL )
+                                        imcb_add_buddy( ic, jid, ( group && group->text_len ) ?
+                                                                   group->text : NULL );
+                                
+                                imcb_rename_buddy( ic, jid, name );
                         }
                         else if( strcmp( sub, "remove" ) == 0 )

protocols/jabber/jabber_util.c

@@ -223 +223 @@
         presence_send_request( bla->ic, bla->handle, "subscribed" );
         
-        if( find_buddy( bla->ic, bla->handle ) == NULL )
+        if( imcb_find_buddy( bla->ic, bla->handle ) == NULL )
                 imcb_ask_add( bla->ic, bla->handle, NULL );
         
@@ -371 +371 @@
                 }
                 
-                if( bud == NULL && ( flags & GET_BUDDY_CREAT ) && find_buddy( ic, jid ) )
+                if( bud == NULL && ( flags & GET_BUDDY_CREAT ) && imcb_find_buddy( ic, jid ) )
                 {
                         *s = '/';
@@ -391 +391 @@
                 if( bud == NULL )
                         /* No match. Create it now? */
-                        return ( ( flags & GET_BUDDY_CREAT ) && find_buddy( ic, jid_ ) ) ?
+                        return ( ( flags & GET_BUDDY_CREAT ) && imcb_find_buddy( ic, jid_ ) ) ?
                                    jabber_buddy_add( ic, jid_ ) : NULL;
                 else if( bud->resource && ( flags & GET_BUDDY_EXACT ) )

protocols/msn/msn_util.c

@@ -94 +94 @@
         msn_buddy_list_add( bla->ic, "AL", bla->handle, bla->realname );
         
-        if( find_buddy( bla->ic, bla->handle ) == NULL )
+        if( imcb_find_buddy( bla->ic, bla->handle ) == NULL )
                 imcb_ask_add( bla->ic, bla->handle, NULL );
         

protocols/msn/ns.c

@@ -305 +305 @@
                         int num;
                         
-                        if( cmd[4] != NULL && sscanf( cmd[4], "%d", &num ) == 1 )
+                        if( cmd[4] != NULL && sscanf( cmd[4], "%d", &num ) == 1 && num < md->groupcount )
                                 group = md->grouplist[num];
                         
-                        add_buddy( ic, group, cmd[1], cmd[2] );
+                        imcb_add_buddy( ic, cmd[1], group );
+                        imcb_rename_buddy( ic, cmd[1], cmd[2] );
                 }
                 if( list & 2 ) /* AL */
@@ -391 +392 @@
                 
                 http_decode( cmd[4] );
-                serv_buddy_rename( ic, cmd[3], cmd[4] );
+                imcb_rename_buddy( ic, cmd[3], cmd[4] );
                 
                 st = msn_away_state_by_code( cmd[2] );
@@ -420 +421 @@
                 
                 http_decode( cmd[3] );
-                serv_buddy_rename( ic, cmd[2], cmd[3] );
+                imcb_rename_buddy( ic, cmd[2], cmd[3] );
                 
                 st = msn_away_state_by_code( cmd[1] );
@@ -482 +483 @@
                                 imcb_error( ic, "Syntax error" );
                                 imc_logout( ic, TRUE );
-                                return( 0 );
-                        }
-                        
-                        /* We got added by someone. If we don't have this person in permit/deny yet, inform the user. */
+                                return 0;
+                        }
+                        
+                        /* We got added by someone. If we don't have this
+                           person in permit/deny yet, inform the user. */
                         for( l = ic->permit; l; l = l->next )
                                 if( g_strcasecmp( l->data, cmd[4] ) == 0 )
-                                        return( 1 );
+                                        return 1;
                         
                         for( l = ic->deny; l; l = l->next )
                                 if( g_strcasecmp( l->data, cmd[4] ) == 0 )
-                                        return( 1 );
+                                        return 1;
                         
                         msn_buddy_ask( ic, cmd[4], cmd[5] );
+                }
+                else if( num_parts >= 6 && strcmp( cmd[2], "FL" ) == 0 )
+                {
+                        http_decode( cmd[5] );
+                        imcb_add_buddy( ic, cmd[4], NULL );
+                        imcb_rename_buddy( ic, cmd[4], cmd[5] );
                 }
         }
@@ -545 +553 @@
                         /* This is not supposed to happen, but let's handle it anyway... */
                         http_decode( cmd[4] );
-                        serv_buddy_rename( ic, cmd[3], cmd[4] );
+                        imcb_rename_buddy( ic, cmd[3], cmd[4] );
                 }
         }

protocols/nogaim.c

@@ -352 +352 @@
 /* list.c */
 
-void add_buddy( struct im_connection *ic, char *group, char *handle, char *realname )
+void imcb_add_buddy( struct im_connection *ic, char *handle, char *group )
 {
         user_t *u;
-        char nick[MAX_NICK_LENGTH+1];
-        char *s;
+        char nick[MAX_NICK_LENGTH+1], *s;
         irc_t *irc = ic->irc;
-        
-        if( set_getbool( &irc->set, "debug" ) && 0 ) /* This message is too useless */
-                imcb_log( ic, "Receiving user add from handle: %s", handle );
         
         if( user_findhandle( ic, handle ) )
@@ -369 +365 @@
                 return;
                 
-                /* Buddy seems to exist already. Let's ignore this request then... */
+                /* Buddy seems to exist already. Let's ignore this request then...
+                   Eventually subsequent calls to this function *should* be possible
+                   when a buddy is in multiple groups. But for now BitlBee doesn't
+                   even support groups so let's silently ignore this for now. */
         }
         
         memset( nick, 0, MAX_NICK_LENGTH + 1 );
-        strcpy( nick, nick_get( ic->acc, handle, realname ) );
+        strcpy( nick, nick_get( ic->acc, handle, NULL ) );
         
         u = user_add( ic->irc, nick );
         
-        if( !realname || !*realname ) realname = nick;
-        u->realname = g_strdup( realname );
+//      if( !realname || !*realname ) realname = nick;
+//      u->realname = g_strdup( realname );
         
         if( ( s = strchr( handle, '@' ) ) )
@@ -387 +386 @@
         else if( ic->acc->server )
         {
-                char *colon;
-                
-                if( ( colon = strchr( ic->acc->server, ':' ) ) )
-                        u->host = g_strndup( ic->acc->server,
-                                             colon - ic->acc->server );
-                else
-                        u->host = g_strdup( ic->acc->server );
-                
+                u->host = g_strdup( ic->acc->server );
                 u->user = g_strdup( handle );
                 
@@ -415 +407 @@
 }
 
-struct buddy *find_buddy( struct im_connection *ic, char *handle )
+struct buddy *imcb_find_buddy( struct im_connection *ic, char *handle )
 {
         static struct buddy b[1];
@@ -435 +427 @@
 
 
-void serv_buddy_rename( struct im_connection *ic, char *handle, char *realname )
+void imcb_rename_buddy( struct im_connection *ic, char *handle, char *realname )
 {
         user_t *u = user_findhandle( ic, handle );
         
-        if( !u ) return;
+        if( !u || !realname ) return;
         
         if( g_strcasecmp( u->realname, realname ) != 0 )
@@ -470 +462 @@
 {
         data->ic->acc->prpl->add_buddy( data->ic, data->handle, NULL );
-        add_buddy( data->ic, NULL, data->handle, data->handle );
+        /* imcb_add_buddy( data->ic, NULL, data->handle, data->handle ); */
         
         return show_got_added_no( w, data );
@@ -505 +497 @@
                 if( g_strcasecmp( set_getstr( &ic->irc->set, "handle_unknown" ), "add" ) == 0 )
                 {
-                        add_buddy( ic, NULL, (char*) handle, NULL );
+                        imcb_add_buddy( ic, (char*) handle, NULL );
                         u = user_findhandle( ic, (char*) handle );
                 }
@@ -609 +601 @@
                         }
                         
-                        add_buddy( ic, NULL, handle, NULL );
+                        imcb_add_buddy( ic, handle, NULL );
                         u = user_findhandle( ic, handle );
                         u->is_private = private;
@@ -779 +771 @@
         if( !u )
         {
-                add_buddy( b->ic, NULL, handle, NULL );
+                imcb_add_buddy( b->ic, handle, NULL );
                 u = user_findhandle( b->ic, handle );
         }

protocols/nogaim.h

@@ -201 +201 @@
 
 /* Buddy management */
-G_MODULE_EXPORT void add_buddy( struct im_connection *ic, char *group, char *handle, char *realname );
-G_MODULE_EXPORT struct buddy *find_buddy( struct im_connection *ic, char *handle );
-G_MODULE_EXPORT void serv_buddy_rename( struct im_connection *ic, char *handle, char *realname );
+G_MODULE_EXPORT void imcb_add_buddy( struct im_connection *ic, char *handle, char *group );
+G_MODULE_EXPORT void imcb_remove_buddy( struct im_connection *ic, char *handle, char *group );
+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 );
 
 /* Buddy activity */

protocols/oscar/oscar.c

@@ -1119 +1119 @@
         aim_ssi_auth_reply(od->sess, od->conn, uin, 1, "");
         // aim_send_im_ch4(od->sess, uin, AIM_ICQMSG_AUTHGRANTED, &message);
-        if(find_buddy(data->ic, uin) == NULL)
+        if(imcb_find_buddy(data->ic, uin) == NULL)
                 imcb_ask_add(data->ic, uin, NULL);
         
@@ -1875 +1875 @@
         struct oscar_data *odata = (struct oscar_data *)g->proto_data;
         if (odata->icq) {
-                struct buddy *budlight = find_buddy(g, who);
+                struct buddy *budlight = imcb_find_buddy(g, who);
                 if (budlight)
                         if ((budlight->uc & 0xff80) >> 7)
@@ -2013 +2013 @@
                 switch (curitem->type) {
                         case 0x0000: /* Buddy */
-                                if ((curitem->name) && (!find_buddy(ic, curitem->name))) {
+                                if ((curitem->name) && (!imcb_find_buddy(ic, curitem->name))) {
                                         char *realname = NULL;
 
@@ -2019 +2019 @@
                                                     realname = aim_gettlv_str(curitem->data, 0x0131, 1);
                                                 
-                                        add_buddy(ic, NULL, curitem->name, realname);
+                                        imcb_add_buddy(ic, curitem->name, NULL);
                                         
-                                        if (realname)
-                                            g_free(realname);
+                                        if (realname) {
+                                                imcb_rename_buddy(ic, curitem->name, realname);
+                                                g_free(realname);
+                                        }
                                 }
                                 break;
@@ -2105 +2107 @@
                 {
                         st = aimbs_get16( &fr->data );
-                        if( st == 0x0E )
+                        if( st == 0x00 )
+                        {
+                                imcb_add_buddy( sess->aux_data, list, NULL );
+                        }
+                        else if( st == 0x0E )
                         {
                                 imcb_log( sess->aux_data, "Buddy %s can't be added without authorization, requesting authorization", list );
@@ -2111 +2117 @@
                                 aim_ssi_auth_request( sess, fr->conn, list, "" );
                                 aim_ssi_addbuddies( sess, fr->conn, OSCAR_GROUP, &list, 1, 1 );
+                        }
+                        else
+                        {
+                                imcb_error( sess->aux_data, "Error while adding buddy: 0x%04x", st );
                         }
                         list += strlen( list ) + 1;

protocols/yahoo/libyahoo2.c

@@ -2403 +2403 @@
                 where = "Unknown";
 
-        bud = y_new0(struct yahoo_buddy, 1);
-        bud->id = strdup(who);
-        bud->group = strdup(where);
-        bud->real_name = NULL;
-
-        yd->buddies = y_list_append(yd->buddies, bud);
+        /* status: 0 == Successful, 1 == Error (does not exist), 2 == Already in list */
+        if( status == 0 ) {
+                bud = y_new0(struct yahoo_buddy, 1);
+                bud->id = strdup(who);
+                bud->group = strdup(where);
+                bud->real_name = NULL;
+                
+                yd->buddies = y_list_append(yd->buddies, bud);
+                
+                /* Possibly called already, but at least the call above doesn't
+                   seem to happen every time (not anytime I tried). */
+                YAHOO_CALLBACK(ext_yahoo_contact_added)(yd->client_id, me, who, NULL);
+        }
 
 /*      YAHOO_CALLBACK(ext_yahoo_status_changed)(yd->client_id, who, status, NULL, (status==YAHOO_STATUS_AVAILABLE?0:1)); */

protocols/yahoo/yahoo.c

@@ -532 +532 @@
                 }
                 
-                add_buddy( ic, b->group, b->id, b->real_name );
+                imcb_add_buddy( ic, b->id, b->group );
+                imcb_rename_buddy( ic, b->id, b->real_name );
+                
                 bl = bl->next;
         }
@@ -904 +906 @@
 void ext_yahoo_contact_added( int id, const char *myid, const char *who, const char *msg )
 {
+        /* Groups schmoups. If I want to handle groups properly I can get the
+           buddy data from some internal libyahoo2 structure. */
+        imcb_add_buddy( byahoo_get_ic_by_id( id ), (char*) who, NULL );
 }