hexo-theme-solitude 1.0.0 → 1.1.3

package/source/js/commentBarrage.js

@@ -1,148 +1,157 @@
-var commentBarrageConfig = {
-    maxBarrage: 1,
-    barrageTime: 8e3,
-    twikooUrl: "https://twikoo.sondy.top",
-    pageUrl: window.location.pathname,
-    barrageTimer: [],
-    barrageList: [],
-    barrageIndex: 0,
-    dom: document.querySelector(".comment-barrage")
-}
-    , commentInterval = null
-    , hoverOnCommentBarrage = !1
-    , isFirstTime = !0;
-document.querySelector(".comment-barrage").addEventListener("mouseenter", (function () {
-        hoverOnCommentBarrage = !0
-    }
-)),
-    document.querySelector(".comment-barrage").addEventListener("mouseleave", (function () {
-            hoverOnCommentBarrage = !1
-        }
-    ));
-var fetchComments = async function () {
-    try {
-        var e = await fetch(commentBarrageConfig.twikooUrl, {
-            method: "POST",
-            headers: {
-                "Content-Type": "application/json"
+function initializeCommentBarrage() {
+    window.commentBarrageInitialized = !0;
+    let e = {
+        maxBarrage: 1,
+        barrageTime: 8e3,
+        twikooUrl: GLOBALCONFIG.comment.twikooUrl,
+        pageUrl: window.location.pathname,
+        accessToken: GLOBALCONFIG.comment.twikooAccessToken,
+    };
+    new class {
+        commentInterval = null
+        constructor(e) {
+            this.config = {
+                ...e,
+                barrageTimer: [],
+                barrageList: [],
+                barrageIndex: 0,
+                dom: document.querySelector(".comment-barrage")
             },
-            body: JSON.stringify({
-                event: "COMMENT_GET",
-                accessToken: commentBarrageConfig.accessToken,
-                url: commentBarrageConfig.pageUrl
-            })
-        });
-        if (!e.ok)
-            throw new Error("HTTP error! status: " + e.status);
-        return (await e.json()).data
-    } catch (e) {
-        console.error("An error occurred while fetching comments: ", e)
-    }
-}
-    , initCommentBarrage = function () {
-    "false" !== localStorage.getItem("commentBarrageSwitch") ? (commentBarrageConfig.dom.style.display = "none",
-        document.querySelector(".menu-commentBarrage-text").textContent = "显示热评",
-        document.querySelector("#consoleCommentBarrage").classList.remove("on")) : (commentBarrageConfig.dom.style.display = "flex",
-        document.querySelector(".menu-commentBarrage-text").textContent = "关闭热评",
-        document.querySelector("#consoleCommentBarrage").classList.add("on")),
-        fetchComments().then((function (e) {
-                commentBarrageConfig.barrageList = commentLinkFilter(e),
-                    commentBarrageConfig.dom.innerHTML = "",
-                    clearInterval(commentInterval),
-                    commentInterval = null;
-                var r = function () {
-                    if (commentBarrageConfig.barrageList.length && !hoverOnCommentBarrage) {
-                        if (!popCommentBarrage(commentBarrageConfig.barrageList[commentBarrageConfig.barrageIndex]))
-                            return commentBarrageConfig.barrageIndex += 1,
-                                commentBarrageConfig.barrageIndex %= commentBarrageConfig.barrageList.length,
-                                r();
-                        commentBarrageConfig.barrageIndex += 1,
-                            commentBarrageConfig.barrageIndex %= commentBarrageConfig.barrageList.length
-                    }
-                    commentBarrageConfig.barrageTimer.length > (commentBarrageConfig.barrageList.length > commentBarrageConfig.maxBarrage ? commentBarrageConfig.maxBarrage : commentBarrageConfig.barrageList.length) && !hoverOnCommentBarrage && removeCommentBarrage(commentBarrageConfig.barrageTimer.shift())
-                };
-                setTimeout((function () {
-                        r(),
-                            commentInterval = setInterval(r, commentBarrageConfig.barrageTime)
-                    }
-                ), 3e3)
-            }
-        ))
-};
+                this.commentInterval = null,
+                this.hoverOnCommentBarrage = !1,
+                this.init()
+        }
 
-function commentLinkFilter(e) {
-    e.sort((function (e, r) {
-            return e.created - r.created
+        async fetchComments() {
+            return fetch(this.config.twikooUrl, {
+                method: "POST",
+                headers: {
+                    "Content-Type": "application/json"
+                },
+                body: JSON.stringify({
+                    event: "COMMENT_GET",
+                    accessToken: this.config.accessToken,
+                    url: this.config.pageUrl
+                })
+            }).then((e => {
+                    if (!e.ok)
+                        throw Error("HTTP error! status: " + e.status);
+                    return e.json()
+                }
+            )).then((e => e.data)).catch((e => console.error("An error occurred while fetching comments: ", e)))
         }
-    ));
-    var r = [];
-    return e.forEach((function (e) {
-            r.push(...getCommentReplies(e))
+
+        commentLinkFilter(e) {
+            e.sort(((e, t) => e.created - t.created));
+            let t = [];
+            return e.forEach((e => {
+                    t.push(...this.getCommentReplies(e))
+                }
+            )),
+                t
         }
-    )),
-        r
-}
 
-function getCommentReplies(e) {
-    if (e.replies) {
-        var r = [e];
-        return e.replies.forEach((function (e) {
-                r.push(...getCommentReplies(e))
+        getCommentReplies(e) {
+            if (e.replies) {
+                let comments = [e];
+                e.replies.forEach((reply) => {
+                    comments.push(...this.getCommentReplies(reply));
+                });
+                return comments;
             }
-        )),
-            r
-    }
-    return []
-}
+            return [];
+        }
 
-function processCommentContent(e) {
-    var r = document.createElement("div");
-    r.innerHTML = e;
-    for (var a = r.getElementsByTagName("img"), n = a.length - 1; n >= 0; n--) {
-        var t = a[n];
-        t.parentNode.removeChild(t)
-    }
-    var o = r.getElementsByTagName("blockquote");
-    for (n = o.length - 1; n >= 0; n--) {
-        var m = o[n];
-        m.parentNode.removeChild(m)
-    }
-    var c = r.getElementsByTagName("a");
-    for (n = c.length - 1; n >= 0; n--) {
-        var i = c[n]
-            , g = document.createTextNode(i.textContent);
-        i.parentNode.replaceChild(g, i)
-    }
-    var s = r.getElementsByTagName("p");
-    for (n = s.length - 1; n >= 0; n--) {
-        var l = s[n];
-        "" === l.textContent.trim() && l.parentNode.removeChild(l)
-    }
-    return r.innerHTML
-}
 
-function popCommentBarrage(e) {
-    var r = processCommentContent(e.comment);
-    if (!r.trim())
-        return !1;
-    var a = document.createElement("div");
-    return a.className = "comment-barrage-item",
-        a.innerHTML = `\n        <div class="barrageHead">\n            <a class="barrageTitle" href="javascript:sco.scrollTo('post-comment')">热评</a>\n            <div class="barrageNick">${e.nick}</div>\n            <img class="barrageAvatar" src="https://cravatar.cn/avatar/${e.mailMd5}"/>\n            <a class="comment-barrage-close" href="javascript:sco.switchCommentBarrage();"><i class="scofont icon-close-fill"></i></a>\n        </div>\n        <a class="barrageContent" href="javascript:sco.scrollTo('${e.id}');">${r}</a>\n    `,
-        commentBarrageConfig.barrageTimer.push(a),
-        commentBarrageConfig.dom.appendChild(a),
-        !0
-}
+        processCommentContent(e) {
+            const t = e.replace(/<blockquote\b[^>]*>[\s\S]*?<\/blockquote>/gi, "")
+                , r = t.replace(/<[^>]*>/g, "").replace(/\n/g, " ");
+            return "" === t.trim() ? "" : `<p>${r}</p>`
+        }
+
+        popCommentBarrage(e) {
+            var commentContent = this.processCommentContent(e.comment);
 
-function removeCommentBarrage(e) {
-    e.className = "comment-barrage-item out",
-        setTimeout((function () {
-                commentBarrageConfig.dom.removeChild(e)
+            if (!commentContent.trim()) {
+                return false;
             }
-        ), 1e3)
-}
 
-initCommentBarrage(),
-    document.addEventListener("pjax:send", (function () {
-            clearInterval(commentInterval)
+            let commentBarrageItem = document.createElement("div");
+            commentBarrageItem.className = "comment-barrage-item";
+
+            commentBarrageItem.innerHTML = `
+        <div class="barrageHead">
+            <a class="barrageTitle" href="javascript:sco.scrollTo('post-comment')">热评</a>
+            <div class="barrageNick">${e.nick}</div>
+            <img class="barrageAvatar" src="https://cravatar.cn/avatar/${e.mailMd5}"/>
+            <a class="comment-barrage-close" href="javascript:sco.switchCommentBarrage();"><i class="scoicon sco-close-fill"></i></a>
+        </div>
+        <a class="barrageContent" href="javascript:sco.scrollTo('${e.id}');">${commentContent}</a>
+    `;
+
+            this.config.barrageTimer.push(commentBarrageItem);
+
+            this.config.dom.appendChild(commentBarrageItem);
+            return true;
+        }
+
+        removeCommentBarrage(e) {
+            e.className = "comment-barrage-item out",
+                setTimeout((() => {
+                        this.config.dom.removeChild(e)
+                    }
+                ), 1e3)
         }
-    ));
+
+        async initCommentBarrage() {
+            if (localStorage.getItem("commentBarrageSwitch") != null) {
+                document.querySelector(".comment-barrage").style.display = "flex";
+                document.querySelector(".menu-commentBarrage-text").textContent = "关闭热评";
+                document.querySelector("#consoleCommentBarrage").classList.add("on");
+            } else {
+                document.querySelector(".comment-barrage").style.display = "none";
+                document.querySelector(".menu-commentBarrage-text").textContent = "显示热评";
+                document.querySelector("#consoleCommentBarrage").classList.remove("on");
+            }
+            const comments = await this.fetchComments();
+            this.config.barrageList = this.commentLinkFilter(comments);
+            this.config.dom.innerHTML = "";
+            clearInterval(this.commentInterval);
+            this.commentInterval = null;
+            const t = () => {
+                if (this.config.barrageList.length && !this.hoverOnCommentBarrage) {
+                    if (!this.popCommentBarrage(this.config.barrageList[this.config.barrageIndex]))
+                        return this.config.barrageIndex += 1,
+                            this.config.barrageIndex %= this.config.barrageList.length,
+                            void t();
+                    this.config.barrageIndex += 1,
+                        this.config.barrageIndex %= this.config.barrageList.length
+                }
+                if (this.config.barrageTimer.length > (this.config.barrageList.length > this.config.maxBarrage ? this.config.maxBarrage : this.config.barrageList.length) && !this.hoverOnCommentBarrage) {
+                    this.removeCommentBarrage(this.config.barrageTimer.shift());
+                }
+            };
+            setTimeout(() => {
+                t();
+                if (this.commentInterval) {
+                    clearInterval(this.commentInterval);
+                }
+                this.commentInterval = setInterval(t, this.config.barrageTime);
+            }, 3000);
+        }
+
+        init() {
+            this.initCommentBarrage();
+            const commentBarrage = document.querySelector(".comment-barrage");
+            commentBarrage.addEventListener('mouseover', () => {
+                this.hoverOnCommentBarrage = true;
+            });
+            commentBarrage.addEventListener('mouseout', () => {
+                this.hoverOnCommentBarrage = false;
+            });
+        }
+    }
+    (e)
+}
+
+initializeCommentBarrage();

package/source/js/extend/covercolor/local.js

@@ -1,107 +1,113 @@
 function coverColor() {
     var path = document.getElementById("post-cover")?.src;
     if (path !== undefined) {
-      var img = new Image();
-      img.crossOrigin = "Anonymous";
-      img.src = path;
-      img.onload = function () {
-        var canvas = document.createElement("canvas");
-        canvas.width = this.width;
-        canvas.height = this.height;
-        var ctx = canvas.getContext("2d");
-        ctx.drawImage(this, 0, 0);
-        var data = ctx.getImageData(0, 0, this.width, this.height).data;
-        var r = 0, g = 0, b = 0;
-        var step = 5;
-        for (var i = 0; i < data.length; i += 4 * step) {
-          r += data[i];
-          g += data[i + 1];
-          b += data[i + 2];
+        var img = new Image();
+        img.crossOrigin = "Anonymous";
+        img.src = path;
+        img.onload = function () {
+            var canvas = document.createElement("canvas");
+            canvas.width = this.width;
+            canvas.height = this.height;
+            var ctx = canvas.getContext("2d");
+            ctx.drawImage(this, 0, 0);
+            var data = ctx.getImageData(0, 0, this.width, this.height).data;
+            var colorCounts = {};
+            var dominantColor = '';
+            var maxCount = 0;
+            var step = 5;
+            for (var i = 0; i < data.length; i += 4 * step) {
+                var r = data[i];
+                var g = data[i + 1];
+                var b = data[i + 2];
+                var color = `${r},${g},${b}`;
+
+                colorCounts[color] = (colorCounts[color] || 0) + 1;
+
+                if (colorCounts[color] > maxCount) {
+                    maxCount = colorCounts[color];
+                    dominantColor = color;
+                }
+            }
+            var rgb = dominantColor.split(',').map(c => parseInt(c, 10));
+            var value = "#" + rgb[0].toString(16) + rgb[1].toString(16) + rgb[2].toString(16);
+            if (getContrastYIQ(value) == "light") {
+                value = LightenDarkenColor(colorHex(value), -50)
+            }
+
+            document.documentElement.style.setProperty('--sco-main', value);
+            document.documentElement.style.setProperty('--sco-main-op', value + '23');
+            document.documentElement.style.setProperty('--sco-main-op-deep', value + 'dd');
+            document.documentElement.style.setProperty('--sco-main-none', value + '00');
+            initThemeColor()
+            document.getElementById("coverdiv").classList.add("loaded");
         }
-        r = Math.floor(r / (data.length / 4 / step));
-        g = Math.floor(g / (data.length / 4 / step));
-        b = Math.floor(b / (data.length / 4 / step));
-        var value = "#" + r.toString(16) + g.toString(16) + b.toString(16);
-        if (getContrastYIQ(value) == "light") {
-          value = LightenDarkenColor(colorHex(value), -50)
-        }
-
-        document.documentElement.style.setProperty('--sco-main', value);
-        document.documentElement.style.setProperty('--sco-main-op', value + '23');
-        document.documentElement.style.setProperty('--sco-main-op-deep', value + 'dd');
-        document.documentElement.style.setProperty('--sco-main-none', value + '00');
-        initThemeColor()
-        document.getElementById("coverdiv").classList.add("loaded");
-      }
     } else {
-      document.documentElement.style.setProperty('--sco-main', 'var(--sco-theme)');
-      document.documentElement.style.setProperty('--sco-main-op', 'var(--sco-theme-op)');
-      document.documentElement.style.setProperty('--sco-main-op-deep', 'var(--sco-theme-op-deep)');
-      document.documentElement.style.setProperty('--sco-main-none', 'var(--sco-theme-none)');
-      initThemeColor()
+        document.documentElement.style.setProperty('--sco-main', 'var(--sco-theme)');
+        document.documentElement.style.setProperty('--sco-main-op', 'var(--sco-theme-op)');
+        document.documentElement.style.setProperty('--sco-main-op-deep', 'var(--sco-theme-op-deep)');
+        document.documentElement.style.setProperty('--sco-main-none', 'var(--sco-theme-none)');
+        initThemeColor()
     }
-  }
-
+}
 
-  function colorHex(colorString) {
+function colorHex(colorString) {
     const hexRegex = /^#([0-9a-fA-f]{3}|[0-9a-fA-f]{6})$/;
     let color = colorString;
 
     if (/^(rgb|RGB)/.test(color)) {
-      const colorArr = color.replace(/(?:\(|\)|rgb|RGB)*/g, "").split(",");
-      const hexArr = colorArr.map(c => {
-        const hex = Number(c).toString(16);
-        return hex.length === 1 ? "0" + hex : hex;
-      });
-      return "#" + hexArr.join("");
-    } else if (hexRegex.test(color)) {
-      const hexDigits = color.replace(/#/, "").split("");
-      if (hexDigits.length === 6) {
-        return color;
-      } else if (hexDigits.length === 3) {
-        const hexArr = hexDigits.map(c => c + c);
+        const colorArr = color.replace(/(?:\(|\)|rgb|RGB)*/g, "").split(",");
+        const hexArr = colorArr.map(c => {
+            const hex = Number(c).toString(16);
+            return hex.length === 1 ? "0" + hex : hex;
+        });
         return "#" + hexArr.join("");
-      }
+    } else if (hexRegex.test(color)) {
+        const hexDigits = color.replace(/#/, "").split("");
+        if (hexDigits.length === 6) {
+            return color;
+        } else if (hexDigits.length === 3) {
+            const hexArr = hexDigits.map(c => c + c);
+            return "#" + hexArr.join("");
+        }
     }
     return color;
-  }
-
+}
 
 
 function colorRgb(str) {
-  const HEX_SHORT_REGEX = /^#([0-9a-fA-f]{3})$/;
-  const HEX_LONG_REGEX = /^#([0-9a-fA-f]{6})$/;
-  const HEX_SHORT_LENGTH = 4;
-
-  if (!str || typeof str !== 'string') {
-    return str;
-  }
-
-  const sColor = str.toLowerCase();
-  let hexValue = "";
-
-  if (sColor && (HEX_SHORT_REGEX.test(sColor) || HEX_LONG_REGEX.test(sColor))) {
-    hexValue = sColor.length === HEX_SHORT_LENGTH ?
-        sColor.replace(/^#(.)/g, "#$1$1") :
-        sColor;
-
-    const rgbValue = hexValue.slice(1)
-        .match(/.{2}/g)
-        .map(val => parseInt(val, 16));
-
-    return `rgb(${rgbValue[0]}, ${rgbValue[1]}, ${rgbValue[2]})`;
-  } else {
-    return sColor;
-  }
+    const HEX_SHORT_REGEX = /^#([0-9a-fA-f]{3})$/;
+    const HEX_LONG_REGEX = /^#([0-9a-fA-f]{6})$/;
+    const HEX_SHORT_LENGTH = 4;
+
+    if (!str || typeof str !== 'string') {
+        return str;
+    }
+
+    const sColor = str.toLowerCase();
+    let hexValue = "";
+
+    if (sColor && (HEX_SHORT_REGEX.test(sColor) || HEX_LONG_REGEX.test(sColor))) {
+        hexValue = sColor.length === HEX_SHORT_LENGTH ?
+            sColor.replace(/^#(.)/g, "#$1$1") :
+            sColor;
+
+        const rgbValue = hexValue.slice(1)
+            .match(/.{2}/g)
+            .map(val => parseInt(val, 16));
+
+        return `rgb(${rgbValue[0]}, ${rgbValue[1]}, ${rgbValue[2]})`;
+    } else {
+        return sColor;
+    }
 }
 
 
-  function LightenDarkenColor(col, amt) {
+function LightenDarkenColor(col, amt) {
     let usePound = false;
 
     if (col[0] === "#") {
-      col = col.slice(1);
-      usePound = true;
+        col = col.slice(1);
+        usePound = true;
     }
 
     const num = parseInt(col, 16);
@@ -110,12 +116,15 @@ function colorRgb(str) {
     const g = Math.min(255, Math.max(0, (num & 0xff) + amt));
 
     return `${usePound ? "#" : ""}${(g | (b << 8) | (r << 16)).toString(16).padStart(6, "0")}`;
-  }
+}
 
 
-  function getContrastYIQ(hexcolor) {
+function getContrastYIQ(hexcolor) {
     var colorrgb = colorRgb(hexcolor);
     var colors = colorrgb.match(/^rgb\((\d+),\s*(\d+),\s*(\d+)\)$/);
+    if (!colors) {
+        return "light";  // or "dark", depending on your preference
+    }
     var red = colors[1];
     var green = colors[2];
     var blue = colors[3];
@@ -123,28 +132,29 @@ function colorRgb(str) {
     brightness = (red * 299) + (green * 587) + (blue * 114);
     brightness = brightness / 255000;
     if (brightness >= 0.5) {
-      return "light";
+        return "light";
     } else {
-      return "dark";
+        return "dark";
     }
-  }
+}
+
 
-  function initThemeColor() {
+function initThemeColor() {
     const currentTop = window.scrollY || document.documentElement.scrollTop;
     let themeColor;
     if (currentTop > 0) {
-      themeColor = getComputedStyle(document.documentElement).getPropertyValue('--sco-card-bg');
+        themeColor = getComputedStyle(document.documentElement).getPropertyValue('--sco-card-bg');
     } else if (PAGECONFIG.is_post) {
-      themeColor = getComputedStyle(document.documentElement).getPropertyValue('--sco-main');
+        themeColor = getComputedStyle(document.documentElement).getPropertyValue('--sco-main');
     } else {
-      themeColor = getComputedStyle(document.documentElement).getPropertyValue('--sco-background');
+        themeColor = getComputedStyle(document.documentElement).getPropertyValue('--sco-background');
     }
     changeThemeColor(themeColor);
-  }
+}
 
-  function changeThemeColor(color) {
+function changeThemeColor(color) {
     const meta = document.querySelector('meta[name="theme-color"]');
     if (meta) {
-      meta.setAttribute('content', color);
+        meta.setAttribute('content', color);
     }
-  }
+}

package/source/js/extend/search/algolia-search.js

@@ -118,6 +118,17 @@ class search {
 
 const searchClickFn = () => {
     document.querySelector('#search-button > .search').addEventListener('click', search.openSearch)
+    document.getElementById('menu-search').addEventListener('click', function() {
+        rm.hideRightMenu();
+        search.openSearch();
+        let t = document.getElementsByClassName('ais-search-box--input')[0];
+        let evt = new Event('input', {
+            bubbles: true,
+            cancelable: true
+        });
+        t.value = selectTextNow;
+        t.dispatchEvent(evt);
+    });
 }
 
 const searchClickFnOnce = () => {

package/source/js/extend/search/local-search.js

@@ -47,7 +47,7 @@ class search{
     if (!GLOBALCONFIG.localsearch.preload && dataObj === null) dataObj = this.fetchData(GLOBALCONFIG.localsearch.path)
     $input.addEventListener('input', function type() {
       const keywords = this.value.trim().toLowerCase().split(/[\s]+/)
-      if (keywords[0] !== '') $loadingStatus.innerHTML = '<i class="ri-loader-2-fill"></i><span>加载中</span>'
+      if (keywords[0] !== '') $loadingStatus.innerHTML = '<i class="scoicon sco-loading-line"></i><span>加载中</span>'
       else {
         $resultContent.innerHTML = ''
         return
@@ -142,6 +142,17 @@ class search{
 
 const searchClickFn = () => {
   document.querySelector('#search-button > .search').addEventListener('click', search.openSearch)
+  document.getElementById('menu-search').addEventListener('click', function() {
+    rm.hideRightMenu();
+    search.openSearch();
+    let t = document.getElementsByClassName('search-box-input')[0];
+    let evt = new Event('input', {
+      bubbles: true,
+      cancelable: true
+    });
+    t.value = selectTextNow;
+    t.dispatchEvent(evt);
+  })
 }
 
 const searchClickFnOnce = () => {