@waline/vercel 1.36.5 → 1.38.0

package/src/locales/fr.json

@@ -0,0 +1,19 @@
+{
+  "import data format not support!": "Format de fichier non pris en charge",
+  "USER_EXIST": "L'utilisateur existe déjà",
+  "USER_NOT_EXIST": "L'utilisateur n'existe pas",
+  "USER_REGISTERED": "Utilisateur déjà enregistré",
+  "TOKEN_EXPIRED": "Le jeton a expiré",
+  "TWO_FACTOR_AUTH_ERROR_DETAIL": "Échec de l'authentification à deux facteurs",
+  "[{{name | safe}}] Registration Confirm Mail": "【{{name | safe}}】Mail de confirmation d'inscription",
+  "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.": "Veuillez cliquer sur <a href=\"{{url}}\">{{url}}</a> pour confirmer l'inscription. Le lien est valable 1 heure. Si vous ne vous êtes pas inscrit, ignorez cet e-mail.",
+  "[{{name | safe}}] Reset Password": "【{{name | safe}}】Réinitialisation du mot de passe",
+  "Please click <a href=\"{{url}}\">{{url}}</a> to login and change your password as soon as possible!": "Veuillez cliquer sur <a href=\"{{url}}\">{{url}}</a> pour vous connecter et changer votre mot de passe dès que possible !",
+  "Duplicate Content": "Contenu dupliqué envoyé",
+  "Comment too fast": "Vous commentez trop rapidement, veuillez ralentir !",
+  "Registration confirm mail send failed, please {%- if isAdmin -%}check your mail configuration{%- else -%}check your email address and contact administrator{%- endif -%}.": "Échec de l'envoi du mail de confirmation. Veuillez {%- if isAdmin -%}vérifier votre configuration d'e-mail{%- else -%}vérifier votre adresse e-mail et contacter l'administrateur{%- endif -%}.",
+  "MAIL_SUBJECT": "{{parent.nick | safe}}，Votre commentaire sur '{{site.name | safe}}' a reçu une réponse",
+  "MAIL_TEMPLATE": "<div style='border-top:2px solid #12ADDB;box-shadow:0 1px 3px #AAAAAA;line-height:180%;padding:0 15px 12px;margin:50px auto;font-size:12px;'> <h2 style='border-bottom:1px solid #DDD;font-size:14px;font-weight:normal;padding:13px 0 10px 8px;'> Votre commentaire sur <a style='text-decoration:none;color: #12ADDB;' href='{{site.url}}' target='_blank'>{{site.name}}</a> a une nouvelle réponse </h2>{{parent.nick}}, vous avez commenté : <div style='padding:0 12px 0 12px;margin-top:18px'> <div style='background-color: #f5f5f5;padding: 10px 15px;margin:18px 0;word-wrap:break-word;'>{{parent.comment | safe}}</div><p><strong>{{self.nick}}</strong> a répondu :</p><div style='background-color: #f5f5f5;padding: 10px 15px;margin:18px 0;word-wrap:break-word;'>{{self.comment | safe}}</div><p>Vous pouvez voir la réponse complète <a style='text-decoration:none; color:#12addb' href='{{site.postUrl}}' target='_blank'>ici</a>, et revenez visiter <a style='text-decoration:none; color:#12addb' href='{{site.url}}' target='_blank'>{{site.name}}</a>.</p><br/> </div></div>",
+  "MAIL_SUBJECT_ADMIN": "Nouveau commentaire sur {{site.name | safe}}",
+  "MAIL_TEMPLATE_ADMIN": "<div style='border-top:2px solid #12ADDB;box-shadow:0 1px 3px #AAAAAA;line-height:180%;padding:0 15px 12px;margin:50px auto;font-size:12px;'> <h2 style='border-bottom:1px solid #DDD;font-size:14px;font-weight:normal;padding:13px 0 10px 8px;'> Votre article sur <a style='text-decoration:none;color: #12ADDB;' href='{{site.url}}' target='_blank'>{{site.name}}</a> a de nouveaux commentaires </h2> <p><strong>{{self.nick}}</strong> a écrit :</p><div style='background-color: #f5f5f5;padding: 10px 15px;margin:18px 0;word-wrap:break-word;'>{{self.comment | safe}}</div><p>Vous pouvez voir la réponse complète <a style='text-decoration:none; color:#12addb' href='{{site.postUrl}}' target='_blank'>ici</a></p><br/> </div>"
+}

