Changeset ad54149 for protocols/twitter

Timestamp:

2016-09-21T03:03:15Z (8 years ago)

Author:

dequis <dx@…>

Branches:

master

Children:

524e931

Parents:

35401cd

git-author:

dequis <dx@…> (21-09-16 00:53:40)

git-committer:

dequis <dx@…> (21-09-16 03:03:15)

Message:

twitter: extended tweet support (AKA avoid showing truncated ones)

Documentation over here:

​https://dev.twitter.com/overview/api/upcoming-changes-to-tweets

This is already live in twitter, can be tested by including an
attachment from twitter web and then fill 140 characters.

Should be sanely backwards compatible with twitter clones - i'd expect
them to ignore the tweet_mode=extended parameter in REST queries, and
just not deliver extended_tweet objects / full_text strings at all.

File:

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

protocols/twitter/twitter_lib.c

@@ -599 +599 @@
 static struct twitter_xml_status *twitter_xt_get_status(const json_value *node)
 {
-        struct twitter_xml_status *txs;
+        struct twitter_xml_status *txs = {0};
         const json_value *rt = NULL;
+        const json_value *text_value = NULL;
 
         if (node->type != json_object) {
@@ -608 +609 @@
 
         JSON_O_FOREACH(node, k, v) {
-                if (strcmp("text", k) == 0 && v->type == json_string) {
-                        txs->text = g_memdup(v->u.string.ptr, v->u.string.length + 1);
-                        strip_html(txs->text);
+                if (strcmp("text", k) == 0 && v->type == json_string && text_value == NULL) {
+                        text_value = v;
+                } else if (strcmp("full_text", k) == 0 && v->type == json_string) {
+                        text_value = v;
+                } else if (strcmp("extended_tweet", k) == 0 && v->type == json_object) {
+                        text_value = json_o_get(v, "full_text");
                 } else if (strcmp("retweeted_status", k) == 0 && v->type == json_object) {
                         rt = v;
@@ -636 +640 @@
                 struct twitter_xml_status *rtxs = twitter_xt_get_status(rt);
                 if (rtxs) {
-                        g_free(txs->text);
                         txs->text = g_strdup_printf("RT @%s: %s", rtxs->user->screen_name, rtxs->text);
                         txs->id = rtxs->id;
                         txs_free(rtxs);
                 }
-        } else {
+        } else if (text_value && text_value->type == json_string) {
+                txs->text = g_memdup(text_value->u.string.ptr, text_value->u.string.length + 1);
+                strip_html(txs->text);
                 expand_entities(&txs->text, node);
         }
@@ -1479 +1484 @@
         td->flags &= ~TWITTER_GOT_TIMELINE;
 
-        char *args[6];
+        char *args[8];
         args[0] = "cursor";
         args[1] = g_strdup_printf("%" G_GINT64_FORMAT, next_cursor);
         args[2] = "include_entities";
         args[3] = "true";
+        args[4] = "tweet_mode";
+        args[5] = "extended";
         if (td->timeline_id) {
-                args[4] = "since_id";
-                args[5] = g_strdup_printf("%" G_GUINT64_FORMAT, td->timeline_id);
+                args[6] = "since_id";
+                args[7] = g_strdup_printf("%" G_GUINT64_FORMAT, td->timeline_id);
         }
 
         if (twitter_http(ic, TWITTER_HOME_TIMELINE_URL, twitter_http_get_home_timeline, ic, 0, args,
-                         td->timeline_id ? 6 : 4) == NULL) {
+                         td->timeline_id ? 8 : 6) == NULL) {
                 if (++td->http_fails >= 5) {
                         imcb_error(ic, "Could not retrieve %s: %s",
@@ -1501 +1508 @@
         g_free(args[1]);
         if (td->timeline_id) {
-                g_free(args[5]);
+                g_free(args[7]);
         }
 }
@@ -1516 +1523 @@
         td->flags &= ~TWITTER_GOT_MENTIONS;
 
-        char *args[6];
+        char *args[8];
         args[0] = "cursor";
         args[1] = g_strdup_printf("%" G_GINT64_FORMAT, next_cursor);
@@ -1528 +1535 @@
                 args[5] = g_strdup_printf("%d", set_getint(&ic->acc->set, "show_old_mentions"));
         }
+        args[6] = "tweet_mode";
+        args[7] = "extended";
 
         if (twitter_http(ic, TWITTER_MENTIONS_URL, twitter_http_get_mentions,
-                         ic, 0, args, 6) == NULL) {
+                         ic, 0, args, 8) == NULL) {
                 if (++td->http_fails >= 5) {
                         imcb_error(ic, "Could not retrieve %s: %s",