fix current user vote on showcase page

FriendsOfFlarum · Mar 7, 2024 · 4919682 · 4919682
1 parent f2a1760
commit 4919682
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/js/src/forum/components/PollsShowcasePage.tsx b/js/src/forum/components/PollsShowcasePage.tsx
@@ -16,7 +16,7 @@ export default class PollsShowcasePage extends AbstractPollPage {
     this.state = new PollListState({
       sort: m.route.param('sort'),
       filter: m.route.param('filter'),
-      include: ['options', 'votes', 'myVotes'],
+      include: ['options', 'votes', 'myVotes', 'myVotes.option'],
     });
 
     this.state.refresh();

diff --git a/src/Api/Controllers/ListGlobalPollsController.php b/src/Api/Controllers/ListGlobalPollsController.php
@@ -49,8 +49,6 @@ public function __construct(PollRepository $polls, UrlGenerator $url)
 
     public function data(ServerRequestInterface $request, Document $document): Collection
     {
-        $actor = RequestUtil::getActor($request);
-
         // Not yet needed, but here if/when we do.
         // $filters = $this->extractFilter($request);
         $sort = $this->extractSort($request);
@@ -60,7 +58,7 @@ public function data(ServerRequestInterface $request, Document $document): Colle
         $offset = $this->extractOffset($request);
         $include = $this->extractInclude($request);
 
-        $results = $this->polls->queryVisibleTo($actor)
+        $results = $this->polls->queryVisibleTo(RequestUtil::getActor($request))
             ->select('polls.*')
             ->whereNull('post_id')
             ->orderBy($sortIsDefault ? 'id' : $sort, 'desc')