twikoo-func 1.6.37 → 1.6.39

package/index.js

@@ -622,7 +622,7 @@ async function parse (comment) {
   const isAdminUser = await isAdmin()
   const isBloggerMail = equalsMail(comment.mail, config.BLOGGER_EMAIL)
   if (isBloggerMail && !isAdminUser) throw new Error('请先登录管理面板，再使用博主身份发送评论')
-  const hashMethod = this.gravatarCdn === 'cravatar.cn' ? md5 : sha256
+  const hashMethod = config.GRAVATAR_CDN === 'cravatar.cn' ? md5 : sha256
   const commentDo = {
     uid: await getUid(),
     nick: comment.nick ? comment.nick : '匿名',
@@ -643,7 +643,7 @@ async function parse (comment) {
   }
   if (isQQ(comment.mail)) {
     commentDo.mail = addQQMailSuffix(comment.mail)
-    commentDo.mailMd5 = md5(normalizeMail(commentDo.mail))
+    commentDo.mailMd5 = hashMethod(normalizeMail(commentDo.mail))
     commentDo.avatar = await getQQAvatar(comment.mail)
   }
   return commentDo

package/package.json

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

package/utils/index.js

@@ -218,6 +218,7 @@ const fn = {
   async getQQAvatar (qq) {
     try {
       const qqNum = qq.replace(/@qq.com/ig, '')
+      // TODO: 这个接口已经失效了，暂时找不到新的接口
       const result = await axios.get(`https://aq.qq.com/cn2/get_img/get_face?img_type=3&uin=${qqNum}`)
       return result.data?.url || null
     } catch (e) {

package/utils/spam.js

@@ -3,6 +3,9 @@ const {
   getCryptoJS,
   getTencentcloud
 } = require('./lib')
+const {
+  equalsMail
+} = require('.')
 const AkismetClient = getAkismetClient()
 const CryptoJS = getCryptoJS()
 
@@ -29,20 +32,30 @@ const fn = {
       if (comment.isSpam) {
         // 预检测没过的，就不再检测了
         isSpam = true
+      } else if (equalsMail(config.BLOGGER_EMAIL, comment.mail)) {
+        // 博主本人评论，不再检测了
+        isSpam = false
       } else if (config.QCLOUD_SECRET_ID && config.QCLOUD_SECRET_KEY) {
         // 腾讯云内容安全
-        const client = new (getTencentCloud().tms.v20200713.Client)({
+        const client = new (getTencentCloud().tms.v20201229.Client)({
           credential: { secretId: config.QCLOUD_SECRET_ID, secretKey: config.QCLOUD_SECRET_KEY },
           region: 'ap-shanghai',
           profile: { httpProfile: { endpoint: 'tms.tencentcloudapi.com' } }
         })
-        const checkResult = await client.TextModeration({
+        const textModerationParams = {
+          // 文档: https://cloud.tencent.com/document/api/1124/51860
           Content: CryptoJS.enc.Base64.stringify(CryptoJS.enc.Utf8.parse(comment.comment)),
-          Device: { IP: comment.ip },
-          User: { Nickname: comment.nick }
-        })
+          DataId: comment.id,
+          User: { Nickname: comment.nick },
+          Device: { IP: comment.ip }
+        }
+        if (config.QCLOUD_CMS_BIZTYPE) {
+          textModerationParams.BizType = config.QCLOUD_CMS_BIZTYPE
+        }
+        logger.log('腾讯云请求参数：', textModerationParams)
+        const checkResult = await client.TextModeration(textModerationParams)
         logger.log('腾讯云返回结果：', checkResult)
-        isSpam = checkResult.EvilFlag !== 0
+        isSpam = checkResult.Suggestion !== 'Pass'
       } else if (config.AKISMET_KEY) {
         // Akismet
         const akismetClient = new AkismetClient({