@waline/vercel 1.17.3 → 1.18.1

package/.eslintrc.yml

@@ -1,2 +1,9 @@
 globals:
   think: readonly
+
+overrides:
+  - files:
+      - '__tests__/**/*.spec.js'
+
+    parserOptions:
+      sourceType: module

package/__tests__/__snapshots__/xss.spec.js.snap

@@ -1,6 +1,6 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Vitest Snapshot v1
 
-exports[`XSS test Should render 1`] = `
+exports[`XSS test > Should render 1`] = `
 "<p>Waline is a good framework. :money:</p>
 <h2>特性</h2>
 <ul>

package/__tests__/katex.spec.js

@@ -1,5 +1,7 @@
-const MarkdownIt = require('markdown-it');
-const { katexPlugin } = require('../src/service/markdown/katex');
+import { describe, expect, it } from 'vitest';
+import MarkdownIt from 'markdown-it';
+import { katexPlugin } from '../src/service/markdown/katex';
+import { vi } from 'vitest';
 
 const markdownIt = MarkdownIt({ linkify: true }).use(katexPlugin, {
   output: 'mathml',
@@ -46,7 +48,7 @@ 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 = jest.fn();
+    global.console.warn = vi.fn();
 
     expect(markdownItWithError.render('$\\fra{a}{b}$')).toEqual(
       "<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"
@@ -117,7 +119,7 @@ $$
   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 = jest.fn();
+    global.console.warn = vi.fn();
     expect(markdownItWithError.render('$$\\fra{a}{b}$$')).toMatch(
       /<p class='katex-block katex-error' title='[\s\S]*?'>[\s\S]*?<\/p>/
     );

package/__tests__/mathjax.spec.js

@@ -1,5 +1,6 @@
-const MarkdownIt = require('markdown-it');
-const { mathjaxPlugin } = require('../src/service/markdown/mathjax');
+import { describe, expect, it } from 'vitest';
+import MarkdownIt from 'markdown-it';
+import { mathjaxPlugin } from '../src/service/markdown/mathjax';
 
 const markdownIt = MarkdownIt({ linkify: true }).use(mathjaxPlugin);
 

package/__tests__/xss.spec.js

@@ -1,5 +1,7 @@
-const MarkdownIt = require('markdown-it');
-const { sanitize } = require('../src/service/markdown/xss');
+import { describe, expect, it } from 'vitest';
+import MarkdownIt from 'markdown-it';
+import { sanitize } from '../src/service/markdown/xss';
+
 const parser = (content) =>
   sanitize(new MarkdownIt({ html: true }).render(content));
 

package/index.js

@@ -1,5 +1,5 @@
-const os = require('os');
-const path = require('path');
+const os = require('node:os');
+const path = require('node:path');
 const Application = require('thinkjs');
 const Loader = require('thinkjs/lib/loader');
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@waline/vercel",
-  "version": "1.17.3",
+  "version": "1.18.1",
   "description": "vercel server for waline comment system",
   "keywords": [
     "waline",
@@ -47,5 +47,8 @@
     "think-router-rest": "^1.0.5",
     "thinkjs": "^3.2.14",
     "ua-parser-js": "^1.0.2"
+  },
+  "engines": {
+    "node": ">=14"
   }
 }

package/src/config/config.js

@@ -92,7 +92,7 @@ const markdown = {
 
 if (isFalse(MARKDOWN_HIGHLIGHT)) markdown.config.highlight = false;
 
-let avatarProxy = 'https://avatar.75cdn.workers.dev/';
+let avatarProxy = '';
 if (AVATAR_PROXY) {
   avatarProxy = !isFalse(AVATAR_PROXY) ? AVATAR_PROXY : '';
 }

package/src/controller/comment.js

@@ -50,6 +50,7 @@ async function formatCmt(
     comment.addr = await think.ip2region(ip, { depth: isAdmin ? 3 : 1 });
   }
   comment.comment = markdownParser(comment.comment);
+  comment.like = Number(comment.like) || 0;
   return comment;
 }
 
@@ -97,6 +98,7 @@ module.exports = class extends BaseRest {
             'ip',
             'user_id',
             'sticky',
+            'like',
           ],
         });
 
