artalk 2.2.5 → 2.2.6

package/dist/Artalk.es.js

@@ -2808,7 +2808,10 @@ function isValidURL(urlRaw) {
   return url.protocol === "http:" || url.protocol === "https:";
 }
 function getURLBasedOnApi(ctx, path) {
-  return `${ctx.conf.server.replace(/\/api\/?$/, "")}/${path.replace(/^\//, "")}`;
+  return getURLBasedOn(ctx.conf.server, path);
+}
+function getURLBasedOn(baseURL, path) {
+  return `${baseURL.replace(/\/$/, "")}/${path.replace(/^\//, "")}`;
 }
 function showLoading(parentElem, conf) {
   if (parentElem instanceof Context)
@@ -3191,7 +3194,7 @@ class Api {
     __publicField(this, "ctx");
     __publicField(this, "baseURL");
     this.ctx = ctx;
-    this.baseURL = ctx.conf.server;
+    this.baseURL = `${ctx.conf.server}/api`;
   }
   get(offset, pageSize, flatMode, paramsEditor) {
     const params = {
@@ -3460,7 +3463,7 @@ const CaptchaChecker = {
       const $iframe = createElement(`<iframe class="atk-fade-in"></iframe>`);
       $iframe.style.display = "none";
       showLoading($iframeWrap, { transparentBg: true });
-      $iframe.src = `${that.ctx.conf.server}/captcha/get?t=${+new Date()}`;
+      $iframe.src = `${that.ctx.conf.server}/api/captcha/get?t=${+new Date()}`;
       $iframe.onload = () => {
         $iframe.style.display = "";
         hideLoading($iframeWrap);
@@ -5434,7 +5437,7 @@ class ListLite extends Component {
     }
     this.data = data;
     const feMinVersion = ((_a = data.api_version) == null ? void 0 : _a.fe_min_version) || "0.0.0";
-    if (this.ctx.conf.versionCheck && this.versionCheck("\u524D\u7AEF", feMinVersion, "2.2.5"))
+    if (this.ctx.conf.versionCheck && this.versionCheck("\u524D\u7AEF", feMinVersion, "2.2.6"))
       return;
     if (this.ctx.conf.versionCheck && this.versionCheck("\u540E\u7AEF", backendMinVersion, (_b = data.api_version) == null ? void 0 : _b.version))
       return;
@@ -5766,7 +5769,7 @@ class List extends ListLite {
     if (this.ctx.conf.listSort) {
       this.initDropdown();
     }
-    this.$el.querySelector(".atk-copyright").innerHTML = `Powered By <a href="https://artalk.js.org" target="_blank" title="Artalk v${"2.2.5"}">Artalk</a>`;
+    this.$el.querySelector(".atk-copyright").innerHTML = `Powered By <a href="https://artalk.js.org" target="_blank" title="Artalk v${"2.2.6"}">Artalk</a>`;
     this.ctx.on("list-reload", () => this.fetchComments(0));
     this.ctx.on("list-refresh-ui", () => this.refreshUI());
     this.ctx.on("list-import", (data) => this.importComments(data));
@@ -5992,7 +5995,7 @@ class SidebarLayer extends Component {
       if (this.firstShow) {
         this.$iframeWrap.innerHTML = "";
         this.$iframe = createElement("<iframe></iframe>");
-        const baseURL = getURLBasedOnApi(this.ctx, "sidebar/");
+        const baseURL = getURLBasedOnApi(this.ctx, "/sidebar/");
         const query = {
           pageKey: this.conf.pageKey,
           site: this.conf.site || "",
@@ -6065,18 +6068,25 @@ const _Artalk = class {
     __publicField(this, "list");
     __publicField(this, "sidebarLayer");
     this.conf = __spreadValues(__spreadValues({}, _Artalk.defaults), customConf);
-    this.conf.server = this.conf.server.replace(/\/$/, "");
+    this.conf.server = this.conf.server.replace(/\/$/, "").replace(/\/api\/?$/, "");
     if (!this.conf.pageKey) {
-      this.conf.pageKey = `${window.location.protocol}//${window.location.host}${window.location.pathname}`;
+      this.conf.pageKey = `${window.location.pathname}`;
     }
-    try {
-      const $root = document.querySelector(this.conf.el);
-      if (!$root)
-        throw Error(`Sorry, target element "${this.conf.el}" was not found.`);
-      this.$root = $root;
-    } catch (e) {
-      console.error(e);
-      throw new Error("Please check your Artalk `el` config.");
+    if (!this.conf.pageTitle) {
+      this.conf.pageTitle = `${document.title}`;
+    }
+    if (!!this.conf.el && this.conf.el instanceof HTMLElement) {
+      this.$root = this.conf.el;
+    } else {
+      try {
+        const $root = document.querySelector(this.conf.el);
+        if (!$root)
+          throw Error(`Sorry, target element "${this.conf.el}" was not found.`);
+        this.$root = $root;
+      } catch (e) {
+        console.error(e);
+        throw new Error("Please check your Artalk `el` config.");
+      }
     }
     this.ctx = new Context(this.$root, this.conf);
     this.$root.classList.add("artalk");