Changeset a7b9ec7 for protocols

Timestamp:

2010-05-23T13:49:54Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

186bd04

Parents:

bb5ce4d1

Message:

Improved error reporting (get textual HTTP error message and error message
from Twitter API response if possible).

File:

• protocols/twitter/twitter_lib.c (modified) (9 diffs)

protocols/twitter/twitter_lib.c

@@ -117 +117 @@
 }
 
+/* Warning: May return a malloc()ed value, which will be free()d on the next
+   call. Only for short-term use. */
+static char *twitter_parse_error(struct http_request *req)
+{
+        static char *ret = NULL;
+        struct xt_parser *xp;
+        struct xt_node *node;
+        char *err_s = NULL;
+        
+        g_free(ret);
+        ret = NULL;
+        
+        xp = xt_new(NULL, NULL);
+        xt_feed(xp, req->reply_body, req->body_size);
+        
+        if ((node = xt_find_node(xp->root, "hash")) &&
+            (node = xt_find_node(node->children, "error")) &&
+            node->text_len > 0)
+                err_s = node->text;
+        
+        if (err_s)
+        {
+                ret = g_strdup_printf("%s (%s)", req->status_string, err_s);
+                xt_free(xp);
+                return ret;
+        }
+        else
+        {
+                return req->status_string;
+        }
+}
+
 static void twitter_http_get_friends_ids(struct http_request *req);
 
@@ -124 +156 @@
 void twitter_get_friends_ids(struct im_connection *ic, int next_cursor)
 {
-        struct twitter_data *td = ic->proto_data;
-
         // Primitive, but hey! It works...      
         char* args[2];
@@ -196 +226 @@
                 // It didn't go well, output the error and return.
                 if (++td->http_fails >= 5)
-                        imcb_error(ic, "Could not retrieve friends. HTTP STATUS: %d", req->status_code);
+                        imcb_error(ic, "Could not retrieve friends: %s", twitter_parse_error(req));
                 
                 return;
@@ -526 +556 @@
                 // It didn't go well, output the error and return.
                 if (++td->http_fails >= 5)
-                        imcb_error(ic, "Could not retrieve " TWITTER_HOME_TIMELINE_URL ". HTTP STATUS: %d", req->status_code);
+                        imcb_error(ic, "Could not retrieve " TWITTER_HOME_TIMELINE_URL ": %s", twitter_parse_error(req));
                 
                 return;
@@ -578 +608 @@
                 // It didn't go well, output the error and return.
                 if (++td->http_fails >= 5)
-                        imcb_error(ic, "Could not retrieve " TWITTER_SHOW_FRIENDS_URL " HTTP STATUS: %d", req->status_code);
+                        imcb_error(ic, "Could not retrieve " TWITTER_SHOW_FRIENDS_URL ": %s", twitter_parse_error(req));
                 
                 return;
@@ -617 +647 @@
 void twitter_get_statuses_friends(struct im_connection *ic, int next_cursor)
 {
-        struct twitter_data *td = ic->proto_data;
-
         char* args[2];
         args[0] = "cursor";
@@ -642 +670 @@
         if (req->status_code != 200) {
                 // It didn't go well, output the error and return.
-                imcb_error(ic, "Could not post message... HTTP STATUS: %d", req->status_code);
+                imcb_error(ic, "Could not post message: %s", twitter_parse_error(req));
                 return;
         }
@@ -652 +680 @@
 void twitter_post_status(struct im_connection *ic, char* msg)
 {
-        struct twitter_data *td = ic->proto_data;
-
         char* args[2];
         args[0] = "status";
@@ -667 +693 @@
 void twitter_direct_messages_new(struct im_connection *ic, char *who, char *msg)
 {
-        struct twitter_data *td = ic->proto_data;
-
         char* args[4];
         args[0] = "screen_name";