Changeset 6e9ae72 for protocols/twitter/twitter.c

Timestamp:

2011-12-17T13:50:01Z (13 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

18c6d36

Parents:

87dddee (diff), 17f057d (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:

Mainline merge.

File:

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

protocols/twitter/twitter.c

@@ -30 +30 @@
 
 #define twitter_msg( ic, fmt... ) \
-        do {                                                        \
-                struct twitter_data *td = ic->proto_data;           \
-                if( td->home_timeline_gc )                          \
-                        imcb_chat_log( td->home_timeline_gc, fmt ); \
-                else                                                \
-                        imcb_log( ic, fmt );                        \
+        do {                                            \
+                struct twitter_data *td = ic->proto_data;   \
+                if( td->timeline_gc )                       \
+                        imcb_chat_log( td->timeline_gc, fmt );  \
+                else                                        \
+                        imcb_log( ic, fmt );                    \
         } while( 0 );
 
@@ -52 +52 @@
 
         // Do stuff..
-        twitter_get_home_timeline(ic, -1);
+        twitter_get_timeline(ic, -1);
 
         // If we are still logged in run this function again after timeout.
@@ -69 +69 @@
         // Queue the main_loop
         // Save the return value, so we can remove the timeout on logout.
-        td->main_loop_id = b_timeout_add(60000, twitter_main_loop, ic);
+        td->main_loop_id =
+            b_timeout_add(set_getint(&ic->acc->set, "fetch_interval") * 1000, twitter_main_loop, ic);
 }
 
@@ -77 +78 @@
 {
         struct twitter_data *td = ic->proto_data;
+
+        td->flags &= ~TWITTER_DOING_TIMELINE;
 
         if (set_getbool(&ic->acc->set, "oauth") && !td->oauth_info)
@@ -90 +93 @@
 
 static const struct oauth_service twitter_oauth = {
-        "http://api.twitter.com/oauth/request_token",
-        "http://api.twitter.com/oauth/access_token",
+        "https://api.twitter.com/oauth/request_token",
+        "https://api.twitter.com/oauth/access_token",
         "https://api.twitter.com/oauth/authorize",
         .consumer_key = "xsDNKJuNZYkZyMcu914uEA",
@@ -98 +101 @@
 
 static const struct oauth_service identica_oauth = {
-        "http://identi.ca/api/oauth/request_token",
-        "http://identi.ca/api/oauth/access_token",
+        "https://identi.ca/api/oauth/request_token",
+        "https://identi.ca/api/oauth/access_token",
         "https://identi.ca/api/oauth/authorize",
         .consumer_key = "e147ff789fcbd8a5a07963afbb43f9da",
@@ -216 +219 @@
                 def_oauth = "true";
         } else {                /* if( strcmp( acc->prpl->name, "identica" ) == 0 ) */
-
                 def_url = IDENTICA_API_URL;
                 def_oauth = "false";
@@ -228 +230 @@
         s = set_add(&acc->set, "commands", "true", set_eval_bool, acc);
 
+        s = set_add(&acc->set, "fetch_interval", "60", set_eval_int, acc);
+        s->flags |= ACC_SET_OFFLINE_ONLY;
+
+        s = set_add(&acc->set, "fetch_mentions", "true", set_eval_bool, acc);
+
         s = set_add(&acc->set, "message_length", "140", set_eval_int, acc);
 
@@ -235 +242 @@
         s = set_add(&acc->set, "show_ids", "false", set_eval_bool, acc);
         s->flags |= ACC_SET_OFFLINE_ONLY;
+
+        s = set_add(&acc->set, "show_old_mentions", "true", set_eval_bool, acc);
 
         s = set_add(&acc->set, "oauth", def_oauth, set_eval_bool, acc);
@@ -317 +326 @@
         b_event_remove(td->main_loop_id);
 
-        if (td->home_timeline_gc)
-                imcb_chat_free(td->home_timeline_gc);
+        if (td->timeline_gc)
+                imcb_chat_free(td->timeline_gc);
 
         if (td) {
@@ -404 +413 @@
         struct twitter_data *td = c->ic->proto_data;
 
-        if (c != td->home_timeline_gc)
+        if (c != td->timeline_gc)
                 return;         /* WTF? */
 
         /* If the user leaves the channel: Fine. Rejoin him/her once new
            tweets come in. */
-        imcb_chat_free(td->home_timeline_gc);
-        td->home_timeline_gc = NULL;
+        imcb_chat_free(td->timeline_gc);
+        td->timeline_gc = NULL;
 }
 
@@ -465 +474 @@
                 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 +499 @@
                 guint64 id;
 
-                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) {
+                        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 {
-                        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;
@@ -514 +525 @@
                 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;
@@ -525 +544 @@
                                 bu = NULL;
                 }
+
                 if (!id || !bu) {
                         twitter_msg(ic, "User `%s' does not exist or didn't "