hexo-theme-stellar 1.32.3 → 1.32.4

package/_config.yml

@@ -1,6 +1,6 @@
 ######## Stellar info ########
 stellar:
-  version: '1.32.3'
+  version: '1.32.4'
   homepage: 'https://xaoxuu.com/wiki/stellar/'
   repo: 'https://github.com/xaoxuu/hexo-theme-stellar'
   main_css: /css/main.css
@@ -503,6 +503,11 @@ data_services:
     js: /js/services/artalk_latest_comment.js
   giscus:
     js: /js/services/giscus_latest_comment.js
+  contributors:
+    edit_this_page: # 从开头开始匹配替换
+      '_posts/': # https://github.com/xaoxuu/xaoxuu.com/blob/main/source/_posts/
+      'wiki/stellar/': https://github.com/xaoxuu/hexo-theme-stellar-docs/blob/main/
+    js: /js/services/contributors.js
 
 
 # 扩展插件接入方法：(插件名下面用 #plugin# 代替)

package/_data/icons.yml

@@ -30,7 +30,7 @@ default:calendar: <svg style="margin-bottom:2px" xmlns="http://www.w3.org/2000/s
 default:category: <svg style="margin-bottom:1px" xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 24 24"><path fill="currentColor" d="M2 6.95c0-.883 0-1.324.07-1.692A4 4 0 0 1 5.257 2.07C5.626 2 6.068 2 6.95 2c.386 0 .58 0 .766.017a4 4 0 0 1 2.18.904c.144.119.28.255.554.529L11 4c.816.816 1.224 1.224 1.712 1.495a4 4 0 0 0 .848.352C14.098 6 14.675 6 15.828 6h.374c2.632 0 3.949 0 4.804.77c.079.07.154.145.224.224c.77.855.77 2.172.77 4.804V14c0 3.771 0 5.657-1.172 6.828C19.657 22 17.771 22 14 22h-4c-3.771 0-5.657 0-6.828-1.172C2 19.657 2 17.771 2 14z" opacity=".5"/><path fill="currentColor" d="M20 6.238c0-.298-.005-.475-.025-.63a3 3 0 0 0-2.583-2.582C17.197 3 16.965 3 16.5 3H9.988c.116.104.247.234.462.45L11 4c.816.816 1.224 1.224 1.712 1.495a4 4 0 0 0 .849.352C14.098 6 14.675 6 15.829 6h.373c1.78 0 2.957 0 3.798.238"/><path fill="currentColor" fill-rule="evenodd" d="M12.25 10a.75.75 0 0 1 .75-.75h5a.75.75 0 0 1 0 1.5h-5a.75.75 0 0 1-.75-.75" clip-rule="evenodd"/></svg>
 
 # 编辑本文
