@waline/vercel 1.19.1 → 1.19.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@waline/vercel",
-  "version": "1.19.1",
+  "version": "1.19.2",
   "description": "vercel server for waline comment system",
   "keywords": [
     "waline",
@@ -32,8 +32,8 @@
     "markdown-it-sub": "1.0.0",
     "markdown-it-sup": "1.0.0",
     "mathjax-full": "3.2.2",
-    "node-fetch": "2",
-    "nodemailer": "6.7.7",
+    "node-fetch": "2.6.7",
+    "nodemailer": "6.7.8",
     "nunjucks": "3.2.3",
     "phpass": "0.1.1",
     "prismjs": "1.28.0",
@@ -43,7 +43,7 @@
     "think-model": "1.5.4",
     "think-model-mysql": "1.1.7",
     "think-model-postgresql": "1.1.7",
-    "think-model-sqlite": "1.2.3",
+    "think-model-sqlite": "1.3.0",
     "think-mongo": "2.2.1",
     "think-router-rest": "1.0.5",
     "thinkjs": "3.2.14",

package/src/controller/comment.js

@@ -567,10 +567,17 @@ module.exports = class extends BaseRest {
     think.logger.debug(`Comment have been added to storage.`);
 
     let parentComment;
+    let parentUser;
 
     if (pid) {
       parentComment = await this.modelInstance.select({ objectId: pid });
       parentComment = parentComment[0];
+      if (parentComment.user_id) {
+        parentUser = await this.model('User').select({
+          objectId: parentComment.user_id,
+        });
+        parentUser = parentUser[0];
+      }
     }
 
     await this.ctx.webhook('new_comment', {
@@ -578,14 +585,27 @@ module.exports = class extends BaseRest {
       reply: parentComment,
     });
 
+    const cmtReturn = await formatCmt(
+      resp,
+      [userInfo],
+      this.config(),
+      userInfo
+    );
+    const parentReturn = parentComment
+      ? await formatCmt(
+          parentComment,
+          parentUser ? [parentUser] : [],
+          this.config(),
+          userInfo
+        )
+      : undefined;
+
     if (comment.status !== 'spam') {
       const notify = this.service('notify');
 
       await notify.run(
-        { ...resp, comment: markdownParser(resp.comment), rawComment: comment },
-        parentComment
-          ? { ...parentComment, comment: markdownParser(parentComment.comment) }
-          : undefined
+        { ...cmtReturn, mail: resp.mail, rawComment: comment },
+        parentReturn ? { ...parentReturn, mail: parentComment.mail } : undefined
       );
     }
 
@@ -642,17 +662,47 @@ module.exports = class extends BaseRest {
       data.status === 'approved' &&
       oldData.pid
     ) {
+      let cmtUser;
+
+      if (newData.user_id) {
+        cmtUser = await this.model('User').select({
+          objectId: newData.user_id,
+        });
+        cmtUser = cmtUser[0];
+      }
+
       let pComment = await this.modelInstance.select({
         objectId: oldData.pid,
       });
 
       pComment = pComment[0];
 
+      let pUser;
+
+      if (pComment.user_id) {
+        pUser = await this.model('User').select({
+          objectId: pComment.user_id,
+        });
+        pUser = pUser[0];
+      }
+
       const notify = this.service('notify');
+      const cmtReturn = await formatCmt(
+        newData,
+        cmtUser ? [cmtUser] : [],
+        this.config(),
+        userInfo
+      );
+      const pcmtReturn = await formatCmt(
+        pComment,
+        pUser ? [pUser] : [],
+        this.config(),
+        userInfo
+      );
 
       await notify.run(
-        { ...newData, comment: markdownParser(newData.comment) },
-        { ...pComment, comment: markdownParser(pComment.comment) },
+        { ...cmtReturn, mail: newData.mail },
+        { ...pcmtReturn, mail: pComment.mail },
         true
       );
     }

package/src/controller/db.js

@@ -6,8 +6,10 @@ 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);
   }
 
@@ -42,6 +44,7 @@ module.exports = class extends BaseRest {
       const model = this.service(`storage/${storage}`, tableName);
 
       const data = await model.select({});
+
       exportData.data[tableName] = data;
     }
 
@@ -68,8 +71,10 @@ module.exports = class extends BaseRest {
 
         idMaps[tableName] = new Map();
         let data = importData.data[tableName];
+
         if (['postgresql', 'mysql', 'sqlite'].includes(storage)) {
           let i = 0;
+
           data = formatID(data, () => (i = i + 1));
         } else if (storage === 'leancloud') {
           data
@@ -131,6 +136,7 @@ module.exports = class extends BaseRest {
         return this.success();
       }
       console.log(e);
+
       return this.fail(e.message);
     }
   }

package/src/service/storage/mysql.js

@@ -9,7 +9,7 @@ module.exports = class extends Base {
     }
 
     for (const k in filter) {
-      if (k === 'objectId') {
+      if (k === 'objectId' || k === 'objectid') {
         where.id = filter[k];
         continue;
       }
@@ -78,6 +78,11 @@ module.exports = class extends Base {
       data.id = data.objectId;
       delete data.objectId;
     }
+    const date = new Date();
+    if (!data.createdAt)
+      data.createdAt = date;
+    if (!data.updatedAt)
+      data.updatedAt = date;
 
     const instance = this.model(this.tableName);
     const id = await instance.add(data);