Changeset b75671d for protocols/twitter/twitter.c

Timestamp:

2015-06-17T22:47:26Z (9 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Children:

b441614

Parents:

d832164 (diff), 2f99f23 (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 remote-tracking branch 'origin/master' into parson

File:

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

protocols/twitter/twitter.c

@@ -469 +469 @@
         g_regex_match(regex, msg, 0, &match_info);
         while (g_match_info_matches(match_info)) {
-                gchar *url = g_match_info_fetch(match_info, 2);
+                gchar *s, *url;
+
+                url = g_match_info_fetch(match_info, 2);
                 url_len_diff += target_len - g_utf8_strlen(url, -1);
+
                 /* Add another character for https://t.co/... URLs */
-                if (g_match_info_fetch(match_info, 3) != NULL) {
+                if ((s = g_match_info_fetch(match_info, 3))) {
                         url_len_diff += 1;
+                        g_free(s);
                 }
                 g_free(url);
@@ -483 +487 @@
 }
 
-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 +495 @@
         }
 
-        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;
         }
@@ -852 +863 @@
 }
 
-/* Parses a decimal or hex tweet ID, returns TRUE on success */
-static gboolean twitter_parse_id(char *string, int base, guint64 *id)
-{
-        guint64 parsed;
-        char *endptr;
-
-        errno = 0;
-        parsed = g_ascii_strtoull(string, &endptr, base);
-        if (errno || endptr == string || *endptr != '\0') {
-                return FALSE;
-        }
-        *id = parsed;
-        return TRUE;
-}
-
 bee_user_t twitter_log_local_user;
 
@@ -896 +892 @@
                         arg++;
                 }
-                if (twitter_parse_id(arg, 16, &id) && id < TWITTER_LOG_LENGTH) {
+                if (parse_int64(arg, 16, &id) && id < TWITTER_LOG_LENGTH) {
                         bu = td->log[id].bu;
                         id = td->log[id].id;
-                } else if (twitter_parse_id(arg, 10, &id)) {
+                } else if (parse_int64(arg, 10, &id)) {
                         /* Allow normal tweet IDs as well; not a very useful
                            feature but it's always been there. Just ignore
@@ -1016 +1012 @@
                         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);
+                        twitter_status_show_url(ic, id);
                 }
                 goto eof;