hexo-theme-solitude 1.10.6 → 1.11.1

package/source/css/_page/says.styl

@@ -13,22 +13,13 @@ if hexo-config('says.home_mini')
     user-select none
     align-items center
     padding .5rem 1rem
+    animation slide-in .6s 0s backwards
+    margin-bottom .5rem
 
     &.more-page
       margin-bottom 0
 
-    if hexo-config('hometop.enable')
-      margin-bottom 1rem
-
-    +maxWidth1300()
-      if hexo-config('hometop.enable')
-        margin-bottom 1rem
-      animation slide-in .6s 0s backwards
-
     +minWidth1300()
-      if hexo-config('hometop.enable')
-        margin-bottom .5rem
-      animation slide-in .6s 0s backwards
       &:hover
         border var(--style-border-hover)
         box-shadow var(--efu-shadow-main)
@@ -115,7 +106,8 @@ if hexo-config('says.enable')
         .fa-rectangles-mixed
           margin-right 8px
 
-        .bber-info-time
+        .bber-info-time, .bber-info-location
+          margin-right .5rem
           color var(--efu-fontcolor)
           font-size .7rem
           background-color var(--efu-gray-op)
@@ -140,7 +132,7 @@ if hexo-config('says.enable')
 
         .bber-content-link
           display flex
-          margin-left .5rem
+          margin-right .5rem
           color var(--efu-secondtext)
           font-size .7rem
           align-items center

package/source/js/main.js

@@ -155,6 +155,8 @@ const handleThemeChange = mode => {
 
 // lastSayHello 上次打招呼的内容
 let lastSayHello = "";
+// 用于记录标签页是否被隐藏，从而改变下次执行打招呼的内容
+let wasPageHidden = false;
 // musicPlaying 是否正在播放音乐
 let musicPlaying = false
 // is_rm 是否启用右键菜单
@@ -391,12 +393,35 @@ let sco = {
         if (el) {
             const hours = new Date().getHours();
             const lang = GLOBAL_CONFIG.aside.sayhello;
+
+            const localData = getLocalData(['twikoo', 'WALINE_USER_META', 'WALINE_USER', '_v_Cache_Meta', 'ArtalkUser']);
+
+            function getLocalData(keys) {
+                for (let key of keys) {
+                    const data = localStorage.getItem(key);
+                    if (data) {
+                        console.log(key, data);
+                        return JSON.parse(data);
+                    }
+                }
+                return null;
+            };
+            const nick = localData ? (localData.nick ? localData.nick : localData.display_name) : null;
+
+            let prefix;
+            if (wasPageHidden) {
+                prefix = GLOBAL_CONFIG.aside.sayhello3.back + nick;
+                wasPageHidden = false;
+            } else {
+                prefix = GLOBAL_CONFIG.aside.sayhello3.prefix + nick;
+            }
+
             const greetings = [
-                {start: 0, end: 5, text: lang.goodnight},
-                {start: 6, end: 10, text: lang.morning},
-                {start: 11, end: 14, text: lang.noon},
-                {start: 15, end: 18, text: lang.afternoon},
-                {start: 19, end: 24, text: lang.night},
+                {start: 0, end: 5, text: nick ? prefix : lang.goodnight},
+                {start: 6, end: 10, text: nick ? prefix : lang.morning},
+                {start: 11, end: 14, text: nick ? prefix : lang.noon},
+                {start: 15, end: 18, text: nick ? prefix : lang.afternoon},
+                {start: 19, end: 24, text: nick ? prefix : lang.night},
             ];
             const greeting = greetings.find(g => hours >= g.start && hours <= g.end);
             el.innerText = greeting.text;
@@ -804,6 +829,12 @@ window.refreshFn = () => {
 document.addEventListener('DOMContentLoaded', () => {
     [addCopyright, sco.initConsoleState, window.refreshFn, asideStatus, () => window.onscroll = percent].forEach(fn => fn());
 });
+// 监听切换标签页
+document.addEventListener('visibilitychange', () => {
+    if (document.hidden) {
+        wasPageHidden = true;
+    }
+});
 // 一些快捷键绑定
 window.onkeydown = e => {
     const {keyCode, ctrlKey, shiftKey} = e;