X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Fapistatusesupdate.php;h=374930fff007f9d2d47c4542df4b8f3d5f30a726;hb=48da97f204800d9e972be66d4a2b8426ab0b01f1;hp=822ebacbddd01b0774ed3714be1626c23fa9e70a;hpb=dc62cf1c0b6f77ebd4e4bf885aa3de7846b3232a;p=quix0rs-gnu-social.git
diff --git a/actions/apistatusesupdate.php b/actions/apistatusesupdate.php
index 822ebacbdd..374930fff0 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).
*
@@ -160,7 +157,6 @@ class ApiStatusesUpdateAction extends ApiAuthAction
* @param array $args $_REQUEST args
*
* @return boolean success flag
- *
*/
function prepare($args)
{
@@ -227,37 +223,17 @@ class ApiStatusesUpdateAction extends ApiAuthAction
}
if (empty($this->auth_user)) {
+ // TRANS: Client error displayed when updating a status for a non-existing user.
$this->clientError(_('No such user.'), 404, $this->format);
return;
}
- $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)) {
@@ -275,7 +251,7 @@ 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;
@@ -293,28 +269,39 @@ class ApiStatusesUpdateAction extends ApiAuthAction
$upload = null;
try {
- $upload = MediaFile::fromUpload('media', $this->auth_user);
+ $upload = MediaFile::fromUpload('media', $this->auth_user->getProfile());
} catch (Exception $e) {
$this->clientError($e->getMessage(), $e->getCode(), $this->format);
return;
}
if (isset($upload)) {
- $status_shortened .= ' ' . $upload->shortUrl();
+ $this->status .= ' ' . $upload->shortUrl();
+
+ /* Do not call shortenlinks until the whole notice has been build */
+ }
+
+ /* 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 (isset($upload)) {
$upload->delete();
- $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,
+ $this->format);
}
+
$content = html_entity_decode($status_shortened, ENT_NOQUOTES, 'UTF-8');
$options = array('reply_to' => $reply_to);
@@ -376,7 +363,7 @@ class ApiStatusesUpdateAction extends ApiAuthAction
function supported($cmd)
{
static $cmdlist = array('MessageCommand', 'SubCommand', 'UnsubCommand',
- 'FavCommand', 'OnCommand', 'OffCommand');
+ 'FavCommand', 'OnCommand', 'OffCommand', 'JoinCommand', 'LeaveCommand');
if (in_array(get_class($cmd), $cmdlist)) {
return true;