wamo/gnu-social
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Finalize move of 'repeat' Command

Browse Source
This commit is contained in:
Mikael Nordfeldth 2015-03-12 19:22:05 +01:00
parent 1350987e2e
commit 940737a958
3 changed files with 37 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
lib/command.php
View File

@ -17,7 +17,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } if (!defined('GNUSOCIAL')) { exit(1); }
require_once(INSTALLDIR.'/lib/channel.php'); require_once(INSTALLDIR.'/lib/channel.php');
@ -523,32 +523,6 @@ class WhoisCommand extends Command
} }
} }
class RepeatCommand extends Command
{
var $other = null;
function __construct($user, $other)
{
parent::__construct($user);
$this->other = $other;
}
function handle($channel)
{
$notice = $this->getNotice($this->other);
try {
$repeat = $notice->repeat($this->scoped->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));
} catch (Exception $e) {
$channel->error($this->user, $e->getMessage());
}
}
}
class ReplyCommand extends Command class ReplyCommand extends Command
{ {
var $other = null; var $other = null;
@ -912,10 +886,6 @@ class HelpCommand extends Command
"whois <nickname>" => _m('COMMANDHELP', "get profile info on user"), "whois <nickname>" => _m('COMMANDHELP', "get profile info on user"),
// TRANS: Help message for IM/SMS command "lose <nickname>". // TRANS: Help message for IM/SMS command "lose <nickname>".
"lose <nickname>" => _m('COMMANDHELP', "force user to stop following you"), "lose <nickname>" => _m('COMMANDHELP', "force user to stop following you"),
// 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>". // TRANS: Help message for IM/SMS command "reply #<notice_id>".
"reply #<notice_id>" => _m('COMMANDHELP', "reply to notice with a given id"), "reply #<notice_id>" => _m('COMMANDHELP', "reply to notice with a given id"),
// TRANS: Help message for IM/SMS command "reply <nickname>". // TRANS: Help message for IM/SMS command "reply <nickname>".

14
plugins/Share/SharePlugin.php
View File

@ -177,7 +177,7 @@ class SharePlugin extends ActivityVerbHandlerPlugin
// API stuff // API stuff
/** /**
* show the "favorite" form in the notice options element * show the "repeat" form in the notice options element
* FIXME: Don't let a NoticeListItemAdapter slip in here (or extend that from NoticeListItem) * FIXME: Don't let a NoticeListItemAdapter slip in here (or extend that from NoticeListItem)
* *
* @return void * @return void
@ -219,8 +219,8 @@ class SharePlugin extends ActivityVerbHandlerPlugin
} }
/** /**
* EndInterpretCommand for FavoritePlugin will handle the 'fav' command * EndInterpretCommand for RepeatPlugin will handle the 'repeat' command
* using the class FavCommand. * using the class RepeatCommand.
* *
* @param string $cmd Command being run * @param string $cmd Command being run
* @param string $arg Rest of the message (including address) * @param string $arg Rest of the message (including address)
@ -249,10 +249,10 @@ class SharePlugin extends ActivityVerbHandlerPlugin
public function onHelpCommandMessages(HelpCommand $help, array &$commands) public function onHelpCommandMessages(HelpCommand $help, array &$commands)
{ {
// TRANS: Help message for IM/SMS command "fav <nickname>". // TRANS: Help message for IM/SMS command "repeat #<notice_id>".
$commands['fav <nickname>'] = _m('COMMANDHELP', "add user's last notice as a 'fave'"); $commands['repeat #<notice_id>'] = _m('COMMANDHELP', "repeat a notice with a given id");
// TRANS: Help message for IM/SMS command "fav #<notice_id>". // TRANS: Help message for IM/SMS command "repeat <nickname>".
$commands['fav #<notice_id>'] = _m('COMMANDHELP', "add notice with the given id as a 'fave'"); $commands['repeat <nickname>'] = _m('COMMANDHELP', "repeat the last notice from user");
} }
/** /**

29
plugins/Share/lib/repeatcommand.php Normal file
View File

@ -0,0 +1,29 @@
<?php
if (!defined('GNUSOCIAL')) { exit(1); }
class RepeatCommand extends Command
{
var $other = null;
function __construct($user, $other)
{
parent::__construct($user);
$this->other = $other;
}
function handle($channel)
{
$notice = $this->getNotice($this->other);
try {
$repeat = $notice->repeat($this->scoped->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));
} catch (Exception $e) {
$channel->error($this->user, $e->getMessage());
}
}
}