@waline/vercel 1.18.4 → 1.18.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@waline/vercel",
-  "version": "1.18.4",
+  "version": "1.18.7",
   "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.16.0",
+    "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.2",
+    "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/controller/comment.js

@@ -558,7 +558,9 @@ module.exports = class extends BaseRest {
       const notify = this.service('notify');
       await notify.run(
         { ...resp, comment: markdownParser(resp.comment), rawComment: comment },
-        { ...parentComment, comment: markdownParser(parentComment.comment) }
+        parentComment
+          ? { ...parentComment, comment: markdownParser(parentComment.comment) }
+          : undefined
       );
     }
 
@@ -638,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

@@ -3,6 +3,24 @@ const util = require('util');
 const BaseRest = require('./rest');
 
 const readFileAsync = util.promisify(fs.readFile);
+
+function formatID(data, idGenerator) {
+  const objectIdMap = {};
+  for (let i = 0; i < data.length; i++) {
+    const { objectId } = data[i];
+    objectIdMap[objectId] = idGenerator(data[i], i, data);
+  }
+
+  for (let i = 0; i < data.length; i++) {
+    ['objectId', 'pid', 'rid']
+      .filter((k) => data[i][k])
+      .forEach((k) => {
+        data[i][k] = objectIdMap[data[i][k]];
+      });
+  }
+
+  return data;
+}
 module.exports = class extends BaseRest {
   async getAction() {
     const exportData = {
@@ -43,11 +61,17 @@ module.exports = class extends BaseRest {
         const storage = this.config('storage');
         const model = this.service(`storage/${storage}`, tableName);
 
+        let data = importData.data[tableName];
+        if (['postgresql', 'mysql', 'sqlite'].includes(storage)) {
+          let i = 0;
+          data = formatID(data, () => (i = i + 1));
+        }
+
         // delete all data at first
         await model.delete({});
         // then add data one by one
-        for (let j = 0; j < importData.data[tableName].length; j++) {
-          await model.add(importData.data[tableName][j]);
+        for (let j = 0; j < data.length; j++) {
+          await model.add(data[j]);
         }
       }
       return this.success();

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/src/service/storage/postgresql.js

@@ -23,6 +23,20 @@ module.exports = class extends MySQL {
     });
   }
 
+  async add(data) {
+    ['insertedAt', 'createdAt', 'updatedAt']
+      .filter((key) => data[key])
+      .forEach((key) => {
+        const val = data[key];
+        data[key.toLowerCase()] =
+          val instanceof Date
+            ? think.datetime(val, 'YYYY-MM-DD HH:mm:ss')
+            : val;
+        delete data[key];
+      });
+    return super.add(data);
+  }
+
   async count(...args) {
     let result = await super.count(...args);
     try {