X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=lib%2Fcommand.php;h=3fb4d76c75f131ff74f245362a646cde59d43086;hb=5089d3065c5b2944e468d821a0afdc0881830445;hp=ae69f04a1366b80d990110344374db868c40ef09;hpb=e0e7cb7c5376a7adfdcf8e0724aedfae3de471ef;p=quix0rs-gnu-social.git

diff --git a/lib/command.php b/lib/command.php
index ae69f04a13..3fb4d76c75 100644
--- a/lib/command.php
+++ b/lib/command.php
@@ -139,7 +139,7 @@ class Command
     {
         $user = null;
         if (Event::handle('StartCommandGetUser', array($this, $arg, &$user))) {
-            $user = User::staticGet('nickname', $arg);
+            $user = User::staticGet('nickname', Nickname::normalize($arg));
         }
         Event::handle('EndCommandGetUser', array($this, $arg, &$user));
         if (!$user){
@@ -479,7 +479,7 @@ class MessageCommand extends Command
             return;
         }
 
-        $this->text = common_shorten_links($this->text);
+        $this->text = $this->user->shortenLinks($this->text);
 
         if (Message::contentTooLong($this->text)) {
             // XXX: i18n. Needs plural support.
@@ -582,7 +582,7 @@ class ReplyCommand extends Command
             return;
         }
 
-        $this->text = common_shorten_links($this->text);
+        $this->text = $this->user->shortenLinks($this->text);
 
         if (Notice::contentTooLong($this->text)) {
             // XXX: i18n. Needs plural support.