From a729a4f8a2bc6b5b007019d686fc7e809ae1095e Mon Sep 17 00:00:00 2001
From: iMaeGoo <mail1st@qq.com>
Date: Thu, 28 Dec 2023 20:46:16 +0800
Subject: [PATCH] fix: failed to reply comment

---
 docs/.vitepress/theme/Twikoo.vue        |  2 +-
 docs/backend.md                         |  2 +-
 docs/frontend.md                        | 10 +++++-----
 package.json                            |  2 +-
 src/client/version.js                   |  2 +-
 src/client/view/components/TkSubmit.vue |  9 +++++++--
 src/server/function/twikoo/package.json |  2 +-
 src/server/netlify/package.json         |  2 +-
 src/server/self-hosted/package.json     |  4 ++--
 src/server/vercel/package.json          |  4 ++--
 10 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/docs/.vitepress/theme/Twikoo.vue b/docs/.vitepress/theme/Twikoo.vue
index 429286d61..4dab1b625 100644
--- a/docs/.vitepress/theme/Twikoo.vue
+++ b/docs/.vitepress/theme/Twikoo.vue
@@ -73,6 +73,6 @@ onMounted(() => {
 
     <!-- Twikoo -->
     <div id="twikoo"></div>
-    <component :is="'script'" src="https://cdn.jsdelivr.net/npm/twikoo@1.6.28/dist/twikoo.min.js" ref="twikooJs"></component>
+    <component :is="'script'" src="https://cdn.jsdelivr.net/npm/twikoo@1.6.29/dist/twikoo.min.js" ref="twikooJs"></component>
   </div>
 </template>
diff --git a/docs/backend.md b/docs/backend.md
index 653fda4d3..56bf7b42b 100644
--- a/docs/backend.md
+++ b/docs/backend.md
@@ -43,7 +43,7 @@ exports.main = require('twikoo-func').main
 8. 创建完成后，点击“twikoo"进入云函数详情页，进入“函数代码”标签，点击“文件 - 新建文件”，输入 `package.json`，回车
 9. 复制以下代码、粘贴到代码框中，点击“保存并安装依赖”
 ``` json
-{ "dependencies": { "twikoo-func": "1.6.28" } }
+{ "dependencies": { "twikoo-func": "1.6.29" } }
 ```
 
 ## 腾讯云命令行部署
diff --git a/docs/frontend.md b/docs/frontend.md
index e81c3e4e8..9c212d8a9 100644
--- a/docs/frontend.md
+++ b/docs/frontend.md
@@ -85,7 +85,7 @@ twikoo:
 
 ``` html
 <div id="tcomment"></div>
-<script src="https://cdn.staticfile.org/twikoo/1.6.28/twikoo.all.min.js"></script>
+<script src="https://cdn.staticfile.org/twikoo/1.6.29/twikoo.all.min.js"></script>
 <script>
 twikoo.init({
   envId: '您的环境id', // 腾讯云环境填 envId；Vercel 环境填地址（https://xxx.vercel.app）
@@ -103,10 +103,10 @@ twikoo.init({
 
 如果遇到默认 CDN 加载速度缓慢，可更换其他 CDN 镜像。以下为可供选择的公共 CDN，其中一些 CDN 可能需要数天时间同步最新版本：
 
-* `https://cdn.staticfile.org/twikoo/1.6.28/twikoo.all.min.js`
-* `https://lib.baomitu.com/twikoo/1.6.28/twikoo.all.min.js`
-* `https://cdn.bootcdn.net/ajax/libs/twikoo/1.6.28/twikoo.all.min.js`
-* `https://cdn.jsdelivr.net/npm/twikoo@1.6.28/dist/twikoo.all.min.js`
+* `https://cdn.staticfile.org/twikoo/1.6.29/twikoo.all.min.js`
+* `https://lib.baomitu.com/twikoo/1.6.29/twikoo.all.min.js`
+* `https://cdn.bootcdn.net/ajax/libs/twikoo/1.6.29/twikoo.all.min.js`
+* `https://cdn.jsdelivr.net/npm/twikoo@1.6.29/dist/twikoo.all.min.js`
 
 ## 开启管理面板（腾讯云环境）
 
diff --git a/package.json b/package.json
index f9fa6a75b..02ad2d6c6 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "twikoo",
-  "version": "1.6.28",
+  "version": "1.6.29",
   "description": "A simple comment system.",
   "keywords": [
     "twikoojs",
diff --git a/src/client/version.js b/src/client/version.js
index 3a9307055..5a3e7477b 100644
--- a/src/client/version.js
+++ b/src/client/version.js
@@ -1,3 +1,3 @@
-const version = '1.6.28'
+const version = '1.6.29'
 
 export { version }
diff --git a/src/client/view/components/TkSubmit.vue b/src/client/view/components/TkSubmit.vue
index f0df3abe4..528f04dd1 100644
--- a/src/client/view/components/TkSubmit.vue
+++ b/src/client/view/components/TkSubmit.vue
@@ -42,7 +42,7 @@
           :disabled="!canSend"
           @click="send">{{ isSending ? t('SUBMIT_SENDING') : t('SUBMIT_SEND') }}</el-button>
       <div class="tk-turnstile-container" ref="turnstile-container">
-        <div class="tk-turnstile" id="tk-turnstile"></div>
+        <div class="tk-turnstile" ref="turnstile"></div>
       </div>
     </div>
     <div class="tk-preview-container" v-if="isPreviewing" v-html="commentHtml" ref="comment-preview"></div>
@@ -150,6 +150,10 @@ export default {
     },
     initTurnstile () {
       if (!this.config.TURNSTILE_SITE_KEY) return
+      if (window.turnstile) {
+        this.turnstileLoad = Promise.resolve()
+        return
+      }
       this.turnstileLoad = new Promise((resolve, reject) => {
         const scriptEl = document.createElement('script')
         scriptEl.src = 'https://challenges.cloudflare.com/turnstile/v0/api.js?render=explicit'
@@ -161,7 +165,7 @@ export default {
     getTurnstileToken () {
       return new Promise((resolve, reject) => {
         this.turnstileLoad.then(() => {
-          const widgetId = window.turnstile.render('#tk-turnstile', {
+          const widgetId = window.turnstile.render(this.$refs.turnstile, {
             sitekey: this.config.TURNSTILE_SITE_KEY,
             callback: (token) => {
               resolve(token)
@@ -372,6 +376,7 @@ export default {
     this.initOwo()
     this.addEventListener()
     this.onBgImgChange()
+    this.initTurnstile()
   },
   watch: {
     'config.SHOW_EMOTION': function () {
diff --git a/src/server/function/twikoo/package.json b/src/server/function/twikoo/package.json
index d99e7b13d..d0c4e0bb0 100644
--- a/src/server/function/twikoo/package.json
+++ b/src/server/function/twikoo/package.json
@@ -1,6 +1,6 @@
 {
   "name": "twikoo-func",
-  "version": "1.6.28",
+  "version": "1.6.29",
   "description": "A simple comment system.",
   "author": "imaegoo <hello@imaegoo.com> (https://github.com/imaegoo)",
   "license": "MIT",
diff --git a/src/server/netlify/package.json b/src/server/netlify/package.json
index d583782a2..ca98ff018 100644
--- a/src/server/netlify/package.json
+++ b/src/server/netlify/package.json
@@ -1,6 +1,6 @@
 {
   "name": "twikoo-netlify",
-  "version": "1.6.28",
+  "version": "1.6.29",
   "description": "A simple comment system.",
   "author": "imaegoo <hello@imaegoo.com> (https://github.com/imaegoo)",
   "license": "MIT",
diff --git a/src/server/self-hosted/package.json b/src/server/self-hosted/package.json
index 5cb8f09e9..16909f8af 100644
--- a/src/server/self-hosted/package.json
+++ b/src/server/self-hosted/package.json
@@ -1,6 +1,6 @@
 {
   "name": "tkserver",
-  "version": "1.6.28",
+  "version": "1.6.29",
   "description": "A simple comment system.",
   "keywords": [
     "twikoo",
@@ -31,7 +31,7 @@
     "get-user-ip": "^1.0.1",
     "lokijs": "^1.5.12",
     "mongodb": "^3.6.3",
-    "twikoo-func": "1.6.28",
+    "twikoo-func": "1.6.29",
     "uuid": "^8.3.2"
   }
 }
diff --git a/src/server/vercel/package.json b/src/server/vercel/package.json
index a92615c40..49eb00c98 100644
--- a/src/server/vercel/package.json
+++ b/src/server/vercel/package.json
@@ -1,6 +1,6 @@
 {
   "name": "twikoo-vercel",
-  "version": "1.6.28",
+  "version": "1.6.29",
   "description": "A simple comment system.",
   "author": "imaegoo <hello@imaegoo.com> (https://github.com/imaegoo)",
   "license": "MIT",
@@ -13,7 +13,7 @@
   "dependencies": {
     "get-user-ip": "^1.0.1",
     "mongodb": "^3.6.3",
-    "twikoo-func": "1.6.28",
+    "twikoo-func": "1.6.29",
     "uuid": "^8.3.2"
   }
 }