hexo-theme-fluid 1.9.8 → 1.9.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hexo-theme-fluid",
-  "version": "1.9.8",
+  "version": "1.9.9",
   "description": "An elegant Material-Design theme for Hexo.",
   "main": "package.json",
   "files": [

package/scripts/events/index.js

@@ -4,6 +4,7 @@
 
 hexo.on('generateBefore', () => {
   require('./lib/merge-configs')(hexo);
+  require('./lib/random-banner')(hexo);
   require('./lib/compatible-configs')(hexo);
   require('./lib/injects')(hexo);
   require('./lib/highlight')(hexo);

package/scripts/events/lib/footnote.js

@@ -2,6 +2,15 @@
 
 const { stripHTML } = require('hexo-util');
 
+function escapeAttr(text) {
+  return text
+    .replace(/&/g, '&')
+    .replace(/"/g, '"')
+    .replace(/'/g, ''')
+    .replace(/</g, '&lt;')
+    .replace(/>/g, '&gt;');
+}
+
 // Register footnotes filter
 module.exports = (hexo) => {
   const config = hexo.theme.config;
@@ -76,11 +85,11 @@ module.exports = (hexo) => {
         if (!indexMap[index]) {
           return match;
         }
-        const tooltip = indexMap[index].content;
+        const tooltip = escapeAttr(stripHTML(indexMap[index].content));
         return '<sup id="fnref:' + index + '" class="footnote-ref">'
           + '<a href="#fn:' + index + '" rel="footnote">'
           + '<span class="hint--top hint--rounded" aria-label="'
-          + stripHTML(tooltip)
+          + tooltip
           + '">[' + index + ']</span></a></sup>';
       });
 

package/scripts/events/lib/random-banner.js

@@ -0,0 +1,45 @@
+'use strict';
+
+const fs = require('fs');
+const path = require('path');
+
+const IMAGE_EXTS = new Set([
+  '.png',
+  '.jpg',
+  '.jpeg',
+  '.gif',
+  '.webp',
+  '.avif'
+]);
+
+module.exports = (hexo) => {
+  const themeConfig = hexo.theme && hexo.theme.config;
+  if (!themeConfig || !themeConfig.post) {
+    return;
+  }
+
+  const randomEnabled = themeConfig.banner && typeof themeConfig.banner.random_img === 'boolean'
+    ? themeConfig.banner.random_img
+    : false;
+  if (!randomEnabled) {
+    return;
+  }
+
+  const randomDir = path.join(hexo.theme_dir, 'source', 'img', 'random');
+  if (!fs.existsSync(randomDir)) {
+    hexo.log.warn(`[Fluid] Random banner directory not found: ${randomDir}`);
+    return;
+  }
+
+  const files = fs.readdirSync(randomDir)
+    .filter((file) => IMAGE_EXTS.has(path.extname(file).toLowerCase()));
+
+  if (files.length === 0) {
+    hexo.log.warn('[Fluid] Random banner directory is empty.');
+    return;
+  }
+
+  themeConfig.banner_img_list = files.map((file) => `/img/random/${file}`);
+  hexo.log.debug(`[Fluid] Random banner images loaded: ${themeConfig.banner_img_list.length}`);
+};
+

package/scripts/filters/post-filter.js

@@ -26,7 +26,7 @@ hexo.extend.filter.register('before_generate', function() {
   });
   const hidePosts = allPosts.filter(post => post.hide);
   const normalPosts = allPosts.filter(post => !post.hide);
-  const indexPost = allPosts.filter(post => !post.hide && !post.archive)
+  const indexPost = allPosts.filter(post => !post.hide && !post.archive);
 
   this.locals.set('all_posts', allPosts);
   this.locals.set('hide_posts', hidePosts);
@@ -51,5 +51,28 @@ hexo.extend.filter.register('after_post_render', (page) => {
   page.content = page.content.replace(/<colgroup>.+?<\/colgroup>/gims, '');
   // 移除 hexo-renderer-pandoc 生成的 <span class="footnote-text">...<br>...</span>
   page.content = page.content.replace(/(class="footnote-text".+?)<br.+?>(.+?rev="footnote")/gims, '$1$2');
+
+  // 为文章中 <h1> 添加默认 id 属性，方便锚点链接
+  if (page.content) {
+    const uniqueIdStore = {};
+    page.content = page.content.replace(/<h1>(.*?)<\/h1>/g, function(match, p1) {
+      const cleanId = p1.trim().toLowerCase()
+        .replace(/\s+/g, '-')
+        .replace(/[?#&]/g, '');
+
+      let uniqueId = cleanId;
+      if (cleanId === '') {
+        uniqueId = 'default';
+      }
+      if (uniqueIdStore[cleanId]) {
+        uniqueId = `${cleanId}-${uniqueIdStore[cleanId]}`;
+        uniqueIdStore[cleanId] += 1;
+      } else {
+        uniqueIdStore[cleanId] = 1;
+      }
+      return `<h1 id="${uniqueId}">${p1}</h1>`;
+    });
+  }
+
   return page;
 });

package/scripts/helpers/wordcount.js

@@ -5,13 +5,10 @@
 const { stripHTML } = require('hexo-util');
 
 const getWordCount = (post) => {
-  // post.origin is the original post content of hexo-blog-encrypt
-  const content = stripHTML(post.origin || post.content).replace(/\r?\n|\r/g, '').replace(/\s+/g, '');
-
   if (!post.wordcount) {
-    const zhCount = (content.match(/[\u4E00-\u9FA5]/g) || []).length;
-    const enCount = (content.replace(/[\u4E00-\u9FA5]/g, '').match(/[a-zA-Z0-9_\u0392-\u03c9\u0400-\u04FF]+|[\u4E00-\u9FFF\u3400-\u4dbf\uf900-\ufaff\u3040-\u309f\uac00-\ud7af\u0400-\u04FF]+|[\u00E4\u00C4\u00E5\u00C5\u00F6\u00D6]+|\w+/g) || []).length;
-    post.wordcount = zhCount + enCount
+    // post.origin is the original post content of hexo-blog-encrypt
+    const content = stripHTML(post.origin || post.content).replace(/[\s\r\n]/g, '');
+    post.wordcount = content.length;
   }
   return post.wordcount;
 };

package/scripts/tags/fold.js

@@ -13,7 +13,7 @@ hexo.extend.tag.register('fold', (args, content) => {
       </div>
       <div class="fold-collapse collapse" id="${id}">
         <div class="fold-content">
-          ${hexo.render.renderSync({ text: content, engine: 'markdown' }).split('\n').join('')}
+          ${hexo.render.renderSync({ text: content, engine: 'markdown' }).split('\n').join(' ')}
         </div>
       </div>
     </div>`;

package/scripts/tags/note.js

@@ -7,7 +7,7 @@ const note = (args, content) => {
     args = [ hexo.theme.config.post.updated.note_class || "info"];
   }
   return `<div class="note note-${args.join(' ')}">
-            ${hexo.render.renderSync({ text: content, engine: 'markdown' }).split('\n').join('')}
+            ${hexo.render.renderSync({ text: content, engine: 'markdown' }).split('\n').join(' ')}
           </div>`;
 };
 

package/source/css/_pages/_base/_widget/header.styl

@@ -172,3 +172,100 @@
 
   #subtitle, .typed-cursor
     font-size 1.35rem
+
+// Mobile grid menu (九宫格)
+#mobile-grid-menu
+  display block
+  position fixed
+  top 0
+  left 0
+  right 0
+  bottom 0
+  z-index 1029
+  overflow-y auto
+  -webkit-overflow-scrolling touch
+  pointer-events none
+  opacity 0
+  transform translateY(-12px)
+  transition opacity .18s ease, transform .18s ease
+  will-change opacity, transform
+
+  if $navbar-glass-enable
+    ground-glass($navbar-glass-px, $navbar-bg-color, $navbar-glass-alpha)
+  else
+    background-color var(--navbar-bg-color)
+
+  &.show
+    pointer-events auto
+    opacity 1
+    transform translateY(0)
+
+    // Staggered cell pop-in — delays are set via JS
+    .mobile-grid-cell, .mobile-grid-group-header
+      animation mobile-grid-cell-in .18s ease both
+
+  .mobile-grid-menu-inner
+    padding-top 70px
+    padding-bottom 2rem
+
+  .mobile-grid-group-header
+    color var(--navbar-text-color)
+    font-size 0.8rem
+    opacity 0.6
+    text-transform uppercase
+    letter-spacing 0.05em
+    padding 1rem 15px 0.4rem
+    border-top 1px solid rgba(255, 255, 255, 0.1)
+    margin-top 0.5rem
+
+    &:first-child
+      border-top none
+      margin-top 0
+
+    i
+      margin-right 0.3rem
+      font-size 0.8rem
+
+  .mobile-grid-cell
+    padding 0.5rem
+
+  .mobile-grid-item
+    display flex
+    flex-direction column
+    align-items center
+    justify-content center
+    padding 1rem 0.5rem
+    border-radius 12px
+    background-color rgba(255, 255, 255, 0.08)
+    transition background-color .2s ease-in-out, transform .15s ease-in-out
+    cursor pointer
+    min-height 80px
+
+    &:hover, &:active
+      background-color rgba(255, 255, 255, 0.18)
+      transform scale(0.96)
+
+    i
+      font-size 1.6rem
+      color var(--navbar-text-color)
+      margin-bottom 0.4rem
+      line-height 1
+
+    span
+      font-size 0.78rem
+      color var(--navbar-text-color)
+      text-align center
+      line-height 1.2
+      word-break break-word
+
+  a
+    text-decoration none
+    color var(--navbar-text-color)
+
+    &:hover
+      color var(--navbar-text-color)
+
+// On mobile, suppress the original collapse list — grid menu takes over
+@media (max-width: 991.98px)
+  #navbarSupportedContent
+    display none !important

package/source/css/_pages/_base/_widget/toc.styl

@@ -32,9 +32,37 @@
   a
     font-size 0.95rem
 
+  ol a
+    font-size 0.85rem
+
 .tocbot-link
   color var(--text-color)
 
+.toc-toggle
+  display inline-block
+  width .7rem
+  text-align center
+  margin-right .15rem
+  cursor pointer
+  user-select none
+  color var(--text-color)
+  font-size .9rem
+  line-height 1
+  transition transform .2s ease-in-out
+
+  &.toc-toggle-collapsed
+    transform rotate(0deg)
+
+  &.toc-toggle-expanded
+    transform rotate(90deg)
+
+  &.toc-toggle-placeholder
+    visibility hidden
+    pointer-events none
+    cursor default
+    transform none
+
+
 .tocbot-active-link
   font-weight bold
   color var(--link-hover-color)
@@ -47,7 +75,10 @@
   transition all .3s ease-in-out
 
 .toc-list-item
-  white-space nowrap
+  padding .1rem 0
+  display -webkit-box
+  -webkit-box-orient vertical
+  -webkit-line-clamp 2
   overflow hidden
   text-overflow ellipsis
 

package/source/css/_pages/_base/base.styl

@@ -66,3 +66,6 @@ label
 i.iconfont
   font-size 1em
   line-height 1
+
+body.mobile-menu-open
+  overflow hidden

package/source/css/_pages/_base/keyframes.styl

@@ -29,3 +29,11 @@
   100%
     -webkit-transform translateY(0)
     transform translateY(0)
+
+@keyframes mobile-grid-cell-in
+  from
+    opacity 0
+    transform scale(0.82) translateY(10px)
+  to
+    opacity 1
+    transform scale(1) translateY(0)

package/source/js/color-schema.js

@@ -153,33 +153,38 @@
       }
       var iconElement = document.querySelector(colorToggleIconSelector);
       if (iconElement) {
-        iconElement.setAttribute(
-          'class',
-          'iconfont ' + icon
-        );
-        iconElement.setAttribute(
-          'data',
-          invertColorSchemaObj[schema]
-        );
+        iconElement.setAttribute('class', 'iconfont ' + icon);
+        iconElement.setAttribute('data', invertColorSchemaObj[schema]);
       } else {
-        // 如果图标不存在则说明图标还没加载出来，等到页面全部加载再尝试切换
         Fluid.utils.waitElementLoaded(colorToggleIconSelector, function() {
           var iconElement = document.querySelector(colorToggleIconSelector);
           if (iconElement) {
-            iconElement.setAttribute(
-              'class',
-              'iconfont ' + icon
-            );
-            iconElement.setAttribute(
-              'data',
-              invertColorSchemaObj[schema]
-            );
+            iconElement.setAttribute('class', 'iconfont ' + icon);
+            iconElement.setAttribute('data', invertColorSchemaObj[schema]);
           }
         });
       }
+
+      // 同步更新移动端按钮文字：light 状态显示"关灯"，dark 状态显示"开灯"
+      var mobileBtn = document.querySelector('#mobile-color-toggle-btn');
+      if (mobileBtn) {
+        var label = document.querySelector('#mobile-color-toggle-label');
+        if (label) {
+          // schema 是当前模式：light→显示 dark 标签（关灯），dark→显示 light 标签（开灯）
+          label.textContent = schema === 'dark'
+            ? (mobileBtn.getAttribute('data-label-light') || '')
+            : (mobileBtn.getAttribute('data-label-dark') || '');
+        }
+        // 同步图标
+        var mobileIcon = document.querySelector('#mobile-color-toggle-icon');
+        if (mobileIcon) {
+          mobileIcon.setAttribute('class', 'iconfont ' + icon);
+        }
+      }
+
       if (document.documentElement.getAttribute('data-user-color-scheme')) {
-        var color = getComputedStyle(document.documentElement).getPropertyValue('--navbar-bg-color').trim()
-        document.querySelector('meta[name="theme-color"]').setAttribute('content', color)
+        var color = getComputedStyle(document.documentElement).getPropertyValue('--navbar-bg-color').trim();
+        document.querySelector('meta[name="theme-color"]').setAttribute('content', color);
       }
     }
   }
@@ -277,10 +282,18 @@
         });
       }
     }
+
+    // 绑定移动端菜单按钮的事件
+    var mobileButton = document.querySelector('#mobile-color-toggle-btn');
+    if (mobileButton) {
+      mobileButton.addEventListener('click', function() {
+        applyCustomColorSchemaSettings(toggleCustomColorSchema());
+      });
+    }
   });
 
   Fluid.utils.waitElementLoaded(iframeSelector, function() {
     applyCustomColorSchemaSettings();
   });
-  
+
 })(window, document);

package/source/js/events.js

@@ -29,9 +29,54 @@ Fluid.events = {
         submenu.removeClass('navbar-dark');
       }
     });
+
+    var mobileGridMenu = jQuery('#mobile-grid-menu');
+
     jQuery('#navbar-toggler-btn').on('click', function() {
+      var $this = jQuery(this);
+      if ($this.data('animating')) {
+        return;
+      }
+      $this.data('animating', true);
       jQuery('.animated-icon').toggleClass('open');
-      jQuery('#navbar').toggleClass('navbar-col-show');
+
+      // On mobile use grid menu; on desktop keep original collapse behavior
+      if (window.innerWidth < 992) {
+        navbar.addClass('top-nav-collapse');
+        mobileGridMenu.toggleClass('show');
+        // Apply staggered animation delays when opening
+        if (mobileGridMenu.hasClass('show')) {
+          mobileGridMenu.find('.mobile-grid-cell, .mobile-grid-group-header').each(function(i, el) {
+            el.style.animationDelay = (i * 20) + 'ms';
+          });
+        }
+        // Prevent body scroll when menu is open
+        jQuery('body').toggleClass('mobile-menu-open', mobileGridMenu.hasClass('show'));
+      } else {
+        jQuery('#navbar').toggleClass('navbar-col-show');
+      }
+
+      setTimeout(function() {
+        $this.data('animating', false);
+      }, 300);
+    });
+
+    // Close grid menu when a link inside it is clicked
+    mobileGridMenu.on('click', 'a[href]:not([href="javascript:;"])', function() {
+      mobileGridMenu.removeClass('show');
+      jQuery('.animated-icon').removeClass('open');
+      jQuery('body').removeClass('mobile-menu-open');
+      navbar.removeClass('top-nav-collapse');
+      jQuery('#navbar-toggler-btn').data('animating', false);
+    });
+
+    // Close grid menu on resize to desktop
+    jQuery(window).on('resize', function() {
+      if (window.innerWidth >= 992 && mobileGridMenu.hasClass('show')) {
+        mobileGridMenu.removeClass('show');
+        jQuery('.animated-icon').removeClass('open');
+        jQuery('body').removeClass('mobile-menu-open');
+      }
     });
   },
 

package/source/js/openkounter.js

@@ -0,0 +1,173 @@
+/* global CONFIG, Fluid */
+
+(function(window, document) {
+  'use strict';
+
+  // Get server URL from config
+  const API_SERVER = (CONFIG.web_analytics.openkounter && CONFIG.web_analytics.openkounter.server_url) || '';
+
+  if (!API_SERVER) {
+    console.warn('OpenKounter: server_url is not configured');
+    return;
+  }
+
+  function getRecord(target) {
+    return fetch(`${API_SERVER}/api/counter?target=${encodeURIComponent(target)}`)
+      .then(resp => {
+        if (!resp.ok) {
+          throw new Error(`HTTP ${resp.status}: ${resp.statusText}`);
+        }
+        return resp.json();
+      })
+      .then(({ data, code, message }) => {
+        if (code !== 0) {
+          throw new Error(message || 'Unknown error');
+        }
+        return { time: data.time || 0, objectId: data.target };
+      })
+      .catch(error => {
+        console.error('OpenKounter fetch error:', error);
+        return { time: 0, objectId: target };
+      });
+  }
+
+  function increment(incrArr) {
+    if (!incrArr || incrArr.length === 0) {
+      return Promise.resolve([]);
+    }
+
+    return fetch(`${API_SERVER}/api/counter`, {
+      method: 'POST',
+      headers: { 'Content-Type': 'application/json' },
+      body: JSON.stringify({
+        action: 'batch_inc',
+        requests: incrArr
+      })
+    })
+      .then(res => {
+        if (!res.ok) {
+          throw new Error(`HTTP ${res.status}: ${res.statusText}`);
+        }
+        return res.json();
+      })
+      .then(res => {
+        if (res.code !== 0) {
+          throw new Error(res.message || 'Failed to increment counter');
+        }
+        return res.data;
+      })
+      .catch(error => {
+        console.error('OpenKounter increment error:', error);
+      });
+  }
+
+  function buildIncrement(objectId) {
+    return { target: objectId };
+  }
+
+  // 校验是否为有效的主机（排除本地开发环境）
+  function validHost() {
+    const ignoreLocal = CONFIG.web_analytics.openkounter && CONFIG.web_analytics.openkounter.ignore_local;
+    if (ignoreLocal !== false) {
+      const hostname = window.location.hostname;
+      if (hostname === 'localhost' || hostname === '127.0.0.1' || hostname === '[::1]') {
+        return false;
+      }
+    }
+    return true;
+  }
+
+  // 校验是否为有效的独立访客（24小时内只计一次）
+  function validUV() {
+    const key = 'OpenKounter_UV_Flag';
+    const now = Date.now();
+
+    try {
+      const flag = localStorage.getItem(key);
+      if (flag) {
+        const lastVisit = parseInt(flag, 10);
+        // 距离上次访问小于 24 小时则不计为新 UV
+        if (now - lastVisit <= 86400000) {
+          return false;
+        }
+      }
+      localStorage.setItem(key, now.toString());
+    } catch (e) {
+      // localStorage 不可用时默认计为 UV
+      console.warn('OpenKounter: localStorage is not available');
+    }
+    return true;
+  }
+
+  function addCount() {
+    const enableIncr = CONFIG.web_analytics.enable && (!window.Fluid || !Fluid.ctx.dnt) && validHost();
+    const getterArr = [];
+    const incrArr = [];
+
+    // 请求站点 PV 并自增
+    const pvCtn = document.querySelector('#openkounter-site-pv-container');
+    if (pvCtn) {
+      const pvGetter = getRecord('site-pv').then((record) => {
+        if (enableIncr) {
+          incrArr.push(buildIncrement(record.objectId));
+        }
+        const ele = document.querySelector('#openkounter-site-pv');
+        if (ele) {
+          ele.innerText = (record.time || 0) + (enableIncr ? 1 : 0);
+          pvCtn.style.display = 'inline';
+        }
+      });
+      getterArr.push(pvGetter);
+    }
+
+    // 请求站点 UV 并自增
+    const uvCtn = document.querySelector('#openkounter-site-uv-container');
+    if (uvCtn) {
+      const uvGetter = getRecord('site-uv').then((record) => {
+        const incrUV = validUV() && enableIncr;
+        if (incrUV) {
+          incrArr.push(buildIncrement(record.objectId));
+        }
+        const ele = document.querySelector('#openkounter-site-uv');
+        if (ele) {
+          ele.innerText = (record.time || 0) + (incrUV ? 1 : 0);
+          uvCtn.style.display = 'inline';
+        }
+      });
+      getterArr.push(uvGetter);
+    }
+
+    // 请求页面浏览数并自增
+    const viewCtn = document.querySelector('#openkounter-page-views-container');
+    if (viewCtn) {
+      const pathConfig = CONFIG.web_analytics.openkounter.path || 'window.location.pathname';
+      const path = eval(pathConfig);
+      const target = decodeURI(path.replace(/\/*(index.html)?$/, '/'));
+
+      const viewGetter = getRecord(target).then((record) => {
+        if (enableIncr) {
+          incrArr.push(buildIncrement(record.objectId));
+        }
+        const ele = document.querySelector('#openkounter-page-views');
+        if (ele) {
+          ele.innerText = (record.time || 0) + (enableIncr ? 1 : 0);
+          viewCtn.style.display = 'inline';
+        }
+      });
+      getterArr.push(viewGetter);
+    }
+
+    // 批量发起统计请求
+    Promise.all(getterArr).then(() => {
+      if (enableIncr && incrArr.length > 0) {
+        increment(incrArr);
+      }
+    }).catch(error => {
+      console.error('OpenKounter error:', error);
+    });
+  }
+
+  addCount();
+
+})(window, document);
+

package/source/js/umami-view.js

@@ -1,7 +1,7 @@
 // 从配置文件中获取 umami 的配置
 const website_id = CONFIG.web_analytics.umami.website_id;
 // 拼接请求地址
-const request_url = `${CONFIG.web_analytics.umami.api_server}/websites/${website_id}/stats`;
+const request_url = `${CONFIG.web_analytics.umami.api_server}/api/websites/${website_id}/stats`;
 
 const start_time = new Date(CONFIG.web_analytics.umami.start_time).getTime();
 const end_time = new Date().getTime();
@@ -31,7 +31,7 @@ const request_header = {
   method: "GET",
   headers: {
     "Content-Type": "application/json",
-    "x-umami-api-key": "oZKCH3msvqt10VlXKwoJvHclmaS4bVx0",
+    "Authorization": "Bearer " + token,
   },
 };
 
@@ -40,7 +40,7 @@ async function siteStats() {
   try {
     const response = await fetch(`${request_url}?${params}`, request_header);
     const data = await response.json();
-    const uniqueVisitors = data.uniques.value; // 获取独立访客数
+    const uniqueVisitors = data.visitors.value; // 获取独立访客数
     const pageViews = data.pageviews.value; // 获取页面浏览量
 
     let pvCtn = document.querySelector("#umami-site-pv-container");
@@ -94,6 +94,8 @@ let viewCtn = document.querySelector("#umami-page-views-container");
 // 如果页面容器存在，则获取页面浏览量
 if (viewCtn) {
   let path = window.location.pathname;
-  let target = decodeURI(path.replace(/\/*(index.html)?$/, "/"));
+  let target = path
+    .replace(/(\/[^/]+\.html)\/$/, "$1")  // 如果是 '/xxxx.html/' 格式的路径，则去掉最后那个 '/'
+    .replace(/\/index\.html$/, "/");      // 如果是 '/index.html' 格式，则合并成 '/'
   pageStats(target);
 }