@waline/vercel 1.19.1 → 1.19.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@waline/vercel",
-  "version": "1.19.1",
+  "version": "1.19.4",
   "description": "vercel server for waline comment system",
   "keywords": [
     "waline",
@@ -16,34 +16,34 @@
   "author": "lizheming <i@imnerd.org>",
   "dependencies": {
     "@cloudbase/node-sdk": "2.9.1",
-    "@koa/cors": "3.3.0",
+    "@koa/cors": "3.4.1",
     "akismet": "2.0.7",
     "deta": "1.1.0",
-    "dompurify": "2.3.10",
+    "dompurify": "2.4.0",
     "dy-node-ip2region": "1.0.1",
     "fast-csv": "4.3.6",
     "form-data": "4.0.0",
     "jsdom": "20.0.0",
     "jsonwebtoken": "8.5.1",
-    "katex": "0.16.0",
-    "leancloud-storage": "4.13.1",
+    "katex": "0.16.2",
+    "leancloud-storage": "4.13.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",
-    "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",
+    "prismjs": "1.29.0",
     "speakeasy": "2.0.0",
-    "think-helper": "1.1.3",
+    "think-helper": "1.1.4",
     "think-logger3": "1.3.1",
     "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/config/config.js

@@ -54,7 +54,7 @@ if (LEAN_KEY) {
   storage = 'postgresql';
   jwtKey = jwtKey || PG_PASSWORD;
 } else if (SQLITE_PATH) {
-  storage = 'mysql';
+  storage = 'sqlite';
 } else if (MYSQL_DB) {
   storage = 'mysql';
   jwtKey = jwtKey || MYSQL_PASSWORD;

package/src/controller/comment.js

@@ -145,7 +145,8 @@ module.exports = class extends BaseRest {
 
       case 'count': {
         const { url } = this.get();
-        const where = { url: ['IN', url] };
+        const where =
+          Array.isArray(url) && url.length ? { url: ['IN', url] } : {};
 
         if (think.isEmpty(userInfo) || this.config('storage') === 'deta') {
           where.status = ['NOT IN', ['waiting', 'spam']];
@@ -156,12 +157,19 @@ module.exports = class extends BaseRest {
             user_id: userInfo.objectId,
           };
         }
-        const data = await this.modelInstance.select(where, { field: ['url'] });
-        const counts = url.map(
-          (u) => data.filter(({ url }) => url === u).length
-        );
 
-        return this.json(counts.length === 1 ? counts[0] : counts);
+        if (Array.isArray(url) && url.length > 1) {
+          const data = await this.modelInstance.select(where, {
+            field: ['url'],
+          });
+
+          return this.json(
+            url.map((u) => data.filter(({ url }) => url === u).length)
+          );
+        }
+        const data = await this.modelInstance.count(where);
+
+        return this.json(data);
       }
 
       case 'list': {
@@ -567,10 +575,20 @@ 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.service(
+          `storage/${this.config('storage')}`,
+          'User'
+        ).select({
+          objectId: parentComment.user_id,
+        });
+        parentUser = parentUser[0];
+      }
     }
 
     await this.ctx.webhook('new_comment', {
@@ -578,14 +596,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 +673,53 @@ module.exports = class extends BaseRest {
       data.status === 'approved' &&
       oldData.pid
     ) {
+      let cmtUser;
+
+      if (newData.user_id) {
+        cmtUser = await this.service(
+          `storage/${this.config('storage')}`,
+          '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.service(
+          `storage/${this.config('storage')}`,
+          '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,15 +71,20 @@ 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
-            .filter(({ insertedAt }) => insertedAt)
-            .forEach((item) => {
-              item.insertedAt = new Date(item.insertedAt);
-            });
+          await model.setSeqId(1);
+        }
+
+        if (storage === 'leancloud' || storage === 'mysql') {
+          data.forEach((item) => {
+            item.insertedAt && (item.insertedAt = new Date(item.insertedAt));
+            item.createdAt && (item.createdAt = new Date(item.createdAt));
+            item.updatedAt && (item.updatedAt = new Date(item.updatedAt));
+          });
         }
 
         // delete all data at first
@@ -108,7 +116,7 @@ module.exports = class extends BaseRest {
           const oldId = cmt[field];
           const newId = idMaps[tableName].get(cmt[field]);
 
-          if (oldId !== newId) {
+          if (oldId && newId && oldId !== newId) {
             willUpdateItem[field] = newId;
           }
         });
@@ -131,6 +139,7 @@ module.exports = class extends BaseRest {
         return this.success();
       }
       console.log(e);
+
       return this.fail(e.message);
     }
   }

package/src/logic/comment.js

@@ -89,7 +89,7 @@ module.exports = class extends Base {
    * @apiGroup Comment
    * @apiVersion  0.0.1
    *
-   * @apiParam  {String}  url a array string join by comma just like `a` or `a,b`
+   * @apiParam  {String}  url a array string join by comma just like `a` or `a,b`, return site comment count if url empty
    *
    * @apiSuccessExample {Number} Single Path Response:
    * 300
@@ -131,7 +131,6 @@ module.exports = class extends Base {
         this.rules = {
           url: {
             array: true,
-            required: true,
           },
         };
         break;

package/src/service/notify.js

@@ -144,12 +144,11 @@ module.exports = class extends think.Service {
     querystring.set('corpsecret', `${QYWX_AM_AY[1]}`);
 
     const { access_token } = await fetch(
-      `https://qyapi.weixin.qq.com/cgi-bin/gettoken`,
+      `https://qyapi.weixin.qq.com/cgi-bin/gettoken?${querystring.toString()}`,
       {
         headers: {
           'content-type': 'application/json',
         },
-        body: querystring,
       }
     ).then((resp) => resp.json());
 
@@ -392,6 +391,8 @@ module.exports = class extends think.Service {
     const isReplyAuthor = AUTHOR
       ? parent && parent.mail.toLowerCase() === AUTHOR.toLowerCase()
       : false;
+    const isCommentSelf =
+      parent && parent.mail.toLowerCase() === comment.mail.toLowerCase();
 
     const title = mailSubjectAdmin || '{{site.name | safe}} 上有新评论了';
     const content =
@@ -436,7 +437,12 @@ module.exports = class extends think.Service {
     );
     const fakeMail = new RegExp(`@(${disallowList.join('|')})$`, 'i');
 
-    if (parent && !fakeMail.test(parent.mail) && comment.status !== 'waiting') {
+    if (
+      parent &&
+      !fakeMail.test(parent.mail) &&
+      !isCommentSelf &&
+      comment.status !== 'waiting'
+    ) {
       mailList.push({
         to: parent.mail,
         title:

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);
@@ -108,4 +113,12 @@ module.exports = class extends Base {
 
     return instance.where(this.parseWhere(where)).delete();
   }
+
+  async setSeqId(id) {
+    const instance = this.model(this.tableName);
+
+    return instance.query(
+      `ALTER TABLE ${instance.tableName} AUTO_INCREMENT = ${id};`
+    );
+  }
 };

package/src/service/storage/postgresql.js

@@ -73,4 +73,12 @@ module.exports = class extends MySQL {
 
     return result;
   }
+
+  async setSeqId(id) {
+    const instance = this.model(this.tableName);
+
+    return instance.query(
+      `ALTER SEQUENCE ${instance.tableName}_seq RESTART WITH ${id};`
+    );
+  }
 };

package/src/service/storage/sqlite.js

@@ -0,0 +1,11 @@
+const MySQL = require('./mysql');
+
+module.exports = class extends MySQL {
+  async setSeqId(id) {
+    const instance = this.model(this.tableName);
+
+    return instance.query(
+      `UPDATE SQLITE_SEQUENCE SET SEQ=${id} WHERE NAME='${instance.tableName}';`
+    );
+  }
+};