From b7c0044f64577ec405a33d4ab7e8a43faa46c823 Mon Sep 17 00:00:00 2001
From: "1152958806@qq.com" <1152958806@qq.com>
Date: Mon, 28 Aug 2023 01:43:06 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=AF=84=E8=AE=BA500?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 templates/assets/js/utils.js                  | 2 +-
 templates/modules/widgets/aside/comments.html | 2 +-
 templates/modules/widgets/console.html        | 2 +-
 templates/photos.html                         | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/templates/assets/js/utils.js b/templates/assets/js/utils.js
index 89d0ae52..2bbb75c6 100644
--- a/templates/assets/js/utils.js
+++ b/templates/assets/js/utils.js
@@ -235,7 +235,7 @@ var btf = {
                 })
             }
         ))
-        document.querySelectorAll('#article-container .timeline')[0]?.classList.remove("loadings");
+        document.querySelectorAll('#article-container .loadings')[0]?.classList.remove("loadings");
     },
 
     diffDate: (d, more = false) => {
diff --git a/templates/modules/widgets/aside/comments.html b/templates/modules/widgets/aside/comments.html
index 9a78d2b8..693afeff 100644
--- a/templates/modules/widgets/aside/comments.html
+++ b/templates/modules/widgets/aside/comments.html
@@ -7,7 +7,7 @@
         <th:block th:if="${#strings.equals(theme.config.comments.use, 'commentWidget') }">
             <div class="aside-list-item" th:each="comment,iterStat : ${commentFinder.list(null, 1, 20)}"
                  th:with="page = ${comment.spec.subjectRef.kind == 'Post' ? postFinder.getByName(comment.spec.subjectRef.name) :
-                 comment.spec.subjectRef.kind == 'SinglePage' ? singlePageFinder.getByName(comment.spec.subjectRef.name) : null},
+                 comment.spec.subjectRef.kind == 'SinglePage' && not #strings.contains('photos,links,moments', comment.spec.subjectRef.name) ? singlePageFinder.getByName(comment.spec.subjectRef.name) : null},
                  url = ${page == null? '/' : page.status.permalink + '#comment-' + comment.metadata.name}"
                  th:if="${iterStat.index  < theme.config.sidebar.newcommentnumber}">
                 <span th:text="${commentIndex}"></span>
diff --git a/templates/modules/widgets/console.html b/templates/modules/widgets/console.html
index ff523ad9..e633cfa5 100644
--- a/templates/modules/widgets/console.html
+++ b/templates/modules/widgets/console.html
@@ -19,7 +19,7 @@
             <!-- BUG：由于当前的列出所有评论API无过滤功能，非文章页的评论无法查询到页面信息，所以非文章评论跳转至首页-->
             <div class="aside-list-item" th:each="comment,iterStat : ${commentFinder.list(null, 1, 20)}"
                  th:with="page = ${comment.spec.subjectRef.kind == 'Post' ? postFinder.getByName(comment.spec.subjectRef.name) :
-                  comment.spec.subjectRef.kind == 'SinglePage' ? singlePageFinder.getByName(comment.spec.subjectRef.name) : null},
+                  comment.spec.subjectRef.kind == 'SinglePage' && not #strings.contains('photos,links,moments', comment.spec.subjectRef.name) ? singlePageFinder.getByName(comment.spec.subjectRef.name) : null},
                   url = ${page == null? '/' : page.status.permalink + '#comment-' + comment.metadata.name}"
                  th:if="${iterStat.index  < 6}" >
               <a th:href="${url}" class="thumbnail"  data-pjax-state="">
diff --git a/templates/photos.html b/templates/photos.html
index 6ec981c6..96bdb967 100644
--- a/templates/photos.html
+++ b/templates/photos.html
@@ -192,7 +192,7 @@
                 <!--/* 评论组件 */-->
                 <th:block th:replace="~{modules/comment :: comment(group = 'content.halo.run',
                   kind = 'SinglePage',
-                  name = 'moments',
+                  name = 'photos',
                   allowComment = true)}" />
             </div>