@waline/vercel 1.25.1 → 1.25.2

package/__tests__/katex.spec.js

@@ -1,3 +1,4 @@
+/* eslint-disable @typescript-eslint/unbound-method */
 import { describe, expect, it } from 'vitest';
 import MarkdownIt from 'markdown-it';
 import { katexPlugin } from '../src/service/markdown/katex';
@@ -12,7 +13,7 @@ const markdownItWithError = MarkdownIt({ linkify: true }).use(katexPlugin, {
 });
 
 describe('inline katex', () => {
-  it('Shoud render', () => {
+  it('Should render', () => {
     expect(markdownIt.render(`$a=1$`)).toEqual(
       `<p><span class="katex"><math xmlns="http://www.w3.org/1998/Math/MathML"><semantics><mrow><mi>a</mi><mo>=</mo><mn>1</mn></mrow><annotation encoding="application/x-tex">a=1</annotation></semantics></math></span></p>\n`
     );
@@ -33,7 +34,7 @@ describe('inline katex', () => {
     );
   });
 
-  it('Should render when the first one is after a charater', () => {
+  it('Should render when the first one is after a character', () => {
     expect(markdownIt.render(`The next$a = 1$ won't work`)).toEqual(
       `<p>The next<span class="katex"><math xmlns="http://www.w3.org/1998/Math/MathML"><semantics><mrow><mi>a</mi><mo>=</mo><mn>1</mn></mrow><annotation encoding="application/x-tex">a = 1</annotation></semantics></math></span> won't work</p>\n`
     );
@@ -46,7 +47,6 @@ describe('inline katex', () => {
   });
 
   it('Should render error msg when content is wrong', () => {
-    // eslint-disable-next-line @typescript-eslint/unbound-method
     const originalWarn = global.console.warn;
 
     global.console.warn = vi.fn();
@@ -55,14 +55,13 @@ describe('inline katex', () => {
       "<p><span class='katex-error' title='ParseError: KaTeX parse error: Undefined control sequence: \\fra at position 1: \\̲f̲r̲a̲{a}{b}'>\\fra{a}{b}</span></p>\n"
     );
 
-    // eslint-disable-next-line @typescript-eslint/unbound-method
     expect(global.console.warn).toHaveBeenCalledTimes(1);
     global.console.warn = originalWarn;
   });
 });
 
 describe('block katex', () => {
-  it('Shoud render', () => {
+  it('Should render', () => {
     expect(markdownIt.render(`$$a=1$$`)).toEqual(
       `<p class='katex-block'><span class="katex"><math xmlns="http://www.w3.org/1998/Math/MathML" display="block"><semantics><mrow><mi>a</mi><mo>=</mo><mn>1</mn></mrow><annotation encoding="application/x-tex">a=1\n</annotation></semantics></math></span></p>\n`
     );
@@ -118,7 +117,6 @@ $$
   });
 
   it('Should render error msg when content is wrong', () => {
-    // eslint-disable-next-line @typescript-eslint/unbound-method
     const originalWarn = global.console.warn;
 
     global.console.warn = vi.fn();
@@ -136,7 +134,6 @@ $$
       /<p class='katex-block katex-error' title='[\s\S]*?'>[\s\S]*?<\/p>/
     );
 
-    // eslint-disable-next-line @typescript-eslint/unbound-method
     expect(global.console.warn).toHaveBeenCalledTimes(2);
     global.console.warn = originalWarn;
   });

package/__tests__/mathjax.spec.js

@@ -5,7 +5,7 @@ import { mathjaxPlugin } from '../src/service/markdown/mathjax';
 const markdownIt = MarkdownIt({ linkify: true }).use(mathjaxPlugin);
 
 describe('inline mathjax', () => {
-  it('Shoud render', () => {
+  it('Should render', () => {
     expect(markdownIt.render(`$a=1$`)).toEqual(
       `<p><svg style="vertical-align: -0.186ex" xmlns="http://www.w3.org/2000/svg" width="5.345ex" height="1.692ex" role="img" focusable="false" viewBox="0 -666 2362.6 748"><g stroke="currentColor" fill="currentColor" stroke-width="0" transform="scale(1,-1)"><g data-mml-node="math"><g data-mml-node="mi"><path data-c="1D44E" d="M33 157Q33 258 109 349T280 441Q331 441 370 392Q386 422 416 422Q429 422 439 414T449 394Q449 381 412 234T374 68Q374 43 381 35T402 26Q411 27 422 35Q443 55 463 131Q469 151 473 152Q475 153 483 153H487Q506 153 506 144Q506 138 501 117T481 63T449 13Q436 0 417 -8Q409 -10 393 -10Q359 -10 336 5T306 36L300 51Q299 52 296 50Q294 48 292 46Q233 -10 172 -10Q117 -10 75 30T33 157ZM351 328Q351 334 346 350T323 385T277 405Q242 405 210 374T160 293Q131 214 119 129Q119 126 119 118T118 106Q118 61 136 44T179 26Q217 26 254 59T298 110Q300 114 325 217T351 328Z"></path></g><g data-mml-node="mo" transform="translate(806.8,0)"><path data-c="3D" d="M56 347Q56 360 70 367H707Q722 359 722 347Q722 336 708 328L390 327H72Q56 332 56 347ZM56 153Q56 168 72 173H708Q722 163 722 153Q722 140 707 133H70Q56 140 56 153Z"></path></g><g data-mml-node="mn" transform="translate(1862.6,0)"><path data-c="31" d="M213 578L200 573Q186 568 160 563T102 556H83V602H102Q149 604 189 617T245 641T273 663Q275 666 285 666Q294 666 302 660V361L303 61Q310 54 315 52T339 48T401 46H427V0H416Q395 3 257 3Q121 3 100 0H88V46H114Q136 46 152 46T177 47T193 50T201 52T207 57T213 61V578Z"></path></g></g></g></svg></p>\n`
     );
@@ -40,7 +40,7 @@ describe('inline mathjax', () => {
 });
 
 describe('block mathjax', () => {
-  it('Shoud render', () => {
+  it('Should render', () => {
     expect(markdownIt.render(`$$a=1$$`)).toEqual(
       `<svg style="vertical-align: -0.186ex" xmlns="http://www.w3.org/2000/svg" width="100%" height="1.692ex" role="img" focusable="false" viewBox="0 -666 2362.6 748"><g stroke="currentColor" fill="currentColor" stroke-width="0" transform="scale(1,-1)"><g data-mml-node="math"><g data-mml-node="mi"><path data-c="1D44E" d="M33 157Q33 258 109 349T280 441Q331 441 370 392Q386 422 416 422Q429 422 439 414T449 394Q449 381 412 234T374 68Q374 43 381 35T402 26Q411 27 422 35Q443 55 463 131Q469 151 473 152Q475 153 483 153H487Q506 153 506 144Q506 138 501 117T481 63T449 13Q436 0 417 -8Q409 -10 393 -10Q359 -10 336 5T306 36L300 51Q299 52 296 50Q294 48 292 46Q233 -10 172 -10Q117 -10 75 30T33 157ZM351 328Q351 334 346 350T323 385T277 405Q242 405 210 374T160 293Q131 214 119 129Q119 126 119 118T118 106Q118 61 136 44T179 26Q217 26 254 59T298 110Q300 114 325 217T351 328Z"></path></g><g data-mml-node="mo" transform="translate(806.8,0)"><path data-c="3D" d="M56 347Q56 360 70 367H707Q722 359 722 347Q722 336 708 328L390 327H72Q56 332 56 347ZM56 153Q56 168 72 173H708Q722 163 722 153Q722 140 707 133H70Q56 140 56 153Z"></path></g><g data-mml-node="mn" transform="translate(1862.6,0)"><path data-c="31" d="M213 578L200 573Q186 568 160 563T102 556H83V602H102Q149 604 189 617T245 641T273 663Q275 666 285 666Q294 666 302 660V361L303 61Q310 54 315 52T339 48T401 46H427V0H416Q395 3 257 3Q121 3 100 0H88V46H114Q136 46 152 46T177 47T193 50T201 52T207 57T213 61V578Z"></path></g></g></g></svg>\n`
     );

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@waline/vercel",
-  "version": "1.25.1",
+  "version": "1.25.2",
   "description": "vercel server for waline comment system",
   "keywords": [
     "waline",
@@ -23,10 +23,10 @@
     "dy-node-ip2region": "1.0.1",
     "fast-csv": "4.3.6",
     "form-data": "4.0.0",
-    "jsdom": "20.0.2",
-    "jsonwebtoken": "8.5.1",
-    "katex": "0.16.3",
-    "leancloud-storage": "4.13.4",
+    "jsdom": "20.0.3",
+    "jsonwebtoken": "9.0.0",
+    "katex": "0.16.4",
+    "leancloud-storage": "4.14.0",
     "markdown-it": "13.0.1",
     "markdown-it-emoji": "2.0.2",
     "markdown-it-sub": "1.0.0",

package/src/controller/comment.js

@@ -296,7 +296,7 @@ module.exports = class extends BaseRest {
           if (order === 'desc') {
             selectOptions.desc = field;
           } else if (order === 'asc') {
-            // do nothing because of ascending order is default behaviour
+            // do nothing because of ascending order is default behavior
           }
         }
 
@@ -311,9 +311,9 @@ module.exports = class extends BaseRest {
          *
          * Why we have limit and the limit is 1000?
          * Many serverless storages have fetch data limit, for example LeanCloud is 100, and CloudBase is 1000
-         * If we have much commments, We should use more request to fetch all comments
+         * If we have much comments, We should use more request to fetch all comments
          * If we have 3000 comments, We have to use 30 http request to fetch comments, things go athwart.
-         * And Serverless Service like vercel have excute time limit
+         * And Serverless Service like vercel have execute time limit
          * if we have more http requests in a serverless function, it may timeout easily.
          * so we use limit to avoid it.
          */
@@ -521,7 +521,7 @@ module.exports = class extends BaseRest {
 
       think.logger.debug('Comment duplicate check OK!');
 
-      /** IP Frequence */
+      /** IP frequency */
       const { IPQPS = 60 } = process.env;
 
       const recent = await this.modelInstance.select({
@@ -530,12 +530,12 @@ module.exports = class extends BaseRest {
       });
 
       if (!think.isEmpty(recent)) {
-        think.logger.debug(`The author has posted in ${IPQPS} seconeds.`);
+        think.logger.debug(`The author has posted in ${IPQPS} seconds.`);
 
         return this.fail(this.locale('Comment too fast!'));
       }
 
-      think.logger.debug(`Comment post frequence check OK!`);
+      think.logger.debug(`Comment post frequency check OK!`);
 
       /** Akismet */
       const { COMMENT_AUDIT } = process.env;

package/src/controller/user/password.js

@@ -11,9 +11,9 @@ module.exports = class extends BaseRest {
       SMTP_USER,
       SITE_NAME,
     } = process.env;
-    const hasMailServie = SMTP_HOST || SMTP_SERVICE;
+    const hasMailService = SMTP_HOST || SMTP_SERVICE;
 
-    if (!hasMailServie) {
+    if (!hasMailService) {
       return this.fail();
     }
 

package/src/controller/user.js

@@ -71,12 +71,12 @@ module.exports = class extends BaseRest {
       SMTP_USER,
       SITE_NAME,
     } = process.env;
-    const hasMailServie = SMTP_HOST || SMTP_SERVICE;
+    const hasMailService = SMTP_HOST || SMTP_SERVICE;
 
     const token = Array.from({ length: 4 }, () =>
       Math.round(Math.random() * 9)
     ).join('');
-    const normalType = hasMailServie
+    const normalType = hasMailService
       ? `verify:${token}:${Date.now() + 1 * 60 * 60 * 1000}`
       : 'guest';
 
@@ -119,7 +119,7 @@ module.exports = class extends BaseRest {
 
       return this.fail(
         this.locale(
-          'Registeration confirm mail send failed, please {%- if isAdmin -%}check your mail configuration{%- else -%}check your email address and contact administrator{%- endif -%}.',
+          'Registration confirm mail send failed, please {%- if isAdmin -%}check your mail configuration{%- else -%}check your email address and contact administrator{%- endif -%}.',
           { isAdmin: think.isEmpty(count) }
         )
       );

package/src/controller/verification.js

@@ -21,7 +21,7 @@ module.exports = class extends BaseRest {
     const match = user.type.match(/^verify:(\d{4}):(\d+)$/i);
 
     if (!match) {
-      return this.fail(this.locale('USER_REGISTED'));
+      return this.fail(this.locale('USER_REGISTERED'));
     }
 
     if (token === match[1] && Date.now() < parseInt(match[2])) {

package/src/locales/en.json

@@ -2,7 +2,7 @@
   "import data format not support!": "import data format not support!",
   "USER_EXIST": "USER_EXIST",
   "USER_NOT_EXIST": "USER_NOT_EXIST",
-  "USER_REGISTED": "USER_REGISTED",
+  "USER_REGISTERED": "USER_REGISTERED",
   "TOKEN_EXPIRED": "TOKEN_EXPIRED",
   "TWO_FACTOR_AUTH_ERROR_DETAIL": "TWO_FACTOR_AUTH_ERROR_DETAIL",
   "[{{name | safe}}] Registration Confirm Mail": "[{{name | safe}}] Registration Confirm Mail",
@@ -11,7 +11,7 @@
   "Please click <a href=\"{{url}}\">{{url}}</a> to login and change your password as soon as possible!": "Please click <a href=\"{{url}}\">{{url}}</a> to login and change your password as soon as possible!",
   "Duplicate Content": "Duplicate Content",
   "Comment too fast": "Comment too fast",
-  "Registeration confirm mail send failed, please {%- if isAdmin -%}check your mail configuration{%- else -%}check your email address and contact administrator{%- endif -%}.": "Registeration confirm mail send failed, please {%- if isAdmin -%}check your mail configuration{%- else -%}check your email address and contact administrator{%- endif -%}.",
+  "Registration confirm mail send failed, please {%- if isAdmin -%}check your mail configuration{%- else -%}check your email address and contact administrator{%- endif -%}.": "Registration confirm mail send failed, please {%- if isAdmin -%}check your mail configuration{%- else -%}check your email address and contact administrator{%- endif -%}.",
   "MAIL_SUBJECT": "Your comment on {{site.name | safe}} received a reply",
   "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;'> Your comment on <a style='text-decoration:none;color: #12ADDB;' href='{{site.url}}' target='_blank'>{{site.name}}</a> received a reply </h2>{{parent.nick}}, you wrote: <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> replied:</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'>View full reply</a> or visit <a style='text-decoration:none; color:#12addb' href='{{site.url}}' target='_blank'>{{site.name}}</a>.</p><br/> </div></div>",
   "MAIL_SUBJECT_ADMIN": "New comment on {{site.name | safe}}",

package/src/locales/zh-CN.json

@@ -2,7 +2,7 @@
   "import data format not support!": "文件格式不支持",
   "USER_EXIST": "用户已存在",
   "USER_NOT_EXIST": "用户不存在",
-  "USER_REGISTED": "用户已注册",
+  "USER_REGISTERED": "用户已注册",
   "TOKEN_EXPIRED": "密钥已过期",
   "TWO_FACTOR_AUTH_ERROR_DETAIL": "二步验证失败",
   "[{{name | safe}}] Registration Confirm Mail": "【{{name | safe}}】注册确认邮件",
@@ -11,7 +11,7 @@
   "Please click <a href=\"{{url}}\">{{url}}</a> to login and change your password as soon as possible!": "请尽快点击链接 <a href=\"{{url}}\">{{url}}</a> 登录并修改你的密码！",
   "Duplicate Content": "发送的内容之前已经发过",
   "Comment too fast": "评论太快啦，请慢点！",
-  "Registeration confirm mail send failed, please {%- if isAdmin -%}check your mail configuration{%- else -%}check your email address and contact administrator{%- endif -%}.": "注册确认邮件发送失败，请{%- if isAdmin -%}检查一下网站的邮件相关配置{% else %}确认你的邮箱输入无误并联系管理员{%- endif -%}。",
+  "Registration confirm mail send failed, please {%- if isAdmin -%}check your mail configuration{%- else -%}check your email address and contact administrator{%- endif -%}.": "注册确认邮件发送失败，请{%- if isAdmin -%}检查一下网站的邮件相关配置{% else %}确认你的邮箱输入无误并联系管理员{%- endif -%}。",
   "MAIL_SUBJECT": "{{parent.nick | safe}}，『{{site.name | safe}}』上的评论收到了回复",
   "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}} 上有新评论了",

package/src/locales/zh-TW.json

@@ -2,7 +2,7 @@
   "import data format not support!": "文件格式不支持",
   "USER_EXIST": "用戶已存在",
   "USER_NOT_EXIST": "用戶不存在",
-  "USER_REGISTED": "用戶已註冊",
+  "USER_REGISTERED": "用戶已註冊",
   "TOKEN_EXPIRED": "密鑰已過期",
   "TWO_FACTOR_AUTH_ERROR_DETAIL": "二步驗證失敗",
   "[{{name | safe}}] Registration Confirm Mail": "『{{name | safe}}』註冊確認郵件",
@@ -11,7 +11,7 @@
   "Please click <a href=\"{{url}}\">{{url}}</a> to login and change your password as soon as possible!": "請盡快點擊鏈接 <a href=\"{{url}}\">{{url}}</a> 登錄並修改你的密碼！",
   "Duplicate Content": "發送的內容之前已經發過",
   "Comment too fast": "評論太快啦，請慢點！",
-  "Registeration confirm mail send failed, please {%- if isAdmin -%}check your mail configuration{%- else -%}check your email address and contact administrator{%- endif -%}.": "註冊確認郵件發送失敗，{%- if isAdmin -%}檢查一下網站的郵件相關配置{% else %}確認你的郵箱輸入無誤後聯繫管理員{%- endif -%}。",
+  "Registration confirm mail send failed, please {%- if isAdmin -%}check your mail configuration{%- else -%}check your email address and contact administrator{%- endif -%}.": "註冊確認郵件發送失敗，{%- if isAdmin -%}檢查一下網站的郵件相關配置{% else %}確認你的郵箱輸入無誤後聯繫管理員{%- endif -%}。",
   "MAIL_SUBJECT": "{{parent.nick | safe}}，『{{site.name | safe}}』上的評論收到回復",
   "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}} 上有新評論了",

package/src/logic/base.js

@@ -50,7 +50,13 @@ module.exports = class extends think.Logic {
       return;
     }
     const token = state || authorization.replace(/^Bearer /, '');
-    const userMail = jwt.verify(token, think.config('jwtKey'));
+    let userMail = '';
+
+    try {
+      userMail = jwt.verify(token, think.config('jwtKey'));
+    } catch (e) {
+      think.logger.debug(e);
+    }
 
     if (think.isEmpty(userMail) || !think.isString(userMail)) {
       return;

package/src/logic/user.js

@@ -109,7 +109,7 @@ module.exports = class extends Base {
       return this.fail();
     }
 
-    // you should be a administrator to update otherself info
+    // you should be a administrator to update others info
     if (this.id && userInfo.type !== 'administrator') {
       return this.fail();
     }

package/src/service/notify.js

@@ -499,8 +499,7 @@ module.exports = class extends think.Service {
       if (
         [wechat, qq, telegram, qywxAmWechat, pushplus, discord, lark].every(
           think.isEmpty
-        ) &&
-        !isReplyAuthor
+        )
       ) {
         mailList.push({ to: AUTHOR, title, content });
       }
@@ -515,6 +514,7 @@ module.exports = class extends think.Service {
       parent &&
       !fakeMail.test(parent.mail) &&
       !isCommentSelf &&
+      !isReplyAuthor &&
       comment.status !== 'waiting'
     ) {
       mailList.push({

package/src/service/storage/github.js

@@ -308,7 +308,6 @@ module.exports = class extends Base {
     return data.map(({ id, ...cmt }) => ({ ...cmt, objectId: id }));
   }
 
-  // eslint-disable-next-line no-unused-vars
   async count(where = {}, { group } = {}) {
     const instance = await this.collection(this.tableName);
     const data = this.where(instance, where);
@@ -335,9 +334,8 @@ module.exports = class extends Base {
   }
 
   async add(
-    data,
-    // eslint-disable-next-line no-unused-vars
-    { access: { read = true, write = true } = { read: true, write: true } } = {}
+    data
+    // { access: { read = true, write = true } = { read: true, write: true } } = {}
   ) {
     const instance = await this.collection(this.tableName);
     const id = Math.random().toString(36).substr(2, 15);