@waline/vercel 1.24.0 → 1.25.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@waline/vercel",
-  "version": "1.24.0",
+  "version": "1.25.0",
   "description": "vercel server for waline comment system",
   "keywords": [
     "waline",
@@ -16,7 +16,7 @@
   "author": "lizheming <i@imnerd.org>",
   "dependencies": {
     "@cloudbase/node-sdk": "2.9.1",
-    "@koa/cors": "3.4.2",
+    "@koa/cors": "4.0.0",
     "akismet": "2.0.7",
     "deta": "1.1.0",
     "dompurify": "2.4.0",
@@ -32,7 +32,6 @@
     "markdown-it-sub": "1.0.0",
     "markdown-it-sup": "1.0.0",
     "mathjax-full": "3.2.2",
-    "mongodb": "4.10.0",
     "node-fetch": "2.6.7",
     "nodemailer": "6.8.0",
     "nunjucks": "3.2.3",
@@ -48,7 +47,7 @@
     "think-mongo": "2.2.1",
     "think-router-rest": "1.0.5",
     "thinkjs": "3.2.14",
-    "ua-parser-js": "1.0.2"
+    "ua-parser-js": "1.0.32"
   },
   "engines": {
     "node": ">=14"

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

@@ -58,6 +58,11 @@ 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));
+  }
+
   return comment;
 }
 

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/locales/zh-CN.json

@@ -17,5 +17,3 @@
   "MAIL_SUBJECT_ADMIN": "{{site.name | safe}} 上有新评论了",
   "MAIL_TEMPLATE_ADMIN": "<div style='border-top:2px solid #12ADDB;box-shadow:0 1px 3px #AAAAAA;line-height:180%;padding:0 15px 12px;margin:50px auto;font-size:12px;'> <h2 style='border-bottom:1px solid #DDD;font-size:14px;font-weight:normal;padding:13px 0 10px 8px;'> 您在<a style='text-decoration:none;color: #12ADDB;' href='{{site.url}}' target='_blank'>{{site.name}}</a>上的文章有了新的评论 </h2> <p><strong>{{self.nick}}</strong>回复说：</p><div style='background-color: #f5f5f5;padding: 10px 15px;margin:18px 0;word-wrap:break-word;'>{{self.comment | safe}}</div><p>您可以点击<a style='text-decoration:none; color:#12addb' href='{{site.postUrl}}' target='_blank'>查看回复的完整內容</a></p><br/> </div>"
 }
-
-

package/src/locales/zh-TW.json

@@ -16,5 +16,4 @@
   "MAIL_TEMPLATE": "<div style='border-top:2px solid #12ADDB;box-shadow:0 1px 3px #AAAAAA;line-height:180%;padding:0 15px 12px;margin:50px auto;font-size:12px;'> <h2 style='border-bottom:1px solid #DDD;font-size:14px;font-weight:normal;padding:13px 0 10px 8px;'> 您在<a style='text-decoration:none;color: #12ADDB;' href='{{site.url}}' target='_blank'>{{site.name}}</a>上的品論有新的回復 </h2>{{parent.nick}}同學，您層發表評論： <div style='padding:0 12px 0 12px;margin-top:18px'> <div style='background-color: #f5f5f5;padding: 10px 15px;margin:18px 0;word-wrap:break-word;'>{{parent.comment | safe}}</div><p><strong>{{self.nick}}</strong>回復說：</p><div style='background-color: #f5f5f5;padding: 10px 15px;margin:18px 0;word-wrap:break-word;'>{{self.comment | safe}}</div><p>您可以點擊<a style='text-decoration:none; color:#12addb' href='{{site.postUrl}}' target='_blank'>查看回復的完整內容</a>，歡迎再次光臨<a style='text-decoration:none; color:#12addb' href='{{site.url}}' target='_blank'>{{site.name}}</a>。</p><br/> </div></div>",
   "MAIL_SUBJECT_ADMIN": "{{site.name | safe}} 上有新評論了",
   "MAIL_TEMPLATE_ADMIN": "<div style='border-top:2px solid #12ADDB;box-shadow:0 1px 3px #AAAAAA;line-height:180%;padding:0 15px 12px;margin:50px auto;font-size:12px;'> <h2 style='border-bottom:1px solid #DDD;font-size:14px;font-weight:normal;padding:13px 0 10px 8px;'> 您在<a style='text-decoration:none;color: #12ADDB;' href='{{site.url}}' target='_blank'>{{site.name}}</a>上的文章有新評論了 </h2> <p><strong>{{self.nick}}</strong>回復說：</p><div style='background-color: #f5f5f5;padding: 10px 15px;margin:18px 0;word-wrap:break-word;'>{{self.comment | safe}}</div><p>您可以點擊<a style='text-decoration:none; color:#12addb' href='{{site.postUrl}}' target='_blank'>查看回復的完整內容</a></p><br/> </div>"
-
 }

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,15 +284,22 @@ 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');
 
-    return fetch(`https://api.telegram.org/bot${TG_BOT_TOKEN}/sendMessage`, {
-      method: 'POST',
-      header: form.getHeaders(),
-      body: form,
-    }).then((resp) => resp.json());
+    const resp = await fetch(
+      `https://api.telegram.org/bot${TG_BOT_TOKEN}/sendMessage`,
+      {
+        method: 'POST',
+        header: form.getHeaders(),
+        body: form,
+      }
+    ).then((resp) => resp.json());
+
+    if (!resp.ok) {
+      console.log('Telegram Notification Failed:' + JSON.stringify(resp));
+    }
   }
 
   async pushplus({ title, content }, self, parent) {
@@ -320,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();
 
@@ -357,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}}
@@ -379,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 } =
@@ -409,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

package/src/service/storage/mongodb.js

@@ -1,4 +1,4 @@
-const { ObjectId } = require('mongodb');
+const { ObjectID: ObjectId } = require('think-mongo/lib/model');
 const Base = require('./base');
 
 module.exports = class extends Base {