X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Fapitimelinehome.php;h=5dca9a42cd19d9536a5141556c1d007543ffb805;hb=ffcdd14940e0a10a40b292378ccabf51d4a04cff;hp=828eae6cf6f912382f350afe2fe17ba716041bc9;hpb=bd6571c2e17939b21e01afd3772acb5cebbbadfe;p=quix0rs-gnu-social.git diff --git a/actions/apitimelinehome.php b/actions/apitimelinehome.php index 828eae6cf6..5dca9a42cd 100644 --- a/actions/apitimelinehome.php +++ b/actions/apitimelinehome.php @@ -29,6 +29,7 @@ * @author Robin Millette * @author Zach Copley * @copyright 2009 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/ */ @@ -37,8 +38,6 @@ if (!defined('STATUSNET')) { exit(1); } -require_once INSTALLDIR . '/lib/apibareauth.php'; - /** * Returns the most recent notices (default 20) posted by the target user. * This is the equivalent of 'You and friends' page accessed via Web. @@ -55,7 +54,6 @@ require_once INSTALLDIR . '/lib/apibareauth.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 ApiTimelineHomeAction extends ApiBareAuthAction { var $notices = null; @@ -66,18 +64,16 @@ class ApiTimelineHomeAction extends ApiBareAuthAction * @param array $args $_REQUEST args * * @return boolean success flag - * */ - - function prepare($args) + protected function prepare(array $args=array()) { parent::prepare($args); - common_debug("api home_timeline"); - $this->user = $this->getTargetUser($this->arg('id')); - if (empty($this->user)) { - $this->clientError(_('No such user.'), 404, $this->format); - return; + $this->target = $this->getTargetProfile($this->arg('id')); + + if (!($this->target instanceof Profile)) { + // TRANS: Client error displayed when requesting most recent dents by user and friends for a non-existing user. + $this->clientError(_('No such user.'), 404); } $this->notices = $this->getNotices(); @@ -90,14 +86,11 @@ class ApiTimelineHomeAction extends ApiBareAuthAction * * Just show the notices * - * @param array $args $_REQUEST data (unused) - * * @return void */ - - function handle($args) + protected function handle() { - parent::handle($args); + parent::handle(); $this->showTimeline(); } @@ -106,55 +99,73 @@ class ApiTimelineHomeAction extends ApiBareAuthAction * * @return void */ - function showTimeline() { - $profile = $this->user->getProfile(); - $avatar = $profile->getAvatar(AVATAR_PROFILE_SIZE); $sitename = common_config('site', 'name'); - $title = sprintf(_("%s and friends"), $this->user->nickname); - $taguribase = common_config('integration', 'taguri'); - $id = "tag:$taguribase:HomeTimeline:" . $this->user->id; - $link = common_local_url( - 'all', array('nickname' => $this->user->nickname) - ); + // TRANS: Timeline title for user and friends. %s is a user nickname. + $title = sprintf(_("%s and friends"), $this->target->nickname); + $taguribase = TagURI::base(); + $id = "tag:$taguribase:HomeTimeline:" . $this->target->id; + $subtitle = sprintf( + // TRANS: Message is used as a subtitle. %1$s is a user nickname, %2$s is a site name. _('Updates from %1$s and friends on %2$s!'), - $this->user->nickname, $sitename + $this->target->nickname, $sitename ); - $logo = ($avatar) ? $avatar->displayUrl() : Avatar::defaultImage(AVATAR_PROFILE_SIZE); + + $logo = $this->target->avatarUrl(AVATAR_PROFILE_SIZE); + $link = common_local_url('all', + array('nickname' => $this->target->nickname)); + $self = $this->getSelfUri(); switch($this->format) { case 'xml': $this->showXmlTimeline($this->notices); break; case 'rss': - $this->showRssTimeline($this->notices, $title, $link, $subtitle, null, $logo); + $this->showRssTimeline( + $this->notices, + $title, + $link, + $subtitle, + null, + $logo, + $self + ); break; case 'atom': - $target_id = $this->arg('id'); + header('Content-Type: application/atom+xml; charset=utf-8'); - if (isset($target_id)) { - $selfuri = common_root_url() . - 'api/statuses/home_timeline/' . - $target_id . '.atom'; - } else { - $selfuri = common_root_url() . - 'api/statuses/home_timeline.atom'; - } + $atom = new AtomNoticeFeed($this->auth_user); + + $atom->setId($id); + $atom->setTitle($title); + $atom->setSubtitle($subtitle); + $atom->setLogo($logo); + $atom->setUpdated('now'); + + $atom->addLink($link); + $atom->setSelfLink($self); + + $atom->addEntryFromNotices($this->notices); + $this->raw($atom->getString()); - $this->showAtomTimeline( - $this->notices, $title, $id, $link, - $subtitle, null, $selfuri, $logo - ); break; case 'json': $this->showJsonTimeline($this->notices); break; - default: - $this->clientError(_('API method not found.'), $code = 404); + case 'as': + header('Content-Type: ' . ActivityStreamJSONDocument::CONTENT_TYPE); + $doc = new ActivityStreamJSONDocument($this->auth_user); + $doc->setTitle($title); + $doc->addLink($link, 'alternate', 'text/html'); + $doc->addItemsFromNotices($this->notices); + $this->raw($doc->asString()); break; + default: + // TRANS: Client error displayed when coming across a non-supported API method. + $this->clientError(_('API method not found.'), 404); } } @@ -163,24 +174,16 @@ class ApiTimelineHomeAction extends ApiBareAuthAction * * @return array notices */ - function getNotices() { $notices = array(); - if (!empty($this->auth_user) && $this->auth_user->id == $this->user->id) { - $notice = $this->user->noticeInbox( - ($this->page-1) * $this->count, - $this->count, $this->since_id, - $this->max_id, $this->since - ); - } else { - $notice = $this->user->noticesWithFriends( - ($this->page-1) * $this->count, - $this->count, $this->since_id, - $this->max_id, $this->since - ); - } + $stream = new InboxNoticeStream($this->target, $this->scoped); + + $notice = $stream->getNotices(($this->page-1) * $this->count, + $this->count, + $this->since_id, + $this->max_id); while ($notice->fetch()) { $notices[] = clone($notice); @@ -196,8 +199,7 @@ class ApiTimelineHomeAction extends ApiBareAuthAction * * @return boolean true */ - - function isReadOnly($args) + function isReadOnly(array $args=array()) { return true; } @@ -207,7 +209,6 @@ class ApiTimelineHomeAction extends ApiBareAuthAction * * @return string datestamp of the latest notice in the stream */ - function lastModified() { if (!empty($this->notices) && (count($this->notices) > 0)) { @@ -225,7 +226,6 @@ class ApiTimelineHomeAction extends ApiBareAuthAction * * @return string etag */ - function etag() { if (!empty($this->notices) && (count($this->notices) > 0)) { @@ -235,8 +235,9 @@ class ApiTimelineHomeAction extends ApiBareAuthAction return '"' . implode( ':', array($this->arg('action'), + common_user_cache_hash($this->auth_user), common_language(), - $this->user->id, + $this->target->id, strtotime($this->notices[0]->created), strtotime($this->notices[$last]->created)) ) @@ -245,5 +246,4 @@ class ApiTimelineHomeAction extends ApiBareAuthAction return null; } - }