Changeset 508c340 for protocols

Timestamp:

2010-04-26T00:42:37Z (15 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

acba168

Parents:

b2bc25c

Message:

Successfully posted a tweet!

Twitter's tricky. It returns vars (user_id, screen_name) in the access token
that, the way I read the spec, should be included in all subsequent queries.
However, stuff only started to work when I dropped those vars.

This code's definitely not pretty ATM. Need to clean up now that it actually
works.

Location:

protocols/twitter

Files:

• twitter.c (modified) (2 diffs)
• twitter.h (modified) (1 diff)
• twitter_http.c (modified) (3 diffs)
• twitter_http.h (modified) (1 diff)
• twitter_lib.c (modified) (5 diffs)

protocols/twitter/twitter.c

@@ -82 +82 @@
 
         td->user = acc->user;
-        td->pass = acc->pass;
+        if( strstr( acc->pass, "oauth_token=" ) == NULL )
+                td->pass = g_strdup( acc->pass );
+        else
+                td->oauth = g_strdup( acc->pass );
         td->home_timeline_id = 0;
 
@@ -119 +122 @@
         if( td )
         {
+                g_free( td->pass );
+                g_free( td->oauth );
                 g_free( td );
         }

protocols/twitter/twitter.h

@@ -37 +37 @@
         char* user;
         char* pass;
+        char* oauth;
         guint64 home_timeline_id;
         gint main_loop_id;

protocols/twitter/twitter_http.c

@@ -35 +35 @@
 #include "misc.h"
 #include "base64.h"
+#include "oauth.h"
 #include <ctype.h>
 #include <errno.h>
@@ -45 +46 @@
  * This is actually pretty generic function... Perhaps it should move to the lib/http_client.c
  */
-void *twitter_http(char *url_string, http_input_function func, gpointer data, int is_post, char* user, char* pass, char** arguments, int arguments_len)
+void *twitter_http(char *url_string, http_input_function func, gpointer data, int is_post, char* user, char* pass, char* oauth_token, char** arguments, int arguments_len)
 {
         url_t *url = g_new0( url_t, 1 );
@@ -110 +111 @@
 
         // If a pass and user are given we append them to the request.
-        if (userpass_base64)
+        if (oauth_token)
+        {
+                char *full_header;
+                
+                full_header = oauth_http_header(oauth_token,
+                                                is_post ? "POST" : "GET",
+                                                url_string, url_arguments);
+                
+                tmp = g_strdup_printf("%sAuthorization: %s\r\n", request, full_header);
+                g_free(request);
+                g_free(full_header);
+                request = tmp;
+        }
+        else if (userpass_base64)
         {
                 tmp = g_strdup_printf("%sAuthorization: Basic %s\r\n", request, userpass_base64);

protocols/twitter/twitter_http.h

@@ -29 +29 @@
 
 void *twitter_http(char *url_string, http_input_function func, gpointer data, int is_post, 
-                                        char* user, char* pass, char** arguments, int arguments_len);
+                   char* user, char* pass, char *oauth_token, char** arguments, int arguments_len);
 
 #endif //_TWITTER_HTTP_H

protocols/twitter/twitter_lib.c

@@ -130 +130 @@
         args[0] = "cursor";
         args[1] = g_strdup_printf ("%d", next_cursor);
-        twitter_http(TWITTER_FRIENDS_IDS_URL, twitter_http_get_friends_ids, ic, 0, td->user, td->pass, args, 2);
+        twitter_http(TWITTER_FRIENDS_IDS_URL, twitter_http_get_friends_ids, ic, 0, td->user, td->pass, td->oauth, args, 2);
 
         g_free(args[1]);
@@ -396 +396 @@
         }
 
-        twitter_http(TWITTER_HOME_TIMELINE_URL, twitter_http_get_home_timeline, ic, 0, td->user, td->pass, args, td->home_timeline_id ? 4 : 2);
+        twitter_http(TWITTER_HOME_TIMELINE_URL, twitter_http_get_home_timeline, ic, 0, td->user, td->pass, td->oauth, args, td->home_timeline_id ? 4 : 2);
 
         g_free(args[1]);
@@ -620 +620 @@
         args[1] = g_strdup_printf ("%d", next_cursor);
 
-        twitter_http(TWITTER_SHOW_FRIENDS_URL, twitter_http_get_statuses_friends, ic, 0, td->user, td->pass, args, 2);
+        twitter_http(TWITTER_SHOW_FRIENDS_URL, twitter_http_get_statuses_friends, ic, 0, td->user, td->pass, td->oauth, args, 2);
 
         g_free(args[1]);
@@ -654 +654 @@
         args[0] = "status";
         args[1] = msg;
-        twitter_http(TWITTER_STATUS_UPDATE_URL, twitter_http_post_status, ic, 1, td->user, td->pass, args, 2);
+        twitter_http(TWITTER_STATUS_UPDATE_URL, twitter_http_post_status, ic, 1, td->user, td->pass, td->oauth, args, 2);
 //      g_free(args[1]);
 }
@@ -672 +672 @@
         args[3] = msg;
         // Use the same callback as for twitter_post_status, since it does basically the same.
-        twitter_http(TWITTER_DIRECT_MESSAGES_NEW_URL, twitter_http_post_status, ic, 1, td->user, td->pass, args, 4);
+        twitter_http(TWITTER_DIRECT_MESSAGES_NEW_URL, twitter_http_post_status, ic, 1, td->user, td->pass, td->oauth, args, 4);
 //      g_free(args[1]);
 //      g_free(args[3]);