$this->showJsonTimeline($this->notices);
break;
case 'as':
- header('Content-Type: application/json; charset=utf-8');
+ header('Content-Type: ' . ActivityStreamJSONDocument::CONTENT_TYPE);
$doc = new ActivityStreamJSONDocument($this->auth_user);
$doc->setTitle($title);
$doc->addLink($link, 'alternate', 'text/html');
$this->raw($doc->asString());
break;
default:
- // TRANS: Client error displayed when trying to handle an unknown API method.
+ // TRANS: Client error displayed when coming across a non-supported API method.
$this->clientError(_('API method not found.'), $code = 404);
break;
}
{
$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
- );
- } else {
- $notice = $this->user->noticesWithFriends(
- ($this->page-1) * $this->count,
- $this->count, $this->since_id,
- $this->max_id
- );
+ $profile = null;
+
+ if (isset($this->auth_user)) {
+ $profile = $this->auth_user->getProfile();
}
+ $stream = new InboxNoticeStream($this->user, $profile);
+
+ $notice = $stream->getNotices(($this->page-1) * $this->count,
+ $this->count,
+ $this->since_id,
+ $this->max_id);
+
while ($notice->fetch()) {
$notices[] = clone($notice);
}