Changeset 38376

Timestamp:

08/29/10 21:37:06 (3 years ago)

Author:

NeoCat

Message:

Don't request (GET) while ratelimit is activated

Files:

• websites/twicli/twicli.js (modified) (7 diffs)

websites/twicli/twicli.js

@@ -36 +36 @@
 function setupOAuthURL(url, post) {
         if (url.indexOf(twitterAPI) != 0) return url;
+        if (!post && ratelimit_reset_time && new Date < ratelimit_reset_time) return false;
         url = url.split("?");
         setupOAuthArgs(url[1]);
@@ -46 +47 @@
 function loadXDomainScript(url, ele) {
         url = setupOAuthURL(url);
+        if (!url) return ele;
         if (ele && ele.parentNode)
                 ele.parentNode.removeChild(ele);
@@ -301 +303 @@
 var geo = null;
 var geowatch = null;
+var ratelimit_reset_time = null;
 
 //ログイン・自ユーザ名受信
@@ -349 +352 @@
 
 function error(str) {
+        if (str.indexOf('Rate limit exceeded.') == 0) {
+                if (ratelimit_reset_time && new Date < ratelimit_reset_time)
+                        return;
+                else
+                        update_ele2 = loadXDomainScript(twitterAPI + 'account/rate_limit_status.json' +
+                                                                                        '?id=' + myname + '&callback=twLimit2', update_ele2);
+        }
         $('loading').style.display = 'none';
         alert(str);
@@ -754 +764 @@
 }
 function twDirectCheck(tw) {
+        if (tw.error) return error(tw.error);
         if (!tw || tw.length == 0) return false;
         if (last_direct_id && last_direct_id < tw[0].id)
@@ -765 +776 @@
                                         "hourly limit : " + lim.remaining_hits + " / " + lim.hourly_limit + "<br>" +
                                         "reset at : " + dateFmt(lim.reset_time);
+}
+function twLimit2(lim) {
+        ratelimit_reset_time = new Date(lim.reset_time.replace('+','GMT+'));;
 }
 // 新着reply受信通知
@@ -1145 +1159 @@
         callPlugins("miscTab", $("tw2h"));
         $("loading").style.display = "block";
-        update_ele2 = loadXDomainScript(twitterAPI + 'account/rate_limit_status.json' +
+        if (ratelimit_reset_time && new Date < ratelimit_reset_time)
+                $("tw2c").innerHTML = "<b>Twitter API status:</b><br>" +
+                                        "hourly limit : 0<br>reset at : " + dateFmt(ratelimit_reset_time);
+        else
+                update_ele2 = loadXDomainScript(twitterAPI + 'account/rate_limit_status.json' +
                                                                                 '?id=' + myname + '&callback=twLimit', update_ele2);
 }