Changeset 5246133 for protocols

Timestamp:

2012-11-09T00:23:44Z (12 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

5d749ad

Parents:

fb351ce

Message:

Updated error response parsing. Also, use this for 401 responses so for example
the auth errors caused by NTP desync are clearer:

<root> twitter - Login error: Authentication failure (401 Unauthorized

(Timestamp out of bounds))

File:

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

protocols/twitter/twitter_lib.c

@@ -169 +169 @@
 {
         static char *ret = NULL;
-        struct xt_node *root, *node, *err;
+        json_value *root, *err;
 
         g_free(ret);
         ret = NULL;
 
-        /* EX:
-        {"errors":[{"message":"Rate limit exceeded","code":88}]} */
         if (req->body_size > 0) {
-                root = xt_from_string(req->reply_body, req->body_size);
-                
-                for (node = root; node; node = node->next)
-                        if ((err = xt_find_node(node->children, "error")) && err->text_len > 0) {
-                                ret = g_strdup_printf("%s (%s)", req->status_string, err->text);
-                                break;
-                        }
-
-                xt_free_node(root);
+                root = json_parse(req->reply_body);
+                err = json_o_get(root, "errors");
+                if (err->type == json_array && (err = err->u.array.values[0]) &&
+                    err->type == json_object) {
+                        const char *msg = json_o_str(err, "message");
+                        if (msg)
+                                ret = g_strdup_printf("%s (%s)", req->status_string, msg);
+                }
+                json_value_free(root);
         }
 
@@ -216 +214 @@
                    throwing 401s so I'll keep treating this one as fatal
                    only during login. */
-                imcb_error(ic, "Authentication failure");
+                imcb_error(ic, "Authentication failure (%s)",
+                               twitter_parse_error(req));
                 imc_logout(ic, FALSE);
                 return NULL;