Merge branch '0.8.x' of git@gitorious.org:+laconica-developers/laconica/dev into...

[quix0rs-gnu-social.git] / actions / twitapiaccount.php

diff --git a/actions/twitapiaccount.php b/actions/twitapiaccount.php
index c19cd370d927f2b2bb6e8f5bf044f328f5e12926..8b956f897a397606434d2a2d1040a71c31b937c8 100644 (file)
--- a/actions/twitapiaccount.php
+++ b/actions/twitapiaccount.php
@@ -23,22 +23,24 @@ require_once(INSTALLDIR.'/lib/twitterapi.php');
 
 class TwitapiaccountAction extends TwitterapiAction
 {
-
     function verify_credentials($args, $apidata)
     {
-        if ($apidata['content-type'] == 'xml') {
-            header('Content-Type: application/xml; charset=utf-8');
-            print '<authorized>true</authorized>';
-        } elseif ($apidata['content-type'] == 'json') {
-            header('Content-Type: application/json; charset=utf-8');
-            print '{"authorized":true}';
-        } else {
+        parent::handle($args);
+
+        switch ($apidata['content-type']) {
+        case 'xml':
+        case 'json':
+            $action_obj = new TwitapiusersAction();
+            $action_obj->prepare($args);
+            call_user_func(array($action_obj, 'show'), $args, $apidata);
+            break;
+        default:
             header('Content-Type: text/html; charset=utf-8');
             print 'Authorized';
         }
     }
 
-    function end_session($args, $apidata)
+   function end_session($args, $apidata)
     {
         parent::handle($args);
         $this->serverError(_('API method under construction.'), $code=501);
@@ -96,9 +98,31 @@ class TwitapiaccountAction extends TwitterapiAction
         $this->serverError(_('API method under construction.'), $code=501);
     }
 
+    // We don't have a rate limit, but some clients check this method.
+    // It always returns the same thing: 100 hit left.
     function rate_limit_status($args, $apidata)
     {
         parent::handle($args);
-        $this->serverError(_('API method under construction.'), $code=501);
+
+        $type = $apidata['content-type'];
+        $this->init_document($type);
+
+        if ($apidata['content-type'] == 'xml') {
+            $this->elementStart('hash');
+            $this->element('remaining-hits', array('type' => 'integer'), 100);
+            $this->element('hourly-limit', array('type' => 'integer'), 100);
+            $this->element('reset-time', array('type' => 'datetime'), null);
+            $this->element('reset_time_in_seconds', array('type' => 'integer'), 0);
+            $this->elementEnd('hash');
+        } elseif ($apidata['content-type'] == 'json') {
+
+            $out = array('reset_time_in_seconds' => 0,
+                         'remaining_hits' => 100,
+                         'hourly_limit' => 100,
+                         'reset_time' => '');
+            print json_encode($out);
+        }
+
+        $this->end_document($type);
     }
 }