-default:edit: <svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 24 24"><!-- Icon from Solar by 480 Design - https://creativecommons.org/licenses/by/4.0/ --><g fill="none"><path stroke="currentColor" stroke-linecap="round" stroke-width="1.5" d="m16.652 3.455l.649-.649A2.753 2.753 0 0 1 21.194 6.7l-.65.649m-3.892-3.893s.081 1.379 1.298 2.595c1.216 1.217 2.595 1.298 2.595 1.298m-3.893-3.893L10.687 9.42c-.404.404-.606.606-.78.829q-.308.395-.524.848c-.121.255-.211.526-.392 1.068L8.412 13.9m12.133-6.552l-2.983 2.982m-2.982 2.983c-.404.404-.606.606-.829.78a4.6 4.6 0 0 1-.848.524c-.255.121-.526.211-1.068.392l-1.735.579m0 0l-1.123.374a.742.742 0 0 1-.939-.94l.374-1.122m1.688 1.688L8.412 13.9"/><path fill="currentColor" d="M22.75 12a.75.75 0 0 0-1.5 0zM12 2.75a.75.75 0 0 0 0-1.5zM7.376 20.013a.75.75 0 1 0-.752 1.298zm-4.687-2.638a.75.75 0 1 0 1.298-.75zM21.25 12A9.25 9.25 0 0 1 12 21.25v1.5c5.937 0 10.75-4.813 10.75-10.75zM12 1.25C6.063 1.25 1.25 6.063 1.25 12h1.5A9.25 9.25 0 0 1 12 2.75zM6.624 21.311A10.7 10.7 0 0 0 12 22.75v-1.5a9.2 9.2 0 0 1-4.624-1.237zM1.25 12a10.7 10.7 0 0 0 1.439 5.375l1.298-.75A9.2 9.2 0 0 1 2.75 12z"/></g></svg>
+default:edit: <svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 24 24"><!-- Icon from Solar by 480 Design - https://creativecommons.org/licenses/by/4.0/ --><circle cx="12" cy="12" r="10" fill="currentColor" opacity=".5"/><path fill="currentColor" d="M13.926 14.302c.245-.191.467-.413.912-.858l5.54-5.54c.134-.134.073-.365-.106-.427a6.1 6.1 0 0 1-2.3-1.449a6.1 6.1 0 0 1-1.45-2.3c-.061-.18-.292-.24-.426-.106l-5.54 5.54c-.445.444-.667.667-.858.912a5 5 0 0 0-.577.932c-.133.28-.233.579-.431 1.175l-.257.77l-.409 1.226l-.382 1.148a.817.817 0 0 0 1.032 1.033l1.15-.383l1.224-.408l.77-.257c.597-.199.895-.298 1.175-.432q.498-.237.933-.576m8.187-8.132a3.028 3.028 0 0 0-4.282-4.283l-.179.178a.73.73 0 0 0-.206.651c.027.15.077.37.168.633a4.9 4.9 0 0 0 1.174 1.863a4.9 4.9 0 0 0 1.862 1.174c.263.09.483.141.633.168c.24.043.48-.035.652-.207z"/></svg>
 default:upup: <svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 24 24"><!-- Icon from Solar by 480 Design - https://creativecommons.org/licenses/by/4.0/ --><g fill="none" stroke="currentColor" stroke-linecap="round" stroke-width="1.5"><path stroke-linejoin="round" d="m9 15.5l3-3l3 3m-6-4l3-3l3 3"/><path d="M7 3.338A9.95 9.95 0 0 1 12 2c5.523 0 10 4.477 10 10s-4.477 10-10 10S2 17.523 2 12c0-1.821.487-3.53 1.338-5"/></g></svg>
 default:tocomment: <svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 24 24"><!-- Icon from Solar by 480 Design - https://creativecommons.org/licenses/by/4.0/ --><path fill="none" stroke="currentColor" stroke-linecap="round" stroke-width="1.5" d="M8 10.5h8M8 14h5.5M17 3.338A9.95 9.95 0 0 0 12 2C6.477 2 2 6.477 2 12c0 1.6.376 3.112 1.043 4.453c.178.356.237.763.134 1.148l-.595 2.226a1.3 1.3 0 0 0 1.591 1.592l2.226-.596a1.63 1.63 0 0 1 1.149.133A9.96 9.96 0 0 0 12 22c5.523 0 10-4.477 10-10c0-1.821-.487-3.53-1.338-5"/></svg>
 default:theme: <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1024 1024"><path fill="currentColor" fill-rule="evenodd" d="M582.4 326.4c-140.8 0-256 115.2-256 256s115.2 256 256 256 256-115.2 256-256-115.2-256-256-256z m0 448c-70.4 0-131.2-36.8-164.8-92.8 12.8 3.2 27.2 4.8 40 4.8 121.6 0 219.2-99.2 219.2-219.2 0-17.6-1.6-35.2-6.4-52.8 60.8 32 102.4 96 102.4 169.6 1.6 104-84.8 190.4-190.4 190.4zM582.4 262.4c17.6 0 32-14.4 32-32v-128c0-17.6-14.4-32-32-32s-32 14.4-32 32v128c0 17.6 14.4 32 32 32zM262.4 582.4c0-17.6-14.4-32-32-32h-128c-17.6 0-32 14.4-32 32s14.4 32 32 32h128c17.6 0 32-14.4 32-32zM310.4 356.8c6.4 6.4 14.4 9.6 22.4 9.6 8 0 16-3.2 22.4-9.6 12.8-12.8 12.8-32 0-44.8l-91.2-91.2c-12.8-12.8-32-12.8-44.8 0-12.8 12.8-12.8 32 0 44.8l91.2 91.2zM944 220.8c-12.8-12.8-32-12.8-44.8 0l-91.2 91.2c-12.8 12.8-12.8 32 0 44.8 6.4 6.4 14.4 9.6 22.4 9.6 8 0 16-3.2 22.4-9.6l91.2-91.2c12.8-12.8 12.8-33.6 0-44.8zM310.4 808l-91.2 91.2c-12.8 12.8-12.8 32 0 44.8 6.4 6.4 14.4 9.6 22.4 9.6 8 0 16-3.2 22.4-9.6l91.2-91.2c12.8-12.8 12.8-32 0-44.8-11.2-11.2-32-11.2-44.8 0z"></path></svg>

