X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Fapitimelinefriends.php;h=13fb6022d7b514bfa5d0e894459b2adecf50f6b8;hb=a75b1df62727ce74fdf4d8d98421558b153458e1;hp=0e356bb18be2bc08ba7eea5441b12fc32778ae3f;hpb=59a0b2a82da418f688faf182407146d9e7a7af7a;p=quix0rs-gnu-social.git
diff --git a/actions/apitimelinefriends.php b/actions/apitimelinefriends.php
index 0e356bb18b..13fb6022d7 100644
--- a/actions/apitimelinefriends.php
+++ b/actions/apitimelinefriends.php
@@ -92,7 +92,7 @@
false
Wed Mar 31 01:33:02 +0000 2010
-
+
26674201
@@ -133,8 +133,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.
@@ -163,15 +161,14 @@ class ApiTimelineFriendsAction extends ApiBareAuthAction
* @return boolean success flag
*
*/
- function prepare($args)
+ protected function prepare(array $args=array())
{
parent::prepare($args);
- $this->user = $this->getTargetUser($this->arg('id'));
+ $this->target = $this->getTargetProfile($this->arg('id'));
- if (empty($this->user)) {
+ if (!($this->target instanceof Profile)) {
// TRANS: Client error displayed when requesting dents of a user and friends for a user that does not exist.
- $this->clientError(_('No such user.'), 404, $this->format);
- return;
+ $this->clientError(_('No such user.'), 404);
}
$this->notices = $this->getNotices();
@@ -184,13 +181,11 @@ class ApiTimelineFriendsAction 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();
}
@@ -201,31 +196,25 @@ class ApiTimelineFriendsAction extends ApiBareAuthAction
*/
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);
+ // TRANS: Title of API timeline for a user and friends.
+ // TRANS: %s is a username.
+ $title = sprintf(_("%s and friends"), $this->target->nickname);
$taguribase = TagURI::base();
- $id = "tag:$taguribase:FriendsTimeline:" . $this->user->id;
+ $id = "tag:$taguribase:FriendsTimeline:" . $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,
+ $this->target->nickname,
$sitename
);
- $link = common_local_url(
- 'all',
- array('nickname' => $this->user->nickname)
- );
-
+ $logo = $this->target->avatarUrl(AVATAR_PROFILE_SIZE);
+ $link = common_local_url('all',
+ array('nickname' => $this->target->nickname));
$self = $this->getSelfUri();
- $logo = (!empty($avatar))
- ? $avatar->displayUrl()
- : Avatar::defaultImage(AVATAR_PROFILE_SIZE);
-
switch($this->format) {
case 'xml':
$this->showXmlTimeline($this->notices);
@@ -264,17 +253,15 @@ class ApiTimelineFriendsAction extends ApiBareAuthAction
$this->showJsonTimeline($this->notices);
break;
case 'as':
- header('Content-Type: application/json; charset=utf-8');
- $doc = new ActivityStreamJSONDocument($this->auth_user);
- $doc->setTitle($title);
- $doc->addLink($link,'alternate', 'text/html');
+ header('Content-Type: ' . ActivityStreamJSONDocument::CONTENT_TYPE);
+ $doc = new ActivityStreamJSONDocument($this->auth_user, $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.'), $code = 404);
- break;
+ // TRANS: Client error displayed when coming across a non-supported API method.
+ $this->clientError(_('API method not found.'), 404);
}
}
@@ -287,15 +274,12 @@ class ApiTimelineFriendsAction extends ApiBareAuthAction
{
$notices = array();
- if (!empty($this->auth_user) && $this->auth_user->id == $this->user->id) {
- $notice = $this->user->ownFriendsTimeline(($this->page-1) * $this->count,
- $this->count, $this->since_id,
- $this->max_id);
- } else {
- $notice = $this->user->friendsTimeline(($this->page-1) * $this->count,
- $this->count, $this->since_id,
- $this->max_id);
- }
+ $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);
@@ -348,7 +332,7 @@ class ApiTimelineFriendsAction extends ApiBareAuthAction
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))
)