package/src/locales/index.js

@@ -2,14 +2,30 @@ const en = require('./en.json');
 const it = require('./it.json');
 const zhCN = require('./zh-CN.json');
 const zhTW = require('./zh-TW.json');
+const jp = require('./jp.json');
+const de = require('./de.json');
+const esMX = require('./es.json');
+const fr = require('./fr.json');
+const ru = require('./ru.json');
+const vi = require('./vi-VN.json');
+const ptBR = require('./pt-BR.json');
 
 module.exports = {
   'zh-cn': zhCN,
   'zh-tw': zhTW,
   en: en,
   'en-us': en,
-  jp: en,
-  'jp-jp': en,
   it,
   'it-it': it,
+  jp,
+  'jp-jp': jp,
+  de,
+  esMX,
+  fr,
+  'fr-fr': fr,
+  ru,
+  'ru-ru': ru,
+  vi,
+  'vi-vn': vi,
+  'pt-br': ptBR,
 };

package/src/locales/jp.json

@@ -0,0 +1,19 @@
+{
+  "import data format not support!": "ファイル形式はサポートされていません",
+  "USER_EXIST": "ユーザーは既に存在します",
+  "USER_NOT_EXIST": "ユーザーが存在しません",
+  "USER_REGISTERED": "ユーザーは既に登録されています",
+  "TOKEN_EXPIRED": "トークンの有効期限が切れています",
+  "TWO_FACTOR_AUTH_ERROR_DETAIL": "二段階認証に失敗しました",
+  "[{{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 | 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": "コメントが速すぎます。少し待ってください！",
+  "Registration confirm mail send failed, please {%- if isAdmin -%}check your mail configuration{%- else -%}check your email address and contact administrator{%- endif -%}.": "登録確認メールの送信に失敗しました。{%- if isAdmin -%}メール設定を確認してください{%- else -%}メールアドレスを確認し、管理者に連絡してください{%- endif -%}。",
+  "MAIL_SUBJECT": "{{parent.nick | safe}}、『{{site.name | safe}}』にあなたのコメントへの返信があります",
+  "MAIL_TEMPLATE": "<div style='border-top:2px solid #12ADDB;box-shadow:0 1px 3px #AAAAAA;line-height:180%;padding:0 15px 12px;margin:50px auto;font-size:12px;'> <h2 style='border-bottom:1px solid #DDD;font-size:14px;font-weight:normal;padding:13px 0 10px 8px;'> <a style='text-decoration:none;color: #12ADDB;' href='{{site.url}}' target='_blank'>{{site.name}}</a> にあなたのコメントへの新しい返信があります </h2>{{parent.nick}}さん、あなたは次のようにコメントしました： <div style='padding:0 12px 0 12px;margin-top:18px'> <div style='background-color: #f5f5f5;padding: 10px 15px;margin:18px 0;word-wrap:break-word;'>{{parent.comment | safe}}</div><p><strong>{{self.nick}}</strong> が次のように返信しました：</p><div style='background-color: #f5f5f5;padding: 10px 15px;margin:18px 0;word-wrap:break-word;'>{{self.comment | safe}}</div><p>返信の全文は <a style='text-decoration:none; color:#12addb' href='{{site.postUrl}}' target='_blank'>こちら</a> で確認できます。<a style='text-decoration:none; color:#12addb' href='{{site.url}}' target='_blank'>{{site.name}}</a> にまたお越しください。</p><br/> </div></div>",
+  "MAIL_SUBJECT_ADMIN": "{{site.name | safe}} に新しいコメントがあります",
+  "MAIL_TEMPLATE_ADMIN": "<div style='border-top:2px solid #12ADDB;box-shadow:0 1px 3px #AAAAAA;line-height:180%;padding:0 15px 12px;margin:50px auto;font-size:12px;'> <h2 style='border-bottom:1px solid #DDD;font-size:14px;font-weight:normal;padding:13px 0 10px 8px;'> <a style='text-decoration:none;color: #12ADDB;' href='{{site.url}}' target='_blank'>{{site.name}}</a> に新しいコメントがあります </h2> <p><strong>{{self.nick}}</strong> が次のようにコメントしました：</p><div style='background-color: #f5f5f5;padding: 10px 15px;margin:18px 0;word-wrap:break-word;'>{{self.comment | safe}}</div><p>全文は <a style='text-decoration:none; color:#12addb' href='{{site.postUrl}}' target='_blank'>こちら</a> で確認できます。</p><br/> </div>"
+}

