@waline/vercel 1.18.8 → 1.19.1

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/logic/base.js

@@ -16,6 +16,7 @@ module.exports = class extends think.Logic {
   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
@@ -33,6 +34,7 @@ module.exports = class extends think.Logic {
           ? domain.test(referrer)
           : domain === referrer
       );
+
       if (!match) {
         return this.ctx.throw(403);
       }
@@ -41,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;
     }
@@ -71,6 +75,7 @@ module.exports = class extends think.Logic {
         ],
       }
     );
+
     if (think.isEmpty(user)) {
       return;
     }
@@ -85,6 +90,7 @@ module.exports = class extends think.Logic {
           link: userInfo.url,
         });
     const { avatarProxy } = think.config();
+
     if (avatarProxy) {
       avatarUrl = avatarProxy + '?url=' + encodeURIComponent(avatarUrl);
     }

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>`;

package/src/service/notify.js

@@ -1,6 +1,8 @@
+const FormData = require('form-data');
 const nodemailer = require('nodemailer');
+const fetch = require('node-fetch');
 const nunjucks = require('nunjucks');
-const request = require('request-promise-native');
+
 module.exports = class extends think.Service {
   constructor(...args) {
     super(...args);
@@ -13,10 +15,12 @@ module.exports = class extends think.Service {
       SMTP_SECURE,
       SMTP_SERVICE,
     } = process.env;
+
     if (SMTP_HOST || SMTP_SERVICE) {
       const config = {
         auth: { user: SMTP_USER, pass: SMTP_PASS },
       };
+
       if (SMTP_SERVICE) {
         config.service = SMTP_SERVICE;
       } else {
@@ -48,6 +52,7 @@ module.exports = class extends think.Service {
         postUrl: SITE_URL + self.url + '#' + self.objectId,
       },
     };
+
     title = nunjucks.renderString(title, data);
     content = nunjucks.renderString(content, data);
 
@@ -64,6 +69,7 @@ module.exports = class extends think.Service {
 
   async wechat({ title, content }, self, parent) {
     const { SC_KEY, SITE_NAME, SITE_URL } = process.env;
+
     if (!SC_KEY) {
       return false;
     }
@@ -77,22 +83,25 @@ module.exports = class extends think.Service {
         postUrl: SITE_URL + self.url + '#' + self.objectId,
       },
     };
+
     title = nunjucks.renderString(title, data);
     content = nunjucks.renderString(content, data);
 
-    return request({
-      uri: `https://sctapi.ftqq.com/${SC_KEY}.send`,
+    const form = new FormData();
+
+    form.append('text', title);
+    form.append('desp', content);
+
+    return fetch(`https://sctapi.ftqq.com/${SC_KEY}.send`, {
       method: 'POST',
-      form: {
-        text: title,
-        desp: content,
-      },
-      json: true,
-    });
+      headers: form.getHeaders(),
+      body: form,
+    }).then((resp) => resp.json());
   }
 
   async qywxAmWechat({ title, content }, self, parent) {
     const { QYWX_AM, SITE_NAME, SITE_URL } = process.env;
+
     if (!QYWX_AM) {
       return false;
     }
@@ -126,48 +135,55 @@ module.exports = class extends think.Service {
 
     title = nunjucks.renderString(title, data);
     const desp = nunjucks.renderString(contentWechat, data);
+
     content = desp.replace(/\n/g, '<br/>');
 
-    const { access_token } = await request({
-      uri: `https://qyapi.weixin.qq.com/cgi-bin/gettoken`,
-      qs: {
-        corpid: `${QYWX_AM_AY[0]}`,
-        corpsecret: `${QYWX_AM_AY[1]}`,
-      },
-      headers: {
-        'Content-Type': 'application/json',
-      },
-      json: true,
-    });
-    return request({
-      url: `https://qyapi.weixin.qq.com/cgi-bin/message/send?access_token=${access_token}`,
-      body: {
-        touser: `${QYWX_AM_AY[2]}`,
-        agentid: `${QYWX_AM_AY[3]}`,
-        msgtype: 'mpnews',
-        mpnews: {
-          articles: [
-            {
-              title,
-              thumb_media_id: `${QYWX_AM_AY[4]}`,
-              author: `Waline Comment`,
-              content_source_url: `${data.site.postUrl}`,
-              content: `${content}`,
-              digest: `${desp}`,
-            },
-          ],
+    const querystring = new URLSearchParams();
+
+    querystring.set('corpid', `${QYWX_AM_AY[0]}`);
+    querystring.set('corpsecret', `${QYWX_AM_AY[1]}`);
+
+    const { access_token } = await fetch(
+      `https://qyapi.weixin.qq.com/cgi-bin/gettoken`,
+      {
+        headers: {
+          'content-type': 'application/json',
         },
-      },
-      method: 'POST',
-      json: true,
-      headers: {
-        'Content-Type': 'application/json',
-      },
-    });
+        body: querystring,
+      }
+    ).then((resp) => resp.json());
+
+    return fetch(
+      `https://qyapi.weixin.qq.com/cgi-bin/message/send?access_token=${access_token}`,
+      {
+        method: 'POST',
+        headers: {
+          'content-type': 'application/json',
+        },
+        body: JSON.stringify({
+          touser: `${QYWX_AM_AY[2]}`,
+          agentid: `${QYWX_AM_AY[3]}`,
+          msgtype: 'mpnews',
+          mpnews: {
+            articles: [
+              {
+                title,
+                thumb_media_id: `${QYWX_AM_AY[4]}`,
+                author: `Waline Comment`,
+                content_source_url: `${data.site.postUrl}`,
+                content: `${content}`,
+                digest: `${desp}`,
+              },
+            ],
+          },
+        }),
+      }
+    ).then((resp) => resp.json());
   }
 
   async qq(self, parent) {
     const { QMSG_KEY, QQ_ID, SITE_NAME, SITE_URL } = process.env;
+
     if (!QMSG_KEY) {
       return false;
     }
@@ -196,24 +212,28 @@ module.exports = class extends think.Service {
 {{self.comment}}
 仅供预览评论，请前往上述页面查看完整內容。`;
 
-    return request({
-      uri: `https://qmsg.zendee.cn/send/${QMSG_KEY}`,
+    const form = new FormData();
+
+    form.append('msg', nunjucks.renderString(contentQQ, data));
+    form.append('qq', QQ_ID);
+
+    return fetch(`https://qmsg.zendee.cn/send/${QMSG_KEY}`, {
       method: 'POST',
-      form: {
-        msg: nunjucks.renderString(contentQQ, data),
-        qq: QQ_ID,
-      },
-    });
+      header: form.getHeaders(),
+      body: form,
+    }).then((resp) => resp.json());
   }
 
   async telegram(self, parent) {
     const { TG_BOT_TOKEN, TG_CHAT_ID, SITE_NAME, SITE_URL } = process.env;
+
     if (!TG_BOT_TOKEN || !TG_CHAT_ID) {
       return false;
     }
 
     let commentLink = '';
     const href = self.comment.match(/<a href="(.*?)">(.*?)<\/a>/g);
+
     if (href !== null) {
       for (var i = 0; i < href.length; i++) {
         href[i] =
@@ -261,16 +281,17 @@ module.exports = class extends think.Service {
       },
     };
 
-    return request({
-      uri: `https://api.telegram.org/bot${TG_BOT_TOKEN}/sendMessage`,
+    const form = new FormData();
+
+    form.append('text', nunjucks.renderString(contentTG, data));
+    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',
-      form: {
-        text: nunjucks.renderString(contentTG, data),
-        chat_id: TG_CHAT_ID,
-        parse_mode: 'MarkdownV2',
-      },
-      json: true,
-    });
+      header: form.getHeaders(),
+      body: form,
+    }).then((resp) => resp.json());
   }
 
   async pushplus({ title, content }, self, parent) {
@@ -298,27 +319,30 @@ module.exports = class extends think.Service {
         postUrl: SITE_URL + self.url + '#' + self.objectId,
       },
     };
