Let's not limit qvitter stuff to 'json' requests

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

diff --git a/actions/apistatusesfavs.php b/actions/apistatusesfavs.php
index 626ea3786c866386d3adb954744e4d5048b70d78..9a60028419f4ad208ddbde5341f217e71c400228 100644 (file)
--- a/actions/apistatusesfavs.php
+++ b/actions/apistatusesfavs.php
@@ -36,7 +36,7 @@ class ApiStatusesFavsAction extends ApiAuthAction
 {
     const MAXCOUNT = 100;
 
-    var $original = null;
+    var $original = null;   // Notice object for which to retrieve favs
     var $cnt      = self::MAXCOUNT;
 
     /**
@@ -46,19 +46,21 @@ class ApiStatusesFavsAction extends ApiAuthAction
      *
      * @return boolean success flag
      */
-    function prepare($args)
+    protected function prepare($args)
     {
         parent::prepare($args);
 
+        if ($this->format !== 'json') {
+            $this->clientError('This method currently only serves JSON.', 415);
+        }
+
         $id = $this->trimmed('id');
 
         $this->original = Notice::staticGet('id', $id);
 
-        if (empty($this->original)) {
+        if (!($this->original instanceof Notice)) {
             // TRANS: Client error displayed trying to display redents of a non-exiting notice.
-            $this->clientError(_('No such notice.'),
-                               400, $this->format);
-            return false;
+            $this->clientError(_('No such notice.'), 400);
         }
 
         $cnt = $this->trimmed('count');
@@ -81,9 +83,9 @@ class ApiStatusesFavsAction extends ApiAuthAction
      *
      * @return void
      */
-    function handle($args)
+    protected function handle()
     {
-        parent::handle($args);
+        parent::handle();
        
         $fave = new Fave();
         $fave->selectAdd();