Changeset aa2f575 for protocols/twitter

Timestamp:

2011-08-17T22:21:47Z (13 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

fd1ca44

Parents:

5f1e78d

Message:

Better cleanup of status IDs in Twitter commands. Stop using that silly
g_ascii_strtoull() everywhere. This should fix some accidental Tweet
incidents.

File:

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

protocols/twitter/twitter.c

@@ -465 +465 @@
                 guint64 id;
 
-                if (cmd[1])
-                        id = g_ascii_strtoull(cmd[1], NULL, 10);
-                else
-                        id = td->last_status_id;
-
-                /* TODO: User feedback. */
-                if (id)
+                if (cmd[1] == NULL)
+                        twitter_status_destroy(ic, td->last_status_id);
+                else if (sscanf(cmd[1], "%" G_GUINT64_FORMAT, &id) == 1) {
+                        if (id < TWITTER_LOG_LENGTH && td->log)
+                                id = td->log[id].id;
+                        
                         twitter_status_destroy(ic, id);
-                else
+                } else
                         twitter_msg(ic, "Could not undo last action");
 
@@ -491 +490 @@
                 guint64 id;
 
-                if (g_str_has_prefix(cmd[1], "#")) {
-                        id = g_ascii_strtoull(cmd[1] + 1, NULL, 10);
+                if (g_str_has_prefix(cmd[1], "#") &&
+                    sscanf(cmd[1] + 1, "%" G_GUINT64_FORMAT, &id) == 1) {
                         if (id < TWITTER_LOG_LENGTH && td->log)
                                 id = td->log[id].id;
@@ -498 +497 @@
                     (tud = bu->data) && tud->last_id)
                         id = tud->last_id;
-                else {
-                        id = g_ascii_strtoull(cmd[1], NULL, 10);
+                else if (sscanf(cmd[1], "%" G_GUINT64_FORMAT, &id) == 1){
                         if (id < TWITTER_LOG_LENGTH && td->log)
                                 id = td->log[id].id;
@@ -518 +516 @@
                 guint64 id = 0;
 
-                if ((bu = bee_user_by_handle(ic->bee, ic, cmd[1])) &&
+                if (g_str_has_prefix(cmd[1], "#") &&
+                    sscanf(cmd[1] + 1, "%" G_GUINT64_FORMAT, &id) == 1 &&
+                    (id < TWITTER_LOG_LENGTH) && td->log) {
+                        bu = td->log[id].bu;
+                        if (g_slist_find(ic->bee->users, bu))
+                                id = td->log[id].id;
+                        else
+                                bu = NULL;
+                } else if ((bu = bee_user_by_handle(ic->bee, ic, cmd[1])) &&
                     (tud = bu->data) && tud->last_id) {
                         id = tud->last_id;
@@ -529 +535 @@
                                 bu = NULL;
                 }
+
                 if (!id || !bu) {
                         twitter_msg(ic, "User `%s' does not exist or didn't "