From 759d1db9f198d62c9226cbe4fa179441731ff0f4 Mon Sep 17 00:00:00 2001
From: Anton Dyudin <ohAitch@gmail.com>
Date: Sat, 24 Jan 2015 13:31:29 -0800
Subject: [PATCH] Fixed key order, rate limit handling

---
 main/app/twit/core.hook                | 15 ++++-----------
 main/app/twitter-auth/core.hook        |  4 ++--
 main/app/twitter-auth/hoontap-keys.txt |  4 ++--
 3 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/main/app/twit/core.hook b/main/app/twit/core.hook
index 531d9f158..6955e6f1b 100644
--- a/main/app/twit/core.hook
+++ b/main/app/twit/core.hook
@@ -110,21 +110,14 @@
     ?+    p.p.sig  ~|([%unknown-code p.p.sig] !!)
         429  ::  Rate-limit
       =.  ran  (~(put by ran) pax 6 lat)
-      =+  mez=(appl-rate:auth ~ [%resources 'statuses']~)
-      :_(+>.$ [ost %pass [%limi pax] %e %them ~ mez]~)
+      =+  lim=%.(%x-rate-limit-reset ;~(biff ~(get by (mo q.p.sig)) poja ni:jo))
+      =+  tym=?~(lim (add ~m7.s30 lat) (add ~1970.1.1 (mul ~s1 u.lim)))
+      ~&  retrying-in/`@dr`(sub tym lat)
+      :_(+>.$ [ost %pass pax %t %wait tym]~)
         200  ::  OK
       =+  jon=(need (poja q:(need r.p.sig)))
   ::     ~&  twit-resp/%.(jon ?+(-.jon !! %o stat:twir, %a (ar:jo stat:twir)))
       ?+    pax  ~|([%http-missed pax] !!)
-          [%limi *]
-        :_  +>.$
-        =+  num=|=([a=cord b=$+(json (unit ,@da))] (ot:jo [a b] ~))
-        =.  b.num  (cu |=(a=@u (add ~1970.1.1 (mul a ~s1))) ni):jo
-        =+  paf=`path`~[%resources %statuses '/statuses/home_timeline' %reset]
-        ~|  [%no-time `wain`paf jon]
-        =+  tym=(need %.(jon b:(reel paf num)))
-        ~&  retrying-in/`@dr`(sub tym lat)
-        [ost %pass t.pax %t %wait tym]~
           [%post @ ~]
         =.  out  (~(put by out) (slav %uv i.t.pax) %| lat)
         :_  +>.$
diff --git a/main/app/twitter-auth/core.hook b/main/app/twitter-auth/core.hook
index e39e41429..2266ebddf 100644
--- a/main/app/twitter-auth/core.hook
+++ b/main/app/twitter-auth/core.hook
@@ -15,8 +15,8 @@
   =.  vat  (flop vat)                 ::  put into order of entry
   ?.  ?=([@ @ @ @ ~] vat)
     ~|([%keys-missing vat] !!)
-  =+  =<  aut=[[utok usec] atok asec]
-      `[atok=cord asec=cord utok=cord usec=cord ~]`vat
+  =+  =<  aut=[[ctok csec] atok asec]
+      `[ctok=cord csec=cord atok=cord asec=cord ~]`vat
   |=  ost=bone 
   :_  ~
   :^  ost  %pass  /out 
diff --git a/main/app/twitter-auth/hoontap-keys.txt b/main/app/twitter-auth/hoontap-keys.txt
index 3d4e6b523..ed380f2d9 100644
--- a/main/app/twitter-auth/hoontap-keys.txt
+++ b/main/app/twitter-auth/hoontap-keys.txt
@@ -1,4 +1,4 @@
+AP3G1t8ki6rPzeeAqdWCTw03F
+VV784LPwZSaAxtF16RWWTnST4F85BHN8VqQKNyv7MprCkA0xZD
 2821727326-RZGXSeTn7hCFQfJqR0ViivM3YYpu2O1M71gelBl
 jW9VygFPOTsEK0WmrJDHYSoEnofOPdCE1oQRzueemVTl8
-AP3G1t8ki6rPzeeAqdWCTw03F
-VV784LPwZSaAxtF16RWWTnST4F85BHN8VqQKNyv7MprCkA0xZD
\ No newline at end of file