Ticket #648: kensanata.3.diff

protocols/twitter/Makefile

@@ -23 +23 @@
 lcov: check
 gcov: 
         gcov *.c
-        
+
 .PHONY: all clean distclean
 
 clean:
@@ -42 +42 @@
 twitter_mod.o: $(objects)
         @echo '*' Linking twitter_mod.o
         @$(LD) $(LFLAGS) $(objects) -o twitter_mod.o
-        
-

protocols/twitter/twitter.c

@@ -118 +118 @@
                         return FALSE;
                 }
                 
-                sprintf( name, "twitter_%s", ic->acc->user );
+                sprintf( name, "%s_%s", td->host, ic->acc->user );
                 msg = g_strdup_printf( "To finish OAuth authentication, please visit "
                                        "%s and respond with the resulting PIN code.",
                                        info->auth_url );
@@ -183 +183 @@
         s = set_add( &acc->set, "oauth", "true", set_eval_bool, acc );
 }
 
+static void identica_init( account_t *acc )
+{
+        set_t *s;
+        
+        s = set_add( &acc->set, "base_url", IDENTICA_API_URL, NULL, acc );
+        s->flags |= ACC_SET_OFFLINE_ONLY;
+        
+        s = set_add( &acc->set, "message_length", "140", set_eval_int, acc );
+        
+        s = set_add( &acc->set, "mode", "one", set_eval_mode, acc );
+        s->flags |= ACC_SET_OFFLINE_ONLY;
+        
+        s = set_add( &acc->set, "oauth", "false", set_eval_bool, acc );
+}
+
 /**
  * Login method. Since the twitter API works with seperate HTTP request we 
  * only save the user and pass to the twitter_data object.
@@ -213 +228 @@
                 td->url_path = g_strdup( url.file );
         else
                 td->url_path = g_strdup( "" );
+        if( g_str_has_suffix( url.host, ".com" ) )
+                td->host = g_strndup ( url.host, strlen( url.host ) - 4 );
+        else
+                td->host = g_strdup ( url.host );
         
         td->user = acc->user;
         if( strstr( acc->pass, "oauth_token=" ) )
                 td->oauth_info = oauth_from_string( acc->pass, &twitter_oauth );
         
-        sprintf( name, "twitter_%s", acc->user );
+        sprintf( name, "%s_%s", td->host, acc->user );
         imcb_add_buddy( ic, name, NULL );
         imcb_buddy_status( ic, name, OPT_LOGGED_IN, NULL, NULL );
         
@@ -246 +265 @@
         if( td )
         {
                 oauth_info_free( td->oauth_info );
+                g_free( td->host );
                 g_free( td->url_host );
                 g_free( td->url_path );
                 g_free( td->pass );
@@ -261 +281 @@
 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)
+        gchar** s = g_strsplit(who, "_", 2); /* who has a value of "twitter.com_nick" */
+        if (NULL != s &&
+            g_strcasecmp(s[0], td->host) == 0 &&
+            g_strcasecmp(s[1], ic->acc->user) == 0)
         {
                 if( set_getbool( &ic->acc->set, "oauth" ) &&
                     td->oauth_info && td->oauth_info->token == NULL )
@@ -418 +439 @@
 
         register_protocol(ret);
 
+        ret = g_new0(struct prpl, 1);
+        
+        ret->name = "identica";
+        ret->login = twitter_login;
+        ret->init = identica_init;
+        ret->logout = twitter_logout;
+        ret->buddy_msg = twitter_buddy_msg;
+        ret->get_info = twitter_get_info;
+        ret->set_my_name = twitter_set_my_name;
+        ret->add_buddy = twitter_add_buddy;
+        ret->remove_buddy = twitter_remove_buddy;
+        ret->chat_msg = twitter_chat_msg;
+        ret->chat_invite = twitter_chat_invite;
+        ret->chat_leave = twitter_chat_leave;
+        ret->chat_with = twitter_chat_with;
+        ret->keepalive = twitter_keepalive;
+        ret->add_permit = twitter_add_permit;
+        ret->rem_permit = twitter_rem_permit;
+        ret->add_deny = twitter_add_deny;
+        ret->rem_deny = twitter_rem_deny;
+        ret->send_typing = twitter_send_typing;
+        ret->handle_cmp = g_strcasecmp;
+
+        register_protocol(ret);
+
         // Initialise the twitter_connections GSList.
         twitter_connections = NULL;
 }
-

protocols/twitter/twitter.h

@@ -52 +52 @@
         int url_port;
         char *url_host;
         char *url_path;
+        char *host;
 };
 
 /**

protocols/twitter/twitter_lib.c

@@ -446 +446 @@
         
         td->home_timeline_gc = gc = imcb_chat_new( ic, "home/timeline" );
         
-        name_hint = g_strdup_printf( "Twitter_%s", ic->acc->user );
+        name_hint = g_strdup_printf( "%s_%s", td->host, ic->acc->user );
         imcb_chat_name_hint( gc, name_hint );
         g_free( name_hint );
 }
@@ -503 +503 @@
 
         if( mode_one )
         {
-                g_snprintf( from, sizeof( from ) - 1, "twitter_%s", ic->acc->user );
+                g_snprintf( from, sizeof( from ) - 1, "%s_%s", td->host, ic->acc->user );
                 from[MAX_STRING-1] = '\0';
         }
         
@@ -735 +735 @@
         args[0] = "screen_name";
         args[1] = who;
         twitter_http(ic, create ? TWITTER_FRIENDSHIPS_CREATE_URL : TWITTER_FRIENDSHIPS_DESTROY_URL, twitter_http_post, ic, 1, args, 2);
-}
- No newline at end of file
+}

protocols/twitter/twitter_lib.h

@@ -29 +29 @@
 #include "twitter_http.h"
 
 #define TWITTER_API_URL "http://twitter.com"
+#define IDENTICA_API_URL "http://identi.ca/api"
 
 /* Status URLs */
 #define TWITTER_STATUS_UPDATE_URL "/statuses/update.xml"