Fixed feed content empty when user logged in (#6)

* Fixed feed content empty when user logged in * Apply fixes from StyleCI
imorland · Jul 6, 2021 · 603f900 · 603f900
1 parent ad59c74
commit 603f900
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 26 deletions.
diff --git a/src/Controller/AbstractFeedController.php b/src/Controller/AbstractFeedController.php
@@ -168,18 +168,19 @@ protected function getActor(ServerRequestInterface $request): User
     /**
      * Retrieves an API response from the given endpoint.
      *
-     * @param string $endpoint The API endpoint.
-     * @param User   $actor    The request actor.
-     * @param array  $params   The API request parameters (if any).
-     * @param array  $body     The API request body (if any).
+     * @param Request $request
+     * @param string  $endpoint The API endpoint.
+     * @param User    $actor    The request actor.
+     * @param array   $params   The API request parameters (if any).
+     * @param array   $body     The API request body (if any).
      *
      * @throws RouteNotFoundException If the API endpoint cannot be found, or if it cannot find what requested.
      *
      * @return \stdClass API response.
      */
-    protected function getAPIDocument(string $endpoint, User $actor, array $params = [], array $body = [])
+    protected function getAPIDocument(Request $request, string $endpoint, User $actor, array $params = [], array $body = [])
     {
-        $response = $this->api->withQueryParams($params)->withBody($body)->withActor($actor)->get($endpoint);
+        $response = $this->api->withParentRequest($request)->withQueryParams($params)->withBody($body)->withActor($actor)->get($endpoint);
 
         if ($response->getStatusCode() === 404) {
             throw new RouteNotFoundException();
@@ -191,13 +192,14 @@ protected function getAPIDocument(string $endpoint, User $actor, array $params =
     /**
      * Get the result of an API request to show the forum.
      *
-     * @param User $actor
+     * @param Request $request
+     * @param User    $actor
      *
      * @return \stdClass
      */
-    protected function getForumDocument(User $actor)
+    protected function getForumDocument(Request $request, User $actor)
     {
-        return $this->getAPIDocument('/', $actor)->data;
+        return $this->getAPIDocument($request, '/', $actor)->data;
     }
 
     /**

diff --git a/src/Controller/DiscussionFeedController.php b/src/Controller/DiscussionFeedController.php
@@ -70,14 +70,14 @@ protected function getFeedContent(Request $request)
 
         $actor = $this->getActor($request);
 
-        $discussion = $this->getDiscussionsDocument($actor, [
+        $discussion = $this->getDiscussionsDocument($request, $actor, [
             'id'   => $discussion_id,
             'page' => [
                 'limit' => 1,
             ],
         ])->data;
 
-        $posts = $this->getPostsDocument($actor, [
+        $posts = $this->getPostsDocument($request, $actor, [
             'filter' => [
                 'discussion' => $discussion_id,
             ],
@@ -124,30 +124,32 @@ protected function getFeedContent(Request $request)
     /**
      * Get the result of an API request to show a discussion.
      *
-     * @param User  $actor
-     * @param array $params
+     * @param Request $request
+     * @param User    $actor
+     * @param array   $params
      *
      * @throws RouteNotFoundException
      *
      * @return object
      */
-    protected function getDiscussionsDocument(User $actor, array $params)
+    protected function getDiscussionsDocument(Request $request, User $actor, array $params)
     {
-        return $this->getAPIDocument('/discussions/'.$params['id'], $actor, $params);
+        return $this->getAPIDocument($request, '/discussions/'.$params['id'], $actor, $params);
     }
 
     /**
      * Get the result of an API request to list a discussion posts.
      *
-     * @param User  $actor
-     * @param array $params
+     * @param Request $request
+     * @param User    $actor
+     * @param array   $params
      *
      * @throws RouteNotFoundException
      *
      * @return object
      */
-    protected function getPostsDocument(User $actor, array $params)
+    protected function getPostsDocument(Request $request, User $actor, array $params)
     {
-        return $this->getAPIDocument('/posts', $actor, $params);
+        return $this->getAPIDocument($request, '/posts', $actor, $params);
     }
 }
diff --git a/src/Controller/DiscussionsActivityFeedController.php b/src/Controller/DiscussionsActivityFeedController.php
@@ -114,13 +114,13 @@ protected function getFeedContent(Request $request)
         ];
 
         $actor = $this->getActor($request);
-        $forum = $this->getForumDocument($actor);
-        $last_discussions = $this->getDocument($actor, $params);
+        $forum = $this->getForumDocument($request, $actor);
+        $last_discussions = $this->getDocument($request, $actor, $params);
 
         $entries = [];
         $lastModified = null;
 
-        foreach ($last_discussions->data as $discussion) {
+        foreach ((array) $last_discussions->data as $discussion) {
             if ($discussion->type != 'discussions') {
                 continue;
             }
@@ -183,14 +183,15 @@ protected function getFeedContent(Request $request)
     /**
      * Get the result of an API request to list discussions.
      *
-     * @param User  $actor
-     * @param array $params
+     * @param Request $request
+     * @param User    $actor
+     * @param array   $params
      *
      * @return object
      */
-    private function getDocument(User $actor, array $params)
+    private function getDocument(Request $request, User $actor, array $params)
     {
-        return $this->getAPIDocument('/discussions', $actor, $params);
+        return $this->getAPIDocument($request, '/discussions', $actor, $params);
     }
 
     /**