Changeset 3bd4a93

Timestamp:

2010-04-13T17:36:16Z (15 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

3254c12

Parents:

3e69802

Message:

Suppress HTTP error messages unless we get five or more in a row.

Location:

protocols/twitter

Files:

• twitter.c (modified) (2 diffs)
• twitter.h (modified) (1 diff)
• twitter_lib.c (modified) (6 diffs)

protocols/twitter/twitter.c

@@ -36 +36 @@
         
         // Check if we are still logged in...
-        // We are logged in if the flag says so and the connection is still in the connections list.
-        if (!g_slist_find( twitter_connections, ic ) ||
-            (ic->flags & OPT_LOGGED_IN) != OPT_LOGGED_IN) 
+        if (!g_slist_find( twitter_connections, ic ))
                 return 0;
 
@@ -79 +77 @@
 
         imcb_log( ic, "Connecting to Twitter" );
-        imcb_connected(ic);
 
         // Run this once. After this queue the main loop function.

protocols/twitter/twitter.h

@@ -40 +40 @@
         gint main_loop_id;
         struct groupchat *home_timeline_gc;
+        gint http_fails;
 };
 

protocols/twitter/twitter_lib.c

@@ -180 +180 @@
         struct xt_parser *parser;
         struct twitter_xml_list *txl;
+        struct twitter_data *td;
 
         ic = req->data;
+        td = ic->proto_data;
 
         // Check if the connection is still active.
@@ -190 +192 @@
         if (req->status_code != 200) {
                 // It didn't go well, output the error and return.
-                imcb_error(ic, "Could not retrieve friends. HTTP STATUS: %d", req->status_code);
-                return;
+                if (++td->http_fails >= 5)
+                        imcb_error(ic, "Could not retrieve friends. HTTP STATUS: %d", req->status_code);
+                
+                return;
+        } else {
+                td->http_fails = 0;
         }
 
@@ -462 +468 @@
 {
         struct im_connection *ic = req->data;
+        struct twitter_data *td = ic->proto_data;
         struct xt_parser *parser;
         struct twitter_xml_list *txl;
@@ -470 +477 @@
 
         // Check if the HTTP request went well.
-        if (req->status_code != 200) {
+        if (req->status_code == 200)
+        {
+                td->http_fails = 0;
+                if (!ic->flags & OPT_LOGGED_IN)
+                        imcb_connected(ic);
+        }
+        else if (req->status_code == 401)
+        {
+                imcb_error( ic, "Authentication failure" );
+                imc_logout( ic, FALSE );
+                return;
+        }
+        else
+        {
                 // It didn't go well, output the error and return.
-                imcb_error(ic, "Could not retrieve " TWITTER_HOME_TIMELINE_URL ". HTTP STATUS: %d", req->status_code);
+                if (++td->http_fails >= 5)
+                        imcb_error(ic, "Could not retrieve " TWITTER_HOME_TIMELINE_URL ". HTTP STATUS: %d", req->status_code);
+                
                 return;
         }
@@ -507 +529 @@
 {
         struct im_connection *ic = req->data;
+        struct twitter_data *td = ic->proto_data;
         struct xt_parser *parser;
         struct twitter_xml_list *txl;
@@ -519 +542 @@
         if (req->status_code != 200) {
                 // It didn't go well, output the error and return.
-                imcb_error(ic, "Could not retrieve " TWITTER_SHOW_FRIENDS_URL " HTTP STATUS: %d", req->status_code);
-                return;
+                if (++td->http_fails >= 5)
+                        imcb_error(ic, "Could not retrieve " TWITTER_SHOW_FRIENDS_URL " HTTP STATUS: %d", req->status_code);
+                
+                return;
+        } else {
+                td->http_fails = 0;
         }