twikoo-func 1.6.13 → 1.6.15

package/package.json

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

package/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),

package/utils/index.js

@@ -1,3 +1,4 @@
+const { URL } = require('url')
 const { axios, bowser, ipToRegion, md5 } = require('./lib')
 const { RES_CODE } = require('./constants')
 const ipRegionSearcher = ipToRegion.create() // 初始化 IP 属地
@@ -110,11 +111,12 @@ const fn = {
     return comments
   },
   getRelativeUrl (url) {
-    let x = url.indexOf('/')
-    for (let i = 0; i < 2; i++) {
-      x = url.indexOf('/', x + 1)
+    try {
+      return (new URL(url)).pathname
+    } catch (e) {
+      // 如果 url 已经是一个相对地址了，会报 ERR_INVALID_URL，返回原始 url 就行
+      return url
     }
-    return url.substring(x)
   },
   getMailMd5 (comment) {
     if (comment.mailMd5) {