twikoo-vercel 1.6.26 → 1.6.28

package/api/index.js

@@ -31,6 +31,7 @@ const {
   getQQAvatar,
   getPasswordStatus,
   preCheckSpam,
+  checkTurnstileCaptcha,
   getConfig,
   getConfigForAdmin,
   validate
@@ -596,6 +597,8 @@ async function commentSubmit (event, request) {
   validate(event, ['url', 'ua', 'comment'])
   // 限流
   await limitFilter(request)
+  // 验证码
+  await checkCaptcha(event, request)
   // 预检测、转换
   const data = await parse(event, request)
   // 保存
@@ -615,7 +618,7 @@ async function commentSubmit (event, request) {
     ])
     logger.log('POST_SUBMIT')
   } catch (e) {
-    logger.error('POST_SUBMIT 失败', e)
+    logger.error('POST_SUBMIT 失败', e.message)
   }
   return res
 }
@@ -711,6 +714,16 @@ async function limitFilter (request) {
   }
 }
 
+async function checkCaptcha (comment, request) {
+  if (config.TURNSTILE_SITE_KEY && config.TURNSTILE_SECRET_KEY) {
+    await checkTurnstileCaptcha({
+      ip: getIp(request),
+      turnstileToken: comment.turnstileToken,
+      turnstileTokenSecretKey: config.TURNSTILE_SECRET_KEY
+    })
+  }
+}
+
 async function saveSpamCheckResult (comment, isSpam) {
   comment.isSpam = isSpam
   if (isSpam) {
@@ -827,6 +840,9 @@ async function getRecentComments (event) {
   try {
     const query = {}
     query.isSpam = { $ne: true }
+    if (event.urls && event.urls.length) {
+      query.url = { $in: getUrlsQuery(event.urls) }
+    }
     if (!event.includeReply) query.rid = { $in: ['', null] }
     if (event.pageSize > 100) event.pageSize = 100
     const result = await db

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "twikoo-vercel",
-  "version": "1.6.26",
+  "version": "1.6.28",
   "description": "A simple comment system.",
   "author": "imaegoo <hello@imaegoo.com> (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.26",
+    "twikoo-func": "1.6.28",
     "uuid": "^8.3.2"
   }
 }