fix: use correct Algolia index for multi-lang setups

johannschopplich · Mar 15, 2024 · 7d49f5d · 7d49f5d
1 parent 7605550
commit 7d49f5d
Show file tree

Hide file tree

Showing 3 changed files with 58 additions and 66 deletions.
diff --git a/AlgoliaDocSearch.php b/AlgoliaDocSearch.php
@@ -114,7 +114,7 @@ public static function instance(): self
      */
     public function getAlgoliaIndex(string|null $languageCode = null): \Algolia\AlgoliaSearch\SearchIndex
     {
-        $indexName = $this->options['index'] . (!empty($languageCode) ? "-{$languageCode}" : '');
+        $indexName = $this->options['index'] . (!empty($languageCode) ? '-' . $languageCode : '');
         return $this->algolia->initIndex($indexName);
     }
 

diff --git a/composer.lock b/composer.lock
diff --git a/extensions/hooks.php b/extensions/hooks.php
@@ -6,19 +6,6 @@
 use Kirby\Exception\Exception;
 
 return [
-    'page.changeSlug:before' => function (Page $page, string $slug, string|null $languageCode = null) {
-        /** @var \Kirby\Cms\App $this */
-        if (
-            $this->option('johannschopplich.algolia-docsearch.hooks', false) !== true ||
-            $this->option('debug')
-        ) {
-            return;
-        }
-
-        $docSearch = DocSearch::instance();
-        $index = $docSearch->getAlgoliaIndex();
-        $index->deleteObject($page->uri($languageCode));
-    },
     'page.delete:after' => function (bool $status, Page $page) {
         /** @var \Kirby\Cms\App $this */
         if (
@@ -28,11 +15,12 @@
             return;
         }
 
+        $languageCode = $this->languageCode();
         $docSearch = DocSearch::instance();
-        $index = $docSearch->getAlgoliaIndex();
-        $index->deleteObject($page->uri($this->languageCode()));
+        $index = $docSearch->getAlgoliaIndex($languageCode);
+        $index->deleteObject($page->uri($languageCode));
     },
-    'page.*:after' => function (Event $event, Page|null $newPage) {
+    'page.*:after' => function (Event $event, Page|null $newPage, Page|null $oldPage) {
         /** @var \Kirby\Cms\App $this */
         if (
             $this->option('johannschopplich.algolia-docsearch.hooks', false) !== true ||
@@ -46,17 +34,20 @@
             return;
         }
 
-        if (!$newPage) {
+        if (!$newPage || !$oldPage) {
             return;
         }
 
         $languageCode = $this->languageCode();
         $docSearch = DocSearch::instance();
-        $index = $docSearch->getAlgoliaIndex();
+        $index = $docSearch->getAlgoliaIndex($languageCode);
         $allowedTemplates = $docSearch->options['templates'] ?? [];
 
+        if ($event->action() === 'changeSlug') {
+            $index->deleteObject($oldPage->uri($languageCode));
+        }
+
         if (
-            $event->action() === 'delete' ||
             ($event->action() === 'changeStatus' && !$newPage->isListed()) ||
             ($event->action() === 'changeTemplate' && !in_array($newPage->intendedTemplate()->name(), $allowedTemplates, true))
         ) {