X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Fapitimelinehome.php;h=56f0e66d0433f2eb436f4a84413546521e40bcec;hb=0e439117a75698629c5066d0241ab41dc07b5ee1;hp=96642cbfab6b476cb95c494eacef882c990e6ff9;hpb=84a2fb44b9f6f2b60124b651bb1d72496e81b5f0;p=quix0rs-gnu-social.git

diff --git a/actions/apitimelinehome.php b/actions/apitimelinehome.php
index 96642cbfab..56f0e66d04 100644
--- a/actions/apitimelinehome.php
+++ b/actions/apitimelinehome.php
@@ -169,7 +169,7 @@ class ApiTimelineHomeAction extends ApiBareAuthAction
             $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');
@@ -192,19 +192,12 @@ class ApiTimelineHomeAction extends ApiBareAuthAction
     {
         $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
-            );
-        }
+        $stream = new InboxNoticeStream($this->user);
+        
+        $notice = $stream->getNotices(($this->page-1) * $this->count,
+                                      $this->count,
+                                      $this->since_id,
+                                      $this->max_id);
 
         while ($notice->fetch()) {
             $notices[] = clone($notice);