@waline/vercel 1.18.7 → 1.19.0

package/src/controller/user.js

@@ -23,6 +23,7 @@ module.exports = class extends BaseRest {
         offset: Math.max((page - 1) * pageSize, 0),
       }
     );
+
     return this.success({
       page,
       totalPages: Math.ceil(count / pageSize),
@@ -89,7 +90,7 @@ module.exports = class extends BaseRest {
             ? `"${SENDER_NAME}" <${SENDER_EMAIL}>`
             : SMTP_USER,
         to: data.email,
-        subject: this.locale('[{{name}}] Registration Confirm Mail', {
+        subject: this.locale('[{{name | safe}}] Registration Confirm Mail', {
           name: SITE_NAME || 'Waline',
         }),
         html: this.locale(
@@ -147,8 +148,10 @@ module.exports = class extends BaseRest {
     }
 
     const socials = ['github', 'twitter', 'facebook', 'google', 'weibo', 'qq'];
+
     socials.forEach((social) => {
       const nextSocial = this.post(social);
+
       if (think.isString(nextSocial)) {
         updateData[social] = nextSocial;
       }

package/src/controller/verification.js

@@ -12,18 +12,21 @@ module.exports = class extends BaseRest {
   async getAction() {
     const { token, email } = this.get();
     const users = await this.modelInstance.select({ email });
+
     if (think.isEmpty(users)) {
       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(this.locale('USER_REGISTED'));
     }
 
     if (token === match[1] && Date.now() < parseInt(match[2])) {
       await this.modelInstance.update({ type: 'guest' }, { email });
+
       return this.redirect('/ui/login');
     }
 

package/src/extend/controller.js

@@ -4,18 +4,22 @@ const locales = require('../locales');
 module.exports = {
   success(...args) {
     this.ctx.success(...args);
+
     return think.prevent();
   },
   fail(...args) {
     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

@@ -14,9 +14,11 @@ module.exports = {
   findLastIndex(arr, fn) {
     for (let i = arr.length - 1; i >= 0; i--) {
       const ret = fn(arr[i], i, arr);
+
       if (!ret) {
         continue;
       }
+
       return i;
     }
 
@@ -34,6 +36,7 @@ module.exports = {
 
       function runTask() {
         const idx = index;
+
         index += 1;
         if (index > promises.length) {
           return Promise.resolve();
@@ -45,6 +48,7 @@ module.exports = {
           if (count === promises.length) {
             resolve(ret);
           }
+
           return runTask();
         }, reject);
       }
@@ -55,20 +59,23 @@ module.exports = {
     });
   },
   async ip2region(ip, { depth = 1 }) {
-    if (!ip) return '';
+    if (!ip || ip.includes(':')) return '';
 
     try {
       const search = helper.promisify(regionSearch.btreeSearch, regionSearch);
       const result = await search(ip);
+
       if (!result) {
         return '';
       }
       const { region } = result;
       const [, , province, city, isp] = region.split('|');
       const address = Array.from(new Set([province, city, isp]));
+
       return address.slice(0, depth).join(' ');
     } catch (e) {
       console.log(e);
+
       return '';
     }
   },

package/src/locales/en.json

@@ -5,9 +5,9 @@
   "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",
+  "[{{name | safe}}] Registration Confirm Mail": "[{{name | safe}}] 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",
+  "[{{name | safe}}] Reset Password": "[{{name | safe}}] 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",

package/src/locales/zh-CN.json

@@ -5,9 +5,9 @@
   "USER_REGISTED": "用户已注册",
   "TOKEN_EXPIRED": "密钥已过期",
   "TWO_FACTOR_AUTH_ERROR_DETAIL": "二步验证失败",
-  "[{{name}}] Registration Confirm Mail": "【{{name}}】注册确认邮件",
+  "[{{name | safe}}] Registration Confirm Mail": "【{{name | safe}}】注册确认邮件",
   "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}}】重置密码",
+  "[{{name | safe}}] Reset Password": "【{{name | safe}}】重置密码",
   "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": "评论太快啦，请慢点！",

package/src/locales/zh-TW.json

@@ -5,9 +5,9 @@
   "USER_REGISTED": "用戶已註冊",
   "TOKEN_EXPIRED": "密鑰已過期",
   "TWO_FACTOR_AUTH_ERROR_DETAIL": "二步驗證失敗",
-  "[{{name}}] Registration Confirm Mail": "『{{name}}』註冊確認郵件",
+  "[{{name | safe}}] Registration Confirm Mail": "『{{name | safe}}』註冊確認郵件",
   "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}}』重置密碼",
+  "[{{name | safe}}] Reset Password": "『{{name | safe}}』重置密碼",
   "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": "評論太快啦，請慢點！",

package/src/logic/base.js

@@ -1,3 +1,4 @@
+const path = require('path');
 const jwt = require('jsonwebtoken');
 const helper = require('think-helper');
 
@@ -8,12 +9,14 @@ module.exports = class extends think.Logic {
       `storage/${this.config('storage')}`,
       'Users'
     );
+    this.resource = this.getResource();
     this.id = this.getId();
   }
 
   async __before() {
     const referrer = this.ctx.referrer(true);
     let { secureDomains } = this.config();
+
     if (secureDomains && referrer && this.ctx.host.indexOf(referrer) !== 0) {
       secureDomains = think.isArray(secureDomains)
         ? secureDomains
@@ -31,6 +34,7 @@ module.exports = class extends think.Logic {
           ? domain.test(referrer)
           : domain === referrer
       );
+
       if (!match) {
         return this.ctx.throw(403);
       }
@@ -39,11 +43,13 @@ module.exports = class extends think.Logic {
     this.ctx.state.userInfo = {};
     const { authorization } = this.ctx.req.headers;
     const { state } = this.get();
+
     if (!authorization && !state) {
       return;
     }
     const token = state || authorization.replace(/^Bearer /, '');
     const userMail = jwt.verify(token, think.config('jwtKey'));
+
     if (think.isEmpty(userMail) || !think.isString(userMail)) {
       return;
     }
@@ -69,6 +75,7 @@ module.exports = class extends think.Logic {
         ],
       }
     );
+
     if (think.isEmpty(user)) {
       return;
     }
@@ -83,6 +90,7 @@ module.exports = class extends think.Logic {
           link: userInfo.url,
         });
     const { avatarProxy } = think.config();
+
     if (avatarProxy) {
       avatarUrl = avatarProxy + '?url=' + encodeURIComponent(avatarUrl);
     }
@@ -92,6 +100,13 @@ module.exports = class extends think.Logic {
     this.ctx.state.token = token;
   }
 
+  getResource() {
+    const filename = this.__filename || __filename;
+    const last = filename.lastIndexOf(path.sep);
+
+    return filename.substr(last + 1, filename.length - last - 4);
+  }
+
   getId() {
     const id = this.get('id');
 

package/src/logic/comment.js

@@ -1,4 +1,5 @@
 const Base = require('./base');
+
 module.exports = class extends Base {
   async __before() {
     await super.__before();
@@ -7,6 +8,7 @@ module.exports = class extends Base {
     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;
     }
@@ -114,6 +116,7 @@ module.exports = class extends Base {
    */
   getAction() {
     const { type } = this.get();
+
     switch (type) {
       case 'recent':
         this.rules = {
@@ -135,6 +138,7 @@ module.exports = class extends Base {
 
       case 'list': {
         const { userInfo } = this.ctx.state;
+
         if (userInfo.type !== 'administrator') {
           return this.fail();
         }
@@ -224,6 +228,7 @@ module.exports = class extends Base {
    */
   putAction() {
     const { userInfo } = this.ctx.state;
+
     if (think.isEmpty(userInfo) || userInfo.type !== 'administrator') {
       this.rules = {
         like: {

package/src/logic/db.js

@@ -5,6 +5,7 @@ module.exports = class extends Base {
     await super.__before(...args);
 
     const { userInfo } = this.ctx.state;
+
     if (think.isEmpty(userInfo)) {
       return this.fail(401);
     }

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

@@ -12,6 +12,7 @@ module.exports = class extends Base {
 
   async postAction() {
     const { userInfo } = this.ctx.state;
+
     if (think.isEmpty(userInfo)) {
       return this.fail(401);
     }

package/src/logic/user.js

@@ -3,6 +3,7 @@ const Base = require('./base');
 module.exports = class extends Base {
   getAction() {
     const { userInfo } = this.ctx.state;
+
     if (think.isEmpty(userInfo) || userInfo.type !== 'administrator') {
       return this.fail();
     }
@@ -50,6 +51,7 @@ module.exports = class extends Base {
   putAction() {
     // you need login to update yourself profile
     const { userInfo } = this.ctx.state;
+
     if (think.isEmpty(userInfo)) {
       return this.fail();
     }

package/src/service/akismet.js

@@ -3,6 +3,7 @@ const DEFAULT_KEY = '70542d86693e';
 
 module.exports = function (comment, blog) {
   let { AKISMET_KEY, SITE_URL } = process.env;
+
   if (!AKISMET_KEY) {
     AKISMET_KEY = DEFAULT_KEY;
   }

package/src/service/avatar.js

@@ -3,6 +3,7 @@ const helper = require('think-helper');
 const { GRAVATAR_STR } = process.env;
 
 const env = new nunjucks.Environment();
+
 env.addFilter('md5', (str) => helper.md5(str));
 
 const DEFAULT_GRAVATAR_STR = `{%- set numExp = r/^[0-9]+$/g -%}
@@ -14,17 +15,21 @@ const DEFAULT_GRAVATAR_STR = `{%- set numExp = r/^[0-9]+$/g -%}
 {%- else -%}
   https://seccdn.libravatar.org/avatar/{{mail|md5}}
 {%- endif -%}`;
+
 module.exports = class extends think.Service {
   async stringify(comment) {
     const fn = think.config('avatarUrl');
+
     if (think.isFunction(fn)) {
       const ret = await fn(comment);
+
       if (think.isString(ret) && ret) {
         return ret;
       }
     }
 
     const gravatarStr = GRAVATAR_STR || DEFAULT_GRAVATAR_STR;
+
     return env.renderString(gravatarStr, comment);
   }
 };

package/src/service/markdown/katex.js

@@ -9,6 +9,7 @@ const katexInline = (tex, options) => {
     return katex.renderToString(tex, options);
   } catch (error) {
     if (options.throwOnError) console.warn(error);
+
     return `<span class='katex-error' title='${escapeHtml(
       error.toString()
     )}'>${escapeHtml(tex)}</span>`;
@@ -21,6 +22,7 @@ const katexBlock = (tex, options) => {
     return `<p class='katex-block'>${katex.renderToString(tex, options)}</p>`;
   } catch (error) {
     if (options.throwOnError) console.warn(error);
+
     return `<p class='katex-block katex-error' title='${escapeHtml(
       error.toString()
     )}'>${escapeHtml(tex)}</p>`;

package/src/service/markdown/mathCommon.js

@@ -5,6 +5,7 @@
 const isValidDelim = (state, pos) => {
   const prevChar = pos > 0 ? state.src.charAt(pos - 1) : '';
   const nextChar = pos + 1 <= state.posMax ? state.src.charAt(pos + 1) : '';
+
   return {
     canOpen: nextChar !== ' ' && nextChar !== '\t',
     /*
@@ -31,6 +32,7 @@ const inlineTex = (state, silent) => {
   if (!res.canOpen) {
     if (!silent) state.pending += '$';
     state.pos += 1;
+
     return true;
   }
   /*
@@ -58,6 +60,7 @@ const inlineTex = (state, silent) => {
   if (match === -1) {
     if (!silent) state.pending += '$';
     state.pos = start;
+
     return true;
   }
 
@@ -65,6 +68,7 @@ const inlineTex = (state, silent) => {
   if (match - start === 0) {
     if (!silent) state.pending += '$$';
     state.pos = start + 1;
+
     return true;
   }
 
@@ -74,6 +78,7 @@ const inlineTex = (state, silent) => {
   if (!res.canClose) {
     if (!silent) state.pending += '$';
     state.pos = start;
+
     return true;
   }
 

package/src/service/markdown/mathjax.js

@@ -12,6 +12,7 @@ const { inlineTex, blockTex } = require('./mathCommon');
 class MathToSvg {
   constructor() {
     const adaptor = liteAdaptor();
+
     RegisterHTMLHandler(adaptor);
 
     const packages = AllPackages.sort();
@@ -27,6 +28,7 @@ class MathToSvg {
 
       if (svg.includes('data-mml-node="merror"')) {
         const errorTitle = svg.match(/<title>(.*?)<\/title>/)[1];
+
         svg = `<span class='katex-error' title='${escapeHtml(
           errorTitle
         )}'>${escapeHtml(tex)}</span>`;
@@ -41,6 +43,7 @@ class MathToSvg {
 
       if (svg.includes('data-mml-node="merror"')) {
         const errorTitle = svg.match(/<title>(.*?)<\/title>/)[1];
+
         svg = `<p class='katex-block katex-error' title='${escapeHtml(
           errorTitle
         )}'>${escapeHtml(tex)}</p>`;