hexo-theme-solitude 1.7.3 → 1.7.4

package/_config.yml

@@ -164,6 +164,7 @@ aside:
   page:
     noSticky: "about"
     Sticky: "newestPost,allInfo"
+  position: 0 # left(0): 左侧 / right(1): 右侧
   # 侧边栏个人信息卡片
   # Sidebar personal information
   card:
@@ -708,6 +709,7 @@ comment:
   commentBarrage: false # 热评开关 / Hot comment switch
   lazyload: true # 懒加载
   count: true # 评论数展示
+  avatar: https://cravatar.cn # Gravatar link
   newest_comment:
     enable: false
     storage: 421000 # 缓存时间

package/languages/en.yml

@@ -16,15 +16,12 @@ copy_copyright:
   source: Source
   info: Copyright is owned by the author. For commercial reprints, please contact the author for authorization. For non-commercial reprints, please indicate the source.
 
-lately:
-  second: ' second'
-  minute: ' minute'
-  hour: ' hour'
-  day: ' day'
-  month: ' month'
-  year: ' year'
-  ago: ' ago'
-  error: ' NaN'
+time:
+  day: " days ago"
+  hour: " hours ago"
+  just: "just"
+  min: " minutes ago"
+  month: " months ago"
 
 page:
   tag: Tags

package/languages/zh-CN.yml

@@ -17,15 +17,12 @@ copy_copyright:
   source: 来源
   info: 著作权归作者所有。 商业转载请联系作者获得授权，非商业转载请注明出处。
 
-lately:
-  second: 秒
-  minute: 分钟
-  hour: 小时
-  day: 天
-  month: 个月
-  year: 年
-  ago: 前
-  error: NaN
+time:
+  day: "天前"
+  hour: "小时前"
+  just: "刚刚"
+  min: "分钟前"
+  month: "个月前"
 
 page:
   tag: 标签

package/languages/zh-TW.yml

@@ -17,15 +17,12 @@ copy_copyright:
   source: 來源
   info: 著作權歸作者所有。 商業轉載請聯繫作者獲得授權，非商業轉載請註明出處。
 
-lately:
-  second: 秒
-  minute: 分鐘
-  hour: 小時
-  day: 天
-  month: 个月
-  year: 年
-  ago: 前
-  error: NaN
+time:
+  day: "天前"
+  hour: "小時前"
+  just: "剛剛"
+  min: "分鐘前"
+  month: "個月前"
 
 page:
   tag: 標籤

package/layout/includes/head/config.pug

@@ -97,15 +97,12 @@
             error: _p('copy.error'),
         },
         backtop: _p('nav.backtop'),
-        lately: {
-            second: _p('lately.second'),
-            minute: _p('lately.minute'),
-            hour: _p('lately.hour'),
-            day: _p('lately.day'),
-            month: _p('lately.month'),
-            year: _p('lately.year'),
-            ago: _p('lately.ago'),
-            error: _p('lately.error'),
+        time: {
+            day: _p('time.day'),
+            hour: _p('time.hour'),
+            just: _p('time.just'),
+            min: _p('time.min'),
+            month: _p('time.month')
         },
         f12: _p('f12'),
     }

package/layout/includes/inject/body.pug

@@ -18,9 +18,6 @@ div
         // md5
         script(src=url_for(theme.cdn.blueimp_md5))
 
-    // lately
-    script(src=url_for(theme.cdn.lately_js))
-
     if theme.mermaid
         script(src=url_for(theme.cdn.mermaid_js))
 

package/layout/includes/inject/head.pug

