From ab736ce1d70ff14dd3095029f8ff7c7908e4c255 Mon Sep 17 00:00:00 2001
From: nineya <361654768@qq.com>
Date: Fri, 29 Dec 2023 17:20:34 +0800
Subject: [PATCH] =?UTF-8?q?fix(thumbnail):=20=E5=BD=92=E6=A1=A3=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E6=B7=BB=E5=8A=A0=E9=BB=98=E8=AE=A4=E5=B0=81=E9=9D=A2?=
 =?UTF-8?q?=E5=9B=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 templates/archives.html          | 7 ++++---
 templates/main/article.html      | 2 +-
 templates/main/article_list.html | 4 ++--
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/templates/archives.html b/templates/archives.html
index 82f4e13..00e0f31 100644
--- a/templates/archives.html
+++ b/templates/archives.html
@@ -12,9 +12,10 @@
         <div class="timeline-title" th:text="${archive.year}"></div>
         <div class="timeline">
           <th:block th:each="months : ${archive.months}">
-            <article th:each="post : ${months.posts}" class="media">
-              <a th:if="${!#strings.isEmpty(post.spec.cover)}" th:href="${post.status.permalink}" class="media-left">
-                <img class="not-gallery" th:src="${post.spec.cover}" th:alt="${post.spec.title}">
+            <article th:each="post : ${months.posts}" class="media"
+                     th:with="thumbnail = ${#strings.isEmpty(post.spec.cover) ? #strings.isEmpty(theme.config.post.default_thumbnail) ? '' : theme.config.post.default_thumbnail + (#strings.contains(theme.config.post.default_thumbnail, '?') ? '&' : '?') + 'id=' + post.metadata.name : post.spec.cover}">
+              <a th:if="${!#strings.isEmpty(thumbnail)}" th:href="${post.status.permalink}" class="media-left">
+                <img class="not-gallery" th:src="${thumbnail}" th:alt="${post.spec.title}">
               </a>
               <div class="media-content">
                 <time th:text="${#dates.format(post.spec.publishTime, 'yyyy-MM-dd')}"></time>
diff --git a/templates/main/article.html b/templates/main/article.html
index f62b903..a4fadf6 100644
--- a/templates/main/article.html
+++ b/templates/main/article.html
@@ -1,7 +1,7 @@
 <th:block xmlns:th="https://www.thymeleaf.org"
      th:fragment="article (post, type)"
      th:with="updateInterval = ${T(java.lang.Math).floor((#dates.createNow().getTime()/1000.0 - post.status.lastModifyTime.getEpochSecond())/86400.0).intValue()},
-     thumbnail = ${#strings.isEmpty(post.spec.cover) ? #strings.isEmpty(theme.config.post.default_thumbnail) ? '' : theme.config.post.default_thumbnail : post.spec.cover}">
+     thumbnail = ${#strings.isEmpty(post.spec.cover) ? #strings.isEmpty(theme.config.post.default_thumbnail) ? '' : theme.config.post.default_thumbnail + (#strings.contains(theme.config.post.default_thumbnail, '?') ? '&' : '?') + 'id=' + post.metadata.name : post.spec.cover}">
 
     <div th:if="${!#strings.isEmpty(thumbnail)}" class="card widget">
         <div class="cover-image" th:style="'background-image: url(' + ${thumbnail} + ')'">
diff --git a/templates/main/article_list.html b/templates/main/article_list.html
index 564610c..ce22777 100644
--- a/templates/main/article_list.html
+++ b/templates/main/article_list.html
@@ -1,7 +1,7 @@
 <th:block xmlns:th="https://www.thymeleaf.org"
           th:fragment="articleList (posts)">
   <th:block th:each="post : ${posts}"
-            th:with="thumbnail = ${#strings.isEmpty(post.spec.cover) ? #strings.isEmpty(theme.config.post.default_thumbnail) ? '' : theme.config.post.default_thumbnail + '?id=' + postStat.index : post.spec.cover},
+            th:with="thumbnail = ${#strings.isEmpty(post.spec.cover) ? #strings.isEmpty(theme.config.post.default_thumbnail) ? '' : theme.config.post.default_thumbnail + (#strings.contains(theme.config.post.default_thumbnail, '?') ? '&' : '?') + 'id=' + post.metadata.name : post.spec.cover},
             thumbnail_mode = ${(theme.config.post.top_thumbnail_mode == 'grid' || (!post.spec.pinned && theme.config.post.thumbnail_mode == 'grid'))? 'grid' : !#strings.isEmpty(post.metadata.annotations.get('thumbnail_mode'))? post.metadata.annotations.get('thumbnail_mode') : post.spec.pinned ? theme.config.post.top_thumbnail_mode : theme.config.post.thumbnail_mode}">
     <div th:if="${!#strings.isEmpty(thumbnail) && thumbnail_mode == 'back'}" class="card widget card-cover">
       <a th:href="${post.status.permalink}">
@@ -133,7 +133,7 @@
   <div th:if="${theme.config.post.top_thumbnail_mode == 'grid' || theme.config.post.thumbnail_mode == 'grid'}"
        class="column-main-grid">
     <th:block th:each="post : ${posts}"
-              th:with="thumbnail = ${#strings.isEmpty(post.spec.cover) ? #strings.isEmpty(theme.config.post.default_thumbnail) ? '' : theme.config.post.default_thumbnail + '?id=' + postStat.index : post.spec.cover}">
+              th:with="thumbnail = ${#strings.isEmpty(post.spec.cover) ? #strings.isEmpty(theme.config.post.default_thumbnail) ? '' : theme.config.post.default_thumbnail + (#strings.contains(theme.config.post.default_thumbnail, '?') ? '&' : '?') + 'id=' + post.metadata.name : post.spec.cover}">
       <div
         th:if="${(theme.config.post.top_thumbnail_mode == 'grid' || (!post.spec.pinned && theme.config.post.thumbnail_mode == 'grid'))}"
         class="card widget">