{
$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) {
}
// 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));
}
}
$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();
}
$notice = $recipient->getCurrentNotice();
if (!$notice) {
- $channel->error($this->user, _('User has no last notice'));
+ $channel->error($this->user, _('User has no last notice.'));
return;
}
}
}
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())) {
$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));
}
$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));
}
$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);
$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;
}
}
$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;
$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();
}
$notice = $recipient->getCurrentNotice();
if (!$notice) {
- $channel->error($this->user, _('User has no last notice'));
+ $channel->error($this->user, _('User has no last notice.'));
return;
}
}
$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.'));
}
}
$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;
{
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;
}
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;
}
{
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();
$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'),
+ $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'),
+ 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))));
}
"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".
projects / quix0rs-gnu-social.git / blobdiff