From 86241e15254c817bc99b0b71fa0b55fbe039c168 Mon Sep 17 00:00:00 2001
From: GreyAir <greyair@gmail.com>
Date: Mon, 27 May 2024 08:25:08 +0000
Subject: [PATCH 1/3] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E5=8F=AF=E4=BB=A5=E9=9A=90=E8=97=8F=E8=AF=84=E8=AE=BA=E7=9A=84?=
 =?UTF-8?q?=E5=B1=9E=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/Comment.js           | 136 ++++++++++++++++----------------
 lib/notion/getPageProperties.js |   1 +
 2 files changed, 70 insertions(+), 67 deletions(-)

diff --git a/components/Comment.js b/components/Comment.js
index ba0d4256..bc702c4d 100644
--- a/components/Comment.js
+++ b/components/Comment.js
@@ -121,82 +121,84 @@ const Comment = ({ frontMatter, className }) => {
     return null
   }
 
-  return (
-    <div
-      key={frontMatter?.id}
-      id='comment'
-      ref={commentRef}
-      className={`comment mt-5 text-gray-800 dark:text-gray-300 ${className || ''}`}>
-      {/* 延迟加载评论区 */}
-      {!shouldLoad && (
-        <div className='text-center'>
-          Loading...
-          <i className='fas fa-spinner animate-spin text-3xl ' />
-        </div>
-      )}
+  if (frontMatter?.comment != 'Hide') {
+    return (
+      <div
+        key={frontMatter?.id}
+        id='comment'
+        ref={commentRef}
+        className={`comment mt-5 text-gray-800 dark:text-gray-300 ${className || ''}`}>
+        {/* 延迟加载评论区 */}
+        {!shouldLoad && (
+          <div className='text-center'>
+            Loading...
+            <i className='fas fa-spinner animate-spin text-3xl ' />
+          </div>
+        )}
 
-      {shouldLoad && (
-        <Tabs>
-          {COMMENT_ARTALK_SERVER && (
-            <div key='Artalk'>
-              <Artalk />
-            </div>
-          )}
+        {shouldLoad && (
+          <Tabs>
+            {COMMENT_ARTALK_SERVER && (
+              <div key='Artalk'>
+                <Artalk />
+              </div>
+            )}
 
-          {COMMENT_TWIKOO_ENV_ID && (
-            <div key='Twikoo'>
-              <TwikooCompenent />
-            </div>
-          )}
+            {COMMENT_TWIKOO_ENV_ID && (
+              <div key='Twikoo'>
+                <TwikooCompenent />
+              </div>
+            )}
 
-          {COMMENT_WALINE_SERVER_URL && (
-            <div key='Waline'>
-              <WalineComponent />
-            </div>
-          )}
+            {COMMENT_WALINE_SERVER_URL && (
+              <div key='Waline'>
+                <WalineComponent />
+              </div>
+            )}
 
-          {COMMENT_VALINE_APP_ID && (
-            <div key='Valine' name='reply'>
-              <ValineComponent path={frontMatter.id} />
-            </div>
-          )}
+            {COMMENT_VALINE_APP_ID && (
+              <div key='Valine' name='reply'>
+                <ValineComponent path={frontMatter.id} />
+              </div>
+            )}
 
-          {COMMENT_GISCUS_REPO && (
-            <div key='Giscus'>
-              <GiscusComponent className='px-2' />
-            </div>
-          )}
+            {COMMENT_GISCUS_REPO && (
+              <div key='Giscus'>
+                <GiscusComponent className='px-2' />
+              </div>
+            )}
 
-          {COMMENT_CUSDIS_APP_ID && (
-            <div key='Cusdis'>
-              <CusdisComponent frontMatter={frontMatter} />
-            </div>
-          )}
+            {COMMENT_CUSDIS_APP_ID && (
+              <div key='Cusdis'>
+                <CusdisComponent frontMatter={frontMatter} />
+              </div>
+            )}
 
-          {COMMENT_UTTERRANCES_REPO && (
-            <div key='Utterance'>
-              <UtterancesComponent
-                issueTerm={frontMatter.id}
-                className='px-2'
-              />
-            </div>
-          )}
+            {COMMENT_UTTERRANCES_REPO && (
+              <div key='Utterance'>
+                <UtterancesComponent
+                  issueTerm={frontMatter.id}
+                  className='px-2'
+                />
+              </div>
+            )}
 
-          {COMMENT_GITALK_CLIENT_ID && (
-            <div key='GitTalk'>
-              <GitalkComponent frontMatter={frontMatter} />
-            </div>
-          )}
+            {COMMENT_GITALK_CLIENT_ID && (
+              <div key='GitTalk'>
+                <GitalkComponent frontMatter={frontMatter} />
+              </div>
+            )}
 
-          {COMMENT_WEBMENTION_ENABLE && (
-            <div key='WebMention'>
-              <WebMentionComponent frontMatter={frontMatter} className='px-2' />
-            </div>
-          )}
-        </Tabs>
-      )}
-    </div>
-  )
+            {COMMENT_WEBMENTION_ENABLE && (
+              <div key='WebMention'>
+                <WebMentionComponent frontMatter={frontMatter} className='px-2' />
+              </div>
+            )}
+          </Tabs>
+        )}
+      </div>
+    )
+  }
 }
 
 export default Comment
