Changeset c42e8b9 for protocols

Timestamp:

2010-04-26T22:40:11Z (15 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

78a2f1e

Parents:

713d611

Message:

OAuth, it lives!

Location:

protocols/twitter

Files:

• twitter.c (modified) (4 diffs)
• twitter.h (modified) (1 diff)

protocols/twitter/twitter.c

@@ -70 +70 @@
 static void twitter_oauth_start( struct im_connection *ic )
 {
+        imcb_log( ic, "Requesting OAuth request token" );
+
         oauth_request_token( TWITTER_OAUTH_REQUEST_TOKEN, twitter_oauth_callback, ic );
 }
@@ -76 +78 @@
 {
         struct im_connection *ic = info->data;
-        
-        if( info->request_token && info->access_token == NULL )
+        struct twitter_data *td = ic->proto_data;
+        
+        if( info->stage == OAUTH_REQUEST_TOKEN )
         {
                 char name[strlen(ic->acc->user)+9], *msg;
+                
+                if( info->request_token == NULL )
+                {
+                        imcb_error( ic, "OAuth error: %s", info->http->status_string );
+                        imc_logout( ic, TRUE );
+                        return;
+                }
+                
+                td->oauth_info = info;
                 
                 sprintf( name, "twitter_%s", ic->acc->user );
@@ -88 +100 @@
                 g_free( msg );
         }
+        else if( info->stage == OAUTH_ACCESS_TOKEN )
+        {
+                if( info->access_token == NULL )
+                {
+                        imcb_error( ic, "OAuth error: %s", info->http->status_string );
+                        imc_logout( ic, TRUE );
+                        return;
+                }
+                
+                td->oauth = g_strdup( info->access_token );
+                
+                twitter_main_loop_start( ic );
+        }
 }
 
@@ -171 +196 @@
 static int twitter_buddy_msg( struct im_connection *ic, char *who, char *message, int away )
 {
+        struct twitter_data *td = ic->proto_data;
+        
         if (g_strncasecmp(who, "twitter_", 8) == 0 &&
             g_strcasecmp(who + 8, ic->acc->user) == 0)
-                twitter_post_status(ic, message);
+        {
+                if( set_getbool( &ic->acc->set, "oauth" ) && td->oauth == NULL )
+                        oauth_access_token( TWITTER_OAUTH_ACCESS_TOKEN, message, td->oauth_info );
+                else
+                        twitter_post_status(ic, message);
+        }
         else
+        {
                 twitter_direct_messages_new(ic, who, message);
-        
+        }
         return( 0 );
 }

protocols/twitter/twitter.h

@@ -38 +38 @@
         char* pass;
         char* oauth;
+        struct oauth_info *oauth_info;
         guint64 home_timeline_id;
         gint main_loop_id;