updating prepare and handle

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

diff --git a/actions/apistatusesfavs.php b/actions/apistatusesfavs.php
index 626ea3786c866386d3adb954744e4d5048b70d78..01a5d3014e1637ee51e4475cf6832b38e6bf1ba6 100644 (file)
--- a/actions/apistatusesfavs.php
+++ b/actions/apistatusesfavs.php
@@ -20,7 +20,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * @category  API
- * @package   GNUSocial
+ * @package   GNUsocial
  * @author    Hannes Mannerheim <h@nnesmannerhe.im>
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://www.gnu.org/software/social/
@@ -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(array $args=array())
     {
         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);
+        $this->original = Notice::getKV('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(); 
@@ -100,7 +102,7 @@ class ApiStatusesFavsAction extends ApiAuthAction
                $ids_with_profile_data = array();
                $i=0;
                foreach($ids as $id) {
-                       $profile = Profile::staticGet('id', $id);
+                       $profile = Profile::getKV('id', $id);
                        $ids_with_profile_data[$i]['user_id'] = $id;
                        $ids_with_profile_data[$i]['nickname'] = $profile->nickname;
                        $ids_with_profile_data[$i]['fullname'] = $profile->fullname;