fix: pid/rid/spam field when importing artrans

docs/.vuepress/theme/layouts/Layout.vue

@@ -13,7 +13,7 @@
 
         <!-- Twikoo -->
         <div id="twikoo"></div>
-        <component :is="'script'" src="https://cdn.jsdelivr.net/npm/[email protected].14/dist/twikoo.all.min.js" ref="twikooJs"></component>
+        <component :is="'script'" src="https://cdn.jsdelivr.net/npm/[email protected].15/dist/twikoo.all.min.js" ref="twikooJs"></component>
       </div>
     </template>
   </ParentLayout>

docs/en/quick-start.md

@@ -51,7 +51,7 @@ exports.main = require('twikoo-func').main
 8. 创建完成后，点击“twikoo"进入云函数详情页，进入“函数代码”标签，点击“文件 - 新建文件”，输入 `package.json`，回车
 9. 复制以下代码、粘贴到代码框中，点击“保存并安装依赖”
 ``` json
-{ "dependencies": { "twikoo-func": "1.6.14" } }
+{ "dependencies": { "twikoo-func": "1.6.15" } }
 ```
 
 ### 命令行部署
@@ -248,7 +248,7 @@ twikoo:
 
 ``` html
 <div id="tcomment"></div>
-<script src="https://cdn.staticfile.org/twikoo/1.6.14/twikoo.all.min.js"></script>
+<script src="https://cdn.staticfile.org/twikoo/1.6.15/twikoo.all.min.js"></script>
 <script>
 twikoo.init({
   envId: '您的环境id', // 腾讯云环境填 envId；Vercel 环境填地址（https://xxx.vercel.app）
@@ -266,10 +266,10 @@ twikoo.init({
 
 如果遇到默认 CDN 加载速度缓慢，可更换其他 CDN 镜像。以下为可供选择的公共 CDN，其中一些 CDN 可能需要数天时间同步最新版本：
 
-* `https://cdn.staticfile.org/twikoo/1.6.14/twikoo.all.min.js`
-* `https://lib.baomitu.com/twikoo/1.6.14/twikoo.all.min.js`
-* `https://cdn.bootcdn.net/ajax/libs/twikoo/1.6.14/twikoo.all.min.js`
-* `https://cdn.jsdelivr.net/npm/[email protected].14/dist/twikoo.all.min.js`
+* `https://cdn.staticfile.org/twikoo/1.6.15/twikoo.all.min.js`
+* `https://lib.baomitu.com/twikoo/1.6.15/twikoo.all.min.js`
+* `https://cdn.bootcdn.net/ajax/libs/twikoo/1.6.15/twikoo.all.min.js`
+* `https://cdn.jsdelivr.net/npm/[email protected].15/dist/twikoo.all.min.js`
 
 ## 开启管理面板（腾讯云环境）
 

docs/quick-start.md

@@ -47,7 +47,7 @@ exports.main = require('twikoo-func').main
 8. 创建完成后，点击“twikoo"进入云函数详情页，进入“函数代码”标签，点击“文件 - 新建文件”，输入 `package.json`，回车
 9. 复制以下代码、粘贴到代码框中，点击“保存并安装依赖”
 ``` json
-{ "dependencies": { "twikoo-func": "1.6.14" } }
+{ "dependencies": { "twikoo-func": "1.6.15" } }
 ```
 
 ### 命令行部署
