]> git.mxchange.org Git - quix0rs-gnu-social.git/blobdiff - lib/command.php
Lots of tiny message changes.
[quix0rs-gnu-social.git] / lib / command.php
index 9efa406964651f8abf3ee1f85e08e93c10420f5b..5a1a8bf33af6c333bbdc8f21d58c2c57821cbbc8 100644 (file)
@@ -85,7 +85,7 @@ class NudgeCommand extends Command
     {
         $recipient = User::staticGet('nickname', $this->other);
         if(! $recipient){
-            $channel->error($this->user, sprintf(_('Could not find a user with nickname %s'),
+            $channel->error($this->user, sprintf(_('Could not find a user with nickname %s.'),
                                $this->other));
         }else{
             if ($recipient->id == $this->user->id) {
@@ -96,7 +96,7 @@ class NudgeCommand extends Command
                 }
                 // XXX: notify by IM
                 // XXX: notify by SMS
-                $channel->output($this->user, sprintf(_('Nudge sent to %s'),
+                $channel->output($this->user, sprintf(_('Nudge sent to %s.'),
                                $recipient->nickname));
             }
         }
@@ -149,7 +149,7 @@ class FavCommand extends Command
 
             $notice = Notice::staticGet(substr($this->other,1));
             if (!$notice) {
-                $channel->error($this->user, _('Notice with that id does not exist'));
+                $channel->error($this->user, _('Notice with that id does not exist.'));
                 return;
             }
             $recipient = $notice->getProfile();
@@ -165,7 +165,7 @@ class FavCommand extends Command
             }
             $notice = $recipient->getCurrentNotice();
             if (!$notice) {
-                $channel->error($this->user, _('User has no last notice'));
+                $channel->error($this->user, _('User has no last notice.'));
                 return;
             }
         }
@@ -214,7 +214,7 @@ class JoinCommand extends Command
         }
 
         if ($cur->isMember($group)) {
-            $channel->error($cur, _('You are already a member of that group'));
+            $channel->error($cur, _('You are already a member of that group.'));
             return;
         }
         if (Group_block::isBlocked($group, $cur->getProfile())) {
@@ -231,12 +231,12 @@ class JoinCommand extends Command
         $result = $member->insert();
         if (!$result) {
           common_log_db_error($member, 'INSERT', __FILE__);
-          $channel->error($cur, sprintf(_('Could not join user %s to group %s'),
+          $channel->error($cur, sprintf(_('Could not join user %1$s to group %2$s.'),
                                        $cur->nickname, $group->nickname));
           return;
         }
 
-        $channel->output($cur, sprintf(_('%s joined group %s'),
+        $channel->output($cur, sprintf(_('%1$s joined group %2$s'),
                                               $cur->nickname,
                                               $group->nickname));
     }
@@ -281,12 +281,12 @@ class DropCommand extends Command
         $result = $member->delete();
         if (!$result) {
           common_log_db_error($member, 'INSERT', __FILE__);
-          $channel->error($cur, sprintf(_('Could not remove user %s to group %s'),
+          $channel->error($cur, sprintf(_('Could not remove user %1$s to group %2$s.'),
                                        $cur->nickname, $group->nickname));
           return;
         }
 
-        $channel->output($cur, sprintf(_('%s left group %s'),
+        $channel->output($cur, sprintf(_('%1$s left group %2$s'),
                                               $cur->nickname,
                                               $group->nickname));
     }
@@ -315,7 +315,7 @@ class WhoisCommand extends Command
         $whois = sprintf(_("%1\$s (%2\$s)"), $recipient->nickname,
                          $recipient->profileurl);
         if ($recipient->fullname) {
-            $whois .= "\n" . sprintf(_('Fullname: %s'), $recipient->fullname);
+            $whois .= "\n" . sprintf(_('Full name: %s'), $recipient->fullname);
         }
         if ($recipient->location) {
             $whois .= "\n" . sprintf(_('Location: %s'), $recipient->location);
@@ -355,7 +355,7 @@ class MessageCommand extends Command
         $this->text = common_shorten_links($this->text);
 
         if (Message::contentTooLong($this->text)) {
-            $channel->error($this->user, sprintf(_('Message too long - maximum is %d characters, you sent %d'),
+            $channel->error($this->user, sprintf(_('Message too long - maximum is %1$d characters, you sent %2$d.'),
                                                  Message::maxContent(), mb_strlen($this->text)));
             return;
         }
@@ -372,13 +372,73 @@ class MessageCommand extends Command
         }
         $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));
+            $message->notify();
+            $channel->output($this->user, sprintf(_('Direct message to %s sent.'), $this->other));
         } else {
             $channel->error($this->user, _('Error sending direct message.'));
         }
     }
 }
 
+class RepeatCommand extends Command
+{
+    var $other = null;
+    function __construct($user, $other)
+    {
+        parent::__construct($user);
+        $this->other = $other;
+    }
+
+    function execute($channel)
+    {
+        if(substr($this->other,0,1)=='#'){
+            //repeating a specific notice_id
+
+            $notice = Notice::staticGet(substr($this->other,1));
+            if (!$notice) {
+                $channel->error($this->user, _('Notice with that id does not exist.'));
+                return;
+            }
+            $recipient = $notice->getProfile();
+        }else{
+            //repeating a given user's last notice
+
+            $recipient =
+              common_relative_profile($this->user, common_canonical_nickname($this->other));
+
+            if (!$recipient) {
+                $channel->error($this->user, _('No such user.'));
+                return;
+            }
+            $notice = $recipient->getCurrentNotice();
+            if (!$notice) {
+                $channel->error($this->user, _('User has no last notice.'));
+                return;
+            }
+        }
+
+        if($this->user->id == $notice->profile_id)
+        {
+            $channel->error($this->user, _('Cannot repeat your own notice.'));
+            return;
+        }
+
+        if ($recipient->hasRepeated($notice->id)) {
+            $channel->error($this->user, _('Already repeated that notice.'));
+            return;
+        }
+
+        $repeat = $notice->repeat($this->user->id, $channel->source);
+
+        if ($repeat) {
+            common_broadcast_notice($repeat);
+            $channel->output($this->user, sprintf(_('Notice from %s repeated.'), $recipient->nickname));
+        } else {
+            $channel->error($this->user, _('Error repeating notice.'));
+        }
+    }
+}
+
 class ReplyCommand extends Command
 {
     var $other = null;
@@ -397,7 +457,7 @@ class ReplyCommand extends Command
 
             $notice = Notice::staticGet(substr($this->other,1));
             if (!$notice) {
-                $channel->error($this->user, _('Notice with that id does not exist'));
+                $channel->error($this->user, _('Notice with that id does not exist.'));
                 return;
             }
             $recipient = $notice->getProfile();
@@ -413,7 +473,7 @@ class ReplyCommand extends Command
             }
             $notice = $recipient->getCurrentNotice();
             if (!$notice) {
-                $channel->error($this->user, _('User has no last notice'));
+                $channel->error($this->user, _('User has no last notice.'));
                 return;
             }
         }
@@ -428,15 +488,16 @@ class ReplyCommand extends Command
         $this->text = common_shorten_links($this->text);
 
         if (Notice::contentTooLong($this->text)) {
-            $channel->error($this->user, sprintf(_('Notice too long - maximum is %d characters, you sent %d'),
+            $channel->error($this->user, sprintf(_('Notice too long - maximum is %1$d characters, you sent %2$d.'),
                                                  Notice::maxContent(), mb_strlen($this->text)));
             return;
         }
 
-        $notice = Notice::saveNew($this->user->id, $this->text, $channel->source(), 1,
-                                  $notice->id);
+        $notice = Notice::saveNew($this->user->id, $this->text, $channel->source(),
+                                  array('reply_to' => $notice->id));
+
         if ($notice) {
-            $channel->output($this->user, sprintf(_('Reply to %s sent'), $recipient->nickname));
+            $channel->output($this->user, sprintf(_('Reply to %s sent.'), $recipient->nickname));
         } else {
             $channel->error($this->user, _('Error saving notice.'));
         }
@@ -468,7 +529,7 @@ class GetCommand extends Command
         }
         $notice = $target->getCurrentNotice();
         if (!$notice) {
-            $channel->error($this->user, _('User has no last notice'));
+            $channel->error($this->user, _('User has no last notice.'));
             return;
         }
         $notice_content = $notice->content;
@@ -492,7 +553,7 @@ class SubCommand extends Command
     {
 
         if (!$this->other) {
-            $channel->error($this->user, _('Specify the name of the user to subscribe to'));
+            $channel->error($this->user, _('Specify the name of the user to subscribe to.'));
             return;
         }
 
@@ -520,7 +581,7 @@ class UnsubCommand extends Command
     function execute($channel)
     {
         if(!$this->other) {
-            $channel->error($this->user, _('Specify the name of the user to unsubscribe from'));
+            $channel->error($this->user, _('Specify the name of the user to unsubscribe from.'));
             return;
         }
 
@@ -579,6 +640,103 @@ class OnCommand extends Command
     }
 }
 
+class LoginCommand extends Command
+{
+    function execute($channel)
+    {
+        $disabled = common_config('logincommand','disabled');
+        $disabled = isset($disabled) && $disabled;
+        if($disabled) {
+            $channel->error($this->user, _('Login command is disabled.'));
+            return;
+        }
+        $login_token = Login_token::staticGet('user_id',$this->user->id);
+        if($login_token){
+            $login_token->delete();
+        }
+        $login_token = new Login_token();
+        $login_token->user_id = $this->user->id;
+        $login_token->token = common_good_rand(16);
+        $login_token->created = common_sql_now();
+        $result = $login_token->insert();
+        if (!$result) {
+          common_log_db_error($login_token, 'INSERT', __FILE__);
+          $channel->error($this->user, sprintf(_('Could not create login token for %s.'),
+                                       $this->user->nickname));
+          return;
+        }
+        $channel->output($this->user,
+            sprintf(_('This link is useable only once, and is good for only 2 minutes: %s.'),
+                    common_local_url('login',
+                        array('user_id'=>$login_token->user_id, 'token'=>$login_token->token))));
+    }
+}
+
+class SubscriptionsCommand extends Command
+{
+    function execute($channel)
+    {
+        $profile = $this->user->getSubscriptions(0);
+        $nicknames=array();
+        while ($profile->fetch()) {
+            $nicknames[]=$profile->nickname;
+        }
+        if(count($nicknames)==0){
+            $out=_('You are not subscribed to anyone.');
+        }else{
+            $out = ngettext('You are subscribed to this person:',
+                'You are subscribed to these people:',
+                count($nicknames));
+            $out .= ' ';
+            $out .= implode(', ',$nicknames);
+        }
+        $channel->output($this->user,$out);
+    }
+}
+
+class SubscribersCommand extends Command
+{
+    function execute($channel)
+    {
+        $profile = $this->user->getSubscribers();
+        $nicknames=array();
+        while ($profile->fetch()) {
+            $nicknames[]=$profile->nickname;
+        }
+        if(count($nicknames)==0){
+            $out=_('No one is subscribed to you.');
+        }else{
+            $out = ngettext('This person is subscribed to you:',
+                'These people are subscribed to you:',
+                count($nicknames));
+            $out .= ' ';
+            $out .= implode(', ',$nicknames);
+        }
+        $channel->output($this->user,$out);
+    }
+}
+
+class GroupsCommand extends Command
+{
+    function execute($channel)
+    {
+        $group = $this->user->getGroups();
+        $groups=array();
+        while ($group->fetch()) {
+            $groups[]=$group->nickname;
+        }
+        if(count($groups)==0){
+            $out=_('You are not a member of any groups.');
+        }else{
+            $out = ngettext('You are a member of this group:',
+                'You are a member of these groups:',
+                count($nicknames));
+            $out.=implode(', ',$groups);
+        }
+        $channel->output($this->user,$out);
+    }
+}
+
 class HelpCommand extends Command
 {
     function execute($channel)
@@ -589,15 +747,21 @@ class HelpCommand extends Command
                            "off - turn off notifications\n".
                            "help - show this help\n".
                            "follow <nickname> - subscribe to user\n".
+                           "groups - lists the groups you have joined\n".
+                           "subscriptions - list the people you follow\n".
+                           "subscribers - list the people that follow you\n".
                            "leave <nickname> - unsubscribe from user\n".
                            "d <nickname> <text> - direct message to user\n".
                            "get <nickname> - get last notice from user\n".
                            "whois <nickname> - get profile info on user\n".
                            "fav <nickname> - add user's last notice as a 'fave'\n".
                            "fav #<notice_id> - add notice with the given id as a 'fave'\n".
+                           "repeat #<notice_id> - repeat a notice with a given id\n".
+                           "repeat <nickname> - repeat the last notice from user\n".
                            "reply #<notice_id> - reply to notice with a given id\n".
                            "reply <nickname> - reply to the last notice from user\n".
                            "join <group> - join group\n".
+                           "login - Get a link to login to the web interface\n".
                            "drop <group> - leave group\n".
                            "stats - get your stats\n".
                            "stop - same as 'off'\n".