Changeset ffcdf13 for protocols/twitter

Timestamp:

2010-07-17T15:06:56Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

5c18a76

Parents:

0d691ea

Message:

When using non-Twitter Twitter API services, prefix the channel and contact
name with that service name, not always Twitter. This is especially useful
when having multiple accounts on different sites with the same username.

Also adding an "identica" protocol entry for convenience.

Based on a patch from kensanata, bug #648.

Location:

protocols/twitter

Files:

• twitter.c (modified) (9 diffs)
• twitter.h (modified) (1 diff)
• twitter_lib.c (modified) (2 diffs)
• twitter_lib.h (modified) (1 diff)

protocols/twitter/twitter.c

@@ -119 +119 @@
                 }
                 
-                sprintf( name, "twitter_%s", ic->acc->user );
+                sprintf( name, "%s_%s", td->prefix, ic->acc->user );
                 msg = g_strdup_printf( "To finish OAuth authentication, please visit "
                                        "%s and respond with the resulting PIN code.",
@@ -172 +172 @@
 {
         set_t *s;
-        
-        s = set_add( &acc->set, "base_url", TWITTER_API_URL, NULL, acc );
+        char *def_url;
+        char *def_oauth;
+        
+        if( strcmp( acc->prpl->name, "twitter" ) == 0 )
+        {
+                def_url = TWITTER_API_URL;
+                def_oauth = "true";
+        }
+        else /* if( strcmp( acc->prpl->name, "identica" ) == 0 ) */
+        {
+                def_url = IDENTICA_API_URL;
+                def_oauth = "false";
+        }
+        
+        s = set_add( &acc->set, "base_url", def_url, NULL, acc );
         s->flags |= ACC_SET_OFFLINE_ONLY;
         
@@ -181 +194 @@
         s->flags |= ACC_SET_OFFLINE_ONLY;
         
-        s = set_add( &acc->set, "oauth", "true", set_eval_bool, acc );
+        s = set_add( &acc->set, "oauth", def_oauth, set_eval_bool, acc );
 }
 
@@ -214 +227 @@
         else
                 td->url_path = g_strdup( "" );
+        if( g_str_has_suffix( url.host, ".com" ) )
+                td->prefix = g_strndup( url.host, strlen( url.host ) - 4 );
+        else
+                td->prefix = g_strdup( url.host );
         
         td->user = acc->user;
@@ -219 +236 @@
                 td->oauth_info = oauth_from_string( acc->pass, &twitter_oauth );
         
-        sprintf( name, "twitter_%s", acc->user );
+        sprintf( name, "%s_%s", td->prefix, acc->user );
         imcb_add_buddy( ic, name, NULL );
         imcb_buddy_status( ic, name, OPT_LOGGED_IN, NULL, NULL );
@@ -247 +264 @@
         {
                 oauth_info_free( td->oauth_info );
+                g_free( td->prefix );
                 g_free( td->url_host );
                 g_free( td->url_path );
@@ -262 +280 @@
 {
         struct twitter_data *td = ic->proto_data;
-        
-        if (g_strncasecmp(who, "twitter_", 8) == 0 &&
-            g_strcasecmp(who + 8, ic->acc->user) == 0)
+        int plen = strlen( td->prefix );
+        
+        if (g_strncasecmp(who, td->prefix, plen) == 0 && who[plen] == '_' &&
+            g_strcasecmp(who + plen + 1, ic->acc->user) == 0)
         {
                 if( set_getbool( &ic->acc->set, "oauth" ) &&
@@ -416 +435 @@
         ret->send_typing = twitter_send_typing;
         ret->handle_cmp = g_strcasecmp;
-
+        
+        register_protocol(ret);
+
+        /* And an identi.ca variant: */
+        ret = g_memdup(ret, sizeof(struct prpl));
+        ret->name = "identica";
         register_protocol(ret);
 
@@ -422 +446 @@
         twitter_connections = NULL;
 }
-

protocols/twitter/twitter.h

@@ -53 +53 @@
         char *url_host;
         char *url_path;
+
+        char *prefix; /* Used to generate contact + channel name. */
 };
 

protocols/twitter/twitter_lib.c

@@ -459 +459 @@
         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->prefix, ic->acc->user );
         imcb_chat_name_hint( gc, name_hint );
         g_free( name_hint );
@@ -519 +519 @@
         if( mode_one )
         {
-                g_snprintf( from, sizeof( from ) - 1, "twitter_%s", ic->acc->user );
+                g_snprintf( from, sizeof( from ) - 1, "%s_%s", td->prefix, ic->acc->user );
                 from[MAX_STRING-1] = '\0';
         }

protocols/twitter/twitter_lib.h

@@ -30 +30 @@
 
 #define TWITTER_API_URL "http://twitter.com"
+#define IDENTICA_API_URL "http://identi.ca/api"
 
 /* Status URLs */