@@ -244,7 +244,7 @@ twikoo:
 
 ``` html
 <div id="tcomment"></div>
-<script src="https://cdn.staticfile.org/twikoo/1.6.14/twikoo.all.min.js"></script>
+<script src="https://cdn.staticfile.org/twikoo/1.6.15/twikoo.all.min.js"></script>
 <script>
 twikoo.init({
   envId: '您的环境id', // 腾讯云环境填 envId；Vercel 环境填地址（https://xxx.vercel.app）
@@ -262,10 +262,10 @@ twikoo.init({
 
 如果遇到默认 CDN 加载速度缓慢，可更换其他 CDN 镜像。以下为可供选择的公共 CDN，其中一些 CDN 可能需要数天时间同步最新版本：
 
-* `https://cdn.staticfile.org/twikoo/1.6.14/twikoo.all.min.js`
-* `https://lib.baomitu.com/twikoo/1.6.14/twikoo.all.min.js`
-* `https://cdn.bootcdn.net/ajax/libs/twikoo/1.6.14/twikoo.all.min.js`
-* `https://cdn.jsdelivr.net/npm/[email protected].14/dist/twikoo.all.min.js`
+* `https://cdn.staticfile.org/twikoo/1.6.15/twikoo.all.min.js`
+* `https://lib.baomitu.com/twikoo/1.6.15/twikoo.all.min.js`
+* `https://cdn.bootcdn.net/ajax/libs/twikoo/1.6.15/twikoo.all.min.js`
+* `https://cdn.jsdelivr.net/npm/[email protected].15/dist/twikoo.all.min.js`
 
 ## 开启管理面板（腾讯云环境）
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "twikoo",
-  "version": "1.6.14",
+  "version": "1.6.15",
   "description": "A simple comment system.",
   "keywords": [
     "twikoojs",

src/client/version.js

@@ -1,3 +1,3 @@
-const version = '1.6.14'
+const version = '1.6.15'
 
 export { version }

src/client/view/components/TkAdminExport.vue

@@ -26,14 +26,14 @@ export default {
           collection
         })
         if (result.result.data) {
-          this.downloadJson(`${collection}.json`, result.result.data)
+          this.downloadJson(`twikoo-${collection}.json`, result.result.data)
         }
       } finally {
         this.loading = false
       }
     },
     downloadJson (fileName, json) {
-      const jsonStr = (json instanceof Object) ? JSON.stringify(json) : json
+      const jsonStr = (json instanceof Object) ? JSON.stringify(json, null, 2) : json
       const url = window.URL || window.webkitURL || window
       const blob = new Blob([jsonStr])
       const saveLink = document.createElementNS('http://www.w3.org/1999/xhtml', 'a')

src/server/function/twikoo/package.json

@@ -1,6 +1,6 @@
 {
   "name": "twikoo-func",
-  "version": "1.6.14",
+  "version": "1.6.15",
   "description": "A simple comment system.",
   "author": "imaegoo <[email protected]> (https://github.com/imaegoo)",
   "license": "MIT",

src/server/function/twikoo/utils/import.js

@@ -115,8 +115,8 @@ const fn = {
           ip: '',
           isSpam: post.isSpam[0] === 'true' || post.isDeleted[0] === 'true',
           master: false,
-          pid: parent ? parent.$['dsq:id'] : null,
-          rid: root ? root.$['dsq:id'] : null,
+          pid: parent ? parent.$['dsq:id'] : undefined,
+          rid: root ? root.$['dsq:id'] : undefined,
           created: new Date(post.createdAt[0]).getTime(),
           updated: Date.now()
         })
@@ -157,8 +157,8 @@ const fn = {
           isSpam: false,
           ua: comment.ua || '',
           link: comment.link,
-          pid: comment.rid ? `artalk${comment.rid}` : '',
-          rid: comment.rid ? `artalk${comment.rid}` : '',
+          pid: comment.rid && comment.rid !== '0' ? `artalk${comment.rid}` : undefined,
+          rid: comment.rid && comment.rid !== '0' ? `artalk${comment.rid}` : undefined,
           master: false,
           comment: DOMPurify.sanitize(marked.marked(comment.content)),
           url: getRelativeUrl(comment.page_key),
@@ -201,11 +201,11 @@ const fn = {
           ip: comment.ip,
           mail: comment.email,
           mailMd5: md5(comment.email),
-          isSpam: comment.is_pending,
+          isSpam: comment.is_pending === 'true',
           ua: comment.ua || '',
           link: comment.link,
-          pid: comment.rid ? `artalk${comment.rid}` : '',
-          rid: comment.rid ? `artalk${comment.rid}` : '',
+          pid: comment.rid && comment.rid !== '0' ? `artalk${comment.rid}` : undefined,
+          rid: comment.rid && comment.rid !== '0' ? `artalk${comment.rid}` : undefined,
           master: false,
           comment: DOMPurify.sanitize(marked.marked(comment.content)),
           url: getRelativeUrl(comment.page_key),

src/server/self-hosted/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tkserver",
-  "version": "1.6.14",
+  "version": "1.6.15",
   "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.14",
+    "twikoo-func": "1.6.15",
     "uuid": "^8.3.2"
   }
 }

src/server/vercel-min/package.json

@@ -1 +1 @@
-{ "dependencies": { "twikoo-vercel": "1.6.14" } }
+{ "dependencies": { "twikoo-vercel": "1.6.15" } }

src/server/vercel/package.json

@@ -1,6 +1,6 @@
 {
   "name": "twikoo-vercel",
-  "version": "1.6.14",
+  "version": "1.6.15",
   "description": "A simple comment system.",
   "author": "imaegoo <[email protected]> (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.14",
+    "twikoo-func": "1.6.15",
     "uuid": "^8.3.2"
   }
 }