Changeset 429a9b1

Timestamp:

2011-08-26T20:16:17Z (13 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

0fff0b2

Parents:

2322a9f

Message:

Since t.co is all over Twitter now, start parsing and showing entity
information. I'm going for this way of rendering even though full URLs are
also available to me because A) it puts me on the safe side wrt Twitter ToS
and B) some full URLS may really be very long.

Noticed some problem with truncated RT statuses not getting fixed but this
seems to be unrelated. (This is a truncated RT status without the
"truncated" property set.)

Bug #821.

File:

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

protocols/twitter/twitter_lib.c

@@ -499 +499 @@
                 txs->text = g_strdup_printf("RT @%s: %s", rtxs->user->screen_name, rtxs->text);
                 txs_free(rtxs);
+        } else {
+                struct xt_node *urls, *url;
+                
+                urls = xt_find_path(node, "entities/urls");
+                for (url = urls ? urls->children : NULL; url; url = url->next) {
+                        /* "short" is a reserved word. :-P */
+                        struct xt_node *kort = xt_find_node(url->children, "url");
+                        struct xt_node *disp = xt_find_node(url->children, "display_url");
+                        char *pos, *new;
+                        
+                        if (!kort || !kort->text || !disp || !disp->text ||
+                            !(pos = strstr(txs->text, kort->text)))
+                                continue;
+                        
+                        *pos = '\0';
+                        new = g_strdup_printf("%s%s <%s>%s", txs->text, kort->text,
+                                              disp->text, pos + strlen(kort->text));
+                        
+                        g_free(txs->text);
+                        txs->text = new;
+                }
         }
 
@@ -788 +809 @@
         td->flags &= ~TWITTER_GOT_TIMELINE;
 
-        char *args[4];
+        char *args[6];
         args[0] = "cursor";
         args[1] = g_strdup_printf("%lld", (long long) next_cursor);
+        args[2] = "include_entities";
+        args[3] = "true";
         if (td->timeline_id) {
-                args[2] = "since_id";
-                args[3] = g_strdup_printf("%llu", (long long unsigned int) td->timeline_id);
+                args[4] = "since_id";
+                args[5] = g_strdup_printf("%llu", (long long unsigned int) td->timeline_id);
         }
 
         twitter_http(ic, TWITTER_HOME_TIMELINE_URL, twitter_http_get_home_timeline, ic, 0, args,
-                     td->timeline_id ? 4 : 2);
+                     td->timeline_id ? 6 : 4);
 
         g_free(args[1]);
         if (td->timeline_id) {
-                g_free(args[3]);
+                g_free(args[5]);
         }
 }
@@ -815 +838 @@
         td->flags &= ~TWITTER_GOT_MENTIONS;
 
-        char *args[4];
+        char *args[6];
         args[0] = "cursor";
         args[1] = g_strdup_printf("%lld", (long long) next_cursor);
+        args[2] = "include_entities";
+        args[3] = "true";
         if (td->timeline_id) {
-                args[2] = "since_id";
-                args[3] = g_strdup_printf("%llu", (long long unsigned int) td->timeline_id);
+                args[4] = "since_id";
+                args[5] = g_strdup_printf("%llu", (long long unsigned int) td->timeline_id);
         }
 
         twitter_http(ic, TWITTER_MENTIONS_URL, twitter_http_get_mentions, ic, 0, args,
-                     td->timeline_id ? 4 : 2);
+                     td->timeline_id ? 6 : 4);
 
         g_free(args[1]);
         if (td->timeline_id) {
-                g_free(args[3]);
+                g_free(args[5]);
         }
 }