X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Fapistatusesretweet.php;h=ee391fdb4adc33ce02b6944ac3d9f79c27163679;hb=63306081bc164fcf57abd7f0996767626fd1e501;hp=aae98f63786c6d5d5f64dd84845a796d9db1836a;hpb=42dd460d3b9aa9a8ad147d00de9b6c8e209ab4e9;p=quix0rs-gnu-social.git diff --git a/actions/apistatusesretweet.php b/actions/apistatusesretweet.php index aae98f6378..ee391fdb4a 100644 --- a/actions/apistatusesretweet.php +++ b/actions/apistatusesretweet.php @@ -31,9 +31,6 @@ if (!defined('STATUSNET')) { exit(1); } -require_once INSTALLDIR . '/lib/apiauth.php'; -require_once INSTALLDIR . '/lib/mediafile.php'; - /** * Repeat a notice through the API * @@ -43,7 +40,6 @@ require_once INSTALLDIR . '/lib/mediafile.php'; * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 * @link http://status.net/ */ - class ApiStatusesRetweetAction extends ApiAuthAction { var $original = null; @@ -54,9 +50,7 @@ class ApiStatusesRetweetAction extends ApiAuthAction * @param array $args $_REQUEST args * * @return boolean success flag - * */ - function prepare($args) { parent::prepare($args); @@ -70,9 +64,10 @@ class ApiStatusesRetweetAction extends ApiAuthAction $id = $this->trimmed('id'); - $this->original = Notice::staticGet('id', $id); + $this->original = Notice::getKV('id', $id); if (empty($this->original)) { + // TRANS: Client error displayed trying to repeat a non-existing notice through the API. $this->clientError(_('No such notice.'), 400, $this->format); return false; @@ -80,20 +75,6 @@ class ApiStatusesRetweetAction extends ApiAuthAction $this->user = $this->auth_user; - if ($this->user->id == $this->original->profile_id) { - $this->clientError(_('Cannot repeat your own notice.'), - 400, $this->format); - return false; - } - - $profile = $this->user->getProfile(); - - if ($profile->hasRepeated($id)) { - $this->clientError(_('Already repeated that notice.'), - 400, $this->format); - return false; - } - return true; } @@ -106,15 +87,12 @@ class ApiStatusesRetweetAction extends ApiAuthAction * * @return void */ - function handle($args) { parent::handle($args); $repeat = $this->original->repeat($this->user->id, $this->source); - - $this->showNotice($repeat); } @@ -123,7 +101,6 @@ class ApiStatusesRetweetAction extends ApiAuthAction * * @return void */ - function showNotice($notice) { if (!empty($notice)) {