twikoo-func 1.6.2 → 1.6.5

package/package.json

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

package/utils/image.js

@@ -46,6 +46,9 @@ const fn = {
     // 自定义兰空图床（v2）URL
     const formData = new FormData()
     formData.append('file', fn.base64UrlToReadStream(photo, fileName))
+    if (process.env.TWIKOO_LSKY_STRATEGY_ID) {
+      formData.append('strategy_id', parseInt(process.env.TWIKOO_LSKY_STRATEGY_ID))
+    }
     const url = `${imageCdn}/api/v1/upload`
     let token = config.IMAGE_CDN_TOKEN
     if (!token.startsWith('Bearer')) {

package/utils/index.js

@@ -96,7 +96,7 @@ const fn = {
       if (detail) {
         return area === city ? [city, isp].join(' ') : [area, city, isp].join(' ')
       } else {
-        return area
+        return area.replace(/(省|市)$/, '')
       }
     } catch (e) {
       console.error('IP 属地查询失败：', e.message)

package/utils/notify.js

@@ -57,12 +57,20 @@ const fn = {
   },
   // 博主通知
   async noticeMaster (comment, config) {
-    if (!transporter) if (!await fn.initMailer({ config })) return
-    if (config.BLOGGER_EMAIL === comment.mail) return
+    if (!transporter && !await fn.initMailer({ config })) {
+      console.log('未配置邮箱或邮箱配置有误，不通知')
+      return
+    }
+    if (config.BLOGGER_EMAIL && config.BLOGGER_EMAIL === comment.mail) {
+      console.log('博主本人评论，不发送通知给博主')
+      return
+    }
     // 判断是否存在即时消息推送配置
     const hasIMPushConfig = config.PUSHOO_CHANNEL && config.PUSHOO_TOKEN
-    // 存在即时消息推送配置，则默认不发送邮件给博主
-    if (hasIMPushConfig && config.SC_MAIL_NOTIFY !== 'true') return
+    if (hasIMPushConfig && config.SC_MAIL_NOTIFY !== 'true') {
+      console.log('存在即时消息推送配置，默认不发送邮件给博主，您可以在管理面板修改此行为')
+      return
+    }
     const SITE_NAME = config.SITE_NAME
     const NICK = comment.nick
     const IMG = getAvatar(comment, config)
@@ -114,7 +122,10 @@ const fn = {
       console.log('没有配置 pushoo，放弃即时消息通知')
       return
     }
-    if (config.BLOGGER_EMAIL === comment.mail) return
+    if (config.BLOGGER_EMAIL && config.BLOGGER_EMAIL === comment.mail) {
+      console.log('博主本人评论，不发送通知给博主')
+      return
+    }
     const pushContent = fn.getIMPushContent(comment, config)
     const sendResult = await pushoo(config.PUSHOO_CHANNEL, {
       token: config.PUSHOO_TOKEN,
@@ -153,13 +164,23 @@ const fn = {
   },
   // 回复通知
   async noticeReply (currentComment, config, getParentComment) {
-    if (!currentComment.pid) return
-    if (!transporter) if (!await fn.initMailer({ config })) return
+    if (!currentComment.pid) {
+      console.log('无父级评论，不通知')
+      return
+    }
+    if (!transporter && !await fn.initMailer({ config })) {
+      console.log('未配置邮箱或邮箱配置有误，不通知')
+      return
+    }
     const parentComment = await getParentComment(currentComment)
-    // 回复给博主，因为会发博主通知邮件，所以不再重复通知
-    if (config.BLOGGER_EMAIL === parentComment.mail) return
-    // 回复自己的评论，不邮件通知
-    if (currentComment.mail === parentComment.mail) return
+    if (config.BLOGGER_EMAIL === parentComment.mail) {
+      console.log('回复给博主，因为会发博主通知邮件，所以不再重复通知')
+      return
+    }
+    if (currentComment.mail === parentComment.mail) {
+      console.log('回复自己的评论，不邮件通知')
+      return
+    }
     const PARENT_NICK = parentComment.nick
     const IMG = getAvatar(currentComment, config)
     const PARENT_IMG = getAvatar(parentComment, config)