Merge branch 'dev'

Revert "Add Knocket as a free live chat option (alongside Chatra/Tidio/Crisp)"

README.md

@@ -124,6 +124,7 @@ npm install hexo-renderer-pug hexo-renderer-stylus --save
 - [x] **Theme Customization** - Custom site color schemes
 - [x] **Chart Support** - Mermaid flowcharts/Chart.js data charts
 - [x] **Music Notation** - ABCJS music notation support
+- [x] **Music Player** - APlayer/Meting music playback
 - [x] **Article Series** - Series article organization
 - [x] **Instantpage** - Page preloading acceleration
 - [x] **Snackbar** - Elegant notification messages

README_CN.md

@@ -124,6 +124,7 @@ npm install hexo-renderer-pug hexo-renderer-stylus --save
 - [x] **主題定製** - 自訂網站配色方案
 - [x] **圖表支援** - Mermaid 流程圖/Chart.js 數據圖表
 - [x] **音樂符號** - ABCJS 音樂記譜法支援
+- [x] **音樂播放器** - APlayer/Meting 音樂播放功能
 - [x] **系列文章** - 系列文章組織功能
 - [x] **Instantpage** - 頁面預載入加速
 - [x] **Snackbar** - 優雅的提示訊息

_config.yml

@@ -993,6 +993,11 @@ pjax:
   exclude:
     # - /xxxxxx/
 
+# Inject the css and script (aplayer/meting)
+aplayerInject:
+  enable: false
+  per_page: true
+
 # Snackbar - Toast Notification
 # https://github.com/polonel/SnackBar
 # position: top-left / top-center / top-right / bottom-left / bottom-center / bottom-right
@@ -1083,6 +1088,8 @@ CDN:
     # activate_power_mode:
     # algolia_js:
     # algolia_search:
+    # aplayer_css:
+    # aplayer_js:
     # artalk_css:
     # artalk_js:
     # blueimp_md5:
@@ -1115,6 +1122,7 @@ CDN:
     # mathjax:
     # medium_zoom:
     # mermaid:
+    # meting_js:
     # prismjs_autoloader:
     # prismjs_js:
     # prismjs_lineNumber_js:

layout/includes/additional-js.pug

@@ -41,6 +41,10 @@ div
   != partial("includes/third-party/effect", {}, { cache: true })
   != partial("includes/third-party/chat/index", {}, { cache: true })
 
+  if theme.aplayerInject && theme.aplayerInject.enable
+    if theme.pjax.enable || theme.aplayerInject.per_page || page.aplayer
+      include ./third-party/aplayer.pug
+
   if theme.pjax.enable
     != partial("includes/third-party/pjax", {}, { cache: true })
 

layout/includes/page/shuoshuo.pug

@@ -161,7 +161,7 @@
           container.innerHTML = content
 
           window.lazyLoadInstance && window.lazyLoadInstance.update()
