Changeset 58d285a

Timestamp:

2016-10-03T00:56:35Z (8 years ago)

Author:

dequis <dx@…>

Branches:

master

Children:

01d56c0

Parents:

82e55d2

Message:

twitter: fix quoted tweet expansion in extended tweets

The outermost entities object only contains the url of the compat tweet,
the one linking to /i/web/status/[...]

The inner entities object, inside the "extended_tweet", is the one that
contains the quoted tweet url that we're supposed to replace.

But expand_entities() assumed that the quoted_status object would be
next to entities, which doesn't apply in the case of extended tweets.
So now it gets an extra parameter to look for entities.

File:

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

protocols/twitter/twitter_lib.c

@@ -587 +587 @@
 #endif
 
-static void expand_entities(char **text, const json_value *node);
+static void expand_entities(char **text, const json_value *node, const json_value *extended_node);
 
 /**
@@ -602 +602 @@
         const json_value *rt = NULL;
         const json_value *text_value = NULL;
+        const json_value *extended_node = NULL;
 
         if (node->type != json_object) {
@@ -615 +616 @@
                 } else if (strcmp("extended_tweet", k) == 0 && v->type == json_object) {
                         text_value = json_o_get(v, "full_text");
+                        extended_node = v;
                 } else if (strcmp("retweeted_status", k) == 0 && v->type == json_object) {
                         rt = v;
@@ -647 +649 @@
                 txs->text = g_memdup(text_value->u.string.ptr, text_value->u.string.length + 1);
                 strip_html(txs->text);
-                expand_entities(&txs->text, node);
+                expand_entities(&txs->text, node, extended_node);
         }
 
@@ -690 +692 @@
         }
 
-        expand_entities(&txs->text, node);
+        expand_entities(&txs->text, node, NULL);
 
         if (txs->text && txs->user && txs->id) {
@@ -700 +702 @@
 }
 
-static void expand_entities(char **text, const json_value *node)
-{
-        json_value *entities, *quoted;
+static void expand_entities(char **text, const json_value *node, const json_value *extended_node)
+{
+        json_value *entities, *extended_entities, *quoted;
         char *quote_url = NULL, *quote_text = NULL;
 
@@ -718 +720 @@
         } else {
                 quoted = NULL;
+        }
+
+        if (extended_node) {
+                extended_entities = json_o_get(extended_node, "entities");
+                if (extended_entities && extended_entities->type == json_object) {
+                        entities = extended_entities;
+                }
         }