@waline/vercel 1.17.2 → 1.18.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@waline/vercel",
-  "version": "1.17.2",
+  "version": "1.18.0",
   "description": "vercel server for waline comment system",
   "keywords": [
     "waline",
@@ -31,7 +31,7 @@
     "markdown-it-sub": "^1.0.0",
     "markdown-it-sup": "^1.0.0",
     "mathjax-full": "^3.2.0",
-    "nodemailer": "^6.7.4",
+    "nodemailer": "^6.7.5",
     "nunjucks": "^3.2.3",
     "phpass": "^0.1.1",
     "prismjs": "^1.28.0",

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',
           ],
         };
 
@@ -365,7 +368,7 @@ module.exports = class extends BaseRest {
           });
           comments.forEach((cmt) => {
             const countItem = (counts || []).find(({ mail, user_id }) => {
-              if (user_id) {
+              if (cmt.user_id) {
                 return user_id === cmt.user_id;
               }
               return mail === cmt.mail;
@@ -568,13 +571,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,

package/src/logic/base.js

@@ -65,6 +65,7 @@ module.exports = class extends think.Logic {
           'qq',
           'avatar',
           '2fa',
+          'label',
         ],
       }
     );

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

@@ -30,6 +30,7 @@ const CSV_HEADERS = {
     'type',
     'url',
     'avatar',
+    'label',
     'github',
     'twitter',
     'facebook',

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;
     }