From f1b5f62ac9d12326a75286316bca046f501d69d7 Mon Sep 17 00:00:00 2001
From: Ryan Wang <i@ryanc.cc>
Date: Fri, 15 Aug 2025 17:05:10 +0800
Subject: [PATCH 1/9] Add support for private comments in comment widget

---
 packages/comment-widget/package.json          |  2 +-
 .../comment-widget/src/base-comment-item.ts   | 19 +++++++++++--
 packages/comment-widget/src/base-form.ts      | 27 ++++++++++++++++---
 packages/comment-widget/src/comment-form.ts   |  3 ++-
 packages/comment-widget/src/comment-item.ts   |  1 +
 .../src/generated/locales/es.ts               |  1 +
 .../src/generated/locales/zh-CN.ts            |  1 +
 .../src/generated/locales/zh-TW.ts            |  1 +
 packages/comment-widget/src/reply-form.ts     |  1 +
 packages/comment-widget/src/reply-item.ts     |  1 +
 packages/comment-widget/src/types/index.ts    |  1 +
 packages/comment-widget/xliff/es.xlf          |  4 +++
 packages/comment-widget/xliff/zh-CN.xlf       |  4 +++
 packages/comment-widget/xliff/zh-TW.xlf       |  4 +++
 pnpm-lock.yaml                                | 15 +++++++++--
 src/main/resources/extensions/settings.yaml   |  5 ++++
 16 files changed, 80 insertions(+), 10 deletions(-)

