Changeset b61c74c for protocols/twitter/twitter.c

Timestamp:

2012-09-15T16:24:52Z (12 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

ddca104

Parents:

b3d99e3

Message:

Merge Twitter favourite command from Flexo/#983. Leaving out the unfavourite
command for reasons given there.

At this point there are loads of command and stuff is getting a little messy
maybe.. :-/

File:

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

protocols/twitter/twitter.c

@@ -490 +490 @@
 }
 
+/** Convert the given bitlbee tweet ID, bitlbee username, or twitter tweet ID
+ *  into a twitter tweet ID.
+ *
+ *  Returns 0 if the user provides garbage.
+ */
+static guint64 twitter_message_id_from_command_arg(struct im_connection *ic, struct twitter_data *td, char *arg) {
+        struct twitter_user_data *tud;
+        bee_user_t *bu;
+        guint64 id = 0;
+        if (g_str_has_prefix(arg, "#") &&
+                sscanf(arg + 1, "%" G_GUINT64_FORMAT, &id) == 1) {
+                if (id < TWITTER_LOG_LENGTH && td->log)
+                        id = td->log[id].id;
+        } else if ((bu = bee_user_by_handle(ic->bee, ic, arg)) &&
+                (tud = bu->data) && tud->last_id)
+                id = tud->last_id;
+        else if (sscanf(arg, "%" G_GUINT64_FORMAT, &id) == 1){
+                if (id < TWITTER_LOG_LENGTH && td->log)
+                        id = td->log[id].id;
+        }
+        return id;
+}
+
 static void twitter_handle_command(struct im_connection *ic, char *message)
 {
@@ -517 +540 @@
                         twitter_msg(ic, "Could not undo last action");
 
+                g_free(cmds);
+                return;
+        } else if (g_strcasecmp(cmd[0], "favourite") == 0 && cmd[1]) {
+                guint64 id;
+                if ((id = twitter_message_id_from_command_arg(ic, td, cmd[1]))) {
+                        twitter_favourite_tweet(ic, id);
+                } else {
+                        twitter_msg(ic, "Please provide a message ID or username.");
+                }
                 g_free(cmds);
                 return;
@@ -546 +578 @@
                 return;
         } else if (g_strcasecmp(cmd[0], "rt") == 0 && cmd[1]) {
-                struct twitter_user_data *tud;
-                bee_user_t *bu;
-                guint64 id;
-
-                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;
-                } else if ((bu = bee_user_by_handle(ic->bee, ic, cmd[1])) &&
-                    (tud = bu->data) && tud->last_id)
-                        id = tud->last_id;
-                else if (sscanf(cmd[1], "%" G_GUINT64_FORMAT, &id) == 1){
-                        if (id < TWITTER_LOG_LENGTH && td->log)
-                                id = td->log[id].id;
-                }
+                guint64 id = twitter_message_id_from_command_arg(ic, td, cmd[1]);
 
                 td->last_status_id = 0;