Changeset c0f33f1

Timestamp:

2011-06-11T17:50:26Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

4bc66ae

Parents:

de923d5

Message:

Change the default base_url to something that works. Change the default for
identi.ca to HTTPS while I'm at it. Pretty important since I can't use OAuth
for it yet.

Files:

• doc/user-guide/commands.xml (modified) (1 diff)
• protocols/twitter/twitter.c (modified) (4 diffs)
• protocols/twitter/twitter_lib.c (modified) (2 diffs)
• protocols/twitter/twitter_lib.h (modified) (1 diff)

doc/user-guide/commands.xml

@@ -771 +771 @@
 
         <bitlbee-setting name="base_url" type="string" scope="account">
-                <default>http://twitter.com</default>
+                <default>http://api.twitter.com/1</default>
 
                 <description>

protocols/twitter/twitter.c

@@ -249 +249 @@
         char name[strlen(acc->user) + 9];
         url_t url;
-
+        char *s;
+        
         if (!url_set(&url, set_getstr(&ic->acc->set, "base_url")) ||
             (url.proto != PROTO_HTTP && url.proto != PROTO_HTTPS)) {
@@ -257 +258 @@
         }
 
+        imcb_log(ic, "Connecting");
+
         twitter_connections = g_slist_append(twitter_connections, ic);
         td = g_new0(struct twitter_data, 1);
@@ -267 +270 @@
         if (strcmp(url.file, "/") != 0)
                 td->url_path = g_strdup(url.file);
-        else
+        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);
-
+                if (g_str_has_suffix(url.host, "twitter.com"))
+                        /* May fire for people who turned on HTTPS. */
+                        imcb_error(ic, "Warning: Twitter requires a version number in API calls "
+                                       "now. Try resetting the base_url account setting.");
+        }
+        
+        /* Hacky string mangling: Turn identi.ca into identi.ca and api.twitter.com
+           into twitter, and try to be sensible if we get anything else. */
+        td->prefix = g_strdup(url.host);
+        if (g_str_has_suffix(td->prefix, ".com"))
+                td->prefix[strlen(url.host) - 4] = '\0';
+        if ((s = strrchr(td->prefix, '.'))) {
+                s = g_strdup(s + 1);
+                g_free(td->prefix);
+                td->prefix = s;
+        }
+        
         if (strstr(acc->pass, "oauth_token="))
                 td->oauth_info = oauth_from_string(acc->pass, get_oauth_service(ic));
@@ -283 +298 @@
         if (set_getbool(&acc->set, "show_ids"))
                 td->log = g_new0(struct twitter_log_data, TWITTER_LOG_LENGTH);
-
-        imcb_log(ic, "Connecting");
 
         twitter_login_finish(ic);

protocols/twitter/twitter_lib.c

@@ -144 +144 @@
         static char *ret = NULL;
         struct xt_parser *xp = NULL;
-        struct xt_node *node;
+        struct xt_node *node, *err;
 
         g_free(ret);
@@ -154 +154 @@
                 
                 for (node = xp->root; node; node = node->next)
-                        if ((node = xt_find_node(node->children, "error")) && node->text_len > 0) {
-                                ret = g_strdup_printf("%s (%s)", req->status_string, node->text);
+                        if ((err = xt_find_node(node->children, "error")) && err->text_len > 0) {
+                                ret = g_strdup_printf("%s (%s)", req->status_string, err->text);
                                 break;
                         }

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"
+#define TWITTER_API_URL "http://api.twitter.com/1"
+#define IDENTICA_API_URL "https://identi.ca/api"
 
 /* Status URLs */