Changeset b8c336b for protocols/twitter/twitter.c

Timestamp:

2015-05-09T19:50:30Z (9 years ago)

Author:

dequis <dx@…>

Children:

ec8b369

Parents:

356e2dd (diff), 5014380 (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 'develop' into feat/hip-cat

Conflicts:

protocols/jabber/hipchat.c
protocols/jabber/iq.c
protocols/jabber/jabber.h

File:

• protocols/twitter/twitter.c (modified) (6 diffs)

protocols/twitter/twitter.c

@@ -483 +483 @@
 }
 
-static gboolean twitter_length_check(struct im_connection *ic, gchar * msg)
-{
-        int max = set_getint(&ic->acc->set, "message_length"), len;
-        int target_len = set_getint(&ic->acc->set, "target_url_length");
+int twitter_message_len(gchar *msg, int target_len)
+{
         int url_len_diff = 0;
 
@@ -493 +491 @@
         }
 
-        if (max == 0 || (len = g_utf8_strlen(msg, -1) + url_len_diff) <= max) {
+        return g_utf8_strlen(msg, -1) + url_len_diff;
+}
+
+static gboolean twitter_length_check(struct im_connection *ic, gchar * msg)
+{
+        int max = set_getint(&ic->acc->set, "message_length");
+        int target_len = set_getint(&ic->acc->set, "target_url_length");
+        int len = twitter_message_len(msg, target_len);
+
+        if (max == 0 || len <= max) {
                 return TRUE;
         }
@@ -867 +874 @@
 }
 
+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 +906 @@
                         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 +916 @@
         }
         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 +1018 @@
                 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;