Changeset eb4ad8d for protocols/twitter

Timestamp:

2015-01-17T20:13:19Z (9 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

e26aa72

Parents:

1065dd4 (diff), 664bac3 (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:

Merging random other fixes/cleanups.

Location:

protocols/twitter

Files:

• twitter.c (modified) (2 diffs)
• twitter_lib.c (modified) (9 diffs)

protocols/twitter/twitter.c

@@ -51 +51 @@
         struct twitter_data *td = ic->proto_data;
 
+        char *last_tweet = set_getstr(&ic->acc->set, "_last_tweet");
+        if (last_tweet)
+                td->timeline_id = g_ascii_strtoull(last_tweet, NULL, 0);
+
         /* Create the room now that we "logged in". */
         if (td->flags & TWITTER_MODE_CHAT)
@@ -327 +331 @@
         s = set_add(&acc->set, "strip_newlines", "false", set_eval_bool, acc);
         
+        s = set_add(&acc->set, "_last_tweet", "0", NULL, acc);
+        s->flags |= SET_HIDDEN | SET_NOSAVE;
+
         if (strcmp(acc->prpl->name, "twitter") == 0) {
                 s = set_add(&acc->set, "stream", "true", set_eval_bool, acc);

protocols/twitter/twitter_lib.c

@@ -234 +234 @@
 void twitter_get_friends_ids(struct im_connection *ic, gint64 next_cursor)
 {
-        // Primitive, but hey! It works...      
+        // Primitive, but hey! It works...
         char *args[2];
         args[0] = "cursor";
-        args[1] = g_strdup_printf("%lld", (long long) next_cursor);
+        args[1] = g_strdup_printf("%" G_GINT64_FORMAT, next_cursor);
         twitter_http(ic, TWITTER_FRIENDS_IDS_URL, twitter_http_get_friends_ids, ic, 0, args, 2);
 
@@ -721 +721 @@
 {
         struct twitter_data *td = ic->proto_data;
+        char *last_id_str;
         
         if (status->user == NULL || status->text == NULL)
@@ -738 +739 @@
         // we won't pick up the updates already in the list.
         td->timeline_id = MAX(td->timeline_id, status->rt_id);
+
+        last_id_str = g_strdup_printf("%" G_GUINT64_FORMAT, td->timeline_id);
+        set_setstr(&ic->acc->set, "last_tweet", last_id_str);
+        g_free(last_id_str);
 }
 
@@ -997 +1002 @@
         char *args[6];
         args[0] = "cursor";
-        args[1] = g_strdup_printf("%lld", (long long) next_cursor);
+        args[1] = g_strdup_printf("%" G_GINT64_FORMAT, next_cursor);
         args[2] = "include_entities";
         args[3] = "true";
         if (td->timeline_id) {
                 args[4] = "since_id";
-                args[5] = g_strdup_printf("%llu", (long long unsigned int) td->timeline_id);
+                args[5] = g_strdup_printf("%" G_GUINT64_FORMAT, td->timeline_id);
         }
 
@@ -1033 +1038 @@
         char *args[6];
         args[0] = "cursor";
-        args[1] = g_strdup_printf("%lld", (long long) next_cursor);
+        args[1] = g_strdup_printf("%" G_GINT64_FORMAT, next_cursor);
         args[2] = "include_entities";
         args[3] = "true";
         if (td->timeline_id) {
                 args[4] = "since_id";
-                args[5] = g_strdup_printf("%llu", (long long unsigned int) td->timeline_id);
+                args[5] = g_strdup_printf("%" G_GUINT64_FORMAT, td->timeline_id);
         } else {
                 args[4] = "count";
@@ -1167 +1172 @@
                 "status", msg,
                 "in_reply_to_status_id",
-                g_strdup_printf("%llu", (unsigned long long) in_reply_to)
+                g_strdup_printf("%" G_GUINT64_FORMAT, in_reply_to)
         };
         twitter_http(ic, TWITTER_STATUS_UPDATE_URL, twitter_http_post, ic, 1,
@@ -1201 +1206 @@
 {
         char *url;
-        url = g_strdup_printf("%s%llu%s", TWITTER_STATUS_DESTROY_URL,
-                              (unsigned long long) id, ".json");
+        url = g_strdup_printf("%s%" G_GUINT64_FORMAT "%s",
+                              TWITTER_STATUS_DESTROY_URL, id, ".json");
         twitter_http_f(ic, url, twitter_http_post, ic, 1, NULL, 0,
                        TWITTER_HTTP_USER_ACK);
@@ -1211 +1216 @@
 {
         char *url;
-        url = g_strdup_printf("%s%llu%s", TWITTER_STATUS_RETWEET_URL,
-                              (unsigned long long) id, ".json");
+        url = g_strdup_printf("%s%" G_GUINT64_FORMAT "%s",
+                              TWITTER_STATUS_RETWEET_URL, id, ".json");
         twitter_http_f(ic, url, twitter_http_post, ic, 1, NULL, 0,
                        TWITTER_HTTP_USER_ACK);
@@ -1241 +1246 @@
                 NULL,
         };
-        args[1] = g_strdup_printf("%llu", (unsigned long long) id);
+        args[1] = g_strdup_printf("%" G_GUINT64_FORMAT, id);
         twitter_http_f(ic, TWITTER_FAVORITE_CREATE_URL, twitter_http_post,
                        ic, 1, args, 2, TWITTER_HTTP_USER_ACK);