fix: correct indices URLs for multihost (#190)

hugomods · Feb 1, 2024 · ec12c52 · ec12c52
1 parent bcc9ccb
commit ec12c52
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 10 deletions.
diff --git a/layouts/_default/index.searchindex.json b/layouts/_default/index.searchindex.json
@@ -1,2 +1 @@
-{{- $ctx := dict "Site" .Site }}
-{{- partialCached "search/index.json" $ctx $ctx -}}
+{{- partialCached "search/index.json" . -}}
diff --git a/layouts/partials/search/assets/js-resource.html b/layouts/partials/search/assets/js-resource.html
@@ -1,4 +1,5 @@
 {{- $defaultLang := .Sites.First.Language.Lang }}
+{{- $multihost := partialCached "search/functions/is-multihost" . }}
 {{- $langs := newScratch }}
 {{- range .Site.Languages }}
   {{- $langs.Set .Lang (dict "lang" .Lang "name" .LanguageName) }}
@@ -79,7 +80,7 @@
   {{- $site := . }}
   {{- with .Home.OutputFormats.Get "SearchIndex" }}
     {{- $hash := partialCached "search/functions/search-index-hash" $site $site }}
-    {{- $indexURL := printf "%s?v=%s" .RelPermalink $hash }}
+    {{- $indexURL := printf "%s?v=%s" (cond $multihost .Permalink .RelPermalink) $hash }}
     {{- $indices = $indices | append $indexURL }}
   {{- end }}
 {{- end }}

diff --git a/layouts/partials/search/functions/is-multihost.html b/layouts/partials/search/functions/is-multihost.html
@@ -0,0 +1,11 @@
+{{- $v := false -}}
+{{- $host := "" }}
+{{- range site.Sites -}}
+  {{- $url := urls.Parse .Home.Permalink -}}
+  {{- if and (ne $host "") (ne $url.Host "") (ne $host $url.Host) -}}
+    {{- $v = true -}}
+    {{- break -}}
+  {{- end -}}
+  {{- $host = $url.Host -}}
+{{- end -}}
+{{- return $v -}}
diff --git a/layouts/partials/search/functions/pages.html b/layouts/partials/search/functions/pages.html
@@ -1,4 +1,4 @@
-{{- $indexAllPages := default true .Site.Params.search.index_all_pages -}}
-{{- $pages := cond $indexAllPages .Site.Pages .Site.RegularPages -}}
+{{- $indexAllPages := default true site.Params.search.index_all_pages -}}
+{{- $pages := cond $indexAllPages site.Pages site.RegularPages -}}
 {{- $pages = where $pages "Params.noindex" "ne" true -}}
 {{- return $pages }}
diff --git a/layouts/partials/search/index.json.html b/layouts/partials/search/index.json.html
@@ -1,8 +1,8 @@
 {{- $items := slice -}}
-{{- $indexContent := default false .Site.Params.search.index_content -}}
+{{- $multihost := partialCached "search/functions/is-multihost" . }}
+{{- $indexContent := default false site.Params.search.index_content -}}
 {{- $years := true }}
-{{- $pagesCtx := dict "Site" .Site }}
-{{- $pages := partialCached "search/functions/pages" $pagesCtx .Site.Language.Lang -}}
+{{- $pages := partial "search/functions/pages" . -}}
 {{- range $pages -}}
   {{- $page := . -}}
   {{- $item := newScratch -}}
@@ -13,14 +13,14 @@
   {{- end }}
   {{- $item.Set "kind" .Kind -}}
   {{- $item.Set "lang" .Language.Lang -}}
-  {{- $item.Set "url" .RelPermalink -}}
+  {{- $item.Set "url" (cond $multihost .Permalink .RelPermalink) -}}
   {{- $item.Set "date" .Date.Unix -}}
   {{- if $years }}
     {{- $item.Set "year" (.Date.Format "2006") }}
   {{- end }}
   {{- $item.Set "headings" (partialCached "search/functions/parse-headings" . .) -}}
   {{/* Taxonomies */}}
-  {{- range $name, $taxonomy := $.Site.Taxonomies -}}
+  {{- range $name, $taxonomy := site.Taxonomies -}}
     {{- range $page.GetTerms $name -}}
       {{- $item.Add $name (slice .Title) }}
     {{- end -}}