@waline/vercel 1.31.3 → 1.31.4

package/src/controller/comment.js

@@ -8,7 +8,7 @@ async function formatCmt(
   { ua, ip, ...comment },
   users = [],
   { avatarProxy, deprecated },
-  loginUser
+  loginUser,
 ) {
   ua = think.uaParser(ua);
   if (!think.config('disableUserAgent')) {
@@ -146,7 +146,7 @@ module.exports = class extends BaseRest {
 
       if (!think.isEmpty(duplicate)) {
         think.logger.debug(
-          'The comment author had post same comment content before'
+          'The comment author had post same comment content before',
         );
 
         return this.fail(this.locale('Duplicate Content'));
@@ -177,7 +177,7 @@ module.exports = class extends BaseRest {
 
       if (data.status === 'approved') {
         const spam = await akismet(data, this.ctx.serverURL).catch((e) =>
-          console.log(e)
+          console.log(e),
         ); // ignore akismet error
 
         if (spam === true) {
@@ -240,14 +240,14 @@ module.exports = class extends BaseRest {
       resp,
       [userInfo],
       { ...this.config(), deprecated: this.ctx.state.deprecated },
-      userInfo
+      userInfo,
     );
     const parentReturn = parentComment
       ? await formatCmt(
           parentComment,
           parentUser ? [parentUser] : [],
           { ...this.config(), deprecated: this.ctx.state.deprecated },
-          userInfo
+          userInfo,
         )
       : undefined;
 
@@ -256,7 +256,9 @@ module.exports = class extends BaseRest {
 
       await notify.run(
         { ...cmtReturn, mail: resp.mail, rawComment: comment },
-        parentReturn ? { ...parentReturn, mail: parentComment.mail } : undefined
+        parentReturn
+          ? { ...parentReturn, mail: parentComment.mail }
+          : undefined,
       );
     }
 
@@ -271,8 +273,8 @@ module.exports = class extends BaseRest {
         resp,
         [userInfo],
         { ...this.config(), deprecated: this.ctx.state.deprecated },
-        userInfo
-      )
+        userInfo,
+      ),
     );
   }
 
@@ -321,7 +323,7 @@ module.exports = class extends BaseRest {
       newData[0],
       cmtUser ? [cmtUser] : [],
       { ...this.config(), deprecated: this.ctx.state.deprecated },
-      userInfo
+      userInfo,
     );
 
     if (
@@ -349,13 +351,13 @@ module.exports = class extends BaseRest {
         pComment,
         pUser ? [pUser] : [],
         { ...this.config(), deprecated: this.ctx.state.deprecated },
-        userInfo
+        userInfo,
       );
 
       await notify.run(
         { ...cmtReturn, mail: newData[0].mail },
         { ...pcmtReturn, mail: pComment.mail },
-        true
+        true,
       );
     }
 
@@ -462,12 +464,12 @@ module.exports = class extends BaseRest {
         rootIds[objectId] = true;
       });
       comments = comments.filter(
-        (cmt) => rootIds[cmt.objectId] || rootIds[cmt.rid]
+        (cmt) => rootIds[cmt.objectId] || rootIds[cmt.rid],
       );
     } else {
       comments = await this.modelInstance.select(
         { ...where, rid: undefined },
-        { ...selectOptions }
+        { ...selectOptions },
       );
       rootCount = comments.length;
       rootComments = [
@@ -480,7 +482,7 @@ module.exports = class extends BaseRest {
           ...where,
           rid: ['IN', rootComments.map(({ objectId }) => objectId)],
         },
-        selectOptions
+        selectOptions,
       );
 
       comments = [...rootComments, ...children];
@@ -488,7 +490,7 @@ module.exports = class extends BaseRest {
 
     const userModel = this.getModel('Users');
     const user_ids = Array.from(
-      new Set(comments.map(({ user_id }) => user_id).filter((v) => v))
+      new Set(comments.map(({ user_id }) => user_id).filter((v) => v)),
     );
     let users = [];
 
@@ -497,7 +499,7 @@ module.exports = class extends BaseRest {
         { objectId: ['IN', user_ids] },
         {
           field: ['display_name', 'email', 'url', 'type', 'avatar', 'label'],
-        }
+        },
       );
     }
 
@@ -511,7 +513,7 @@ module.exports = class extends BaseRest {
         countWhere._complex.user_id = ['IN', user_ids];
       }
       const mails = Array.from(
-        new Set(comments.map(({ mail }) => mail).filter((v) => v))
+        new Set(comments.map(({ mail }) => mail).filter((v) => v)),
       );
 
       if (mails.length) {
@@ -528,7 +530,7 @@ module.exports = class extends BaseRest {
 
       comments.forEach((cmt) => {
         const countItem = (counts || []).find(({ mail, user_id }) =>
-          cmt.user_id ? user_id === cmt.user_id : mail === cmt.mail
+          cmt.user_id ? user_id === cmt.user_id : mail === cmt.mail,
         );
 
         cmt.level = think.getLevel(countItem?.count);
@@ -546,7 +548,7 @@ module.exports = class extends BaseRest {
             comment,
             users,
             { ...this.config(), deprecated: this.ctx.state.deprecated },
-            userInfo
+            userInfo,
           );
 
           cmt.children = await Promise.all(
@@ -560,14 +562,14 @@ module.exports = class extends BaseRest {
                     ...this.config(),
                     deprecated: this.ctx.state.deprecated,
                   },
-                  userInfo
-                )
+                  userInfo,
+                ),
               )
-              .reverse()
+              .reverse(),
           );
 
           return cmt;
-        })
+        }),
       ),
     };
   }
