X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Fapitimelinegroup.php;h=c9d375d4c98bcd769eeb5452dbf74054e2d94f72;hb=4694d068f965ec733edcfe5c9afe8244ae01f00a;hp=e30a08fb5d0db7830c7928d8fa5d1d6b6e474947;hpb=c04c8ae59a7953a21cc464a49b657dfdc926e009;p=quix0rs-gnu-social.git diff --git a/actions/apitimelinegroup.php b/actions/apitimelinegroup.php index e30a08fb5d..c9d375d4c9 100644 --- a/actions/apitimelinegroup.php +++ b/actions/apitimelinegroup.php @@ -25,7 +25,8 @@ * @author Evan Prodromou * @author Jeffery To * @author Zach Copley - * @copyright 2009 StatusNet, Inc. + * @copyright 2009-2010 StatusNet, Inc. + * @copyright 2009 Free Software Foundation, Inc http://www.fsf.org * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 * @link http://status.net/ */ @@ -34,8 +35,6 @@ if (!defined('STATUSNET')) { exit(1); } -require_once INSTALLDIR . '/lib/apiprivateauth.php'; - /** * Returns the most recent notices (default 20) posted to the group specified by ID * @@ -48,10 +47,8 @@ require_once INSTALLDIR . '/lib/apiprivateauth.php'; * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 * @link http://status.net/ */ - class ApiTimelineGroupAction extends ApiPrivateAuthAction { - var $group = null; var $notices = null; @@ -63,8 +60,7 @@ class ApiTimelineGroupAction extends ApiPrivateAuthAction * @return boolean success flag * */ - - function prepare($args) + protected function prepare(array $args=array()) { parent::prepare($args); @@ -78,18 +74,15 @@ class ApiTimelineGroupAction extends ApiPrivateAuthAction * * Just show the notices * - * @param array $args $_REQUEST data (unused) - * * @return void */ - - function handle($args) + protected function handle() { - parent::handle($args); + parent::handle(); if (empty($this->group)) { - $this->clientError(_('Group not found!'), 404, $this->format); - return false; + // TRANS: Client error displayed requesting most recent notices to a group for a non-existing group. + $this->clientError(_('Group not found.'), 404); } $this->notices = $this->getNotices(); @@ -101,92 +94,50 @@ class ApiTimelineGroupAction extends ApiPrivateAuthAction * * @return void */ - function showTimeline() { - $sitename = common_config('site', 'name'); - $avatar = $this->group->homepage_logo; - $title = sprintf(_("%s timeline"), $this->group->nickname); + // We'll pull common formatting out of this for other formats + $atom = new AtomGroupNoticeFeed($this->group, $this->auth_user); - $subtitle = sprintf( - _('Updates from %1$s on %2$s!'), - $this->group->nickname, - $sitename - ); + $self = $this->getSelfUri(); - $logo = ($avatar) ? $avatar : User_group::defaultLogo(AVATAR_PROFILE_SIZE); + $link = common_local_url('showgroup', + array('nickname' => $this->group->nickname)); switch($this->format) { case 'xml': $this->showXmlTimeline($this->notices); break; case 'rss': - $this->showRssTimeline( + $this->showRssTimeline( $this->notices, - $title, + $atom->title, $this->group->homeUrl(), - $subtitle, + $atom->subtitle, null, - $logo + $atom->logo, + $self ); break; case 'atom': - header('Content-Type: application/atom+xml; charset=utf-8'); - - try { - - $atom = new AtomGroupNoticeFeed($this->group); - - // @todo set all this Atom junk up inside the feed class - - #$atom->setId($id); - $atom->setTitle($title); - $atom->setSubtitle($subtitle); - $atom->setLogo($logo); - $atom->setUpdated('now'); - - $atom->addAuthorRaw($this->group->asAtomAuthor()); - $atom->setActivitySubject($this->group->asActivitySubject()); - - $atom->addLink($this->group->homeUrl()); - - $id = $this->arg('id'); - $aargs = array('format' => 'atom'); - if (!empty($id)) { - $aargs['id'] = $id; - } - - $atom->setId($this->getSelfUri('ApiTimelineGroup', $aargs)); - - $atom->addLink( - $this->getSelfUri('ApiTimelineGroup', $aargs), - array('rel' => 'self', 'type' => 'application/atom+xml') - ); - $atom->addEntryFromNotices($this->notices); - - //$this->raw($atom->getString()); - print $atom->getString(); // temp hack until PuSH feeds are redone cleanly - - } catch (Atom10FeedException $e) { - $this->serverError( - 'Could not generate feed for group - ' . $e->getMessage() - ); - return; - } - + $this->raw($atom->getString()); break; case 'json': $this->showJsonTimeline($this->notices); break; - default: - $this->clientError( - _('API method not found.'), - 404, - $this->format - ); + case 'as': + header('Content-Type: ' . ActivityStreamJSONDocument::CONTENT_TYPE); + $doc = new ActivityStreamJSONDocument($this->auth_user); + $doc->setTitle($atom->title); + $doc->addLink($link, 'alternate', 'text/html'); + $doc->addItemsFromNotices($this->notices); + $this->raw($doc->asString()); break; + default: + // TRANS: Client error displayed when trying to handle an unknown API method. + $this->clientError(_('API method not found.'), 404); } } @@ -195,7 +146,6 @@ class ApiTimelineGroupAction extends ApiPrivateAuthAction * * @return array notices */ - function getNotices() { $notices = array(); @@ -221,8 +171,7 @@ class ApiTimelineGroupAction extends ApiPrivateAuthAction * * @return boolean true */ - - function isReadOnly($args) + function isReadOnly(array $args=array()) { return true; } @@ -232,7 +181,6 @@ class ApiTimelineGroupAction extends ApiPrivateAuthAction * * @return string datestamp of the latest notice in the stream */ - function lastModified() { if (!empty($this->notices) && (count($this->notices) > 0)) { @@ -250,7 +198,6 @@ class ApiTimelineGroupAction extends ApiPrivateAuthAction * * @return string etag */ - function etag() { if (!empty($this->notices) && (count($this->notices) > 0)) { @@ -260,6 +207,7 @@ class ApiTimelineGroupAction extends ApiPrivateAuthAction return '"' . implode( ':', array($this->arg('action'), + common_user_cache_hash($this->auth_user), common_language(), $this->group->id, strtotime($this->notices[0]->created), @@ -270,5 +218,4 @@ class ApiTimelineGroupAction extends ApiPrivateAuthAction return null; } - }