MediaFile code improvements, preparing to implement multi-attachments

[quix0rs-gnu-social.git] / actions / apistatusesupdate.php

diff --git a/actions/apistatusesupdate.php b/actions/apistatusesupdate.php
index 5773bdc2e8106ffc4fd8e7787bede0a4616b2dbc..374930fff007f9d2d47c4542df4b8f3d5f30a726 100644 (file)
--- 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).
  *
@@ -231,32 +228,12 @@ class ApiStatusesUpdateAction extends ApiAuthAction
             return;
         }
 
-        $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 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,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;
@@ -292,30 +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();
-                    // 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,
+                                   $this->format);
             }
 
+
             $content = html_entity_decode($status_shortened, ENT_NOQUOTES, 'UTF-8');
 
             $options = array('reply_to' => $reply_to);