@@ -609,7 +611,7 @@ module.exports = class extends BaseRest {
 
     const userModel = this.getModel('Users');
     const user_ids = Array.from(
-      new Set(comments.map(({ user_id }) => user_id).filter((v) => v))
+      new Set(comments.map(({ user_id }) => user_id).filter((v) => v)),
     );
 
     let users = [];
@@ -619,7 +621,7 @@ module.exports = class extends BaseRest {
         { objectId: ['IN', user_ids] },
         {
           field: ['display_name', 'email', 'url', 'type', 'avatar', 'label'],
-        }
+        },
       );
     }
 
@@ -635,9 +637,9 @@ module.exports = class extends BaseRest {
             cmt,
             users,
             { ...this.config(), deprecated: this.ctx.state.deprecated },
-            userInfo
-          )
-        )
+            userInfo,
+          ),
+        ),
       ),
     };
   }
@@ -680,7 +682,7 @@ module.exports = class extends BaseRest {
 
     const userModel = this.getModel('Users');
     const user_ids = Array.from(
-      new Set(comments.map(({ user_id }) => user_id).filter((v) => v))
+      new Set(comments.map(({ user_id }) => user_id).filter((v) => v)),
     );
 
     let users = [];
@@ -690,7 +692,7 @@ module.exports = class extends BaseRest {
         { objectId: ['IN', user_ids] },
         {
           field: ['display_name', 'email', 'url', 'type', 'avatar', 'label'],
-        }
+        },
       );
     }
 
@@ -700,9 +702,9 @@ module.exports = class extends BaseRest {
           cmt,
           users,
           { ...this.config(), deprecated: this.ctx.state.deprecated },
-          userInfo
-        )
-      )
+          userInfo,
+        ),
+      ),
     );
   }
 

package/src/controller/db.js

@@ -42,17 +42,17 @@ module.exports = class extends BaseRest {
       item.insertedAt &&
         (item.insertedAt = think.datetime(
           item.insertedAt,
-          'YYYY-MM-DD HH:mm:ss'
+          'YYYY-MM-DD HH:mm:ss',
         ));
       item.createdAt &&
         (item.createdAt = think.datetime(
           item.createdAt,
-          'YYYY-MM-DD HH:mm:ss'
+          'YYYY-MM-DD HH:mm:ss',
         ));
       item.updatedAt &&
         (item.updatedAt = think.datetime(
           item.updatedAt,
-          'YYYY-MM-DD HH:mm:ss'
+          'YYYY-MM-DD HH:mm:ss',
         ));
     }
 

package/src/controller/oauth.js

