GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

save repeats from the form

Browse Source
This commit is contained in:
Evan Prodromou 2009-12-11 11:51:09 -05:00
parent 60754fc6de
commit afc86a86d3
3 changed files with 33 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
actions/repeat.php
View File

@ -1,7 +1,7 @@
<?php <?php
/** /**
* Forward action. * Repeat action.
* *
* PHP version 5 * PHP version 5
* *
@ -33,7 +33,7 @@ if (!defined('STATUSNET')) {
} }
/** /**
* Forward action * Repeat action
* *
* @category Action * @category Action
* @package StatusNet * @package StatusNet
@ -42,7 +42,7 @@ if (!defined('STATUSNET')) {
* @link http://status.net/ * @link http://status.net/
*/ */
class ForwardAction extends Action class RepeatAction extends Action
{ {
var $user = null; var $user = null;
var $notice = null; var $notice = null;
@ -54,7 +54,7 @@ class ForwardAction extends Action
$this->user = common_current_user(); $this->user = common_current_user();
if (empty($this->user)) { if (empty($this->user)) {
$this->clientError(_("Only logged-in users can forward notices.")); $this->clientError(_("Only logged-in users can repeat notices."));
return false; return false;
} }
@ -73,7 +73,7 @@ class ForwardAction extends Action
} }
if ($this->user->id == $this->notice->profile_id) { if ($this->user->id == $this->notice->profile_id) {
$this->clientError(_("You can't forward your own notice.")); $this->clientError(_("You can't repeat your own notice."));
return false; return false;
} }
@ -86,8 +86,8 @@ class ForwardAction extends Action
$profile = $this->user->getProfile(); $profile = $this->user->getProfile();
if ($profile->hasForwarded($id)) { if ($profile->hasRepeated($id)) {
$this->clientError(_("You already forwarded that notice.")); $this->clientError(_("You already repeated that notice."));
return false; return false;
} }
@ -104,15 +104,15 @@ class ForwardAction extends Action
function handle($args) function handle($args)
{ {
$forward = Forward::saveNew($this->user->id, $this->notice->id); $repeat = $this->notice->repeat($this->user->id, 'web');
if ($this->boolean('ajax')) { if ($this->boolean('ajax')) {
$this->startHTML('text/xml;charset=utf-8'); $this->startHTML('text/xml;charset=utf-8');
$this->elementStart('head'); $this->elementStart('head');
$this->element('title', null, _('Forwarded')); $this->element('title', null, _('Repeated'));
$this->elementEnd('head'); $this->elementEnd('head');
$this->elementStart('body'); $this->elementStart('body');
$this->element('p', array('id' => 'forward_response'), _('Forwarded!')); $this->element('p', array('id' => 'repeat_response'), _('Repeated!'));
$this->elementEnd('body'); $this->elementEnd('body');
$this->elementEnd('html'); $this->elementEnd('html');
} else { } else {

23
classes/Notice.php
View File

@ -236,7 +236,14 @@ class Notice extends Memcached_DataObject
$notice->source = $source; $notice->source = $source;
$notice->uri = $uri; $notice->uri = $uri;
$notice->reply_to = self::getReplyTo($reply_to, $profile_id, $source, $final); // Handle repeat case
if (isset($repeat_of)) {
$notice->repeat_of = $repeat_of;
$notice->reply_to = $repeat_of;
} else {
$notice->reply_to = self::getReplyTo($reply_to, $profile_id, $source, $final);
}
if (!empty($notice->reply_to)) { if (!empty($notice->reply_to)) {
$reply = Notice::staticGet('id', $notice->reply_to); $reply = Notice::staticGet('id', $notice->reply_to);
@ -1434,4 +1441,18 @@ class Notice extends Memcached_DataObject
return $location; return $location;
} }
function repeat($repeater_id, $source)
{
$author = Profile::staticGet('id', $this->profile_id);
// FIXME: truncate on long repeats...?
$content = sprintf(_('RT @%1$s %2$s'),
$author->nickname,
$this->content);
return self::saveNew($repeater_id, $content, $source,
array('repeat_of' => $this->id));
}
} }

1
lib/router.php
View File

@ -99,6 +99,7 @@ class Router
'groupblock', 'groupunblock', 'groupblock', 'groupunblock',
'sandbox', 'unsandbox', 'sandbox', 'unsandbox',
'silence', 'unsilence', 'silence', 'unsilence',
'repeat',
'deleteuser'); 'deleteuser');
foreach ($main as $a) { foreach ($main as $a) {