@@ -111,7 +111,7 @@ script.
     )(window)
 
     console.log(
-        "%c Program: Hexo %c Theme: Solitude %c Version: v1.7.3",
+        "%c Program: Hexo %c Theme: Solitude %c Version: v1.7.4",
         "border-radius:5px 0 0 5px;padding: 5px 10px;color:white;background:#ff3842;",
         "padding: 5px 10px;color:white;background:#3e9f50;",
         "border-radius:0 5px 5px 0;padding: 5px 10px;background:#0084ff;color:white;"

package/layout/index.pug

@@ -1,11 +1,12 @@
 extends includes/layout
 
 block content
-    #home_top
-        if theme.says.home_mini
-            include ./includes/widgets/home/bbTimeList
-        if theme.hometop.enable && is_home_first_page()
-            include ./includes/widgets/home/hometop
+    if theme.hometop.enable || theme.says.home_mini
+        #home_top
+            if theme.says.home_mini
+                include ./includes/widgets/home/bbTimeList
+            if theme.hometop.enable && is_home_first_page()
+                include ./includes/widgets/home/hometop
     main.layout#content-inner
         .recent-posts#recent-posts
             #category-bar
@@ -15,6 +16,5 @@ block content
 
             // pageination
             include ./includes/mixins/pagination
-
         // aside
         include ./includes/widgets/aside/aside

package/package.json

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

package/scripts/event/cdn.js

@@ -83,12 +83,7 @@ hexo.extend.filter.register('before_generate', () => {
             name: 'hexo-theme-solitude',
             file: 'js/third_party/universe.min.js',
             version
-        },
-        lately_js: {
-            name: 'hexo-theme-solitude',
-            file: 'js/third_party/lately.min.js',
-            version
-        },
+        }
     }
 
     const minFile = file => {

package/scripts/event/merge_config.js

@@ -82,9 +82,10 @@ hexo.extend.filter.register('before_generate', () => {
                 comment: false,
             }, award: {
                 enable: false,
-                wechat: 'https://7.isyangs.cn/34/65f2e5814db1a-34.png',
-                alipay: 'https://7.isyangs.cn/34/65f2e5a6d2ef5-34.png',
-                url: '/about/',
+                appreciators: '/',
+                title: '感谢您的赞赏。',
+                desc: '因为有你们的支持，我才体会到写文章的价值。',
+                list: [],
             }, rss: null, covercolor: {
                 enable: false, mode: 'local', api: 'https://api.qjqq.cn/api/Imgcolor?img=', time: 43200000,
             }

package/scripts/filter/default.js

@@ -10,7 +10,7 @@ hexo.extend.filter.register('after_post_render', function (data) {
         data.cc = data.cc || copyright
         data.cover = data.cover || cover[getRandomInt(0, cover?.length)]
         data.excerpt = data.description || data.excerpt
-        data.toc = !!(config.aside.toc.post && data.toc !== false);
+        data.toc = !!(config.aside.toc.post && data.toc !== false)
     }
     if (data.layout === 'page') {
         let {cover} = hexo.theme.config.page.default

package/source/css/_global/index.styl

@@ -389,7 +389,7 @@ i.solitude
     +maxWidth1200()
       width 100%
 
-  > div:first-child:not(.recent-posts)
+  > div:first-child:not(.recent-posts,.aside-content)
     box-shadow var(--efu-shadow-border)
     padding 1rem 2rem
     border-radius 12px
@@ -398,6 +398,8 @@ i.solitude
     align-self flex-start
     animation slide-in .6s .1s backwards
     position relative
+    if hexo-config('aside.position') == 0
+      order 2
 
     +maxWidth768()
       box-shadow none

package/source/css/_layout/article-container.styl

@@ -194,4 +194,11 @@
 
     h4
       font-size 1.1rem
-      line-height 1.3
+      line-height 1.3
+
+if hexo-config('mediumZoom')
+  .medium-zoom--opened .medium-zoom-overlay
+    z-index 10
+
+  .medium-zoom-image--opened
+    z-index 11

package/source/css/_layout/aside.styl

@@ -15,8 +15,11 @@
     display none
 
   +minWidth1300()
-    padding-left 1rem
     animation slide-in .6s .3s backwards
+    if hexo-config('aside.position') == 0
+      padding-right 1rem
+    else
+      padding-left 1rem
 
   .item-headline
     padding-bottom 0

package/source/css/_page/_home/home.styl

@@ -1,11 +1,12 @@
-#home_top
-  max-width 1400px
-  margin .5rem auto auto
-  padding 0 1.5rem
+if hexo-config('hometop.enable') || hexo-config('says.enable')
+  #home_top
+    max-width 1400px
+    margin .5rem auto auto
+    padding 0 1.5rem
 
-  +maxWidth768()
-    padding 0
-    margin-top 0
+    +maxWidth768()
+      padding 0
+      margin-top 0
 
 if hexo-config('hometop.enable')
   @import "home-top.styl"

package/source/css/_page/_home/recent-post.styl

@@ -1,3 +1,7 @@
+#recent-posts
+  if hexo-config('aside.position') == 0
+      order 2
+
 if hexo-config('index_post_list.direction') == "column"
   #recent-posts
     position relative

package/source/js/main.js

@@ -332,14 +332,17 @@ let sco = {
     },
     addRuntime: function () {
         let el = document.getElementById('runtimeshow')
-        el && GLOBAL_CONFIG.runtime && (el.innerText = utils.timeDiff(new Date(GLOBAL_CONFIG.runtime), new Date()) + GLOBAL_CONFIG.lang.lately.day)
+        el && GLOBAL_CONFIG.runtime && (el.innerText = utils.timeDiff(new Date(GLOBAL_CONFIG.runtime), new Date()) + GLOBAL_CONFIG.lang.time.day)
     },
     toTalk: function (txt) {
         const inputs = ["#wl-edit", ".el-textarea__inner"]
         for (let i = 0; i < inputs.length; i++) {
             let el = document.querySelector(inputs[i])
             if (el != null) {
-                el.dispatchEvent(new Event('input', {bubble: true, cancelable: true}))
+                el.dispatchEvent(new Event('input', {
+                    bubble: true,
+                    cancelable: true
+                }))
                 el.value = '> ' + txt.replace(/\n/g, '\n> ') + '\n\n'
                 utils.scrollToDest(utils.getEleTop(document.getElementById('post-comment')), 300)
                 el.focus()
@@ -383,12 +386,31 @@ let sco = {
             const timeNow = new Date();
             const hours = timeNow.getHours();
             const lang = GLOBAL_CONFIG.aside.sayhello;
-            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},
+            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
+                },
             ];
             for (let greeting of greetings) {
                 if (hours >= greeting.start && hours <= greeting.end) {
@@ -631,6 +653,13 @@ let sco = {
 
         document.addEventListener('mouseover', debounce(showOwoBig, 100));
         document.addEventListener('mouseout', hideOwoBig);
+    },
+    changeTimeFormat(selector) {
+        selector.forEach(item => {
+            const timeVal = item.getAttribute('datetime')
+            item.textContent = utils.diffDate(timeVal, true)
+            item.style.display = 'inline'
+        })
     }
 }
 
@@ -638,7 +667,12 @@ const addHighlight = () => {
     const highlight = GLOBAL_CONFIG.highlight;
     if (!highlight) return;
 
-    const {copy, expand, limit, syntax} = highlight;
+    const {
+        copy,
+        expand,
+        limit,
+        syntax
+    } = highlight;
     const $isPrismjs = syntax === 'prismjs';
     const $isShowTool = highlight.enable || copy || expand || limit;
     const expandClass = !expand === true ? 'closed' : ''
@@ -722,7 +756,9 @@ const addHighlight = () => {
         $syntaxHighlight.forEach(item => {
             const langName = item.getAttribute('data-language') || 'Code'
             const highlightLangEle = `<div class="code-lang">${langName}</div>`
-            utils.wrap(item, 'figure', {class: 'highlight'})
+            utils.wrap(item, 'figure', {
+                class: 'highlight'
+            })
             createEle(highlightLangEle, item)
         })
     } else {
@@ -737,7 +773,13 @@ const addHighlight = () => {
 
 const addCopyright = () => {
     if (!GLOBAL_CONFIG.copyright) return
-    const {limit, author, link, source, info} = GLOBAL_CONFIG.copyright
+    const {
+        limit,
+        author,
+        link,
+        source,
+        info
+    } = GLOBAL_CONFIG.copyright
     const handleCopy = (e) => {
         e.preventDefault()
         const copyText = window.getSelection(0).toString()
@@ -792,11 +834,17 @@ class tabs {
 }
 
 window.refreshFn = () => {
+    if (PAGE_CONFIG.is_home) {
+        sco.changeTimeFormat(document.querySelectorAll('#recent-posts time'))
+        GLOBAL_CONFIG.runtime && sco.addRuntime()
+    } else {
+        sco.changeTimeFormat(document.querySelectorAll('#post-meta time'))
+    }
+
     sco.initAdjust()
     scrollFn()
     sidebarFn()
     initObserver()
-    sco.addRuntime()
     sco.hideCookie()
     sco.addPhotoFigcaption()
     sco.setTimeState()
@@ -804,7 +852,6 @@ window.refreshFn = () => {
     sco.categoriesBarActive()
     sco.listenToPageInputPress()
     sco.addNavBackgroundInit()
-    utils.changeTimeFormat()
     GLOBAL_CONFIG.lazyload.enable && utils.lazyloadImg()
     GLOBAL_CONFIG.lightbox && utils.lightbox(document.querySelectorAll("#article-container img:not(.flink-avatar)"))
     GLOBAL_CONFIG.randomlink && randomLinksList()
@@ -830,4 +877,4 @@ window.onkeydown = function (e) {
     (27 === e.keyCode) && sco.hideConsole();
 }
 
-document.addEventListener('copy', () => utils.snackbarShow(GLOBAL_CONFIG.lang.copy.success,false,3e3))
+document.addEventListener('copy', () => utils.snackbarShow(GLOBAL_CONFIG.lang.copy.success, false, 3e3))

package/source/js/utils.js

@@ -72,7 +72,10 @@ const utils = {
         const dur = (typeof duration !== 'undefined') ? duration : 5000
         document.styleSheets[0].addRule(':root', '--efu-snackbar-time:' + dur + 'ms!important')
         Snackbar.show({
-            text: text, showAction: sa, duration: dur, pos: 'top-center'
+            text: text,
+            showAction: sa,
+            duration: dur,
+            pos: 'top-center'
         })
     },
 
@@ -109,7 +112,8 @@ const utils = {
         if (currentPos > pos || isNavFixed) pos = pos - 70
         if ('scrollBehavior' in document.documentElement.style) {
             window.scrollTo({
-                top: pos, behavior: 'smooth'
+                top: pos,
+                behavior: 'smooth'
             })
             return
         }
@@ -175,7 +179,10 @@ const utils = {
     },
     lazyloadImg: function () {
         window.lazyLoadInstance = new LazyLoad({
-            elements_selector: 'img', threshold: 0, data_src: 'lazy-src', callback_error: (img) => {
+            elements_selector: 'img',
+            threshold: 0,
+            data_src: 'lazy-src',
+            callback_error: (img) => {
                 img.setAttribute("src", GLOBAL_CONFIG.lazyload.error);
             }
         })
@@ -184,7 +191,9 @@ const utils = {
         const lightbox = GLOBAL_CONFIG.lightbox
 
         if (lightbox === 'mediumZoom' && mediumZoom) {
-            mediumZoom(selector, {background: "var(--efu-card-bg)"});
+            mediumZoom(selector, {
+                background: "var(--efu-card-bg)"
+            });
         }
 
         if (lightbox === 'fancybox') {
@@ -204,15 +213,19 @@ const utils = {
 
             if (!window.fancyboxRun) {
                 Fancybox.bind('[data-fancybox]', {
-                    Hash: false, Thumbs: {
+                    Hash: false,
+                    Thumbs: {
                         showOnStart: false
-                    }, Images: {
+                    },
+                    Images: {
                         Panzoom: {
                             maxScale: 4
                         }
-                    }, Carousel: {
+                    },
+                    Carousel: {
                         transition: 'slide'
-                    }, Toolbar: {
+                    },
+                    Toolbar: {
                         display: {
                             left: ['infobar'],
                             middle: ['zoomIn', 'zoomOut', 'toggle1to1', 'rotateCCW', 'rotateCW', 'flipX', 'flipY'],
@@ -230,6 +243,32 @@ const utils = {
             lang: GLOBAL_CONFIG.lang.lately,
         })
     },
+    diffDate: (d, more = false) => {
+        const dateNow = new Date()
+        const datePost = new Date(d)
+        const dateDiff = dateNow.getTime() - datePost.getTime()
+        const minute = 1000 * 60
+        const hour = minute * 60
+        const day = hour * 24
+        const month = day * 30
+        const {
+            time
+        } = GLOBAL_CONFIG.lang
+
+        if (!more) return parseInt(dateDiff / day)
+
+        const monthCount = dateDiff / month
+        const dayCount = dateDiff / day
+        const hourCount = dateDiff / hour
+        const minuteCount = dateDiff / minute
+
+        if (monthCount > 12) return datePost.toISOString().slice(0, 10)
+        if (monthCount >= 1) return `${parseInt(monthCount)} ${time.month}`
+        if (dayCount >= 1) return `${parseInt(dayCount)} ${time.day}`
+        if (hourCount >= 1) return `${parseInt(hourCount)} ${time.hour}`
+        if (minuteCount >= 1) return `${parseInt(minuteCount)} ${time.min}`
+        return time.just
+    },
     loadComment: (dom, callback) => {
         if ('IntersectionObserver' in window) {
             const observerItem = new IntersectionObserver((entries) => {
@@ -237,7 +276,9 @@ const utils = {
                     callback()
                     observerItem.disconnect()
                 }
-            }, { threshold: [0] })
+            }, {
+                threshold: [0]
+            })
             observerItem.observe(dom)
         } else {
             callback()