update theme to butterfly

themes/butterfly/scripts/helpers/aside_archives.js

@@ -1,7 +1,7 @@
 'use strict'
 
 hexo.extend.helper.register('aside_archives', function (options = {}) {
-  const { config, page, site, url_for, _p } = this
+  const { config, page, site, url_for: urlFor, _p } = this
   const { archive_dir: archiveDir, timezone, language } = config
 
   // Destructure and set default options with object destructuring
@@ -17,56 +17,43 @@ hexo.extend.helper.register('aside_archives', function (options = {}) {
   // Optimize locale handling
   const lang = toMomentLocale(page.lang || page.language || language)
 
-  // Memoize comparison function to improve performance
-  const compareFunc =
-    type === 'monthly'
-      ? (yearA, monthA, yearB, monthB) => yearA === yearB && monthA === monthB
-      : (yearA, yearB) => yearA === yearB
-
   // Early return if no posts
   if (!site.posts.length) return ''
 
-  // Use reduce for more efficient data processing
-  const data = site.posts.sort('date', order).reduce((acc, post) => {
-    let date = post.date.clone()
-    if (timezone) date = date.tz(timezone)
-
+  const archives = new Map()
+  site.posts.forEach(post => {
+    const date = post.date
     const year = date.year()
     const month = date.month() + 1
+    const key = type === 'yearly' ? year : `${year}-${month}`
 
-    if (lang) date = date.locale(lang)
-
-    // Find or create archive entry
-    const lastEntry = acc[acc.length - 1]
-
-    if (type === 'yearly') {
-      const existingYearIndex = acc.findIndex(entry => entry.year === year)
-      if (existingYearIndex !== -1) {
-        acc[existingYearIndex].count++
-      } else {
-        // 否則創建新條目
-        acc.push({
-          name: date.format(format),
-          year,
-          month,
-          count: 1
-        })
-      }
+    if (archives.has(key)) {
+      archives.get(key).count++
     } else {
-      if (!lastEntry || !compareFunc(lastEntry.year, lastEntry.month, year, month)) {
-        acc.push({
-          name: date.format(format),
-          year,
-          month,
-          count: 1
-        })
-      } else {
-        lastEntry.count++
-      }
+      archives.set(key, {
+        year,
+        month,
+        count: 1,
+        date // Store date object for later formatting
+      })
     }
+  })
 
-    return acc
-  }, [])
+  const data = Array.from(archives.values()).sort((a, b) => {
+    if (order === -1) {
+      return b.year - a.year || b.month - a.month
+    }
+    return a.year - b.year || a.month - b.month
+  })
+
+  // Format names after aggregation
+  data.forEach(item => {
+    let date = item.date.clone()
+    if (timezone) date = date.tz(timezone)
+    if (lang) date = date.locale(lang)
+    item.name = date.format(format)
+    delete item.date // Clean up
+  })
 
   // Create link generator function
   const createArchiveLink = item => {
@@ -74,7 +61,7 @@ hexo.extend.helper.register('aside_archives', function (options = {}) {
     if (type === 'monthly') {
       url += item.month < 10 ? `0${item.month}/` : `${item.month}/`
     }
-    return url_for(url)
+    return urlFor(url)
   }
 
   // Limit results efficiently
@@ -87,7 +74,7 @@ hexo.extend.helper.register('aside_archives', function (options = {}) {
       <span>${_p('aside.card_archives')}</span>
       ${
         data.length > limitedData.length
-          ? `<a class="card-more-btn" href="${url_for(archiveDir)}/"
+          ? `<a class="card-more-btn" href="${urlFor(archiveDir)}/"
             title="${_p('aside.more_button')}">
             <i class="fas fa-angle-right"></i>
           </a>`

themes/butterfly/scripts/helpers/aside_categories.js

@@ -19,15 +19,33 @@ hexo.extend.helper.register('aside_categories', function (categories, options =
   const expandClass = isExpand && options.expand === true ? 'expand' : ''
   const buttonLabel = this._p('aside.more_button')
 
-  const prepareQuery = parent => {
-    const query = parent ? { parent } : { parent: { $exists: false } }
-    return categories.find(query).sort(orderby, order).filter(cat => cat.length)
+  const categoryMap = new Map()
+  categories.forEach(cat => {
+    if (cat.length) {
+      const parentId = cat.parent || 'root'
+      if (!categoryMap.has(parentId)) {
+        categoryMap.set(parentId, [])
+      }
+      categoryMap.get(parentId).push(cat)
+    }
+  })
+
+  const sortFn = (a, b) => {
+    const valA = a[orderby]
+    const valB = b[orderby]
+    if (valA < valB) return -order
+    if (valA > valB) return order
+    return 0
   }
 
-  const hierarchicalList = (remaining, level = 0, parent) => {
+  for (const list of categoryMap.values()) {
+    list.sort(sortFn)
+  }
+
+  const hierarchicalList = (remaining, level = 0, parentId = 'root') => {
     let result = ''
-    if (remaining > 0) {
-      prepareQuery(parent).forEach(cat => {
+    if (remaining > 0 && categoryMap.has(parentId)) {
+      categoryMap.get(parentId).forEach(cat => {
         if (remaining > 0) {
           remaining -= 1
           let child = ''
@@ -37,7 +55,8 @@ hexo.extend.helper.register('aside_categories', function (categories, options =
             remaining = childList.remaining
           }
 
-          const parentClass = isExpand && !parent && child ? 'parent' : ''
+          const isTopLevel = parentId === 'root'
+          const parentClass = isExpand && isTopLevel && child ? 'parent' : ''
           result += `<li class="card-category-list-item ${parentClass}">`
           result += `<a class="card-category-list-link" href="${this.url_for(cat.path)}">`
           result += `<span class="card-category-list-name">${cat.name}</span>`
@@ -46,7 +65,7 @@ hexo.extend.helper.register('aside_categories', function (categories, options =
             result += `<span class="card-category-list-count">${cat.length}</span>`
           }
 
-          if (isExpand && !parent && child) {
+          if (isExpand && isTopLevel && child) {
             result += `<i class="fas fa-caret-left ${expandClass}"></i>`
           }
 

themes/butterfly/scripts/helpers/getArchiveLength.js

@@ -8,28 +8,29 @@ hexo.extend.helper.register('getArchiveLength', function () {
   // Archives Page
   if (!year) return posts.length
 
-  // Function to generate a unique key based on the granularity
-  const getKey = (post, type) => {
-    const date = post.date.clone()
-    const y = date.year()
-    const m = date.month() + 1
-    const d = date.date()
-    if (type === 'year') return `${y}`
-    if (type === 'month') return `${y}-${m}`
-    if (type === 'day') return `${y}-${m}-${d}`
-  }
-
   // Create a map to count posts per period
   const mapData = this.fragment_cache('createArchiveObj', () => {
     const map = new Map()
     posts.forEach(post => {
-      const keyYear = getKey(post, 'year')
-      const keyMonth = getKey(post, 'month')
-      const keyDay = getKey(post, 'day')
+      const date = post.date
+      const y = date.year()
+      const m = date.month() + 1
+      const d = date.date()
 
-      if (yearly) map.set(keyYear, (map.get(keyYear) || 0) + 1)
-      if (monthly) map.set(keyMonth, (map.get(keyMonth) || 0) + 1)
-      if (daily) map.set(keyDay, (map.get(keyDay) || 0) + 1)
+      if (yearly) {
+        const keyYear = `${y}`
+        map.set(keyYear, (map.get(keyYear) || 0) + 1)
+      }
+
+      if (monthly) {
+        const keyMonth = `${y}-${m}`
+        map.set(keyMonth, (map.get(keyMonth) || 0) + 1)
+      }
+
+      if (daily) {
+        const keyDay = `${y}-${m}-${d}`
+        map.set(keyDay, (map.get(keyDay) || 0) + 1)
+      }
     })
     return map
   })

themes/butterfly/scripts/helpers/inject_head_js.js

@@ -4,9 +4,9 @@ hexo.extend.helper.register('inject_head_js', function () {
   const { darkmode, aside, pjax } = this.theme
   const start = darkmode.start || 6
   const end = darkmode.end || 18
-  const { theme_color } = hexo.theme.config
-  const themeColorLight = theme_color && theme_color.enable ? theme_color.meta_theme_color_light : '#ffffff'
-  const themeColorDark = theme_color && theme_color.enable ? theme_color.meta_theme_color_dark : '#0d0d0d'
+  const { theme_color: themeColor } = hexo.theme.config
+  const themeColorLight = themeColor && themeColor.enable ? themeColor.meta_theme_color_light : '#ffffff'
+  const themeColorDark = themeColor && themeColor.enable ? themeColor.meta_theme_color_dark : '#0d0d0d'
 
   const createCustomJs = () => `
     const saveToLocal = {

themes/butterfly/scripts/helpers/page.js

@@ -5,6 +5,12 @@ const { prettyUrls } = require('hexo-util')
 const crypto = require('crypto')
 const moment = require('moment-timezone')
 
+const absoluteUrlPattern = /^(?:[a-z][a-z\d+.-]*:)?\/\//i
+const relativeUrlPattern = /^(\.\/|\.\.\/|\/|[^/]+\/).*$/
+const colorPattern = /^(#|rgb|rgba|hsl|hsla)/i
+const simpleFilePattern = /\.(png|jpg|jpeg|gif|bmp|webp|svg|tiff)$/i
+const archiveRegex = /\/archives\//
+
 hexo.extend.helper.register('truncate', truncateContent)
 
 hexo.extend.helper.register('postDesc', data => {
@@ -20,32 +26,27 @@ hexo.extend.helper.register('cloudTags', function (options = {}) {
   }
 
   const sizes = [...new Set(source.map(tag => tag.length).sort((a, b) => a - b))]
+  const sizeMap = new Map(sizes.map((size, index) => [size, index]))
+  const length = sizes.length - 1
 
   const getRandomColor = () => {
-    const randomColor = () => Math.floor(Math.random() * 201)
-    const r = randomColor()
-    const g = randomColor()
-    const b = randomColor()
+    const r = Math.floor(Math.random() * 201)
+    const g = Math.floor(Math.random() * 201)
+    const b = Math.floor(Math.random() * 201)
     return `rgb(${Math.max(r, 50)}, ${Math.max(g, 50)}, ${Math.max(b, 50)})`
   }
 
   const generateStyle = (size, unit, page) => {
-    if (page === 'tags') {
-      return `font-size: ${parseFloat(size.toFixed(2)) + unit}; background-color: ${getRandomColor()};`
-    } else {
-      return `font-size: ${parseFloat(size.toFixed(2)) + unit}; color: ${getRandomColor()};`
-    }
+    const colorStyle = page === 'tags' ? `background-color: ${getRandomColor()};` : `color: ${getRandomColor()};`
+    return `font-size: ${parseFloat(size.toFixed(2))}${unit}; ${colorStyle}`
   }
 
-  const length = sizes.length - 1
-  const result = source.sort(orderby, order).map(tag => {
-    const ratio = length ? sizes.indexOf(tag.length) / length : 0
+  return source.sort(orderby, order).map(tag => {
+    const ratio = length ? sizeMap.get(tag.length) / length : 0
     const size = minfontsize + ((maxfontsize - minfontsize) * ratio)
     const style = generateStyle(size, unit, page)
     return `<a href="${env.url_for(tag.path)}" style="${style}">${tag.name}</a>`
   }).join('')
-
-  return result
 })
 
 hexo.extend.helper.register('urlNoIndex', function (url = null, trailingIndex = false, trailingHtml = false) {
@@ -77,7 +78,7 @@ hexo.extend.helper.register('findArchivesTitle', function (page, menu, date) {
         if (result) return result
       }
 
-      if (/\/archives\//.test(m[key])) {
+      if (archiveRegex.test(m[key])) {
         return key
       }
     }
@@ -89,13 +90,9 @@ hexo.extend.helper.register('findArchivesTitle', function (page, menu, date) {
 hexo.extend.helper.register('getBgPath', function (path) {
   if (!path) return ''
 
-  const absoluteUrlPattern = /^(?:[a-z][a-z\d+.-]*:)?\/\//i
-  const relativeUrlPattern = /^(\.\/|\.\.\/|\/|[^/]+\/).*$/
-  const colorPattern = /^(#|rgb|rgba|hsl|hsla)/i
-
   if (colorPattern.test(path)) {
     return `background-color: ${path};`
-  } else if (absoluteUrlPattern.test(path) || relativeUrlPattern.test(path)) {
+  } else if (absoluteUrlPattern.test(path) || relativeUrlPattern.test(path) || simpleFilePattern.test(path)) {
     return `background-image: url(${this.url_for(path)});`
   } else {
     return `background: ${path};`
@@ -104,39 +101,34 @@ hexo.extend.helper.register('getBgPath', function (path) {
 
 hexo.extend.helper.register('shuoshuoFN', (data, page) => {
   const { limit } = page
-  let finalResult = ''
+
+  // Shallow copy to avoid mutating original data
+  let processedData = data.map(item => ({ ...item }))
 
   // Check if limit.value is a valid date
   const isValidDate = date => !isNaN(Date.parse(date))
 
   // order by date
-  const orderByDate = data => data.sort((a, b) => Date.parse(b.date) - Date.parse(a.date))
+  processedData.sort((a, b) => Date.parse(b.date) - Date.parse(a.date))
 
   // Apply number limit or time limit conditionally
-  const limitData = data => {
-    if (limit && limit.type === 'num' && limit.value > 0) {
-      return data.slice(0, limit.value)
-    } else if (limit && limit.type === 'date' && isValidDate(limit.value)) {
-      const limitDate = Date.parse(limit.value)
-      return data.filter(item => Date.parse(item.date) >= limitDate)
-    }
-
-    return data
+  if (limit && limit.type === 'num' && limit.value > 0) {
+    processedData = processedData.slice(0, limit.value)
+  } else if (limit && limit.type === 'date' && isValidDate(limit.value)) {
+    const limitDate = Date.parse(limit.value)
+    processedData = processedData.filter(item => Date.parse(item.date) >= limitDate)
   }
 
-  orderByDate(data)
-  finalResult = limitData(data)
-
   // This is a hack method, because hexo treats time as UTC time
   // so you need to manually convert the time zone
-  finalResult.forEach(item => {
+  processedData.forEach(item => {
     const utcDate = moment.utc(item.date).format('YYYY-MM-DD HH:mm:ss')
     item.date = moment.tz(utcDate, hexo.config.timezone).format('YYYY-MM-DD HH:mm:ss')
     // markdown
     item.content = hexo.render.renderSync({ text: item.content, engine: 'markdown' })
   })
 
-  return finalResult
+  return processedData
 })
 
 hexo.extend.helper.register('getPageType', (page, isHome) => {

themes/butterfly/scripts/helpers/related_post.js

@@ -9,14 +9,22 @@
 
 const { postDesc } = require('../common/postDesc')
 
-hexo.extend.helper.register('related_posts', function (currentPost, allPosts) {
-  let relatedPosts = []
+hexo.extend.helper.register('related_posts', function (currentPost) {
+  const relatedPosts = new Map()
   const tagsData = currentPost.tags
-  tagsData.length && tagsData.forEach(function (tag) {
-    allPosts.forEach(function (post) {
-      if (currentPost.path !== post.path && isTagRelated(tag.name, post.tags)) {
+
+  if (!tagsData || !tagsData.length) return ''
+
+  tagsData.forEach(tag => {
+    const posts = tag.posts
+    posts.forEach(post => {
+      if (currentPost.path === post.path) return
+
+      if (relatedPosts.has(post.path)) {
+        relatedPosts.get(post.path).weight += 1
+      } else {
         const getPostDesc = post.postDesc || postDesc(post, hexo)
-        const relatedPost = {
+        relatedPosts.set(post.path, {
           title: post.title,
           path: post.path,
           cover: post.cover,
@@ -24,22 +32,17 @@ hexo.extend.helper.register('related_posts', function (currentPost, allPosts) {
           weight: 1,
           updated: post.updated,
           created: post.date,
-          postDesc: getPostDesc
-        }
-        const index = findItem(relatedPosts, 'path', post.path)
-        if (index !== -1) {
-          relatedPosts[index].weight += 1
-        } else {
-          relatedPosts.push(relatedPost)
-        }
+          postDesc: getPostDesc,
+          random: Math.random()
+        })
       }
     })
   })
 
-  if (relatedPosts.length === 0) {
+  if (relatedPosts.size === 0) {
     return ''
   }
-  let result = ''
+
   const hexoConfig = hexo.config
   const config = hexo.theme.config
 
@@ -47,51 +50,42 @@ hexo.extend.helper.register('related_posts', function (currentPost, allPosts) {
   const dateType = config.related_post.date_type || 'created'
   const headlineLang = this._p('post.recommend')
 
-  relatedPosts = relatedPosts.sort(compare('weight'))
-
-  if (relatedPosts.length > 0) {
-    result += '<div class="relatedPosts">'
-    result += `<div class="headline"><i class="fas fa-thumbs-up fa-fw"></i><span>${headlineLang}</span></div>`
-    result += '<div class="relatedPosts-list">'
-
-    for (let i = 0; i < Math.min(relatedPosts.length, limitNum); i++) {
-      let { cover, title, path, cover_type, created, updated, postDesc } = relatedPosts[i]
-      const { escape_html, url_for, date } = this
-      cover = cover || 'var(--default-bg-color)'
-      title = escape_html(title)
-      const className = postDesc ? 'pagination-related' : 'pagination-related no-desc'
-      result += `<a class="${className}" href="${url_for(path)}" title="${title}">`
-      if (cover_type === 'img') {
-        result += `<img class="cover" src="${url_for(cover)}" alt="cover">`
-      } else {
-        result += `<div class="cover" style="background: ${cover}"></div>`
-      }
-      if (dateType === 'created') {
-        result += `<div class="info text-center"><div class="info-1"><div class="info-item-1"><i class="far fa-calendar-alt fa-fw"></i> ${date(created, hexoConfig.date_format)}</div>`
-      } else {
-        result += `<div class="info text-center"><div class="info-1"><div class="info-item-1"><i class="fas fa-history fa-fw"></i> ${date(updated, hexoConfig.date_format)}</div>`
-      }
-      result += `<div class="info-item-2">${title}</div></div>`
-
-      if (postDesc) {
-        result += `<div class="info-2"><div class="info-item-1">${postDesc}</div></div>`
-      }
-      result += '</div></a>'
+  const relatedPostsList = Array.from(relatedPosts.values()).sort((a, b) => {
+    if (b.weight !== a.weight) {
+      return b.weight - a.weight
     }
+    return b.random - a.random
+  })
 
-    result += '</div></div>'
-    return result
+  let result = '<div class="relatedPosts">'
+  result += `<div class="headline"><i class="fas fa-thumbs-up fa-fw"></i><span>${headlineLang}</span></div>`
+  result += '<div class="relatedPosts-list">'
+
+  for (let i = 0; i < Math.min(relatedPostsList.length, limitNum); i++) {
+    let { cover, title, path, cover_type, created, updated, postDesc } = relatedPostsList[i]
+    const { escape_html, url_for, date } = this
+    cover = cover || 'var(--default-bg-color)'
+    title = escape_html(title)
+    const className = postDesc ? 'pagination-related' : 'pagination-related no-desc'
+    result += `<a class="${className}" href="${url_for(path)}" title="${title}">`
+    if (cover_type === 'img') {
+      result += `<img class="cover" src="${url_for(cover)}" alt="cover">`
+    } else {
+      result += `<div class="cover" style="background: ${cover}"></div>`
+    }
+    if (dateType === 'created') {
+      result += `<div class="info text-center"><div class="info-1"><div class="info-item-1"><i class="far fa-calendar-alt fa-fw"></i> ${date(created, hexoConfig.date_format)}</div>`
+    } else {
+      result += `<div class="info text-center"><div class="info-1"><div class="info-item-1"><i class="fas fa-history fa-fw"></i> ${date(updated, hexoConfig.date_format)}</div>`
+    }
+    result += `<div class="info-item-2">${title}</div></div>`
+
+    if (postDesc) {
+      result += `<div class="info-2"><div class="info-item-1">${postDesc}</div></div>`
+    }
+    result += '</div></a>'
   }
+
+  result += '</div></div>'
+  return result
 })
-
-function isTagRelated (tagName, tags) {
-  return tags.some(tag => tag.name === tagName)
-}
-
-function findItem (arrayToSearch, attr, val) {
-  return arrayToSearch.findIndex(item => item[attr] === val)
-}
-
-function compare (attr) {
-  return (a, b) => b[attr] - a[attr]
-}