package/src/locales/pt-BR.json

@@ -0,0 +1,19 @@
+{
+  "import data format not support!": "Formato de arquivo não suportado",
+  "USER_EXIST": "Usuário já existe",
+  "USER_NOT_EXIST": "Usuário não existe",
+  "USER_REGISTERED": "Usuário já registrado",
+  "TOKEN_EXPIRED": "Token expirou",
+  "TWO_FACTOR_AUTH_ERROR_DETAIL": "Erro de autenticação em dois fatores",
+  "[{{name | safe}}] Registration Confirm Mail": "【{{name | safe}}】Confirmação de registro",
+  "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.": "Por favor clique em <a href=\"{{url}}\">{{url}}</a> para confirmar o registro. O link é válido por 1 hora. Se você não está registrando, ignore este e-mail.",
+  "[{{name | safe}}] Reset Password": "【{{name | safe}}】Redefinir senha",
+  "Please click <a href=\"{{url}}\">{{url}}</a> to login and change your password as soon as possible!": "Por favor clique em <a href=\"{{url}}\">{{url}}</a> para entrar e alterar sua senha o quanto antes!",
+  "Duplicate Content": "Conteúdo duplicado enviado",
+  "Comment too fast": "Comentando rápido demais, por favor aguarde!",
+  "Registration confirm mail send failed, please {%- if isAdmin -%}check your mail configuration{%- else -%}check your email address and contact administrator{%- endif -%}.": "Falha ao enviar o e-mail de confirmação. Por favor {%- if isAdmin -%}verifique a configuração de e-mail{%- else -%}verifique seu endereço de e-mail e contate o administrador{%- endif -%}.",
+  "MAIL_SUBJECT": "{{parent.nick | safe}}，Seu comentário em '{{site.name | safe}}' recebeu uma resposta",
+  "MAIL_TEMPLATE": "<div style='border-top:2px solid #12ADDB;box-shadow:0 1px 3px #AAAAAA;line-height:180%;padding:0 15px 12px;margin:50px auto;font-size:12px;'> <h2 style='border-bottom:1px solid #DDD;font-size:14px;font-weight:normal;padding:13px 0 10px 8px;'> Seu comentário em <a style='text-decoration:none;color: #12ADDB;' href='{{site.url}}' target='_blank'>{{site.name}}</a> tem uma nova resposta </h2>{{parent.nick}}, você comentou: <div style='padding:0 12px 0 12px;margin-top:18px'> <div style='background-color: #f5f5f5;padding: 10px 15px;margin:18px 0;word-wrap:break-word;'>{{parent.comment | safe}}</div><p><strong>{{self.nick}}</strong> respondeu:</p><div style='background-color: #f5f5f5;padding: 10px 15px;margin:18px 0;word-wrap:break-word;'>{{self.comment | safe}}</div><p>Você pode ver a resposta completa em <a style='text-decoration:none; color:#12addb' href='{{site.postUrl}}' target='_blank'>aqui</a>, e visite novamente <a style='text-decoration:none; color:#12addb' href='{{site.url}}' target='_blank'>{{site.name}}</a>.</p><br/> </div></div>",
+  "MAIL_SUBJECT_ADMIN": "Novo comentário em {{site.name | safe}}",
+  "MAIL_TEMPLATE_ADMIN": "<div style='border-top:2px solid #12ADDB;box-shadow:0 1px 3px #AAAAAA;line-height:180%;padding:0 15px 12px;margin:50px auto;font-size:12px;'> <h2 style='border-bottom:1px solid #DDD;font-size:14px;font-weight:normal;padding:13px 0 10px 8px;'> Seu artigo em <a style='text-decoration:none;color: #12ADDB;' href='{{site.url}}' target='_blank'>{{site.name}}</a> tem novos comentários </h2> <p><strong>{{self.nick}}</strong> disse:</p><div style='background-color: #f5f5f5;padding: 10px 15px;margin:18px 0;word-wrap:break-word;'>{{self.comment | safe}}</div><p>Você pode ver a resposta completa em <a style='text-decoration:none; color:#12addb' href='{{site.postUrl}}' target='_blank'>aqui</a></p><br/> </div>"
+}

