tkserver 1.6.45 → 1.7.0

package/index.js

@@ -34,6 +34,7 @@ const {
   getPasswordStatus,
   preCheckSpam,
   checkTurnstileCaptcha,
+  checkGeeTestCaptcha,
   getConfig,
   getConfigForAdmin,
   validate
@@ -274,6 +275,7 @@ async function commentGet (event) {
     const uid = event.accessToken
     const isAdminUser = isAdmin(event.accessToken)
     const limit = parseInt(config.COMMENT_PAGE_SIZE) || 8
+    const sort = event.sort || 'newest'
     let more = false
     let condition
     let query
@@ -294,11 +296,21 @@ async function commentGet (event) {
     // 不包含置顶
     condition.top = { $ne: true }
     query = getCommentQuery({ condition, uid, isAdminUser })
+
+    let sortOrder
+    if (sort === 'oldest') {
+      sortOrder = [['created', false]]
+    } else if (sort === 'popular') {
+      sortOrder = [['ups', true], ['created', true]]
+    } else {
+      sortOrder = [['created', true]]
+    }
+
     let main = db
       .getCollection('comment')
       .chain()
       .find(query)
-      .compoundsort([['created', true]])
+      .compoundsort(sortOrder)
       // 流式分页，通过多读 1 条的方式，确认是否还有更多评论
       .limit(limit + 1)
       .data()
@@ -558,30 +570,47 @@ async function bulkSaveComments (comments) {
     .insert(comments)
 }
 
-// 点赞 / 取消点赞
+// 点赞 / 反对 / 取消
 async function commentLike (event) {
   const res = {}
   validate(event, ['id'])
-  res.updated = await like(event.id, event.accessToken)
+  const type = event.type || 'up'
+  res.updated = await like(event.id, event.accessToken, type)
   return res
 }
 
-// 点赞 / 取消点赞
-async function like (id, uid) {
+// 点赞 / 反对 / 取消
+async function like (id, uid, type) {
   const record = db
     .getCollection('comment')
   const comment = await record
     .findOne({ _id: id })
-  let likes = comment && comment.like ? comment.like : []
-  if (likes.findIndex((item) => item === uid) === -1) {
-    // 赞
-    likes.push(uid)
-  } else {
-    // 取消赞
-    likes = likes.filter((item) => item !== uid)
+  const commentData = comment || {}
+  const ups = commentData.ups || []
+  const downs = commentData.downs || []
+
+  let newUps = [...ups]
+  let newDowns = [...downs]
+
+  if (type === 'up') {
+    if (ups.includes(uid)) {
+      newUps = ups.filter((item) => item !== uid)
+    } else {
+      newUps.push(uid)
+      newDowns = downs.filter((item) => item !== uid)
+    }
+  } else if (type === 'down') {
+    if (downs.includes(uid)) {
+      newDowns = downs.filter((item) => item !== uid)
+    } else {
+      newDowns.push(uid)
+      newUps = ups.filter((item) => item !== uid)
+    }
   }
+
   await record.findAndUpdate({ _id: id }, (obj) => {
-    obj.like = likes
+    obj.ups = newUps
+    obj.downs = newDowns
     return obj
   })
   return 1
@@ -719,6 +748,11 @@ async function limitFilter (request) {
 }
 
 async function checkCaptcha (comment, request) {
+  logger.log('验证码配置:', {
+    TURNSTILE_SITE_KEY: config.TURNSTILE_SITE_KEY,
+    GEETEST_CAPTCHA_ID: config.GEETEST_CAPTCHA_ID,
+    GEETEST_CAPTCHA_KEY: config.GEETEST_CAPTCHA_KEY ? '***' : undefined
+  })
   if (config.TURNSTILE_SITE_KEY && config.TURNSTILE_SECRET_KEY) {
     await checkTurnstileCaptcha({
       ip: getIp(request),
@@ -726,6 +760,16 @@ async function checkCaptcha (comment, request) {
       turnstileTokenSecretKey: config.TURNSTILE_SECRET_KEY
     })
   }
+  if (config.GEETEST_CAPTCHA_ID && config.GEETEST_CAPTCHA_KEY) {
+    await checkGeeTestCaptcha({
+      geeTestCaptchaId: config.GEETEST_CAPTCHA_ID,
+      geeTestCaptchaKey: config.GEETEST_CAPTCHA_KEY,
+      geeTestLotNumber: comment.geeTestLotNumber,
+      geeTestCaptchaOutput: comment.geeTestCaptchaOutput,
+      geeTestPassToken: comment.geeTestPassToken,
+      geeTestGenTime: comment.geeTestGenTime
+    })
+  }
 }
 
 async function saveSpamCheckResult (comment, isSpam) {

package/mongo.js

@@ -268,6 +268,7 @@ async function commentGet (event) {
     const uid = event.accessToken
     const isAdminUser = isAdmin(event.accessToken)
     const limit = parseInt(config.COMMENT_PAGE_SIZE) || 8
+    const sort = event.sort || 'newest'
     let more = false
     let condition
     let query
@@ -288,10 +289,21 @@ async function commentGet (event) {
     // 不包含置顶
     condition.top = { $ne: true }
     query = getCommentQuery({ condition, uid, isAdminUser })
+
+    let orderField = 'created'
+    let orderDirection = -1
+    if (sort === 'oldest') {
+      orderField = 'created'
+      orderDirection = 1
+    } else if (sort === 'popular') {
+      orderField = 'ups'
+      orderDirection = -1
+    }
+
     let main = await db
       .collection('comment')
       .find(query)
-      .sort({ created: -1 })
+      .sort({ [orderField]: orderDirection })
       // 流式分页，通过多读 1 条的方式，确认是否还有更多评论
       .limit(limit + 1)
       .toArray()
@@ -547,30 +559,46 @@ async function bulkSaveComments (comments) {
   return batchRes.insertedCount
 }
 
-// 点赞 / 取消点赞
+// 点赞 / 反对 / 取消
 async function commentLike (event) {
   const res = {}
   validate(event, ['id'])
-  res.updated = await like(event.id, event.accessToken)
+  const type = event.type || 'up'
+  res.updated = await like(event.id, event.accessToken, type)
   return res
 }
 
-// 点赞 / 取消点赞
-async function like (id, uid) {
+// 点赞 / 反对 / 取消
+async function like (id, uid, type) {
   const record = db
     .collection('comment')
   const comment = await record
     .findOne({ _id: id })
-  let likes = comment && comment.like ? comment.like : []
-  if (likes.findIndex((item) => item === uid) === -1) {
-    // 赞
-    likes.push(uid)
-  } else {
-    // 取消赞
-    likes = likes.filter((item) => item !== uid)
+  const commentData = comment || {}
+  const ups = commentData.ups || []
+  const downs = commentData.downs || []
+
+  let newUps = [...ups]
+  let newDowns = [...downs]
+
+  if (type === 'up') {
+    if (ups.includes(uid)) {
+      newUps = ups.filter((item) => item !== uid)
+    } else {
+      newUps.push(uid)
+      newDowns = downs.filter((item) => item !== uid)
+    }
+  } else if (type === 'down') {
+    if (downs.includes(uid)) {
+      newDowns = downs.filter((item) => item !== uid)
+    } else {
+      newDowns.push(uid)
+      newUps = ups.filter((item) => item !== uid)
+    }
   }
+
   const result = await record.updateOne({ _id: id }, {
-    $set: { like: likes }
+    $set: { ups: newUps, downs: newDowns }
   })
   return result
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tkserver",
-  "version": "1.6.45",
+  "version": "1.7.0",
   "description": "A simple comment system.",
   "keywords": [
     "twikoo",
@@ -31,7 +31,7 @@
     "get-user-ip": "^1.0.1",
     "lokijs": "^1.5.12",
     "mongodb": "^6.3.0",
-    "twikoo-func": "1.6.45",
+    "twikoo-func": "1.7.0",
     "uuid": "^8.3.2"
   }
 }