diff --git a/packages/comment-widget/package.json b/packages/comment-widget/package.json
index e4f66a7..86573de 100644
--- a/packages/comment-widget/package.json
+++ b/packages/comment-widget/package.json
@@ -35,7 +35,7 @@
   "dependencies": {
     "@emoji-mart/data": "^1.2.1",
     "@floating-ui/dom": "^1.7.3",
-    "@halo-dev/api-client": "^2.21.1",
+    "@halo-dev/api-client": "https://pkg.pr.new/@halo-dev/api-client@7679",
     "@lit/context": "^1.1.6",
     "@lit/localize": "^0.12.2",
     "@tiptap/core": "^3.1.0",
diff --git a/packages/comment-widget/src/base-comment-item.ts b/packages/comment-widget/src/base-comment-item.ts
index ed69fb5..095e22f 100644
--- a/packages/comment-widget/src/base-comment-item.ts
+++ b/packages/comment-widget/src/base-comment-item.ts
@@ -33,7 +33,10 @@ export class BaseCommentItem extends LitElement {
   content = '';
 
   @property({ type: String })
-  ua: string = '';
+  ua: string | undefined;
+
+  @property({ type: Boolean })
+  private: boolean | undefined;
 
   @consume({ context: configMapDataContext })
   @state()
@@ -49,7 +52,7 @@ export class BaseCommentItem extends LitElement {
         ></user-avatar>
       </div>
       <div class="item-main flex-[1_1_auto] min-w-0 w-full">
-        <div class="item-meta flex items-center gap-3 flex-wrap">
+        <div class="item-meta flex items-center gap-2 flex-wrap">
           ${
             this.userWebsite
               ? html`<a
@@ -65,6 +68,18 @@ export class BaseCommentItem extends LitElement {
           
           ${this.ua && this.configMapData?.basic.showCommenterDevice ? html`<commenter-ua-bar .ua=${this.ua}></commenter-ua-bar>` : ''}
 
+
+          ${
+            this.private
+              ? html`
+              <div class="inline-flex items-center gap-1 bg-muted-3 rounded-base px-1.5 py-1">
+                <i class="i-ri-git-repository-private-line opacity-90 size-3" aria-hidden="true"></i>
+                <span class="text-xs text-text-2">${msg('Private')}</span>
+              </div>`
+              : ''
+          }
+          
+
           <time class="item-meta-info text-xs text-text-3" title=${formatDate(this.creationTime)}>
             ${timeAgo(this.creationTime)}
           </time>
diff --git a/packages/comment-widget/src/base-form.ts b/packages/comment-widget/src/base-form.ts
index 9e68dde..9f957fe 100644
--- a/packages/comment-widget/src/base-form.ts
+++ b/packages/comment-widget/src/base-form.ts
@@ -64,6 +64,9 @@ export class BaseForm extends LitElement {
   @state()
   toastManager: ToastManager | undefined;
 
+  @property({ type: Boolean })
+  hidePrivateCheckbox = false;
+
   textareaRef: Ref<HTMLTextAreaElement> = createRef<HTMLTextAreaElement>();
 
   editorRef: Ref<CommentEditor> = createRef<CommentEditor>();
@@ -150,13 +153,14 @@ export class BaseForm extends LitElement {
 
   renderAccountInfo() {
     return html`<div class="form-account flex items-center gap-2">
-    <div class="form-account-avatar avatar">
       ${
         this.currentUser?.spec.avatar
-          ? html`<img src=${this.currentUser.spec.avatar} class="size-full object-cover" />`
+          ? html`
+            <div class="form-account-avatar avatar">
+              <img src=${this.currentUser.spec.avatar} class="size-full object-cover" />
+            </div>`
           : ''
       }
-    </div>
       <span class="form-account-name text-base text-text-1 font-semibold">
         ${this.currentUser?.spec.displayName || this.currentUser?.metadata.name}
       </span>
@@ -238,7 +242,21 @@ export class BaseForm extends LitElement {
               </button> `
               : ''
           }
-          <div class="form-actions justify-end flex gap-2 flex-wrap items-center">
+          <div class="form-actions justify-end flex gap-3 flex-wrap items-center">
+
+            ${
+              !this.hidePrivateCheckbox &&
+              this.configMapData?.basic.enablePrivateComment
+                ? html`
+                  <div class="flex items-center gap-2">
+                    <input id="hidden" name="hidden" type="checkbox" />
+                    <label for="hidden" class="text-xs select-none text-text-3 hover:text-text-1 transition-all">${msg('Private')}</label>
+                  </div>
+                `
+                : ''
+            }
+            
+
             ${
               this.showCaptcha && this.captcha
                 ? html`
@@ -293,6 +311,7 @@ export class BaseForm extends LitElement {
       detail: {
         ...data,
         content,
+        hidden: data.hidden === 'on',
       },
     });
     this.dispatchEvent(event);
diff --git a/packages/comment-widget/src/comment-form.ts b/packages/comment-widget/src/comment-form.ts
index d0af9cb..b7568ec 100644
--- a/packages/comment-widget/src/comment-form.ts
+++ b/packages/comment-widget/src/comment-form.ts
@@ -82,13 +82,14 @@ export class CommentForm extends LitElement {
 
     const data = e.detail;
 
-    const { displayName, email, website, content } = data || {};
+    const { displayName, email, website, content, hidden } = data || {};
 
     const commentRequest: CommentRequest = {
       raw: content,
       content: content,
       // TODO: support user input
       allowNotification: true,
+      hidden: hidden,
       subjectRef: {
         group: this.group,
         kind: this.kind,
diff --git a/packages/comment-widget/src/comment-item.ts b/packages/comment-widget/src/comment-item.ts
index a4dfb97..814a359 100644
--- a/packages/comment-widget/src/comment-item.ts
+++ b/packages/comment-widget/src/comment-item.ts
@@ -120,6 +120,7 @@ export class CommentItem extends LitElement {
       .approved=${this.comment?.spec.approved}
       .userWebsite=${this.comment?.spec.owner.annotations?.website}
       .ua=${this.comment?.spec.userAgent}
+      .private=${this.comment?.spec.hidden}
     >
       <button slot="action" class="icon-button group -ml-2" type="button" @click="${this.handleUpvote}" aria-label=${msg('Upvote')}>
         <div class="icon-button-icon">
diff --git a/packages/comment-widget/src/generated/locales/es.ts b/packages/comment-widget/src/generated/locales/es.ts
index cd4e1e3..d3f1b8d 100644
--- a/packages/comment-widget/src/generated/locales/es.ts
+++ b/packages/comment-widget/src/generated/locales/es.ts
@@ -41,6 +41,7 @@
 'sc8da3cc71de63832': `Iniciar sesión`,
 'sd1f44f1a8bc20e67': `Correo electrónico`,
 'sd5e242ab9574958a': `Error al comentar, por favor intente más tarde`,
+'se7bee6e9a9b5394c': `Íntimo`,
 'sea7e567ed89dc0d7': `Seleccionar emoticono`,
 'sf3ff78cc329d3528': `Anterior`,
 'sf77128b082955d42': `(O iniciar sesión)`,
diff --git a/packages/comment-widget/src/generated/locales/zh-CN.ts b/packages/comment-widget/src/generated/locales/zh-CN.ts
index 167fe2b..02ead5b 100644
--- a/packages/comment-widget/src/generated/locales/zh-CN.ts
+++ b/packages/comment-widget/src/generated/locales/zh-CN.ts
@@ -41,6 +41,7 @@
 'sc8da3cc71de63832': `登录`,
 'sd1f44f1a8bc20e67': `电子邮件`,
 'sd5e242ab9574958a': `评论失败，请稍后重试`,
+'se7bee6e9a9b5394c': `私密`,
 'sea7e567ed89dc0d7': `选择表情`,
 'sf3ff78cc329d3528': `上一页`,
 'sf77128b082955d42': `（或登录账号）`,
diff --git a/packages/comment-widget/src/generated/locales/zh-TW.ts b/packages/comment-widget/src/generated/locales/zh-TW.ts
index 9f99a0e..66f461c 100644
--- a/packages/comment-widget/src/generated/locales/zh-TW.ts
+++ b/packages/comment-widget/src/generated/locales/zh-TW.ts
@@ -41,6 +41,7 @@
 'sc8da3cc71de63832': `登入`,
 'sd1f44f1a8bc20e67': `電子郵件`,
 'sd5e242ab9574958a': `評論失敗，請稍後重試`,
+'se7bee6e9a9b5394c': `私密`,
 'sea7e567ed89dc0d7': `選擇表情`,
 'sf3ff78cc329d3528': `上一頁`,
 'sf77128b082955d42': `（或登入帳號）`,
diff --git a/packages/comment-widget/src/reply-form.ts b/packages/comment-widget/src/reply-form.ts
index 99395e4..1b03086 100644
--- a/packages/comment-widget/src/reply-form.ts
+++ b/packages/comment-widget/src/reply-form.ts
@@ -75,6 +75,7 @@ export class ReplyForm extends LitElement {
     return html` <base-form
       .submitting=${this.submitting}
       .captcha=${this.captcha}
+      .hidePrivateCheckbox=${this.comment?.spec.hidden || false}
       ${ref(this.baseFormRef)}
       @submit="${this.onSubmit}"
     ></base-form>`;
diff --git a/packages/comment-widget/src/reply-item.ts b/packages/comment-widget/src/reply-item.ts
index 4d81e05..f5a76ab 100644
--- a/packages/comment-widget/src/reply-item.ts
+++ b/packages/comment-widget/src/reply-item.ts
@@ -123,6 +123,7 @@ export class ReplyItem extends LitElement {
         .breath=${this.isQuoteReplyHovered}
         .userWebsite=${this.reply?.spec.owner.annotations?.website}
         .ua=${this.reply?.spec.userAgent}
+        .private=${this.comment?.spec.hidden || this.reply?.spec.hidden}
       >
         <button slot="action" class="icon-button group -ml-2" type="button" @click="${this.handleUpvote}" aria-label=${msg('Upvote')}>
           <div class="icon-button-icon ">
diff --git a/packages/comment-widget/src/types/index.ts b/packages/comment-widget/src/types/index.ts
index 241f25d..0d698f3 100644
--- a/packages/comment-widget/src/types/index.ts
+++ b/packages/comment-widget/src/types/index.ts
@@ -11,6 +11,7 @@ interface BasicConfig {
   withReplySize: number;
   replySize: number;
   showCommenterDevice?: boolean;
+  enablePrivateComment?: boolean;
 }
 
 interface SecurityConfig {
diff --git a/packages/comment-widget/xliff/es.xlf b/packages/comment-widget/xliff/es.xlf
index 933b47a..bcb16df 100644
--- a/packages/comment-widget/xliff/es.xlf
+++ b/packages/comment-widget/xliff/es.xlf
@@ -150,6 +150,10 @@
   <source>Show replies</source>
   <target>Mostrar respuestas</target>
 </trans-unit>
+<trans-unit id="se7bee6e9a9b5394c">
+  <source>Private</source>
+  <target>Íntimo</target>
+</trans-unit>
 </body>
 </file>
 </xliff>
diff --git a/packages/comment-widget/xliff/zh-CN.xlf b/packages/comment-widget/xliff/zh-CN.xlf
index b703308..31703ef 100644
--- a/packages/comment-widget/xliff/zh-CN.xlf
+++ b/packages/comment-widget/xliff/zh-CN.xlf
@@ -150,6 +150,10 @@
   <source>Show replies</source>
   <target>显示回复</target>
 </trans-unit>
+<trans-unit id="se7bee6e9a9b5394c">
+  <source>Private</source>
+  <target>私密</target>
+</trans-unit>
 </body>
 </file>
 </xliff>
diff --git a/packages/comment-widget/xliff/zh-TW.xlf b/packages/comment-widget/xliff/zh-TW.xlf
index 0ea2002..f01ffd3 100644
--- a/packages/comment-widget/xliff/zh-TW.xlf
+++ b/packages/comment-widget/xliff/zh-TW.xlf
@@ -150,6 +150,10 @@
   <source>Show replies</source>
   <target>顯示回覆</target>
 </trans-unit>
+<trans-unit id="se7bee6e9a9b5394c">
+  <source>Private</source>
+  <target>私密</target>
+</trans-unit>
 </body>
 </file>
 </xliff>
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 816b977..311d431 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -49,8 +49,8 @@ importers:
         specifier: ^1.7.3
         version: 1.7.3
       '@halo-dev/api-client':
-        specifier: ^2.21.1
-        version: 2.21.1(axios@1.11.0)
+        specifier: https://pkg.pr.new/@halo-dev/api-client@7679
+        version: https://pkg.pr.new/@halo-dev/api-client@7679(axios@1.11.0)
       '@lit/context':
         specifier: ^1.1.6
         version: 1.1.6
@@ -518,6 +518,12 @@ packages:
     peerDependencies:
       axios: ^1.7.x
 
+  '@halo-dev/api-client@https://pkg.pr.new/@halo-dev/api-client@7679':
+    resolution: {tarball: https://pkg.pr.new/@halo-dev/api-client@7679}
+    version: 2.21.1
+    peerDependencies:
+      axios: ^1.7.x
+
   '@halo-dev/components@2.21.0':
     resolution: {integrity: sha512-hfAKAxFSW7k+690PQoDqe0CAQYBM3O5zsLZwnl+mnZs7VMw9cIQauqWQ+WwIVn+nsfnGhr1a+0VlLtyn/cAwxA==}
     peerDependencies:
@@ -3228,6 +3234,11 @@ snapshots:
       axios: 1.11.0
       qs: 6.14.0
 
+  '@halo-dev/api-client@https://pkg.pr.new/@halo-dev/api-client@7679(axios@1.11.0)':
+    dependencies:
+      axios: 1.11.0
+      qs: 6.14.0
+
   '@halo-dev/components@2.21.0(vue-router@4.5.1(vue@3.5.18(typescript@5.8.3)))(vue@3.5.18(typescript@5.8.3))':
     dependencies:
       floating-vue: 5.2.2(vue@3.5.18(typescript@5.8.3))
diff --git a/src/main/resources/extensions/settings.yaml b/src/main/resources/extensions/settings.yaml
index 7a6f4db..ff49dad 100644
--- a/src/main/resources/extensions/settings.yaml
+++ b/src/main/resources/extensions/settings.yaml
@@ -35,6 +35,11 @@ spec:
           label: 显示评论者设备信息
           name: showCommenterDevice
           value: false
+        - $formkit: checkbox
+          label: 支持私密评论
+          name: enablePrivateComment
+          help: 开启之后，评论者可选是否私密评论
+          value: false
     - group: security
       label: 安全设置
       formSchema:

From 6371616401decd94763a44b66bafed5da4e03613 Mon Sep 17 00:00:00 2001
From: Ryan Wang <i@ryanc.cc>
Date: Fri, 15 Aug 2025 17:08:53 +0800
Subject: [PATCH 2/9] Update

Signed-off-by: Ryan Wang <i@ryanc.cc>
---
 packages/comment-widget/src/comment-form.ts | 2 +-
 packages/comment-widget/src/reply-form.ts   | 3 ++-
 src/main/resources/extensions/settings.yaml | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/packages/comment-widget/src/comment-form.ts b/packages/comment-widget/src/comment-form.ts
index b7568ec..8750866 100644
--- a/packages/comment-widget/src/comment-form.ts
+++ b/packages/comment-widget/src/comment-form.ts
@@ -89,7 +89,7 @@ export class CommentForm extends LitElement {
       content: content,
       // TODO: support user input
       allowNotification: true,
-      hidden: hidden,
+      hidden: hidden || false,
       subjectRef: {
         group: this.group,
         kind: this.kind,
diff --git a/packages/comment-widget/src/reply-form.ts b/packages/comment-widget/src/reply-form.ts
index 1b03086..3bfb6a0 100644
--- a/packages/comment-widget/src/reply-form.ts
+++ b/packages/comment-widget/src/reply-form.ts
@@ -88,13 +88,14 @@ export class ReplyForm extends LitElement {
 
     const data = e.detail;
 
-    const { displayName, email, website, content } = data || {};
+    const { displayName, email, website, content, hidden } = data || {};
 
     const replyRequest: ReplyRequest = {
       raw: content,
       content: content,
       // TODO: support user input
       allowNotification: true,
+      hidden: hidden || false,
     };
 
     if (this.quoteReply) {
diff --git a/src/main/resources/extensions/settings.yaml b/src/main/resources/extensions/settings.yaml
index ff49dad..07a1439 100644
--- a/src/main/resources/extensions/settings.yaml
+++ b/src/main/resources/extensions/settings.yaml
@@ -38,7 +38,7 @@ spec:
         - $formkit: checkbox
           label: 支持私密评论
           name: enablePrivateComment
-          help: 开启之后，评论者可选是否私密评论
+          help: 开启之后，已登录的评论者可选是否私密评论，私密评论仅评论者和网站管理员（包含评论查看权限）可见，
           value: false
     - group: security
       label: 安全设置

From 82af3b040cf29724d358bc1b61f6d7ee76bcb57f Mon Sep 17 00:00:00 2001
From: Ryan Wang <i@ryanc.cc>
Date: Fri, 15 Aug 2025 17:10:43 +0800
Subject: [PATCH 3/9] Update

Signed-off-by: Ryan Wang <i@ryanc.cc>
---
 src/main/resources/extensions/settings.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/resources/extensions/settings.yaml b/src/main/resources/extensions/settings.yaml
index 07a1439..d17d79d 100644
--- a/src/main/resources/extensions/settings.yaml
+++ b/src/main/resources/extensions/settings.yaml
@@ -38,7 +38,7 @@ spec:
         - $formkit: checkbox
           label: 支持私密评论
           name: enablePrivateComment
-          help: 开启之后，已登录的评论者可选是否私密评论，私密评论仅评论者和网站管理员（包含评论查看权限）可见，
+          help: 开启之后，评论者可选是否私密评论，私密评论仅评论者（已登录）和网站管理员（包含评论查看权限）可见，
           value: false
     - group: security
       label: 安全设置

From 453fcf842a2d5563b375422f15f8b9e48f480221 Mon Sep 17 00:00:00 2001
From: Ryan Wang <i@ryanc.cc>
Date: Fri, 15 Aug 2025 23:12:26 +0800
Subject: [PATCH 4/9] Add option to show private comment badge

---
 packages/comment-widget/src/base-comment-item.ts |  2 +-
 packages/comment-widget/src/types/index.ts       |  1 +
 src/main/resources/extensions/settings.yaml      | 10 ++++++++++
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/packages/comment-widget/src/base-comment-item.ts b/packages/comment-widget/src/base-comment-item.ts
index 095e22f..fb77717 100644
--- a/packages/comment-widget/src/base-comment-item.ts
+++ b/packages/comment-widget/src/base-comment-item.ts
@@ -70,7 +70,7 @@ export class BaseCommentItem extends LitElement {
 
 
           ${
-            this.private
+            this.private && this.configMapData?.basic.showPrivateCommentBadge
               ? html`
               <div class="inline-flex items-center gap-1 bg-muted-3 rounded-base px-1.5 py-1">
                 <i class="i-ri-git-repository-private-line opacity-90 size-3" aria-hidden="true"></i>
diff --git a/packages/comment-widget/src/types/index.ts b/packages/comment-widget/src/types/index.ts
index 0d698f3..6854bef 100644
--- a/packages/comment-widget/src/types/index.ts
+++ b/packages/comment-widget/src/types/index.ts
@@ -12,6 +12,7 @@ interface BasicConfig {
   replySize: number;
   showCommenterDevice?: boolean;
   enablePrivateComment?: boolean;
+  showPrivateCommentBadge?: boolean;
 }
 
 interface SecurityConfig {
diff --git a/src/main/resources/extensions/settings.yaml b/src/main/resources/extensions/settings.yaml
index d17d79d..9fbfe42 100644
--- a/src/main/resources/extensions/settings.yaml
+++ b/src/main/resources/extensions/settings.yaml
@@ -37,9 +37,19 @@ spec:
           value: false
         - $formkit: checkbox
           label: 支持私密评论
+          id: enablePrivateComment
+          key: enablePrivateComment
           name: enablePrivateComment
           help: 开启之后，评论者可选是否私密评论，私密评论仅评论者（已登录）和网站管理员（包含评论查看权限）可见，
           value: false
+        - $formkit: checkbox
+          if: "$get(enablePrivateComment).value === true"
+          label: 显示私密评论状态
+          name: showPrivateCommentBadge
+          id: showPrivateCommentBadge
+          key: showPrivateCommentBadge
+          value: true
+          help: 开启后，私密评论会显示一个私密状态标识
     - group: security
       label: 安全设置
       formSchema:

From 1d82a4175f44281a11ca9e7534c041d5f20aca83 Mon Sep 17 00:00:00 2001
From: Ryan Wang <i@ryanc.cc>
Date: Sat, 16 Aug 2025 14:19:40 +0800
Subject: [PATCH 5/9] Add tooltip for private comment option

---
 packages/comment-widget/src/base-form.ts      |   4 +
 packages/comment-widget/src/base-tooltip.ts   | 161 ++++++++++++++++++
 .../src/generated/locales/es.ts               |   2 +
 .../src/generated/locales/zh-CN.ts            |   2 +
 .../src/generated/locales/zh-TW.ts            |   2 +
 packages/comment-widget/xliff/es.xlf          |   8 +
 packages/comment-widget/xliff/zh-CN.xlf       |   8 +
 packages/comment-widget/xliff/zh-TW.xlf       |   8 +
 8 files changed, 195 insertions(+)
 create mode 100644 packages/comment-widget/src/base-tooltip.ts

diff --git a/packages/comment-widget/src/base-form.ts b/packages/comment-widget/src/base-form.ts
index 9f957fe..286d94a 100644
--- a/packages/comment-widget/src/base-form.ts
+++ b/packages/comment-widget/src/base-form.ts
@@ -23,6 +23,7 @@ import './comment-editor';
 import { ofetch } from 'ofetch';
 import type { CommentEditor } from './comment-editor';
 import { cleanHtml } from './utils/html';
+import './base-tooltip';
 
 export class BaseForm extends LitElement {
   @consume({ context: baseUrlContext })
@@ -251,6 +252,9 @@ export class BaseForm extends LitElement {
                   <div class="flex items-center gap-2">
                     <input id="hidden" name="hidden" type="checkbox" />
                     <label for="hidden" class="text-xs select-none text-text-3 hover:text-text-1 transition-all">${msg('Private')}</label>
+                    <base-tooltip content=${this.currentUser ? msg('Currently logged in. After selecting the private option, comments will only be visible to yourself and the site administrator.') : msg('You are currently anonymous. After selecting the private option, the comment will only be visible to the site administrator.')}>
+                      <i class="i-mingcute:information-line size-3.5 text-text-3 block"></i>
+                    </base-tooltip>
                   </div>
                 `
                 : ''
diff --git a/packages/comment-widget/src/base-tooltip.ts b/packages/comment-widget/src/base-tooltip.ts
new file mode 100644
index 0000000..3fe0b21
--- /dev/null
+++ b/packages/comment-widget/src/base-tooltip.ts
@@ -0,0 +1,161 @@
+import {
+  autoUpdate,
+  computePosition,
+  flip,
+  offset,
+  shift,
+} from '@floating-ui/dom';
+import type { TemplateResult } from 'lit';
+import { css, html, LitElement } from 'lit';
+import { property } from 'lit/decorators.js';
+import baseStyles from './styles/base';
+
+/**
+ * A simple tooltip component based on Lit and floating-ui.
+ *
+ * @example
+ * ```html
+ * <base-tooltip content="This is a tooltip">
+ *   <button>Hover me</button>
+ * </base-tooltip>
+ * ```
+ */
+export class BaseTooltip extends LitElement {
+  /**
+   * The content to display in the tooltip.
+   */
+  @property({ type: String })
+  content: string | TemplateResult = '';
+
+  private tooltipEl?: HTMLElement;
+  private cleanupFn?: () => void;
+
+  override connectedCallback(): void {
+    super.connectedCallback();
+    this.addEventListener('mouseenter', this._showTooltip);
+    this.addEventListener('mouseleave', this._hideTooltip);
+  }
+
+  override disconnectedCallback(): void {
+    super.disconnectedCallback();
+    this.removeEventListener('mouseenter', this._showTooltip);
+    this.removeEventListener('mouseleave', this._hideTooltip);
+
+    // Clean up positioning if needed
+    if (this.cleanupFn) {
+      this.cleanupFn();
+      this.cleanupFn = undefined;
+    }
+  }
+
+  override firstUpdated(): void {
+    // Get tooltip element after the component is rendered
+    this.tooltipEl = this.shadowRoot?.querySelector('.tooltip') as HTMLElement;
+  }
+
+  private _showTooltip = (): void => {
+    if (!this.tooltipEl) return;
+
+    this.tooltipEl.classList.add('show');
+    this._updatePosition();
+  };
+
+  private _hideTooltip = (): void => {
+    if (!this.tooltipEl) return;
+
+    this.tooltipEl.classList.remove('show');
+
+    // Clean up positioning
+    if (this.cleanupFn) {
+      this.cleanupFn();
+      this.cleanupFn = undefined;
+    }
+  };
+
+  private _updatePosition(): void {
+    if (!this.tooltipEl) return;
+
+    const floating = this.tooltipEl;
+
+    // Clean up previous positioning if any
+    if (this.cleanupFn) {
+      this.cleanupFn();
+    }
+
+    // Use autoUpdate to reposition on scroll/resize
+    this.cleanupFn = autoUpdate(this, floating, async () => {
+      // Calculate the position
+      const middlewares = [
+        offset(8), // 8px distance from trigger
+        flip(), // flip to other side if needed
+        shift({ padding: 5 }), // shift to keep in viewport
+      ];
+
+      // Calculate position
+      const { x, y } = await computePosition(this, floating, {
+        placement: 'top', // Default placement is top
+        middleware: middlewares,
+      });
+
+      // Position the tooltip
+      Object.assign(floating.style, {
+        left: `${x}px`,
+        top: `${y}px`,
+      });
+    });
+  }
+
+  override render() {
+    return html`
+      <slot></slot>
+      <div class="tooltip">
+        ${this.content}
+      </div>
+    `;
+  }
+
+  static override styles = [
+    ...baseStyles,
+    css`
+      :host {
+        display: inline-block;
+      }
+
+      ::slotted(*) {
+        display: inline-block;
+      }
+
+      .tooltip {
+        position: absolute;
+        background: rgba(0, 0, 0, 0.8);
+        color: white;
+        padding: 5px 10px;
+        border-radius: 4px;
+        font-size: 0.875em;
+        max-width: 300px; 
+        width: auto; 
+        z-index: 10;
+        opacity: 0;
+        pointer-events: none;
+        transition: opacity 0.2s;
+        top: 0;
+        left: 0;
+        white-space: normal;
+        word-wrap: break-word;
+      }
+
+      .tooltip.show {
+        opacity: 1;
+      }
+    `,
+  ];
+}
+
+customElements.get('base-tooltip') ||
+  customElements.define('base-tooltip', BaseTooltip);
+
+declare global {
+  interface HTMLElementTagNameMap {
+    'base-tooltip': BaseTooltip;
+  }
+}
diff --git a/packages/comment-widget/src/generated/locales/es.ts b/packages/comment-widget/src/generated/locales/es.ts
index d3f1b8d..3d2a405 100644
--- a/packages/comment-widget/src/generated/locales/es.ts
+++ b/packages/comment-widget/src/generated/locales/es.ts
@@ -22,6 +22,7 @@
 's3643189d1abbb7f4': `Código`,
 's3fb33d17bad61aa9': `Comentario enviado con éxito, pendiente de revisión`,
 's4c0e15f9073382e6': `Error al obtener el código de verificación`,
+'s5184a3f3e2f7b603': `Actualmente anónimo. Después de seleccionar la opción privada, el comentario solo será visible para el administrador del sitio.`,
 's523eb9043213ff0d': `Itálica`,
 's58a3c1ecd4dd06cf': `Tachado`,
 's67749057edb2586b': `Cerrar sesión`,
@@ -29,6 +30,7 @@
 's7437373e541a8037': `Apodo`,
 's7584ded3d749c75e': `Cargar más`,
 's82665b2ffabc9c0a': `Sitio web`,
+'s838e512973be01d4': `Actualmente conectado. Después de seleccionar la opción privada, los comentarios solo serán visibles para usted y el administrador del sitio.`,
 's84b033b2f7360187': `Por favor, inicie sesión o complete la información primero`,
 's98a5f7789c49dd3f': `En revisión`,
 's9f2ed66340f019c6': `Escribir un comentario`,
diff --git a/packages/comment-widget/src/generated/locales/zh-CN.ts b/packages/comment-widget/src/generated/locales/zh-CN.ts
index 02ead5b..3adc0e7 100644
--- a/packages/comment-widget/src/generated/locales/zh-CN.ts
+++ b/packages/comment-widget/src/generated/locales/zh-CN.ts
@@ -22,6 +22,7 @@
 's3643189d1abbb7f4': `代码`,
 's3fb33d17bad61aa9': `评论成功，请等待审核`,
 's4c0e15f9073382e6': `获取验证码失败`,
+'s5184a3f3e2f7b603': `当前是匿名状态，选择私密选项后，评论将仅对网站管理员可见。`,
 's523eb9043213ff0d': `斜体`,
 's58a3c1ecd4dd06cf': `删除线`,
 's67749057edb2586b': `退出登录`,
@@ -29,6 +30,7 @@
 's7437373e541a8037': `昵称`,
 's7584ded3d749c75e': `加载更多`,
 's82665b2ffabc9c0a': `网站`,
+'s838e512973be01d4': `当前已登录，选择私密选项后，评论将仅对您和网站管理员可见。`,
 's84b033b2f7360187': `请先登录或者完善信息`,
 's98a5f7789c49dd3f': `审核中`,
 's9f2ed66340f019c6': `编写评论`,
diff --git a/packages/comment-widget/src/generated/locales/zh-TW.ts b/packages/comment-widget/src/generated/locales/zh-TW.ts
index 66f461c..73f286e 100644
--- a/packages/comment-widget/src/generated/locales/zh-TW.ts
+++ b/packages/comment-widget/src/generated/locales/zh-TW.ts
@@ -22,6 +22,7 @@
 's3643189d1abbb7f4': `程式碼`,
 's3fb33d17bad61aa9': `評論成功，請等待審核`,
 's4c0e15f9073382e6': `獲取驗證碼失敗`,
+'s5184a3f3e2f7b603': `目前是匿名狀態，選擇私密選項後，評論將僅對網站管理員可見。`,
 's523eb9043213ff0d': `斜體`,
 's58a3c1ecd4dd06cf': `刪除線`,
 's67749057edb2586b': `登出`,
@@ -29,6 +30,7 @@
 's7437373e541a8037': `暱稱`,
 's7584ded3d749c75e': `載入更多`,
 's82665b2ffabc9c0a': `網站`,
+'s838e512973be01d4': `目前已登入，選擇私密選項後，評論將僅對您和網站管理員可見。`,
 's84b033b2f7360187': `請先登入或者完善資訊`,
 's98a5f7789c49dd3f': `審核中`,
 's9f2ed66340f019c6': `撰寫評論`,
diff --git a/packages/comment-widget/xliff/es.xlf b/packages/comment-widget/xliff/es.xlf
index bcb16df..37967bf 100644
--- a/packages/comment-widget/xliff/es.xlf
+++ b/packages/comment-widget/xliff/es.xlf
@@ -154,6 +154,14 @@
   <source>Private</source>
   <target>Íntimo</target>
 </trans-unit>
+<trans-unit id="s838e512973be01d4">
+  <source>Currently logged in. After selecting the private option, comments will only be visible to yourself and the site administrator.</source>
+  <target>Actualmente conectado. Después de seleccionar la opción privada, los comentarios solo serán visibles para usted y el administrador del sitio.</target>
+</trans-unit>
+<trans-unit id="s5184a3f3e2f7b603">
+  <source>You are currently anonymous. After selecting the private option, the comment will only be visible to the site administrator.</source>
+  <target>Actualmente anónimo. Después de seleccionar la opción privada, el comentario solo será visible para el administrador del sitio.</target>
+</trans-unit>
 </body>
 </file>
 </xliff>
diff --git a/packages/comment-widget/xliff/zh-CN.xlf b/packages/comment-widget/xliff/zh-CN.xlf
index 31703ef..1289dc6 100644
--- a/packages/comment-widget/xliff/zh-CN.xlf
+++ b/packages/comment-widget/xliff/zh-CN.xlf
@@ -154,6 +154,14 @@
   <source>Private</source>
   <target>私密</target>
 </trans-unit>
+<trans-unit id="s838e512973be01d4">
+  <source>Currently logged in. After selecting the private option, comments will only be visible to yourself and the site administrator.</source>
+  <target>当前已登录，选择私密选项后，评论将仅对您和网站管理员可见。</target>
+</trans-unit>
+<trans-unit id="s5184a3f3e2f7b603">
+  <source>You are currently anonymous. After selecting the private option, the comment will only be visible to the site administrator.</source>
+  <target>当前是匿名状态，选择私密选项后，评论将仅对网站管理员可见。</target>
+</trans-unit>
 </body>
 </file>
 </xliff>
diff --git a/packages/comment-widget/xliff/zh-TW.xlf b/packages/comment-widget/xliff/zh-TW.xlf
index f01ffd3..d536733 100644
--- a/packages/comment-widget/xliff/zh-TW.xlf
+++ b/packages/comment-widget/xliff/zh-TW.xlf
@@ -154,6 +154,14 @@
   <source>Private</source>
   <target>私密</target>
 </trans-unit>
+<trans-unit id="s838e512973be01d4">
+  <source>Currently logged in. After selecting the private option, comments will only be visible to yourself and the site administrator.</source>
+  <target>目前已登入，選擇私密選項後，評論將僅對您和網站管理員可見。</target>
+</trans-unit>
+<trans-unit id="s5184a3f3e2f7b603">
+  <source>You are currently anonymous. After selecting the private option, the comment will only be visible to the site administrator.</source>
+  <target>目前是匿名狀態，選擇私密選項後，評論將僅對網站管理員可見。</target>
+</trans-unit>
 </body>
 </file>
 </xliff>

From 086ac0e40600e657bb9cca1b0c6028b653091a60 Mon Sep 17 00:00:00 2001
From: Ryan Wang <i@ryanc.cc>
Date: Mon, 18 Aug 2025 12:09:45 +0800
Subject: [PATCH 6/9] Refactor private comment badge rendering logic

---
 packages/comment-widget/src/base-comment-item.ts | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/packages/comment-widget/src/base-comment-item.ts b/packages/comment-widget/src/base-comment-item.ts
index b1f69e4..90c6b23 100644
--- a/packages/comment-widget/src/base-comment-item.ts
+++ b/packages/comment-widget/src/base-comment-item.ts
@@ -72,16 +72,13 @@ export class BaseCommentItem extends LitElement {
               `
           )}
 
-
-          ${
-            this.private && this.configMapData?.basic.showPrivateCommentBadge
-              ? html`
-              <div class="inline-flex items-center gap-1 bg-muted-3 rounded-base px-1.5 py-1">
+          ${when(
+            this.private && this.configMapData?.basic.showPrivateCommentBadge,
+            () => html`<div class="inline-flex items-center gap-1 bg-muted-3 rounded-base px-1.5 py-1">
                 <i class="i-ri-git-repository-private-line opacity-90 size-3" aria-hidden="true"></i>
                 <span class="text-xs text-text-2">${msg('Private')}</span>
               </div>`
-              : ''
-          }
+          )}
 
           ${when(this.ua && this.configMapData?.basic.showCommenterDevice, () => html`<commenter-ua-bar .ua=${this.ua}></commenter-ua-bar>`)}
           

From 785182a671294508f5bc812150d65b668e03a7ae Mon Sep 17 00:00:00 2001
From: Ryan Wang <i@ryanc.cc>
Date: Tue, 19 Aug 2025 10:43:55 +0800
Subject: [PATCH 7/9] Hide private checkbox in reply form

---
 packages/comment-widget/src/reply-form.ts | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/packages/comment-widget/src/reply-form.ts b/packages/comment-widget/src/reply-form.ts
index 3bfb6a0..19c15d6 100644
--- a/packages/comment-widget/src/reply-form.ts
+++ b/packages/comment-widget/src/reply-form.ts
@@ -75,7 +75,7 @@ export class ReplyForm extends LitElement {
     return html` <base-form
       .submitting=${this.submitting}
       .captcha=${this.captcha}
-      .hidePrivateCheckbox=${this.comment?.spec.hidden || false}
+      .hidePrivateCheckbox=${true}
       ${ref(this.baseFormRef)}
       @submit="${this.onSubmit}"
     ></base-form>`;
@@ -88,14 +88,13 @@ export class ReplyForm extends LitElement {
 
     const data = e.detail;
 
-    const { displayName, email, website, content, hidden } = data || {};
+    const { displayName, email, website, content } = data || {};
 
     const replyRequest: ReplyRequest = {
       raw: content,
       content: content,
       // TODO: support user input
       allowNotification: true,
-      hidden: hidden || false,
     };
 
     if (this.quoteReply) {

From c446d8b07b10c1109d59e5c2a4dd040692f86054 Mon Sep 17 00:00:00 2001
From: Ryan Wang <i@ryanc.cc>
Date: Tue, 19 Aug 2025 11:04:13 +0800
Subject: [PATCH 8/9] Update biome.json includes and import base-tooltip

---
 biome.json                               | 2 +-
 packages/comment-widget/src/base-form.ts | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/biome.json b/biome.json
index 3fc5b6a..e2de23f 100644
--- a/biome.json
+++ b/biome.json
@@ -7,7 +7,7 @@
   },
   "files": {
     "ignoreUnknown": false,
-    "includes": ["**", "!**/generated/**"]
+    "includes": ["**", "!**/generated"]
   },
   "formatter": {
     "enabled": true,
diff --git a/packages/comment-widget/src/base-form.ts b/packages/comment-widget/src/base-form.ts
index b2ee8c1..b54aecd 100644
--- a/packages/comment-widget/src/base-form.ts
+++ b/packages/comment-widget/src/base-form.ts
@@ -24,6 +24,7 @@ import { when } from 'lit/directives/when.js';
 import { ofetch } from 'ofetch';
 import type { CommentEditor } from './comment-editor';
 import { cleanHtml } from './utils/html';
+import './base-tooltip';
 
 export class BaseForm extends LitElement {
   @consume({ context: baseUrlContext })

From b6f25674070909723808134fd10d436e7381abb1 Mon Sep 17 00:00:00 2001
From: Ryan Wang <i@ryanc.cc>
Date: Tue, 19 Aug 2025 11:08:47 +0800
Subject: [PATCH 9/9] Update minimum required version in plugin.yaml

---
 src/main/resources/plugin.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/resources/plugin.yaml b/src/main/resources/plugin.yaml
index a766806..31b093a 100644
--- a/src/main/resources/plugin.yaml
+++ b/src/main/resources/plugin.yaml
@@ -8,7 +8,7 @@ metadata:
     "store.halo.run/app-id": "app-YXyaD"
 spec:
   enabled: true
-  requires: ">=2.21.0"
+  requires: ">=2.21.7"
   author:
     name: Halo
     website: https://github.com/halo-dev