package/src/locales/ru.json

@@ -0,0 +1,19 @@
+{
+  "import data format not support!": "Формат файла не поддерживается",
+  "USER_EXIST": "Пользователь уже существует",
+  "USER_NOT_EXIST": "Пользователь не найден",
+  "USER_REGISTERED": "Пользователь уже зарегистрирован",
+  "TOKEN_EXPIRED": "Токен истёк",
+  "TWO_FACTOR_AUTH_ERROR_DETAIL": "Ошибка двухфакторной аутентификации",
+  "[{{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 | 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": "Слишком быстрое комментирование, пожалуйста, замедлитесь!",
+  "Registration confirm mail send failed, please {%- if isAdmin -%}check your mail configuration{%- else -%}check your email address and contact administrator{%- endif -%}.": "Сбой отправки письма подтверждения регистрации. Пожалуйста, {%- if isAdmin -%}проверьте конфигурацию почты{%- else -%}проверьте адрес эл. почты и свяжитесь с администратором{%- endif -%}.",
+  "MAIL_SUBJECT": "{{parent.nick | safe}}，У вас есть ответ на комментарий в '{{site.name | safe}}'",
+  "MAIL_TEMPLATE": "<div style='border-top:2px solid #12ADDB;box-shadow:0 1px 3px #AAAAAA;line-height:180%;padding:0 15px 12px;margin:50px auto;font-size:12px;'> <h2 style='border-bottom:1px solid #DDD;font-size:14px;font-weight:normal;padding:13px 0 10px 8px;'> Ваш комментарий на <a style='text-decoration:none;color: #12ADDB;' href='{{site.url}}' target='_blank'>{{site.name}}</a> получил новый ответ </h2>{{parent.nick}}, вы писали: <div style='padding:0 12px 0 12px;margin-top:18px'> <div style='background-color: #f5f5f5;padding: 10px 15px;margin:18px 0;word-wrap:break-word;'>{{parent.comment | safe}}</div><p><strong>{{self.nick}}</strong> ответил:</p><div style='background-color: #f5f5f5;padding: 10px 15px;margin:18px 0;word-wrap:break-word;'>{{self.comment | safe}}</div><p>Просмотреть полный ответ можно по ссылке <a style='text-decoration:none; color:#12addb' href='{{site.postUrl}}' target='_blank'>здесь</a>, и посетите снова <a style='text-decoration:none; color:#12addb' href='{{site.url}}' target='_blank'>{{site.name}}</a>.</p><br/> </div></div>",
+  "MAIL_SUBJECT_ADMIN": "Новый комментарий на {{site.name | safe}}",
+  "MAIL_TEMPLATE_ADMIN": "<div style='border-top:2px solid #12ADDB;box-shadow:0 1px 3px #AAAAAA;line-height:180%;padding:0 15px 12px;margin:50px auto;font-size:12px;'> <h2 style='border-bottom:1px solid #DDD;font-size:14px;font-weight:normal;padding:13px 0 10px 8px;'> В вашей статье на <a style='text-decoration:none;color: #12ADDB;' href='{{site.url}}' target='_blank'>{{site.name}}</a> новый комментарий </h2> <p><strong>{{self.nick}}</strong> написал:</p><div style='background-color: #f5f5f5;padding: 10px 15px;margin:18px 0;word-wrap:break-word;'>{{self.comment | safe}}</div><p>Просмотреть полностью: <a style='text-decoration:none; color:#12addb' href='{{site.postUrl}}' target='_blank'>здесь</a></p><br/> </div>"
+}

