X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Fapistatusesupdate.php;h=09663ac7c2595b2220783fa14135d9c612332e36;hb=2c5cba28b6a8e13a58fe7584835340aa9779b146;hp=ac93d58e33d6b697f3afbc5729bfcab2941c2985;hpb=78f9629bf3553a709c99e13f480bd225083e5ca5;p=quix0rs-gnu-social.git

diff --git a/actions/apistatusesupdate.php b/actions/apistatusesupdate.php
index ac93d58e33..09663ac7c2 100644
--- a/actions/apistatusesupdate.php
+++ b/actions/apistatusesupdate.php
@@ -146,10 +146,13 @@ if (!defined('STATUSNET')) {
  */
 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
@@ -165,6 +168,19 @@ class ApiStatusesUpdateAction extends ApiAuthAction
         $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'));
@@ -177,24 +193,12 @@ class ApiStatusesUpdateAction extends ApiAuthAction
      *
      * Make a new notice for the update, save it, and show it
      *
-     * @param array $args $_REQUEST data (unused)
-     *
      * @return void
      */
     protected function handle()
     {
         parent::handle();
 
-        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;
-        }
-
         // Workaround for PHP returning empty $_POST and $_FILES when POST
         // length > post_max_size in php.ini
 
@@ -209,26 +213,19 @@ 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 (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);
         }
 
-        /* Do not call shortenlinks until the whole notice has been build */
+        /* Do not call shortenLinks until the whole notice has been build */
 
         // Check for commands
 
@@ -256,36 +253,32 @@ class ApiStatusesUpdateAction extends ApiAuthAction
                 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->scoped);
-            } catch (Exception $e) {
-                $this->clientError($e->getMessage(), $e->getCode(), $this->format);
-                return;
-            }
-
-            if (isset($upload)) {
                 $this->status .= ' ' . $upload->shortUrl();
-
-                /* Do not call shortenlinks until the whole notice has been build */
+                /* Do not call shortenLinks until the whole notice has been build */
+            } catch (NoUploadedMediaException $e) {
+                // There was no uploaded media for us today.
             }
 
             /* Do call shortenlinks here & check notice length since notice is about to be saved & sent */
-            $status_shortened = $this->auth_user->shortenlinks($this->status);
+            $status_shortened = $this->auth_user->shortenLinks($this->status);
 
             if (Notice::contentTooLong($status_shortened)) {
-                if (isset($upload)) {
+                if ($upload instanceof MediaFile) {
                     $upload->delete();
                 }
                 // TRANS: Client error displayed exceeding the maximum notice length.
@@ -296,9 +289,7 @@ class ApiStatusesUpdateAction extends ApiAuthAction
                 /* 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);
+                $this->clientError(sprintf($msg, Notice::maxContent()), 413);
             }
 
 
@@ -325,8 +316,7 @@ class ApiStatusesUpdateAction extends ApiAuthAction
                     $options
                 );
             } catch (Exception $e) {
-                $this->clientError($e->getMessage(), $e->getCode(), $this->format);
-                return;
+                $this->clientError($e->getMessage(), $e->getCode());
             }
 
             if (isset($upload)) {
@@ -362,13 +352,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;
     }
 }