@waline/vercel 1.18.3 → 1.18.6

package/index.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@waline/vercel",
-  "version": "1.18.3",
+  "version": "1.18.6",
   "description": "vercel server for waline comment system",
   "keywords": [
     "waline",
@@ -15,38 +15,39 @@
   "license": "MIT",
   "author": "lizheming <i@imnerd.org>",
   "dependencies": {
-    "@cloudbase/node-sdk": "^2.9.0",
-    "@koa/cors": "^3.3.0",
-    "akismet": "^2.0.7",
-    "deta": "^1.1.0",
-    "dompurify": "^2.3.6",
-    "dy-node-ip2region": "^1.0.1",
-    "fast-csv": "^4.3.6",
-    "jsdom": "^19.0.0",
-    "jsonwebtoken": "^8.5.1",
-    "katex": "^0.15.3",
-    "leancloud-storage": "^4.12.2",
-    "markdown-it": "^13.0.1",
-    "markdown-it-emoji": "^2.0.2",
-    "markdown-it-sub": "^1.0.0",
-    "markdown-it-sup": "^1.0.0",
-    "mathjax-full": "^3.2.0",
-    "nodemailer": "^6.7.5",
-    "nunjucks": "^3.2.3",
-    "phpass": "^0.1.1",
-    "prismjs": "^1.28.0",
-    "request": "^2.88.2",
-    "request-promise-native": "^1.0.9",
-    "speakeasy": "^2.0.0",
-    "think-logger3": "^1.3.1",
-    "think-model": "^1.5.4",
-    "think-model-mysql": "^1.1.7",
+    "@cloudbase/node-sdk": "2.9.1",
+    "@koa/cors": "3.3.0",
+    "akismet": "2.0.7",
+    "deta": "1.1.0",
+    "dompurify": "2.3.8",
+    "dy-node-ip2region": "1.0.1",
+    "fast-csv": "4.3.6",
+    "jsdom": "19.0.0",
+    "jsonwebtoken": "8.5.1",
+    "katex": "0.15.6",
+    "leancloud-storage": "4.12.2",
+    "markdown-it": "13.0.1",
+    "markdown-it-emoji": "2.0.2",
+    "markdown-it-sub": "1.0.0",
+    "markdown-it-sup": "1.0.0",
+    "mathjax-full": "3.2.1",
+    "nodemailer": "6.7.5",
+    "nunjucks": "3.2.3",
+    "phpass": "0.1.1",
+    "prismjs": "1.28.0",
+    "request": "2.88.2",
+    "request-promise-native": "1.0.9",
+    "speakeasy": "2.0.0",
+    "think-helper": "^1.1.3",
+    "think-logger3": "1.3.1",
+    "think-model": "1.5.4",
+    "think-model-mysql": "1.1.7",
     "think-model-postgresql": "1.1.6",
-    "think-model-sqlite": "^1.2.3",
-    "think-mongo": "^2.2.1",
-    "think-router-rest": "^1.0.5",
-    "thinkjs": "^3.2.14",
-    "ua-parser-js": "^1.0.2"
+    "think-model-sqlite": "1.2.3",
+    "think-mongo": "2.2.1",
+    "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

@@ -556,7 +556,12 @@ 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
+          ? { ...parentComment, comment: markdownParser(parentComment.comment) }
+          : undefined
+      );
     }
 
     think.logger.debug(`Comment notify done!`);
@@ -616,7 +621,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);
@@ -631,7 +640,14 @@ module.exports = class extends BaseRest {
       return this.fail(preDeleteResp);
     }
 
-    await this.modelInstance.delete({ objectId: this.id });
+    await this.modelInstance.delete({
+      _complex: {
+        _logic: 'or',
+        objectId: this.id,
+        pid: this.id,
+        rid: this.id,
+      },
+    });
     await this.hook('postDelete', this.id);
 
     return this.success();

package/src/controller/db.js

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

package/src/controller/oauth.js

@@ -1,4 +1,4 @@
-const qs = require('node:querystring');
+const qs = require('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('node:path');
+const path = require('path');
 
 module.exports = class extends think.Controller {
   static get _REST() {

package/src/controller/user.js

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

package/src/service/storage/github.js

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

package/src/service/storage/mysql.js

@@ -13,6 +13,11 @@ module.exports = class extends Base {
         continue;
       }
 
+      if (k === '_complex') {
+        where[k] = this.parseWhere(filter[k]);
+        continue;
+      }
+
       if (filter[k] === undefined) {
         where[k] = null;
         continue;

package/vanilla.js

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