X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=inline;f=actions%2Fapistatusesupdate.php;h=6b876c8f117a045b33f70d1a910443c63d5a1a91;hb=261ccfac8699534ff584a2f93d5dcd384529d855;hp=7209ae33335a942d0a86bedc408d0f08ff5140b9;hpb=a9c4bcd71f0ce046bd57ea727c140c6e91fcd013;p=quix0rs-gnu-social.git

diff --git a/actions/apistatusesupdate.php b/actions/apistatusesupdate.php
index 7209ae3333..6b876c8f11 100644
--- a/actions/apistatusesupdate.php
+++ b/actions/apistatusesupdate.php
@@ -146,6 +146,8 @@ if (!defined('STATUSNET')) {
  */
 class ApiStatusesUpdateAction extends ApiAuthAction
 {
+    protected $needPost = true;
+
     var $status                = null;
     var $in_reply_to_status_id = null;
     var $lat                   = null;
@@ -158,7 +160,7 @@ class ApiStatusesUpdateAction extends ApiAuthAction
      *
      * @return boolean success flag
      */
-    function prepare($args)
+    protected function prepare(array $args=array())
     {
         parent::prepare($args);
 
@@ -177,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
@@ -209,23 +199,16 @@ 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);
         }
 
         /* Do not call shortenlinks until the whole notice has been build */
@@ -256,36 +239,25 @@ 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;
-
             try {
-                $upload = MediaFile::fromUpload('media', $this->auth_user);
-            } catch (Exception $e) {
-                $this->clientError($e->getMessage(), $e->getCode(), $this->format);
-                return;
-            }
-
-            if (isset($upload)) {
+                $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.
             }
 
             /* 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 (isset($upload)) {
+                if ($upload instanceof MediaFile) {
                     $upload->delete();
                 }
                 // TRANS: Client error displayed exceeding the maximum notice length.
@@ -296,9 +268,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);
             }
 
 
@@ -306,27 +276,26 @@ class ApiStatusesUpdateAction extends ApiAuthAction
 
             $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)) {
@@ -362,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;
     }
 }