package/src/locales/vi-VN.json

@@ -0,0 +1,19 @@
+{
+  "import data format not support!": "Định dạng tệp không được hỗ trợ",
+  "USER_EXIST": "Người dùng đã tồn tại",
+  "USER_NOT_EXIST": "Người dùng không tồn tại",
+  "USER_REGISTERED": "Người dùng đã đăng ký",
+  "TOKEN_EXPIRED": "Mã thông báo đã hết hạn",
+  "TWO_FACTOR_AUTH_ERROR_DETAIL": "Xác thực hai bước thất bại",
+  "[{{name | safe}}] Registration Confirm Mail": "【{{name | safe}}】 Thư xác nhận đăng ký",
+  "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.": "Vui lòng nhấp vào <a href=\"{{url}}\">{{url}}</a> để xác nhận đăng ký. Liên kết có hiệu lực trong 1 giờ. Nếu bạn không đăng ký, hãy bỏ qua email này.",
+  "[{{name | safe}}] Reset Password": "【{{name | safe}}】 Đặt lại mật khẩu",
+  "Please click <a href=\"{{url}}\">{{url}}</a> to login and change your password as soon as possible!": "Vui lòng nhấp vào <a href=\"{{url}}\">{{url}}</a> để đăng nhập và thay đổi mật khẩu càng sớm càng tốt!",
+  "Duplicate Content": "Nội dung trùng lặp đã được gửi",
+  "Comment too fast": "Bình luận quá nhanh, vui lòng chậm lại!",
+  "Registration confirm mail send failed, please {%- if isAdmin -%}check your mail configuration{%- else -%}check your email address and contact administrator{%- endif -%}.": "Gửi mail xác nhận đăng ký thất bại. Vui lòng {%- if isAdmin -%}kiểm tra cấu hình mail{%- else -%}kiểm tra địa chỉ email và liên hệ quản trị viên{%- endif -%}.",
+  "MAIL_SUBJECT": "{{parent.nick | safe}}，Bình luận của bạn trên '{{site.name | safe}}' đã có phản hồi",
+  "MAIL_TEMPLATE": "<div style='border-top:2px solid #12ADDB;box-shadow:0 1px 3px #AAAAAA;line-height:180%;padding:0 15px 12px;margin:50px auto;font-size:12px;'> <h2 style='border-bottom:1px solid #DDD;font-size:14px;font-weight:normal;padding:13px 0 10px 8px;'> Bình luận của bạn trên <a style='text-decoration:none;color: #12ADDB;' href='{{site.url}}' target='_blank'>{{site.name}}</a> đã có phản hồi </h2>{{parent.nick}}, bạn đã bình luận: <div style='padding:0 12px 0 12px;margin-top:18px'> <div style='background-color: #f5f5f5;padding: 10px 15px;margin:18px 0;word-wrap:break-word;'>{{parent.comment | safe}}</div><p><strong>{{self.nick}}</strong> trả lời:</p><div style='background-color: #f5f5f5;padding: 10px 15px;margin:18px 0;word-wrap:break-word;'>{{self.comment | safe}}</div><p>Bạn có thể xem phản hồi đầy đủ tại <a style='text-decoration:none; color:#12addb' href='{{site.postUrl}}' target='_blank'>đây</a>, và ghé thăm lại <a style='text-decoration:none; color:#12addb' href='{{site.url}}' target='_blank'>{{site.name}}</a>.</p><br/> </div></div>",
+  "MAIL_SUBJECT_ADMIN": "Bình luận mới trên {{site.name | safe}}",
+  "MAIL_TEMPLATE_ADMIN": "<div style='border-top:2px solid #12ADDB;box-shadow:0 1px 3px #AAAAAA;line-height:180%;padding:0 15px 12px;margin:50px auto;font-size:12px;'> <h2 style='border-bottom:1px solid #DDD;font-size:14px;font-weight:normal;padding:13px 0 10px 8px;'> Bài viết của bạn trên <a style='text-decoration:none;color: #12ADDB;' href='{{site.url}}' target='_blank'>{{site.name}}</a> có bình luận mới </h2> <p><strong>{{self.nick}}</strong> trả lời:</p><div style='background-color: #f5f5f5;padding: 10px 15px;margin:18px 0;word-wrap:break-word;'>{{self.comment | safe}}</div><p>Bạn có thể xem phản hồi đầy đủ tại <a style='text-decoration:none; color:#12addb' href='{{site.postUrl}}' target='_blank'>đây</a></p><br/> </div>"
+}

