From de5fd0c3f727c51012a2ad06c56f8828db39be3f Mon Sep 17 00:00:00 2001
From: Cell <1024@lruihao.cn>
Date: Sat, 30 Dec 2023 23:18:15 +0800
Subject: [PATCH] :truck: Feat: migarte params.cacheRemoteImages to
 params.page.cacheRemoteImages (#362)

---
 docs                                       |  2 +-
 hugo.toml                                  | 20 +++++++++-----------
 layouts/_default/_markup/render-image.html |  4 ++--
 layouts/friends/single.html                |  2 +-
 layouts/page/friends.html                  |  2 +-
 layouts/partials/plugin/image.html         |  3 ++-
 layouts/shortcodes/image.html              |  2 +-
 7 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/docs b/docs
index ec2bbf0e..fda1a078 160000
--- a/docs
+++ b/docs
@@ -1 +1 @@
-Subproject commit ec2bbf0e755d0d23dd0bde97286bc455f83d8a5a
+Subproject commit fda1a078d3e15d3193f7a35acebfab5aaf9e54ca
diff --git a/hugo.toml b/hugo.toml
index 1e7f789b..8bf98e11 100644
--- a/hugo.toml
+++ b/hugo.toml
@@ -717,6 +717,15 @@ enableEmoji = true
       scale = true
       # whether to add FullscreenControl
       fullscreen = true
+    # FixIt 0.3.0 | NEW [Experimental] cache remote images locally, see: https://github.com/hugo-fixit/FixIt/pull/362
+    [params.page.cacheRemoteImages]
+      enable = false
+      # replace remote image url with local image url (place in public/images/remote/)
+      replace = false
+    # FixIt 0.3.0 | NEW Related content config (https://gohugo.io/content-management/related/)
+    [params.page.related]
+      enable = false
+      count = 5
     # FixIt 0.2.17 | NEW Donate (Sponsor) settings
     [params.page.reward]
       enable = false
@@ -916,11 +925,6 @@ enableEmoji = true
         name = ""
         logoUrl = ""
 
-    # FixIt 0.3.0 | NEW Related content config (https://gohugo.io/content-management/related/)
-    [params.page.related]
-      enable = false
-      count = 5
-
   # TypeIt config
   [params.typeit]
     # typing speed between each step (measured in milliseconds)
@@ -1073,12 +1077,6 @@ enableEmoji = true
     # "corner-indicator", "fill-left", "flash", "flat-top", "loading-bar", "mac-osx", "material", "minimal"]
     theme = "minimal"
   
-  # FixIt 0.3.0 | NEW [Experimental] cache remote images locally, see: https://github.com/hugo-fixit/FixIt/pull/362
-  [params.cacheRemoteImages]
-    enable = false
-    # replace remote image url with local image url
-    replace = false
-  
   # FixIt 0.2.17 | NEW Define custom file paths
   # Create your custom files in site directory `layouts/partials/custom` and uncomment needed files below
   [params.customFilePath]
diff --git a/layouts/_default/_markup/render-image.html b/layouts/_default/_markup/render-image.html
index 2aa4d0a9..68cc9f92 100644
--- a/layouts/_default/_markup/render-image.html
+++ b/layouts/_default/_markup/render-image.html
@@ -1,11 +1,11 @@
 {{- if .Title | and .Text -}}
   <figure>
-    {{- dict "Src" .Destination "Alt" .Text "Caption" .Text "Title" .Title "Linked" true "Resources" .Page.Resources "Params" .Page.Params "Responsive" true | partial "plugin/image.html" -}}
+    {{- dict "Src" .Destination "Alt" .Text "Caption" .Text "Title" .Title "Linked" true "Resources" .Page.Resources "Responsive" true | partial "plugin/image.html" -}}
     <figcaption class="image-caption">
       {{- .Text | safeHTML -}}
     </figcaption>
   </figure>
 {{- else -}}
   {{- $linked := (eq (.Page.Scratch.Get "params").lightgallery "force") | or (ne .Title "") -}}
-  {{- dict "Src" .Destination "Alt" .Text "Title" .Title "Linked" $linked "Resources" .Page.Resources "Params" .Page.Params "Responsive" true | partial "plugin/image.html" -}}
+  {{- dict "Src" .Destination "Alt" .Text "Title" .Title "Linked" $linked "Resources" .Page.Resources "Responsive" true | partial "plugin/image.html" -}}
 {{- end -}}
diff --git a/layouts/friends/single.html b/layouts/friends/single.html
index 4ce85a20..dcd80dc7 100644
--- a/layouts/friends/single.html
+++ b/layouts/friends/single.html
@@ -22,7 +22,7 @@
       {{ range $index, $friend := .Site.Data.friends }}
         <a class="friend-link" title="{{ $friend.description }}" href="{{ $friend.url | safeURL }}" rel="external noopener noreferrer" target="_blank">
           {{ if $friend.avatar }}
-            {{- dict "Src" $friend.avatar "Alt" $friend.nickname "Class" "friend-avatar" "Resources" $.Resources "Params" $.Params | partial "plugin/image.html" -}}
+            {{- dict "Src" $friend.avatar "Alt" $friend.nickname "Class" "friend-avatar" "Resources" $.Resources | partial "plugin/image.html" -}}
           {{ else }}
             <svg class="friend-avatar" aria-hidden="true">
               <use xlink:href="#icon-{{ add 1 $index }}"></use>
diff --git a/layouts/page/friends.html b/layouts/page/friends.html
index 6a8300db..bb12bbc3 100644
--- a/layouts/page/friends.html
+++ b/layouts/page/friends.html
@@ -19,7 +19,7 @@
       {{ range $index, $friend := .Site.Data.friends }}
         <a class="friend-link" title="{{ $friend.description }}" href="{{ $friend.url | safeURL }}" rel="external noopener noreferrer" target="_blank">
           {{ if $friend.avatar }}
-            {{- dict "Src" $friend.avatar "Alt" $friend.nickname "Class" "friend-avatar" "Resources" $.Resources "Params" $.Params | partial "plugin/image.html" -}}
+            {{- dict "Src" $friend.avatar "Alt" $friend.nickname "Class" "friend-avatar" "Resources" $.Resources | partial "plugin/image.html" -}}
           {{ else }}
             <svg class="friend-avatar" aria-hidden="true">
               <use xlink:href="#icon-{{ add 1 $index }}"></use>
diff --git a/layouts/partials/plugin/image.html b/layouts/partials/plugin/image.html
index dcbb568b..bbde8a54 100644
--- a/layouts/partials/plugin/image.html
+++ b/layouts/partials/plugin/image.html
@@ -1,9 +1,10 @@
+{{- $params := page.Scratch.Get "params" -}}
 {{- $class := .Class | default "" -}}
 {{- $style := "" -}}
 {{- $loading := .Loading | default "lazy" -}}
 {{- $onload := "" -}}
 {{- $onerror := "" -}}
-{{- $cacheRemoteImages := (.Params.cacheRemoteImages | default dict) | merge site.Params.cacheRemoteImages -}}
+{{- $cacheRemoteImages := $params.cacheRemoteImages -}}
 {{- $suffixList := slice ".jpeg" ".jpg" ".png" ".gif" ".bmp" ".tif" ".tiff" ".webp" -}}
 
 {{- /* handle for default size image */ -}}
diff --git a/layouts/shortcodes/image.html b/layouts/shortcodes/image.html
index 01489ac9..ea2f01f0 100644
--- a/layouts/shortcodes/image.html
+++ b/layouts/shortcodes/image.html
@@ -16,7 +16,7 @@
   {{- $options = cond $caption true false | dict "Linked" | merge $options -}}
 {{- end -}}
 
-{{- $options = dict "Resources" .Page.Resources "Params" .Page.Params "Responsive" true | merge $options -}}
+{{- $options = dict "Resources" .Page.Resources "Responsive" true | merge $options -}}
 
 {{- with $caption -}}
   <figure{{ with cond $.IsNamedParams ($.Get "class") "" }} class="{{ . }}"{{ end }}>