From 2b888254a126985a4abfefd19fb0e02cbc05b977 Mon Sep 17 00:00:00 2001
From: "1152958806@qq.com" <1152958806@qq.com>
Date: Sat, 15 Jul 2023 01:36:24 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=84=E8=AE=BA=E4=BB=A3=E7=A0=81=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 templates/comments.html        | 20 ++++----------------
 templates/links.html           | 19 +++++--------------
 templates/modules/comment.html | 21 +++++++++++++++++++++
 templates/moments.html         | 20 ++++----------------
 templates/page.html            | 21 +++++----------------
 templates/page_links.html      | 19 +++++--------------
 templates/post.html            | 19 ++++---------------
 7 files changed, 48 insertions(+), 91 deletions(-)
 create mode 100644 templates/modules/comment.html

diff --git a/templates/comments.html b/templates/comments.html
index 5798a61f..95cdf14f 100644
--- a/templates/comments.html
+++ b/templates/comments.html
@@ -136,23 +136,11 @@
                     </div>
                 </div>
                 <hr>
-                <!-- 评论模块 -->
+                <!--/* 评论组件 */-->
                 <th:block
-                        th:if="${theme.config.comments.twikooEnable && #strings.equals(theme.config.comments.use, 'Twikoo') && not #strings.isEmpty(theme.config.comments.twikoos.envId)}">
-                    <div th:replace="~{modules/twikoo :: twikoo}"></div>
-                </th:block>
-                <div id="post-comment"
-                     th:if="${pluginFinder.available('PluginCommentWidget') && #strings.equals(theme.config.comments.use, 'commentWidget')}">
-                    <div class="comment-head">
-                        <div class="comment-headline"><i class="iconfont icon-comment-alt"></i> <span>评论</span></div>
-                        <div class="comment-privacy"><a href="/privacy">隐私政策</a></div>
-                        <div class="comment-tips" id="comment-tips">
-                            <span>你无需删除空行，直接评论以获取最佳展示效果</span>
-                        </div>
-                    </div>
-                    <halo:comment group="content.halo.run" kind="SinglePage"
-                                  th:attr="name=${singlePage.metadata.name}" colorScheme="document.documentElement.getAttribute('data-theme')" />
-                </div>
+                        th:replace="~{modules/comment :: comment(group = 'content.halo.run',
+                  kind = 'SinglePage',
+                  name = ${singlePage.metadata.name})}"/>
 
             </div>
 
diff --git a/templates/links.html b/templates/links.html
index ef12f4c4..787b4657 100644
--- a/templates/links.html
+++ b/templates/links.html
@@ -14,20 +14,11 @@
                 <th:block th:replace="~{macro/content-links :: content-links(${htmlType})}" />
 
                 <hr/>
-                <!-- 评论模块 -->
-                <th:block  th:if="${theme.config.comments.twikooEnable && #strings.equals(theme.config.comments.use, 'Twikoo') && not #strings.isEmpty(theme.config.comments.twikoos.envId)}">
-                    <div th:replace="~{modules/twikoo :: twikoo}"></div>
-                </th:block>
-                <div id="post-comment" th:if="${pluginFinder.available('PluginCommentWidget') && #strings.equals(theme.config.comments.use, 'commentWidget')}">
-                    <div class="comment-head">
-                        <div class="comment-headline"><i class="iconfont icon-comment-alt"></i> <span>评论</span></div>
-                        <div class="comment-privacy"><a href="/privacy">隐私政策</a></div>
-                        <div class="comment-tips" id="comment-tips">
-                            <span>你无需删除空行，直接评论以获取最佳展示效果</span>
-                        </div>
-                    </div>
-                    <halo:comment group="content.halo.run" kind="SinglePage" th:attr="name='links'" colorScheme="document.documentElement.getAttribute('data-theme')" />
-                </div>
+                <!--/* 评论组件 */-->
+                <th:block
+                        th:replace="~{modules/comment :: comment(group = 'content.halo.run',
+                  kind = 'SinglePage',
+                  name = 'links')}"/>
 
             </div>
         </main>