package/src/logic/base.js

@@ -3,7 +3,7 @@ const qs = require('node:querystring');
 
 const jwt = require('jsonwebtoken');
 
-module.exports = class extends think.Logic {
+module.exports = class BaseLogic extends think.Logic {
   constructor(...args) {
     super(...args);
     this.modelInstance = this.getModel('Users');
@@ -11,17 +11,18 @@ module.exports = class extends think.Logic {
     this.id = this.getId();
   }
 
+  // oxlint-disable-next-line max-statements
   async __before() {
     const referrer = this.ctx.referrer(true);
-    let origin = this.ctx.origin;
+    let { origin } = this.ctx;
 
     if (origin) {
       try {
         const parsedOrigin = new URL(origin);
 
         origin = parsedOrigin.hostname;
-      } catch (e) {
-        console.error('Invalid origin format:', origin, e);
+      } catch (err) {
+        console.error('Invalid origin format:', origin, err);
       }
     }
 
@@ -39,9 +40,10 @@ module.exports = class extends think.Logic {
         // 'api.weibo.com',
         // 'graph.qq.com',
       );
-      secureDomains = secureDomains.concat(
-        this.ctx.state.oauthServices.map(({ origin }) => origin),
-      );
+      secureDomains = [
+        ...secureDomains,
+        ...this.ctx.state.oauthServices.map(({ origin }) => origin),
+      ];
 
       // 转换可能的正则表达式字符串为正则表达式对象
       secureDomains = secureDomains
@@ -50,8 +52,8 @@ module.exports = class extends think.Logic {
           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);
+            } catch (err) {
+              console.error('Invalid regex pattern in secureDomains:', domain, err);
 
               return null;
             }
@@ -62,7 +64,7 @@ module.exports = class extends think.Logic {
         .filter(Boolean); // 过滤掉无效的正则表达式
 
       // 有 referrer 检查 referrer，没有则检查 origin
-      const checking = referrer ? referrer : origin;
+      const checking = referrer || origin;
       const isSafe = secureDomains.some((domain) =>
         think.isFunction(domain.test) ? domain.test(checking) : domain === checking,
       );
@@ -84,8 +86,8 @@ module.exports = class extends think.Logic {
 
     try {
       userId = jwt.verify(token, think.config('jwtKey'));
-    } catch (e) {
-      think.logger.debug(e);
+    } catch (err) {
+      think.logger.debug(err);
     }
 
     if (think.isEmpty(userId) || !think.isString(userId)) {
@@ -93,7 +95,7 @@ module.exports = class extends think.Logic {
     }
 
     const user = await this.modelInstance.select(
-      { objectId: userId },
+      { objectId: userId, type: ['!=', 'banned'] },
       {
         field: [
           'id',
@@ -113,19 +115,19 @@ module.exports = class extends think.Logic {
       return;
     }
 
-    const userInfo = user[0];
+    const [userInfo] = user;
 
-    let avatarUrl = userInfo.avatar
-      ? userInfo.avatar
-      : await think.service('avatar').stringify({
-          mail: userInfo.email,
-          nick: userInfo.display_name,
-          link: userInfo.url,
-        });
+    let avatarUrl =
+      userInfo.avatar ||
+      (await think.service('avatar').stringify({
+        mail: userInfo.email,
+        nick: userInfo.display_name,
+        link: userInfo.url,
+      }));
     const { avatarProxy } = think.config();
 
     if (avatarProxy) {
-      avatarUrl = avatarProxy + '?url=' + encodeURIComponent(avatarUrl);
+      avatarUrl = `${avatarProxy}?url=${encodeURIComponent(avatarUrl)}`;
     }
     userInfo.avatar = avatarUrl;
     this.ctx.state.userInfo = userInfo;
@@ -136,7 +138,7 @@ module.exports = class extends think.Logic {
     const filename = this.__filename || __filename;
     const last = filename.lastIndexOf(path.sep);
 
-    return filename.substr(last + 1, filename.length - last - 4);
+    return filename.slice(last + 1, filename.length - last - 4);
   }
 
   getId() {
@@ -193,7 +195,7 @@ module.exports = class extends think.Logic {
       remoteip: this.ctx.ip,
     });
 
-    const requestUrl = method === 'GET' ? api + '?' + query : api;
+    const requestUrl = method === 'GET' ? `${api}?${query}` : api;
     const options =
       method === 'GET'
         ? {}

package/src/logic/comment.js

@@ -1,6 +1,6 @@
 const Base = require('./base.js');
 
-module.exports = class extends Base {
+module.exports = class CommentLogic extends Base {
   checkAdmin() {
     const { userInfo } = this.ctx.state;
 
@@ -117,7 +117,7 @@ module.exports = class extends Base {
     }
 
     switch (type) {
-      case 'recent':
+      case 'recent': {
         this.rules = {
           count: {
             int: { max: 50 },
@@ -125,14 +125,16 @@ module.exports = class extends Base {
           },
         };
         break;
+      }
 
-      case 'count':
+      case 'count': {
         this.rules = {
           url: {
             array: true,
           },
         };
         break;
+      }
 
       case 'list': {
         const { userInfo } = this.ctx.state;
@@ -153,7 +155,7 @@ module.exports = class extends Base {
         break;
       }
 
-      default:
+      default: {
         this.rules = {
           path: {
             string: true,
@@ -173,6 +175,7 @@ module.exports = class extends Base {
           },
         };
         break;
+      }
     }
   }
 

package/src/logic/db.js

@@ -1,6 +1,6 @@
 const Base = require('./base.js');
 
-module.exports = class extends Base {
+module.exports = class DatabaseLogic extends Base {
   async __before(...args) {
     await super.__before(...args);
 

package/src/logic/token.js

@@ -34,8 +34,8 @@ module.exports = class extends Base {
    * @apiSuccess  (200) {Number}  errno 0
    * @apiSuccess  (200) {String}  errmsg  return error message if error
    */
-  postAction() {
-    return this.useCaptchaCheck();
+  async postAction() {
+    await this.useCaptchaCheck();
   }
 
   /**

package/src/logic/user.js

@@ -121,4 +121,29 @@ module.exports = class extends Base {
       },
     };
   }
+
+  /**
+   * @api {DELETE} /api/user delete user account when user is in verify status, or forbid user to login when user is other status.
+   * @apiGroup User
+   * @apiVersion  0.0.1
+   *
+   * @apiParam  {String}  id user id
+   * @apiParam  {String}  lang  language
+   *
+   * @apiSuccess  (200) {Number}  errno 0
+   * @apiSuccess  (200) {String}  errmsg  return error message if error
+   */
+  deleteAction() {
+    // you need to be logged in to delete users
+    const { userInfo } = this.ctx.state;
+
+    if (think.isEmpty(userInfo)) {
+      return this.fail();
+    }
+
+    // you must be an administrator to delete other users and cannot delete yourself
+    if (userInfo.type !== 'administrator' || this.id === userInfo.objectId) {
+      return this.fail();
+    }
+  }
 };

package/src/middleware/dashboard.js

@@ -1,3 +1,4 @@
+// oxlint-disable-next-line func-names
 module.exports = function () {
   return (ctx) => {
     ctx.type = 'html';

package/src/middleware/plugin.js

@@ -3,7 +3,7 @@ const compose = require('koa-compose');
 module.exports = () => async (ctx, next) => {
   const middlewares = think.getPluginMiddlewares();
 
-  if (!think.isArray(middlewares) || !middlewares.length) {
+  if (!think.isArray(middlewares) || middlewares.length === 0) {
     return next();
   }
 

package/src/service/akismet.js

@@ -2,6 +2,7 @@ const Akismet = require('akismet');
 
 const DEFAULT_KEY = '70542d86693e';
 
+// oxlint-disable-next-line func-names
 module.exports = function (comment, blog) {
   let { AKISMET_KEY, SITE_URL } = process.env;
 
@@ -13,14 +14,18 @@ module.exports = function (comment, blog) {
     return Promise.resolve(false);
   }
 
+  // oxlint-disable-next-line func-names
   return new Promise(function (resolve, reject) {
     const akismet = Akismet.client({ blog, apiKey: AKISMET_KEY });
 
+    // oxlint-disable-next-line func-names
     akismet.verifyKey(function (err, verifyKey) {
       if (err) {
-        return reject(err);
+        reject(err);
+        return;
       } else if (!verifyKey) {
-        return reject(new Error('Akismet API_KEY verify failed!'));
+        reject(new Error('Akismet API_KEY verify failed!'));
+        return;
       }
 
       akismet.checkComment(
@@ -30,9 +35,11 @@ module.exports = function (comment, blog) {
           comment_author: comment.nick,
           comment_content: comment.comment,
         },
+        // oxlint-disable-next-line func-names
         function (err, spam) {
           if (err) {
-            return reject(err);
+            reject(err);
+            return;
           }
           resolve(spam);
         },

package/src/service/avatar.js

@@ -1,4 +1,4 @@
-const crypto = require('crypto');
+const crypto = require('node:crypto');
 
 const nunjucks = require('nunjucks');
 const helper = require('think-helper');

package/src/service/markdown/highlight.js

@@ -7,7 +7,7 @@ rawLoadLanguages.silent = true;
 const loadLanguages = (languages = []) => {
   const langsToLoad = languages.filter((item) => !prism.languages[item]);
 
-  if (langsToLoad.length) {
+  if (langsToLoad.length > 0) {
     rawLoadLanguages(langsToLoad);
   }
 };

package/src/service/markdown/utils.js

@@ -1,10 +1,10 @@
 const escapeHtml = (unsafeHTML) =>
   unsafeHTML
-    .replace(/&/gu, '&')
-    .replace(/</gu, '&lt;')
-    .replace(/>/gu, '&gt;')
-    .replace(/"/gu, '&quot;')
-    .replace(/'/gu, '&#039;');
+    .replaceAll('&', '&amp;')
+    .replaceAll('<', '&lt;')
+    .replaceAll('>', '&gt;')
+    .replaceAll('"', '&quot;')
+    .replaceAll("'", '&#039;');
 
 module.exports = {
   escapeHtml,

package/src/service/markdown/xss.js

@@ -28,16 +28,11 @@ DOMPurify.addHook('afterSanitizeAttributes', (node) => {
 });
 
 const sanitize = (content) =>
-  DOMPurify.sanitize(
-    content,
-    Object.assign(
-      {
-        FORBID_TAGS: ['form', 'input', 'style'],
-        FORBID_ATTR: ['autoplay', 'style'],
-      },
-      think.config('domPurify') || {},
-    ),
-  );
+  DOMPurify.sanitize(content, {
+    FORBID_TAGS: ['form', 'input', 'style'],
+    FORBID_ATTR: ['autoplay', 'style'],
+    ...think.config('domPurify'),
+  });
 
 module.exports = {
   sanitize,