X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Fapitimelinefriends.php;h=591baccfccfba26713cf40c018d10a7be0927cad;hb=5eba1030ae39038b7b6b0aad5de1043fae43e48d;hp=279265a30ee55a94e30daaf41ba06baea8822d3f;hpb=328373e29ce1429c7f7482c52d04ebe8bb70a00a;p=quix0rs-gnu-social.git diff --git a/actions/apitimelinefriends.php b/actions/apitimelinefriends.php index 279265a30e..591baccfcc 100644 --- a/actions/apitimelinefriends.php +++ b/actions/apitimelinefriends.php @@ -266,16 +266,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 coming across a non-supported API method. - $this->clientError(_('API method not found.'), $code = 404); + $this->clientError(_('API method not found.'), 404); break; } } @@ -289,7 +288,13 @@ class ApiTimelineFriendsAction extends ApiBareAuthAction { $notices = array(); - $stream = new InboxNoticeStream($this->user); + $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,