From 26381b498d09a26b0e7d4188e8e9295539b6f94d Mon Sep 17 00:00:00 2001
From: Dillon <dillonzq@outlook.com>
Date: Tue, 28 Apr 2020 12:53:06 +0800
Subject: [PATCH] feat(search): improve search index

---
 layouts/_default/summary.html       | 4 ++--
 layouts/index.json                  | 7 +++----
 layouts/partials/single/footer.html | 2 +-
 layouts/posts/single.html           | 2 +-
 4 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/layouts/_default/summary.html b/layouts/_default/summary.html
index f8db06e7..50ea8768 100644
--- a/layouts/_default/summary.html
+++ b/layouts/_default/summary.html
@@ -29,7 +29,7 @@
             {{ T "publish" }}&nbsp;<time datetime={{ $publish_date }}>{{ $publish_date }}</time>
         </span>
 
-        {{- with $params.categories -}}
+        {{- with .Params.categories -}}
             &nbsp;
             <span class="post-category">
                 {{- T "included" -}}
@@ -56,7 +56,7 @@
     {{- /* Footer */ -}}
     <div class="post-footer">
         <a href="{{ .RelPermalink }}">{{ T "readMore" }}</a>
-        {{- with $params.tags -}}
+        {{- with .Params.tags -}}
             <div class="post-tags">
                 <i class="fas fa-tags fa-fw"></i>&nbsp;
                 {{- range $index, $value := . -}}
diff --git a/layouts/index.json b/layouts/index.json
index bbddbd34..46ee7ef6 100644
--- a/layouts/index.json
+++ b/layouts/index.json
@@ -6,13 +6,12 @@
     {{- $pages = where $pages "Params.hiddenfromsearch" "!=" true -}}
 {{- end -}}
 {{- range $pages -}}
-    {{- $params := .Params | merge $.Site.Params.page -}}
-    {{- $one := dict "uri" .RelPermalink "title" .Title "description" (.Description | default "") -}}
-    {{- $tags := $params.tags | default slice -}}
+    {{- $one := dict "objectID" .RelPermalink "uri" .RelPermalink "title" .Title "description" (.Description | default "") -}}
+    {{- $tags := .Params.tags | default slice -}}
     {{- $one = delimit $tags "\n" | dict "tags" | merge $one -}}
     {{- $publish_date := .PublishDate.Format (.Site.Params.dateFormat | default "2006-01-02") -}}
     {{- $one = dict "date" $publish_date | merge $one -}}
-    {{- $content := dict "content" .Content "ruby" $params.ruby "fraction" $params.fraction "fontawesome" $params.fontawesome | partial "function/content.html" | plainify -}}
+    {{- $content := .RawContent -}}
     {{- if gt .Site.Params.search.contentLength 0 -}}
         {{- $content = substr $content 0 .Site.Params.search.contentLength -}}
     {{- end -}}
diff --git a/layouts/partials/single/footer.html b/layouts/partials/single/footer.html
index a57cd6b5..8e280186 100644
--- a/layouts/partials/single/footer.html
+++ b/layouts/partials/single/footer.html
@@ -46,7 +46,7 @@
 
     <div class="post-info-more">
         <section class="post-tags">
-            {{- with $params.tags -}}
+            {{- with .Params.tags -}}
                 <i class="fas fa-tags fa-fw"></i>&nbsp;
                 {{- range $index, $value := . -}}
                     {{- if gt $index 0 }},&nbsp;{{ end -}}
diff --git a/layouts/posts/single.html b/layouts/posts/single.html
index a1813839..85e02e11 100644
--- a/layouts/posts/single.html
+++ b/layouts/posts/single.html
@@ -30,7 +30,7 @@
                     {{- partial "plugin/link.html" $options -}}
                 </span>
 
-                {{- with $params.categories -}}
+                {{- with .Params.categories -}}
                     &nbsp;
                     <span class="post-category">
                         {{- T "included" -}}