Changeset 3b0c1c3

Timestamp:

2018-07-31T06:17:21Z (6 years ago)

Author:

dequis <dx@…>

Branches:

master

Children:

0b1448f

Parents:

fa1bc1d (diff), 921ea8b (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into develop

File:

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

protocols/twitter/twitter_lib.c

@@ -704 +704 @@
 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;
+        json_value *entities, *extended_entities, *quoted, *quoted_permalink;
+        char *quote_url = NULL, *quote_text = NULL, *quote_kort = NULL;
+        gboolean quote_used = FALSE;
 
         if (!((entities = json_o_get(node, "entities")) && entities->type == json_object))
@@ -716 +717 @@
                 quote_text = g_strdup_printf("@%s: %s", txs->user->screen_name, txs->text);
                 quote_url = g_strdup_printf("%s/status/%" G_GUINT64_FORMAT, txs->user->screen_name, txs->id);
+                if ((quoted_permalink = json_o_get(node, "quoted_status_permalink")) && quoted->type == json_object) {
+                        quote_kort = json_o_strdup(quoted_permalink, "url");
+                }
                 txs_free(txs);
         } else {
@@ -759 +763 @@
                                 format = "%s<%s> [%s]%s";
                                 disp = quote_text;
+                                quote_used = TRUE;
                         }
 
@@ -769 +774 @@
                 }
         }
+
+        if (quote_text && !quote_used) {
+                const char *url = quote_kort ?: quote_url;
+                char *new = g_strdup_printf("%s <%s>[%s]", *text, url, quote_text);
+                g_free(*text);
+                *text = new;
+        }
+
         g_free(quote_text);
         g_free(quote_url);
+        g_free(quote_kort);
 }