@@ -25,7 +25,7 @@ module.exports = class extends think.Controller {
         `${oauthUrl}/${type}?${new URLSearchParams({
           redirect: redirectUrl,
           state: this.ctx.state.token || '',
-        }).toString()}`
+        }).toString()}`,
       );
     }
 
@@ -54,7 +54,7 @@ module.exports = class extends think.Controller {
         headers: {
           'user-agent': '@waline',
         },
-      }
+      },
     ).then((resp) => resp.json());
 
     if (!user || !user.id) {
@@ -68,7 +68,7 @@ module.exports = class extends think.Controller {
 
       if (redirect) {
         return this.redirect(
-          redirect + (redirect.includes('?') ? '&' : '?') + 'token=' + token
+          redirect + (redirect.includes('?') ? '&' : '?') + 'token=' + token,
         );
       }
 
@@ -123,7 +123,7 @@ module.exports = class extends think.Controller {
 
     if (redirect) {
       return this.redirect(
-        redirect + (redirect.includes('?') ? '&' : '?') + 'token=' + token
+        redirect + (redirect.includes('?') ? '&' : '?') + 'token=' + token,
       );
     }
 

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

@@ -14,7 +14,7 @@ module.exports = class extends BaseRest {
         { email },
         {
           field: ['2fa'],
-        }
+        },
       );
       const is2FAEnabled = !think.isEmpty(user) && Boolean(user[0]['2fa']);
 

package/src/controller/user/password.js

@@ -41,7 +41,7 @@ module.exports = class extends BaseRest {
       }),
       html: this.locale(
         'Please click <a href="{{url}}">{{url}}</a> to login and change your password as soon as possible!',
-        { url: profileUrl }
+        { url: profileUrl },
       ),
     });
 

package/src/controller/user.js

@@ -33,7 +33,7 @@ module.exports = class extends BaseRest {
         desc: 'createdAt',
         limit: pageSize,
         offset: Math.max((page - 1) * pageSize, 0),
-      }
+      },
     );
 
     return this.success({
@@ -70,7 +70,7 @@ module.exports = class extends BaseRest {
     const hasMailService = SMTP_HOST || SMTP_SERVICE;
 
     const token = Array.from({ length: 4 }, () =>
-      Math.round(Math.random() * 9)
+      Math.round(Math.random() * 9),
     ).join('');
     const normalType = hasMailService
       ? `verify:${token}:${Date.now() + 1 * 60 * 60 * 1000}`
@@ -107,7 +107,7 @@ module.exports = class extends BaseRest {
         }),
         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 }
+          { url: apiUrl },
         ),
       });
     } catch (e) {
@@ -116,8 +116,8 @@ module.exports = class extends BaseRest {
       return this.fail(
         this.locale(
           'Registration confirm mail send failed, please {%- if isAdmin -%}check your mail configuration{%- else -%}check your email address and contact administrator{%- endif -%}.',
-          { isAdmin: think.isEmpty(count) }
-        )
+          { isAdmin: think.isEmpty(count) },
+        ),
       );
     }
 
@@ -189,7 +189,7 @@ module.exports = class extends BaseRest {
       },
       {
         group: ['user_id', 'mail'],
-      }
+      },
     );
 
     counts.sort((a, b) => b.count - a.count);
@@ -226,7 +226,7 @@ module.exports = class extends BaseRest {
         if (user.count) {
           const _level = think.findLastIndex(
             this.config('levels'),
-            (l) => l <= user.count
+            (l) => l <= user.count,
           );
 
           if (_level !== -1) {
@@ -255,7 +255,7 @@ module.exports = class extends BaseRest {
 
       const comments = await commentModel.select(
         { mail: count.mail },
-        { limit: 1 }
+        { limit: 1 },
       );
 
       if (think.isEmpty(comments)) {

package/src/extend/think.js

@@ -79,7 +79,7 @@ module.exports = {
       const { region } = result;
       const [, , province, city, isp] = region.split('|');
       const address = Array.from(
-        new Set([province, city, isp].filter((v) => v))
+        new Set([province, city, isp].filter((v) => v)),
       );
 
       return address.slice(0, depth).join(' ');
@@ -155,7 +155,7 @@ module.exports = {
   getPluginHook(hookName) {
     return think
       .pluginMap('hooks', (hook) =>
-        think.isFunction(hook[hookName]) ? hook[hookName] : undefined
+        think.isFunction(hook[hookName]) ? hook[hookName] : undefined,
       )
       .filter((v) => v);
   },

package/src/logic/base.js

@@ -28,13 +28,13 @@ module.exports = class extends think.Logic {
         'api.twitter.com',
         'www.facebook.com',
         'api.weibo.com',
-        'graph.qq.com'
+        'graph.qq.com',
       );
 
       const match = secureDomains.some((domain) =>
         think.isFunction(domain.test)
           ? domain.test(referrer)
-          : domain === referrer
+          : domain === referrer,
       );
 
       if (!match) {
@@ -81,7 +81,7 @@ module.exports = class extends think.Logic {
           '2fa',
           'label',
         ],
-      }
+      },
     );
 
     if (think.isEmpty(user)) {
@@ -183,13 +183,13 @@ module.exports = class extends think.Logic {
           };
 
     const response = await fetch(requestUrl, options).then((resp) =>
-      resp.json()
+      resp.json(),
     );
 
     if (!response.success) {
       think.logger.debug(
         'RecaptchaV3 or Turnstile Result:',
-        JSON.stringify(response, null, '\t')
+        JSON.stringify(response, null, '\t'),
       );
 
       return this.ctx.throw(403);

package/src/middleware/prefix-warning.js

@@ -20,7 +20,7 @@ module.exports = () => async (ctx, next) => {
 
   if (ctx.state.deprecated) {
     think.logger.warn(
-      `[Deprecated] ${ctx.path} API will be deprecated in the next major version, please don't use it anymore. If you are using \`@waline/client\` please upgrade to \`@waline/client@3\`. For other scenarios, you can use \`/api${ctx.path}\` to replace it.`
+      `[Deprecated] ${ctx.path} API will be deprecated in the next major version, please don't use it anymore. If you are using \`@waline/client\` please upgrade to \`@waline/client@3\`. For other scenarios, you can use \`/api${ctx.path}\` to replace it.`,
     );
   }
 

