X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Fapistatusesupdate.php;h=590ba1f06e41d73e733d3ac3ec2e4b43c758b957;hb=65055044118978383006d52675a230aa09bb3220;hp=b0f35271607e261cc67f56406fba4f9444d26a90;hpb=12588b1cf73fad7d0a76a29a46ec355150eaa54e;p=quix0rs-gnu-social.git diff --git a/actions/apistatusesupdate.php b/actions/apistatusesupdate.php index b0f3527160..590ba1f06e 100644 --- a/actions/apistatusesupdate.php +++ b/actions/apistatusesupdate.php @@ -129,9 +129,6 @@ if (!defined('STATUSNET')) { exit(1); } -require_once INSTALLDIR . '/lib/apiauth.php'; -require_once INSTALLDIR . '/lib/mediafile.php'; - /** * Updates the authenticating user's status (posts a notice). * @@ -149,6 +146,8 @@ require_once INSTALLDIR . '/lib/mediafile.php'; */ class ApiStatusesUpdateAction extends ApiAuthAction { + protected $needPost = true; + var $status = null; var $in_reply_to_status_id = null; var $lat = null; @@ -161,7 +160,7 @@ class ApiStatusesUpdateAction extends ApiAuthAction * * @return boolean success flag */ - function prepare($args) + protected function prepare(array $args=array()) { parent::prepare($args); @@ -180,23 +179,11 @@ class ApiStatusesUpdateAction extends ApiAuthAction * * Make a new notice for the update, save it, and show it * - * @param array $args $_REQUEST data (unused) - * * @return void */ - function handle($args) + protected function handle() { - 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 - ); - return; - } + parent::handle(); // Workaround for PHP returning empty $_POST and $_FILES when POST // length > post_max_size in php.ini @@ -212,51 +199,24 @@ class ApiStatusesUpdateAction extends ApiAuthAction intval($_SERVER['CONTENT_LENGTH'])); $this->clientError(sprintf($msg, $_SERVER['CONTENT_LENGTH'])); - return; } if (empty($this->status)) { - $this->clientError( - // TRANS: Client error displayed when the parameter "status" is missing. - _('Client must provide a \'status\' parameter with a value.'), - 400, - $this->format - ); - return; + // TRANS: Client error displayed when the parameter "status" is missing. + $this->clientError(_('Client must provide a \'status\' parameter with a value.')); } - if (empty($this->auth_user)) { + if (is_null($this->scoped)) { // TRANS: Client error displayed when updating a status for a non-existing user. - $this->clientError(_('No such user.'), 404, $this->format); - return; + $this->clientError(_('No such user.'), 404); } - $status_shortened = $this->auth_user->shortenlinks($this->status); - - if (Notice::contentTooLong($status_shortened)) { - // Note: Twitter truncates anything over 140, flags the status - // as "truncated." - - $this->clientError( - sprintf( - // TRANS: Client error displayed exceeding the maximum notice length. - // TRANS: %d is the maximum length for a notice. - _m('That\'s too long. Maximum notice size is %d character.', - 'That\'s too long. Maximum notice size is %d characters.', - Notice::maxContent()), - Notice::maxContent() - ), - 406, - $this->format - ); - - return; - } + /* Do not call shortenLinks until the whole notice has been build */ // Check for commands $inter = new CommandInterpreter(); - $cmd = $inter->handle_command($this->auth_user, $status_shortened); + $cmd = $inter->handle_command($this->auth_user, $this->status); if ($cmd) { if ($this->supported($cmd)) { @@ -274,73 +234,68 @@ class ApiStatusesUpdateAction extends ApiAuthAction if (!empty($this->in_reply_to_status_id)) { // Check whether notice actually exists - $reply = Notice::staticGet($this->in_reply_to_status_id); + $reply = Notice::getKV($this->in_reply_to_status_id); if ($reply) { $reply_to = $this->in_reply_to_status_id; } else { - $this->clientError( - // TRANS: Client error displayed when replying to a non-existing notice. - _('Parent notice not found.'), - $code = 404, - $this->format - ); - return; + // TRANS: Client error displayed when replying to a non-existing notice. + $this->clientError(_('Parent notice not found.'), 404); } } $upload = null; - try { - $upload = MediaFile::fromUpload('media', $this->auth_user); - } catch (Exception $e) { - $this->clientError($e->getMessage(), $e->getCode(), $this->format); - return; + $upload = MediaFile::fromUpload('media', $this->scoped); + $this->status .= ' ' . $upload->shortUrl(); + /* Do not call shortenLinks until the whole notice has been build */ + } catch (NoUploadedMediaException $e) { + // There was no uploaded media for us today. } - if (isset($upload)) { - $status_shortened .= ' ' . $upload->shortUrl(); + /* Do call shortenlinks here & check notice length since notice is about to be saved & sent */ + $status_shortened = $this->auth_user->shortenLinks($this->status); - if (Notice::contentTooLong($status_shortened)) { + if (Notice::contentTooLong($status_shortened)) { + if ($upload instanceof MediaFile) { $upload->delete(); - // TRANS: Client error displayed exceeding the maximum notice length. - // TRANS: %d is the maximum lenth for a notice. - $msg = _m('Maximum notice size is %d character, including attachment URL.', - 'Maximum notice size is %d characters, including attachment URL.', - Notice::maxContent()); - $this->clientError( - sprintf($msg, Notice::maxContent()), - 400, - $this->format - ); } + // TRANS: Client error displayed exceeding the maximum notice length. + // TRANS: %d is the maximum lenth for a notice. + $msg = _m('Maximum notice size is %d character, including attachment URL.', + 'Maximum notice size is %d characters, including attachment URL.', + Notice::maxContent()); + /* Use HTTP 413 error code (Request Entity Too Large) + * instead of basic 400 for better understanding + */ + $this->clientError(sprintf($msg, Notice::maxContent()), 413); } + $content = html_entity_decode($status_shortened, ENT_NOQUOTES, 'UTF-8'); $options = array('reply_to' => $reply_to); - if ($this->auth_user->shareLocation()) { + if ($this->scoped->shareLocation()) { $locOptions = Notice::locationOptions($this->lat, $this->lon, null, null, - $this->auth_user->getProfile()); + $this->scoped); $options = array_merge($options, $locOptions); } try { $this->notice = Notice::saveNew( - $this->auth_user->id, + $this->scoped->id, $content, $this->source, $options ); } catch (Exception $e) { - $this->clientError($e->getMessage(), $e->getCode(), $this->format); - return; + $this->clientError($e->getMessage(), $e->getCode()); } if (isset($upload)) { @@ -376,13 +331,15 @@ class ApiStatusesUpdateAction extends ApiAuthAction */ function supported($cmd) { - static $cmdlist = array('MessageCommand', 'SubCommand', 'UnsubCommand', - 'FavCommand', 'OnCommand', 'OffCommand', 'JoinCommand', 'LeaveCommand'); + static $cmdlist = array('SubCommand', 'UnsubCommand', + 'OnCommand', 'OffCommand', 'JoinCommand', 'LeaveCommand'); + + $supported = null; - if (in_array(get_class($cmd), $cmdlist)) { - return true; + if (Event::handle('CommandSupportedAPI', array($cmd, &$supported))) { + $supported = $supported || in_array(get_class($cmd), $cmdlist); } - return false; + return $supported; } }