X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=lib%2Fcommand.php;h=f51cbbb5f76f78362ae1fe21407596c15a42f458;hb=736bc9cc96bfc6bc0c2d43bbea013b607b9e6c71;hp=ae69f04a1366b80d990110344374db868c40ef09;hpb=2b0d1d9fc4cc2f8d297a14ed0708bcb64a1f070d;p=quix0rs-gnu-social.git diff --git a/lib/command.php b/lib/command.php index ae69f04a13..f51cbbb5f7 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){ @@ -180,7 +180,7 @@ class UnimplementedCommand extends Command function handle($channel) { // TRANS: Error text shown when an unimplemented command is given. - $channel->error($this->user, _("Sorry, this command is not yet implemented.")); + $channel->error($this->user, _('Sorry, this command is not yet implemented.')); } } @@ -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,127 @@ 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) { + // TRANS: Client error displayed trying to perform an action related to a non-existing profile. + $channel->error($cur, _('No such profile.')); + return; + } + if (!$cur->canTag($profile)) { + // TRANS: Error displayed when trying to tag a user that cannot be tagged. + $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)) { + // TRANS: Error displayed if a given tag is invalid. + // TRANS: %s is the invalid 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) { + // TRANS: Error displayed if tagging a user fails. + // TRANS: %1$s is the tagged user, %2$s is the error message (no punctuation). + $channel->error($cur, sprintf(_('Error tagging %1$s: %2$s'), + $profile->nickname, $e->getMessage())); + return; + } + + // TRANS: Succes message displayed if tagging a user succeeds. + // TRANS: %1$s is the tagged user's nickname, %2$s is a list of tags. + // TRANS: Plural is decided based on the number of tags added (not part of message). + $channel->output($cur, sprintf(_m('%1$s was tagged %2$s', + '%1$s was tagged %2$s', + count($clean_tags)), + $profile->nickname, + // TRANS: Separator for list of tags. + implode(_(', '), $clean_tags))); + } +} + +class UntagCommand extends TagCommand +{ + function handle($channel) + { + $profile = $this->getProfile($this->other); + $cur = $this->user->getProfile(); + + if (!$profile) { + // TRANS: Client error displayed trying to perform an action related to a non-existing profile. + $channel->error($cur, _('No such profile.')); + return; + } + if (!$cur->canTag($profile)) { + // TRANS: Error displayed when trying to tag a user that cannot be tagged. + $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)) { + // TRANS: Error displayed if a given tag is invalid. + // TRANS: %s is the invalid 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) { + // TRANS: Error displayed if untagging a user fails. + // TRANS: %1$s is the untagged user, %2$s is the error message (no punctuation). + $channel->error($cur, sprintf(_('Error untagging %1$s: %2$s'), + $profile->nickname, $e->getMessage())); + return; + } + + // TRANS: Succes message displayed if untagging a user succeeds. + // TRANS: %1$s is the untagged user's nickname, %2$s is a list of tags. + // TRANS: Plural is decided based on the number of tags removed (not part of message). + $channel->output($cur, sprintf(_m('The following tag was removed from user %1$s: %2$s.', + 'The following tags were removed from user %1$s: %2$s.', + count($tags)), + $profile->nickname, + // TRANS: Separator for list of tags. + implode(_(', '), $tags))); + } +} + class WhoisCommand extends Command { var $other = null; @@ -479,7 +606,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. @@ -502,7 +629,7 @@ class MessageCommand extends Command return; } else if ($this->user->id == $other->id) { // TRANS: Error text shown when trying to send a direct message to self. - $channel->error($this->user, _('Don\'t send a message to yourself; just say it to yourself quietly instead.')); + $channel->error($this->user, _('Do not send a message to yourself; just say it to yourself quietly instead.')); return; } $message = Message::saveNew($this->user->id, $other->id, $this->text, $channel->source()); @@ -531,29 +658,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()); } } } @@ -582,7 +695,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. @@ -718,7 +831,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 +857,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 +945,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 +972,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 +999,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 +1012,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 - 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 - unsubscribe from user\n". - "d - direct message to user\n". - "get - get last notice from user\n". - "whois - get profile info on user\n". - "lose - force user to stop following you\n". - "fav - add user's last notice as a 'fave'\n". - "fav # - add notice with the given id as a 'fave'\n". - "repeat # - repeat a notice with a given id\n". - "repeat - repeat the last notice from user\n". - "reply # - reply to notice with a given id\n". - "reply - reply to the last notice from user\n". - "join - join group\n". - "login - Get a link to login to the web interface\n". - "drop - leave group\n". - "stats - get your stats\n". - "stop - same as 'off'\n". - "quit - same as 'off'\n". - "sub - same as 'follow'\n". - "unsub - same as 'leave'\n". - "last - same as 'get'\n". - "on - not yet implemented.\n". - "off - not yet implemented.\n". - "nudge - remind a user to update.\n". - "invite - not yet implemented.\n". - "track - not yet implemented.\n". - "untrack - 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 ". + "follow " => _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 " => _m('COMMANDHELP',"tag a user"), + // TRANS: Help message for IM/SMS command "untag". + "untag " => _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 ". + "leave " => _m('COMMANDHELP', "unsubscribe from user"), + // TRANS: Help message for IM/SMS command "d ". + "d " => _m('COMMANDHELP', "direct message to user"), + // TRANS: Help message for IM/SMS command "get ". + "get " => _m('COMMANDHELP', "get last notice from user"), + // TRANS: Help message for IM/SMS command "whois ". + "whois " => _m('COMMANDHELP', "get profile info on user"), + // TRANS: Help message for IM/SMS command "lose ". + "lose " => _m('COMMANDHELP', "force user to stop following you"), + // TRANS: Help message for IM/SMS command "fav ". + "fav " => _m('COMMANDHELP', "add user's last notice as a 'fave'"), + // TRANS: Help message for IM/SMS command "fav #". + "fav #" => _m('COMMANDHELP', "add notice with the given id as a 'fave'"), + // TRANS: Help message for IM/SMS command "repeat #". + "repeat #" => _m('COMMANDHELP', "repeat a notice with a given id"), + // TRANS: Help message for IM/SMS command "repeat ". + "repeat " => _m('COMMANDHELP', "repeat the last notice from user"), + // TRANS: Help message for IM/SMS command "reply #". + "reply #" => _m('COMMANDHELP', "reply to notice with a given id"), + // TRANS: Help message for IM/SMS command "reply ". + "reply " => _m('COMMANDHELP', "reply to the last notice from user"), + // TRANS: Help message for IM/SMS command "join ". + "join " => _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 ". + "drop " => _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 ". + "sub " => _m('COMMANDHELP', "same as 'follow'"), + // TRANS: Help message for IM/SMS command "unsub ". + "unsub " => _m('COMMANDHELP', "same as 'leave'"), + // TRANS: Help message for IM/SMS command "last ". + "last " => _m('COMMANDHELP', "same as 'get'"), + // TRANS: Help message for IM/SMS command "on ". + "on " => _m('COMMANDHELP', "not yet implemented."), + // TRANS: Help message for IM/SMS command "off ". + "off " => _m('COMMANDHELP', "not yet implemented."), + // TRANS: Help message for IM/SMS command "nudge ". + "nudge " => _m('COMMANDHELP', "remind a user to update."), + // TRANS: Help message for IM/SMS command "invite ". + "invite " => _m('COMMANDHELP', "not yet implemented."), + // TRANS: Help message for IM/SMS command "track ". + "track " => _m('COMMANDHELP', "not yet implemented."), + // TRANS: Help message for IM/SMS command "untrack ". + "untrack " => _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)); } }