{
$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){
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) {
$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);
}
}
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.
}
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.
// TRANS: Whois output.
// TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
- $whois = sprintf(_("%1\$s (%2\$s)"), $recipient->nickname,
+ $whois = sprintf(_m('WHOIS',"%1\$s (%2\$s)"), $recipient->nickname,
$recipient->profileurl);
if ($recipient->fullname) {
// TRANS: Whois output. %s is the full name of the queried user.
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.
- // TRANS: Message given if content is too long.
+ // TRANS: Message given if content is too long. %1$sd is used for plural.
// TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
- $channel->error($this->user, sprintf(_('Message too long - maximum is %1$d characters, you sent %2$d.'),
+ $channel->error($this->user, sprintf(_m('Message too long - maximum is %1$d character, you sent %2$d.',
+ 'Message too long - maximum is %1$d characters, you sent %2$d.',
+ Message::maxContent()),
Message::maxContent(), mb_strlen($this->text)));
return;
}
return;
}
- if ($this->user->getProfile()->hasRepeated($notice->id)) {
+ // Is it OK to repeat that notice (general enough scope)?
+
+ if ($notice->scope != Notice::SITE_SCOPE &&
+ $notice->scope != Notice::PUBLIC_SCOPE) {
+ // TRANS: Client error displayed when trying to repeat a private notice.
+ $channel->error($this->user, _('You may not repeat a private notice.'));
+ }
+
+ $profile = $this->user->getProfile();
+
+ // Can the profile actually see that notice?
+
+ if (!$notice->inScope($profile)) {
+ // TRANS: Client error displayed when trying to repeat a notice the user has no access to.
+ $channel->error($this->user, _('You have no access to that notice.'));
+ }
+
+ if ($profile->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;
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.
- // TRANS: Message given if content of a notice for a reply is too long.
+ // TRANS: Message given if content of a notice for a reply is too long. %1$d is used for plural.
// TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
- $channel->error($this->user, sprintf(_('Notice too long - maximum is %1$d characters, you sent %2$d.'),
+ $channel->error($this->user, sprintf(_m('Notice too long - maximum is %1$d character, you sent %2$d.',
+ 'Notice too long - maximum is %1$d characters, you sent %2$d.',
+ Notice::maxContent()),
Notice::maxContent(), mb_strlen($this->text)));
return;
}
}
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 {
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 {
{
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 "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));
}
}
projects / quix0rs-gnu-social.git / blobdiff