From e07557becc93f960bbe4c99ab02df027b791bc5a Mon Sep 17 00:00:00 2001
From: j m <1406993111@qq.com>
Date: Wed, 25 Dec 2024 20:18:11 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E9=99=A4=20=E8=AF=84=E8=AE=BA?=
 =?UTF-8?q?=E5=8A=A0=E8=BD=BD=E6=96=B9=E5=BC=8F=20=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 settings.yaml               | 10 --------
 templates/links.html        | 46 ++++++++++---------------------------
 templates/main/article.html | 21 ++++-------------
 templates/moment.html       | 21 ++++-------------
 templates/moments.html      | 21 ++++-------------
 5 files changed, 27 insertions(+), 92 deletions(-)

diff --git a/settings.yaml b/settings.yaml
index fdc0001..50d386b 100644
--- a/settings.yaml
+++ b/settings.yaml
@@ -1350,16 +1350,6 @@ spec:
               label: 开启
             - value: false
               label: 关闭
-        - $formkit: radio
-          name: enable_comment_type
-          label: 评论加载方式
-          value: true
-          help: '在使用Halo评论组件时，建议您关闭Pjax加载功能以获得最佳体验。同时，Halo评论组件支持评论插件的新特性。而对于Web评论组件，它支持Pjax加载，但请注意，部分新特性可能不被Web评论组件所支持。'
-          options:
-            - value: true
-              label: Halo评论组件
-            - value: false
-              label: Web评论组件
         - $formkit: radio
           name: effects_lantern_mode
           id: effects_lantern_mode
diff --git a/templates/links.html b/templates/links.html
index 9986237..568df88 100644
--- a/templates/links.html
+++ b/templates/links.html
@@ -49,41 +49,19 @@
         </div>
         <div class="card card-content comment-wrapper-z-index" id="comment-wrapper" th:if="${enableComment}">
             <h3 class="comment-title">评论</h3>
-            <th:block th:unless="${theme.config.enhance.enable_comment_type}">
-                <th:block th:if="${theme.config.page_config.link_enable_comment == 'custom'}">
-                    <comment-widget
-                            group="content.halo.run"
-                            kind="SinglePage"
-                            version="v1alpha1"
-                            th:name="${theme.config.page_config.link_comment_id}"
-                            with-replies="false"
-                    ></comment-widget>
-                </th:block>
-                <th:block th:if="${theme.config.page_config.link_enable_comment != 'custom'}">
-                    <comment-widget
-                            group="plugin.halo.run"
-                            kind="Plugin"
-                            version="v1alpha1"
-                            th:name="${pluginName}"
-                            with-replies="false"
-                    ></comment-widget>
-                </th:block>
+            <th:block th:if="${theme.config.page_config.link_enable_comment == 'custom'}">
+                <halo:comment
+                        group="content.halo.run"
+                        kind="SinglePage"
+                        th:attr="name=${theme.config.page_config.link_comment_id}"
+                />
             </th:block>
-            <th:block th:if="${theme.config.enhance.enable_comment_type}">
-                <th:block th:if="${theme.config.page_config.link_enable_comment == 'custom'}">
-                    <halo:comment
-                            group="content.halo.run"
-                            kind="SinglePage"
-                            th:attr="name=${theme.config.page_config.link_comment_id}"
-                    />
-                </th:block>
-                <th:block th:if="${theme.config.page_config.link_enable_comment != 'custom'}">
-                    <halo:comment
-                            group="plugin.halo.run"
-                            kind="Plugin"
-                            th:attr="name=${pluginName}"
-                    />
-                </th:block>
+            <th:block th:if="${theme.config.page_config.link_enable_comment != 'custom'}">
+                <halo:comment
+                        group="plugin.halo.run"
+                        kind="Plugin"
+                        th:attr="name=${pluginName}"
+                />
             </th:block>
         </div>
     </th:block>
diff --git a/templates/main/article.html b/templates/main/article.html
index 503d1a8..089052f 100644
--- a/templates/main/article.html
+++ b/templates/main/article.html
@@ -98,21 +98,10 @@
 
     <div class="card card-content comment-wrapper-z-index" id="comment-wrapper" th:if="${enableComment}">
         <h3 class="comment-title">评论</h3>
-        <th:block th:unless="${theme.config.enhance.enable_comment_type}">
-            <comment-widget
-                    group="content.halo.run"
-                    th:kind="${type}"
-                    version="v1alpha1"
-                    th:name="${post.metadata.name}"
-                    with-replies="false"
-            ></comment-widget>
-        </th:block>
-        <th:block th:if="${theme.config.enhance.enable_comment_type}">
-            <halo:comment
-                    group="content.halo.run"
-                    th:kind="${type}"
-                    th:attr="name=${post.metadata.name}"
-            />
-        </th:block>
+        <halo:comment
+                group="content.halo.run"
+                th:kind="${type}"
+                th:attr="name=${post.metadata.name}"
+        />
     </div>
 </th:block>
\ No newline at end of file
diff --git a/templates/moment.html b/templates/moment.html
index 16e8964..0736077 100644
--- a/templates/moment.html
+++ b/templates/moment.html
@@ -57,22 +57,11 @@
         </div>
       </div>
       <div class="journal-comment comment-wrapper-z-index" th:if="${enableComment}">
-        <th:block th:unless="${theme.config.enhance.enable_comment_type}">
-          <comment-widget
-                  group="moment.halo.run"
-                  kind="Moment"
-                  version="v1alpha1"
-                  th:name="${moment.metadata.name}"
-                  with-replies="false"
-          ></comment-widget>
-        </th:block>
-        <th:block th:if="${theme.config.enhance.enable_comment_type}">
-          <halo:comment
-                  group="moment.halo.run"
-                  kind="Moment"
-                  th:attr="name=${moment.metadata.name}"
-          />
-        </th:block>
+        <halo:comment
+                group="moment.halo.run"
+                kind="Moment"
+                th:attr="name=${moment.metadata.name}"
+        />
       </div>
     </div>
 
diff --git a/templates/moments.html b/templates/moments.html
index 97aa4ab..14d01b4 100644
--- a/templates/moments.html
+++ b/templates/moments.html
@@ -68,22 +68,11 @@
         </div>
       </div>
       <div class="journal-comment comment-wrapper-z-index" th:if="${enableComment}">
-        <th:block th:unless="${theme.config.enhance.enable_comment_type}">
-          <comment-widget
-                  group="moment.halo.run"
-                  kind="Moment"
-                  version="v1alpha1"
-                  th:name="${moment.metadata.name}"
-                  with-replies="false"
-          ></comment-widget>
-        </th:block>
-        <th:block th:if="${theme.config.enhance.enable_comment_type}">
-          <halo:comment
-                  group="moment.halo.run"
-                  kind="Moment"
-                  th:attr="name=${moment.metadata.name}"
-          />
-        </th:block>
+        <halo:comment
+                group="moment.halo.run"
+                kind="Moment"
+                th:attr="name=${moment.metadata.name}"
+        />
       </div>
     </div>
     <th:block th:replace="~{main/pagination :: pagination (${moments}, '/moments')}"/>