Merge remote-tracking branch 'statusnet/master'

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

diff --git a/actions/apifavoritecreate.php b/actions/apifavoritecreate.php
index 1b05eb95c9b768e2ad7eb63cad6c720957c4899c..3f639159cc9edcfb70b3d963e7e92597692a0c0e 100644 (file)
--- a/actions/apifavoritecreate.php
+++ b/actions/apifavoritecreate.php
@@ -21,8 +21,11 @@
  *
  * @category  API
  * @package   StatusNet
+ * @author    Craig Andrews <candrews@integralblue.com>
+ * @author    Evan Prodromou <evan@status.net>
  * @author    Zach Copley <zach@status.net>
  * @copyright 2009 StatusNet, Inc.
+ * @copyright 2009 Free Software Foundation, Inc http://www.fsf.org
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://status.net/
  */
@@ -31,7 +34,7 @@ if (!defined('STATUSNET')) {
     exit(1);
 }
 
-require_once INSTALLDIR.'/lib/apiauth.php';
+require_once INSTALLDIR . '/lib/apiauth.php';
 
 /**
  * Favorites the status specified in the ID parameter as the authenticating user.
@@ -39,14 +42,14 @@ require_once INSTALLDIR.'/lib/apiauth.php';
  *
  * @category API
  * @package  StatusNet
+ * @author   Craig Andrews <candrews@integralblue.com>
+ * @author   Evan Prodromou <evan@status.net>
  * @author   Zach Copley <zach@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  */
-
 class ApiFavoriteCreateAction extends ApiAuthAction
 {
-    var $user   = null;
     var $notice = null;
 
     /**
@@ -55,15 +58,19 @@ class ApiFavoriteCreateAction extends ApiAuthAction
      * @param array $args $_REQUEST args
      *
      * @return boolean success flag
-     *
      */
-
     function prepare($args)
     {
         parent::prepare($args);
 
         $this->user   = $this->auth_user;
         $this->notice = Notice::staticGet($this->arg('id'));
+        if ($this->notice->repeat_of != '' ) {
+                common_log(LOG_DEBUG, 'Trying to Fave '.$this->notice->id.', repeat of '.$this->notice->repeat_of);
+                common_log(LOG_DEBUG, 'Will Fave '.$this->notice->repeat_of.' instead');
+                $real_notice_id = $this->notice->repeat_of;
+                $this->notice = Notice::staticGet($real_notice_id);
+        }
 
         return true;
     }
@@ -77,13 +84,13 @@ class ApiFavoriteCreateAction extends ApiAuthAction
      *
      * @return void
      */
-
     function handle($args)
     {
         parent::handle($args);
 
         if ($_SERVER['REQUEST_METHOD'] != 'POST') {
             $this->clientError(
+                // TRANS: Client error. POST is a HTTP command. It should not be translated.
                 _('This method requires a POST.'),
                 400,
                 $this->format
@@ -93,7 +100,8 @@ class ApiFavoriteCreateAction extends ApiAuthAction
 
         if (!in_array($this->format, array('xml', 'json'))) {
             $this->clientError(
-                _('API method not found!'),
+                // TRANS: Client error displayed when coming across a non-supported API method.
+                _('API method not found.'),
                 404,
                 $this->format
             );
@@ -102,6 +110,7 @@ class ApiFavoriteCreateAction extends ApiAuthAction
 
         if (empty($this->notice)) {
             $this->clientError(
+                // TRANS: Client error displayed when requesting a status with a non-existing ID.
                 _('No status found with that ID.'),
                 404,
                 $this->format
@@ -113,18 +122,20 @@ class ApiFavoriteCreateAction extends ApiAuthAction
 
         if ($this->user->hasFave($this->notice)) {
             $this->clientError(
-                _('This status is already a favorite!'),
+                // TRANS: Client error displayed when trying to mark a notice favourite that already is a favourite.
+                _('This status is already a favorite.'),
                 403,
                 $this->format
             );
             return;
         }
 
-        $fave = Fave::addNew($this->user, $this->notice);
+        $fave = Fave::addNew($this->user->getProfile(), $this->notice);
 
         if (empty($fave)) {
             $this->clientError(
-                _('Could not create favorite.')
+                // TRANS: Client error displayed when marking a notice as favourite fails.
+                _('Could not create favorite.'),
                 403,
                 $this->format
             );
@@ -141,7 +152,6 @@ class ApiFavoriteCreateAction extends ApiAuthAction
         }
     }
 
-
     /**
      * Notify the author of the favorite that the user likes their notice
      *
@@ -162,5 +172,4 @@ class ApiFavoriteCreateAction extends ApiAuthAction
             // XXX: notify by SMS
         }
     }
-
 }