Remove trailing whitespace in UI text.

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

diff --git a/actions/apistatusesupdate.php b/actions/apistatusesupdate.php
index 822ebacbddd01b0774ed3714be1626c23fa9e70a..b0f35271607e261cc67f56406fba4f9444d26a90 100644 (file)
--- 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 <a href="http://georss.org/Main_Page">GeoRSS</a>
     to encode the latitude and longitude (see example response below <georss:point>).
     @li Data uploaded via the @e media parameter should be multipart/form-data encoded.
@@ -160,7 +160,6 @@ class ApiStatusesUpdateAction extends ApiAuthAction
      * @param array $args $_REQUEST args
      *
      * @return boolean success flag
-     *
      */
     function prepare($args)
     {
@@ -227,21 +226,21 @@ 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);
+        $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.
+                    // TRANS: Client error displayed exceeding the maximum notice length.
+                    // TRANS: %d is the maximum length 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()),
@@ -304,6 +303,8 @@ class ApiStatusesUpdateAction extends ApiAuthAction
 
                 if (Notice::contentTooLong($status_shortened)) {
                     $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());
@@ -376,7 +377,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;