Changeset 67f6828

Timestamp:

2012-11-25T22:09:41Z (12 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

b235228

Parents:

f97b8e9

Message:

Only a few commands use twitter_message_id_from_command_arg(), others were
still using a decimal scanf format string. Messy code duplication. :-(

Location:

protocols/twitter

Files:

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

protocols/twitter/twitter.c

@@ -592 +592 @@
                 if (cmd[1] == NULL)
                         twitter_status_destroy(ic, td->last_status_id);
-                else if (sscanf(cmd[1], "%" G_GUINT64_FORMAT, &id) == 1) {
+                else if (sscanf(cmd[1], "%" G_GINT64_MODIFIER "x", &id) == 1) {
                         if (id < TWITTER_LOG_LENGTH && td->log)
                                 id = td->log[id].id;
@@ -627 +627 @@
                    posted the given ID if the user wants to do it that way */
                 if (g_str_has_prefix(cmd[1], "#") &&
-                    sscanf(cmd[1] + 1, "%" G_GUINT64_FORMAT, &id) == 1) {
+                    sscanf(cmd[1] + 1, "%" G_GINT64_MODIFIER "x", &id) == 1) {
                         if (id < TWITTER_LOG_LENGTH && td->log) {
                                 if (g_slist_find(ic->bee->users, td->log[id].bu)) {
@@ -655 +655 @@
 
                 if (g_str_has_prefix(cmd[1], "#") &&
-                    sscanf(cmd[1] + 1, "%" G_GUINT64_FORMAT, &id) == 1 &&
+                    sscanf(cmd[1] + 1, "%" G_GINT64_MODIFIER "x", &id) == 1 &&
                     (id < TWITTER_LOG_LENGTH) && td->log) {
                         bu = td->log[id].bu;
@@ -665 +665 @@
                     (tud = bu->data) && tud->last_id) {
                         id = tud->last_id;
-                } else if (sscanf(cmd[1], "%" G_GUINT64_FORMAT, &id) == 1 &&
+                } else if (sscanf(cmd[1], "%" G_GINT64_MODIFIER "x", &id) == 1 &&
                            (id < TWITTER_LOG_LENGTH) && td->log) {
                         bu = td->log[id].bu;

protocols/twitter/twitter_lib.c

@@ -67 +67 @@
         char *text;
         struct twitter_xml_user *user;
-        guint64 id, reply_to;
+        guint64 id, rt_id; /* Usually equal, with RTs id == *original* id */
+        guint64 reply_to;
 };
 
@@ -491 +492 @@
                         g_free(txs->text);
                         txs->text = g_strdup_printf("RT @%s: %s", rtxs->user->screen_name, rtxs->text);
+                        txs->rt_id = txs->id;
                         txs->id = rtxs->id;
                         txs_free(rtxs);
@@ -642 +644 @@
         td->log[td->log_id].bu = bee_user_by_handle(ic->bee, ic, txs->user->screen_name);
         
+        /* This is all getting hairy. :-( If we RT'ed something ourselves,
+           remember OUR id instead so undo will work. In other cases, the
+           original tweet's id should be remembered for deduplicating. */
+        if (txs->rt_id && strcmp(txs->user->screen_name, td->user) == 0)
+                td->log[td->log_id].id = txs->rt_id;
+        
         if (set_getbool(&ic->acc->set, "show_ids")) {
                 if (reply_to != -1)
@@ -1154 +1162 @@
                 return;
         
-        if ((id = json_o_get(parsed, "id")) && id->type == json_integer)
+        if ((id = json_o_get(parsed, "id")) && id->type == json_integer) {
                 td->last_status_id = id->u.integer;
+        }
         
         json_value_free(parsed);