@waline/vercel 1.24.1 → 1.25.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@waline/vercel",
-  "version": "1.24.1",
+  "version": "1.25.0",
   "description": "vercel server for waline comment system",
   "keywords": [
     "waline",

package/src/config/config.js

@@ -38,6 +38,7 @@ const {
   TG_TEMPLATE,
   WX_TEMPLATE,
   DISCORD_TEMPLATE,
+  LARK_TEMPLATE,
 
   LEVELS,
 } = process.env;
@@ -124,4 +125,5 @@ module.exports = {
   TGTemplate: TG_TEMPLATE,
   WXTemplate: WX_TEMPLATE,
   DiscordTemplate: DISCORD_TEMPLATE,
+  LarkTemplate: LARK_TEMPLATE,
 };

package/src/controller/comment.js

@@ -57,7 +57,7 @@ async function formatCmt(
   }
   comment.comment = markdownParser(comment.comment);
   comment.like = Number(comment.like) || 0;
-  
+
   // compat sql storage return number flag to string
   if (typeof comment.sticky === 'string') {
     comment.sticky = Boolean(Number(comment.sticky));

package/src/extend/controller.js

@@ -14,7 +14,7 @@ module.exports = {
   },
   locale(message, variables) {
     const { lang } = this.get();
-    const locale = locales[(lang || '').toLowerCase()];
+    const locale = locales[(lang || 'zh-cn').toLowerCase()];
 
     if (locale && locale[message]) {
       message = locale[message];

package/src/service/notify.js

@@ -2,6 +2,7 @@ const FormData = require('form-data');
 const nodemailer = require('nodemailer');
 const fetch = require('node-fetch');
 const nunjucks = require('nunjucks');
+const crypto = require('crypto');
 
 module.exports = class extends think.Service {
   constructor(ctx) {
@@ -85,8 +86,8 @@ module.exports = class extends think.Service {
       },
     };
 
-    title = nunjucks.renderString(title, data);
-    content = nunjucks.renderString(content, data);
+    title = this.ctx.locale(title, data);
+    content = this.ctx.locale(content, data);
 
     const form = new FormData();
 
@@ -134,8 +135,8 @@ module.exports = class extends think.Service {
 【内容】：{{self.comment}} 
 <a href='{{site.postUrl}}'>查看详情</a>`;
 
-    title = nunjucks.renderString(title, data);
-    const desp = nunjucks.renderString(contentWechat, data);
+    title = this.ctx.locale(title, data);
+    const desp = this.ctx.locale(contentWechat, data);
 
     content = desp.replace(/\n/g, '<br/>');
 
@@ -214,7 +215,7 @@ module.exports = class extends think.Service {
 
     const form = new FormData();
 
-    form.append('msg', nunjucks.renderString(contentQQ, data));
+    form.append('msg', this.ctx.locale(contentQQ, data));
     form.append('qq', QQ_ID);
 
     return fetch(`https://qmsg.zendee.cn/send/${QMSG_KEY}`, {
@@ -283,7 +284,7 @@ module.exports = class extends think.Service {
 
     const form = new FormData();
 
-    form.append('text', nunjucks.renderString(contentTG, data));
+    form.append('text', this.ctx.locale(contentTG, data));
     form.append('chat_id', TG_CHAT_ID);
     form.append('parse_mode', 'MarkdownV2');
 
@@ -297,7 +298,7 @@ module.exports = class extends think.Service {
     ).then((resp) => resp.json());
 
     if (!resp.ok) {
-      throw new Error(resp.description);
+      console.log('Telegram Notification Failed:' + JSON.stringify(resp));
     }
   }
 
@@ -327,8 +328,8 @@ module.exports = class extends think.Service {
       },
     };
 
-    title = nunjucks.renderString(title, data);
-    content = nunjucks.renderString(content, data);
+    title = this.ctx.locale(title, data);
+    content = this.ctx.locale(content, data);
 
     const form = new FormData();
 
@@ -364,8 +365,8 @@ module.exports = class extends think.Service {
       },
     };
 
-    title = nunjucks.renderString(title, data);
-    content = nunjucks.renderString(
+    title = this.ctx.locale(title, data);
+    content = this.ctx.locale(
       think.config('DiscordTemplate') ||
         `💬 {{site.name|safe}} 有新评论啦 
     【评论者昵称】：{{self.nick}}
@@ -386,6 +387,83 @@ module.exports = class extends think.Service {
     }).then((resp) => resp.json());
   }
 
+  async lark({ title, content }, self, parent) {
+    const { LARK_WEBHOOK, LARK_SECRET, SITE_NAME, SITE_URL } = process.env;
+
+    if (!LARK_WEBHOOK) {
+      return false;
+    }
+
+    self.comment = self.comment.replace(/(<([^>]+)>)/gi, '');
+
+    const data = {
+      self,
+      parent,
+      site: {
+        name: SITE_NAME,
+        url: SITE_URL,
+        postUrl: SITE_URL + self.url + '#' + self.objectId,
+      },
+    };
+
+    content = nunjucks.renderString(
+      think.config('LarkTemplate') ||
+        `【网站名称】：{{site.name|safe}} \n【评论者昵称】：{{self.nick}}\n【评论者邮箱】：{{self.mail}}\n【内容】：{{self.comment}}【地址】：{{site.postUrl}}`,
+      data
+    );
+
+    const post = {
+      en_us: {
+        title: this.ctx.locale(title, data),
+        content: [
+          [
+            {
+              tag: 'text',
+              text: content,
+            },
+          ],
+        ],
+      },
+    };
+
+    let signData = {};
+    const msg = {
+      msg_type: 'post',
+      content: {
+        post,
+      },
+    };
+
+    const sign = (timestamp, secret) => {
+      const signStr = timestamp + '\n' + secret;
+
+      return crypto.createHmac('sha256', signStr).update('').digest('base64');
+    };
+
+    if (LARK_SECRET) {
+      const timestamp = parseInt(+new Date() / 1000);
+
+      signData = { timestamp: timestamp, sign: sign(timestamp, LARK_SECRET) };
+    }
+
+    const resp = await fetch(LARK_WEBHOOK, {
+      method: 'POST',
+      headers: {
+        'Content-Type': 'application/json',
+      },
+      body: JSON.stringify({
+        ...signData,
+        ...msg,
+      }),
+    }).then((resp) => resp.json());
+
+    if (resp.status !== 200) {
+      console.log('Lark Notification Failed:' + JSON.stringify(resp));
+    }
+
+    console.log('FeiShu Notification Success:' + JSON.stringify(resp));
+  }
+
   async run(comment, parent, disableAuthorNotify = false) {
     const { AUTHOR_EMAIL, DISABLE_AUTHOR_NOTIFY } = process.env;
     const { mailSubject, mailTemplate, mailSubjectAdmin, mailTemplateAdmin } =
@@ -416,9 +494,10 @@ module.exports = class extends think.Service {
       const telegram = await this.telegram(comment, parent);
       const pushplus = await this.pushplus({ title, content }, comment, parent);
       const discord = await this.discord({ title, content }, comment, parent);
+      const lark = await this.lark({ title, content }, comment, parent);
 
       if (
-        [wechat, qq, telegram, qywxAmWechat, pushplus, discord].every(
+        [wechat, qq, telegram, qywxAmWechat, pushplus, discord, lark].every(
           think.isEmpty
         ) &&
         !isReplyAuthor