diff --git a/lib/notion/getPageProperties.js b/lib/notion/getPageProperties.js
index 38eede18..17f88e4e 100644
--- a/lib/notion/getPageProperties.js
+++ b/lib/notion/getPageProperties.js
@@ -94,6 +94,7 @@ export default async function getPageProperties(
   properties.type = properties.type?.[0] || ''
   properties.status = properties.status?.[0] || ''
   properties.category = properties.category?.[0] || ''
+  properties.comment = properties.comment?.[0] || ''
 
   // 映射值：用户个性化type和status字段的下拉框选项，在此映射回代码的英文标识
   mapProperties(properties)

From 34292132e794f2cfe71b419ff4063c84633fdd62 Mon Sep 17 00:00:00 2001
From: GreyAir <greyair@gmail.com>
Date: Mon, 27 May 2024 09:01:15 +0000
Subject: [PATCH 2/3] fix bug

---
 components/Comment.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/Comment.js b/components/Comment.js
index bc702c4d..a2b73c05 100644
--- a/components/Comment.js
+++ b/components/Comment.js
@@ -121,7 +121,7 @@ const Comment = ({ frontMatter, className }) => {
     return null
   }
 
-  if (frontMatter?.comment != 'Hide') {
+  if (frontMatter?.comment !== 'Hide') {
     return (
       <div
         key={frontMatter?.id}

From 290b38a13b22b49360406d1a4bc4bf081cbde12b Mon Sep 17 00:00:00 2001
From: "tangly1024.com" <tlyong1992@hotmail.com>
Date: Fri, 31 May 2024 15:18:28 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=96=87=E7=AB=A0?=
 =?UTF-8?q?=E9=9A=90=E8=97=8F=E8=AF=84=E8=AE=BA=E5=8C=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/Comment.js | 157 +++++++++++++++++++++---------------------
 1 file changed, 80 insertions(+), 77 deletions(-)

diff --git a/components/Comment.js b/components/Comment.js
index a2b73c05..fce7078d 100644
--- a/components/Comment.js
+++ b/components/Comment.js
@@ -121,84 +121,87 @@ const Comment = ({ frontMatter, className }) => {
     return null
   }
 
-  if (frontMatter?.comment !== 'Hide') {
-    return (
-      <div
-        key={frontMatter?.id}
-        id='comment'
-        ref={commentRef}
-        className={`comment mt-5 text-gray-800 dark:text-gray-300 ${className || ''}`}>
-        {/* 延迟加载评论区 */}
-        {!shouldLoad && (
-          <div className='text-center'>
-            Loading...
-            <i className='fas fa-spinner animate-spin text-3xl ' />
-          </div>
-        )}
-
-        {shouldLoad && (
-          <Tabs>
-            {COMMENT_ARTALK_SERVER && (
-              <div key='Artalk'>
-                <Artalk />
-              </div>
-            )}
-
-            {COMMENT_TWIKOO_ENV_ID && (
-              <div key='Twikoo'>
-                <TwikooCompenent />
-              </div>
-            )}
-
-            {COMMENT_WALINE_SERVER_URL && (
-              <div key='Waline'>
-                <WalineComponent />
-              </div>
-            )}
-
-            {COMMENT_VALINE_APP_ID && (
-              <div key='Valine' name='reply'>
-                <ValineComponent path={frontMatter.id} />
-              </div>
-            )}
-
-            {COMMENT_GISCUS_REPO && (
-              <div key='Giscus'>
-                <GiscusComponent className='px-2' />
-              </div>
-            )}
-
-            {COMMENT_CUSDIS_APP_ID && (
-              <div key='Cusdis'>
-                <CusdisComponent frontMatter={frontMatter} />
-              </div>
-            )}
-
-            {COMMENT_UTTERRANCES_REPO && (
-              <div key='Utterance'>
-                <UtterancesComponent
-                  issueTerm={frontMatter.id}
-                  className='px-2'
-                />
-              </div>
-            )}
-
-            {COMMENT_GITALK_CLIENT_ID && (
-              <div key='GitTalk'>
-                <GitalkComponent frontMatter={frontMatter} />
-              </div>
-            )}
-
-            {COMMENT_WEBMENTION_ENABLE && (
-              <div key='WebMention'>
-                <WebMentionComponent frontMatter={frontMatter} className='px-2' />
-              </div>
-            )}
-          </Tabs>
-        )}
-      </div>
-    )
+  // 特定文章关闭评论区
+  if (frontMatter?.comment === 'Hide') {
+    return null
   }
+
+  return (
+    <div
+      key={frontMatter?.id}
+      id='comment'
+      ref={commentRef}
+      className={`comment mt-5 text-gray-800 dark:text-gray-300 ${className || ''}`}>
+      {/* 延迟加载评论区 */}
+      {!shouldLoad && (
+        <div className='text-center'>
+          Loading...
+          <i className='fas fa-spinner animate-spin text-3xl ' />
+        </div>
+      )}
+
+      {shouldLoad && (
+        <Tabs>
+          {COMMENT_ARTALK_SERVER && (
+            <div key='Artalk'>
+              <Artalk />
+            </div>
+          )}
+
+          {COMMENT_TWIKOO_ENV_ID && (
+            <div key='Twikoo'>
+              <TwikooCompenent />
+            </div>
+          )}
+
+          {COMMENT_WALINE_SERVER_URL && (
+            <div key='Waline'>
+              <WalineComponent />
+            </div>
+          )}
+
+          {COMMENT_VALINE_APP_ID && (
+            <div key='Valine' name='reply'>
+              <ValineComponent path={frontMatter.id} />
+            </div>
+          )}
+
+          {COMMENT_GISCUS_REPO && (
+            <div key='Giscus'>
+              <GiscusComponent className='px-2' />
+            </div>
+          )}
+
+          {COMMENT_CUSDIS_APP_ID && (
+            <div key='Cusdis'>
+              <CusdisComponent frontMatter={frontMatter} />
+            </div>
+          )}
+
+          {COMMENT_UTTERRANCES_REPO && (
+            <div key='Utterance'>
+              <UtterancesComponent
+                issueTerm={frontMatter.id}
+                className='px-2'
+              />
+            </div>
+          )}
+
+          {COMMENT_GITALK_CLIENT_ID && (
+            <div key='GitTalk'>
+              <GitalkComponent frontMatter={frontMatter} />
+            </div>
+          )}
+
+          {COMMENT_WEBMENTION_ENABLE && (
+            <div key='WebMention'>
+              <WebMentionComponent frontMatter={frontMatter} className='px-2' />
+            </div>
+          )}
+        </Tabs>
+      )}
+    </div>
+  )
 }
 
 export default Comment