]> git.mxchange.org Git - quix0rs-gnu-social.git/blobdiff - lib/command.php
Merge remote-tracking branch 'mainline/1.0.x' into people_tags_rebase
[quix0rs-gnu-social.git] / lib / command.php
index 3fb4d76c75f131ff74f245362a646cde59d43086..a922aa73ac57b66091551c00b843598ca8d6895e 100644 (file)
@@ -287,6 +287,18 @@ class FavCommand extends Command
     function handle($channel)
     {
         $notice = $this->getNotice($this->other);
+
+        $fave            = new Fave();
+        $fave->user_id   = $this->user->id;
+        $fave->notice_id = $notice->id;
+        $fave->find();
+
+        if ($fave->fetch()) {
+            // TRANS: Error message text shown when a favorite could not be set because it has already been favorited.
+            $channel->error($this->user, _('Could not create favorite: already favorited.'));
+            return;
+        }
+
         $fave = Fave::addNew($this->user->getProfile(), $notice);
 
         if (!$fave) {
@@ -300,7 +312,7 @@ class FavCommand extends Command
 
         $other = User::staticGet('id', $notice->profile_id);
 
-        if ($other && $other->id != $user->id) {
+        if ($other && $other->id != $this->user->id) {
             if ($other->email && $other->emailnotifyfav) {
                 mail_notify_fave($other, $this->user, $notice);
             }
@@ -340,10 +352,7 @@ class JoinCommand extends Command
         }
 
         try {
-            if (Event::handle('StartJoinGroup', array($group, $cur))) {
-                Group_member::join($group->id, $cur->id);
-                Event::handle('EndJoinGroup', array($group, $cur));
-            }
+            $cur->joinGroup($group);
         } catch (Exception $e) {
             // TRANS: Message given having failed to add a user to a group.
             // TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
@@ -388,10 +397,7 @@ class DropCommand extends Command
         }
 
         try {
-            if (Event::handle('StartLeaveGroup', array($group, $cur))) {
-                Group_member::leave($group->id, $cur->id);
-                Event::handle('EndLeaveGroup', array($group, $cur));
-            }
+            $cur->leaveGroup($group);
         } catch (Exception $e) {
             // TRANS: Message given having failed to remove a user from a group.
             // TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
@@ -408,6 +414,104 @@ class DropCommand extends Command
     }
 }
 
+class TagCommand extends Command
+{
+    var $other = null;
+    var $tags = null;
+    function __construct($user, $other, $tags)
+    {
+        parent::__construct($user);
+        $this->other = $other;
+        $this->tags = $tags;
+    }
+
+    function handle($channel)
+    {
+        $profile = $this->getProfile($this->other);
+        $cur     = $this->user->getProfile();
+
+        if (!$profile) {
+            $channel->error($cur, _('No such profile.'));
+            return;
+        }
+        if (!$cur->canTag($profile)) {
+            $channel->error($cur, _('You cannot tag this user.'));
+            return;
+        }
+
+        $privs = array();
+        $tags = preg_split('/[\s,]+/', $this->tags);
+        $clean_tags = array();
+
+        foreach ($tags as $tag) {
+            $private = @$tag[0] === '.';
+            $tag = $clean_tags[] = common_canonical_tag($tag);
+
+            if (!common_valid_profile_tag($tag)) {
+                $channel->error($cur, sprintf(_('Invalid tag: "%s"'), $tag));
+                return;
+            }
+            $privs[$tag] = $private;
+        }
+
+        try {
+            foreach ($clean_tags as $tag) {
+                Profile_tag::setTag($cur->id, $profile->id, $tag, null, $privs[$tag]);
+            }
+        } catch (Exception $e) {
+            $channel->error($cur, sprintf(_('Error tagging %s: %s'),
+                                          $profile->nickname, $e->getMessage()));
+            return;
+        }
+
+        $channel->output($cur, sprintf(_('%1$s was tagged %2$s'),
+                                              $profile->nickname,
+                                              implode(', ', $clean_tags)));
+    }
+}
+
+
+class UntagCommand extends TagCommand
+{
+    function handle($channel)
+    {
+        $profile = $this->getProfile($this->other);
+        $cur     = $this->user->getProfile();
+
+        if (!$profile) {
+            $channel->error($cur, _('No such profile.'));
+            return;
+        }
+        if (!$cur->canTag($profile)) {
+            $channel->error($cur, _('You cannot tag this user.'));
+            return;
+        }
+
+        $tags = array_map('common_canonical_tag', preg_split('/[\s,]+/', $this->tags));
+
+        foreach ($tags as $tag) {
+            if (!common_valid_profile_tag($tag)) {
+                $channel->error($cur, sprintf(_('Invalid tag: "%s"'), $tag));
+                return;
+            }
+        }
+
+        try {
+            foreach ($tags as $tag) {
+                Profile_tag::unTag($cur->id, $profile->id, $tag);
+            }
+        } catch (Exception $e) {
+            $channel->error($cur, sprintf(_('Error untagging %s: %s'),
+                                          $profile->nickname, $e->getMessage()));
+            return;
+        }
+
+        $channel->output($cur, sprintf(_('The following tag(s) were removed from user %1$s: %2$s.'),
+                                              $profile->nickname,
+                                              implode(', ', $tags)));
+    }
+}
+
 class WhoisCommand extends Command
 {
     var $other = null;
@@ -531,29 +635,15 @@ class RepeatCommand extends Command
     {
         $notice = $this->getNotice($this->other);
 
-        if($this->user->id == $notice->profile_id)
-        {
-            // TRANS: Error text shown when trying to repeat an own notice.
-            $channel->error($this->user, _('Cannot repeat your own notice.'));
-            return;
-        }
-
-        if ($this->user->getProfile()->hasRepeated($notice->id)) {
-            // TRANS: Error text shown when trying to repeat an notice that was already repeated by the user.
-            $channel->error($this->user, _('Already repeated that notice.'));
-            return;
-        }
-
-        $repeat = $notice->repeat($this->user->id, $channel->source);
-
-        if ($repeat) {
+        try {
+            $repeat = $notice->repeat($this->user->id, $channel->source());
+            $recipient = $notice->getProfile();
 
             // TRANS: Message given having repeated a notice from another user.
             // TRANS: %s is the name of the user for which the notice was repeated.
             $channel->output($this->user, sprintf(_('Notice from %s repeated.'), $recipient->nickname));
-        } else {
-            // TRANS: Error text shown when repeating a notice fails with an unknown reason.
-            $channel->error($this->user, _('Error repeating notice.'));
+        } catch (Exception $e) {
+            $channel->error($this->user, $e->getMessage());
         }
     }
 }
@@ -718,7 +808,7 @@ class OffCommand extends Command
     }
     function handle($channel)
     {
-        if ($other) {
+        if ($this->other) {
             // TRANS: Error text shown when issuing the command "off" with a setting which has not yet been implemented.
             $channel->error($this->user, _("Command not yet implemented."));
         } else {
@@ -744,7 +834,7 @@ class OnCommand extends Command
 
     function handle($channel)
     {
-        if ($other) {
+        if ($this->other) {
             // TRANS: Error text shown when issuing the command "on" with a setting which has not yet been implemented.
             $channel->error($this->user, _("Command not yet implemented."));
         } else {
@@ -832,7 +922,7 @@ class SubscriptionsCommand extends Command
             // TRANS: Text shown after requesting other users a user is subscribed to.
             // TRANS: This message supports plural forms. This message is followed by a
             // TRANS: hard coded space and a comma separated list of subscribed users.
-            $out = ngettext('You are subscribed to this person:',
+            $out = _m('You are subscribed to this person:',
                 'You are subscribed to these people:',
                 count($nicknames));
             $out .= ' ';
@@ -859,7 +949,7 @@ class SubscribersCommand extends Command
             // TRANS: Text shown after requesting other users that are subscribed to a user (followers).
             // TRANS: This message supports plural forms. This message is followed by a
             // TRANS: hard coded space and a comma separated list of subscribing users.
-            $out = ngettext('This person is subscribed to you:',
+            $out = _m('This person is subscribed to you:',
                 'These people are subscribed to you:',
                 count($nicknames));
             $out .= ' ';
@@ -886,7 +976,7 @@ class GroupsCommand extends Command
             // TRANS: Text shown after requesting groups a user is subscribed to.
             // TRANS: This message supports plural forms. This message is followed by a
             // TRANS: hard coded space and a comma separated list of subscribed groups.
-            $out = ngettext('You are a member of this group:',
+            $out = _m('You are a member of this group:',
                 'You are a member of these groups:',
                 count($nicknames));
             $out.=implode(', ',$groups);
@@ -899,45 +989,92 @@ class HelpCommand extends Command
 {
     function handle($channel)
     {
-        $channel->output($this->user,
-                         // TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings.
-                         _("Commands:\n".
-                           "on - turn on notifications\n".
-                           "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".
-                           "lose <nickname> - force user to stop following you\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".
-                           "quit - same as 'off'\n".
-                           "sub <nickname> - same as 'follow'\n".
-                           "unsub <nickname> - same as 'leave'\n".
-                           "last <nickname> - same as 'get'\n".
-                           "on <nickname> - not yet implemented.\n".
-                           "off <nickname> - not yet implemented.\n".
-                           "nudge <nickname> - remind a user to update.\n".
-                           "invite <phone number> - not yet implemented.\n".
-                           "track <word> - not yet implemented.\n".
-                           "untrack <word> - not yet implemented.\n".
-                           "track off - not yet implemented.\n".
-                           "untrack all - not yet implemented.\n".
-                           "tracks - not yet implemented.\n".
-                           "tracking - not yet implemented.\n"));
+        // TRANS: Header line of help text for commands.
+        $out = array(_m('COMMANDHELP', "Commands:"));
+        $commands = array(// TRANS: Help message for IM/SMS command "on"
+                          "on" => _m('COMMANDHELP', "turn on notifications"),
+                          // TRANS: Help message for IM/SMS command "off"
+                          "off" => _m('COMMANDHELP', "turn off notifications"),
+                          // TRANS: Help message for IM/SMS command "help"
+                          "help" => _m('COMMANDHELP', "show this help"),
+                          // TRANS: Help message for IM/SMS command "follow <nickname>"
+                          "follow <nickname>" => _m('COMMANDHELP', "subscribe to user"),
+                          // TRANS: Help message for IM/SMS command "groups"
+                          "groups" => _m('COMMANDHELP', "lists the groups you have joined"),
+                          // TRANS: Help message for IM/SMS command "tag"
+                          "tag <nickname> <tags>" => _m('COMMANDHELP',"tag a user"),
+                          // TRANS: Help message for IM/SMS command "untag"
+                          "untag <nickname> <tags>" => _m('COMMANDHELP',"untag a user"),
+                          // TRANS: Help message for IM/SMS command "subscriptions"
+                          "subscriptions" => _m('COMMANDHELP', "list the people you follow"),
+                          // TRANS: Help message for IM/SMS command "subscribers"
+                          "subscribers" => _m('COMMANDHELP', "list the people that follow you"),
+                          // TRANS: Help message for IM/SMS command "leave <nickname>"
+                          "leave <nickname>" => _m('COMMANDHELP', "unsubscribe from user"),
+                          // TRANS: Help message for IM/SMS command "d <nickname> <text>"
+                          "d <nickname> <text>" => _m('COMMANDHELP', "direct message to user"),
+                          // TRANS: Help message for IM/SMS command "get <nickname>"
+                          "get <nickname>" => _m('COMMANDHELP', "get last notice from user"),
+                          // TRANS: Help message for IM/SMS command "whois <nickname>"
+                          "whois <nickname>" => _m('COMMANDHELP', "get profile info on user"),
+                          // TRANS: Help message for IM/SMS command "lose <nickname>"
+                          "lose <nickname>" => _m('COMMANDHELP', "force user to stop following you"),
+                          // TRANS: Help message for IM/SMS command "fav <nickname>"
+                          "fav <nickname>" => _m('COMMANDHELP', "add user's last notice as a 'fave'"),
+                          // TRANS: Help message for IM/SMS command "fav #<notice_id>"
+                          "fav #<notice_id>" => _m('COMMANDHELP', "add notice with the given id as a 'fave'"),
+                          // TRANS: Help message for IM/SMS command "repeat #<notice_id>"
+                          "repeat #<notice_id>" => _m('COMMANDHELP', "repeat a notice with a given id"),
+                          // TRANS: Help message for IM/SMS command "repeat <nickname>"
+                          "repeat <nickname>" => _m('COMMANDHELP', "repeat the last notice from user"),
+                          // TRANS: Help message for IM/SMS command "reply #<notice_id>"
+                          "reply #<notice_id>" => _m('COMMANDHELP', "reply to notice with a given id"),
+                          // TRANS: Help message for IM/SMS command "reply <nickname>"
+                          "reply <nickname>" => _m('COMMANDHELP', "reply to the last notice from user"),
+                          // TRANS: Help message for IM/SMS command "join <group>"
+                          "join <group>" => _m('COMMANDHELP', "join group"),
+                          // TRANS: Help message for IM/SMS command "login"
+                          "login" => _m('COMMANDHELP', "Get a link to login to the web interface"),
+                          // TRANS: Help message for IM/SMS command "drop <group>"
+                          "drop <group>" => _m('COMMANDHELP', "leave group"),
+                          // TRANS: Help message for IM/SMS command "stats"
+                          "stats" => _m('COMMANDHELP', "get your stats"),
+                          // TRANS: Help message for IM/SMS command "stop"
+                          "stop" => _m('COMMANDHELP', "same as 'off'"),
+                          // TRANS: Help message for IM/SMS command "quit"
+                          "quit" => _m('COMMANDHELP', "same as 'off'"),
+                          // TRANS: Help message for IM/SMS command "sub <nickname>"
+                          "sub <nickname>" => _m('COMMANDHELP', "same as 'follow'"),
+                          // TRANS: Help message for IM/SMS command "unsub <nickname>"
+                          "unsub <nickname>" => _m('COMMANDHELP', "same as 'leave'"),
+                          // TRANS: Help message for IM/SMS command "last <nickname>"
+                          "last <nickname>" => _m('COMMANDHELP', "same as 'get'"),
+                          // TRANS: Help message for IM/SMS command "on <nickname>"
+                          "on <nickname>" => _m('COMMANDHELP', "not yet implemented."),
+                          // TRANS: Help message for IM/SMS command "off <nickname>"
+                          "off <nickname>" => _m('COMMANDHELP', "not yet implemented."),
+                          // TRANS: Help message for IM/SMS command "nudge <nickname>"
+                          "nudge <nickname>" => _m('COMMANDHELP', "remind a user to update."),
+                          // TRANS: Help message for IM/SMS command "invite <phone number>"
+                          "invite <phone number>" => _m('COMMANDHELP', "not yet implemented."),
+                          // TRANS: Help message for IM/SMS command "track <word>"
+                          "track <word>" => _m('COMMANDHELP', "not yet implemented."),
+                          // TRANS: Help message for IM/SMS command "untrack <word>"
+                          "untrack <word>" => _m('COMMANDHELP', "not yet implemented."),
+                          // TRANS: Help message for IM/SMS command "track off"
+                          "track off" => _m('COMMANDHELP', "not yet implemented."),
+                          // TRANS: Help message for IM/SMS command "untrack all"
+                          "untrack all" => _m('COMMANDHELP', "not yet implemented."),
+                          // TRANS: Help message for IM/SMS command "tracks"
+                          "tracks" => _m('COMMANDHELP', "not yet implemented."),
+                          // TRANS: Help message for IM/SMS command "tracking"
+                          "tracking" => _m('COMMANDHELP', "not yet implemented."));
+
+        // Give plugins a chance to add or override...
+        Event::handle('HelpCommandMessages', array($this, &$commands));
+        foreach ($commands as $command => $help) {
+            $out[] = "$command - $help";
+        }
+        $channel->output($this->user, implode("\n", $out));
     }
 }