Changeset eb6df6a for protocols/twitter

Timestamp:

2010-07-11T17:21:21Z (15 years ago)

Author:

Sven Moritz Hallberg <pesco@…>

Branches:

master

Children:

be999a5

Parents:

3759849 (diff), 00540d4 (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:

merge with upstraem bitlbee 1.2.8

Location:

protocols/twitter

Files:

• twitter.c (modified) (7 diffs)
• twitter.h (modified) (3 diffs)
• twitter_lib.c (modified) (11 diffs)
• twitter_lib.h (modified) (1 diff)

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 );
 }
 
@@ -236 +247 @@
         {
                 oauth_info_free( td->oauth_info );
+                g_free( td->url_host );
+                g_free( td->url_path );
                 g_free( td->pass );
                 g_free( td );
@@ -256 +269 @@
                     td->oauth_info && td->oauth_info->token == NULL )
                 {
-                        if( !oauth_access_token( message, td->oauth_info ) )
+                        char pin[strlen(message)+1], *s;
+                        
+                        strcpy( pin, message );
+                        for( s = pin + sizeof( pin ) - 2; s > pin && isspace( *s ); s -- )
+                                *s = '\0';
+                        for( s = pin; *s && isspace( *s ); s ++ ) {}
+                        
+                        if( !oauth_access_token( s, td->oauth_info ) )
                         {
                                 imcb_error( ic, "OAuth error: %s", "Failed to send access token request" );

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

@@ -42 +42 @@
 struct twitter_xml_list {
         int type;
-        int next_cursor;
+        gint64 next_cursor;
         GSList *list;
         gpointer data;
@@ -58 +58 @@
         guint64 id;
 };
+
+static void twitter_groupchat_init(struct im_connection *ic);
 
 /**
@@ -153 +155 @@
  * Get the friends ids.
  */
-void twitter_get_friends_ids(struct im_connection *ic, int next_cursor)
+void twitter_get_friends_ids(struct im_connection *ic, gint64 next_cursor)
 {
         // Primitive, but hey! It works...      
         char* args[2];
         args[0] = "cursor";
-        args[1] = g_strdup_printf ("%d", next_cursor);
+        args[1] = g_strdup_printf ("%lld", (long long) next_cursor);
         twitter_http(ic, TWITTER_FRIENDS_IDS_URL, twitter_http_get_friends_ids, ic, 0, args, 2);
 
@@ -169 +171 @@
 static xt_status twitter_xt_next_cursor( struct xt_node *node, struct twitter_xml_list *txl )
 {
-        // Do something with the cursor.
-        txl->next_cursor = node->text != NULL ? atoi(node->text) : -1;
+        char *end = NULL;
+        
+        if( node->text )
+                txl->next_cursor = g_ascii_strtoll( node->text, &end, 10 );
+        if( end == NULL )
+                txl->next_cursor = -1;
 
         return XT_HANDLED;
@@ -413 +419 @@
  * Get the timeline.
  */
-void twitter_get_home_timeline(struct im_connection *ic, int next_cursor)
+void twitter_get_home_timeline(struct im_connection *ic, gint64 next_cursor)
 {
         struct twitter_data *td = ic->proto_data;
@@ -419 +425 @@
         char* args[4];
         args[0] = "cursor";
-        args[1] = g_strdup_printf ("%d", next_cursor);
+        args[1] = g_strdup_printf ("%lld", (long long) next_cursor);
         if (td->home_timeline_id) {
                 args[2] = "since_id";
@@ -431 +437 @@
                 g_free(args[3]);
         }
+}
+
+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 );
 }
 
@@ -445 +464 @@
         // 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 +616 @@
         
         // 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);
@@ -634 +654 @@
         // if the next_cursor is set to something bigger then 0 there are more friends to gather.
         if (txl->next_cursor > 0)
+        {
                 twitter_get_statuses_friends(ic, txl->next_cursor);
-
+        }
+        else
+        {
+                td->flags |= TWITTER_HAVE_FRIENDS;
+                twitter_login_finish(ic);
+        }
+        
         // Free the structure.
         txl_free(txl);
@@ -644 +671 @@
  * Get the friends.
  */
-void twitter_get_statuses_friends(struct im_connection *ic, int next_cursor)
+void twitter_get_statuses_friends(struct im_connection *ic, gint64 next_cursor)
 {
         char* args[2];
         args[0] = "cursor";
-        args[1] = g_strdup_printf ("%d", next_cursor);
+        args[1] = g_strdup_printf ("%lld", (long long) next_cursor);
 
         twitter_http(ic, TWITTER_SHOW_FRIENDS_URL, twitter_http_get_statuses_friends, ic, 0, args, 2);

protocols/twitter/twitter_lib.h

@@ -76 +76 @@
 #define TWITTER_BLOCKS_DESTROY_URL "/blocks/destroy/"
 
-void twitter_get_friends_ids(struct im_connection *ic, int next_cursor);
-void twitter_get_home_timeline(struct im_connection *ic, int next_cursor);
-void twitter_get_statuses_friends(struct im_connection *ic, int next_cursor);
+void twitter_get_friends_ids(struct im_connection *ic, gint64 next_cursor);
+void twitter_get_home_timeline(struct im_connection *ic, gint64 next_cursor);
+void twitter_get_statuses_friends(struct im_connection *ic, gint64 next_cursor);
 
 void twitter_post_status(struct im_connection *ic, char *msg);