better header for not-modified message

[quix0rs-gnu-social.git] / classes / Command.php

diff --git a/classes/Command.php b/classes/Command.php
index 265e70f0a567684d07f868039b3a104f75b68ed2..c2409d140a2ac152c86ca780ffe36d288833bf42 100644 (file)
--- a/classes/Command.php
+++ b/classes/Command.php
@@ -102,7 +102,7 @@ class StatsCommand extends Command {
        }
 }
 
-class FaveCommand extends Command {
+class FavCommand extends Command {
        
        var $other = NULL;
        
@@ -133,10 +133,17 @@ class FaveCommand extends Command {
                        return;
                }
 
-               mail_notify_fave($recipient, $this->user, $notice);
+           $other = User::staticGet('id', $recipient->id);
+               
+               if ($other && $other->id != $user->id) {
+                       if ($other->email && $other->emailnotifyfav) {
+                               mail_notify_fave($other, $this->user, $notice);
+                       }
+               }
+               
                $this->user->blowFavesCache();
                
-               $channel->output($this->user, _('Message marked as fave.'));
+               $channel->output($this->user, _('Notice marked as fave.'));
        }
 }
 
@@ -180,7 +187,7 @@ class MessageCommand extends Command {
        function __construct($user, $other, $text) {
                parent::__construct($user);
                $this->other = $other;
-               $this->text = $other;           
+               $this->text = $text;
        }
        
        function execute($channel) {
@@ -190,9 +197,14 @@ class MessageCommand extends Command {
                        $channel->error($this->user, _('No content!'));
                        return;
                } else if ($len > 140) {
-                       $channel->error($this->user, sprintf(_('Message too long - maximum is 140 characters, you sent %d'), $len));
-                       return;
-               } else if (!$other) {
+                       $content = common_shorten_links($content);
+                       if (mb_strlen($content) > 140) {
+                               $channel->error($this->user, sprintf(_('Message too long - maximum is 140 characters, you sent %d'), $len));
+                               return;
+                       }
+               }
+               
+               if (!$other) {
                        $channel->error($this->user, _('No such user.'));
                        return;
                } else if (!$this->user->mutuallySubscribed($other)) {
@@ -202,7 +214,7 @@ class MessageCommand extends Command {
                        $channel->error($this->user, _('Don\'t send a message to yourself; just say it to yourself quietly instead.'));
                        return;
                }
-               $message = Message::saveNew($this->user->id, $other->id, $body, 'xmpp');
+               $message = Message::saveNew($this->user->id, $other->id, $this->text, $channel->source());
                if ($message) {
                        $channel->output($this->user, sprintf(_('Direct message to %s sent'), $this->other));
                } else {
@@ -221,8 +233,10 @@ class GetCommand extends Command {
        }
        
        function execute($channel) {
-               $target = 
-                 common_relative_profile($this->user, common_canonical_nickname($this->other));
+               $target_nickname = common_canonical_nickname($this->other);
+               
+               $target =
+                 common_relative_profile($this->user, $target_nickname);
 
                if (!$target) {
                        $channel->error($this->user, _('No such user.'));
@@ -234,6 +248,7 @@ class GetCommand extends Command {
                        return;
                }
                $notice_content = $notice->content;
+               
                $channel->output($this->user, $target_nickname . ": " . $notice_content);
        }
 }
@@ -300,9 +315,9 @@ class OffCommand extends Command {
                        $channel->error($this->user, _("Command not yet implemented."));
                } else {
                        if ($channel->off($this->user)) {
-                               $channel->output(_('Notification off.'));
+                               $channel->output($this->user, _('Notification off.'));
                        } else {
-                               $channel->error(_('Can\'t turn off notification.'));
+                               $channel->error($this->user, _('Can\'t turn off notification.'));
                        }
                }
        }
@@ -320,9 +335,9 @@ class OnCommand extends Command {
                        $channel->error($this->user, _("Command not yet implemented."));
                } else {
                        if ($channel->on($this->user)) {
-                               $channel->output(_('Notification on.'));
+                               $channel->output($this->user, _('Notification on.'));
                        } else {
-                               $channel->error(_('Can\'t turn on notification.'));
+                               $channel->error($this->user, _('Can\'t turn on notification.'));
                        }
                }
        }