artalk 2.5.4 → 2.5.5

package/dist/Artalk.es.js

@@ -136,7 +136,8 @@ function onImagesLoaded($container, event) {
   }
 }
 function getGravatarURL(ctx, emailMD5) {
-  return `${ctx.conf.gravatar.mirror.replace(/\/$/, "")}/${emailMD5}?d=${encodeURIComponent(ctx.conf.gravatar.default)}&s=80`;
+  const { mirror, params } = ctx.conf.gravatar;
+  return `${mirror.replace(/\/$/, "")}/${emailMD5}?${params.replace(/^\?/, "")}`;
 }
 function versionCompare(a, b) {
   const pa = a.split(".");
@@ -732,10 +733,34 @@ function findClosingBracket(str, b) {
   }
   return -1;
 }
-function checkSanitizeDeprecation(opt) {
-  if (opt && opt.sanitize && !opt.silent) {
+function checkDeprecations(opt, callback) {
+  if (!opt || opt.silent) {
+    return;
+  }
+  if (callback) {
+    console.warn("marked(): callback is deprecated since version 5.0.0, should not be used and will be removed in the future. Read more here: https://marked.js.org/using_pro#async");
+  }
+  if (opt.sanitize || opt.sanitizer) {
     console.warn("marked(): sanitize and sanitizer parameters are deprecated since version 0.7.0, should not be used and will be removed in the future. Read more here: https://marked.js.org/#/USING_ADVANCED.md#options");
   }
+  if (opt.highlight || opt.langPrefix !== "language-") {
+    console.warn("marked(): highlight and langPrefix parameters are deprecated since version 5.0.0, should not be used and will be removed in the future. Instead use https://www.npmjs.com/package/marked-highlight.");
+  }
+  if (opt.mangle) {
+    console.warn("marked(): mangle parameter is deprecated since version 5.0.0, should not be used and will be removed in the future. Instead use https://www.npmjs.com/package/marked-mangle.");
+  }
+  if (opt.baseUrl) {
+    console.warn("marked(): baseUrl parameter is deprecated since version 5.0.0, should not be used and will be removed in the future. Instead use https://www.npmjs.com/package/marked-base-url.");
+  }
+  if (opt.smartypants) {
+    console.warn("marked(): smartypants parameter is deprecated since version 5.0.0, should not be used and will be removed in the future. Instead use https://www.npmjs.com/package/marked-smartypants.");
+  }
+  if (opt.xhtml) {
+    console.warn("marked(): xhtml parameter is deprecated since version 5.0.0, should not be used and will be removed in the future. Instead use https://www.npmjs.com/package/marked-xhtml.");
+  }
+  if (opt.headerIds || opt.headerPrefix) {
+    console.warn("marked(): headerIds and headerPrefix parameters are deprecated since version 5.0.0, should not be used and will be removed in the future. Instead use https://www.npmjs.com/package/marked-gfm-heading-id.");
+  }
 }
 function repeatString(pattern, count) {
   if (count < 1) {
@@ -1025,6 +1050,7 @@ class Tokenizer {
     if (cap) {
       const token = {
         type: "html",
+        block: true,
         raw: cap[0],
         pre: !this.options.sanitizer && (cap[1] === "pre" || cap[1] === "script" || cap[1] === "style"),
         text: cap[0]
@@ -1163,6 +1189,7 @@ class Tokenizer {
         raw: cap[0],
         inLink: this.lexer.state.inLink,
         inRawBlock: this.lexer.state.inRawBlock,
+        block: false,
         text: this.options.sanitize ? this.options.sanitizer ? this.options.sanitizer(cap[0]) : escape(cap[0]) : cap[0]
       };
     }
@@ -1929,7 +1956,7 @@ class Renderer {
 ${quote}</blockquote>
 `;
   }
-  html(html) {
+  html(html, block2) {
     return html;
   }
   /**
@@ -2264,7 +2291,7 @@ class Parser {
           continue;
         }
         case "html": {
-          out += this.renderer.html(token.text);
+          out += this.renderer.html(token.text, token.block);
           continue;
         }
         case "paragraph": {
@@ -2424,7 +2451,7 @@ function parseMarkdown(lexer, parser2) {
     if (typeof src !== "string") {
       return throwError(new Error("marked(): input parameter is of type " + Object.prototype.toString.call(src) + ", string expected"));
     }
-    checkSanitizeDeprecation(opt);
+    checkDeprecations(opt, callback);
     if (opt.hooks) {
       opt.hooks.options = opt;
     }
@@ -2695,6 +2722,9 @@ marked$1.parseInline;
 Parser.parse;
 Lexer.lex;
 var commonjsGlobal = typeof globalThis !== "undefined" ? globalThis : typeof window !== "undefined" ? window : typeof global !== "undefined" ? global : typeof self !== "undefined" ? self : {};
+function getDefaultExportFromCjs(x) {
+  return x && x.__esModule && Object.prototype.hasOwnProperty.call(x, "default") ? x["default"] : x;
+}
 var escapes = {
   "&": "&amp;",
   "<": "&lt;",
@@ -3084,15 +3114,8 @@ function insane(html, options, strict) {
 }
 insane.defaults = defaults$1;
 var insane_1 = insane;
-var hanabiExports = {};
-var hanabi$1 = {
-  get exports() {
-    return hanabiExports;
-  },
-  set exports(v) {
-    hanabiExports = v;
-  }
-};
+const insane$1 = /* @__PURE__ */ getDefaultExportFromCjs(insane_1);
+var hanabi$1 = { exports: {} };
 (function(module, exports) {
   (function(global2, factory) {
     module.exports = factory();
@@ -3148,7 +3171,8 @@ var hanabi$1 = {
     return index;
   });
 })(hanabi$1);
-const hanabi = hanabiExports;
+var hanabiExports = hanabi$1.exports;
+const hanabi = /* @__PURE__ */ getDefaultExportFromCjs(hanabiExports);
 let instance;
 function getInstance() {
   return instance;
@@ -3201,7 +3225,7 @@ function marked(ctx, src) {
   if (!markedContent) {
     markedContent = src.replace(/```\s*([^]+?.*?[^]+?[^]+?)```/g, (_, code) => `<pre><code>${hanabi(code)}</code></pre>`).replace(/!\[(.*?)\]\((.*?)\)/g, (_, alt, imgSrc) => `<img src="${imgSrc}" alt="${alt}" />`).replace(/\[(.*?)\]\((.*?)\)/g, (_, text, link) => `<a href="${link}" target="_blank">${text}</a>`).replace(/\n/g, "<br>");
   }
-  let dest = insane_1(markedContent, {
+  let dest = insane$1(markedContent, {
     allowedClasses: {},
     // @refer CVE-2018-8495
     // @link https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2018-8495
@@ -3472,7 +3496,7 @@ function t(key, args = {}) {
   str = str.replace(/\{\s*(\w+?)\s*\}/g, (_, token) => args[token] || "");
   return str;
 }
-const version = "2.5.4";
+const version = "2.5.5";
 class User {
   constructor() {
     __publicField(this, "ctx");
@@ -5000,8 +5024,8 @@ const defaults = {
   countEl: "#ArtalkCount",
   pvEl: "#ArtalkPV",
   gravatar: {
-    default: "mp",
-    mirror: "https://cravatar.cn/avatar/"
+    mirror: "https://cravatar.cn/avatar/",
+    params: "d=mp&s=240"
   },
   pagination: {
     pageSize: 20,
@@ -7695,10 +7719,12 @@ function Do(m) {
     } catch (err) {
       console.error(err);
       m.editor.showNotify(`${m.editor.$t("commentFail")}，${err.msg || String(err)}`, "e");
+      return;
+    } finally {
+      m.editor.hideLoading();
     }
     m.editor.reset();
     m.editor.ctx.trigger("editor-submitted");
-    m.editor.hideLoading();
   });
 }
 function getSubmitAddParams(m) {