-          document.dispatchEvent(new Event('shuoshuo:rendered'))
+          btf.loadLightbox(document.querySelectorAll('#article-container img:not(.no-lightbox)'))
         }
 
         const setupNavEvents = (nav) => {

layout/includes/third-party/aplayer.pug

@@ -0,0 +1,23 @@
+link(rel='stylesheet' href=url_for(theme.asset.aplayer_css) media="print" onload="this.media='all'")
+script(src=url_for(theme.asset.aplayer_js))
+script(src=url_for(theme.asset.meting_js))
+if theme.pjax.enable
+  script.
+    (() => {
+      const destroyAplayer = () => {
+        if (window.aplayers) {
+          for (let i = 0; i < window.aplayers.length; i++) {
+            if (!window.aplayers[i].options.fixed) {
+              window.aplayers[i].destroy()
+            }
+          }
+        }
+      }
+
+      const runMetingJS = () => {
+        typeof loadMeting === 'function' && document.getElementsByClassName('aplayer').length && loadMeting()
+      }
+
+      btf.addGlobalFn('pjaxSend', destroyAplayer, 'destroyAplayer')
+      btf.addGlobalFn('pjaxComplete', loadMeting, 'runMetingJS')
+    })()

layout/includes/third-party/comments/index.pug

@@ -43,13 +43,4 @@ hr.custom-hr
           when 'Remark42'
             #remark42
           when 'Artalk'
-            if theme.artalk.vote
-              .artalk-vote
-                span.artalk-page-vote-up
-                  i.fas.fa-thumbs-up
-                  span.artalk-page-vote-up-count
-                span.artalk-page-vote-down
-                  i.fas.fa-thumbs-down
-                  span.artalk-page-vote-down-count
             #artalk-wrap
-

package.json

@@ -1,6 +1,6 @@
 {
   "name": "hexo-theme-butterfly",
-  "version": "5.7.0",
+  "version": "5.6.1",
   "description": "A Simple and Card UI Design theme for Hexo",
   "main": "package.json",
   "scripts": {
@@ -26,7 +26,7 @@
     "hexo-renderer-pug": "^3.0.0",
     "hexo-renderer-stylus": "^3.0.1",
     "hexo-util": "^4.0.0",
-    "moment-timezone": "^0.6.3"
+    "moment-timezone": "^0.6.2"
   },
   "homepage": "https://butterfly.js.org/",
   "author": "Jerry <my@crazywong.com>",

plugins.yml

@@ -10,14 +10,22 @@ algolia_search:
   name: algoliasearch
   file: dist/lite/builds/browser.umd.js
   version: 5.56.0
+aplayer_css:
+  name: aplayer
+  file: dist/APlayer.min.css
+  version: 1.10.1
+aplayer_js:
+  name: aplayer
+  file: dist/APlayer.min.js
+  version: 1.10.1
 artalk_css:
   name: artalk
   file: dist/Artalk.css
-  version: 2.10.0
+  version: 2.9.1
 artalk_js:
   name: artalk
   file: dist/Artalk.js
-  version: 2.10.0
+  version: 2.9.1
 blueimp_md5:
   name: blueimp-md5
   file: js/md5.min.js
@@ -58,12 +66,12 @@ docsearch_css:
   name: '@docsearch/css'
   other_name: docsearch-css
   file: dist/style.css
-  version: 4.7.0
+  version: 4.6.3
 docsearch_js:
   name: '@docsearch/js'
   other_name: docsearch-js
   file: dist/umd/index.js
-  version: 4.7.0
+  version: 4.6.3
 egjs_infinitegrid:
   name: '@egjs/infinitegrid'
   other_name: egjs-infinitegrid
@@ -72,13 +80,13 @@ egjs_infinitegrid:
 fancybox:
   name: '@fancyapps/ui'
   file: dist/fancybox/fancybox.umd.js
-  other_name: fancyapps-ui
   version: 6.1.14
+  other_name: fancyapps-ui
 fancybox_css:
   name: '@fancyapps/ui'
   file: dist/fancybox/fancybox.css
-  other_name: fancyapps-ui
   version: 6.1.14
+  other_name: fancyapps-ui
 fireworks:
   name: butterfly-extsrc
   file: dist/fireworks.min.js
@@ -104,12 +112,12 @@ katex:
   name: katex
   file: dist/katex.min.css
   other_name: KaTeX
-  version: 0.18.1
+  version: 0.17.0
 katex_copytex:
   name: katex
   file: dist/contrib/copy-tex.min.js
   other_name: KaTeX
-  version: 0.18.1
+  version: 0.17.0
 lazyload:
   name: vanilla-lazyload
   file: dist/lazyload.iife.min.js
@@ -126,6 +134,10 @@ mermaid:
   name: mermaid
   file: dist/mermaid.min.js
   version: 11.16.0
+meting_js:
+  name: butterfly-extsrc
+  file: metingjs/dist/Meting.min.js
+  version: 1.1.6
 pace_default_css:
   name: pace-js
   other_name: pace
@@ -174,7 +186,7 @@ snackbar_css:
 twikoo:
   name: twikoo
   file: dist/twikoo.all.min.js
-  version: 1.7.15
+  version: 1.7.14
 typed:
   name: typed.js
   file: dist/typed.umd.js

scripts/common/default_config.js

@@ -378,7 +378,6 @@ module.exports = {
     server: null,
     site: null,
     visitor: false,
-    vote: false,
     option: null
   },
   chat: {
@@ -556,6 +555,10 @@ module.exports = {
     enable: false,
     exclude: null
   },
+  aplayerInject: {
+    enable: false,
+    per_page: true
+  },
   snackbar: {
     enable: false,
     position: 'bottom-left',

scripts/events/404.js

@@ -6,8 +6,7 @@
 'use strict'
 
 hexo.extend.generator.register('404', function (locals) {
-  const error404 = hexo.theme.config.error_404 || {}
-  if (!error404.enable) return
+  if (!hexo.theme.config.error_404.enable) return
   return {
     path: '404.html',
     layout: ['page'],

scripts/events/cdn.js

@@ -8,19 +8,11 @@
 const { version } = require('../../package.json')
 const path = require('path')
 
-// Cache plugins.yml to avoid re-rendering on every generate
-let cachedPlugins = null
-const loadPlugins = hexo => {
-  if (cachedPlugins) return cachedPlugins
-  cachedPlugins = hexo.render.renderSync({ path: path.join(hexo.theme_dir, '/plugins.yml'), engine: 'yaml' })
-  return cachedPlugins
-}
-
 hexo.extend.filter.register('before_generate', () => {
   const themeConfig = hexo.theme.config
   const { CDN } = themeConfig
 
-  const thirdPartySrc = loadPlugins(hexo)
+  const thirdPartySrc = hexo.render.renderSync({ path: path.join(hexo.theme_dir, '/plugins.yml'), engine: 'yaml' })
   const internalSrc = {
     main: {
       name: 'hexo-theme-butterfly',

scripts/events/stylus.js

@@ -5,7 +5,7 @@
 'use strict'
 
 hexo.extend.filter.register('stylus:renderer', style => {
-  const { syntax_highlighter: syntaxHighlighter, highlight = {}, prismjs = {} } = hexo.config
+  const { syntax_highlighter: syntaxHighlighter, highlight, prismjs } = hexo.config
   let { enable: highlightEnable, line_number: highlightLineNumber } = highlight
   let { enable: prismjsEnable, line_number: prismjsLineNumber } = prismjs
 

scripts/helpers/aside_archives.js

@@ -69,14 +69,18 @@ hexo.extend.helper.register('aside_archives', function (options = {}) {
 
   // Use template literal for better readability
   const archiveHeader = `
-    <div class="item-headline"><i class="fas fa-archive"></i><span>${_p('aside.card_archives')}</span>${
+    <div class="item-headline">
+      <i class="fas fa-archive"></i>
+      <span>${_p('aside.card_archives')}</span>
+      ${
         data.length > limitedData.length
           ? `<a class="card-more-btn" href="${urlFor(archiveDir)}/"
             title="${_p('aside.more_button')}">
             <i class="fas fa-angle-right"></i>
           </a>`
           : ''
-    }</div>
+      }
+    </div>
   `
 
   // Use map for generating list items, join for performance

scripts/helpers/aside_categories.js

@@ -89,7 +89,11 @@ hexo.extend.helper.register('aside_categories', function (categories, options =
       <i class="fas fa-angle-right"></i></a>`
     : ''
 
-  return `<div class="item-headline"><i class="fas fa-folder-open"></i><span>${this._p('aside.card_categories')}</span>${moreButton}</div>
+  return `<div class="item-headline">
+            <i class="fas fa-folder-open"></i>
+            <span>${this._p('aside.card_categories')}</span>
+            ${moreButton}
+          </div>
           <ul class="card-category-list${isExpand && list.result ? ' expandBtn' : ''}" id="aside-cat-list">
             ${list.result}
           </ul>`

scripts/helpers/page.js

@@ -157,40 +157,8 @@ hexo.extend.helper.register('shuoshuoFN', (data, page) => {
   processedData.forEach(item => {
     const parsed = moment.utc(item.date)
     item.date = moment.tz(parsed.format('YYYY-MM-DD HH:mm:ss'), timezone).format('YYYY-MM-DD HH:mm:ss')
-
-    // Render the content using Hexo's rendering engine to process any tags or markdown
-    const mockPost = {
-      content: item.content,
-      source: item.source || page.source || '',
-      full_source: page.full_source || '',
-      path: page.path || '',
-      layout: item.layout || page.layout || 'post',
-      raw: item.raw || item.content,
-      draft: false,
-      published: true
-    }
-    try {
-      hexo.execFilterSync('before_post_render', mockPost, { context: hexo })
-    } catch (e) {
-      // ignore third-party plugin errors, fallback to markdown-only rendering
-    }
-    item.content = mockPost.content
-
-    const codeBlocks = []
-    item.content = item.content.replace(/<hexoPostRenderCodeBlock>([\s\S]*?)<\/hexoPostRenderCodeBlock>/g, (_, c) => {
-      codeBlocks.push(c)
-      return `<!--CODEBLOCK_${codeBlocks.length - 1}-->`
-    })
-
-    try {
-      item.content = hexo.extend.tag.env.renderString(item.content, {})
-    } catch (e) {
-      // ignore tag plugin errors, fallback to markdown-only rendering
-    }
-
+    // markdown
     item.content = hexo.render.renderSync({ text: item.content, engine: 'markdown' })
-
-    item.content = item.content.replace(/<!--CODEBLOCK_(\d+)-->/g, (_, i) => codeBlocks[+i])
   })
 
   return processedData

scripts/tag/series.js

@@ -23,7 +23,7 @@ function buildSeriesGroups () {
       groups[p.series].push({
         title: p.title,
         path: p.path,
-        date: p.date.valueOf()
+        date: p.date.unix()
       })
     }
   }

source/css/_global/index.styl

@@ -131,10 +131,6 @@ body
 *::-webkit-scrollbar-track
   background-color: transparent
 
-// make the scrollbar transparent when fancybox is open
-html.with-fancybox
-  --scrollbar-color: transparent
-
 input::placeholder
   color: var(--font-color)
 

source/css/_layout/third-party.styl

@@ -28,107 +28,6 @@
   .wl-comment-actions > button:not(last-child)
     padding-right: 4px
 
-if hexo-config('artalk.vote')
-  .artalk-vote
-    display: flex
-    justify-content: center
-    align-items: center
-    margin: 4px 0 20px
-    gap: 10px
-
-    .artalk-page-vote-up,
-    .artalk-page-vote-down
-      position: relative
-      display: inline-flex
-      align-items: center
-      overflow: hidden
-      padding: 5px 16px
-      border: 1px solid alpha($theme-color, .15)
-      gap: 6px
-      addBorderRadius(8)
-      background: var(--card-bg)
-      color: var(--font-color)
-      font-weight: 500
-      font-size: .95em
-      cursor: pointer
-      transition: all .2s ease
-      user-select: none
-
-      i,
-      .artalk-page-vote-up-count,
-      .artalk-page-vote-down-count
-        position: relative
-        z-index: 1
-
-      i
-        font-size: 1em
-        line-height: 1
-
-      .artalk-page-vote-up-count,
-      .artalk-page-vote-down-count
-        min-width: 1em
-        text-align: center
-        font-weight: 600
-        font-size: .9em
-        font-variant-numeric: tabular-nums
-
-      &::after
-        position: absolute
-        top: 50%
-        left: 50%
-        z-index: 0
-        width: 8px
-        height: 8px
-        border-radius: 50%
-        content: ''
-        opacity: 0
-        pointer-events: none
-
-      &:hover
-        border-color: $theme-color
-
-      &:active
-        transform: scale(.95)
-
-        &::after
-          animation: artalkVoteRipple .6s ease-out forwards
-
-    .artalk-page-vote-up
-      &:hover,
-      &.active
-        border-color: $theme-color
-        background: alpha($theme-color, .1)
-        color: $theme-color
-
-      &::after
-        background: alpha($theme-color, .5)
-
-    .artalk-page-vote-down
-      &:hover,
-      &.active
-        border-color: $light-red
-        background: alpha($light-red, .1)
-        color: $light-red
-
-      &::after
-        background: alpha($light-red, .5)
-
-    +maxWidth600()
-      gap: 8px
-
-      .artalk-page-vote-up,
-      .artalk-page-vote-down
-        padding: 4px 12px
-
-  @keyframes artalkVoteRipple
-    0%
-      opacity: .8
-      transform: translate(-50%, -50%) scale(0)
-
-    100%
-      opacity: 0
-      transform: translate(-50%, -50%) scale(20)
-
 if hexo-config('valine.bg')
   #vcomment
     textarea
@@ -294,6 +193,26 @@ if hexo-config('math.use')
     right: 0
     bottom: 0
 
+.aplayer
+  color: $font-black
+
+.container
+  .aplayer
+    margin: 0 0 20px
+
+    if hexo-config('beautify.enable')
+      ol,
+      ul
+        margin: 0
+        padding: 0
+
+        li
+          margin: 0
+          padding: 0 15px
+
+          &:before
+            content: none
+
 .snackbar-container.snackbar-css
   addBorderRadius(5)
   opacity: .85 !important

source/css/_mode/darkmode.styl

@@ -105,6 +105,9 @@ if hexo-config('darkmode.enable') || hexo-config('display_mode') == 'dark'
         code
           background: $code-background
 
+      .aplayer
+        filter: brightness(.8)
+
       kbd
         border-color: #696969
         background-color: #525252

source/js/main.js

@@ -995,11 +995,8 @@ document.addEventListener('DOMContentLoaded', () => {
     GLOBAL_CONFIG_SITE.pageType === 'home' && scrollDownInIndex()
     scrollFn()
 
-    if (GLOBAL_CONFIG_SITE.pageType !== 'shuoshuo') {
     forPostFn()
-      btf.switchComments(document)
-    }
-
+    GLOBAL_CONFIG_SITE.pageType !== 'shuoshuo' && btf.switchComments(document)
     openMobileMenu()
   }
 
@@ -1015,6 +1012,4 @@ document.addEventListener('DOMContentLoaded', () => {
       fn()
     })
   })
-
-  document.addEventListener('shuoshuo:rendered', forPostFn)
 })

source/js/utils.js

@@ -243,8 +243,7 @@
                   ],
                   right: ['slideshow', 'thumbs', 'close']
                 }
-              },
-              hideScrollbar: false
+              }
             }
           } else {
             options = {
@@ -275,8 +274,7 @@
                     maxScale: 4
                   }
                 }
-              },
-              hideScrollbar: false
+              }
             }
           }