X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Fapitimelinehome.php;h=3c18a5b0bf195d35f396c8551efa623f8055cfa0;hb=c97048d01bea468e0cf8865b60c3c250b4515c39;hp=96642cbfab6b476cb95c494eacef882c990e6ff9;hpb=84a2fb44b9f6f2b60124b651bb1d72496e81b5f0;p=quix0rs-gnu-social.git diff --git a/actions/apitimelinehome.php b/actions/apitimelinehome.php index 96642cbfab..3c18a5b0bf 100644 --- a/actions/apitimelinehome.php +++ b/actions/apitimelinehome.php @@ -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);