OAuth related syntax fixes, nothing big

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

diff --git a/actions/apidirectmessagenew.php b/actions/apidirectmessagenew.php
index c126cd312fea2c19119b11bc71651676b2c4ad87..6d637fcb46461c9b27839460841f4ef155d78ead 100644 (file)
--- a/actions/apidirectmessagenew.php
+++ b/actions/apidirectmessagenew.php
@@ -34,8 +34,6 @@ if (!defined('STATUSNET')) {
     exit(1);
 }
 
-require_once INSTALLDIR . '/lib/apiauth.php';
-
 /**
  * Creates a new direct message from the authenticating user to
  * the user specified by id.
@@ -60,7 +58,6 @@ class ApiDirectMessageNewAction extends ApiAuthAction
      * @param array $args $_REQUEST args
      *
      * @return boolean success flag
-     *
      */
     function prepare($args)
     {
@@ -69,6 +66,7 @@ class ApiDirectMessageNewAction extends ApiAuthAction
         $this->user = $this->auth_user;
 
         if (empty($this->user)) {
+            // TRANS: Client error when user not found for an API direct message action.
             $this->clientError(_('No such user.'), 404, $this->format);
             return;
         }
@@ -113,17 +111,17 @@ class ApiDirectMessageNewAction extends ApiAuthAction
 
         if (empty($this->content)) {
             $this->clientError(
-                // TRANS: Client error (406).
+                // TRANS: Client error displayed when no message text was submitted (406).
                 _('No message text!'),
                 406,
                 $this->format
             );
         } else {
-            $content_shortened = common_shorten_links($this->content);
+            $content_shortened = $this->auth_user->shortenLinks($this->content);
             if (Message::contentTooLong($content_shortened)) {
-                // TRANS: Client error displayed when message content is too long.
-                // TRANS: %d is the maximum number of characters for a message.
                 $this->clientError(
+                    // TRANS: Client error displayed when message content is too long.
+                    // TRANS: %d is the maximum number of characters for a message.
                     sprintf(_m('That\'s too long. Maximum message size is %d character.', 'That\'s too long. Maximum message size is %d characters.', Message::maxContent()),
                         Message::maxContent()
                     ),
@@ -141,7 +139,7 @@ class ApiDirectMessageNewAction extends ApiAuthAction
         } else if (!$this->user->mutuallySubscribed($this->other)) {
             $this->clientError(
                 // TRANS: Client error displayed trying to direct message another user who's not a friend (403).
-                _('Can\'t send direct messages to users who aren\'t your friend.'),
+                _('Cannot send direct messages to users who aren\'t your friend.'),
                 403,
                 $this->format
             );
@@ -163,11 +161,6 @@ class ApiDirectMessageNewAction extends ApiAuthAction
             $this->source
         );
 
-        if (is_string($message)) {
-            $this->serverError($message);
-            return;
-        }
-
         $message->notify();
 
         if ($this->format == 'xml') {