Changeset bb5ce4d1 for protocols/twitter/twitter.c

Timestamp:

2010-05-23T12:50:51Z (11 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

a7b9ec7

Parents:

f9110b4

Message:

Added base_url settting to Twitter module so other services using the
Twitter API can be used. Only with Basic authentication though.

File:

• protocols/twitter/twitter.c (modified) (4 diffs)

protocols/twitter/twitter.c

@@ -27 +27 @@
 #include "twitter_http.h"
 #include "twitter_lib.h"
+#include "url.h"
 
 /**
@@ -160 +161 @@
         set_t *s;
         
+        s = set_add( &acc->set, "base_url", TWITTER_API_URL, NULL, acc );
+        s->flags |= ACC_SET_OFFLINE_ONLY;
+        
         s = set_add( &acc->set, "message_length", "140", set_eval_int, acc );
         
@@ -175 +179 @@
 {
         struct im_connection *ic = imcb_new( acc );
-        struct twitter_data *td = g_new0( struct twitter_data, 1 );
+        struct twitter_data *td;
         char name[strlen(acc->user)+9];
-
+        url_t url;
+
+        if( !url_set( &url, set_getstr( &ic->acc->set, "base_url" ) ) ||
+            ( url.proto != PROTO_HTTP && url.proto != PROTO_HTTPS ) )
+        {
+                imcb_error( ic, "Incorrect API base URL: %s", set_getstr( &ic->acc->set, "base_url" ) );
+                imc_logout( ic, FALSE );
+                return;
+        }
+        
         twitter_connections = g_slist_append( twitter_connections, ic );
+        td = g_new0( struct twitter_data, 1 );
         ic->proto_data = td;
         
+        td->url_ssl = url.proto == PROTO_HTTPS;
+        td->url_port = url.port;
+        td->url_host = g_strdup( url.host );
+        if( strcmp( url.file, "/" ) != 0 )
+                td->url_path = g_strdup( url.file );
+        else
+                td->url_path = g_strdup( "" );
+        
         td->user = acc->user;
-        if( !set_getbool( &acc->set, "oauth" ) )
-                td->pass = g_strdup( acc->pass );
-        else if( strstr( acc->pass, "oauth_token=" ) )
+        if( strstr( acc->pass, "oauth_token=" ) )
                 td->oauth_info = oauth_from_string( acc->pass, &twitter_oauth );
-        td->home_timeline_id = 0;
         
         sprintf( name, "twitter_%s", acc->user );
@@ -192 +211 @@
         imcb_buddy_status( ic, name, OPT_LOGGED_IN, NULL, NULL );
         
-        if( td->pass || td->oauth_info )
+        if( td->oauth_info || !set_getbool( &acc->set, "oauth" ) )
                 twitter_main_loop_start( ic );
         else