hexo-theme-solitude 1.7.13 → 1.7.14

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hexo-theme-solitude",
-  "version": "1.7.13",
+  "version": "1.7.14",
   "description": "A beautiful, powerful, and efficient Hexo theme developed by the efu.",
   "main": "package.json",
   "scripts": {

package/plugins.yml

@@ -27,10 +27,14 @@ valine:
   name: valine
   file: dist/Valine.min.js
   version: 1.5.1
-discuss:
-  name: discuss
-  file: dist/discuss.js
-  version: 1.2.7
+artalk_css:
+  name: artalk
+  file: Artalk.css
+  version: 2.8.4
+artalk_js:
+  name: artalk
+  file: Artalk.js
+  version: 2.8.4
 katex:
   name: katex
   file: dist/katex.min.css

package/scripts/event/cdn.js

@@ -64,19 +64,9 @@ hexo.extend.filter.register('before_generate', () => {
             file: 'js/third_party/efu_ai.min.js',
             version
         },
-        twikoo_commentBarrage: {
+        commentBarrage: {
             name: 'hexo-theme-solitude',
-            file: 'js/commentBarrage/twikoo.js',
-            version
-        },
-        waline_commentBarrage: {
-            name: 'hexo-theme-solitude',
-            file: 'js/commentBarrage/waline.js',
-            version
-        },
-        valine_commentBarrage: {
-            name: 'hexo-theme-solitude',
-            file: 'js/commentBarrage/valine.js',
+            file: 'js/barrage_comment.js',
             version
         },
         waterfall: {

package/source/css/_layout/header.styl

@@ -267,17 +267,17 @@
 
   &.no-top-img
     margin-bottom 0
-  if hexo-config('nav.right.top')
-    &:not(.nav-fixed)
-      #percent
-        transition .3s
 
-      #nav-right #nav-totop
-        width 0
-        transform scale(0)
-        margin-left 0
-        overflow hidden
-        transition .3s ease-in
+  &:not(.nav-fixed)
+    #percent
+      transition .3s
+
+    #nav-right #nav-totop
+      width 0
+      transform scale(0)
+      margin-left 0
+      overflow hidden
+      transition .3s ease-in
 
 #page-header #scroll-down .scroll-down-effects,
 #page-header #site-subtitle, #page-header #site-title
@@ -606,51 +606,40 @@
 #site-logo
   width 121px
 
-if hexo-config('nav.right.top')
-  #nav-totop
-    position relative
-    width 35px
-    height 35px
-    display flex
-    border-radius 40px
-    transition all .3s ease-in-out
-    align-items center
-
-    &.long
-      width 80px
+#nav-totop
+  position relative
+  width 35px
+  height 35px
+  display flex
+  border-radius 40px
+  transition all .3s ease-in-out
+  align-items center
 
-    .totopbtn
-      padding-top 0
+  &.long
+    width 80px
 
-      i
-        position absolute
-        display flex
-        font-size 22px
-        opacity 0
-        line-height 1
+  .totopbtn
+    padding-top 0
 
-    &:hover
-      .totopbtn
-        i
-          opacity 1
-          color var(--efu-card-bg)
-          transition .3s
+    i
+      position absolute
+      display flex
+      font-size 22px
+      opacity 0
+      line-height 1
 
-      #percent
-        opacity 0
-        font-weight 700
+  &:hover
+    .totopbtn
+      i
+        opacity 1
+        color var(--efu-card-bg)
+        transition .3s
 
     #percent
-      font-size 12px
-      border-radius 35px
-      display flex
-      justify-content center
-      align-items center
-      transition .3s
-      white-space nowrap
+      opacity 0
+      font-weight 700
 
-  .nav-fixed #nav-totop #percent,
-  .page #nav-totop #percent
+  #percent
     font-size 12px
     border-radius 35px
     display flex
@@ -659,6 +648,16 @@ if hexo-config('nav.right.top')
     transition .3s
     white-space nowrap
 
+.nav-fixed #nav-totop #percent,
+.page #nav-totop #percent
+  font-size 12px
+  border-radius 35px
+  display flex
+  justify-content center
+  align-items center
+  transition .3s
+  white-space nowrap
+
 if hexo-config('nav.group')
   .back-home-button
     display flex
@@ -847,6 +846,7 @@ if hexo-config('nav.group')
         background var(--efu-main)
         transition .3s
         box-shadow var(--efu-shadow-main)
+
     #site-name
       &:hover
         i

package/source/js/barrage_comment.js

@@ -0,0 +1,78 @@
+/**
+ * Comment Barrage
+ * author: @efu
+ * website: efu.me
+ * copyright: MIT
+ * date: 2024-04-12
+ * update: 2024-04-12
+ * @param array
+ */
+function initializeCommentBarrage(array) {
+    if (array === undefined) return;
+    new class {
+        constructor() {
+            this.config = {
+                barrageTimer: [],
+                barrageList: [],
+                barrageIndex: 0,
+                dom: document.querySelector(".comment-barrage"),
+                maxBarrage: 1,
+                barrageTime: 5000
+            };
+            this.hoverOnCommentBarrage = false;
+            this.init();
+        }
+
+        filterAndFlatten(comments) {
+            return comments.flatMap(comment => comment.replies ? [comment, ...this.filterAndFlatten(comment.replies)] : [comment]);
+        }
+
+        sanitizeContent(content) {
+            return content.replace(/(<([^>]+)>)/ig, '').trim();
+        }
+
+        createBarrageItem(comment) {
+            const content = this.sanitizeContent(comment.content);
+            if (!content) return false;
+            const element = document.createElement("div");
+            element.className = "comment-barrage-item";
+            element.innerHTML = `<div class="barrageHead"><a class="barrageTitle" href="javascript:sco.scrollTo('post-comment')">${GLOBAL_CONFIG.lang.barrage.title}</a><div class="barrageNick">${comment.nick}</div><img class="barrageAvatar" src="${GLOBAL_CONFIG.comment.avatar}/avatar/${comment.mailMd5}"/><a class="comment-barrage-close" href="javascript:sco.switchCommentBarrage();"><i class="solitude st-close-fill"></i></a></div><a class="barrageContent" href="${comment.id ? `javascript:sco.scrollTo(\'${comment.id}\')` : 'javascript:sco.scrollTo(\'post-comment\')' }">${content}</a>`;
+            this.config.dom.appendChild(element);
+            this.config.barrageTimer.push(element);
+            return true;
+        }
+
+        removeBarrageItem(element) {
+            element.classList.add("out");
+            setTimeout(() => this.config.dom.removeChild(element), 1000);
+        }
+
+        manageBarrage() {
+            if (this.config.barrageList.length && !this.hoverOnCommentBarrage) {
+                if (!this.createBarrageItem(this.config.barrageList[this.config.barrageIndex])) {
+                    this.config.barrageIndex = (this.config.barrageIndex + 1) % this.config.barrageList.length;
+                    return this.manageBarrage();
+                }
+                this.config.barrageIndex = (this.config.barrageIndex + 1) % this.config.barrageList.length;
+            }
+            if (this.config.barrageTimer.length > Math.min(this.config.maxBarrage, this.config.barrageList.length) && !this.hoverOnCommentBarrage) {
+                this.removeBarrageItem(this.config.barrageTimer.shift());
+            }
+        }
+
+        async initBarrage() {
+            const storageSwitch = localStorage.getItem("commentBarrageSwitch");
+            this.config.dom.style.display = storageSwitch ? "flex" : "none";
+            this.config.barrageList = this.filterAndFlatten(array);
+            this.config.dom.innerHTML = "";
+            clearInterval(this.commentInterval);
+            this.commentInterval = setInterval(() => this.manageBarrage(), this.config.barrageTime);
+        }
+
+        async init() {
+            await this.initBarrage();
+            this.config.dom.addEventListener('mouseover', () => this.hoverOnCommentBarrage = true);
+            this.config.dom.addEventListener('mouseout', () => this.hoverOnCommentBarrage = false);
+        }
+    }();
+}

package/source/js/main.js

@@ -63,6 +63,50 @@ const scrollFn = function () {
     }
 }
 
+const percent = () => {
+    let scrollTop = document.documentElement.scrollTop || window.pageYOffset
+    let totalHeight = Math.max(document.body.scrollHeight, document.documentElement.scrollHeight, document.body.offsetHeight, document.documentElement.offsetHeight, document.body.clientHeight, document.documentElement.clientHeight) - document.documentElement.clientHeight
+    let scrollPercent = Math.round(scrollTop / totalHeight * 100)
+    let percentElement = document.querySelector("#percent")
+    let viewportBottom = window.scrollY + document.documentElement.clientHeight
+    let remainingScroll = totalHeight - scrollTop
+
+    if ((document.getElementById("post-comment") || document.getElementById("footer")).offsetTop < viewportBottom || scrollPercent > 90) {
+        document.querySelector("#nav-totop").classList.add("long")
+        percentElement.innerHTML = GLOBAL_CONFIG.lang.backtop
+    } else {
+        document.querySelector("#nav-totop").classList.remove("long")
+        if (scrollPercent >= 0) {
+            percentElement.innerHTML = scrollPercent + ""
+        }
+    }
+
+    let elementsToHide = document.querySelectorAll(".needEndHide")
+    if (remainingScroll < 100) {
+        elementsToHide.forEach(function (element) {
+            element.classList.add("hide")
+        })
+    } else {
+        elementsToHide.forEach(function (element) {
+            element.classList.remove("hide")
+        })
+    }
+
+    window.onscroll = percent
+}
+
+const handleThemeChange = mode => {
+    const globalFn = window.globalFn || {}
+    const themeChange = globalFn.themeChange || {}
+    if (!themeChange) {
+        return
+    }
+
+    Object.keys(themeChange).forEach(key => {
+        const themeChangeFn = themeChange[key]
+        themeChangeFn(mode)
+    })
+}
 
 const showTodayCard = () => {
     const el = document.getElementById('todayCard')
@@ -282,6 +326,7 @@ let sco = {
             utils.snackbarShow(GLOBAL_CONFIG.lang.theme.light, false, 2000)
             right_menu && rm.mode(false)
         }
+        handleThemeChange(nowMode)
     },
     hideTodayCard: () => document.getElementById('todayCard').classList.add('hide'),
     toTop: () => utils.scrollToDest(0),
@@ -791,6 +836,7 @@ class tabs {
 }
 
 sco.initAdjust()
+percent()
 initObserver()
 addCopyright()
 sco.initConsoleState()
@@ -821,7 +867,6 @@ window.refreshFn = () => {
     (PAGE_CONFIG.is_post || PAGE_CONFIG.is_page) && ((addHighlight()) || tabs.init())
     PAGE_CONFIG.is_home && showTodayCard()
     GLOBAL_CONFIG.covercolor.enable && coverColor()
-    GLOBAL_CONFIG.comment.commentBarrage && PAGE_CONFIG.comment && initializeCommentBarrage()
     PAGE_CONFIG.page === "music" && scoMusic.init()
     GLOBAL_CONFIG.post_ai && PAGE_CONFIG.page === "post" && efu_ai.init()
 }

package/source/js/third_party/efu_ai.min.js

@@ -1,5 +1,5 @@
 /**
- * author: Efu AI
+ * author: Efu
  * email: o@efu.me
  * website: https://efu.me
  */

package/source/js/commentBarrage/twikoo.js

@@ -1,151 +0,0 @@
-function initializeCommentBarrage() {
-    window.commentBarrageInitialized = !0;
-    const e = {
-        maxBarrage: 1,
-        barrageTime: 8e3,
-        twikooUrl: GLOBAL_CONFIG.comment.url,
-        pageUrl: window.location.pathname,
-        accessToken: GLOBAL_CONFIG.comment.accessToken,
-    };
-
-    class CommentBarrage {
-        constructor(config) {
-            this.config = {
-                ...config,
-                barrageTimer: [],
-                barrageList: [],
-                barrageIndex: 0,
-                dom: document.querySelector(".comment-barrage")
-            };
-            this.commentInterval = null;
-            this.hoverOnCommentBarrage = false;
-            this.init();
-        }
-
-        async fetchComments() {
-            try {
-                const response = await 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
-                    })
-                });
-                if (!response.ok) {
-                    throw new Error("HTTP error! status: " + response.status);
-                }
-                const data = await response.json();
-                return data.data;
-            } catch (error) {
-                console.error("An error occurred while fetching comments: ", error);
-            }
-        }
-
-        commentLinkFilter(comments) {
-            comments.sort((a, b) => a.created - b.created);
-            let filteredComments = [];
-            comments.forEach(comment => {
-                filteredComments.push(...this.getCommentReplies(comment));
-            });
-            return filteredComments;
-        }
-
-        getCommentReplies(comment) {
-            let comments = [comment];
-            if (comment.replies) {
-                comment.replies.forEach(reply => {
-                    comments.push(...this.getCommentReplies(reply));
-                });
-            }
-            return comments;
-        }
-
-        processCommentContent(comment) {
-            const strippedContent = comment.replace(/<blockquote\b[^>]*>[\s\S]*?<\/blockquote>/gi, "");
-            const plainText = strippedContent.replace(/<[^>]*>/g, "").replace(/\n/g, " ");
-            return plainText.trim() !== "" ? `<p>${plainText}</p>` : "";
-        }
-
-        popCommentBarrage(comment) {
-            const commentContent = this.processCommentContent(comment.comment);
-            if (!commentContent.trim()) {
-                return false;
-            }
-            const commentBarrageItem = document.createElement("div");
-            commentBarrageItem.className = "comment-barrage-item";
-            commentBarrageItem.innerHTML = `
-                <div class="barrageHead">
-                    <a class="barrageTitle" href="javascript:sco.scrollTo('post-comment')">${GLOBAL_CONFIG.lang.barrage.title}</a>
-                    <div class="barrageNick">${comment.nick}</div>
-                    <img class="barrageAvatar" src="${GLOBAL_CONFIG.comment.avatar}/avatar/${comment.mailMd5}"/>
-                    <a class="comment-barrage-close" href="javascript:sco.switchCommentBarrage();"><i class="solitude st-close-fill"></i></a>
-                </div>
-                <a class="barrageContent" href="javascript:sco.scrollTo('${comment.id}');">${commentContent}</a>
-            `;
-            this.config.barrageTimer.push(commentBarrageItem);
-            this.config.dom.appendChild(commentBarrageItem);
-            return true;
-        }
-
-        removeCommentBarrage(commentBarrageItem) {
-            commentBarrageItem.className = "comment-barrage-item out";
-            setTimeout(() => {
-                this.config.dom.removeChild(commentBarrageItem);
-            }, 1000);
-        }
-
-        async initCommentBarrage() {
-            const commentBarrageSwitch = localStorage.getItem("commentBarrageSwitch");
-            if (commentBarrageSwitch != null) {
-                document.querySelector(".comment-barrage").style.display = "flex";
-                document.querySelector("#consoleCommentBarrage").classList.add("on");
-            } else {
-                document.querySelector(".comment-barrage").style.display = "none";
-                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])) {
-                        this.config.barrageIndex += 1;
-                        this.config.barrageIndex %= this.config.barrageList.length;
-                        return 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;
-            });
-        }
-    }
-
-    new CommentBarrage(e);
-}