package/languages/en.yml

@@ -36,6 +36,7 @@ meta:
   updated: 'Updated on'
   license: License
   share: Share
+  contributors: Contributors
   date_suffix:
     just: Just
     min: minutes ago

package/languages/zh-CN.yml

@@ -36,6 +36,7 @@ meta:
   updated: 更新于
   license: 许可协议
   share: 分享文章
+  contributors: 贡献者
   date_suffix:
     just: 刚刚
     min: 分钟前

package/languages/zh-TW.yml

@@ -36,6 +36,7 @@ meta:
   updated: 更新於
   license: 授權條款
   share: 分享文章
+  contributors: 貢獻者
   date_suffix:
     just: 剛剛
     min: 分鐘前

package/layout/_partial/comments/artalk/script.ejs

@@ -33,7 +33,7 @@
             headers: headers
             }).then((resp) => resp.json())
               .then((resp) => resp.<%= theme.comments.artalk.imageUploader?.resp %>)
-        },
+          },
         <% } %>
       });
     });

package/layout/_partial/head.ejs

@@ -95,12 +95,8 @@ function custom_inject() {
 function generate_canonical() {
   const originalHost = theme.canonical.originalHost || '';
   if (originalHost.length > 0) {
-    if (is_home()) {
-      return `<link rel="canonical" href="https://${originalHost}/">`;
-    } else if (page.path?.length > 0) {
-      const path = page.path.replace(/index\.html$/, '') || '/';
-      return `<link rel="canonical" href="https://${originalHost}/${path}">`;
-    }
+    const path = url_for(page.path).replace(/index\.html$/, '') || '/';
+    return `<link rel="canonical" href="https://${originalHost}${path}">`;
   }
   return '';
 }

package/layout/_partial/main/article/article_footer.ejs

@@ -11,6 +11,10 @@ function layoutDiv() {
   if (theme.article.share?.length > 0) {
     item.push('share');
   }
+  var contributors = partial('contributors', {map: theme.data_services.contributors.edit_this_page})
+  if (contributors?.trim().length > 0) {
+    item.push('contributors')
+  }
   if (item.length === 0) {
     return el;
   }
@@ -76,6 +80,10 @@ function layoutDiv() {
     `
   }
 
+  if (contributors) {
+    el += contributors
+  }
+
   var showSharePlugin = false
   if (page.wiki) {
     const proj = theme.wiki.tree[page.wiki]

package/layout/_partial/main/article/contributors.ejs

@@ -0,0 +1,34 @@
+<%
+function parseURL() {
+  const source = page.source || ''
+  for (let id of Object.keys(map)) {
+    if (source.startsWith(id) && map[id]) {
+      return source.replace(id, map[id])
+    }
+  }
+}
+function layoutDiv() {
+  const url = parseURL()
+  if (url == null) {
+    return ''
+  }
+  const commits = url.replace('/github.com/', `/${theme.api_host.ghapi}/repos/`).replace('/blob/main/', '/commits?path=');
+  var el = `
+  <section id="contributors">
+    <div class="header">
+      <span>${__('meta.contributors')}</span>
+      <span class="spacer"></span>
+      <a class="edit" href="${url_for(url)}">
+        ${icon('default:edit')}
+        <span>${__('btn.edit')}</span>
+      </a>
+    </div>
+    <div class="body">
+      <div class="ds-contributors users-wrap" api-type="commits" api="${commits}"><div class="grid-box"></div></div>
+    </div>
+  </section>
+  `
+  return el
+}
+%>
+<%- layoutDiv() %>

package/layout/_partial/scripts/utils.ejs

@@ -160,7 +160,7 @@
               status = 2;
               timer = null;
               reject('请求超时');
-              if (retryTimes == 0) {
+              if (retryTimes == 0 && onFailure) {
                 onFailure();
               }
             }
@@ -188,7 +188,9 @@
               }, 5000);
             } else {
               utils.onLoadFailure(el);
-              onFailure();
+              if (onFailure) {
+                onFailure();
+              }
             }
           });
         });

package/layout/_partial/sidebar/logo.ejs

@@ -22,7 +22,7 @@ if (page.logo) {
 // logo.icon, logo.title, logo.subtitle, logo.url
 function layoutTitle(main, url, sub) {
   var el = ''
-  el += `<a class="title" href="${url_for(url || "/")}">`
+  el += `<a class="title" href="${url || "/"}">`
   el += `<div class="main">${main}</div>`
   if (sub) {
     const arr = sub.split('|')

package/layout/_partial/widgets/toc.ejs

@@ -36,9 +36,8 @@ function layoutToc(fallback) {
 }
 
 function layoutDiv(fallback) {
-  const editBtn = partial('components/edit', {map: item.edit_this_page})
   const tocBody = layoutTocBody()
-  if (tocBody.trim().length == 0 && editBtn.trim().length == 0) {
+  if (tocBody.trim().length == 0) {
     return ''
   }
   var el = ''
@@ -50,7 +49,6 @@ function layoutDiv(fallback) {
     el += `</div>`
   }
   el += `<div class="widget-footer">`
-  el += editBtn
   el += `<a class="top" onclick="util.scrollTop()">`
   el += icon('default:upup')
   el += `<span>${__('btn.top')}</span>`

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hexo-theme-stellar",
-  "version": "1.32.3",
+  "version": "1.32.4",
   "description": "Elegant and powerful theme for Hexo.",
   "main": "package.json",
   "scripts": {

package/scripts/generators/notebooks.js

@@ -1,38 +1,39 @@
 /**
  * notebooks v1
  */
-const pagination = require('hexo-pagination')
-
-function paginationWithEmpty(base, posts, options={}) {
-  const { layout, data = {} } = options
-  if (posts.length === 0) {
-    base = `${base}/`
-    return [{
-      path: base,
-      layout: layout,
-      data: {
-        ...data,
-        base: base,
-        total: 1,
-        current: 1,
-        current_url: base,
-        posts: posts,
-        prev: 0,
-        prev_link: '',
-        next: 0,
-        next_link: '',
-      }
-    }]
-  } else {
-    return pagination(base, posts, options)
-  }
-}
 
 hexo.extend.generator.register('notebooks', function (locals) {
   const { site_tree, notebooks } = hexo.theme.config
   if (!notebooks?.tree || Object.keys(notebooks.tree).length === 0) {
     return []
   }
+  // 不用 blog 和 notebooks 时不必依赖 hexo-pagination
+  const pagination = require('hexo-pagination')
+
+  function paginationWithEmpty(base, posts, options={}) {
+    const { layout, data = {} } = options
+    if (posts.length === 0) {
+      base = `${base}/`
+      return [{
+        path: base,
+        layout: layout,
+        data: {
+          ...data,
+          base: base,
+          total: 1,
+          current: 1,
+          current_url: base,
+          posts: posts,
+          prev: 0,
+          prev_link: '',
+          next: 0,
+          next_link: '',
+        }
+      }]
+    } else {
+      return pagination(base, posts, options)
+    }
+  }
 
   const routes = []
 

package/source/css/_common/loading.styl

@@ -17,6 +17,7 @@ svg.loading
 .loading-wrap
   margin: 0
   text-align: center
+  align-content: center
   background: var(--block)
   border-radius: $border-card
   position relative

package/source/css/_components/partial/article-footer.styl

@@ -40,6 +40,54 @@
     padding-top: 1rem
     border-top: 1px solid var(--block-border)
 
+.article-footer #contributors
+  .header
+    display: flex
+    justify-content: space-between
+    a.edit
+      font-size: $fs-14
+      display: flex
+      align-items: center
+      color: inherit
+      background: var(--block)
+      padding: 0 .5rem
+      border-radius: $border-button
+      svg
+        width 1.2em
+        height: 1.2em
+        margin-right: 4px
+        color: var(--text-p4)
+        trans1 color
+      span
+        line-height: 1.5
+        trans1 color
+      trans1 background
+      &:hover
+        color: var(--theme)
+        background: var(--theme-a20)
+        svg
+          color: var(--theme)
+  .body
+    .loading-wrap
+      margin-top: 4px
+      padding: 0
+      height: 84px
+    .users-wrap .grid-box
+      margin-top: 4px
+      grid-template-columns: repeat(auto-fill, minmax(72px, 1fr))
+      grid-gap: 4px
+      &:empty
+        display: none
+    .users-wrap .user-card .card-link
+      background: var(--block)
+      trans1 all
+      &:hover
+        background: var(--theme-a20)
+        color: var(--theme)
+      img
+        width 32px
+        height: 32px
+
 .article-footer .social-wrap
   grid-gap: 0.5rem 2rem
   margin: 1rem 0 0.5rem

package/source/css/_components/partial/paginator.styl

@@ -6,7 +6,7 @@
   font-size: 1rem
   font-weight: 700
   background: var(--card)
-  border-radius: $border-card
+  border-radius: $border-card-l
   overflow: hidden
   box-shadow: 0 2px 8px 0px rgba(0, 0, 0, 0.03)
   color: var(--text-p3)

package/source/css/_components/tag-plugins/friends.styl

@@ -13,7 +13,7 @@
     align-items: center
     text-align: center
     line-height: 1.2
-    border-radius: 4px
+    border-radius: $border-button
     overflow: hidden
     position: relative
     padding: 1rem 0.5rem

package/source/css/_components/tag-plugins/timeline.styl

@@ -149,6 +149,9 @@
   pre code 
     font-size: $fs-13
 
+aside .tag-plugin.timeline[api] .body .lazy-box
+  border-radius: $border-image-s
+
 .tag-plugin.timeline[api] .body .footer
   margin: 0 0 -0.5rem
   padding: 0.5rem 0 1rem

package/source/css/_plugins/comments/artalk.styl

@@ -8,6 +8,8 @@
       border-bottom: 1px dashed var(--block-border)
       padding: 0.5rem 1rem
       margin: 0
+      .atk-editor-user
+        padding: 0
     .atk-editor-user-wrap:empty
       visibility: hidden
       padding: 0
@@ -101,6 +103,7 @@
   background: none
 .md-text .atk-main-editor>.atk-textarea-wrap>.atk-textarea
   background: none
+  padding: 0.5rem 1rem
 
 .md-text .atk-notify-wrap .atk-notify
   border-radius: $border-bar

package/source/css/_plugins/lazyload.styl

@@ -4,6 +4,7 @@ $loadingImageSize = 2rem
 .lazy-box
   position: relative
   overflow: hidden
+  line-height: 0
   &.async // 通过 data-service 异步创建的懒加载元素，没办法知道宽高
     background: var(--block)
     min-height: 4rem

package/source/js/services/contributors.js

@@ -0,0 +1,56 @@
+utils.jq(() => {
+  $(function () {
+    function parseGithubFileContributors(data) {
+      // 去重贡献者（按 login）
+      const contributorsMap = new Map();
+
+      for (const commit of data) {
+        const author = commit.author;
+        if (author) {
+          const login = author.login;
+          if (!contributorsMap.has(login)) {
+            contributorsMap.set(login, {
+              login: login,
+              avatar_url: author.avatar_url,
+              html_url: author.html_url,
+              count: 1
+            });
+          } else {
+            contributorsMap.get(login).count++;
+          }
+        }
+      }
+      // 转为数组并按提交次数排序（降序）
+      const sortedContributors = Array.from(contributorsMap.values())
+        .sort((a, b) => b.count - a.count);
+      return sortedContributors;
+    }
+
+    const els = document.getElementsByClassName('ds-contributors');
+    for (var i = 0; i < els.length; i++) {
+      const el = els[i];
+      const api = el.getAttribute('api');
+      if (api == null) {
+        continue;
+      }
+      const default_avatar = def.avatar;
+      // layout
+      utils.request(el, api, async resp => {
+        const data = await resp.json();
+        const list = parseGithubFileContributors(data);
+        for (let item of list) {
+          var cell = `<div class="grid-cell user-card">`;
+          cell += `<a class="card-link" target="_blank" rel="external nofollow noopener noreferrer" href="${item.html_url || item.url}">`;;
+          cell += `<img src="${item.avatar_url || item.avatar || item.icon || default_avatar}" onerror="javascript:this.removeAttribute(\'data-src\');this.src=\'${default_avatar}\';"/>`;
+          cell += `<div class="name image-meta">`;
+          cell += `<span class="image-caption">${item.title || item.login}</span>`;
+          cell += `</div>`;
+          cell += `</a>`;
+          cell += `</div>`;
+          $(el).find('.grid-box').append(cell);
+        }
+        window.wrapLazyloadImages(el);
+      });
+    }
+  });
+});

package/layout/_partial/widgets/components/edit.ejs

@@ -1,24 +0,0 @@
-<%
-function parseURL() {
-  const source = page.source || ''
-  var url
-  for (let id of Object.keys(map)) {
-    if (source.startsWith(id) && map[id]) {
-      return source.replace(id, map[id])
-    }
-  }
-}
-function layoutDiv() {
-  const url = parseURL()
-  if (url == null) {
-    return ''
-  }
-  var el = ''
-  el += `<a class="edit" href="${url_for(url)}">`
-  el += icon('default:edit')
-  el += `<span>${__('btn.edit')}</span>`
-  el += `</a>`
-  return el
-}
-%>
-<%- layoutDiv() %>