From 800f6261bc1d0674d6e4c9e378c6f1ce48ff2d1a Mon Sep 17 00:00:00 2001 From: Rune Piper Date: Wed, 24 Apr 2024 12:49:54 +0200 Subject: [PATCH 1/3] fix: add missing event listener for indexing content --- Classes/EventListener/IndexContent.php | 36 ++++++++++++++++++++++++++ Configuration/Services.yaml | 4 +++ 2 files changed, 40 insertions(+) create mode 100644 Classes/EventListener/IndexContent.php diff --git a/Classes/EventListener/IndexContent.php b/Classes/EventListener/IndexContent.php new file mode 100644 index 0000000..2653e91 --- /dev/null +++ b/Classes/EventListener/IndexContent.php @@ -0,0 +1,36 @@ +isCachingEnabled() === false) { + return; + } + + $tsfe = $event->getController(); + + if ((int) $tsfe->page['no_search'] === 1 || (int) $tsfe->page['no_index'] === 1) { + return; + } + + $indexService = GeneralUtility::makeInstance(IndexService::class); + + if ($tsfe->content !== '') { + $indexService->add(Document::createFromTSFE($tsfe)); + } + + $indexService->checkForFiles($tsfe); + } +} \ No newline at end of file diff --git a/Configuration/Services.yaml b/Configuration/Services.yaml index 7a2a051..27df93a 100644 --- a/Configuration/Services.yaml +++ b/Configuration/Services.yaml @@ -6,3 +6,7 @@ services: VV\T3meilisearch\: resource: '../Classes/*' + + VV\T3meilisearch\EventListener\IndexContent: + tags: + - name: event.listener From 018113d9f8637afd034597a6777ba672e70abd55 Mon Sep 17 00:00:00 2001 From: Rune Piper Date: Wed, 24 Apr 2024 12:51:20 +0200 Subject: [PATCH 2/3] chore: use correct coding style --- Classes/EventListener/IndexContent.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Classes/EventListener/IndexContent.php b/Classes/EventListener/IndexContent.php index 2653e91..e6f3f6e 100644 --- a/Classes/EventListener/IndexContent.php +++ b/Classes/EventListener/IndexContent.php @@ -1,10 +1,9 @@ checkForFiles($tsfe); } -} \ No newline at end of file +} From baffef832d91d9ffc8cdf4ba44e49bb395531c08 Mon Sep 17 00:00:00 2001 From: Rune Piper Date: Wed, 24 Apr 2024 12:59:36 +0200 Subject: [PATCH 3/3] fix: use correct event --- Classes/EventListener/IndexContent.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Classes/EventListener/IndexContent.php b/Classes/EventListener/IndexContent.php index e6f3f6e..3626054 100644 --- a/Classes/EventListener/IndexContent.php +++ b/Classes/EventListener/IndexContent.php @@ -5,13 +5,13 @@ namespace VV\T3meilisearch\EventListener; use TYPO3\CMS\Core\Utility\GeneralUtility; -use TYPO3\CMS\Frontend\Event\AfterCachedPageIsPersistedEvent; +use TYPO3\CMS\Frontend\Event\AfterCacheableContentIsGeneratedEvent; use VV\T3meilisearch\Domain\Model\Document; use VV\T3meilisearch\Service\IndexService; class IndexContent { - public function __invoke(AfterCachedPageIsPersistedEvent $event): void + public function __invoke(AfterCacheableContentIsGeneratedEvent $event): void { // Only do this when caching is enabled if ($event->isCachingEnabled() === false) {