@waline/vercel 1.24.1 → 1.25.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@waline/vercel",
-  "version": "1.24.1",
+  "version": "1.25.1",
   "description": "vercel server for waline comment system",
   "keywords": [
     "waline",
@@ -19,14 +19,14 @@
     "@koa/cors": "4.0.0",
     "akismet": "2.0.7",
     "deta": "1.1.0",
-    "dompurify": "2.4.0",
+    "dompurify": "2.4.1",
     "dy-node-ip2region": "1.0.1",
     "fast-csv": "4.3.6",
     "form-data": "4.0.0",
-    "jsdom": "20.0.1",
+    "jsdom": "20.0.2",
     "jsonwebtoken": "8.5.1",
-    "katex": "0.16.2",
-    "leancloud-storage": "4.13.2",
+    "katex": "0.16.3",
+    "leancloud-storage": "4.13.4",
     "markdown-it": "13.0.1",
     "markdown-it-emoji": "2.0.2",
     "markdown-it-sub": "1.0.0",

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));
@@ -538,13 +538,9 @@ module.exports = class extends BaseRest {
       think.logger.debug(`Comment post frequence check OK!`);
 
       /** Akismet */
-      const { COMMENT_AUDIT, AUTHOR_EMAIL } = process.env;
-      const AUTHOR = AUTHOR_EMAIL;
-      const isAuthorComment = AUTHOR
-        ? data.mail.toLowerCase() === AUTHOR.toLowerCase()
-        : false;
+      const { COMMENT_AUDIT } = process.env;
 
-      data.status = COMMENT_AUDIT && !isAuthorComment ? 'waiting' : 'approved';
+      data.status = COMMENT_AUDIT ? 'waiting' : 'approved';
 
       think.logger.debug(`Comment initial status is ${data.status}`);
 

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()] || locales['zh-cn'];
 
     if (locale && locale[message]) {
       message = locale[message];

package/src/logic/comment.js

@@ -20,8 +20,9 @@ module.exports = class extends Base {
    *
    * @apiParam  {String}  path  comment url path
    * @apiParam  {String}  page  page
-   * @apiParam  {String}  pagesize  page size
+   * @apiParam  {String}  pageSize  page size
    * @apiParam  {String}  sortBy  comment sort type, one of 'insertedAt_desc', 'insertedAt_asc', 'like_desc'
+   * @apiParam  {String}  lang  language
    *
    * @apiSuccess  (200) {Number}  page return current comments list page
    * @apiSuccess  (200) {Number}  pageSize  to  return error message if error
@@ -52,7 +53,8 @@ module.exports = class extends Base {
    * @apiVersion  0.0.1
    *
    * @apiParam  {String}  page  page
-   * @apiParam  {String}  pagesize  page size
+   * @apiParam  {String}  pageSize  page size
+   * @apiParam  {String}  lang  language
    *
    * @apiSuccess  (200) {Number}  errno 0
    * @apiSuccess  (200) {String}  errmsg  return error message if error
@@ -80,6 +82,7 @@ module.exports = class extends Base {
    * @apiVersion  0.0.1
    *
    * @apiParam  {String}  url a array string join by comma just like `a` or `a,b`, return site comment count if url empty
+   * @apiParam  {String}  lang  language
    *
    * @apiSuccessExample {Number} Single Path Response:
    * 300
@@ -92,6 +95,7 @@ module.exports = class extends Base {
    * @apiVersion  0.0.1
    *
    * @apiParam  {String}  count return comments number, default value is 10
+   * @apiParam  {String}  lang  language
    *
    * @apiSuccess  (200) {Object[]} response
    * @apiSuccess  (200) {String}  response.nick comment user nick name
@@ -181,11 +185,12 @@ module.exports = class extends Base {
    * @apiParam  {String}  mail  post comment user mail address
    * @apiParam  {String}  link  post comment user link
    * @apiParam  {String}  comment  post comment text
-   * @apiParam  {String}  url  the artcile url path of comment
+   * @apiParam  {String}  url  the article url path of comment
    * @apiParam  {String}  ua  browser user agent
    * @apiParam  {String}  pid parent comment id
    * @apiParam  {String}  rid root comment id
    * @apiParam  {String}  at  parent comment user nick name
+   * @apiParam  {String}  lang  language
    *
    * @apiSuccess  (200) {Number}  errno 0
    * @apiSuccess  (200) {String}  errmsg  return error message if error
@@ -224,8 +229,9 @@ module.exports = class extends Base {
    * @apiParam  {String}  [mail]  post comment user mail address
    * @apiParam  {String}  [link]  post comment user link
    * @apiParam  {String}  [comment]  post comment text
-   * @apiParam  {String}  [url]  the artcile url path of comment
+   * @apiParam  {String}  [url]  the article url path of comment
    * @apiParam  {Boolean} [like] like comment
+   * @apiParam  {String}  lang  language
    *
    * @apiSuccess  (200) {Number}  errno 0
    * @apiSuccess  (200) {String}  errmsg  return error message if error
@@ -277,6 +283,8 @@ module.exports = class extends Base {
    * @apiGroup Comment
    * @apiVersion  0.0.1
    *
+   * @apiParam  {String}  lang  language
+   *
    * @apiSuccess  (200) {Number}  errno 0
    * @apiSuccess  (200) {String}  errmsg  return error message if error
    */

package/src/logic/db.js

@@ -19,6 +19,8 @@ module.exports = class extends Base {
    * @api {GET} /db export site data
    * @apiGroup Site
    * @apiVersion  0.0.1
+   *
+   * @apiParam  {String}  lang  language
    */
   async getAction() {}
 
@@ -26,6 +28,8 @@ module.exports = class extends Base {
    * @api {POST} /db import site data
    * @apiGroup Site
    * @apiVersion  0.0.1
+   *
+   * @apiParam  {String}  lang  language
    */
   async postAction() {
     this.rules = {
@@ -41,6 +45,8 @@ module.exports = class extends Base {
    * @api {PUT} /db update site table data
    * @apiGroup Site
    * @apiVersion  0.0.1
+   *
+   * @apiParam  {String}  lang  language
    */
   async putAction() {
     this.rules = {
@@ -60,6 +66,8 @@ module.exports = class extends Base {
    * @api {DELETE} /db clean site data
    * @apiGroup Site
    * @apiVersion  0.0.1
+   *
+   * @apiParam  {String}  lang  language
    */
   async deleteAction() {
     this.rules = {

package/src/logic/token.js

@@ -6,6 +6,8 @@ module.exports = class extends Base {
    * @apiGroup User
    * @apiVersion  0.0.1
    *
+   * @apiParam  {String}  lang  language
+   *
    * @apiSuccess  (200) {Number}  errno 0
    * @apiSuccess  (200) {String}  errmsg  return error message if error
    * @apiSuccess  (200) {Object}  data user info
@@ -28,6 +30,7 @@ module.exports = class extends Base {
    *
    * @apiParam  {String}  email login user email
    * @apiParam  {String}  password login user password
+   * @apiParam  {String}  lang  language
    *
    * @apiSuccess  (200) {Number}  errno 0
    * @apiSuccess  (200) {String}  errmsg  return error message if error
@@ -41,6 +44,8 @@ module.exports = class extends Base {
    * @apiGroup User
    * @apiVersion  0.0.1
    *
+   * @apiParam  {String}  lang  language
+   *
    * @apiSuccess  (200) {Number}  errno 0
    * @apiSuccess  (200) {String}  errmsg  return error message if error
    */

package/src/logic/user.js

@@ -2,14 +2,43 @@ const Base = require('./base');
 
 module.exports = class extends Base {
   /**
-   * @api {GET} /user user list
+   * @api {GET} /user user top list without admin
    * @apiGroup User
    * @apiVersion  0.0.1
    *
    * @apiParam  {String}  pageSize  page size
+   * @apiParam  {String}  lang  language
    *
    * @apiSuccess  (200) {Number}  errno 0
    * @apiSuccess  (200) {String}  errmsg  return error message if error
+   * @apiSuccess  (200) {Object[]}  data  user list
+   * @apiSuccess  (200) {String}  data.nick comment user nick name
+   * @apiSuccess  (200) {String}  data.link comment user link
+   * @apiSuccess  (200) {String}  data.avatar comment user avatar
+   * @apiSuccess  (200) {String}  data.level comment user level
+   * @apiSuccess  (200) {String}  data.count user comment count
+   */
+  /**
+   * @api {GET} /user?token user list with admin login
+   * @apiGroup User
+   * @apiVersion  0.0.1
+   *
+   * @apiParam  {String}  page  page
+   * @apiParam  {String}  pageSize  page size
+   * @apiParam  {String}  lang  language
+   *
+   * @apiSuccess  (200) {Number}  errno 0
+   * @apiSuccess  (200) {String}  errmsg  return error message if error
+   * @apiSuccess  (200) {Object}  data  user list
+   * @apiSuccess  (200) {Number}  data.page user list current page
+   * @apiSuccess  (200) {Number}  data.pageSize user list page size
+   * @apiSuccess  (200) {Number}  data.totalPages user list total pages
+   * @apiSuccess  (200) {Object[]}  data.data user list data
+   * @apiSuccess  (200) {String}  data.data.nick comment user nick name
+   * @apiSuccess  (200) {String}  data.data.link comment user link
+   * @apiSuccess  (200) {String}  data.data.avatar comment user avatar
+   * @apiSuccess  (200) {String}  data.data.level comment user level
+   * @apiSuccess  (200) {String}  data.data.label comment user label
    */
   getAction() {
     const { userInfo } = this.ctx.state;
@@ -49,15 +78,10 @@ module.exports = class extends Base {
    * @apiParam  {String}  email user email
    * @apiParam  {String}  password user password
    * @apiParam  {String}  url user link
+   * @apiParam  {String}  lang  language
    *
    * @apiSuccess  (200) {Number}  errno 0
    * @apiSuccess  (200) {String}  errmsg  return error message if error
-   * @apiSuccess  (200) {Object[]}  data  user list
-   * @apiSuccess  (200) {String}  data.nick comment user nick name
-   * @apiSuccess  (200) {String}  data.link comment user link
-   * @apiSuccess  (200) {String}  data.avatar comment user avatar
-   * @apiSuccess  (200) {String}  data.level comment user level
-   * @apiSuccess  (200) {String}  data.label comment user label
    */
   postAction() {
     return this.useCaptchaCheck();
@@ -72,6 +96,7 @@ module.exports = class extends Base {
    * @apiParam  {String}  [url] user new link
    * @apiParam  {String}  [password] user new password
    * @apiParam  {String}  [github] user github account name
+   * @apiParam  {String}  lang  language
    *
    * @apiSuccess  (200) {Number}  errno 0
    * @apiSuccess  (200) {String}  errmsg  return error message if error

package/src/service/markdown/index.js

@@ -14,7 +14,7 @@ const getMarkdownParser = () => {
   // markdown-it instance
   const markdownIt = MarkdownIt({
     breaks: true,
-    linkify: true, // Autoconvert URL-like text to links
+    linkify: true, // Auto convert URL-like text to links
     typographer: true, // Enable some language-neutral replacement + quotes beautification
 
     // default highlight

package/src/service/markdown/mathCommon.js

@@ -1,5 +1,5 @@
 /*
- * Test if potential opening or closing delimieter
+ * Test if potential opening or closing delimiter
  * Assumes that there is a "$" at state.src[pos]
  */
 const isValidDelim = (state, pos) => {
@@ -10,7 +10,7 @@ const isValidDelim = (state, pos) => {
     canOpen: nextChar !== ' ' && nextChar !== '\t',
     /*
      * Check non-whitespace conditions for opening and closing, and
-     * check that closing delimeter isn’t followed by a number
+     * check that closing delimiter isn’t followed by a number
      */
     canClose: !(
       prevChar === ' ' ||
@@ -36,10 +36,10 @@ const inlineTex = (state, silent) => {
     return true;
   }
   /*
-   * First check for and bypass all properly escaped delimieters
+   * First check for and bypass all properly escaped delimiters
    * This loop will assume that the first leading backtick can not
    * be the first character in state.src, which is known since
-   * we have found an opening delimieter already.
+   * we have found an opening delimiter already.
    */
   const start = state.pos + 1;
 
@@ -56,7 +56,7 @@ const inlineTex = (state, silent) => {
     match += 1;
   }
 
-  // No closing delimter found.  Consume $ and continue.
+  // No closing delimiter found.  Consume $ and continue.
   if (match === -1) {
     if (!silent) state.pending += '$';
     state.pos = start;

package/src/service/markdown/mathjax.js

@@ -8,7 +8,7 @@ const { AllPackages } = require('mathjax-full/js/input/tex/AllPackages.js');
 const { escapeHtml } = require('./utils');
 const { inlineTex, blockTex } = require('./mathCommon');
 
-// set MathJax as the renderer for markdown-it-simplemath
+// set MathJax as the renderer
 class MathToSvg {
   constructor() {
     const adaptor = liteAdaptor();
@@ -29,7 +29,7 @@ class MathToSvg {
       if (svg.includes('data-mml-node="merror"')) {
         const errorTitle = svg.match(/<title>(.*?)<\/title>/)[1];
 
-        svg = `<span class='katex-error' title='${escapeHtml(
+        svg = `<span class='mathjax-error' title='${escapeHtml(
           errorTitle
         )}'>${escapeHtml(tex)}</span>`;
       }
@@ -44,7 +44,7 @@ class MathToSvg {
       if (svg.includes('data-mml-node="merror"')) {
         const errorTitle = svg.match(/<title>(.*?)<\/title>/)[1];
 
-        svg = `<p class='katex-block katex-error' title='${escapeHtml(
+        svg = `<p class='mathjax-block mathjax-error' title='${escapeHtml(
           errorTitle
         )}'>${escapeHtml(tex)}</p>`;
       } else {

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,18 +328,18 @@ 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();
 
-    form.append('topic', topic);
-    form.append('template', template);
-    form.append('channel', channel);
-    form.append('webhook', webhook);
-    form.append('callbackUrl', callbackUrl);
-    form.append('title', title);
-    form.append('content', content);
+    topic && form.append('topic', topic);
+    template && form.append('template', template);
+    channel && form.append('channel', channel);
+    webhook && form.append('webhook', webhook);
+    callbackUrl && form.append('callbackUrl', callbackUrl);
+    title && form.append('title', title);
+    content && form.append('content', content);
 
     return fetch(`http://www.pushplus.plus/send/${PUSH_PLUS_KEY}`, {
       method: 'POST',
@@ -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