Revert "Added bit about being incompatible with file attachment virtual server"

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

diff --git a/actions/twitapistatuses.php b/actions/twitapistatuses.php
index b8f4a1058505bd5f9468c0ffcf262744d217200a..b0d3e584ba0e202570049a3d0343b9125eaa0a6c 100644 (file)
--- a/actions/twitapistatuses.php
+++ b/actions/twitapistatuses.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * StatusNet - a distributed open-source microblogging tool
+ * StatusNet - the distributed open-source microblogging tool
  * Copyright (C) 2008, 2009, StatusNet, Inc.
  *
  * This program is free software: you can redistribute it and/or modify
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
@@ -136,6 +136,11 @@ class TwitapistatusesAction extends TwitterapiAction
 
     }
 
+    function home_timeline($args, $apidata)
+    {
+        call_user_func(array($this, 'friends_timeline'), $args, $apidata);
+    }
+
     function user_timeline($args, $apidata)
     {
         parent::handle($args);
@@ -231,11 +236,8 @@ class TwitapistatusesAction extends TwitterapiAction
         }
 
         if (empty($status)) {
-
-            // XXX: Note: In this case, Twitter simply returns '200 OK'
-            // No error is given, but the status is not posted to the
-            // user's timeline.     Seems bad.     Shouldn't we throw an
-            // errror? -- Zach
+            $this->clientError(_('Client must provide a \'status\' parameter with a value.'),
+                $code = 403, $apidata['content-type']);
             return;
 
         } else {
@@ -292,7 +294,7 @@ class TwitapistatusesAction extends TwitterapiAction
                     $source, 1, $reply_to);
 
             if (is_string($notice)) {
-                $this->serverError($notice);
+                $this->serverError($notice, 500, $apidata['content-type']);
                 return;
             }
 
@@ -449,7 +451,7 @@ class TwitapistatusesAction extends TwitterapiAction
     function friends($args, $apidata)
     {
         parent::handle($args);
-        $includeStatuses=! (boolean) $args['lite'];
+        $includeStatuses= !(array_key_exists('lite', $args) and $args['lite']);
         return $this->subscriptions($apidata, 'subscribed', 'subscriber', false, $includeStatuses);
     }
 
@@ -462,7 +464,7 @@ class TwitapistatusesAction extends TwitterapiAction
     function followers($args, $apidata)
     {
         parent::handle($args);
-        $includeStatuses=! (boolean) $args['lite'];
+        $includeStatuses= !(array_key_exists('lite', $args) and $args['lite']);
         return $this->subscriptions($apidata, 'subscriber', 'subscribed', false, $includeStatuses);
     }