twikoo-func 1.6.0-beta.2 → 1.6.2

package/index.js

@@ -575,7 +575,7 @@ async function getParentComment (currentComment) {
 async function postSubmit (comment, context) {
   if (!isRecursion(context)) return { code: RES_CODE.FORBIDDEN }
   // 垃圾检测
-  const isSpam = await postCheckSpam(comment)
+  const isSpam = await postCheckSpam(comment, config)
   await saveSpamCheckResult(comment, isSpam)
   // 发送通知
   await sendNotice(comment, config, getParentComment)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "twikoo-func",
-  "version": "1.6.0-beta.2",
+  "version": "1.6.2",
   "description": "A simple comment system.",
   "author": "imaegoo <hello@imaegoo.com> (https://github.com/imaegoo)",
   "license": "MIT",
@@ -13,6 +13,7 @@
   "dependencies": {
     "@cloudbase/manager-node": "^3.9.0",
     "@cloudbase/node-sdk": "^2.5.0",
+    "@imaegoo/node-ip2region": "^2.1.1",
     "akismet-api": "^5.1.0",
     "axios": "^0.21.1",
     "blueimp-md5": "^2.18.0",
@@ -20,7 +21,6 @@
     "cheerio": "1.0.0-rc.5",
     "crypto-js": "^4.0.0",
     "dompurify": "^2.2.6",
-    "dy-node-ip2region": "^1.0.1",
     "form-data": "^4.0.0",
     "jsdom": "^16.4.0",
     "marked": "^4.0.12",

package/utils/import.js

@@ -196,6 +196,12 @@ const fn = {
           // 解决 id 历史数据问题
           parsed._id = comment._id.$oid
         }
+        if (comment.pid === null) {
+          delete comment.pid
+        }
+        if (comment.rid === null) {
+          delete comment.rid
+        }
         comments.push(parsed)
         log(`${comment._id} 解析成功`)
       } catch (e) {

package/utils/index.js

@@ -87,6 +87,8 @@ const fn = {
   getIpRegion ({ ip, detail = false }) {
     if (!ip) return ''
     try {
+      // 将 IPv6 格式的 IPv4 地址转换为 IPv4 格式
+      ip = ip.replace(/^::ffff:/, '')
       const { region } = ipRegionSearcher.binarySearchSync(ip)
       const [country,, province, city, isp] = region.split('|')
       // 有省显示省，没有省显示国家
@@ -97,7 +99,7 @@ const fn = {
         return area
       }
     } catch (e) {
-      console.error('IP 属地查询失败：', e)
+      console.error('IP 属地查询失败：', e.message)
       return ''
     }
   },

package/utils/lib.js

@@ -6,7 +6,7 @@ const { JSDOM } = require('jsdom') // document.window 服务器版
 const axios = require('axios') // 发送 REST 请求
 const bowser = require('bowser') // UserAgent 格式化
 const createDOMPurify = require('dompurify') // 反 XSS
-const ipToRegion = require('dy-node-ip2region') // IP 属地查询
+const ipToRegion = require('@imaegoo/node-ip2region') // IP 属地查询
 const marked = require('marked') // Markdown 解析
 const md5 = require('blueimp-md5') // MD5 加解密
 const nodemailer = require('nodemailer') // 发送邮件

package/utils/notify.js

@@ -155,7 +155,7 @@ const fn = {
   async noticeReply (currentComment, config, getParentComment) {
     if (!currentComment.pid) return
     if (!transporter) if (!await fn.initMailer({ config })) return
-    const parentComment = await getParentComment()
+    const parentComment = await getParentComment(currentComment)
     // 回复给博主，因为会发博主通知邮件，所以不再重复通知
     if (config.BLOGGER_EMAIL === parentComment.mail) return
     // 回复自己的评论，不邮件通知