twikoo-func 1.4.13 → 1.4.17

package/index.js

@@ -1,5 +1,5 @@
 /*!
- * Twikoo cloudbase function v1.4.13
+ * Twikoo cloudbase function v1.4.17
  * (c) 2020-present iMaeGoo
  * Released under the MIT License.
  */
@@ -31,7 +31,7 @@ const window = new JSDOM('').window
 const DOMPurify = createDOMPurify(window)
 
 // 常量 / constants
-const VERSION = '1.4.13'
+const VERSION = '1.4.17'
 const RES_CODE = {
   SUCCESS: 0,
   FAIL: 1000,
@@ -880,6 +880,7 @@ async function sendNotice (comment) {
     noticePushPlus(comment),
     noticeWeComPush(comment),
     noticeDingTalkHook(comment),
+    noticePushdeer(comment),
     noticeQQ(comment)
   ]).catch(err => {
     console.error('邮件通知异常：', err)
@@ -931,7 +932,8 @@ async function noticeMaster (comment) {
     'QM_SENDKEY',
     'PUSH_PLUS_TOKEN',
     'WECOM_API_URL',
-    'DINGTALK_WEBHOOK_URL'
+    'DINGTALK_WEBHOOK_URL',
+    'PUSHDEER_KEY'
   ]
   // 判断是否存在即时消息推送配置
   const hasIMPushConfig = IM_PUSH_CONFIGS.some(item => !!config[item])
@@ -939,7 +941,7 @@ async function noticeMaster (comment) {
   if (hasIMPushConfig && config.SC_MAIL_NOTIFY !== 'true') return
   const SITE_NAME = config.SITE_NAME
   const NICK = comment.nick
-  const IMG = comment.avatar
+  const IMG = getAvatar(comment)
   const IP = comment.ip
   const MAIL = comment.mail
   const COMMENT = comment.comment
@@ -1062,7 +1064,7 @@ async function noticeQQ (comment) {
     return
   }
   if (config.BLOGGER_EMAIL === comment.mail) return
-  const pushContent = getIMPushContent(comment)
+  const pushContent = getIMPushContent(comment, { withUrl: false })
   const qmApiUrl = 'https://qmsg.zendee.cn'
   const qmApiParam = {
     msg: pushContent.subject + '\n' + pushContent.content.replace(/<br>/g, '\n')
@@ -1073,8 +1075,20 @@ async function noticeQQ (comment) {
   console.log('QQ通知结果：', sendResult)
 }
 
+async function noticePushdeer (comment) {
+  if (!config.PUSHDEER_KEY) return
+  if (config.BLOGGER_EMAIL === comment.mail) return
+  const pushContent = getIMPushContent(comment, { markdown: true })
+  const sendResult = await axios.post('https://api2.pushdeer.com/message/push', {
+    pushkey: config.PUSHDEER_KEY,
+    text: pushContent.subject,
+    desp: pushContent.content
+  })
+  console.log('Pushdeer 通知结果：', sendResult)
+}
+
 // 即时消息推送内容获取
-function getIMPushContent (comment) {
+function getIMPushContent (comment, { withUrl = true, markdown = false } = {}) {
   const SITE_NAME = config.SITE_NAME
   const NICK = comment.nick
   const MAIL = comment.mail
@@ -1083,7 +1097,14 @@ function getIMPushContent (comment) {
   const SITE_URL = config.SITE_URL
   const POST_URL = appendHashToUrl(comment.href || SITE_URL + comment.url, comment.id)
   const subject = config.MAIL_SUBJECT_ADMIN || `${SITE_NAME}有新评论了`
-  const content = `评论人：${NICK}(${MAIL})<br>评论人IP：${IP}<br>评论内容：${COMMENT}<br>您可以点击 ${POST_URL} 查看回复的完整內容`
+  let content = `评论人：${NICK}(${MAIL})<br>评论人IP：${IP}<br>评论内容：${COMMENT}`
+  // Qmsg 会过滤带网址的推送消息，所以不能带网址
+  if (withUrl) {
+    content += `<br>您可以点击 ${markdown ? `[${POST_URL}](${POST_URL})` : POST_URL} 查看回复的完整內容`
+  }
+  if (markdown) {
+    content = content.replace(/<br>/g, '\n\n')
+  }
   return {
     subject,
     content
@@ -1104,8 +1125,8 @@ async function noticeReply (currentComment) {
   // 回复自己的评论，不邮件通知
   if (currentComment.mail === parentComment.mail) return
   const PARENT_NICK = parentComment.nick
-  const IMG = currentComment.avatar
-  const PARENT_IMG = parentComment.avatar
+  const IMG = getAvatar(currentComment)
+  const PARENT_IMG = getAvatar(parentComment)
   const SITE_NAME = config.SITE_NAME
   const NICK = currentComment.nick
   const COMMENT = currentComment.comment
@@ -1583,6 +1604,7 @@ async function readConfig () {
 
 // 写入配置
 async function writeConfig (newConfig) {
+  if (!Object.keys(newConfig).length) return 0
   console.log('写入配置：', newConfig)
   try {
     let updated

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "twikoo-func",
-  "version": "1.4.13",
+  "version": "1.4.17",
   "description": "A simple comment system based on Tencent CloudBase (tcb).",
   "author": "imaegoo <hello@imaegoo.com> (https://github.com/imaegoo)",
   "license": "MIT",
@@ -21,7 +21,7 @@
     "crypto-js": "^4.0.0",
     "dompurify": "^2.2.6",
     "jsdom": "^16.4.0",
-    "marked": "^2.0.0",
+    "marked": "^4.0.12",
     "nodemailer": "^6.4.17",
     "querystring": "^0.2.0",
     "tencentcloud-sdk-nodejs": "^4.0.65",