hexo-theme-solitude 1.7.14 → 1.8.0

package/scripts/event/merge_config.js

@@ -1,282 +1,307 @@
 hexo.extend.filter.register('before_generate', () => {
-    const defaultConfig = {
-        site: {
-            name: {
-                class: 'text', custom: 'Solitude'
-            }, siteIcon: '/img/pwa/favicon.ico', icon: 'icon'
-        },
-        nav: {
-            group: null, menu: null, right: {
-                random: false, console: false, custom: [],
-            }
-        },
-        hometop: {
-            enable: false, banner: {
-                title: 'Solitude', url: 'A simple theme for Hexo', icon: null,
-            }, group: null, recommendList: {
-                sup: 'Recommend',
-                title: 'Solitude Docs',
-                url: 'https://solitude-docs.efu.me/',
-                img: '/img/default.png',
-                color: 'none',
-            }
-        },
-        aside: {
-            home: {
-                noSticky: 'about', Sticky: 'allInfo'
+        const defaultConfig = {
+            site: {
+                name: {
+                    class: 'text', custom: 'Solitude'
+                }, siteIcon: '/img/pwa/favicon.ico', icon: 'icon'
             },
-            post: {
-                noSticky: 'about', Sticky: 'allInfo'
+            nav: {
+                group: null, menu: null, right: {
+                    random: false, console: false, custom: [],
+                }
+            },
+            hometop: {
+                enable: false,
+                banner: {
+                    title: 'Solitude',
+                    url: 'A simple theme for Hexo',
+                    icon: null,
+                },
+                group: null,
+                recommendList: {
+                    sup: 'Recommend',
+                    title: 'Solitude Docs',
+                    url: 'https://solitude-docs.efu.me/',
+                    img: '/img/default.png',
+                    color: 'none',
+                }
+            },
+            aside: {
+                home: {
+                    noSticky: 'about', Sticky: 'allInfo'
+                },
+                post: {
+                    noSticky: 'about', Sticky: 'allInfo'
+                },
+                page: {
+                    noSticky: 'about', Sticky: 'allInfo'
+                },
+                card: {
+                    author: {
+                        img: '/img/logo.png', sticker: '/img/happy-sticker.png',
+                    },
+                    url: '/about/',
+                    content1: 'Solitude',
+                    content2: 'A simple theme for Hexo',
+                    sayhello: {
+                        morning: 'Good Morning',
+                        noon: 'Good Noon',
+                        afternoon: 'Good Afternoon',
+                        night: 'Good Night',
+                        goodnight: 'Good Night',
+                    },
+                    sayhello2: ['Welcome to Solitude', 'A simple theme for Hexo', 'Enjoy your time', 'Have a nice day', 'Good luck'],
+                    information: null,
+                },
+                flip: {
+                    favicon: '',
+                    face: '',
+                    backface: '',
+                    backcolor: 'var(--efu-blue)'
+                },
+                toc: {
+                    post: true,
+                    page: false,
+                    vague: true,
+                },
+                tags: {
+                    enable: true,
+                    limit: 20,
+                    highlight: false,
+                    list: [],
+                }, archive: {
+                    enable: true,
+                    type: 'month'
+                }, siteinfo: {
+                    postcount: true,
+                    wordcount: false,
+                    pv: true,
+                    uv: true,
+                    updatetime: true,
+                    runtimeenable: true,
+                    runtime: "2023-04-20 00:00:00",
+                },
+            },
+            index_post_list: {
+                direction: 'column',
+                content: false,
+                length: 500,
+                cover: 'both'
             },
             page: {
-                noSticky: 'about', Sticky: 'allInfo'
+                error: true,
+                tags: true,
+                categories: true,
+                default: {
+                    cover: ['/img/default.png'],
+                }
             },
-            card: {
-                author: {
-                    img: '/img/logo.png', sticker: '/img/happy-sticker.png',
+            post: {
+                default: {
+                    cover: ['/img/default.png'],
+                    locate: 'China, Changsha',
+                    copyright: {
+                        enable: true,
+                        license: 'CC BY-NC-SA 4.0',
+                        licenurl: 'https://creativecommons.org/licenses/by-nc-sa/4.0/',
+                    }
                 },
-                url: '/about/',
-                content1: 'Solitude',
-                content2: 'A simple theme for Hexo',
-                sayhello: {
-                    morning: 'Good Morning',
-                    noon: 'Good Noon',
-                    afternoon: 'Good Afternoon',
-                    night: 'Good Night',
-                    goodnight: 'Good Night',
+                meta: {
+                    date: false,
+                    updated: false,
+                    locate: false,
+                    wordcount: false,
+                    readtime: false,
+                    pv: false,
+                    uv: false,
+                    comment: false,
+                },
+                award: {
+                    enable: false,
+                    appreciators: '/',
+                    title: '感谢您的赞赏。',
+                    desc: '因为有你们的支持，我才体会到写文章的价值。',
+                    list: [],
+                },
+                rss: null,
+                covercolor: {
+                    enable: false,
+                    mode: 'local',
+                    api: 'https://api.qjqq.cn/api/Imgcolor?img=',
+                    time: 43200000,
+                }
+            },
+            theme_color: {
+                dark: "#ffc848",
+                dark_op: "#f2b94b23",
+                dark_op_deep: "#f2b94bdd",
+                dark_none: "#f2b94b00",
+                light: "#425AEF",
+                light_op: "#4259ef23",
+                light_op_deep: "#4259efdd",
+                light_none: "#4259ef01"
+            },
+            display_mode: {
+                type: 'auto',
+                universe: false
+            },
+            related_post: {
+                enable: false,
+                limit: 2,
+                date_type: 'created'
+            },
+            footer: {
+                information: {
+                    left: null,
+                    right: null,
                 },
-                sayhello2: ['Welcome to Solitude', 'A simple theme for Hexo', 'Enjoy your time', 'Have a nice day', 'Good luck'],
-                information: null,
+                group: null,
+                randomlink: false,
+                privacy: null,
+                license: null,
+                links: [{
+                    name: 'Solitude',
+                    url: 'https://github.com/valor-x/hexo-theme-solitude',
+                }]
+            }, errorpage: {
+                img: 'https://7.isyangs.cn/34/65f2e65eae32a-34.png',
+                text: '404 Not Found',
+                recommendList: true
+            }, says: {
+                enable: false,
+                home_mini: false,
+                style: 1,
+                strip: 30
+            },
+            meting_api: "https://meting.qjqq.cn/?server=:server&type=:type&id=:id&auth=:auth&r=:r",
+            music: {
+                enable: false,
+                id: '8407304077',
+                server: 'netease',
+                type: 'playlist',
+                volume: 0.8,
+                mutex: true,
             },
-            flip: {
-                favicon: '',
-                face: '',
-                backface: '',
-                backcolor: 'var(--efu-blue)'
+            capsule: {
+                enable: false,
+                id: '8407304077',
+                server: 'netease',
+                type: 'playlist',
             },
-            toc: {
-                post: true,
-                page: false,
-                vague: true,
+            moments: {
+                enable: false,
+                api: '',
+                error_img: '/img/logo.png',
+                sort_rule: 'created',
+                expire_days: 1,
+                page_init_number: 10,
+                page_turning_number: 5,
+                angle: false,
+                appjs: 'https://cdn.cbd.int/st-source@1.0.3/js/fcircle.min.js',
+                bundlejs: 'https://cdn.cbd.int/st-source/js/moment/bundle.min.js',
+                randompostjs: 'https://cdn.cbd.int/st-source/js/moment/random_post.min.js'
             },
-            tags: {
+            keyboard: {
+                enable: false,
+                list: []
+            }
+            , lazyload: {
+                enable: false,
+                field: 'site',
+                placeholder: '/img/loading.gif',
+                errorimg: '/img/error_load.png'
+            },
+            loading: {
+                fullpage: false,
+                pace: true,
+            },
+            highlight: {
                 enable: true,
-                limit: 20,
-                highlight: false,
-                list: [],
-            }, archive: {
+                limit: 200,
+                copy: true,
+                expand: true,
+                theme: 'default',
+                color: 'default',
+            },
+            lightbox: false,
+            fancybox: false,
+            mediumZoom: false,
+            mermaid: false,
+            OpenGraph: {
+                enable: false,
+                options: null
+            },
+            wordcount: false,
+            busuanzi: false,
+            search: {
+                enable: false,
+                type: 'local',
+                tags: [],
+                algolia: null,
+                local: {
+                    preload: false, CDN: null,
+                }
+            },
+            rightside: {
+                enable: false
+            },
+            copy: {
                 enable: true,
-                type: 'month'
-            }, siteinfo: {
-                postcount: true,
-                wordcount: false,
-                pv: true,
-                uv: true,
-                updatetime: true,
-                runtimeenable: true,
-                runtime: "2023-04-20 00:00:00",
-            },
-        },
-        index_post_list: {
-            direction: 'column',
-            content: false,
-            length: 500,
-            cover: 'both'
-        },
-        page: {
-            error: true,
-            tags: true,
-            categories: true,
-            default: {
-                cover: ['/img/default.png'],
-            }
-        },
-        post: {
-            default: {
-                cover: ['/img/default.png'],
-                locate: 'China, Changsha',
                 copyright: {
-                    enable: true,
-                    license: 'CC BY-NC-SA 4.0',
-                    licenurl: 'https://creativecommons.org/licenses/by-nc-sa/4.0/',
+                    enable: false,
+                    limit: 50
                 }
             },
-            meta: {
-                date: false,
-                updated: false,
-                locate: false,
-                wordcount: false,
-                readtime: false,
-                pv: false,
-                uv: false,
-                comment: false,
-            },
-            award: {
+            post_ai: {
                 enable: false,
-                appreciators: '/',
-                title: '感谢您的赞赏。',
-                desc: '因为有你们的支持，我才体会到写文章的价值。',
-                list: [],
+                modelName: 'GPT 3',
+                key: 'your key',
+                talk: 'I am a AI.',
+                randomPost: false,
+                tips: 'AI is not perfect, please use it with caution.'
             },
-            rss: null,
-            covercolor: {
-                enable: false,
-                mode: 'local',
-                api: 'https://api.qjqq.cn/api/Imgcolor?img=',
-                time: 43200000,
-            }
-        },
-        theme_color: {
-            dark: "#ffc848",
-            dark_op: "#f2b94b23",
-            dark_op_deep: "#f2b94bdd",
-            dark_none: "#f2b94b00",
-            light: "#425AEF",
-            light_op: "#4259ef23",
-            light_op_deep: "#4259efdd",
-            light_none: "#4259ef01"
-        },
-        display_mode: {
-            type: 'auto',
-            universe: false
-        },
-        related_post: {
-            enable: false,
-            limit: 2,
-            date_type: 'created'
-        },
-        footer: {
-            information: {
-                left: null,
-                right: null,
-            },
-            group: null,
-            randomlink: false,
-            privacy: null,
-            license: null,
-            links: [{
-                name: 'Solitude',
-                url: 'https://github.com/valor-x/hexo-theme-solitude',
-            }]
-        }, errorpage: {
-            img: 'https://7.isyangs.cn/34/65f2e65eae32a-34.png',
-            text: '404 Not Found',
-            recommendList: true
-        }, says: {
-            enable: false,
-            home_mini: false,
-            style: 1,
-            strip: 30
-        },
-        meting_api: "https://meting.qjqq.cn/?server=:server&type=:type&id=:id&auth=:auth&r=:r",
-        music: {
-            enable: false,
-            id: '8407304077',
-            server: 'netease',
-            type: 'playlist',
-            volume: 0.8,
-            mutex: true,
-        },
-        capsule: {
-            enable: false,
-            id: '8407304077',
-            server: 'netease',
-            type: 'playlist',
-        },
-        moments: {
-            enable: false,
-            api: '',
-            error_img: '/img/logo.png',
-            sort_rule: 'created',
-            expire_days: 1,
-            page_init_number: 10,
-            page_turning_number: 5,
-            angle: false,
-            appjs: 'https://cdn.cbd.int/st-source@1.0.3/js/fcircle.min.js',
-            bundlejs: 'https://cdn.cbd.int/st-source/js/moment/bundle.min.js',
-            randompostjs: 'https://cdn.cbd.int/st-source/js/moment/random_post.min.js'
-        },
-        keyboard: {
-            enable: false,
-            list: []
-        }
-        , lazyload: {
-            enable: false,
-            field: 'site',
-            placeholder: '/img/loading.gif',
-            errorimg: '/img/error_load.png'
-        },
-        loading: {
-            fullpage: false,
-            pace: true,
-        },
-        highlight: {
-            enable: true,
-            limit: 200,
-            copy: true,
-            expand: true,
-            theme: 'default',
-            color: 'default',
-        },
-        lightbox: false,
-        fancybox: false,
-        mediumZoom: false,
-        mermaid: false,
-        OpenGraph: {
-            enable: false,
-            options: null
-        },
-        wordcount: false,
-        busuanzi: false,
-        search: {
-            enable: false,
-            type: 'local',
-            tags: [],
-            algolia: null,
-            local: {
-                preload: false, CDN: null,
-            }
-        },
-        rightside: {
-            enable: false
-        },
-        copy: {
-            enable: true,
-            copyright: {
+            katex: {
                 enable: false,
-                limit: 50
-            }
-        },
-        post_ai: {
-            enable: false,
-            modelName: 'GPT 3',
-            key: 'your key',
-            talk: 'I am a AI.',
-            randomPost: false,
-            tips: 'AI is not perfect, please use it with caution.'
-        },
-        katex: {
-            enable: false,
-            per_page: false,
-            copytex: false,
-        },
-        comment: {
-            enable: false,
-            type: '',
-            commentBarrage: false,
-            newComment: false,
-            randomInfoStart: [`baby's`, `little`, `my`,],
-            randomInfoEnd: [`home`, `world`, `heart`,],
+                per_page: false,
+                copytex: false,
+            },
+            comment: {
+                use: null,
+                commentBarrage: false,
+                lazyload: false,
+                count: false,
+                avatar: 'https://cravatar.cn',
+                newest_comment: {
+                    enable: false,
+                    storage: .2
+                }
+            },
             twikoo: {
                 envId: 'your envId',
-                lang: 'zh-CN',
+                region: null,
+                style: true,
                 accessToken: null,
+                option: null,
             },
             waline: {
                 envId: 'your envId',
                 pageview: true,
                 option: null,
             },
+            valine: {
+                appId: 'your appId',
+                appKey: 'your appKey',
+                serverURLs: 'your serverURLs',
+                avatar: 'monsterid',
+                visitor: false,
+                style: true,
+                option: null,
+            },
+            artalk: {
+                server: 'your server',
+                site: 'your site-name',
+                option: null,
+            },
             verify_site: [],
             css_prefix: false,
             font: {
@@ -327,6 +352,6 @@ hexo.extend.filter.register('before_generate', () => {
                 }
             }
         }
-    }
-    hexo.theme.config = Object.assign(defaultConfig, hexo.theme.config)
-}, 1)
+        hexo.theme.config = Object.assign(defaultConfig, hexo.theme.config)
+    }, 1
+)

package/scripts/filter/comment.js

@@ -0,0 +1,13 @@
+/**
+ * 将 use 分拆并将首字大写
+ */
+
+hexo.extend.filter.register('before_generate', () => {
+    const themeConfig = hexo.theme.config
+    let { use } = themeConfig.comment
+    if (!use) return
+    if (typeof use === 'string') {
+        use = use.split(',').slice(0,2)
+    }
+    themeConfig.comment.use = use.map(item => item.toLowerCase().replace(/\b[a-z]/g, s => s.toUpperCase()))
+})

package/source/css/_comments/comment.styl

@@ -50,10 +50,6 @@
           &::before
             transform translateX(20px)
 
-  .comment-wrap
-    > div:nth-child(2)
-      display none
-
 .post-comment
   background var(--efu-card-bg)
 
@@ -81,26 +77,91 @@ div#post-comment
     color var(--efu-secondtext)
     border-radius 8px
 
+  if hexo-config('comment.use')[1]
+    &.move
+      if hexo-config('comment.count')
+        .comment-head
+          .count span:first-child
+            display none
+
+          .count span:last-child
+            display inline-block
+
+      #switch-btn::before
+        transform translateX(20px)
+
+      .comment-wrap
+        > div:first-child
+          display none
+
+        > div:last-child
+          display block
+          animation 0.5s ease 0s 1 normal none running tabshow
+
   .comment-head
-    font-size .8em !important
+    font-size .8em
     margin-bottom .5rem
-    display flex
-    align-items center
-    flex-wrap wrap
     position relative
 
+    if hexo-config('comment.use')[1]
+      .count span:last-child
+        display none
+
+      .comment-switch
+        display inline-block
+        float right
+        margin 2px auto 0
+        padding 4px 16px
+        width max-content
+        user-select none
+
+        #switch-btn
+          position relative
+          display inline-block
+          margin 0 8px 0
+          width 42px
+          height 22px
+          border-radius 34px
+          background-color var(--efu-main)
+          vertical-align middle
+          cursor pointer
+          transition .4s
+          border var(--style-border-always)
+
+          &::before
+            position absolute
+            bottom 3px
+            left 4px
+            width 14px
+            height 14px
+            border-radius 50%
+            background-color #fff
+            content ''
+            transition .4s
+
+  if hexo-config('comment.use')[1]
+    .comment-wrap
+      > div:last-child
+        display none
+
+      > div:first-child
+        animation 0.5s ease 0s 1 normal none running tabshow
+
 #owo-big
   position fixed
   align-items center
-  background-color var(--heo-card-bg)
+  background-color var(--efu-card-bg)
   border var(--style-border-always)
   border-radius 10px
   z-index 9999
   display none
   transform translate(0, -105%)
   overflow hidden
-  animation owoIn .3s cubic-bezier(.42,0,.3,1.11)
+  animation owoIn .3s cubic-bezier(.42, 0, .3, 1.11)
   padding 1rem
 
-@import 'twikoo.styl' when hexo-config('comment.type') == 'twikoo'
-@import 'valine.styl' when hexo-config('comment.type') == 'valine'
+if hexo-config('twikoo.style') && 'Twikoo' in hexo-config('comment.use')
+  @import 'twikoo.styl'
+
+if hexo-config('valine.style') && 'Valine' in hexo-config('comment.use')
+  @import 'valine.styl'

package/source/css/_comments/valine.styl

@@ -1,4 +1,4 @@
-#comment
+#vcomment
   .vcount
     display none !important