@waline/vercel 1.23.5 → 1.24.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@waline/vercel",
-  "version": "1.23.5",
+  "version": "1.24.1",
   "description": "vercel server for waline comment system",
   "keywords": [
     "waline",
@@ -16,7 +16,7 @@
   "author": "lizheming <i@imnerd.org>",
   "dependencies": {
     "@cloudbase/node-sdk": "2.9.1",
-    "@koa/cors": "3.4.2",
+    "@koa/cors": "4.0.0",
     "akismet": "2.0.7",
     "deta": "1.1.0",
     "dompurify": "2.4.0",
@@ -32,7 +32,6 @@
     "markdown-it-sub": "1.0.0",
     "markdown-it-sup": "1.0.0",
     "mathjax-full": "3.2.2",
-    "mongodb": "4.10.0",
     "node-fetch": "2.6.7",
     "nodemailer": "6.8.0",
     "nunjucks": "3.2.3",
@@ -48,7 +47,7 @@
     "think-mongo": "2.2.1",
     "think-router-rest": "1.0.5",
     "thinkjs": "3.2.14",
-    "ua-parser-js": "1.0.2"
+    "ua-parser-js": "1.0.32"
   },
   "engines": {
     "node": ">=14"

package/src/controller/comment.js

@@ -57,6 +57,11 @@ async function formatCmt(
   }
   comment.comment = markdownParser(comment.comment);
   comment.like = Number(comment.like) || 0;
+  
+  // compat sql storage return number flag to string
+  if (typeof comment.sticky === 'string') {
+    comment.sticky = Boolean(Number(comment.sticky));
+  }
 
   return comment;
 }

package/src/controller/user.js

@@ -12,6 +12,13 @@ module.exports = class extends BaseRest {
 
   async getAction() {
     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 });
@@ -176,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/locales/zh-CN.json

@@ -17,5 +17,3 @@
   "MAIL_SUBJECT_ADMIN": "{{site.name | safe}} 上有新评论了",
   "MAIL_TEMPLATE_ADMIN": "<div style='border-top:2px solid #12ADDB;box-shadow:0 1px 3px #AAAAAA;line-height:180%;padding:0 15px 12px;margin:50px auto;font-size:12px;'> <h2 style='border-bottom:1px solid #DDD;font-size:14px;font-weight:normal;padding:13px 0 10px 8px;'> 您在<a style='text-decoration:none;color: #12ADDB;' href='{{site.url}}' target='_blank'>{{site.name}}</a>上的文章有了新的评论 </h2> <p><strong>{{self.nick}}</strong>回复说：</p><div style='background-color: #f5f5f5;padding: 10px 15px;margin:18px 0;word-wrap:break-word;'>{{self.comment | safe}}</div><p>您可以点击<a style='text-decoration:none; color:#12addb' href='{{site.postUrl}}' target='_blank'>查看回复的完整內容</a></p><br/> </div>"
 }
-
-

package/src/locales/zh-TW.json

@@ -16,5 +16,4 @@
   "MAIL_TEMPLATE": "<div style='border-top:2px solid #12ADDB;box-shadow:0 1px 3px #AAAAAA;line-height:180%;padding:0 15px 12px;margin:50px auto;font-size:12px;'> <h2 style='border-bottom:1px solid #DDD;font-size:14px;font-weight:normal;padding:13px 0 10px 8px;'> 您在<a style='text-decoration:none;color: #12ADDB;' href='{{site.url}}' target='_blank'>{{site.name}}</a>上的品論有新的回復 </h2>{{parent.nick}}同學，您層發表評論： <div style='padding:0 12px 0 12px;margin-top:18px'> <div style='background-color: #f5f5f5;padding: 10px 15px;margin:18px 0;word-wrap:break-word;'>{{parent.comment | safe}}</div><p><strong>{{self.nick}}</strong>回復說：</p><div style='background-color: #f5f5f5;padding: 10px 15px;margin:18px 0;word-wrap:break-word;'>{{self.comment | safe}}</div><p>您可以點擊<a style='text-decoration:none; color:#12addb' href='{{site.postUrl}}' target='_blank'>查看回復的完整內容</a>，歡迎再次光臨<a style='text-decoration:none; color:#12addb' href='{{site.url}}' target='_blank'>{{site.name}}</a>。</p><br/> </div></div>",
   "MAIL_SUBJECT_ADMIN": "{{site.name | safe}} 上有新評論了",
   "MAIL_TEMPLATE_ADMIN": "<div style='border-top:2px solid #12ADDB;box-shadow:0 1px 3px #AAAAAA;line-height:180%;padding:0 15px 12px;margin:50px auto;font-size:12px;'> <h2 style='border-bottom:1px solid #DDD;font-size:14px;font-weight:normal;padding:13px 0 10px 8px;'> 您在<a style='text-decoration:none;color: #12ADDB;' href='{{site.url}}' target='_blank'>{{site.name}}</a>上的文章有新評論了 </h2> <p><strong>{{self.nick}}</strong>回復說：</p><div style='background-color: #f5f5f5;padding: 10px 15px;margin:18px 0;word-wrap:break-word;'>{{self.comment | safe}}</div><p>您可以點擊<a style='text-decoration:none; color:#12addb' href='{{site.postUrl}}' target='_blank'>查看回復的完整內容</a></p><br/> </div>"
-
 }

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 = {
@@ -35,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/notify.js

@@ -287,11 +287,18 @@ module.exports = class extends think.Service {
     form.append('chat_id', TG_CHAT_ID);
     form.append('parse_mode', 'MarkdownV2');
 
-    return fetch(`https://api.telegram.org/bot${TG_BOT_TOKEN}/sendMessage`, {
-      method: 'POST',
-      header: form.getHeaders(),
-      body: form,
-    }).then((resp) => resp.json());
+    const resp = await fetch(
+      `https://api.telegram.org/bot${TG_BOT_TOKEN}/sendMessage`,
+      {
+        method: 'POST',
+        header: form.getHeaders(),
+        body: form,
+      }
+    ).then((resp) => resp.json());
+
+    if (!resp.ok) {
+      throw new Error(resp.description);
+    }
   }
 
   async pushplus({ title, content }, self, parent) {

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++) {

package/src/service/storage/mongodb.js

@@ -1,4 +1,4 @@
-const { ObjectId } = require('mongodb');
+const { ObjectID: ObjectId } = require('think-mongo/lib/model');
 const Base = require('./base');
 
 module.exports = class extends Base {