@waline/vercel 1.19.4 → 1.21.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@waline/vercel",
-  "version": "1.19.4",
+  "version": "1.21.0",
   "description": "vercel server for waline comment system",
   "keywords": [
     "waline",

package/src/controller/comment.js

@@ -6,7 +6,7 @@ const { getMarkdownParser } = require('../service/markdown');
 const markdownParser = getMarkdownParser();
 
 async function formatCmt(
-  { ua, user_id, ip, ...comment },
+  { ua, ip, ...comment },
   users = [],
   { avatarProxy },
   loginUser
@@ -20,7 +20,7 @@ async function formatCmt(
     comment.os = [ua.os.name, ua.os.version].filter((v) => v).join(' ');
   }
 
-  const user = users.find(({ objectId }) => user_id === objectId);
+  const user = users.find(({ objectId }) => comment.user_id === objectId);
 
   if (!think.isEmpty(user)) {
     comment.nick = user.display_name;
@@ -42,10 +42,12 @@ async function formatCmt(
 
   const isAdmin = loginUser && loginUser.type === 'administrator';
 
+  if (loginUser) {
+    comment.orig = comment.comment;
+  }
   if (!isAdmin) {
     delete comment.mail;
   } else {
-    comment.orig = comment.comment;
     comment.ip = ip;
   }
 
@@ -247,7 +249,7 @@ module.exports = class extends BaseRest {
       }
 
       default: {
-        const { path: url, page, pageSize } = this.get();
+        const { path: url, page, pageSize, sortBy } = this.get();
         const where = { url };
 
         if (think.isEmpty(userInfo) || this.config('storage') === 'deta') {
@@ -266,7 +268,6 @@ module.exports = class extends BaseRest {
         let rootComments = [];
         let rootCount = 0;
         const selectOptions = {
-          desc: 'insertedAt',
           field: [
             'status',
             'comment',
@@ -284,6 +285,16 @@ module.exports = class extends BaseRest {
           ],
         };
 
+        if (sortBy) {
+          const [field, order] = sortBy.split('_');
+
+          if (order === 'desc') {
+            selectOptions.desc = field;
+          } else if (order === 'asc') {
+            // do nothing because of ascending order is default behaviour
+          }
+        }
+
         /**
          * most of case we have just little comments
          * while if we want get rootComments, rootCount, childComments with pagination
@@ -583,7 +594,7 @@ module.exports = class extends BaseRest {
       if (parentComment.user_id) {
         parentUser = await this.service(
           `storage/${this.config('storage')}`,
-          'User'
+          'Users'
         ).select({
           objectId: parentComment.user_id,
         });
@@ -633,26 +644,19 @@ module.exports = class extends BaseRest {
 
   async putAction() {
     const { userInfo } = this.ctx.state;
-    let data = this.post();
+    const isAdmin = userInfo.type === 'administrator';
+    let data = isAdmin ? this.post() : this.post('comment,like');
     let oldData = await this.modelInstance.select({ objectId: this.id });
 
-    if (think.isEmpty(oldData)) {
+    if (think.isEmpty(oldData) || think.isEmpty(data)) {
       return this.success();
     }
 
     oldData = oldData[0];
-    if (think.isEmpty(userInfo) || userInfo.type !== 'administrator') {
-      if (!think.isBoolean(data.like)) {
-        return this.success();
-      }
-
+    if (think.isBoolean(data.like)) {
       const likeIncMax = this.config('LIKE_INC_MAX') || 1;
-
-      data = {
-        like:
-          (Number(oldData.like) || 0) +
-          (data.like ? Math.ceil(Math.random() * likeIncMax) : -1),
-      };
+      data.like = (Number(oldData.like) || 0) +
+      (data.like ? Math.ceil(Math.random() * likeIncMax) : -1);
     }
 
     const preUpdateResp = await this.hook('preUpdate', {
@@ -668,22 +672,28 @@ module.exports = class extends BaseRest {
       objectId: this.id,
     });
 
+    let cmtUser;
+    if (!think.isEmpty(newData) && newData[0].user_id) {
+      cmtUser = await this.service(
+        `storage/${this.config('storage')}`,
+        'Users'
+      ).select({
+        objectId: newData[0].user_id,
+      });
+      cmtUser = cmtUser[0];
+    }
+    const cmtReturn = await formatCmt(
+      newData[0],
+      cmtUser ? [cmtUser] : [],
+      this.config(),
+      userInfo
+    );
+    
     if (
       oldData.status === 'waiting' &&
       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,
@@ -696,7 +706,7 @@ module.exports = class extends BaseRest {
       if (pComment.user_id) {
         pUser = await this.service(
           `storage/${this.config('storage')}`,
-          'User'
+          'Users'
         ).select({
           objectId: pComment.user_id,
         });
@@ -704,12 +714,6 @@ module.exports = class extends BaseRest {
       }
 
       const notify = this.service('notify');
-      const cmtReturn = await formatCmt(
-        newData,
-        cmtUser ? [cmtUser] : [],
-        this.config(),
-        userInfo
-      );
       const pcmtReturn = await formatCmt(
         pComment,
         pUser ? [pUser] : [],
@@ -718,7 +722,7 @@ module.exports = class extends BaseRest {
       );
 
       await notify.run(
-        { ...cmtReturn, mail: newData.mail },
+        { ...cmtReturn, mail: newData[0].mail },
         { ...pcmtReturn, mail: pComment.mail },
         true
       );
@@ -726,7 +730,7 @@ module.exports = class extends BaseRest {
 
     await this.hook('postUpdate', data);
 
-    return this.success();
+    return this.success(cmtReturn);
   }
 
   async deleteAction() {

package/src/controller/oauth.js

@@ -1,7 +1,6 @@
 const jwt = require('jsonwebtoken');
 const fetch = require('node-fetch');
 const { PasswordHash } = require('phpass');
-const qs = require('querystring');
 
 module.exports = class extends think.Controller {
   constructor(ctx) {
@@ -21,16 +20,16 @@ module.exports = class extends think.Controller {
 
     if (!hasCode) {
       const { serverURL } = this.ctx;
-      const redirectUrl = `${serverURL}/oauth?${qs.stringify({
+      const redirectUrl = `${serverURL}/oauth?${new URLSearchParams({
         redirect,
         type,
-      })}`;
+      }).toString()}`;
 
       return this.redirect(
-        `${oauthUrl}/${type}?${qs.stringify({
+        `${oauthUrl}/${type}?${new URLSearchParams({
           redirect: redirectUrl,
           state: this.ctx.state.token,
-        })}`
+        }).toString()}`
       );
     }
 
@@ -41,23 +40,26 @@ module.exports = class extends think.Controller {
 
     if (type === 'facebook') {
       const { serverURL } = this.ctx;
-      const redirectUrl = `${serverURL}/oauth?${qs.stringify({
+      const redirectUrl = `${serverURL}/oauth?${new URLSearchParams({
         redirect,
         type,
-      })}`;
+      }).toString()}`;
 
-      params.state = qs.stringify({
+      params.state = new URLSearchParams({
         redirect: redirectUrl,
         state: this.ctx.state.token || '',
       });
     }
 
-    const user = await fetch(`${oauthUrl}/${type}?${qs.stringify(params)}`, {
-      method: 'GET',
-      headers: {
-        'user-agent': '@waline',
-      },
-    }).then((resp) => resp.json());
+    const user = await fetch(
+      `${oauthUrl}/${type}?${new URLSearchParams(params).toString()}`,
+      {
+        method: 'GET',
+        headers: {
+          'user-agent': '@waline',
+        },
+      }
+    ).then((resp) => resp.json());
 
     if (!user || !user.id) {
       return this.fail(user);

package/src/controller/user.js

@@ -1,4 +1,3 @@
-const qs = require('querystring');
 const { PasswordHash } = require('phpass');
 const BaseRest = require('./rest');
 
@@ -82,7 +81,7 @@ module.exports = class extends BaseRest {
       const apiUrl =
         this.ctx.serverURL +
         '/verification?' +
-        qs.stringify({ token, email: data.email });
+        new URLSearchParams({ token, email: data.email }).toString();
 
       await notify.transporter.sendMail({
         from:

package/src/logic/comment.js

@@ -1,18 +1,7 @@
 const Base = require('./base');
 
 module.exports = class extends Base {
-  async __before() {
-    await super.__before();
-
-    const { type, path } = this.get();
-    const { like } = this.post();
-    const isAllowedGet = this.isGet && (type !== 'list' || path);
-    const isAllowedPut = this.ctx.isMethod('PUT') && think.isBoolean(like);
-
-    if (this.isPost || isAllowedGet || isAllowedPut) {
-      return;
-    }
-
+  checkAdmin() {
     const { userInfo } = this.ctx.state;
 
     if (think.isEmpty(userInfo)) {
@@ -32,6 +21,7 @@ module.exports = class extends Base {
    * @apiParam  {String}  path  comment url path
    * @apiParam  {String}  page  page
    * @apiParam  {String}  pagesize  page size
+   * @apiParam  {String}  sortBy  comment sort type, one of 'insertedAt_desc', 'insertedAt_asc', 'like_desc'
    *
    * @apiSuccess  (200) {Number}  page return current comments list page
    * @apiSuccess  (200) {Number}  pageSize  to  return error message if error
@@ -115,7 +105,11 @@ module.exports = class extends Base {
    * @apiSuccess  (200) {String}  response.type comment login user type
    */
   getAction() {
-    const { type } = this.get();
+    const { type, path } = this.get();
+    const isAllowedGet = type !== 'list' || path;
+    if (!isAllowedGet) {
+      this.checkAdmin();
+    }
 
     switch (type) {
       case 'recent':
@@ -168,6 +162,10 @@ module.exports = class extends Base {
             int: { max: 100 },
             default: 10,
           },
+          sortBy: {
+            in: ['insertedAt_desc', 'insertedAt_asc', 'like_desc'],
+            default: 'insertedAt_desc',
+          },
         };
         break;
     }
@@ -225,17 +223,41 @@ module.exports = class extends Base {
    * @apiSuccess  (200) {Number}  errno 0
    * @apiSuccess  (200) {String}  errmsg  return error message if error
    */
-  putAction() {
+  async putAction() {
     const { userInfo } = this.ctx.state;
+    const { like } = this.post();
 
-    if (think.isEmpty(userInfo) || userInfo.type !== 'administrator') {
+    // 1. like
+    if (think.isEmpty(userInfo) && think.isBoolean(like)) {
       this.rules = {
         like: {
           required: true,
           boolean: true,
         },
       };
+      return;
+    }
+
+    if (think.isEmpty(userInfo)) {
+      return this.ctx.throw(401);
+    }
+
+    // 2. administrator
+    if (userInfo.type === 'administrator') {
+      return;
+    }
+
+    // 3. comment author modify comment content
+    const modelInstance = this.service(
+      `storage/${this.config('storage')}`,
+      'Comment'
+    );
+    const commentData = await modelInstance.select({ user_id: userInfo.objectId, objectId: this.id });
+    if (!think.isEmpty(commentData)) {
+      return;
     }
+    
+    return this.ctx.throw(403);
   }
 
   /**
@@ -246,5 +268,25 @@ module.exports = class extends Base {
    * @apiSuccess  (200) {Number}  errno 0
    * @apiSuccess  (200) {String}  errmsg  return error message if error
    */
-  deleteAction() {}
+  async deleteAction() {
+    const { userInfo } = this.ctx.state;
+
+    if (think.isEmpty(userInfo)) {
+      return this.ctx.throw(401);
+    }
+
+    if (userInfo.type === 'administrator') {
+      return;
+    }
+
+    const modelInstance = this.service(
+      `storage/${this.config('storage')}`,
+      'Comment'
+    );
+    const commentData = await modelInstance.select({ user_id: userInfo.objectId, objectId: this.id });
+    if (!think.isEmpty(commentData)) {
+      return;
+    }
+    return this.ctx.throw(403);
+  }
 };

package/src/service/storage/mysql.js

@@ -44,7 +44,7 @@ module.exports = class extends Base {
 
     instance.where(this.parseWhere(where));
     if (desc) {
-      instance.order(`${desc} DESC`);
+      instance.order(`"${desc}" DESC`);
     }
     if (limit || offset) {
       instance.limit(offset || 0, limit);
@@ -67,9 +67,9 @@ module.exports = class extends Base {
       return instance.count();
     }
 
-    instance.field([...group, 'COUNT(*) as count']);
+    instance.field([...group, 'COUNT(*) as count'].join(','));
     instance.group(group);
-
+    
     return instance.select();
   }