@waline/vercel 1.31.14 → 1.32.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@waline/vercel",
-  "version": "1.31.14",
+  "version": "1.32.0",
   "description": "vercel server for waline comment system",
   "keywords": [
     "waline",
@@ -23,11 +23,11 @@
     "@mdit/plugin-sup": "0.8.0",
     "akismet": "^2.0.7",
     "deta": "^2.0.0",
-    "dompurify": "^3.1.3",
+    "dompurify": "^3.1.4",
     "dy-node-ip2region": "^1.0.1",
     "fast-csv": "^5.0.1",
     "form-data": "^4.0.0",
-    "jsdom": "^24.0.0",
+    "jsdom": "^24.1.0",
     "jsonwebtoken": "^9.0.2",
     "katex": "^0.16.10",
     "koa-compose": "^4.1.0",

package/src/controller/article.js

@@ -18,14 +18,28 @@ module.exports = class extends BaseRest {
     const resp = await this.modelInstance.select({ url: ['IN', path] });
 
     if (think.isEmpty(resp)) {
-      const data = type.reduce((o, field) => {
-        o[field] = 0;
-
-        return o;
-      }, {});
+      const counters = new Array(path.length).fill(
+        type.length === 1 && deprecated
+          ? 0
+          : type.reduce((o, field) => {
+              o[field] = 0;
+
+              return o;
+            }, {}),
+      );
 
+      // - deprecated:
+      //   - single path and single type: 0
+      //   - single path and multiple type: {[type]: 0}
+      //   - multiple path and single type: [0, 0]
+      //   - multiple path and multiple type: [{[type]: 0},{[type]: 0}]
+      // - latest
+      //   - single path and single type: [{[type]: 0}]
+      //   - single path and multiple type: [{[type]: 0}]
+      //   - multiple path and single type: [{[type]: 0}]
+      //   - multiple path and multiple type: [{[type]: 0}]
       return this.jsonOrSuccess(
-        type.length === 1 && deprecated ? data[type[0]] : data,
+        path.length === 1 && deprecated ? counters[0] : counters,
       );
     }
 

package/src/controller/comment.js

@@ -575,10 +575,15 @@ module.exports = class extends BaseRest {
           cmt.children.forEach((c) => {
             const parent = childCommentsMap.get(c.pid);
 
+            // fix https://github.com/walinejs/waline/issues/2518 avoid some abnormal comment data
+            if (!parent) {
+              return;
+            }
+
             c.reply_user = {
-              nick: parent.nick,
-              link: parent.link,
-              avatar: parent.avatar,
+              nick: parent?.nick,
+              link: parent?.link,
+              avatar: parent?.avatar,
             };
           });
 

package/src/extend/controller.js

@@ -1,7 +1,9 @@
 const nunjucks = require('nunjucks');
 const { PasswordHash } = require('phpass');
 
-const locales = require('../locales/index.js');
+const defaultLocales = require('../locales/index.js');
+
+const defaultLang = 'en-us';
 
 module.exports = {
   success(...args) {
@@ -18,11 +20,19 @@ module.exports = {
     return this[this.ctx.state.deprecated ? 'json' : 'success'](...args);
   },
   locale(message, variables) {
-    const { lang } = this.get();
-    const locale = locales[(lang || 'zh-cn').toLowerCase()] || locales['zh-cn'];
+    const { userLang } = this.get();
+    const lang = (userLang || defaultLang).toLowerCase();
+
+    const customLocales = this.config('locales');
+    const locales = customLocales || defaultLocales;
+
+    const localMessage =
+      locales?.[lang]?.[message] ||
+      defaultLocales?.[lang]?.[message] ||
+      defaultLocales[defaultLang][message];
 
-    if (locale?.[message]) {
-      message = locale[message];
+    if (localMessage) {
+      message = localMessage;
     }
 
     return nunjucks.renderString(message, variables);

package/src/service/markdown/index.js

@@ -1,14 +1,11 @@
 const { katex: katexPlugin } = require('@mdit/plugin-katex');
-const {
-  createMathjaxInstance,
-  mathjax: mathjaxPlugin,
-} = require('@mdit/plugin-mathjax');
 const { sub: subPlugin } = require('@mdit/plugin-sub');
 const { sup: supPlugin } = require('@mdit/plugin-sup');
 const MarkdownIt = require('markdown-it');
 const emojiPlugin = require('markdown-it-emoji');
 
 const { resolveHighlighter } = require('./highlight.js');
+const { mathjaxPlugin } = require('./mathjax.js');
 const { sanitize } = require('./xss.js');
 
 const getMarkdownParser = () => {
@@ -58,10 +55,7 @@ const getMarkdownParser = () => {
       output: 'mathml',
     });
   } else if (tex !== false) {
-    markdownIt.use(
-      mathjaxPlugin,
-      createMathjaxInstance({ ...mathjax, output: 'svg' }),
-    );
+    markdownIt.use(mathjaxPlugin, mathjax);
   }
 
   return (content) => sanitize(markdownIt.render(content));