@waline/vercel 1.23.4 → 1.24.0

package/package.json

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

package/src/controller/db.js

@@ -51,6 +51,9 @@ module.exports = class extends BaseRest {
     const storage = this.config('storage');
     const model = this.service(`storage/${storage}`, table);
 
+    delete data.objectId;
+    delete data.createdAt;
+    delete data.updatedAt;
     await model.update(data, { objectId });
 
     return this.success();

package/src/controller/user.js

@@ -11,7 +11,24 @@ module.exports = class extends BaseRest {
   }
 
   async getAction() {
-    const { page, pageSize } = this.get();
+    const { page, pageSize, email } = this.get();
+    const { userInfo } = this.ctx.state;
+
+    if (think.isEmpty(userInfo) || userInfo.type !== 'administrator') {
+      const users = await this.getUsersListByCount();
+
+      return this.success(users);
+    }
+
+    if (email) {
+      const user = await this.modelInstance.select({ email });
+
+      if (think.isEmpty(user)) {
+        return this.success();
+      }
+
+      return this.success(user[0]);
+    }
 
     const count = await this.modelInstance.count({});
     const users = await this.modelInstance.select(
@@ -166,4 +183,107 @@ module.exports = class extends BaseRest {
 
     return this.success();
   }
+
+  async getUsersListByCount() {
+    const { pageSize } = this.get();
+    const commentModel = this.service(
+      `storage/${this.config('storage')}`,
+      'Comment'
+    );
+    const counts = await commentModel.count(
+      {
+        status: ['NOT IN', ['waiting', 'spam']],
+      },
+      {
+        group: ['user_id', 'mail'],
+      }
+    );
+
+    counts.sort((a, b) => b.count - a.count);
+    counts.length = Math.min(pageSize, counts.length);
+
+    const userIds = counts
+      .filter(({ user_id }) => user_id)
+      .map(({ user_id }) => user_id);
+
+    let usersMap = {};
+
+    if (userIds.length) {
+      const users = await this.modelInstance.select({
+        objectId: ['IN', userIds],
+      });
+
+      for (let i = 0; i < users.length; i++) {
+        usersMap[users[i].objectId] = users;
+      }
+    }
+
+    const users = [];
+    const { avatarProxy } = this.config();
+
+    for (let i = 0; i < counts.length; i++) {
+      const count = counts[i];
+      const user = {
+        count: count.count,
+      };
+
+      if (think.isArray(this.config('levels'))) {
+        let level = 0;
+
+        if (user.count) {
+          const _level = think.findLastIndex(
+            this.config('levels'),
+            (l) => l <= user.count
+          );
+
+          if (_level !== -1) {
+            level = _level;
+          }
+        }
+        user.level = level;
+      }
+
+      if (count.user_id && users[count.user_id]) {
+        const {
+          display_name: nick,
+          url: link,
+          avatar: avatarUrl,
+          label,
+        } = users[count.user_id];
+        const avatar =
+          avatarProxy && !avatarUrl.includes(avatarProxy)
+            ? avatarProxy + '?url=' + encodeURIComponent(avatarUrl)
+            : avatarUrl;
+
+        Object.assign(user, { nick, link, avatar, label });
+        users.push(user);
+        continue;
+      }
+
+      const comments = await commentModel.select(
+        { mail: count.mail },
+        { limit: 1 }
+      );
+
+      if (think.isEmpty(comments)) {
+        continue;
+      }
+      const comment = comments[0];
+
+      if (think.isEmpty(comment)) {
+        continue;
+      }
+      const { nick, link } = comment;
+      const avatarUrl = await think.service('avatar').stringify(comment);
+      const avatar =
+        avatarProxy && !avatarUrl.includes(avatarProxy)
+          ? avatarProxy + '?url=' + encodeURIComponent(avatarUrl)
+          : avatarUrl;
+
+      Object.assign(user, { nick, link, avatar });
+      users.push(user);
+    }
+
+    return users;
+  }
 };

package/src/logic/user.js

@@ -1,11 +1,28 @@
 const Base = require('./base');
 
 module.exports = class extends Base {
+  /**
+   * @api {GET} /user user list
+   * @apiGroup User
+   * @apiVersion  0.0.1
+   *
+   * @apiParam  {String}  pageSize  page size
+   *
+   * @apiSuccess  (200) {Number}  errno 0
+   * @apiSuccess  (200) {String}  errmsg  return error message if error
+   */
   getAction() {
     const { userInfo } = this.ctx.state;
 
     if (think.isEmpty(userInfo) || userInfo.type !== 'administrator') {
-      return this.fail();
+      this.rules = {
+        pageSize: {
+          int: { max: 50 },
+          default: 20,
+        },
+      };
+
+      return;
     }
 
     this.rules = {
@@ -17,6 +34,9 @@ module.exports = class extends Base {
         int: { max: 100 },
         default: 10,
       },
+      email: {
+        string: true,
+      },
     };
   }
 
@@ -32,6 +52,12 @@ module.exports = class extends Base {
    *
    * @apiSuccess  (200) {Number}  errno 0
    * @apiSuccess  (200) {String}  errmsg  return error message if error
+   * @apiSuccess  (200) {Object[]}  data  user list
+   * @apiSuccess  (200) {String}  data.nick comment user nick name
+   * @apiSuccess  (200) {String}  data.link comment user link
+   * @apiSuccess  (200) {String}  data.avatar comment user avatar
+   * @apiSuccess  (200) {String}  data.level comment user level
+   * @apiSuccess  (200) {String}  data.label comment user label
    */
   postAction() {
     return this.useCaptchaCheck();

package/src/service/storage/leancloud.js

@@ -260,6 +260,41 @@ module.exports = class extends Base {
       options.group.join('_'),
       where
     );
+
+    if (!where._complex) {
+      if (cacheData.length) {
+        return cacheData;
+      }
+
+      const counts = await this.select(where, { field: options.group });
+      const countsMap = {};
+
+      for (let i = 0; i < counts.length; i++) {
+        const key = options.group
+          .map((item) => counts[i][item] || undefined)
+          .join('_');
+
+        if (!countsMap[key]) {
+          countsMap[key] = {};
+
+          for (let j = 0; j < options.group.length; j++) {
+            const field = options.group[j];
+
+            countsMap[key][field] = counts[i][field];
+          }
+          countsMap[key].count = 0;
+        }
+        countsMap[key].count += 1;
+      }
+
+      const ret = Object.values(countsMap);
+
+      // cache data
+      await this._setCmtGroupByMailUserIdCache(options.group.join('_'), ret);
+
+      return ret;
+    }
+
     const cacheDataMap = {};
 
     for (let i = 0; i < cacheData.length; i++) {