diff --git a/templates/modules/comment.html b/templates/modules/comment.html
new file mode 100644
index 00000000..b759450f
--- /dev/null
+++ b/templates/modules/comment.html
@@ -0,0 +1,21 @@
+<!DOCTYPE html>
+<html lang="en" xmlns:th="http://www.thymeleaf.org">
+<th:block th:fragment="comment(group, kind, name)">
+    <th:block
+            th:if="${theme.config.comments.twikooEnable && #strings.equals(theme.config.comments.use, 'Twikoo') && not #strings.isEmpty(theme.config.comments.twikoos.envId)}">
+        <div th:replace="~{modules/twikoo :: twikoo}"></div>
+    </th:block>
+    <!-- 已知问题 PJAX 下，comment 首次请求会出错。当前的临时解决办法是使用 js 重试 -->
+    <div id="post-comment"
+         th:if="${pluginFinder.available('PluginCommentWidget') && #strings.equals(theme.config.comments.use, 'commentWidget')}">
+        <div class="comment-head">
+            <div class="comment-headline"><i class="iconfont icon-comment-alt"></i> <span>评论</span></div>
+            <div class="comment-privacy"><a href="/privacy">隐私政策</a></div>
+            <div class="comment-tips" id="comment-tips">
+                <span>你无需删除空行，直接评论以获取最佳展示效果</span>
+            </div>
+        </div>
+        <halo:comment th:attr="name=${name},kind=${kind},group=${group}" colorScheme="document.documentElement.getAttribute('data-theme')"/>
+    </div>
+</th:block>
+</html>
\ No newline at end of file
diff --git a/templates/moments.html b/templates/moments.html
index 613dd0bd..95e36461 100644
--- a/templates/moments.html
+++ b/templates/moments.html
@@ -70,23 +70,11 @@
                 </div>
                 <script>heo.reflashEssayWaterFall();</script>
                 <hr/>
-                <!-- 评论模块 -->
+                <!--/* 评论组件 */-->
                 <th:block
-                        th:if="${theme.config.comments.twikooEnable && #strings.equals(theme.config.comments.use, 'Twikoo') && not #strings.isEmpty(theme.config.comments.twikoos.envId)}">
-                    <div th:replace="~{modules/twikoo :: twikoo}"></div>
-                </th:block>
-                <div id="post-comment"
-                     th:if="${pluginFinder.available('PluginCommentWidget') && #strings.equals(theme.config.comments.use, 'commentWidget')}">
-                    <div class="comment-head">
-                        <div class="comment-headline"><i class="iconfont icon-comment-alt"></i> <span>评论</span></div>
-                        <div class="comment-privacy"><a href="/privacy">隐私政策</a></div>
-                        <div class="comment-tips" id="comment-tips">
-                            <span>你无需删除空行，直接评论以获取最佳展示效果</span>
-                        </div>
-                    </div>
-                    <halo:comment group="content.halo.run" kind="SinglePage" th:attr="name='moments'"
-                                  colorScheme="document.documentElement.getAttribute('data-theme')"/>
-                </div>
+                        th:replace="~{modules/comment :: comment(group = 'content.halo.run',
+                  kind = 'SinglePage',
+                  name = 'moments')}"/>
 
             </div>
 
diff --git a/templates/page.html b/templates/page.html
index 308aa13f..0c75e149 100644
--- a/templates/page.html
+++ b/templates/page.html
@@ -13,23 +13,12 @@
             <div id="page">
                 <div id="article-container" th:utext="${singlePage.content.content}"></div>
                 <hr>
-                <!-- 评论模块 -->
+                <!--/* 评论组件 */-->
                 <th:block