@@ -231,7 +233,7 @@ module.exports = class extends BaseRest {
         const where = { url };
         if (think.isEmpty(userInfo) || this.config('storage') === 'deta') {
           where.status = ['NOT IN', ['waiting', 'spam']];
-        } else {
+        } else if (userInfo.type !== 'administrator') {
           where._complex = {
             _logic: 'or',
             status: ['NOT IN', ['waiting', 'spam']],
@@ -259,6 +261,7 @@ module.exports = class extends BaseRest {
             'ip',
             'user_id',
             'sticky',
+            'like',
           ],
         };
 
@@ -553,7 +556,10 @@ module.exports = class extends BaseRest {
 
     if (comment.status !== 'spam') {
       const notify = this.service('notify');
-      await notify.run({ ...resp, rawComment: comment }, parentComment);
+      await notify.run(
+        { ...resp, comment: markdownParser(resp.comment), rawComment: comment },
+        { ...parentComment, comment: markdownParser(parentComment.comment) }
+      );
     }
 
     think.logger.debug(`Comment notify done!`);
@@ -568,13 +574,27 @@ module.exports = class extends BaseRest {
   }
 
   async putAction() {
-    const data = this.post();
+    const { userInfo } = this.ctx.state;
+    let data = this.post();
     let oldData = await this.modelInstance.select({ objectId: this.id });
     if (think.isEmpty(oldData)) {
       return this.success();
     }
 
     oldData = oldData[0];
+    if (think.isEmpty(userInfo) || userInfo.type !== 'administrator') {
+      if (!think.isBoolean(data.like)) {
+        return this.success();
+      }
+
+      const likeIncMax = this.config('LIKE_INC_MAX') || 1;
+      data = {
+        like:
+          (Number(oldData.like) || 0) +
+          (data.like ? Math.ceil(Math.random() * likeIncMax) : -1),
+      };
+    }
+
     const preUpdateResp = await this.hook('preUpdate', {
       ...data,
       objectId: this.id,
@@ -599,7 +619,11 @@ module.exports = class extends BaseRest {
       pComment = pComment[0];
 
       const notify = this.service('notify');
-      await notify.run(newData, pComment, true);
+      await notify.run(
+        { ...newData, comment: markdownParser(newData.comment) },
+        { ...pComment, comment: markdownParser(pComment.comment) },
+        true
+      );
     }
 
     await this.hook('postUpdate', data);

package/src/controller/db.js

@@ -1,5 +1,5 @@
-const fs = require('fs');
-const util = require('util');
+const fs = require('node:fs');
+const util = require('node:util');
 const BaseRest = require('./rest');
 
 const readFileAsync = util.promisify(fs.readFile);

package/src/controller/oauth.js

@@ -1,4 +1,4 @@
-const qs = require('querystring');
+const qs = require('node:querystring');
 const jwt = require('jsonwebtoken');
 const { PasswordHash } = require('phpass');
 const request = require('request-promise-native');

package/src/controller/rest.js

@@ -1,4 +1,4 @@
-const path = require('path');
+const path = require('node:path');
 
 module.exports = class extends think.Controller {
   static get _REST() {

package/src/controller/user.js

@@ -1,4 +1,4 @@
-const qs = require('querystring');
+const qs = require('node:querystring');
 const { PasswordHash } = require('phpass');
 const BaseRest = require('./rest');
 

package/src/logic/comment.js

@@ -4,9 +4,10 @@ module.exports = class extends Base {
     await super.__before();
 
     const { type, path } = this.get();
+    const { like } = this.post();
     const isAllowedGet = this.isGet && (type !== 'list' || path);
-
-    if (this.isPost || isAllowedGet) {
+    const isAllowedPut = this.ctx.isMethod('PUT') && think.isBoolean(like);
+    if (this.isPost || isAllowedGet || isAllowedPut) {
       return;
     }
 
@@ -207,7 +208,7 @@ module.exports = class extends Base {
   }
 
   /**
-   * @api {POST} /comment/:id update comment data
+   * @api {PUT} /comment/:id update comment data
    * @apiGroup Comment
    * @apiVersion  0.0.1
    *
@@ -216,11 +217,22 @@ module.exports = class extends Base {
    * @apiParam  {String}  [link]  post comment user link
    * @apiParam  {String}  [comment]  post comment text
    * @apiParam  {String}  [url]  the artcile url path of comment
+   * @apiParam  {Boolean} [like] like comment
    *
    * @apiSuccess  (200) {Number}  errno 0
    * @apiSuccess  (200) {String}  errmsg  return error message if error
    */
-  putAction() {}
+  putAction() {
+    const { userInfo } = this.ctx.state;
+    if (think.isEmpty(userInfo) || userInfo.type !== 'administrator') {
+      this.rules = {
+        like: {
+          required: true,
+          boolean: true,
+        },
+      };
+    }
+  }
 
   /**
    * @api {DELETE} /comment/:id delete comment

package/src/service/storage/github.js

@@ -1,4 +1,4 @@
-const path = require('path');
+const path = require('node:path');
 const { parseString, writeToString } = require('fast-csv');
 const request = require('request-promise-native');
 const Base = require('./base');

package/src/service/storage/leancloud.js

@@ -127,7 +127,11 @@ module.exports = class extends Base {
   }
 
   async _getCmtGroupByMailUserIdCache(key, where) {
-    if (this.tableName !== 'Comment' || key !== 'user_id_mail') {
+    if (
+      this.tableName !== 'Comment' ||
+      key !== 'user_id_mail' ||
+      !think.isArray(think.config('levels'))
+    ) {
       return [];
     }
 
@@ -140,7 +144,11 @@ module.exports = class extends Base {
   }
 
   async _setCmtGroupByMailUserIdCache(key, data) {
-    if (this.tableName !== 'Comment' || key !== 'user_id_mail') {
+    if (
+      this.tableName !== 'Comment' ||
+      key !== 'user_id_mail' ||
+      !think.isArray(think.config('levels'))
+    ) {
       return;
     }
 
@@ -161,7 +169,10 @@ module.exports = class extends Base {
   }
 
   async _updateCmtGroupByMailUserIdCache(data, method) {
-    if (this.tableName !== 'Comment') {
+    if (
+      this.tableName !== 'Comment' ||
+      !think.isArray(think.config('levels'))
+    ) {
       return;
     }
 

package/vanilla.js

@@ -1,4 +1,4 @@
-const path = require('path');
+const path = require('node:path');
 const Application = require('thinkjs');
 
 const instance = new Application({