Changeset 8b8def58 for protocols

Timestamp:

2010-06-24T09:14:34Z (15 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

41d415b

Parents:

7cd2e8a (diff), 38ff846 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merging a few revisions from mainline.

Location:

protocols

Files:

• jabber/iq.c (modified) (2 diffs)
• jabber/jabber.c (modified) (2 diffs)
• jabber/message.c (modified) (1 diff)
• twitter/twitter.c (modified) (5 diffs)
• twitter/twitter.h (modified) (3 diffs)
• twitter/twitter_lib.c (modified) (5 diffs)

protocols/jabber/iq.c

@@ -65 +65 @@
                 if( strcmp( s, XMLNS_VERSION ) == 0 )
                 {
-                        xt_add_child( reply, xt_new_node( "name", "BitlBee", NULL ) );
+                        xt_add_child( reply, xt_new_node( "name", set_getstr( &ic->acc->set, "user_agent" ), NULL ) );
                         xt_add_child( reply, xt_new_node( "version", BITLBEE_VERSION, NULL ) );
                         xt_add_child( reply, xt_new_node( "os", ARCH, NULL ) );
@@ -108 +108 @@
                         xt_add_attr( c, "category", "client" );
                         xt_add_attr( c, "type", "pc" );
-                        xt_add_attr( c, "name", "BitlBee" );
+                        xt_add_attr( c, "name", set_getstr( &ic->acc->set, "user_agent" ) );
                         xt_add_child( reply, c );
                         

protocols/jabber/jabber.c

@@ -81 +81 @@
         s = set_add( &acc->set, "tls", "try", set_eval_tls, acc );
         s->flags |= ACC_SET_OFFLINE_ONLY;
+        
+        s = set_add( &acc->set, "user_agent", "BitlBee", NULL, acc );
         
         s = set_add( &acc->set, "xmlconsole", "false", set_eval_bool, acc );
@@ -486 +488 @@
 {
         /* Just any whitespace character is enough as a keepalive for XMPP sessions. */
-        jabber_write( ic, "\n", 1 );
+        if( !jabber_write( ic, "\n", 1 ) )
+                return;
         
         /* This runs the garbage collection every minute, which means every packet

protocols/jabber/message.c

@@ -55 +55 @@
                         struct xt_node *inv, *reason;
                         
-                        if( strcmp( ns, XMLNS_MUC_USER ) == 0 &&
+                        if( ns && strcmp( ns, XMLNS_MUC_USER ) == 0 &&
                             ( inv = xt_find_node( c->children, "invite" ) ) )
                         {

protocols/twitter/twitter.c

@@ -40 +40 @@
                 return 0;
 
-        // If the user uses multiple private message windows we need to get the 
-        // users buddies.
-        if (g_strcasecmp(set_getstr(&ic->acc->set, "mode"), "many") == 0)
-                twitter_get_statuses_friends(ic, -1);
-
         // Do stuff..
         twitter_get_home_timeline(ic, -1);
@@ -56 +51 @@
         struct twitter_data *td = ic->proto_data;
         
-        imcb_log( ic, "Connecting to Twitter" );
+        imcb_log( ic, "Getting initial statuses" );
 
         // Run this once. After this queue the main loop function.
@@ -66 +61 @@
 }
 
+static void twitter_oauth_start( struct im_connection *ic );
+
+void twitter_login_finish( struct im_connection *ic )
+{
+        struct twitter_data *td = ic->proto_data;
+        
+        if( set_getbool( &ic->acc->set, "oauth" ) && !td->oauth_info )
+                twitter_oauth_start( ic );
+        else if( g_strcasecmp( set_getstr( &ic->acc->set, "mode" ), "one" ) != 0 &&
+                 !( td->flags & TWITTER_HAVE_FRIENDS ) )
+        {
+                imcb_log( ic, "Getting contact list" );
+                twitter_get_statuses_friends( ic, -1 );
+        }
+        else
+                twitter_main_loop_start( ic );
+}
 
 static const struct oauth_service twitter_oauth =
@@ -128 +140 @@
                 ic->acc->pass = oauth_to_string( info );
                 
-                twitter_main_loop_start( ic );
+                twitter_login_finish( ic );
         }
         
@@ -211 +223 @@
         imcb_buddy_status( ic, name, OPT_LOGGED_IN, NULL, NULL );
         
-        if( td->oauth_info || !set_getbool( &acc->set, "oauth" ) )
-                twitter_main_loop_start( ic );
-        else
-                twitter_oauth_start( ic );
+        imcb_log( ic, "Connecting" );
+        
+        twitter_login_finish( ic );
 }
 

protocols/twitter/twitter.h

@@ -33 +33 @@
 #endif
 
+typedef enum
+{
+        TWITTER_HAVE_FRIENDS = 1,
+} twitter_flags_t;
+
 struct twitter_data
 {
@@ -42 +47 @@
         struct groupchat *home_timeline_gc;
         gint http_fails;
+        twitter_flags_t flags;
         
         gboolean url_ssl;
@@ -56 +62 @@
 GSList *twitter_connections;
 
+void twitter_login_finish( struct im_connection *ic );
+
 #endif //_TWITTER_H

protocols/twitter/twitter_lib.c

@@ -59 +59 @@
 };
 
+static void twitter_groupchat_init(struct im_connection *ic);
+
 /**
  * Frees a twitter_xml_user struct.
@@ -433 +435 @@
 }
 
+static void twitter_groupchat_init(struct im_connection *ic)
+{
+        char *name_hint;
+        struct groupchat *gc;
+        struct twitter_data *td = ic->proto_data;
+        
+        td->home_timeline_gc = gc = imcb_chat_new( ic, "home/timeline" );
+        
+        name_hint = g_strdup_printf( "Twitter_%s", ic->acc->user );
+        imcb_chat_name_hint( gc, name_hint );
+        g_free( name_hint );
+}
+
 /**
  * Function that is called to see the statuses in a groupchat window.
@@ -445 +460 @@
         // Create a new groupchat if it does not exsist.
         if (!td->home_timeline_gc)
-        {   
-                char *name_hint = g_strdup_printf( "Twitter_%s", ic->acc->user );
-                td->home_timeline_gc = gc = imcb_chat_new( ic, "home/timeline" );
-                imcb_chat_name_hint( gc, name_hint );
-                g_free( name_hint );
-                // Add the current user to the chat...
+                twitter_groupchat_init(ic);
+        
+        gc = td->home_timeline_gc;
+        if (!gc->joined)
                 imcb_chat_add_buddy( gc, ic->acc->user );
-        }
-        else
-        {   
-                gc = td->home_timeline_gc;
-        }
 
         for ( l = list; l ; l = g_slist_next(l) )
@@ -604 +612 @@
         
         // Check if the HTTP request went well.
-        if (req->status_code != 200) {
+        if (req->status_code == 401)
+        {
+                imcb_error( ic, "Authentication failure" );
+                imc_logout( ic, FALSE );
+                return;
+        } else if (req->status_code != 200) {
                 // It didn't go well, output the error and return.
-                if (++td->http_fails >= 5)
-                        imcb_error(ic, "Could not retrieve " TWITTER_SHOW_FRIENDS_URL ": %s", twitter_parse_error(req));
-                
+                imcb_error(ic, "Could not retrieve " TWITTER_SHOW_FRIENDS_URL ": %s", twitter_parse_error(req));
+                imc_logout( ic, TRUE );
                 return;
         } else {
                 td->http_fails = 0;
         }
+        
+        if( !td->home_timeline_gc &&
+            g_strcasecmp( set_getstr( &ic->acc->set, "mode" ), "chat" ) == 0 )
+                twitter_groupchat_init( ic );
 
         txl = g_new0(struct twitter_xml_list, 1);
@@ -639 +655 @@
         txl_free(txl);
         g_free(txl);
+        
+        td->flags |= TWITTER_HAVE_FRIENDS;
+        twitter_login_finish(ic);
 }