-                        th:if="${singlePage.spec.allowComment && theme.config.comments.twikooEnable && #strings.equals(theme.config.comments.use, 'Twikoo') && not #strings.isEmpty(theme.config.comments.twikoos.envId)}">
-                    <div th:replace="~{modules/twikoo :: twikoo}"></div>
-                </th:block>
-                <div id="post-comment"
-                     th:if="${singlePage.spec.allowComment && pluginFinder.available('PluginCommentWidget') && #strings.equals(theme.config.comments.use, 'commentWidget')}">
-                    <div class="comment-head">
-                        <div class="comment-headline"><i class="iconfont icon-comment-alt"></i> <span>评论</span></div>
-                        <div class="comment-privacy"><a href="/privacy">隐私政策</a></div>
-                        <div class="comment-tips" id="comment-tips">
-                            <span>你无需删除空行，直接评论以获取最佳展示效果</span>
-                        </div>
-                    </div>
-                    <halo:comment group="content.halo.run" kind="SinglePage"
-                                  th:attr="name=${singlePage.metadata.name}" colorScheme="document.documentElement.getAttribute('data-theme')" />
-                </div>
+                        th:replace="~{modules/comment :: comment(group = 'content.halo.run',
+                  kind = 'SinglePage',
+                  name = ${singlePage.metadata.name})}"/>
+
             </div>
 
             <!-- 侧栏 -->
diff --git a/templates/page_links.html b/templates/page_links.html
index 2663d758..61433945 100644
--- a/templates/page_links.html
+++ b/templates/page_links.html
@@ -16,20 +16,11 @@
 
 
                 <hr/>
-                <!-- 评论模块 -->
-                <th:block  th:if="${theme.config.comments.twikooEnable && #strings.equals(theme.config.comments.use, 'Twikoo') && not #strings.isEmpty(theme.config.comments.twikoos.envId)}">
-                    <div th:replace="~{modules/twikoo :: twikoo}"></div>
-                </th:block>
-                <div id="post-comment" th:if="${pluginFinder.available('PluginCommentWidget') && #strings.equals(theme.config.comments.use, 'commentWidget')}">
-                    <div class="comment-head">
-                        <div class="comment-headline"><i class="iconfont icon-comment-alt"></i> <span>评论</span></div>
-                        <div class="comment-privacy"><a href="/privacy">隐私政策</a></div>
-                        <div class="comment-tips" id="comment-tips">
-                            <span>你无需删除空行，直接评论以获取最佳展示效果</span>
-                        </div>
-                    </div>
-                    <halo:comment group="content.halo.run" kind="SinglePage" th:attr="name=${singlePage.metadata.name}" colorScheme="document.documentElement.getAttribute('data-theme')" />
-                </div>
+                <!--/* 评论组件 */-->
+                <th:block
+                        th:replace="~{modules/comment :: comment(group = 'content.halo.run',
+                  kind = 'SinglePage',
+                  name = ${singlePage.metadata.name})}"/>
 
             </div>
         </main>
diff --git a/templates/post.html b/templates/post.html
index 94a74f65..63238fd5 100644
--- a/templates/post.html
+++ b/templates/post.html
@@ -272,22 +272,11 @@
                     </div>
                 </div>
                 <hr>
-                <!-- 评论模块 -->
+                <!--/* 评论组件 */-->
                 <th:block
-                        th:if="${post.spec.allowComment && theme.config.comments.twikooEnable && #strings.equals(theme.config.comments.use, 'Twikoo') && not #strings.isEmpty(theme.config.comments.twikoos.envId)}">
-                    <div th:replace="~{modules/twikoo :: twikoo}"></div>
-                </th:block>
-                <div id="post-comment"
-                     th:if="${post.spec.allowComment && pluginFinder.available('PluginCommentWidget') && #strings.equals(theme.config.comments.use, 'commentWidget')}">
-                    <div class="comment-head">
-                        <div class="comment-headline"><i class="iconfont icon-comment-alt"></i> <span>评论</span></div>
-                        <div class="comment-privacy"><a href="/privacy">隐私政策</a></div>
-                        <div class="comment-tips" id="comment-tips">
-                            <span>你无需删除空行，直接评论以获取最佳展示效果</span>
-                        </div>
-                    </div>
-                    <halo:comment group="content.halo.run" kind="Post" th:attr="name=${post.metadata.name}" colorScheme="document.documentElement.getAttribute('data-theme')" />
-                </div>
+                        th:replace="~{modules/comment :: comment(group = 'content.halo.run',
+                  kind = 'Post',
+                  name = ${post.metadata.name})}"/>
 
             </div>