Performance Improvements for the new combined front page (#1697)

BentiGorlich · web-flow · commit ff4978cb8683 · 2025-09-29T07:13:50.000Z
diff --git a/src/Controller/Api/Content/ContentRetrieveApi.php b/src/Controller/Api/Content/ContentRetrieveApi.php
@@ -9,6 +9,7 @@
 use App\DTO\ContentResponseDto;
 use App\Entity\Entry;
 use App\Entity\Post;
+use App\Entity\User;
 use App\PageView\ContentPageView;
 use App\Repository\ContentRepository;
 use App\Repository\Criteria;
@@ -254,6 +255,10 @@ private function generateResponse(
         $this->handleLanguageCriteria($criteria);
         $criteria->content = Criteria::CONTENT_THREADS;
         $criteria->perPage = $perPage;
+        $user = $security->getUser();
+        if ($user instanceof User) {
+            $criteria->fetchCachedItems($contentRepository, $user);
+        }
 
         switch ($collectionType) {
             case 'sub':
diff --git a/src/Controller/Api/Entry/DomainEntriesRetrieveApi.php b/src/Controller/Api/Entry/DomainEntriesRetrieveApi.php
@@ -8,6 +8,7 @@
 use App\DTO\EntryResponseDto;
 use App\Entity\Domain;
 use App\Entity\Entry;
+use App\Entity\User;
 use App\Factory\EntryFactory;
 use App\PageView\EntryPageView;
 use App\Repository\ContentRepository;
@@ -145,6 +146,10 @@ public function __invoke(
         $criteria->sortOption = $sort ?? Criteria::SORT_HOT;
         $criteria->time = $criteria->resolveTime($time ?? Criteria::TIME_ALL);
         $this->handleLanguageCriteria($criteria);
+        $user = $security->getUser();
+        if ($user instanceof User) {
+            $criteria->fetchCachedItems($repository, $user);
+        }
 
         $criteria->perPage = self::constrainPerPage($perPage ?? ContentRepository::PER_PAGE);
 
diff --git a/src/Controller/Api/Entry/EntriesRetrieveApi.php b/src/Controller/Api/Entry/EntriesRetrieveApi.php
@@ -7,6 +7,7 @@
 use App\Controller\Traits\PrivateContentTrait;
 use App\DTO\EntryResponseDto;
 use App\Entity\Entry;
+use App\Entity\User;
 use App\Event\Entry\EntryHasBeenSeenEvent;
 use App\Factory\EntryFactory;
 use App\PageView\EntryPageView;
@@ -201,6 +202,11 @@ public function collection(
         $this->handleLanguageCriteria($criteria);
         $criteria->content = Criteria::CONTENT_THREADS;
 
+        $user = $security->getUser();
+        if ($user instanceof User) {
+            $criteria->fetchCachedItems($repository, $user);
+        }
+
         $entries = $repository->findByCriteria($criteria);
 
         $dtos = [];
@@ -317,6 +323,11 @@ public function subscribed(
         $criteria->subscribed = true;
         $criteria->content = Criteria::CONTENT_THREADS;
 
+        $user = $security->getUser();
+        if ($user instanceof User) {
+            $criteria->fetchCachedItems($repository, $user);
+        }
+
         $entries = $repository->findByCriteria($criteria);
 
         $dtos = [];
@@ -433,6 +444,11 @@ public function moderated(
         $criteria->moderated = true;
         $criteria->content = Criteria::CONTENT_THREADS;
 
+        $user = $security->getUser();
+        if ($user instanceof User) {
+            $criteria->fetchCachedItems($repository, $user);
+        }
+
         $entries = $repository->findByCriteria($criteria);
 
         $dtos = [];
@@ -548,6 +564,11 @@ public function favourited(
 
         $criteria->favourite = true;
 
+        $user = $security->getUser();
+        if ($user instanceof User) {
+            $criteria->fetchCachedItems($repository, $user);
+        }
+
         $entries = $repository->findByCriteria($criteria);
         $criteria->content = Criteria::CONTENT_THREADS;
 
diff --git a/src/Controller/Api/Entry/MagazineEntriesRetrieveApi.php b/src/Controller/Api/Entry/MagazineEntriesRetrieveApi.php
@@ -8,6 +8,7 @@
 use App\DTO\EntryResponseDto;
 use App\Entity\Entry;
 use App\Entity\Magazine;
+use App\Entity\User;
 use App\Factory\EntryFactory;
 use App\PageView\EntryPageView;
 use App\Repository\ContentRepository;
@@ -152,6 +153,11 @@ public function __invoke(
 
         $criteria->magazine = $magazine;
 
+        $user = $security->getUser();
+        if ($user instanceof User) {
+            $criteria->fetchCachedItems($repository, $user);
+        }
+
         $entries = $repository->findByCriteria($criteria);
 
         $dtos = [];
diff --git a/src/Controller/Api/Post/PostsRetrieveApi.php b/src/Controller/Api/Post/PostsRetrieveApi.php
@@ -8,6 +8,7 @@
 use App\DTO\PostResponseDto;
 use App\Entity\Magazine;
 use App\Entity\Post;
+use App\Entity\User;
 use App\Event\Post\PostHasBeenSeenEvent;
 use App\Factory\PostFactory;
 use App\PageView\PostPageView;
@@ -329,6 +330,11 @@ public function subscribed(
 
         $this->handleLanguageCriteria($criteria);
 
+        $user = $security->getUser();
+        if ($user instanceof User) {
+            $criteria->fetchCachedItems($repository, $user);
+        }
+
         $posts = $repository->findByCriteria($criteria);
 
         $dtos = [];
@@ -447,6 +453,11 @@ public function moderated(
         $criteria->moderated = true;
         $criteria->setContent(Criteria::CONTENT_MICROBLOG);
 
+        $user = $security->getUser();
+        if ($user instanceof User) {
+            $criteria->fetchCachedItems($repository, $user);
+        }
+
         $posts = $repository->findByCriteria($criteria);
 
         $dtos = [];
@@ -562,6 +573,11 @@ public function favourited(
 
         $this->logger->debug(var_export($criteria, true));
 
+        $user = $security->getUser();
+        if ($user instanceof User) {
+            $criteria->fetchCachedItems($repository, $user);
+        }
+
         $posts = $repository->findByCriteria($criteria);
 
         $dtos = [];
@@ -706,6 +722,11 @@ public function byMagazine(
         $criteria->magazine = $magazine;
         $criteria->setContent(Criteria::CONTENT_MICROBLOG);
 
+        $user = $security->getUser();
+        if ($user instanceof User) {
+            $criteria->fetchCachedItems($repository, $user);
+        }
+
         $posts = $repository->findByCriteria($criteria);
 
         $dtos = [];
diff --git a/src/Controller/Domain/DomainFrontController.php b/src/Controller/Domain/DomainFrontController.php
@@ -5,6 +5,7 @@
 namespace App\Controller\Domain;
 
 use App\Controller\AbstractController;
+use App\Entity\User;
 use App\PageView\EntryPageView;
 use App\Repository\ContentRepository;
 use App\Repository\DomainRepository;
@@ -42,6 +43,12 @@ public function __invoke(
             ->setDomain($name);
         $resolvedSort = $criteria->resolveSort($sortBy);
         $criteria->sortOption = $resolvedSort;
+
+        $user = $security->getUser();
+        if ($user instanceof User) {
+            $criteria->fetchCachedItems($this->contentRepository, $user);
+        }
+
         $listing = $this->contentRepository->findByCriteria($criteria);
 
         if ($request->isXmlHttpRequest()) {
diff --git a/src/Controller/Entry/EntryFrontController.php b/src/Controller/Entry/EntryFrontController.php
@@ -54,6 +54,10 @@ public function front(
 
         $this->setUserPreferences($user, $criteria);
 
+        if (null !== $user) {
+            $criteria->fetchCachedItems($this->contentRepository, $user);
+        }
+
         $entities = $this->contentRepository->findByCriteria($criteria);
         $templatePath = 'content/';
         $dataKey = 'results';
@@ -119,6 +123,9 @@ public function magazine(
         $this->handleSubscription($subscription, $criteria);
 
         $this->setUserPreferences($user, $criteria);
+        if (null !== $user) {
+            $criteria->fetchCachedItems($this->contentRepository, $user);
+        }
 
         return $this->renderResponse(
             $request,
diff --git a/src/EventSubscriber/ActivityPub/MagazineFollowSubscriber.php b/src/EventSubscriber/ActivityPub/MagazineFollowSubscriber.php
@@ -6,14 +6,17 @@
 
 use App\Event\Magazine\MagazineSubscribedEvent;
 use App\Message\ActivityPub\Outbox\FollowMessage;
+use App\Repository\ContentRepository;
 use JetBrains\PhpStorm\ArrayShape;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 use Symfony\Component\Messenger\MessageBusInterface;
 
 class MagazineFollowSubscriber implements EventSubscriberInterface
 {
-    public function __construct(private readonly MessageBusInterface $bus)
-    {
+    public function __construct(
+        private readonly MessageBusInterface $bus,
+        private readonly ContentRepository $contentRepository,
+    ) {
     }
 
     #[ArrayShape([MagazineSubscribedEvent::class => 'string'])]
@@ -26,6 +29,8 @@ public static function getSubscribedEvents(): array
 
     public function onMagazineFollow(MagazineSubscribedEvent $event): void
     {
+        $this->contentRepository->clearCachedUserSubscribedMagazines($event->user);
+
         if ($event->magazine->apId && !$event->user->apId) {
             $this->bus->dispatch(
                 new FollowMessage($event->user->getId(), $event->magazine->getId(), $event->unfollow, true)
diff --git a/src/EventSubscriber/ActivityPub/MagazineModeratorAddedRemovedSubscriber.php b/src/EventSubscriber/ActivityPub/MagazineModeratorAddedRemovedSubscriber.php
@@ -11,6 +11,7 @@
 use App\Event\Magazine\MagazineModeratorRemovedEvent;
 use App\Message\ActivityPub\Outbox\AddMessage;
 use App\Message\ActivityPub\Outbox\RemoveMessage;
+use App\Repository\ContentRepository;
 use Doctrine\ORM\EntityManagerInterface;
 use Psr\Cache\InvalidArgumentException;
 use Psr\Log\LoggerInterface;
@@ -25,11 +26,14 @@ public function __construct(
         private readonly CacheInterface $cache,
         private readonly LoggerInterface $logger,
         private readonly EntityManagerInterface $entityManager,
+        private readonly ContentRepository $contentRepository,
     ) {
     }
 
     public function onModeratorAdded(MagazineModeratorAddedEvent $event): void
     {
+        $this->contentRepository->clearCachedUserModeratedMagazines($event->user);
+
         // if the magazine is local then we have authority over it, otherwise the addedBy user has to be a local user
         if (!$event->magazine->apId or (null !== $event->addedBy and !$event->addedBy->apId)) {
             $this->bus->dispatch(new AddMessage($event->addedBy->getId(), $event->magazine->getId(), $event->user->getId()));
@@ -42,6 +46,8 @@ public function onModeratorAdded(MagazineModeratorAddedEvent $event): void
 
     public function onModeratorRemoved(MagazineModeratorRemovedEvent $event): void
     {
+        $this->contentRepository->clearCachedUserModeratedMagazines($event->user);
+
         // if the magazine is local then we have authority over it, otherwise the removedBy user has to be a local user
         if (!$event->magazine->apId or (null !== $event->removedBy and !$event->removedBy->apId)) {
             $this->bus->dispatch(new RemoveMessage($event->removedBy->getId(), $event->magazine->getId(), $event->user->getId()));
diff --git a/src/EventSubscriber/ActivityPub/UserFollowSubscriber.php b/src/EventSubscriber/ActivityPub/UserFollowSubscriber.php
@@ -6,6 +6,7 @@
 
 use App\Event\User\UserFollowEvent;
 use App\Message\ActivityPub\Outbox\FollowMessage;
+use App\Repository\ContentRepository;
 use JetBrains\PhpStorm\ArrayShape;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 use Symfony\Component\Messenger\MessageBusInterface;
@@ -16,6 +17,7 @@ class UserFollowSubscriber implements EventSubscriberInterface
     public function __construct(
         private readonly MessageBusInterface $bus,
         private readonly CacheInterface $cache,
+        private readonly ContentRepository $contentRepository,
     ) {
     }
 
@@ -29,6 +31,8 @@ public static function getSubscribedEvents(): array
 
     public function onUserFollow(UserFollowEvent $event): void
     {
+        $this->contentRepository->clearCachedUserFollows($event->follower);
+
         if (!$event->follower->apId && $event->following->apId) {
             $this->bus->dispatch(
                 new FollowMessage($event->follower->getId(), $event->following->getId(), $event->unfollow)
diff --git a/src/EventSubscriber/Domain/DomainBlockSubscriber.php b/src/EventSubscriber/Domain/DomainBlockSubscriber.php
@@ -0,0 +1,27 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\EventSubscriber\Domain;
+
+use App\Event\DomainBlockedEvent;
+use App\Repository\ContentRepository;
+use Symfony\Component\EventDispatcher\EventSubscriberInterface;
+
+class DomainBlockSubscriber implements EventSubscriberInterface
+{
+    public function __construct(
+        private readonly ContentRepository $contentRepository,
+    ) {
+    }
+
+    public static function getSubscribedEvents(): array
+    {
+        return [DomainBlockedEvent::class => 'handleDomainBlockedEvent'];
+    }
+
+    public function handleDomainBlockedEvent(DomainBlockedEvent $event): void
+    {
+        $this->contentRepository->clearCachedUserDomainBlocks($event->user);
+    }
+}
diff --git a/src/EventSubscriber/Domain/DomainFollowSubscriber.php b/src/EventSubscriber/Domain/DomainFollowSubscriber.php
@@ -0,0 +1,27 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\EventSubscriber\Domain;
+
+use App\Event\DomainSubscribedEvent;
+use App\Repository\ContentRepository;
+use Symfony\Component\EventDispatcher\EventSubscriberInterface;
+
+class DomainFollowSubscriber implements EventSubscriberInterface
+{
+    public function __construct(
+        private readonly ContentRepository $contentRepository,
+    ) {
+    }
+
+    public static function getSubscribedEvents(): array
+    {
+        return [DomainSubscribedEvent::class => 'handleDomainSubscribedEvent'];
+    }
+
+    public function handleDomainSubscribedEvent(DomainSubscribedEvent $event): void
+    {
+        $this->contentRepository->clearCachedUserSubscribedDomains($event->user);
+    }
+}
diff --git a/src/EventSubscriber/Magazine/MagazineBlockSubscriber.php b/src/EventSubscriber/Magazine/MagazineBlockSubscriber.php
@@ -0,0 +1,27 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\EventSubscriber\Magazine;
+
+use App\Event\Magazine\MagazineBlockedEvent;
+use App\Repository\ContentRepository;
+use Symfony\Component\EventDispatcher\EventSubscriberInterface;
+
+class MagazineBlockSubscriber implements EventSubscriberInterface
+{
+    public function __construct(
+        private readonly ContentRepository $contentRepository,
+    ) {
+    }
+
+    public static function getSubscribedEvents(): array
+    {
+        return [MagazineBlockedEvent::class => 'handleMagazineBlockedEvent'];
+    }
+
+    public function handleMagazineBlockedEvent(MagazineBlockedEvent $event): void
+    {
+        $this->contentRepository->clearCachedUserMagazineBlocks($event->user);
+    }
+}
diff --git a/src/EventSubscriber/User/UserBlockSubscriber.php b/src/EventSubscriber/User/UserBlockSubscriber.php
diff --git a/src/Pagination/NativeQueryAdapter.php b/src/Pagination/NativeQueryAdapter.php
diff --git a/src/Repository/ContentRepository.php b/src/Repository/ContentRepository.php
diff --git a/src/Repository/Criteria.php b/src/Repository/Criteria.php
diff --git a/src/Utils/SqlHelpers.php b/src/Utils/SqlHelpers.php