package/source/js/commentBarrage/valine.js

@@ -1,156 +0,0 @@
-function initializeCommentBarrage() {
-    window.commentBarrageInitialized = !0;
-    let config = {
-        maxBarrage: 1,
-        barrageTime: 8e3,
-        valineUrl: GLOBAL_CONFIG.comment.url,
-        pageUrl: window.location.pathname,
-    }
-    new class {
-        commentInterval = null
-
-        constructor(config) {
-            this.config = {
-                ...config,
-                barrageTimer: [],
-                barrageList: [],
-                barrageIndex: 0,
-                dom: document.querySelector(".comment-barrage")
-            };
-            this.commentInterval = null;
-            this.hoverOnCommentBarrage = false;
-            this.init();
-        }
-
-        async fetchComments() {
-            const url = new URL(`${this.config.valineUrl}/1.1/classes/Comment`);
-            const params = {
-                url: this.config.pageUrl,
-                order: '-createdAt'
-            };
-
-            for (const [key, value] of Object.entries(params)) {
-                url.searchParams.append(key, value);
-            }
-
-            try {
-                const response = await fetch(url, {
-                    method: "GET",
-                    headers: {
-                        "X-LC-Id": GLOBAL_CONFIG.comment.appId,
-                        "X-LC-Key": GLOBAL_CONFIG.comment.appKey,
-                        "Content-Type": "application/json"
-                    },
-                });
-
-                if (!response.ok) {
-                    throw new Error(`HTTP error! status: ${response.status}`);
-                }
-
-                const data = await response.json();
-                return data.results.filter(item => item.url === this.config.pageUrl)
-            } catch (error) {
-                console.error("An error occurred while fetching comments: ", error);
-            }
-        }
-
-        commentLinkFilter(comments) {
-            return comments.flatMap(comment => this.getCommentReplies(comment));
-        }
-
-        getCommentReplies(comment) {
-            window.comment = comment
-            if (!comment.replies) {
-                return [comment];
-            }
-            return [comment, ...comment.replies.flatMap(reply => this.getCommentReplies(reply))];
-        }
-
-        processCommentContent(comment) {
-            const processed = comment.replace(/```[\s\S]*?```|<blockquote\b[^>]*>[\s\S]*?<\/blockquote>|<[^>]*>|\n|`([^`]{1,9})`:/g, "").trim();
-            return processed ? `<p>${processed}</p>` : "";
-        }
-
-        createCommentBarrage(comment) {
-            const content = this.processCommentContent(comment.comment).trim();
-            if (!content) {
-                return false;
-            }
-
-            const element = document.createElement("div");
-            element.classList.add("comment-barrage-item");
-            element.innerHTML = `
-        <div class="barrageHead">
-            <a class="barrageTitle" href="javascript:sco.scrollTo('post-comment')">${GLOBAL_CONFIG.lang.barrage.title}</a>
-            <div class="barrageNick">${comment.nick}</div>
-            <img class="barrageAvatar" src="${GLOBAL_CONFIG.comment.avatar}/avatar/${md5(comment.mail.toLowerCase())}"/>
-            <a class="comment-barrage-close" href="javascript:sco.switchCommentBarrage();">
-                <i class="solitude st-close-fill"></i>
-            </a>
-        </div>
-        <a class="barrageContent" href="javascript:sco.scrollTo('${comment.objectId}');">${comment.comment}</a>
-    `;
-
-            this.config.dom.appendChild(element);
-            this.config.barrageTimer.push(element);
-
-            return true;
-        }
-
-        removeCommentBarrage(element) {
-            element.className = "comment-barrage-item out";
-            setTimeout(() => {
-                this.config.dom.removeChild(element);
-            }, 1000);
-        }
-
-        async initCommentBarrage() {
-            const commentBarrage = document.querySelector(".comment-barrage");
-            const menuCommentBarrageText = document.querySelector(".menu-commentBarrage-text");
-            const consoleCommentBarrage = document.querySelector("#consoleCommentBarrage");
-
-            if (localStorage.getItem("commentBarrageSwitch") != null) {
-                commentBarrage.style.display = "flex";
-                consoleCommentBarrage.classList.add("on");
-            } else {
-                commentBarrage.style.display = "none";
-                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 createOrRemoveBarrage = () => {
-                if (this.config.barrageList.length && !this.hoverOnCommentBarrage) {
-                    if (!this.createCommentBarrage(this.config.barrageList[this.config.barrageIndex])) {
-                        this.config.barrageIndex = (this.config.barrageIndex + 1) % this.config.barrageList.length;
-                        return createOrRemoveBarrage();
-                    }
-                    this.config.barrageIndex = (this.config.barrageIndex + 1) % 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(() => {
-                createOrRemoveBarrage();
-                if (this.commentInterval) {
-                    clearInterval(this.commentInterval);
-                }
-                this.commentInterval = setInterval(createOrRemoveBarrage, this.config.barrageTime);
-            }, 3000);
-        }
-
-        async init() {
-            await this.initCommentBarrage();
-            const commentBarrage = document.querySelector(".comment-barrage");
-            commentBarrage.addEventListener('mouseover', () => this.hoverOnCommentBarrage = true);
-            commentBarrage.addEventListener('mouseout', () => this.hoverOnCommentBarrage = false);
-        }
-    }
-    (config)
-}