@waline/vercel 1.32.7 → 1.33.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@waline/vercel",
-  "version": "1.32.7",
+  "version": "1.33.0",
   "description": "vercel server for waline comment system",
   "keywords": [
     "waline",
@@ -18,7 +18,7 @@
     "dev": "node development.js 9090"
   },
   "dependencies": {
-    "@cloudbase/node-sdk": "^3.10.1",
+    "@cloudbase/node-sdk": "^3.14.1",
     "@koa/cors": "^5.0.0",
     "@mdit/plugin-katex": "0.23.4-cjs.0",
     "@mdit/plugin-mathjax": "0.23.4-cjs.0",
@@ -26,18 +26,18 @@
     "@mdit/plugin-sup": "0.22.5-cjs.0",
     "akismet": "^2.0.7",
     "deta": "^2.0.0",
-    "dompurify": "^3.2.7",
+    "dompurify": "^3.3.0",
     "dy-node-ip2region": "^1.0.1",
     "fast-csv": "^5.0.5",
     "form-data": "^4.0.4",
-    "jsdom": "^27.0.0",
+    "jsdom": "^19.0.0",
     "jsonwebtoken": "^9.0.2",
     "koa-compose": "^4.1.0",
     "leancloud-storage": "^4.15.2",
     "markdown-it": "^14.1.0",
     "markdown-it-emoji": "^3.0.0",
     "mathjax-full": "^3.2.2",
-    "nodemailer": "^7.0.9",
+    "nodemailer": "^7.0.10",
     "nunjucks": "^3.2.4",
     "phpass": "^0.1.1",
     "prismjs": "^1.30.0",

package/src/controller/article.js

@@ -84,7 +84,7 @@ module.exports = class extends BaseRest {
         { access: { read: true, write: true } },
       );
 
-      return this.jsonOrSuccess(deprecated ? count : [count]);
+      return this.jsonOrSuccess(deprecated ? count : [{ [type]: count }]);
     }
 
     const ret = await this.modelInstance.update(

package/src/controller/oauth.js

@@ -15,12 +15,17 @@ module.exports = class extends think.Controller {
 
     if (!hasCode) {
       const { serverURL } = this.ctx;
-      const redirectUrl = think.buildUrl(`${serverURL}/api/oauth`, {redirect, type});
+      const redirectUrl = think.buildUrl(`${serverURL}/api/oauth`, {
+        redirect,
+        type,
+      });
 
-      return this.redirect(think.buildUrl(`${oauthUrl}/${type}`, {
-        redirect: redirectUrl, 
-        state: this.ctx.state.token || ''
-      }));
+      return this.redirect(
+        think.buildUrl(`${oauthUrl}/${type}`, {
+          redirect: redirectUrl,
+          state: this.ctx.state.token || '',
+        }),
+      );
     }
 
     /**
@@ -30,7 +35,10 @@ module.exports = class extends think.Controller {
 
     if (type === 'facebook') {
       const { serverURL } = this.ctx;
-      const redirectUrl = think.buildUrl(`${serverURL}/api/oauth`, {redirect, type});
+      const redirectUrl = think.buildUrl(`${serverURL}/api/oauth`, {
+        redirect,
+        type,
+      });
 
       params.state = think.buildUrl(undefined, {
         redirect: redirectUrl,
@@ -38,15 +46,12 @@ module.exports = class extends think.Controller {
       });
     }
 
-    const user = await fetch(
-      think.buildUrl(`${oauthUrl}/${type}`, params),
-      {
-        method: 'GET',
-        headers: {
-          'user-agent': '@waline',
-        },
+    const user = await fetch(think.buildUrl(`${oauthUrl}/${type}`, params), {
+      method: 'GET',
+      headers: {
+        'user-agent': '@waline',
       },
-    ).then((resp) => resp.json());
+    }).then((resp) => resp.json());
 
     if (!user?.id) {
       return this.fail(user);

package/src/controller/user.js

@@ -91,7 +91,10 @@ module.exports = class extends BaseRest {
 
     try {
       const notify = this.service('notify', this);
-      const apiUrl = think.buildUrl(this.ctx.serverURL + '/verification', { token, email: data.email });
+      const apiUrl = think.buildUrl(this.ctx.serverURL + '/verification', {
+        token,
+        email: data.email,
+      });
 
       await notify.transporter.sendMail({
         from:

package/src/extend/think.js

@@ -157,7 +157,7 @@ module.exports = {
   buildUrl(path, query = {}) {
     const notEmptyQuery = {};
 
-    for(const key in query) {
+    for (const key in query) {
       if (!query[key]) {
         continue;
       }
@@ -176,5 +176,5 @@ module.exports = {
     }
 
     return destUrl;
-  }
+  },
 };

package/src/locales/index.js

@@ -1,4 +1,5 @@
 const en = require('./en.json');
+const it = require('./it.json');
 const zhCN = require('./zh-CN.json');
 const zhTW = require('./zh-TW.json');
 
@@ -9,4 +10,6 @@ module.exports = {
   'en-us': en,
   jp: en,
   'jp-jp': en,
+  it,
+  'it-it': it,
 };

package/src/locales/it.json

@@ -0,0 +1,19 @@
+{
+  "import data format not support!": "Formato dati di importazione non supportato",
+  "USER_EXIST": "L'utente esiste già",
+  "USER_NOT_EXIST": "L'utente non esiste",
+  "USER_REGISTERED": "L'utente si è registrato",
+  "TOKEN_EXPIRED": "Il token è scaduto",
+  "TWO_FACTOR_AUTH_ERROR_DETAIL": "Verifica in due passaggi non riuscita",
+  "[{{name | safe}}] Registration Confirm Mail": "[{{name | safe}}] Email di conferma registrazione",
+  "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.": "Clicca su <a href=\"{{url}}\">{{url}}<a/> per confermare la registrazione. Il link è valido per 1 ora. Se non sei stato tu a richiedere la registrazione, ignora questa email.",
+  "[{{name | safe}}] Reset Password": "[{{name | safe}}] Reimposta password",
+  "Please click <a href=\"{{url}}\">{{url}}</a> to login and change your password as soon as possible!": "Clicca su <a href=\"{{url}}\">{{url}}</a> per effettuare il login e cambiare la password il prima possibile.",
+  "Duplicate Content": "Contenuto duplicato",
+  "Comment too fast": "Stai commentando troppo velocemente",
+  "Registration confirm mail send failed, please {%- if isAdmin -%}check your mail configuration{%- else -%}check your email address and contact administrator{%- endif -%}.": "Impossibile inviare l'e-mail di conferma della registrazione. {%- if isAdmin -%}Controlla la configurazione della tua posta elettronica{%- else -%}Controlla il tuo indirizzo e-mail e contatta l'amministratore{%- endif -%}.",
+  "MAIL_SUBJECT": "Il tuo commento {{site.name | safe}} ha ricevuto una risposta",
+  "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;'> Il tuo commento su <a style='text-decoration:none;color: #12ADDB;' href='{{site.url}}' target='_blank'>{{site.name}}</a> ha ricevuto una risposta </h2>{{parent.nick}}. Tu hai scritto: <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> ha risposto:</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'>Visualizza la risposta completa</a> oppure vai su <a style='text-decoration:none; color:#12addb' href='{{site.url}}' target='_blank'>{{site.name}}</a>.</p><br/> </div></div>",
+  "MAIL_SUBJECT_ADMIN": "Nuovo commento su {{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;'> Nuovo commento su <a style='text-decoration:none;color: #12ADDB;' href='{{site.url}}' target='_blank'>{{site.name}}</a> </h2> <p><strong>{{self.nick}}</strong> ha scritto:</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'>Vai alla pagina</a></p><br/></div>"
+}