X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Fapistatusesupdate.php;h=09663ac7c2595b2220783fa14135d9c612332e36;hb=2c5cba28b6a8e13a58fe7584835340aa9779b146;hp=666ed9fa32330f55863073418530cd3206e1c752;hpb=c4b8f68a1a3ed6422a2ed1cb7a8b5b5c65011b5f;p=quix0rs-gnu-social.git
diff --git a/actions/apistatusesupdate.php b/actions/apistatusesupdate.php
index 666ed9fa32..09663ac7c2 100644
--- a/actions/apistatusesupdate.php
+++ b/actions/apistatusesupdate.php
@@ -55,7 +55,7 @@
Yes
@param status (Required) The URL-encoded text of the status update.
- @param source (Optional) The source of the status.
+ @param source (Optional) The source application name, if using HTTP authentication or an anonymous OAuth consumer.
@param in_reply_to_status_id (Optional) The ID of an existing status that the update is in reply to.
@param lat (Optional) The latitude the status refers to.
@param long (Optional) The longitude the status refers to.
@@ -67,7 +67,7 @@
@subsection usagenotes Usage notes
@li The URL pattern is relative to the @ref apiroot.
- @li If the @e source parameter is not supplied the source of the status will default to 'api'.
+ @li If the @e source parameter is not supplied the source of the status will default to 'api'. When authenticated via a registered OAuth application, the application's registered name and URL will always override the source parameter.
@li The XML response uses GeoRSS
to encode the latitude and longitude (see example response below ).
@li Data uploaded via the @e media parameter should be multipart/form-data encoded.
@@ -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,10 +146,13 @@ 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;
var $lon = null;
+ var $media_ids = array(); // file_id in the keys
/**
* Take arguments for running
@@ -161,13 +161,26 @@ class ApiStatusesUpdateAction extends ApiAuthAction
*
* @return boolean success flag
*/
- function prepare($args)
+ protected function prepare(array $args=array())
{
parent::prepare($args);
$this->status = $this->trimmed('status');
$this->lat = $this->trimmed('lat');
$this->lon = $this->trimmed('long');
+ $matches = array();
+ common_debug(get_called_class().': media_ids=='._ve($this->trimmed('media_ids')));
+ if (preg_match_all('/\d+/', $this->trimmed('media_ids'), $matches) !== false) {
+ foreach (array_unique($matches[0]) as $match) {
+ try {
+ $this->media_ids[$match] = File::getByID($match);
+ } catch (EmptyIdException $e) {
+ // got a zero from the client, at least Twidere does this on occasion
+ } catch (NoResultException $e) {
+ // File ID was not found. Do we abort and report to the client?
+ }
+ }
+ }
$this->in_reply_to_status_id
= intval($this->trimmed('in_reply_to_status_id'));
@@ -180,23 +193,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 +213,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 = common_shorten_links($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 when the parameter "status" is missing.
- // TRANS: %d is the maximum number of character 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 +248,75 @@ 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;
+ foreach(array_keys($this->media_ids) as $media_id) {
+ // FIXME: Validation on this... Worst case is that if someone sends bad media_ids then
+ // we'll fill the notice with non-working links, so no real harm, done, but let's fix.
+ // The File objects are in the array, so we could get URLs from them directly.
+ $this->status .= ' ' . common_local_url('attachment', array('attachment' => $media_id));
+ }
+ $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 +352,15 @@ class ApiStatusesUpdateAction extends ApiAuthAction
*/
function supported($cmd)
{
- static $cmdlist = array('MessageCommand', 'SubCommand', 'UnsubCommand',
- 'FavCommand', 'OnCommand', 'OffCommand');
+ 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;
}
}