@waline/vercel 1.36.3 → 1.36.5

package/src/logic/base.js

@@ -28,9 +28,7 @@ module.exports = class extends think.Logic {
     let { secureDomains } = this.config();
 
     if (secureDomains) {
-      secureDomains = think.isArray(secureDomains)
-        ? secureDomains
-        : [secureDomains];
+      secureDomains = think.isArray(secureDomains) ? secureDomains : [secureDomains];
 
       secureDomains.push(
         'localhost',
@@ -49,19 +47,11 @@ module.exports = class extends think.Logic {
       secureDomains = secureDomains
         .map((domain) => {
           // 如果是正则表达式字符串，创建一个 RegExp 对象
-          if (
-            typeof domain === 'string' &&
-            domain.startsWith('/') &&
-            domain.endsWith('/')
-          ) {
+          if (typeof domain === 'string' && domain.startsWith('/') && domain.endsWith('/')) {
             try {
               return new RegExp(domain.slice(1, -1)); // 去掉斜杠并创建 RegExp 对象
             } catch (e) {
-              console.error(
-                'Invalid regex pattern in secureDomains:',
-                domain,
-                e,
-              );
+              console.error('Invalid regex pattern in secureDomains:', domain, e);
 
               return null;
             }
@@ -74,9 +64,7 @@ module.exports = class extends think.Logic {
       // 有 referrer 检查 referrer，没有则检查 origin
       const checking = referrer ? referrer : origin;
       const isSafe = secureDomains.some((domain) =>
-        think.isFunction(domain.test)
-          ? domain.test(checking)
-          : domain === checking,
+        think.isFunction(domain.test) ? domain.test(checking) : domain === checking,
       );
 
       if (!isSafe) {
@@ -212,21 +200,15 @@ module.exports = class extends think.Logic {
         : {
             method,
             headers: {
-              'content-type':
-                'application/x-www-form-urlencoded; charset=UTF-8',
+              'content-type': 'application/x-www-form-urlencoded; charset=UTF-8',
             },
             body: query,
           };
 
-    const response = await fetch(requestUrl, options).then((resp) =>
-      resp.json(),
-    );
+    const response = await fetch(requestUrl, options).then((resp) => resp.json());
 
     if (!response.success) {
-      think.logger.debug(
-        'RecaptchaV3 or Turnstile Result:',
-        JSON.stringify(response, null, '\t'),
-      );
+      think.logger.debug('RecaptchaV3 or Turnstile Result:', JSON.stringify(response, null, '\t'));
 
       return this.ctx.throw(403);
     }

package/src/logic/user.js

@@ -116,7 +116,7 @@ module.exports = class extends Base {
     }
 
     this.rules = {
-      email: 
+      email: {
         email: true,
       },
     };

package/src/service/avatar.js

@@ -8,9 +8,7 @@ const { GRAVATAR_STR } = process.env;
 const env = new nunjucks.Environment();
 
 env.addFilter('md5', (str) => helper.md5(str));
-env.addFilter('sha256', (str) =>
-  crypto.createHash('sha256').update(str).digest('hex'),
-);
+env.addFilter('sha256', (str) => crypto.createHash('sha256').update(str).digest('hex'));
 
 const DEFAULT_GRAVATAR_STR = `{%- set numExp = r/^[0-9]+$/g -%}
 {%- set qqMailExp = r/^[0-9]+@qq.com$/ig -%}

package/src/service/markdown/mathCommon.js

@@ -12,11 +12,7 @@ const isValidDelim = (state, pos) => {
      * Check non-whitespace conditions for opening and closing, and
      * check that closing delimiter isn’t followed by a number
      */
-    canClose: !(
-      prevChar === ' ' ||
-      prevChar === '\t' ||
-      /[0-9]/u.exec(nextChar)
-    ),
+    canClose: !(prevChar === ' ' || prevChar === '\t' || /[0-9]/u.exec(nextChar)),
   };
 };
 
@@ -141,9 +137,7 @@ const blockTeX = (state, start, end, silent) => {
       ? `${firstLine}\n`
       : '') +
     state.getLines(start + 1, next, state.tShift[start], true) +
-    ((lastLine === null || lastLine === void 0 ? void 0 : lastLine.trim())
-      ? lastLine
-      : '');
+    ((lastLine === null || lastLine === void 0 ? void 0 : lastLine.trim()) ? lastLine : '');
   token.map = [start, state.line];
   token.markup = '$$';
 

package/src/service/markdown/mathjax.js

@@ -60,8 +60,7 @@ const mathjaxPlugin = (md) => {
 
   md.renderer.rules.inlineTeX = (tokens, idx) => inline(tokens[idx].content);
 
-  md.renderer.rules.blockTeX = (tokens, idx) =>
-    `${block(tokens[idx].content)}\n`;
+  md.renderer.rules.blockTeX = (tokens, idx) => `${block(tokens[idx].content)}\n`;
 };
 
 module.exports = {

package/src/service/notify.js

@@ -9,14 +9,7 @@ module.exports = class extends think.Service {
     super(controller);
 
     this.controller = controller;
-    const {
-      SMTP_USER,
-      SMTP_PASS,
-      SMTP_HOST,
-      SMTP_PORT,
-      SMTP_SECURE,
-      SMTP_SERVICE,
-    } = process.env;
+    const { SMTP_USER, SMTP_PASS, SMTP_HOST, SMTP_PORT, SMTP_SECURE, SMTP_SERVICE } = process.env;
 
     if (SMTP_HOST || SMTP_SERVICE) {
       const config = {
@@ -43,8 +36,7 @@ module.exports = class extends think.Service {
       return;
     }
 
-    const { SITE_NAME, SITE_URL, SMTP_USER, SENDER_EMAIL, SENDER_NAME } =
-      process.env;
+    const { SITE_NAME, SITE_URL, SMTP_USER, SENDER_EMAIL, SENDER_NAME } = process.env;
     const data = {
       self,
       parent,
@@ -59,10 +51,7 @@ module.exports = class extends think.Service {
     content = this.controller.locale(content, data);
 
     return this.transporter.sendMail({
-      from:
-        SENDER_EMAIL && SENDER_NAME
-          ? `"${SENDER_NAME}" <${SENDER_EMAIL}>`
-          : SMTP_USER,
+      from: SENDER_EMAIL && SENDER_NAME ? `"${SENDER_NAME}" <${SENDER_EMAIL}>` : SMTP_USER,
       to,
       subject: title,
       html: content,
@@ -110,8 +99,7 @@ module.exports = class extends think.Service {
   }
 
   async qywxAmWechat({ title, content }, self, parent) {
-    const { QYWX_AM, QYWX_PROXY, QYWX_PROXY_PORT, SITE_NAME, SITE_URL } =
-      process.env;
+    const { QYWX_AM, QYWX_PROXY, QYWX_PROXY_PORT, SITE_NAME, SITE_URL } = process.env;
 
     if (!QYWX_AM) {
       return false;
@@ -165,41 +153,35 @@ module.exports = class extends think.Service {
       }
     }
 
-    const { access_token } = await fetch(
-      `${baseUrl}/cgi-bin/gettoken?${querystring.toString()}`,
-      {
-        headers: {
-          'content-type': 'application/json',
-        },
+    const { access_token } = await fetch(`${baseUrl}/cgi-bin/gettoken?${querystring.toString()}`, {
+      headers: {
+        'content-type': 'application/json',
       },
-    ).then((resp) => resp.json());
-
-    return fetch(
-      `${baseUrl}/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());
+
+    return fetch(`${baseUrl}/cgi-bin/message/send?access_token=${access_token}`, {
+      method: 'POST',
+      headers: {
+        'content-type': 'application/json',
       },
-    ).then((resp) => resp.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) {
@@ -209,9 +191,7 @@ module.exports = class extends think.Service {
       return false;
     }
 
-    const comment = self.comment
-      .replace(/<a href="(.*?)">(.*?)<\/a>/g, '')
-      .replace(/<[^>]+>/g, '');
+    const comment = self.comment.replace(/<a href="(.*?)">(.*?)<\/a>/g, '').replace(/<[^>]+>/g, '');
 
     const data = {
       self: {
@@ -233,20 +213,29 @@ module.exports = class extends think.Service {
 {{self.comment}}
 仅供预览评论，请前往上述页面查看完整內容。`;
 
-    const form = new FormData();
-
-    form.append('msg', this.controller.locale(contentQQ, data));
-    form.append('qq', QQ_ID);
+    const qmsgHost = QMSG_HOST ? QMSG_HOST.replace(/\/$/, '') : 'https://qmsg.zendee.cn';
 
-    const qmsgHost = QMSG_HOST
-      ? QMSG_HOST.replace(/\/$/, '')
-      : 'https://qmsg.zendee.cn';
+    const postBodyData = {
+      qq: QQ_ID,
+      msg: this.controller.locale(contentQQ, data),
+    };
+    const postBody = Object.keys(postBodyData)
+      .map((key) => encodeURIComponent(key) + '=' + encodeURIComponent(postBodyData[key]))
+      .join('&');
 
     return fetch(`${qmsgHost}/send/${QMSG_KEY}`, {
       method: 'POST',
-      headers: form.getHeaders(),
-      body: form,
-    }).then((resp) => resp.json());
+      headers: {
+        'Content-Type': 'application/x-www-form-urlencoded',
+      },
+      body: postBody,
+    }).then((resp) => {
+      return resp.json().then((json) => {
+        think.logger.debug(`qq notify response: ${JSON.stringify(json)}`);
+
+        return json;
+      });
+    });
   }
 
   async telegram(self, parent) {
@@ -306,20 +295,17 @@ module.exports = class extends think.Service {
       },
     };
 
-    const resp = await fetch(
-      `https://api.telegram.org/bot${TG_BOT_TOKEN}/sendMessage`,
-      {
-        method: 'POST',
-        headers: {
-          'Content-Type': 'application/json',
-        },
-        body: JSON.stringify({
-          chat_id: TG_CHAT_ID,
-          text: this.controller.locale(contentTG, data),
-          parse_mode: 'MarkdownV2',
-        }),
+    const resp = await fetch(`https://api.telegram.org/bot${TG_BOT_TOKEN}/sendMessage`, {
+      method: 'POST',
+      headers: {
+        'Content-Type': 'application/json',
       },
-    ).then((resp) => resp.json());
+      body: JSON.stringify({
+        chat_id: TG_CHAT_ID,
+        text: this.controller.locale(contentTG, data),
+        parse_mode: 'MarkdownV2',
+      }),
+    }).then((resp) => resp.json());
 
     if (!resp.ok) {
       console.log('Telegram Notification Failed:' + JSON.stringify(resp));
@@ -492,8 +478,7 @@ module.exports = class extends think.Service {
 
   async run(comment, parent, disableAuthorNotify = false) {
     const { AUTHOR_EMAIL, DISABLE_AUTHOR_NOTIFY } = process.env;
-    const { mailSubject, mailTemplate, mailSubjectAdmin, mailTemplateAdmin } =
-      think.config();
+    const { mailSubject, mailTemplate, mailSubjectAdmin, mailTemplateAdmin } = think.config();
     const AUTHOR = AUTHOR_EMAIL;
 
     const mailList = [];
@@ -504,37 +489,26 @@ module.exports = class extends think.Service {
       ? parent && (parent.mail || '').toLowerCase() === AUTHOR.toLowerCase()
       : false;
     const isCommentSelf =
-      parent &&
-      (parent.mail || '').toLowerCase() === (comment.mail || '').toLowerCase();
+      parent && (parent.mail || '').toLowerCase() === (comment.mail || '').toLowerCase();
 
     const title = mailSubjectAdmin || 'MAIL_SUBJECT_ADMIN';
     const content = mailTemplateAdmin || 'MAIL_TEMPLATE_ADMIN';
 
     if (!DISABLE_AUTHOR_NOTIFY && !isAuthorComment && !disableAuthorNotify) {
       const wechat = await this.wechat({ title, content }, comment, parent);
-      const qywxAmWechat = await this.qywxAmWechat(
-        { title, content },
-        comment,
-        parent,
-      );
+      const qywxAmWechat = await this.qywxAmWechat({ title, content }, comment, parent);
       const qq = await this.qq(comment, parent);
       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);
       const lark = await this.lark({ title, content }, comment, parent);
 
-      if (
-        [wechat, qq, telegram, qywxAmWechat, pushplus, discord, lark].every(
-          think.isEmpty,
-        )
-      ) {
+      if ([wechat, qq, telegram, qywxAmWechat, pushplus, discord, lark].every(think.isEmpty)) {
         mailList.push({ to: AUTHOR, title, content });
       }
     }
 
-    const disallowList = this.controller.ctx.state.oauthServices.map(
-      ({ name }) => 'mail.' + name,
-    );
+    const disallowList = this.controller.ctx.state.oauthServices.map(({ name }) => 'mail.' + name);
     const fakeMail = new RegExp(`@(${disallowList.join('|')})$`, 'i');
 
     if (

package/src/service/storage/base.js

@@ -14,12 +14,7 @@ module.exports = class extends think.Service {
     //to be implemented
   }
 
-  async add(
-    data,
-    {
-      access: { read = true, write = true } = { read: true, write: true },
-    } = {},
-  ) {
+  async add(data, { access: { read = true, write = true } = { read: true, write: true } } = {}) {
     //to be implemented
   }
 

package/src/service/storage/github.js

@@ -53,8 +53,7 @@ class Github {
   // content api can only get file < 1MB
   async get(filename) {
     const resp = await fetch(
-      'https://api.github.com/repos/' +
-        path.join(this.repo, 'contents', filename),
+      'https://api.github.com/repos/' + path.join(this.repo, 'contents', filename),
       {
         headers: {
           accept: 'application/vnd.github.v3+json',
@@ -83,9 +82,7 @@ class Github {
   // blob api can get file larger than 1MB
   async getLargeFile(filename) {
     const { tree } = await fetch(
-      'https://api.github.com/repos/' +
-        path.join(this.repo, 'git/trees/HEAD') +
-        '?recursive=1',
+      'https://api.github.com/repos/' + path.join(this.repo, 'git/trees/HEAD') + '?recursive=1',
       {
         headers: {
           accept: 'application/vnd.github.v3+json',
@@ -114,23 +111,19 @@ class Github {
   }
 
   async set(filename, content, { sha }) {
-    return fetch(
-      'https://api.github.com/repos/' +
-        path.join(this.repo, 'contents', filename),
-      {
-        method: 'PUT',
-        headers: {
-          accept: 'application/vnd.github.v3+json',
-          authorization: 'token ' + this.token,
-          'user-agent': 'Waline',
-        },
-        body: JSON.stringify({
-          sha,
-          message: 'feat(waline): update comment data',
-          content: Buffer.from(content, 'utf-8').toString('base64'),
-        }),
+    return fetch('https://api.github.com/repos/' + path.join(this.repo, 'contents', filename), {
+      method: 'PUT',
+      headers: {
+        accept: 'application/vnd.github.v3+json',
+        authorization: 'token ' + this.token,
+        'user-agent': 'Waline',
       },
-    );
+      body: JSON.stringify({
+        sha,
+        message: 'feat(waline): update comment data',
+        content: Buffer.from(content, 'utf-8').toString('base64'),
+      }),
+    });
   }
 }
 
@@ -266,9 +259,7 @@ module.exports = class extends Base {
 
     const logicFn = logicMap[where._complex._logic];
 
-    return data.filter((item) =>
-      logicFn.call(filters, (filter) => filter.every((fn) => fn(item))),
-    );
+    return data.filter((item) => logicFn.call(filters, (filter) => filter.every((fn) => fn(item))));
   }
 
   async select(where, { desc, limit, offset, field } = {}) {

package/src/service/storage/leancloud.js

@@ -185,10 +185,7 @@ module.exports = class extends Base {
   }
 
   async _updateCmtGroupByMailUserIdCache(data, method) {
-    if (
-      this.tableName !== 'Comment' ||
-      !think.isArray(think.config('levels'))
-    ) {
+    if (this.tableName !== 'Comment' || !think.isArray(think.config('levels'))) {
       return;
     }
 
@@ -200,9 +197,7 @@ module.exports = class extends Base {
     const cacheData = await this.select({
       _complex: {
         _logic: 'or',
-        user_id: think.isObject(data.user_id)
-          ? data.user_id.toString()
-          : data.user_id,
+        user_id: think.isObject(data.user_id) ? data.user_id.toString() : data.user_id,
         mail: data.mail,
       },
     });
@@ -234,14 +229,12 @@ module.exports = class extends Base {
     const currentTableName = this.tableName;
 
     this.tableName = cacheTableName;
-    await this.update({ count }, { objectId: cacheData[0].objectId }).catch(
-      (e) => {
-        if (e.code === 101) {
-          return;
-        }
-        throw e;
-      },
-    );
+    await this.update({ count }, { objectId: cacheData[0].objectId }).catch((e) => {
+      if (e.code === 101) {
+        return;
+      }
+      throw e;
+    });
     this.tableName = currentTableName;
   }
 
@@ -258,10 +251,7 @@ module.exports = class extends Base {
     }
 
     // get group count cache by group field where data
-    const cacheData = await this._getCmtGroupByMailUserIdCache(
-      options.group.join('_'),
-      where,
-    );
+    const cacheData = await this._getCmtGroupByMailUserIdCache(options.group.join('_'), where);
 
     if (!where._complex) {
       if (cacheData.length) {
@@ -272,9 +262,7 @@ module.exports = class extends Base {
       const countsMap = {};
 
       for (const count of counts) {
-        const key = options.group
-          .map((item) => count[item] || undefined)
-          .join('_');
+        const key = options.group.map((item) => count[item] || undefined).join('_');
 
         if (!countsMap[key]) {
           countsMap[key] = {};
@@ -298,9 +286,7 @@ module.exports = class extends Base {
     const cacheDataMap = {};
 
     for (const item of cacheData) {
-      const key = options.group
-        .map((item) => item[item] || undefined)
-        .join('_');
+      const key = options.group.map((item) => item[item] || undefined).join('_');
 
       cacheDataMap[key] = item;
     }
@@ -364,12 +350,7 @@ module.exports = class extends Base {
     return [...cacheData, ...counts];
   }
 
-  async add(
-    data,
-    {
-      access: { read = true, write = true } = { read: true, write: true },
-    } = {},
-  ) {
+  async add(data, { access: { read = true, write = true } = { read: true, write: true } } = {}) {
     const Table = AV.Object.extend(this.tableName);
     const instance = new Table();
 
@@ -403,8 +384,7 @@ module.exports = class extends Base {
       ret.map(async (item) => {
         const _oldStatus = item.get('status');
 
-        const updateData =
-          typeof data === 'function' ? data(item.toJSON()) : data;
+        const updateData = typeof data === 'function' ? data(item.toJSON()) : data;
 
         const REVERSED_KEYS = ['createdAt', 'updatedAt'];
 

package/src/service/storage/mongodb.js

@@ -40,8 +40,7 @@ module.exports = class extends Base {
               break;
             case 'NOT IN':
               filter[parseKey(k)] = {
-                $nin:
-                  k === 'objectId' ? where[k][1].map(ObjectId) : where[k][1],
+                $nin: k === 'objectId' ? where[k][1].map(ObjectId) : where[k][1],
               };
               break;
             case 'LIKE': {

package/src/service/storage/mysql.js

@@ -90,17 +90,13 @@ module.exports = class extends Base {
   }
 
   async update(data, where) {
-    const list = await this.model(this.tableName)
-      .where(this.parseWhere(where))
-      .select();
+    const list = await this.model(this.tableName).where(this.parseWhere(where)).select();
 
     return Promise.all(
       list.map(async (item) => {
         const updateData = typeof data === 'function' ? data(item) : data;
 
-        await this.model(this.tableName)
-          .where({ id: item.id })
-          .update(updateData);
+        await this.model(this.tableName).where({ id: item.id }).update(updateData);
 
         return { ...item, ...updateData };
       }),
@@ -116,8 +112,6 @@ module.exports = class extends Base {
   async setSeqId(id) {
     const instance = this.model(this.tableName);
 
-    return instance.query(
-      `ALTER TABLE ${instance.tableName} AUTO_INCREMENT = ${id};`,
-    );
+    return instance.query(`ALTER TABLE ${instance.tableName} AUTO_INCREMENT = ${id};`);
   }
 };

package/src/service/storage/postgresql.js

@@ -48,9 +48,7 @@ module.exports = class extends MySQL {
         const val = data[key];
 
         data[key.toLowerCase()] =
-          val instanceof Date
-            ? think.datetime(val, 'YYYY-MM-DD HH:mm:ss')
-            : val;
+          val instanceof Date ? think.datetime(val, 'YYYY-MM-DD HH:mm:ss') : val;
         // eslint-disable-next-line @typescript-eslint/no-dynamic-delete
         delete data[key];
       });
@@ -79,8 +77,6 @@ module.exports = class extends MySQL {
   async setSeqId(id) {
     const instance = this.model(this.tableName);
 
-    return instance.query(
-      `ALTER SEQUENCE ${instance.tableName}_seq RESTART WITH ${id};`,
-    );
+    return instance.query(`ALTER SEQUENCE ${instance.tableName}_seq RESTART WITH ${id};`);
   }
 };