artalk 2.8.5 → 2.8.6

package/dist/Artalk.mjs

@@ -155,11 +155,14 @@ class HttpClient {
         /* Json */
       ];
       const responseFormat = format || requestParams.format;
-      return this.customFetch(`${baseUrl || this.baseUrl || ""}${path}${queryString ? `?${queryString}` : ""}`, __spreadProps(__spreadValues({}, requestParams), {
-        headers: __spreadValues(__spreadValues({}, requestParams.headers || {}), type && type !== "multipart/form-data" ? { "Content-Type": type } : {}),
-        signal: (cancelToken ? this.createAbortSignal(cancelToken) : requestParams.signal) || null,
-        body: typeof body === "undefined" || body === null ? null : payloadFormatter(body)
-      })).then((response) => __async(this, null, function* () {
+      return this.customFetch(
+        `${baseUrl || this.baseUrl || ""}${path}${queryString ? `?${queryString}` : ""}`,
+        __spreadProps(__spreadValues({}, requestParams), {
+          headers: __spreadValues(__spreadValues({}, requestParams.headers || {}), type && type !== "multipart/form-data" ? { "Content-Type": type } : {}),
+          signal: (cancelToken ? this.createAbortSignal(cancelToken) : requestParams.signal) || null,
+          body: typeof body === "undefined" || body === null ? null : payloadFormatter(body)
+        })
+      ).then((response) => __async(this, null, function* () {
         const r = response;
         r.data = null;
         r.error = null;
@@ -198,7 +201,9 @@ class HttpClient {
   toQueryString(rawQuery) {
     const query = rawQuery || {};
     const keys = Object.keys(query).filter((key) => "undefined" !== typeof query[key]);
-    return keys.map((key) => Array.isArray(query[key]) ? this.addArrayQueryParam(query, key) : this.addQueryParam(query, key)).join("&");
+    return keys.map(
+      (key) => Array.isArray(query[key]) ? this.addArrayQueryParam(query, key) : this.addQueryParam(query, key)
+    ).join("&");
   }
   addQueryParams(rawQuery) {
     const queryString = this.toQueryString(rawQuery);
@@ -222,6 +227,133 @@ class HttpClient {
 let Api$1 = class Api extends HttpClient {
   constructor() {
     super(...arguments);
+    __publicField(this, "auth", {
+      /**
+       * @description Login by email with verify code (Need send email verify code first) or password
+       *
+       * @tags Auth
+       * @name LoginByEmail
+       * @summary Login by email
+       * @request POST:/auth/email/login
+       * @response `200` `HandlerResponseUserLogin` OK
+       * @response `400` `(HandlerMap & {
+          msg?: string,
+      
+      })` Bad Request
+       * @response `500` `(HandlerMap & {
+          msg?: string,
+      
+      })` Internal Server Error
+       */
+      loginByEmail: (data, params = {}) => this.request(__spreadValues({
+        path: `/auth/email/login`,
+        method: "POST",
+        body: data,
+        type: "application/json",
+        format: "json"
+      }, params)),
+      /**
+       * @description Register by email and verify code (if user exists, will update user, like forget password. Need send email verify code first)
+       *
+       * @tags Auth
+       * @name RegisterByEmail
+       * @summary Register by email
+       * @request POST:/auth/email/register
+       * @response `200` `HandlerResponseUserLogin` OK
+       * @response `400` `(HandlerMap & {
+          msg?: string,
+      
+      })` Bad Request
+       * @response `500` `(HandlerMap & {
+          msg?: string,
+      
+      })` Internal Server Error
+       */
+      registerByEmail: (data, params = {}) => this.request(__spreadValues({
+        path: `/auth/email/register`,
+        method: "POST",
+        body: data,
+        type: "application/json",
+        format: "json"
+      }, params)),
+      /**
+       * @description Send email including verify code to user
+       *
+       * @tags Auth
+       * @name SendVerifyEmail
+       * @summary Send verify email
+       * @request POST:/auth/email/send
+       * @response `200` `(HandlerMap & {
+          msg?: string,
+      
+      })` OK
+       * @response `400` `(HandlerMap & {
+          msg?: string,
+      
+      })` Bad Request
+       * @response `500` `(HandlerMap & {
+          msg?: string,
+      
+      })` Internal Server Error
+       */
+      sendVerifyEmail: (data, params = {}) => this.request(__spreadValues({
+        path: `/auth/email/send`,
+        method: "POST",
+        body: data,
+        type: "application/json",
+        format: "json"
+      }, params)),
+      /**
+       * @description Get all users with same email, if there are more than one user with same email, need merge
+       *
+       * @tags Auth
+       * @name CheckDataMerge
+       * @summary Check data merge
+       * @request GET:/auth/merge
+       * @secure
+       * @response `200` `HandlerResponseAuthDataMergeCheck` OK
+       * @response `400` `(HandlerMap & {
+          msg?: string,
+      
+      })` Bad Request
+       * @response `500` `(HandlerMap & {
+          msg?: string,
+      
+      })` Internal Server Error
+       */
+      checkDataMerge: (params = {}) => this.request(__spreadValues({
+        path: `/auth/merge`,
+        method: "GET",
+        secure: true,
+        format: "json"
+      }, params)),
+      /**
+       * @description This function is to solve the problem of multiple users with the same email address, should be called after user login and then check, and perform data merge.
+       *
+       * @tags Auth
+       * @name ApplyDataMerge
+       * @summary Apply data merge
+       * @request POST:/auth/merge
+       * @secure
+       * @response `200` `HandlerResponseAuthDataMergeApply` OK
+       * @response `400` `(HandlerMap & {
+          msg?: string,
+      
+      })` Bad Request
+       * @response `500` `(HandlerMap & {
+          msg?: string,
+      
+      })` Internal Server Error
+       */
+      applyDataMerge: (data, params = {}) => this.request(__spreadValues({
+        path: `/auth/merge`,
+        method: "POST",
+        body: data,
+        secure: true,
+        type: "application/json",
+        format: "json"
+      }, params))
+    });
     __publicField(this, "cache", {
       /**
        * @description Flush all cache on the server
@@ -482,6 +614,24 @@ let Api$1 = class Api extends HttpClient {
         method: "GET",
         format: "json"
       }, params)),
+      /**
+       * @description Get social login providers
+       *
+       * @tags System
+       * @name GetSocialLoginProviders
+       * @summary Get Social Login Providers
+       * @request GET:/conf/auth/providers
+       * @response `200` `HandlerResponseConfAuthProviders` OK
+       * @response `404` `(HandlerMap & {
+          msg?: string,
+      
+      })` Not Found
+       */
+      getSocialLoginProviders: (params = {}) => this.request(__spreadValues({
+        path: `/conf/auth/providers`,
+        method: "GET",
+        format: "json"
+      }, params)),
       /**
        * @description Get Domain Info
        *
@@ -1341,8 +1491,6 @@ function getDefaultExportFromCjs(x) {
   function _createClass(Constructor, protoProps, staticProps) {
     if (protoProps)
       _defineProperties(Constructor.prototype, protoProps);
-    if (staticProps)
-      _defineProperties(Constructor, staticProps);
     Object.defineProperty(Constructor, "prototype", {
       writable: false
     });
@@ -2057,7 +2205,8 @@ class _Tokenizer {
   blockquote(src) {
     const cap = this.rules.block.blockquote.exec(src);
     if (cap) {
-      const text = rtrim(cap[0].replace(/^ *>[ \t]?/gm, ""), "\n");
+      let text = cap[0].replace(/\n {0,3}((?:=+|-+) *)(?=\n|$)/g, "\n    $1");
+      text = rtrim(text.replace(/^ *>[ \t]?/gm, ""), "\n");
       const top = this.lexer.state.top;
       this.lexer.state.top = true;
       const tokens = this.lexer.blockTokens(text);
@@ -4249,7 +4398,7 @@ const insaneOptions = {
   allowedAttributes: {
     "*": ["title", "accesskey"],
     a: ["href", "name", "target", "aria-label", "rel"],
-    img: ["src", "alt", "title", "atk-emoticon", "aria-label"],
+    img: ["src", "alt", "title", "atk-emoticon", "aria-label", "data-src", "class", "loading"],
     // for code highlight
     code: ["class"],
     span: ["class", "style"]
@@ -4257,7 +4406,8 @@ const insaneOptions = {
   filter: (node) => {
     const allowed = [
       ["code", /^hljs\W+language-(.*)$/],
-      ["span", /^(hljs-.*)$/]
+      ["span", /^(hljs-.*)$/],
+      ["img", /^lazyload$/]
     ];
     allowed.forEach(([tag2, reg]) => {
       if (node.tag === tag2 && !!node.attrs.class && !reg.test(node.attrs.class)) {
@@ -4334,18 +4484,26 @@ const hanabi = /* @__PURE__ */ getDefaultExportFromCjs(hanabiExports);
 function renderCode(code) {
   return hanabi(code);
 }
-function getRenderer() {
+function getRenderer(options) {
   const renderer = new marked$1.Renderer();
   renderer.link = markedLinkRenderer(renderer, renderer.link);
   renderer.code = markedCodeRenderer();
+  renderer.image = markedImageRenderer(renderer, renderer.image, options);
   return renderer;
 }
 const markedLinkRenderer = (renderer, orgLinkRenderer) => (href, title, text) => {
-  const localLink = href == null ? void 0 : href.startsWith(`${window.location.protocol}//${window.location.hostname}`);
+  const getLinkOrigin = (link2) => {
+    try {
+      return new URL(link2).origin;
+    } catch (e) {
+      return "";
+    }
+  };
+  const isSameOriginLink = getLinkOrigin(href) === window.location.origin;
   const html2 = orgLinkRenderer.call(renderer, href, title, text);
   return html2.replace(
     /^<a /,
-    `<a target="_blank" ${!localLink ? `rel="noreferrer noopener nofollow"` : ""} `
+    `<a target="_blank" ${!isSameOriginLink ? `rel="noreferrer noopener nofollow"` : ""} `
   );
 };
 const markedCodeRenderer = () => (block2, lang) => {
@@ -4362,6 +4520,16 @@ const markedCodeRenderer = () => (block2, lang) => {
 <code class="hljs language-${realLang}">${colorized.replace(/&amp;/g, "&")}</code>
 </pre>`;
 };
+const markedImageRenderer = (renderer, orgImageRenderer, { imgLazyLoad }) => (href, title, text) => {
+  const html2 = orgImageRenderer.call(renderer, href, title, text);
+  if (!imgLazyLoad)
+    return html2;
+  if (imgLazyLoad === "native" || imgLazyLoad === true)
+    return html2.replace(/^<img /, '<img class="lazyload" loading="lazy" ');
+  if (imgLazyLoad === "data-src")
+    return html2.replace(/^<img /, '<img class="lazyload" ').replace("src=", "data-src=");
+  return html2;
+};
 let instance;
 let replacers = [];
 const markedOptions = {
@@ -4375,16 +4543,18 @@ function getInstance() {
 function setReplacers(arr) {
   replacers = arr;
 }
-function initMarked() {
+function initMarked(options) {
   try {
     if (!marked$1.name)
       return;
   } catch (e) {
     return;
   }
-  marked$1.setOptions(__spreadValues({
-    renderer: getRenderer()
-  }, markedOptions));
+  marked$1.setOptions(__spreadValues(__spreadValues({
+    renderer: getRenderer({
+      imgLazyLoad: options.imgLazyLoad
+    })
+  }, markedOptions), options.markedOptions));
   instance = marked$1;
 }
 function marked(src) {
@@ -4520,6 +4690,8 @@ const en = {
   placeholder: "Leave a comment",
   noComment: "No Comment",
   send: "Send",
+  signIn: "Sign in",
+  signUp: "Sign up",
   save: "Save",
   nick: "Nickname",
   email: "Email",
@@ -4578,7 +4750,26 @@ const en = {
   /* Sidebar */
   msgCenter: "Messages",
   ctrlCenter: "Admin",
+  /* Auth */
+  noAccountPrompt: "Don't have an account?",
+  haveAccountPrompt: "Already have an account?",
+  forgetPassword: "Forget Password",
+  resetPassword: "Reset Password",
+  verificationCode: "Verification Code",
+  verifySend: "Verify",
+  verifyResend: "Resend",
+  waitSeconds: "Wait {seconds}s",
   emailVerified: "Email has been verified",
+  password: "Password",
+  username: "Username",
+  nextStep: "Next Step",
+  skipNotVerify: "Skip, do not verify",
+  logoutConfirm: "Are you sure to logout?",
+  accountMergeNotice: "Your email has multiple accounts with different id.",
+  accountMergeSelectOne: "Please select one you want to merge all the data into it.",
+  accountMergeConfirm: "All data will be merged into one account, the id is {id}.",
+  dismiss: "Dismiss",
+  merge: "Merge",
   /* General */
   frontend: "Frontend",
   backend: "Backend",
@@ -4601,6 +4792,8 @@ const zhCN = {
   placeholder: "键入内容...",
   noComment: "「此时无声胜有声」",
   send: "发送",
+  signIn: "登录",
+  signUp: "注册",
   save: "保存",
   nick: "昵称",
   email: "邮箱",
@@ -4659,7 +4852,26 @@ const zhCN = {
   /* Sidebar */
   msgCenter: "通知中心",
   ctrlCenter: "控制中心",
+  /* Auth */
+  noAccountPrompt: "没有账号？",
+  haveAccountPrompt: "已有账号？",
+  forgetPassword: "忘记密码",
+  resetPassword: "重置密码",
+  verificationCode: "验证码",
+  verifySend: "发送验证码",
+  verifyResend: "重新发送",
+  waitSeconds: "等待 {seconds}秒",
   emailVerified: "邮箱已验证",
+  password: "密码",
+  username: "用户名",
+  nextStep: "下一步",
+  skipNotVerify: "跳过，不验证",
+  logoutConfirm: "确定要退出登录吗？",
+  accountMergeNotice: "您的电子邮件下有多个不同 ID 的账户。",
+  accountMergeSelectOne: "请选择将所有数据合并到其中的一个。",
+  accountMergeConfirm: "所有数据将合并到 ID 为 {id} 的账户中。",
+  dismiss: "忽略",
+  merge: "合并",
   /* General */
   frontend: "前端",
   backend: "后端",
@@ -4762,27 +4974,6 @@ function timeAgo(date, $t = (n) => n) {
     return " - ";
   }
 }
-function onImagesLoaded($container, event) {
-  if (!$container)
-    return;
-  const images = $container.getElementsByTagName("img");
-  if (!images.length)
-    return;
-  let loaded = images.length;
-  for (let i = 0; i < images.length; i++) {
-    if (images[i].complete) {
-      loaded--;
-    } else {
-      images[i].addEventListener("load", () => {
-        loaded--;
-        if (loaded === 0)
-          event();
-      });
-    }
-    if (loaded === 0)
-      event();
-  }
-}
 function getGravatarURL(opts) {
   return `${opts.mirror.replace(/\/$/, "")}/${opts.emailMD5}?${opts.params.replace(/^\?/, "")}`;
 }
@@ -4982,17 +5173,12 @@ function handelCustomConf(customConf, full = false) {
   return conf;
 }
 function handleConfFormServer(conf) {
-  const DisabledKeys = [
-    "el",
-    "pageKey",
-    "pageTitle",
-    "server",
-    "site",
-    "darkMode"
-  ];
+  const DisabledKeys = ["el", "pageKey", "pageTitle", "server", "site"];
   Object.keys(conf).forEach((k) => {
     if (DisabledKeys.includes(k))
       delete conf[k];
+    if (k === "darkMode" && conf[k] !== "auto")
+      delete conf[k];
   });
   if (conf.emoticons && typeof conf.emoticons === "string") {
     conf.emoticons = conf.emoticons.trim();
@@ -5300,8 +5486,6 @@ function playFadeAnim(elem, after, type = "in") {
   const onAnimEnded = () => {
     elem.classList.remove(`atk-fade-${type}`);
     elem.removeEventListener("animationend", onAnimEnded);
-    if (after)
-      after();
   };
   elem.addEventListener("animationend", onAnimEnded);
 }
@@ -5852,10 +6036,10 @@ class SidebarLayer extends Component {
       } else {
         const $iframe = this.$iframe;
         const iFrameSrc = $iframe.src;
-        if (this.conf.darkMode !== iFrameSrc.includes("darkMode=1")) {
+        if (this.getDarkMode() !== iFrameSrc.includes("&darkMode=1")) {
           this.iframeLoad(
             $iframe,
-            this.conf.darkMode ? iFrameSrc.concat("&darkMode=1") : iFrameSrc.replace("&darkMode=1", "")
+            this.getDarkMode() ? iFrameSrc.concat("&darkMode=1") : iFrameSrc.replace("&darkMode=1", "")
           );
         }
       }
@@ -5925,12 +6109,15 @@ class SidebarLayer extends Component {
     };
     if (view)
       query.view = view;
-    if (this.conf.darkMode)
+    if (this.getDarkMode())
       query.darkMode = "1";
     const urlParams = new URLSearchParams(query);
     this.iframeLoad($iframe, `${baseURL}?${urlParams.toString()}`);
     return $iframe;
   }
+  getDarkMode() {
+    return this.conf.darkMode === "auto" ? window.matchMedia("(prefers-color-scheme: dark)").matches : this.conf.darkMode;
+  }
   iframeLoad($iframe, src) {
     $iframe.src = src;
     showLoading(this.$iframeWrap);
@@ -6265,38 +6452,42 @@ function Detect(userAgent) {
   return dest;
 }
 function check(conf, rules) {
-  rules.forEach(({ el, max: maxHeight, imgContains }) => {
-    const _apply = () => {
-      if (!el)
-        return;
-      if (!conf.scrollable)
-        applyHeightLimit({
-          el,
-          maxHeight,
-          postBtnClick: conf.postExpandBtnClick
-        });
-      else
-        applyScrollableHeightLimit({ el, maxHeight });
-    };
+  rules.forEach(({ el, max, imgCheck }) => {
+    if (!el)
+      return;
+    if (imgCheck)
+      el.style.maxHeight = `${max + 1}px`;
+    let lock = false;
     const _check = () => {
-      if (el && getHeight(el) > maxHeight)
-        _apply();
+      if (lock)
+        return;
+      if (getHeight(el) <= max)
+        return;
+      const afterExpandBtnClick = () => {
+        var _a;
+        lock = true;
+        (_a = conf.afterExpandBtnClick) == null ? void 0 : _a.call(conf);
+      };
+      !conf.scrollable ? applyHeightLimit({ el, max, afterExpandBtnClick }) : applyScrollableHeightLimit({ el, max });
     };
     _check();
-    if (imgContains && el)
-      onImagesLoaded(el, () => _check());
+    if (imgCheck) {
+      el.querySelectorAll(".atk-content img").forEach((img) => {
+        img.onload = () => _check();
+      });
+    }
   });
 }
 const HEIGHT_LIMIT_CSS = "atk-height-limit";
 function applyHeightLimit(obj) {
   if (!obj.el)
     return;
-  if (!obj.maxHeight)
+  if (!obj.max)
     return;
   if (obj.el.classList.contains(HEIGHT_LIMIT_CSS))
     return;
   obj.el.classList.add(HEIGHT_LIMIT_CSS);
-  obj.el.style.height = `${obj.maxHeight}px`;
+  obj.el.style.height = `${obj.max}px`;
   obj.el.style.overflow = "hidden";
   const $expandBtn = createElement(
     `<div class="atk-height-limit-btn">${t("readMore")}</span>`
@@ -6304,8 +6495,8 @@ function applyHeightLimit(obj) {
   $expandBtn.onclick = (e) => {
     e.stopPropagation();
     disposeHeightLimit(obj.el);
-    if (obj.postBtnClick)
-      obj.postBtnClick(e);
+    if (obj.afterExpandBtnClick)
+      obj.afterExpandBtnClick(e);
   };
   obj.el.append($expandBtn);
 }
@@ -6320,16 +6511,17 @@ function disposeHeightLimit($el) {
       e.remove();
   });
   $el.style.height = "";
+  $el.style.maxHeight = "";
   $el.style.overflow = "";
 }
 const HEIGHT_LIMIT_SCROLL_CSS = "atk-height-limit-scroll";
-function applyScrollableHeightLimit(obj) {
-  if (!obj.el)
+function applyScrollableHeightLimit(opt) {
+  if (!opt.el)
     return;
-  if (obj.el.classList.contains(HEIGHT_LIMIT_SCROLL_CSS))
+  if (opt.el.classList.contains(HEIGHT_LIMIT_SCROLL_CSS))
     return;
-  obj.el.classList.add(HEIGHT_LIMIT_SCROLL_CSS);
-  obj.el.style.height = `${obj.maxHeight}px`;
+  opt.el.classList.add(HEIGHT_LIMIT_SCROLL_CSS);
+  opt.el.style.height = `${opt.max}px`;
 }
 const CommentHTML = '<div class="atk-comment-wrap">\n  <div class="atk-comment">\n    <div class="atk-avatar"></div>\n    <div class="atk-main">\n      <div class="atk-header">\n        <span class="atk-item atk-nick"></span>\n        <span class="atk-badge-wrap"></span>\n        <span class="atk-item atk-date"></span>\n      </div>\n      <div class="atk-body">\n        <div class="atk-content"></div>\n      </div>\n      <div class="atk-footer">\n        <div class="atk-actions"></div>\n      </div>\n    </div>\n  </div>\n</div>\n';
 function renderAvatar(r) {
@@ -6793,7 +6985,7 @@ class Render {
     const childrenMaxH = conf.children;
     check(
       {
-        postExpandBtnClick: () => {
+        afterExpandBtnClick: () => {
           const children = this.comment.getChildren();
           if (children.length === 1)
             disposeHeightLimit(children[0].getRender().$content);
@@ -6802,10 +6994,10 @@ class Render {
       },
       [
         // 评论内容限高
-        { el: this.$content, max: contentMaxH, imgContains: true },
-        { el: this.$replyTo, max: contentMaxH, imgContains: true },
+        { el: this.$content, max: contentMaxH, imgCheck: true },
+        { el: this.$replyTo, max: contentMaxH, imgCheck: true },
         // 子评论区域限高（仅嵌套模式）
-        { el: this.$childrenWrap, max: childrenMaxH, imgContains: false }
+        { el: this.$childrenWrap, max: childrenMaxH, imgCheck: false }
       ]
     );
   }
@@ -6894,7 +7086,7 @@ class CommentActions {
       (_b = this.comment.getRender().voteBtnDown) == null ? void 0 : _b.updateText();
     }).catch((err) => {
       actionBtn == null ? void 0 : actionBtn.setError(t("voteFail"));
-      console.log(err);
+      console.error(err);
     });
   }
   /** 管理员 - 评论状态修改 */
@@ -7849,8 +8041,11 @@ ${opts.errMsg}`;
   setError(opts.$err, errEl);
 }
 const Markdown = (ctx) => {
-  initMarked();
-  ctx.on("updated", (conf) => {
+  ctx.watchConf(["markedReplacers", "imgLazyLoad", "markedOptions"], (conf) => {
+    initMarked({
+      markedOptions: ctx.getConf().markedOptions,
+      imgLazyLoad: ctx.getConf().imgLazyLoad
+    });
     if (conf.markedReplacers)
       setReplacers(conf.markedReplacers);
   });
@@ -9089,7 +9284,7 @@ const GotoFocus = (ctx) => {
     comment.focus();
   }));
 };
-const version = "2.8.5";
+const version = "2.8.6";
 const Copyright = (ctx) => {
   ctx.on("mounted", () => {
     const list2 = ctx.get("list");