From a45739c220c8ee4cf2440b930c5b44c04ffac9f0 Mon Sep 17 00:00:00 2001
From: tdro <tdro@noreply.example.com>
Date: Mon, 7 Nov 2022 00:19:46 -0500
Subject: themes/default/layouts/_default/index.json: Avoid invalid data with
 proper filter

Filter outside of the range to avoid index mismatch.
---
 themes/default/layouts/_default/index.json | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/themes/default/layouts/_default/index.json b/themes/default/layouts/_default/index.json
index 0c9c794..78c0fde 100644
--- a/themes/default/layouts/_default/index.json
+++ b/themes/default/layouts/_default/index.json
@@ -7,8 +7,10 @@
   "next_url": "{{ .URL }}",
   {{- end }}
   "items": [
-    {{- range $index, $data := .Paginator.Pages -}}
-    {{- if and (ne $data.Type "json") (not .ExpiryDate) (not .Params.unlisted) -}}
+    {{- $notExpired := where .Paginator.Pages "Params.expirydate" "eq" nil -}}
+    {{- $notUnlisted := where .Paginator.Pages "Params.unlisted" "eq" nil -}}
+    {{- $filteredPages := $notExpired | intersect $notUnlisted -}}
+    {{- range $index, $data := $filteredPages -}}
     {{- if and $index (gt $index 0) -}},{{- end }}
     {
       "id": "{{ md5 $data.Permalink }}",
@@ -37,7 +39,6 @@
       "content_text": {{ $data.Plain | jsonify }},
       "content_html": {{ partial "function-content.html" $data | jsonify }}
     }
-    {{- end -}}
-    {{ end }}
+    {{- end }}
   ]
 }
-- 
cgit v1.2.3