Poll improvements

- fix the end date being ignored upon poll creation
- make the poll end date DATETIMETZ_IMMUTABLE -> with time zone
- implement refreshing the vote counts of remote polls
- fix handling of `Update` activities -> only edit the poll (and discarding all votes) when the content actually changed, pass through the correct object to refresh the poll counts
- send an `Update` activity when a vote is created on a local poll
- fix missing query from `EntryCommentRepository` and `PostCommentRepository` in the `PollVoteFactory`
- add a way to invalidate the cache of an activity object
- add support for the `closed` property on polls (it is the same as `endTime`)
- add a way to just show the results of a poll in the UI

Author: BentiGorlich

config/mbin_routes/poll.yaml

@@ -2,3 +2,8 @@ poll_vote:
   controller: App\Controller\PollVoteController::vote
   path: /poll/{id}/vote
   methods: [GET]
+
+poll_refresh:
+    controller: App\Controller\PollVoteController::refreshVoteCounts
+    path: /poll/{id}/refresh
+    methods: [GET]

migrations/Version20260408134939.php

@@ -18,7 +18,7 @@ public function up(Schema $schema): void
     {
         $this->addSql('CREATE SEQUENCE poll_id_seq INCREMENT BY 1 MINVALUE 1 START 1');
         $this->addSql('CREATE SEQUENCE poll_choice_id_seq INCREMENT BY 1 MINVALUE 1 START 1');
-        $this->addSql('CREATE TABLE poll (id INT NOT NULL, multiple_choice BOOLEAN NOT NULL, voter_count INT DEFAULT 0 NOT NULL, end_date TIMESTAMP(0) WITHOUT TIME ZONE NOT NULL, is_remote BOOLEAN NOT NULL, created_at TIMESTAMP(0) WITH TIME ZONE NOT NULL, sent_notifications BOOLEAN NOT NULL, PRIMARY KEY (id))');
+        $this->addSql('CREATE TABLE poll (id INT NOT NULL, multiple_choice BOOLEAN NOT NULL, voter_count INT DEFAULT 0 NOT NULL, end_date TIMESTAMP(0) WITH TIME ZONE NOT NULL, is_remote BOOLEAN NOT NULL, created_at TIMESTAMP(0) WITH TIME ZONE NOT NULL, sent_notifications BOOLEAN NOT NULL, PRIMARY KEY (id))');
         $this->addSql('CREATE TABLE poll_choice (id INT NOT NULL, name VARCHAR(255) NOT NULL, vote_count INT NOT NULL, poll_id INT NOT NULL, PRIMARY KEY (id))');
         $this->addSql('CREATE INDEX IDX_2DAE19C93C947C0F ON poll_choice (poll_id)');
         $this->addSql('CREATE TABLE poll_vote (uuid UUID NOT NULL, created_at TIMESTAMP(0) WITH TIME ZONE NOT NULL, ap_id VARCHAR(255) DEFAULT NULL, voter_id INT NOT NULL, choice_id INT NOT NULL, poll_id INT NOT NULL, PRIMARY KEY (uuid))');

src/Controller/PollVoteController.php

@@ -9,6 +9,7 @@
 use App\Entity\Poll;
 use App\Entity\Post;
 use App\Entity\PostComment;
+use App\Service\ActivityPub\ApHttpClientInterface;
 use App\Service\PollManager;
 use Psr\Log\LoggerInterface;
 use Symfony\Bridge\Doctrine\Attribute\MapEntity;
@@ -23,6 +24,7 @@ class PollVoteController extends AbstractController
     public function __construct(
         private readonly PollManager $pollManager,
         private readonly LoggerInterface $logger,
+        private readonly ApHttpClientInterface $apHttpClient,
     ) {
     }
 
@@ -49,6 +51,28 @@ public function vote(#[MapEntity] Poll $poll, Request $request): Response
             throw new BadRequestHttpException(previous: $e);
         }
 
+        return $this->redirectToPollContent($poll);
+    }
+
+    #[IsGranted('ROLE_USER')]
+    public function refreshVoteCounts(#[MapEntity] Poll $poll): Response
+    {
+        if (null === $poll->getSubject()->apId) {
+            throw new BadRequestHttpException('Cannot refresh the vote counts of a local poll');
+        }
+
+        $this->apHttpClient->invalidateActivityObjectCache($poll->getSubject()->apId);
+        $object = $this->apHttpClient->getActivityObject($poll->getSubject()->apId);
+        if ($this->pollManager->hasPollProperties($object)) {
+            $this->pollManager->updatePollCounts($poll, $object);
+        }
+
+        return $this->redirectToPollContent($poll);
+    }
+
+    protected function redirectToPollContent(Poll $poll): Response
+    {
+        $content = $poll->getSubject();
         if ($content instanceof Entry) {
             return $this->redirectToRoute('entry_single', ['entry_id' => $content->getId(), 'magazine_name' => $content->magazine->name]);
         } elseif ($content instanceof EntryComment) {

src/DTO/PollResponseDto.php

@@ -15,13 +15,15 @@ class PollResponseDto implements \JsonSerializable
 {
     public int $voterCount = 0;
     public ?bool $currentUserHasVoted = null;
+    public ?\DateTimeImmutable $endDate = null;
     #[OA\Property(type: 'array', items: new OA\Items(ref: new Model(type: PollChoiceResponseDto::class)))]
     public ?array $choices = null;
 
     public static function createFromPoll(Poll $poll, User|UserInterface|null $user): self
     {
         $dto = new PollResponseDto();
         $dto->voterCount = $poll->voterCount;
+        $dto->endDate = $poll->endDate;
         $dto->currentUserHasVoted = $user instanceof User ? $poll->hasUserVoted($user) : null;
         $dto->choices = array_map(fn (PollChoice $choice) => PollChoiceResponseDto::createFromPollChoice($choice, $user), $poll->choices->toArray());
 
@@ -32,6 +34,7 @@ public function jsonSerialize(): array
     {
         return [
             'voterCount' => $this->voterCount,
+            'endDate' => $this->endDate,
             'currentUserHasVoted' => $this->currentUserHasVoted,
             'choices' => $this->choices ? array_map(fn (PollChoiceResponseDto $dto) => $dto->jsonSerialize(), $this->choices) : null,
         ];

src/Entity/Poll.php

@@ -35,7 +35,7 @@ class Poll
     #[Column(options: ['default' => 0])]
     public int $voterCount = 0;
 
-    #[Column(type: Types::DATETIME_IMMUTABLE)]
+    #[Column(type: Types::DATETIMETZ_IMMUTABLE)]
     public \DateTimeImmutable $endDate;
 
     #[Column]

src/EventSubscriber/PollEventSubscriber.php

@@ -8,6 +8,7 @@
 use App\Event\Poll\PollPreEditedEvent;
 use App\Event\Poll\PollVoteEvent;
 use App\Message\ActivityPub\Outbox\PollVoteMessage;
+use App\Message\ActivityPub\Outbox\UpdateMessage;
 use App\Service\Notification\PollNotificationManager;
 use Psr\Log\LoggerInterface;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
@@ -38,6 +39,10 @@ public function onPollVote(PollVoteEvent $event): void
             foreach ($event->poll->votes as $vote) {
                 $this->bus->dispatch(new PollVoteMessage($vote->uuid->toString()));
             }
+        } elseif (!$event->poll->isRemote) {
+            // remote poll -> send update with new vote numbers
+            $this->bus->dispatch(new UpdateMessage($event->content->getId(), \get_class($event->content)));
+            $event->content->editedAt = new \DateTimeImmutable();
         }
     }
 

src/Factory/ActivityPub/PollVoteFactory.php

@@ -6,7 +6,9 @@
 
 use App\Entity\PollVote;
 use App\Repository\ApActivityRepository;
+use App\Repository\EntryCommentRepository;
 use App\Repository\EntryRepository;
+use App\Repository\PostCommentRepository;
 use App\Repository\PostRepository;
 use App\Service\ActivityPub\ContextsProvider;
 use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
@@ -17,7 +19,9 @@ public function __construct(
         private readonly UrlGeneratorInterface $urlGenerator,
         private readonly ContextsProvider $contextsProvider,
         private readonly EntryRepository $entryRepository,
+        private readonly EntryCommentRepository $entryCommentRepository,
         private readonly PostRepository $postRepository,
+        private readonly PostCommentRepository $postCommentRepository,
         private readonly PersonFactory $personFactory,
         private readonly ApActivityRepository $apActivityRepository,
     ) {
@@ -26,7 +30,11 @@ public function __construct(
     public function build(PollVote $vote, bool $includeContext = true): array
     {
         $actorUrl = $this->personFactory->getActivityPubId($vote->getUser());
-        $content = $this->entryRepository->findOneBy(['poll' => $vote->poll]) ?? $this->postRepository->findOneBy(['poll' => $vote->poll]) ?? throw new \LogicException();
+        $content = $this->entryRepository->findOneBy(['poll' => $vote->poll])
+            ?? $this->entryCommentRepository->findOneBy(['poll' => $vote->poll])
+            ?? $this->postRepository->findOneBy(['poll' => $vote->poll])
+            ?? $this->postCommentRepository->findOneBy(['poll' => $vote->poll])
+            ?? throw new \LogicException();
 
         $result = [
             '@context' => $this->contextsProvider->referencedContexts(),

src/Factory/EntryCommentFactory.php

@@ -47,6 +47,7 @@ public function createResponseDto(EntryComment $comment, array $tags, int $child
         $pollDto = null;
         if ($dto->addPoll) {
             $pollDto = new PollResponseDto();
+            $pollDto->endDate = $dto->pollEndsAt;
             $pollDto->voterCount = $comment->poll->voterCount;
             $user = $this->security->getUser();
             $pollDto->currentUserHasVoted = $user instanceof User ? $comment->poll->hasUserVoted($user) : null;

src/Factory/PostCommentFactory.php

@@ -48,6 +48,7 @@ public function createResponseDto(PostComment $comment, array $tags, int $childC
         $pollDto = null;
         if ($dto->addPoll) {
             $pollDto = new PollResponseDto();
+            $pollDto->endDate = $dto->pollEndsAt;
             $pollDto->voterCount = $comment->poll->voterCount;
             $user = $this->security->getUser();
             $pollDto->currentUserHasVoted = $user instanceof User ? $comment->poll->hasUserVoted($user) : null;

src/Factory/PostFactory.php

@@ -43,6 +43,7 @@ public function createResponseDto(Post $post, array $tags): PostResponseDto
         $pollDto = null;
         if ($dto->addPoll) {
             $pollDto = new PollResponseDto();
+            $pollDto->endDate = $dto->pollEndsAt;
             $pollDto->voterCount = $post->poll->voterCount;
             $user = $this->security->getUser();
             $pollDto->currentUserHasVoted = $user instanceof User ? $post->poll->hasUserVoted($user) : null;