From 19579486af2f96d758a1fe5fcd8884d9f23a7e02 Mon Sep 17 00:00:00 2001
From: Ryan Wang <i@ryanc.cc>
Date: Mon, 18 Sep 2023 11:42:19 +0800
Subject: [PATCH] refactor: comment visible condition (#110)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

修改评论功能是否可用的判断方式。

see https://github.com/halo-dev/halo/pull/4271

/kind improvement

```release-note
修改评论功能是否可用的判断方式。
```
---
 templates/page.html | 7 ++-----
 templates/post.html | 7 ++-----
 theme.yaml          | 2 +-
 3 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/templates/page.html b/templates/page.html
index 86b3b00..f0eb313 100644
--- a/templates/page.html
+++ b/templates/page.html
@@ -63,11 +63,8 @@ <h1 class="my-3 text-2xl font-medium dark:text-slate-50" th:text="${singlePage.s
         class="prose prose-base mt-4 !max-w-none break-words dark:prose-invert"
         th:utext="${singlePage.content.content}"
       ></article>
-      <hr class="my-10 dark:border-slate-700" />
-      <!-- https://github.com/halo-sigs/plugin-comment-widget -->
-      <div
-        th:if="${pluginFinder.available('PluginCommentWidget')} and ${singlePage.spec.allowComment} and ${site.comment.enable}"
-      >
+      <hr th:if="${haloCommentEnabled}" class="my-10 dark:border-slate-700" />
+      <div th:if="${haloCommentEnabled}">
         <h2 class="mb-2 text-base font-medium text-gray-900 dark:text-slate-50">评论</h2>
         <halo:comment
           group="content.halo.run"
diff --git a/templates/post.html b/templates/post.html
index 2ea84ee..73b269b 100644
--- a/templates/post.html
+++ b/templates/post.html
@@ -130,11 +130,8 @@ <h1 class="my-3 text-2xl font-medium dark:text-slate-50" th:text="${post.spec.ti
           </a>
         </div>
       </div>
-      <hr class="my-10 dark:border-slate-700" />
-      <!-- https://github.com/halo-sigs/plugin-comment-widget -->
-      <div
-        th:if="${pluginFinder.available('PluginCommentWidget')} and ${post.spec.allowComment} and ${site.comment.enable}"
-      >
+      <hr th:if="${haloCommentEnabled}" class="my-10 dark:border-slate-700" />
+      <div th:if="${haloCommentEnabled}">
         <h2 class="mb-2 text-base font-medium text-gray-900 dark:text-slate-50">评论</h2>
         <halo:comment
           group="content.halo.run"
diff --git a/theme.yaml b/theme.yaml
index b5c2d18..8bd0ff0 100644
--- a/theme.yaml
+++ b/theme.yaml
@@ -14,4 +14,4 @@ spec:
   settingName: "theme-earth-setting"
   configMapName: "theme-earth-configMap"
   version: 1.5.0
-  require: ">=2.6.0"
\ No newline at end of file
+  require: ">=2.8.0"