Changeset 5ca1416 for protocols

Timestamp:

2015-05-04T21:21:57Z (9 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

041777e, 31169ee, b1dc403

Parents:

70ec7ab (diff), c43146d (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 'wilmer-twitter'

Location:

protocols/twitter

Files:

• twitter.c (modified) (4 diffs)
• twitter.h (modified) (2 diffs)
• twitter_lib.c (modified) (10 diffs)

protocols/twitter/twitter.c

@@ -867 +867 @@
 }
 
+bee_user_t twitter_log_local_user;
+
 /** Convert the given bitlbee tweet ID, bitlbee username, or twitter tweet ID
  *  into a twitter tweet ID.
@@ -897 +899 @@
                         bu = td->log[id].bu;
                         id = td->log[id].id;
-                        /* Beware of dangling pointers! */
-                        if (!g_slist_find(ic->bee->users, bu)) {
-                                bu = NULL;
-                        }
                 } else if (twitter_parse_id(arg, 10, &id)) {
                         /* Allow normal tweet IDs as well; not a very useful
@@ -911 +909 @@
         }
         if (bu_) {
+                if (bu == &twitter_log_local_user) {
+                        /* HACK alert. There's no bee_user object for the local
+                         * user so just fake one for the few cmds that need it. */
+                        twitter_log_local_user.handle = td->user;
+                } else {
+                        /* Beware of dangling pointers! */
+                        if (!g_slist_find(ic->bee->users, bu)) {
+                                bu = NULL;
+                        }
+                }
                 *bu_ = bu;
         }
@@ -1003 +1011 @@
                 in_reply_to = id;
                 allow_post = TRUE;
+        } else if (g_strcasecmp(cmd[0], "url") == 0) {
+                id = twitter_message_id_from_command_arg(ic, cmd[1], &bu);
+                if (!id) {
+                        twitter_log(ic, "Tweet `%s' does not exist", cmd[1]);
+                } else {
+                        /* More common link is twitter.com/$UID/status/$ID (and that's
+                         * what this will 302 to) but can't generate that since for RTs,
+                         * bu here points at the retweeter while id contains the id of
+                         * the original message. */
+                        twitter_log(ic, "https://twitter.com/statuses/%lld", id);
+                }
+                goto eof;
+
         } else if (g_strcasecmp(cmd[0], "post") == 0) {
                 message += 5;

protocols/twitter/twitter.h

@@ -101 +101 @@
 struct twitter_log_data {
         guint64 id;
-        struct bee_user *bu; /* DANGER: can be a dead pointer. Check it first. */
+        /* DANGER: bu can be a dead pointer. Check it first.
+         * twitter_message_id_from_command_arg() will do this. */
+        struct bee_user *bu;
 };
 
@@ -110 +112 @@
  */
 extern GSList *twitter_connections;
+
+/**
+ * Evil hack: Fake bee_user which will always point at the local user.
+ * Sometimes used as a return value by twitter_message_id_from_command_arg.
+ * NOT thread safe but don't you dare to even think of ever making BitlBee
+ * threaded. :-)
+ */
+extern bee_user_t twitter_log_local_user;
 
 void twitter_login_finish(struct im_connection *ic);

protocols/twitter/twitter_lib.c

@@ -460 +460 @@
 #endif
 
-static char* expand_entities(char* text, const json_value *entities);
+static void expand_entities(char **text, const json_value *node);
 
 /**
@@ -473 +473 @@
 {
         struct twitter_xml_status *txs;
-        const json_value *rt = NULL, *entities = NULL;
+        const json_value *rt = NULL;
 
         if (node->type != json_object) {
@@ -501 +501 @@
                 } else if (strcmp("in_reply_to_status_id", k) == 0 && v->type == json_integer) {
                         txs->reply_to = v->u.integer;
-                } else if (strcmp("entities", k) == 0 && v->type == json_object) {
-                        entities = v;
                 }
         }
@@ -516 +514 @@
                         txs_free(rtxs);
                 }
-        } else if (entities) {
-                txs->text = expand_entities(txs->text, entities);
+        } else {
+                expand_entities(&txs->text, node);
         }
 
@@ -534 +532 @@
 {
         struct twitter_xml_status *txs;
-        const json_value *entities = NULL;
 
         if (node->type != json_object) {
@@ -561 +558 @@
         }
 
-        if (entities) {
-                txs->text = expand_entities(txs->text, entities);
-        }
+        expand_entities(&txs->text, node);
 
         if (txs->text && txs->user && txs->id) {
@@ -573 +568 @@
 }
 
-static char* expand_entities(char* text, const json_value *entities)
-{
+static void expand_entities(char **text, const json_value *node)
+{
+        json_value *entities, *quoted;
+        char *quote_url = NULL, *quote_text = NULL;
+
+        if (!((entities = json_o_get(node, "entities")) && entities->type == json_object))
+                return;
+        if ((quoted = json_o_get(node, "quoted_status")) && quoted->type == json_object) {
+                /* New "retweets with comments" feature. Note that this info
+                 * seems to be included in the streaming API only! Grab the
+                 * full message and try to insert it when we run into the
+                 * Tweet entity. */
+                struct twitter_xml_status *txs = twitter_xt_get_status(quoted);
+                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);
+                txs_free(txs);
+        } else {
+                quoted = NULL;
+        }
+
         JSON_O_FOREACH(entities, k, v) {
                 int i;
@@ -586 +599 @@
 
                 for (i = 0; i < v->u.array.length; i++) {
+                        const char *format = "%s%s <%s>%s";
+
                         if (v->u.array.values[i]->type != json_object) {
                                 continue;
@@ -592 +607 @@
                         const char *kort = json_o_str(v->u.array.values[i], "url");
                         const char *disp = json_o_str(v->u.array.values[i], "display_url");
+                        const char *full = json_o_str(v->u.array.values[i], "expanded_url");
                         char *pos, *new;
 
-                        if (!kort || !disp || !(pos = strstr(text, kort))) {
+                        if (!kort || !disp || !(pos = strstr(*text, kort))) {
                                 continue;
                         }
+                        if (quote_url && strstr(full, quote_url)) {
+                                format = "%s<%s> [%s]%s";
+                                disp = quote_text;
+                        }
 
                         *pos = '\0';
-                        new = g_strdup_printf("%s%s <%s>%s", text, kort,
+                        new = g_strdup_printf(format, *text, kort,
                                               disp, pos + strlen(kort));
 
-                        g_free(text);
-                        text = new;
-                }
-        }
-
-        return text;
+                        g_free(*text);
+                        *text = new;
+                }
+        }
+        g_free(quote_text);
+        g_free(quote_url);
 }
 
@@ -681 +701 @@
         if (g_strcasecmp(txs->user->screen_name, td->user) == 0) {
                 td->log[td->log_id].id = txs->rt_id;
+                /* More useful than NULL. */
+                td->log[td->log_id].bu = &twitter_log_local_user;
         }