twikoo-func 1.7.22 → 1.7.23

package/index.js

@@ -284,7 +284,7 @@ async function commentGet (event) {
       url: _.in(getUrlQuery(event.url)),
       rid: _.in(['', null])
     }
-    // 查询非垃圾评论 + 自己的评论
+    // 按当前用户和配置查询可见评论
     query = getCommentQuery({ condition, uid, isAdminUser })
     // 读取总条数
     const count = await db
@@ -325,10 +325,7 @@ async function commentGet (event) {
     let top = []
     if (!config.TOP_DISABLED && !event.before) {
       // 查询置顶评论
-      query = {
-        ...condition,
-        top: true
-      }
+      query = getCommentQuery({ condition: { ...condition, top: true }, uid, isAdminUser })
       top = await db
         .collection('comment')
         .where(query)
@@ -434,6 +431,9 @@ async function commentSearch (event) {
 }
 
 function getCommentQuery ({ condition, uid, isAdminUser }) {
+  if (config.HIDE_SPAM === 'true') {
+    return { ...condition, isSpam: _.neq(true) }
+  }
   return _.or(
     { ...condition, isSpam: _.neq(isAdminUser ? 'imaegoo' : true) },
     { ...condition, uid }

package/package.json

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

package/utils/index.js

@@ -288,7 +288,7 @@ const fn = {
     }
   },
   // 预垃圾评论检测
-  preCheckSpam ({ comment, nick }, config) {
+  preCheckSpam ({ comment, nick, link, mail }, config) {
     // 长度限制
     let limitLength = parseInt(config.LIMIT_LENGTH)
     if (Number.isNaN(limitLength)) limitLength = 500
@@ -313,9 +313,11 @@ const fn = {
       // 违禁词检测
       const commentLowerCase = comment.toLowerCase()
       const nickLowerCase = nick.toLowerCase()
+      const linkLowerCase = (link || '').toLowerCase()
+      const mailLowerCase = (mail || '').toLowerCase()
       for (const forbiddenWord of config.FORBIDDEN_WORDS.replace(/,+$/, '').split(',')) {
         const forbiddenWordLowerCase = forbiddenWord.trim().toLowerCase()
-        if (commentLowerCase.indexOf(forbiddenWordLowerCase) !== -1 || nickLowerCase.indexOf(forbiddenWordLowerCase) !== -1) {
+        if (commentLowerCase.indexOf(forbiddenWordLowerCase) !== -1 || nickLowerCase.indexOf(forbiddenWordLowerCase) !== -1 || linkLowerCase.indexOf(forbiddenWordLowerCase) !== -1 || mailLowerCase.indexOf(forbiddenWordLowerCase) !== -1) {
           logger.warn('包含违禁词，直接标记为垃圾评论~')
           return true
         }