Changeset fb351ce

Timestamp:

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

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

5246133

Parents:

8e3b7ac

Message:

Getting better. Corruption fixed, fetching of mentions fixed, error handling
"fixed".

Location:

protocols/twitter

Files:

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

protocols/twitter/twitter_lib.c

@@ -174 +174 @@
         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);
@@ -189 +191 @@
 }
 
-/* TODO: NULL means failure, but not always that the connection is dead. This sucks for callers. */
+/* WATCH OUT: This function might or might not destroy your connection.
+   Sub-optimal indeed, but just be careful when this returns NULL! */
 static json_value *twitter_parse_response(struct im_connection *ic, struct http_request *req)
 {
@@ -457 +460 @@
 static xt_status twitter_xt_get_status(const json_value *node, struct twitter_xml_status *txs)
 {
-        const json_value *c, *rt = NULL, *entities = NULL;
+        const json_value *rt = NULL, *entities = NULL;
         int i;
         
@@ -468 +471 @@
                 
                 if (strcmp("text", k) == 0 && v->type == json_string) {
-                        txs->text = g_memdup(v->u.string.ptr, v->u.string.length);
+                        txs->text = g_memdup(v->u.string.ptr, v->u.string.length + 1);
                 } else if (strcmp("retweeted_status", k) == 0 && v->type == json_object) {
                         rt = v;
@@ -486 +489 @@
                         txs->reply_to = v->u.integer;
                 } else if (strcmp("entities", k) == 0 && v->type == json_object) {
-                        txs->reply_to = v->u.integer;
+                        entities = v;
                 }
         }
@@ -502 +505 @@
                 txs->text = g_strdup_printf("RT @%s: %s", rtxs->user->screen_name, rtxs->text);
                 txs_free(rtxs);
-        } else if (entities && NULL) {
+        } else if (entities) {
                 JSON_O_FOREACH (entities, k, v) {
                         int i;
@@ -545 +548 @@
 {
         struct twitter_xml_status *txs;
-        json_value *c;
         bee_user_t *bu;
         int i;
@@ -917 +919 @@
 
       end:
+        if (!g_slist_find(twitter_connections, ic))
+                return;
+
         td->flags |= TWITTER_GOT_TIMELINE;
 
@@ -950 +955 @@
 
       end:
+        if (!g_slist_find(twitter_connections, ic))
+                return;
+
         td->flags |= TWITTER_GOT_MENTIONS;
 

protocols/twitter/twitter_lib.h

@@ -43 +43 @@
 #define TWITTER_FRIENDS_TIMELINE_URL "/statuses/friends_timeline.json"
 #define TWITTER_HOME_TIMELINE_URL "/statuses/home_timeline.json"
-#define TWITTER_MENTIONS_URL "/statuses/mentions.json"
+#define TWITTER_MENTIONS_URL "/statuses/mentions_timeline.json"
 #define TWITTER_USER_TIMELINE_URL "/statuses/user_timeline.json"