+
     title = nunjucks.renderString(title, data);
     content = nunjucks.renderString(content, data);
 
-    return request({
-      uri: `http://www.pushplus.plus/send/${PUSH_PLUS_KEY}`,
+    const form = new FormData();
+
+    form.append('topic', topic);
+    form.append('template', template);
+    form.append('channel', channel);
+    form.append('webhook', webhook);
+    form.append('callbackUrl', callbackUrl);
+    form.append('title', title);
+    form.append('content', content);
+
+    return fetch(`http://www.pushplus.plus/send/${PUSH_PLUS_KEY}`, {
       method: 'POST',
-      form: {
-        title,
-        content,
-        topic,
-        template,
-        channel,
-        webhook,
-        callbackUrl,
-      },
-      json: true,
-    });
+      header: form.getHeaders(),
+      body: form,
+    }).then((resp) => resp.json());
   }
 
   async discord({ title, content }, self, parent) {
     const { DISCORD_WEBHOOK, SITE_NAME, SITE_URL } = process.env;
+
     if (!DISCORD_WEBHOOK) {
       return false;
     }
@@ -332,6 +356,7 @@ module.exports = class extends think.Service {
         postUrl: SITE_URL + self.url + '#' + self.objectId,
       },
     };
+
     title = nunjucks.renderString(title, data);
     content = nunjucks.renderString(
       think.config('DiscordTemplate') ||
@@ -343,14 +368,15 @@ module.exports = class extends think.Service {
       data
     );
 
-    return request({
-      uri: DISCORD_WEBHOOK,
+    const form = new FormData();
+
+    form.append('content', `${title}\n${content}`);
+
+    return fetch(DISCORD_WEBHOOK, {
       method: 'POST',
-      form: {
-        content: title + '\n' + content,
-      },
-      json: true,
-    });
+      header: form.getHeaders(),
+      body: form,
+    }).then((resp) => resp.json());
   }
 
   async run(comment, parent, disableAuthorNotify = false) {
@@ -394,6 +420,7 @@ module.exports = class extends think.Service {
       const telegram = await this.telegram(comment, parent);
       const pushplus = await this.pushplus({ title, content }, comment, parent);
       const discord = await this.discord({ title, content }, comment, parent);
+
       if (
         [wechat, qq, telegram, qywxAmWechat, pushplus, discord].every(
           think.isEmpty
@@ -408,6 +435,7 @@ module.exports = class extends think.Service {
       (social) => 'mail.' + social
     );
     const fakeMail = new RegExp(`@(${disallowList.join('|')})$`, 'i');
+
     if (parent && !fakeMail.test(parent.mail) && comment.status !== 'waiting') {
       mailList.push({
         to: parent.mail,
@@ -436,6 +464,7 @@ module.exports = class extends think.Service {
     for (let i = 0; i < mailList.length; i++) {
       try {
         const response = await this.mail(mailList[i], comment, parent);
+
         console.log('Notification mail send success: %s', response);
       } catch (e) {
         console.log('Mail send fail:', e);