package/src/service/akismet.js

@@ -35,7 +35,7 @@ module.exports = function (comment, blog) {
             return reject(err);
           }
           resolve(spam);
-        }
+        },
       );
     });
   });

package/src/service/markdown/katex.js

@@ -1,6 +1,6 @@
 const katex = require('katex');
 
-const { inlineTex, blockTex } = require('./mathCommon');
+const { inlineTeX, blockTeX } = require('./mathCommon');
 const { escapeHtml } = require('./utils');
 
 // set KaTeX as the renderer for markdown-it-simplemath
@@ -12,7 +12,7 @@ const katexInline = (tex, options) => {
     if (options.throwOnError) console.warn(error);
 
     return `<span class='katex-error' title='${escapeHtml(
-      error.toString()
+      error.toString(),
     )}'>${escapeHtml(tex)}</span>`;
   }
 };
@@ -25,23 +25,23 @@ const katexBlock = (tex, options) => {
     if (options.throwOnError) console.warn(error);
 
     return `<p class='katex-block katex-error' title='${escapeHtml(
-      error.toString()
+      error.toString(),
     )}'>${escapeHtml(tex)}</p>`;
   }
 };
 
 const katexPlugin = (md, options = { throwOnError: false }) => {
-  md.inline.ruler.after('escape', 'inlineTex', inlineTex);
+  md.inline.ruler.after('escape', 'inlineTeX', inlineTeX);
 
   // It’s a workaround here because types issue
-  md.block.ruler.after('blockquote', 'blockTex', blockTex, {
+  md.block.ruler.after('blockquote', 'blockTeX', blockTeX, {
     alt: ['paragraph', 'reference', 'blockquote', 'list'],
   });
 
-  md.renderer.rules.inlineTex = (tokens, idx) =>
+  md.renderer.rules.inlineTeX = (tokens, idx) =>
     katexInline(tokens[idx].content, options);
 
-  md.renderer.rules.blockTex = (tokens, idx) =>
+  md.renderer.rules.blockTeX = (tokens, idx) =>
     `${katexBlock(tokens[idx].content, options)}\n`;
 };
 

package/src/service/markdown/mathCommon.js

@@ -20,7 +20,7 @@ const isValidDelim = (state, pos) => {
   };
 };
 
-const inlineTex = (state, silent) => {
+const inlineTeX = (state, silent) => {
   let match;
   let pos;
   let res;
@@ -83,7 +83,7 @@ const inlineTex = (state, silent) => {
   }
 
   if (!silent) {
-    token = state.push('inlineTex', 'math', 0);
+    token = state.push('inlineTeX', 'math', 0);
     token.markup = '$';
     token.content = state.src.slice(start, match);
   }
@@ -93,7 +93,7 @@ const inlineTex = (state, silent) => {
   return true;
 };
 
-const blockTex = (state, start, end, silent) => {
+const blockTeX = (state, start, end, silent) => {
   let firstLine;
   let lastLine;
   let next;
@@ -133,7 +133,7 @@ const blockTex = (state, start, end, silent) => {
 
   state.line = next + 1;
 
-  const token = state.push('blockTex', 'math', 0);
+  const token = state.push('blockTeX', 'math', 0);
 
   token.block = true;
   token.content =
@@ -151,6 +151,6 @@ const blockTex = (state, start, end, silent) => {
 };
 
 module.exports = {
-  inlineTex,
-  blockTex,
+  inlineTeX,
+  blockTeX,
 };

package/src/service/markdown/mathjax.js

@@ -5,7 +5,7 @@ const { TeX } = require('mathjax-full/js/input/tex.js');
 const { mathjax } = require('mathjax-full/js/mathjax');
 const { SVG } = require('mathjax-full/js/output/svg.js');
 
-const { inlineTex, blockTex } = require('./mathCommon');
+const { inlineTeX, blockTeX } = require('./mathCommon');
 const { escapeHtml } = require('./utils');
 
 // set MathJax as the renderer
@@ -30,7 +30,7 @@ class MathToSvg {
         const errorTitle = svg.match(/<title>(.*?)<\/title>/)[1];
 
         svg = `<span class='mathjax-error' title='${escapeHtml(
-          errorTitle
+          errorTitle,
         )}'>${escapeHtml(tex)}</span>`;
       }
 
@@ -45,7 +45,7 @@ class MathToSvg {
         const errorTitle = svg.match(/<title>(.*?)<\/title>/)[1];
 
         svg = `<p class='mathjax-block mathjax-error' title='${escapeHtml(
-          errorTitle
+          errorTitle,
         )}'>${escapeHtml(tex)}</p>`;
       } else {
         svg = svg.replace(/(width=".*?")/, 'width="100%"');
@@ -59,17 +59,17 @@ class MathToSvg {
 const mathjaxPlugin = (md) => {
   const mathToSvg = new MathToSvg();
 
-  md.inline.ruler.after('escape', 'inlineTex', inlineTex);
+  md.inline.ruler.after('escape', 'inlineTeX', inlineTeX);
 
   // It’s a workaround here because types issue
-  md.block.ruler.after('blockquote', 'blockTex', blockTex, {
+  md.block.ruler.after('blockquote', 'blockTeX', blockTeX, {
     alt: ['paragraph', 'reference', 'blockquote', 'list'],
   });
 
-  md.renderer.rules.inlineTex = (tokens, idx) =>
+  md.renderer.rules.inlineTeX = (tokens, idx) =>
     mathToSvg.inline(tokens[idx].content);
 
-  md.renderer.rules.blockTex = (tokens, idx) =>
+  md.renderer.rules.blockTeX = (tokens, idx) =>
     `${mathToSvg.block(tokens[idx].content)}\n`;
 };
 

package/src/service/markdown/xss.js

@@ -35,8 +35,8 @@ const sanitize = (content) =>
         FORBID_TAGS: ['form', 'input', 'style'],
         FORBID_ATTR: ['autoplay', 'style'],
       },
-      think.config('domPurify') || {}
-    )
+      think.config('domPurify') || {},
+    ),
   );
 
 module.exports = {