@waline/vercel 1.13.6 → 1.15.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@waline/vercel",
-  "version": "1.13.6",
+  "version": "1.15.1",
   "description": "vercel server for waline comment system",
   "keywords": [
     "waline",
@@ -42,7 +42,7 @@
     "think-model-mysql": "^1.1.7",
     "think-model-postgresql": "1.1.6",
     "think-model-sqlite": "^1.2.3",
-    "think-mongo": "^2.1.2",
+    "think-mongo": "^2.2.1",
     "think-router-rest": "^1.0.5",
     "thinkjs": "^3.2.14",
     "ua-parser-js": "^1.0.2"

package/src/config/config.js

@@ -37,6 +37,8 @@ const {
   TG_TEMPLATE,
   WX_TEMPLATE,
   DISCORD_TEMPLATE,
+
+  LEVELS,
 } = process.env;
 
 let storage = 'leancloud';
@@ -104,6 +106,10 @@ module.exports = {
   disallowIPList: [],
   secureDomains: SECURE_DOMAINS ? SECURE_DOMAINS.split(/\s*,\s*/) : undefined,
   disableUserAgent: DISABLE_USERAGENT && !isFalse(DISABLE_USERAGENT),
+  levels:
+    !LEVELS || isFalse(LEVELS)
+      ? false
+      : LEVELS.split(/\s*,\s*/).map((v) => Number(v)),
   avatarProxy,
   oauthUrl,
   markdown,

package/src/config/extend.js

@@ -1,5 +1,6 @@
 const Model = require('think-model');
 const Mongo = require('think-mongo');
+const request = require('request-promise-native');
 
 module.exports = [
   Model(think.app),
@@ -15,13 +16,20 @@ module.exports = [
         const { protocol, host } = this;
         return `${protocol}://${host}`;
       },
-    },
-    controller: {
-      fail(...args) {
-        if (this.ctx.status === 200) {
-          this.ctx.status = 500;
+      async webhook(type, data) {
+        const { WEBHOOK } = process.env;
+        if (!WEBHOOK) {
+          return;
         }
-        this.ctx.fail(...args);
+
+        return request({
+          uri: WEBHOOK,
+          method: 'POST',
+          headers: {
+            'content-type': 'application/json',
+          },
+          body: JSON.stringify({ type, data }),
+        });
       },
     },
   },

package/src/controller/comment.js

@@ -305,6 +305,50 @@ module.exports = class extends BaseRest {
           );
         }
 
+        if (think.isArray(this.config('levels'))) {
+          const countWhere = {
+            status: ['NOT IN', ['waiting', 'spam']],
+            _complex: {},
+          };
+          if (user_ids.length) {
+            countWhere._complex.user_id = ['IN', user_ids];
+          }
+          const mails = Array.from(
+            new Set(comments.map(({ mail }) => mail).filter((v) => v))
+          );
+          if (mails.length) {
+            countWhere._complex.mail = ['IN', mails];
+          }
+          if (!think.isEmpty(countWhere._complex)) {
+            countWhere._complex._logic = 'or';
+          } else {
+            delete countWhere._complex;
+          }
+          const counts = await this.modelInstance.count(countWhere, {
+            group: ['user_id', 'mail'],
+          });
+          comments.forEach((cmt) => {
+            const countItem = (counts || []).find(({ mail, user_id }) => {
+              if (user_id) {
+                return user_id === cmt.user_id;
+              }
+              return mail === cmt.mail;
+            });
+
+            let level = 0;
+            if (countItem) {
+              const _level = think.findLastIndex(
+                this.config('levels'),
+                (l) => l <= countItem.count
+              );
+              if (_level !== -1) {
+                level = _level;
+              }
+            }
+            cmt.level = level;
+          });
+        }
+
         return this.json({
           page,
           totalPages: Math.ceil(rootCount / pageSize),
@@ -388,7 +432,7 @@ module.exports = class extends BaseRest {
           'The comment author had post same comment content before'
         );
 
-        return this.fail('Duplicate Content');
+        return this.fail(this.locale('Duplicate Content'));
       }
 
       think.logger.debug('Comment duplicate check OK!');
@@ -403,7 +447,7 @@ module.exports = class extends BaseRest {
 
       if (!think.isEmpty(recent)) {
         think.logger.debug(`The author has posted in ${IPQPS} seconeds.`);
-        return this.fail('Comment too fast!');
+        return this.fail(this.locale('Comment too fast!'));
       }
 
       think.logger.debug(`Comment post frequence check OK!`);
@@ -460,21 +504,25 @@ module.exports = class extends BaseRest {
 
     think.logger.debug(`Comment have been added to storage.`);
 
-    let parrentComment;
-
+    let parentComment;
     if (pid) {
-      parrentComment = await this.modelInstance.select({ objectId: pid });
-      parrentComment = parrentComment[0];
+      parentComment = await this.modelInstance.select({ objectId: pid });
+      parentComment = parentComment[0];
     }
 
+    await this.ctx.webhook('new_comment', {
+      comment: { ...resp, rawComment: comment },
+      reply: parentComment,
+    });
+
     if (comment.status !== 'spam') {
       const notify = this.service('notify');
-      await notify.run({ ...resp, rawComment: comment }, parrentComment);
+      await notify.run({ ...resp, rawComment: comment }, parentComment);
     }
 
     think.logger.debug(`Comment notify done!`);
 
-    await this.hook('postSave', resp, parrentComment);
+    await this.hook('postSave', resp, parentComment);
 
     think.logger.debug(`Comment post hooks postSave done!`);
 

package/src/controller/db.js

@@ -35,7 +35,7 @@ module.exports = class extends BaseRest {
       const jsonText = await readFileAsync(file.path, 'utf-8');
       const importData = JSON.parse(jsonText);
       if (!importData || importData.type !== 'waline') {
-        return this.fail('import data format not support!');
+        return this.fail(this.locale('import data format not support!'));
       }
 
       for (let i = 0; i < importData.tables.length; i++) {

package/src/controller/token/2fa.js

@@ -47,7 +47,7 @@ module.exports = class extends BaseRest {
     });
 
     if (!verified) {
-      return this.fail('TWO_FACTOR_AUTH_ERROR_DETAIL');
+      return this.fail(this.locale('TWO_FACTOR_AUTH_ERROR_DETAIL'));
     }
 
     const userModel = this.service(

package/src/controller/user/password.js

@@ -36,8 +36,13 @@ module.exports = class extends BaseRest {
           ? `"${SENDER_NAME}" <${SENDER_EMAIL}>`
           : SMTP_USER,
       to: user[0].email,
-      subject: `【${SITE_NAME || 'Waline'}】Reset Password`,
-      html: `Please click <a href="${profileUrl}">${profileUrl}</a> to login and change your password as soon as possible!`,
+      subject: this.locale('[{{name}}] Reset Password', {
+        name: SITE_NAME || 'Waline',
+      }),
+      html: this.locale(
+        'Please click <a href="{{url}}">{{url}}</a> to login and change your password as soon as possible!',
+        { url: profileUrl }
+      ),
     });
 
     return this.success();

package/src/controller/user.js

@@ -21,7 +21,7 @@ module.exports = class extends BaseRest {
       !think.isEmpty(resp) &&
       ['administrator', 'guest'].includes(resp[0].type)
     ) {
-      return this.fail('USER_EXIST');
+      return this.fail(this.locale('USER_EXIST'));
     }
 
     const count = await this.modelInstance.count();
@@ -56,21 +56,37 @@ module.exports = class extends BaseRest {
       return this.success();
     }
 
-    const notify = this.service('notify');
-    const apiUrl =
-      this.ctx.serverURL +
-      '/verification?' +
-      qs.stringify({ token, email: data.email });
-
-    await notify.transporter.sendMail({
-      from:
-        SENDER_EMAIL && SENDER_NAME
-          ? `"${SENDER_NAME}" <${SENDER_EMAIL}>`
-          : SMTP_USER,
-      to: data.email,
-      subject: `【${SITE_NAME || 'Waline'}】注册确认邮件`,
-      html: `请点击 ${apiUrl} 确认注册，链接有效时间为 1 个小时。如果不是你在注册，请忽略这封邮件。`,
-    });
+    try {
+      const notify = this.service('notify');
+      const apiUrl =
+        this.ctx.serverURL +
+        '/verification?' +
+        qs.stringify({ token, email: data.email });
+
+      await notify.transporter.sendMail({
+        from:
+          SENDER_EMAIL && SENDER_NAME
+            ? `"${SENDER_NAME}" <${SENDER_EMAIL}>`
+            : SMTP_USER,
+        to: data.email,
+        subject: this.locale('[{{name}}] Registration Confirm Mail', {
+          name: SITE_NAME || 'Waline',
+        }),
+        html: this.locale(
+          'Please click <a href="{{url}}">{{url}}<a/> to confirm registration, the link is valid for 1 hour. If you are not registering, please ignore this email.',
+          { url: apiUrl }
+        ),
+      });
+    } catch (e) {
+      console.log(e);
+
+      return this.fail(
+        this.locale(
+          'Registeration confirm mail send failed, please {%- if isAdmin -%}check your mail configuration{%- else -%}check your email address and contact administrator{%- endif -%}.',
+          { isAdmin: think.isEmpty(count) }
+        )
+      );
+    }
 
     return this.success({ verify: true });
   }

package/src/controller/verification.js

@@ -13,13 +13,13 @@ module.exports = class extends BaseRest {
     const { token, email } = this.get();
     const users = await this.modelInstance.select({ email });
     if (think.isEmpty(users)) {
-      return this.fail('USER_NOT_EXIST');
+      return this.fail(this.locale('USER_NOT_EXIST'));
     }
 
     const user = users[0];
     const match = user.type.match(/^verify:(\d{4}):(\d+)$/i);
     if (!match) {
-      return this.fail('USER_REGISTED');
+      return this.fail(this.locale('USER_REGISTED'));
     }
 
     if (token === match[1] && Date.now() < parseInt(match[2])) {
@@ -27,6 +27,6 @@ module.exports = class extends BaseRest {
       return this.redirect('/ui/login');
     }
 
-    return this.fail('TOKEN_EXPIRED');
+    return this.fail(this.locale('TOKEN_EXPIRED'));
   }
 };

package/src/extend/controller.js

@@ -1,3 +1,6 @@
+const nunjucks = require('nunjucks');
+const locales = require('../locales');
+
 module.exports = {
   success(...args) {
     this.ctx.success(...args);
@@ -7,4 +10,12 @@ module.exports = {
     this.ctx.fail(...args);
     return think.prevent();
   },
+  locale(message, variables) {
+    const { lang } = this.get();
+    const locale = locales[(lang || '').toLowerCase()];
+    if (locale && locale[message]) {
+      message = locale[message];
+    }
+    return nunjucks.renderString(message, variables);
+  },
 };

package/src/extend/think.js

@@ -7,4 +7,15 @@ module.exports = {
   isPrevent(err) {
     return think.isError(err) && err.message === preventMessage;
   },
+  findLastIndex(arr, fn) {
+    for (let i = arr.length - 1; i >= 0; i--) {
+      const ret = fn(arr[i], i, arr);
+      if (!ret) {
+        continue;
+      }
+      return i;
+    }
+
+    return -1;
+  },
 };

package/src/locales/en.json

@@ -0,0 +1,15 @@
+{
+  "import data format not support!": "import data format not support!",
+  "USER_EXIST": "USER_EXIST",
+  "USER_NOT_EXIST": "USER_NOT_EXIST",
+  "USER_REGISTED": "USER_REGISTED",
+  "TOKEN_EXPIRED": "TOKEN_EXPIRED",
+  "TWO_FACTOR_AUTH_ERROR_DETAIL": "TWO_FACTOR_AUTH_ERROR_DETAIL",
+  "[{{name}}] Registration Confirm Mail": "[{{name}}] Registration Confirm Mail",
+  "Please click <a href=\"{{url}}\">{{url}}<a/> to confirm registration, the link is valid for 1 hour. If you are not registering, please ignore this email.": "Please click <a href=\"{{url}}\">{{url}}<a/> to confirm registration, the link is valid for 1 hour. If you are not registering, please ignore this email.",
+  "[{{name}}] Reset Password": "[{{name}}] Reset Password",
+  "Please click <a href=\"{{url}}\">{{url}}</a> to login and change your password as soon as possible!": "Please click <a href=\"{{url}}\">{{url}}</a> to login and change your password as soon as possible!",
+  "Duplicate Content": "Duplicate Content",
+  "Comment too fast": "Comment too fast",
+  "Registeration confirm mail send failed, please {%- if isAdmin -%}check your mail configuration{%- else -%}check your email address and contact administrator{%- endif -%}.": "Registeration confirm mail send failed, please {%- if isAdmin -%}check your mail configuration{%- else -%}check your email address and contact administrator{%- endif -%}."
+}

package/src/locales/index.js

@@ -0,0 +1,12 @@
+const en = require('./en.json');
+const zhCN = require('./zh-CN.json');
+const zhTW = require('./zh-TW.json');
+
+module.exports = {
+  'zh-cn': zhCN,
+  'zh-tw': zhTW,
+  en: en,
+  'en-us': en,
+  jp: en,
+  'jp-jp': en,
+};

package/src/locales/zh-CN.json

@@ -0,0 +1,15 @@
+{
+  "import data format not support!": "文件格式不支持",
+  "USER_EXIST": "用户已存在",
+  "USER_NOT_EXIST": "用户不存在",
+  "USER_REGISTED": "用户已注册",
+  "TOKEN_EXPIRED": "密钥已过期",
+  "TWO_FACTOR_AUTH_ERROR_DETAIL": "二步验证失败",
+  "[{{name}}] Registration Confirm Mail": "【{{name}}】注册确认邮件",
+  "Please click <a href=\"{{url}}\">{{url}}<a/> to confirm registration, the link is valid for 1 hour. If you are not registering, please ignore this email.": "请点击 <a href=\"{{url}}\">{{url}}</a> 确认注册，链接有效时间为 1 个小时。如果不是你在注册，请忽略这封邮件。",
+  "[{{name}}] Reset Password": "【{{name}}】重置密码",
+  "Please click <a href=\"{{url}}\">{{url}}</a> to login and change your password as soon as possible!": "请尽快点击链接 <a href=\"{{url}}\">{{url}}</a> 登录并修改你的密码！",
+  "Duplicate Content": "发送的内容之前已经发过",
+  "Comment too fast": "评论太快啦，请慢点！",
+  "Registeration confirm mail send failed, please {%- if isAdmin -%}check your mail configuration{%- else -%}check your email address and contact administrator{%- endif -%}.": "注册确认邮件发送失败，请{%- if isAdmin -%}检查一下网站的邮件相关配置{% else %}确认你的邮箱输入无误并联系管理员{%- endif -%}。"
+}

package/src/locales/zh-TW.json

@@ -0,0 +1,15 @@
+{
+  "import data format not support!": "文件格式不支持",
+  "USER_EXIST": "用戶已存在",
+  "USER_NOT_EXIST": "用戶不存在",
+  "USER_REGISTED": "用戶已註冊",
+  "TOKEN_EXPIRED": "密鑰已過期",
+  "TWO_FACTOR_AUTH_ERROR_DETAIL": "二步驗證失敗",
+  "[{{name}}] Registration Confirm Mail": "『{{name}}』註冊確認郵件",
+  "Please click <a href=\"{{url}}\">{{url}}<a/> to confirm registration, the link is valid for 1 hour. If you are not registering, please ignore this email.": "請點擊 <a href=\"{{url}}\">{{url}}</a> 確認註冊，鏈接有效時間為 1 個小時。如果不是你在註冊，請忽略這封郵件。",
+  "[{{name}}] Reset Password": "『{{name}}』重置密碼",
+  "Please click <a href=\"{{url}}\">{{url}}</a> to login and change your password as soon as possible!": "請盡快點擊鏈接 <a href=\"{{url}}\">{{url}}</a> 登錄並修改你的密碼！",
+  "Duplicate Content": "發送的內容之前已經發過",
+  "Comment too fast": "評論太快啦，請慢點！",
+  "Registeration confirm mail send failed, please {%- if isAdmin -%}check your mail configuration{%- else -%}check your email address and contact administrator{%- endif -%}.": "註冊確認郵件發送失敗，{%- if isAdmin -%}檢查一下網站的郵件相關配置{% else %}確認你的郵箱輸入無誤後聯繫管理員{%- endif -%}。"
+}

package/src/service/storage/cloudbase.js

@@ -10,6 +10,7 @@ const app = cloudbase.init({
 
 const db = app.database();
 const _ = db.command;
+const $ = db.command.aggregate;
 const collections = {};
 
 module.exports = class extends Base {
@@ -90,10 +91,10 @@ module.exports = class extends Base {
     return filter;
   }
 
-  where(instance, where) {
+  where(instance, where, method = 'where') {
     const filter = this.parseWhere(where);
     if (!where._complex) {
-      return instance.where(filter);
+      return instance[method](filter);
     }
 
     const filters = [];
@@ -106,7 +107,7 @@ module.exports = class extends Base {
         ...filter,
       });
     }
-    return instance.where(_[where._complex._logic](...filters));
+    return instance[method](_[where._complex._logic](...filters));
   }
 
   async _select(where, { desc, limit, offset, field } = {}) {
@@ -147,10 +148,24 @@ module.exports = class extends Base {
     return data;
   }
 
-  async count(where = {}) {
-    const instance = await this.collection(this.tableName);
-    const { total } = await this.where(instance, where).count();
-    return total;
+  async count(where = {}, { group } = {}) {
+    let instance = await this.collection(this.tableName);
+    if (!group) {
+      instance = this.where(instance, where);
+      const { total } = await instance.count();
+      return total;
+    }
+
+    const _id = {};
+    group.forEach((f) => {
+      _id[f] = `$${f}`;
+    });
+    instance = instance.aggregate();
+    this.where(instance, where, 'match');
+    instance = instance.group({ _id, count: $.sum(1) });
+    const { data } = await instance.end();
+
+    return data.map(({ _id, count }) => ({ ..._id, count }));
   }
 
   async add(data) {

package/src/service/storage/deta.js

@@ -184,16 +184,47 @@ module.exports = class extends Base {
     return data;
   }
 
-  async count(where = {}) {
-    const conditions = this.where(where);
-    if (think.isArray(conditions)) {
-      return Promise.all(
-        conditions.map((condition) => this.count(condition))
-      ).then((counts) => counts.reduce((a, b) => a + b, 0));
+  async count(where = {}, { group } = {}) {
+    if (!group) {
+      const conditions = this.where(where);
+      if (think.isArray(conditions)) {
+        return Promise.all(
+          conditions.map((condition) => this.count(condition))
+        ).then((counts) => counts.reduce((a, b) => a + b, 0));
+      }
+
+      const { count } = await this.instance.fetch(conditions);
+      return count;
     }
 
-    const { count } = await this.instance.fetch(conditions);
-    return count;
+    const counts = [];
+    for (let i = 0; i < group.length; i++) {
+      const groupName = group[i];
+      if (!where._complex || !Array.isArray(where._complex[groupName])) {
+        continue;
+      }
+
+      const groupFlatValue = {};
+      group.slice(0, i).forEach((group) => {
+        groupFlatValue[group] = null;
+      });
+
+      for (let j = 0; j < where._complex[groupName][1].length; j++) {
+        const groupWhere = {
+          ...where,
+          ...groupFlatValue,
+          _complex: undefined,
+          [groupName]: where._complex[groupName][1][j],
+        };
+        const num = await this.count(groupWhere);
+        counts.push({
+          ...groupFlatValue,
+          [groupName]: where._complex[groupName][1][j],
+          count: num,
+        });
+      }
+    }
+    return counts;
   }
 
   async add(data) {

package/src/service/storage/github.js

@@ -287,10 +287,25 @@ module.exports = class extends Base {
   }
 
   // eslint-disable-next-line no-unused-vars
-  async count(where = {}, options = {}) {
+  async count(where = {}, { group } = {}) {
     const instance = await this.collection(this.tableName);
     const data = this.where(instance, where);
-    return data.length;
+    if (!group) {
+      return data.length;
+    }
+
+    const counts = {};
+    for (let i = 0; i < data.length; i++) {
+      const key = group.map((field) => data[field]).join();
+      if (!counts[key]) {
+        counts[key] = { count: 0 };
+        group.forEach((field) => {
+          counts[key][field] = data[field];
+        });
+      }
+      counts[key].count += 1;
+    }
+    return Object.keys(counts);
   }
 
   async add(

package/src/service/storage/leancloud.js

@@ -128,12 +128,47 @@ module.exports = class extends Base {
 
   async count(where = {}, options = {}) {
     const instance = this.where(this.tableName, where);
-    return instance.count(options).catch((e) => {
-      if (e.code === 101) {
-        return 0;
+    if (!options.group) {
+      return instance.count(options).catch((e) => {
+        if (e.code === 101) {
+          return 0;
+        }
+        throw e;
+      });
+    }
+
+    // todo: query optimize
+    const counts = [];
+    for (let i = 0; i < options.group.length; i++) {
+      const groupName = options.group[i];
+      if (!where._complex || !Array.isArray(where._complex[groupName])) {
+        continue;
       }
-      throw e;
-    });
+
+      const groupFlatValue = {};
+      options.group.slice(0, i).forEach((group) => {
+        groupFlatValue[group] = null;
+      });
+
+      for (let j = 0; j < where._complex[groupName][1].length; j++) {
+        const groupWhere = {
+          ...where,
+          ...groupFlatValue,
+          _complex: undefined,
+          [groupName]: where._complex[groupName][1][j],
+        };
+        const num = await this.count(groupWhere, {
+          ...options,
+          group: undefined,
+        });
+        counts.push({
+          ...groupFlatValue,
+          [groupName]: where._complex[groupName][1][j],
+          count: num,
+        });
+      }
+    }
+    return counts;
   }
 
   async add(

package/src/service/storage/mongodb.js

@@ -114,10 +114,17 @@ module.exports = class extends Base {
     }));
   }
 
-  async count(where = {}) {
+  async count(where = {}, { group } = {}) {
     const instance = this.mongo(this.tableName);
     this.where(instance, where);
-    return instance.count();
+    if (group) {
+      instance.group(group);
+    }
+    const data = await instance.count({ raw: group });
+    if (!Array.isArray(data)) {
+      return data;
+    }
+    return data.map(({ _id, total: count }) => ({ ..._id, count }));
   }
 
   async add(data) {

package/src/service/storage/mysql.js

@@ -50,10 +50,16 @@ module.exports = class extends Base {
     return data.map(({ id, ...cmt }) => ({ ...cmt, objectId: id }));
   }
 
-  async count(where = {}) {
+  async count(where = {}, { group } = {}) {
     const instance = this.model(this.tableName);
     instance.where(this.parseWhere(where));
-    return instance.count();
+    if (!group) {
+      return instance.count();
+    }
+
+    instance.field([...group, 'COUNT(*) as count']);
+    instance.group(group);
+    return instance.select();
   }
 
   async add(data) {

package/src/service/storage/postgresql.js

@@ -26,7 +26,13 @@ module.exports = class extends MySQL {
   async count(...args) {
     let result = await super.count(...args);
     try {
-      result = parseInt(result);
+      if (Array.isArray(result)) {
+        result.forEach((r) => {
+          r.count = parseInt(r.count);
+        });
+      } else {
+        result = parseInt(result);
+      }
     } catch (e) {
       console.log(e);
     }