hexo-theme-stellar 1.32.3 → 1.33.0

package/_config.yml

@@ -1,6 +1,6 @@
 ######## Stellar info ########
 stellar:
-  version: '1.32.3'
+  version: '1.33.0'
   homepage: 'https://xaoxuu.com/wiki/stellar/'
   repo: 'https://github.com/xaoxuu/hexo-theme-stellar'
   main_css: /css/main.css
@@ -392,12 +392,12 @@ tag_plugins:
       prefix: ph:seal-question-fill
   # {% emoji %}
   emoji:
-    default: https://gcore.jsdelivr.net/gh/cdn-x/emoji/qq/{name}.gif
+    default: https://gcore.jsdelivr.net/gh/cdn-x/emoji@2.1.2/qq/{name}.gif
     twemoji: https://gcore.jsdelivr.net/gh/twitter/twemoji/assets/svg/{name}.svg
-    qq: https://gcore.jsdelivr.net/gh/cdn-x/emoji/qq/{name}.gif
-    aru: https://gcore.jsdelivr.net/gh/cdn-x/emoji/aru-l/{name}.gif
-    tieba: https://gcore.jsdelivr.net/gh/cdn-x/emoji/tieba/{name}.png
-    blobcat: https://gcore.jsdelivr.net/gh/norevi/waline-blobcatemojis@1.0/blobs/{name}.png
+    qq: https://gcore.jsdelivr.net/gh/cdn-x/emoji@2.1.2/qq/{name}.gif
+    aru: https://gcore.jsdelivr.net/gh/cdn-x/emoji@2.1.2/aru/{name}.gif
+    tieba: https://gcore.jsdelivr.net/gh/cdn-x/emoji@2.1.2/tieba/{name}.png
+    blobcat: https://gcore.jsdelivr.net/gh/cdn-x/emoji@2.1.2/blobcat/{name}.gif
   icon:
     # 留空时，图标和文字颜色相同
     default_color: accent # theme, accent, red, orange, yellow, green, cyan, blue, purple
@@ -471,6 +471,14 @@ data_services:
     api: 
   ghinfo:
     js: /js/services/ghinfo.js
+  # 打分
+  rating:
+    js: /js/services/rating.js
+    api: https://star-vote.xaox.cc/api/rating
+  # 投票
+  vote:
+    js: /js/services/vote.js
+    api: https://star-vote.xaox.cc/api/vote
   # 网格布局类
   sites:
     js: /js/services/sites.js
@@ -503,6 +511,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# 代替)
@@ -703,4 +716,11 @@ api_host:
   ghraw: raw.githubusercontent.com
   gist: gist.github.com
   # https://github.com/anuraghazra/github-readme-stats
-  ghcard: github-readme-stats.vercel.app
+  ghcard: github-readme-stats.vercel.app
+
+
+
+# 非资深hexo开发者尽量不要动这块
+system:
+  # hexo 支持输出的链接格式众多，维护成本高，为了减少出错，统一成推荐的格式。
+  override_pretty_urls: true

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>
@@ -49,4 +49,11 @@ share:link: https://gcore.jsdelivr.net/gh/cdn-x/placeholder@1.0.12/social/8411ed
 # quot icons
 ph:seal-question-fill: <svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 256 256"><path fill="currentColor" d="M225.86 102.82c-3.77-3.94-7.67-8-9.14-11.57c-1.36-3.27-1.44-8.69-1.52-13.94c-.15-9.76-.31-20.82-8-28.51s-18.75-7.85-28.51-8c-5.25-.08-10.67-.16-13.94-1.52c-3.56-1.47-7.63-5.37-11.57-9.14C146.28 23.51 138.44 16 128 16s-18.27 7.51-25.18 14.14c-3.94 3.77-8 7.67-11.57 9.14c-3.25 1.36-8.69 1.44-13.94 1.52c-9.76.15-20.82.31-28.51 8s-7.8 18.75-8 28.51c-.08 5.25-.16 10.67-1.52 13.94c-1.47 3.56-5.37 7.63-9.14 11.57C23.51 109.72 16 117.56 16 128s7.51 18.27 14.14 25.18c3.77 3.94 7.67 8 9.14 11.57c1.36 3.27 1.44 8.69 1.52 13.94c.15 9.76.31 20.82 8 28.51s18.75 7.85 28.51 8c5.25.08 10.67.16 13.94 1.52c3.56 1.47 7.63 5.37 11.57 9.14c6.9 6.63 14.74 14.14 25.18 14.14s18.27-7.51 25.18-14.14c3.94-3.77 8-7.67 11.57-9.14c3.27-1.36 8.69-1.44 13.94-1.52c9.76-.15 20.82-.31 28.51-8s7.85-18.75 8-28.51c.08-5.25.16-10.67 1.52-13.94c1.47-3.56 5.37-7.63 9.14-11.57c6.63-6.9 14.14-14.74 14.14-25.18s-7.51-18.27-14.14-25.18M128 192a12 12 0 1 1 12-12a12 12 0 0 1-12 12m8-48.72v.72a8 8 0 0 1-16 0v-8a8 8 0 0 1 8-8c13.23 0 24-9 24-20s-10.77-20-24-20s-24 9-24 20v4a8 8 0 0 1-16 0v-4c0-19.85 17.94-36 40-36s40 16.15 40 36c0 17.38-13.76 31.93-32 35.28"/></svg>
 bxs:quote-left: <svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 24 24"><!-- Icon from BoxIcons Solid by Atisa - https://creativecommons.org/licenses/by/4.0/ --><path fill="currentColor" d="M3.691 6.292C5.094 4.771 7.217 4 10 4h1v2.819l-.804.161c-1.37.274-2.323.813-2.833 1.604A2.9 2.9 0 0 0 6.925 10H10a1 1 0 0 1 1 1v7c0 1.103-.897 2-2 2H3a1 1 0 0 1-1-1v-5l.003-2.919c-.009-.111-.199-2.741 1.688-4.789M20 20h-6a1 1 0 0 1-1-1v-5l.003-2.919c-.009-.111-.199-2.741 1.688-4.789C16.094 4.771 18.217 4 21 4h1v2.819l-.804.161c-1.37.274-2.323.813-2.833 1.604A2.9 2.9 0 0 0 17.925 10H21a1 1 0 0 1 1 1v7c0 1.103-.897 2-2 2"/></svg>
-bxs:quote-right: <svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 24 24"><!-- Icon from BoxIcons Solid by Atisa - https://creativecommons.org/licenses/by/4.0/ --><path fill="currentColor" d="M20.309 17.708C22.196 15.66 22.006 13.03 22 13V5a1 1 0 0 0-1-1h-6c-1.103 0-2 .897-2 2v7a1 1 0 0 0 1 1h3.078a2.9 2.9 0 0 1-.429 1.396c-.508.801-1.465 1.348-2.846 1.624l-.803.16V20h1c2.783 0 4.906-.771 6.309-2.292m-11.007 0C11.19 15.66 10.999 13.03 10.993 13V5a1 1 0 0 0-1-1h-6c-1.103 0-2 .897-2 2v7a1 1 0 0 0 1 1h3.078a2.9 2.9 0 0 1-.429 1.396c-.508.801-1.465 1.348-2.846 1.624l-.803.16V20h1c2.783 0 4.906-.771 6.309-2.292"/></svg>
+bxs:quote-right: <svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 24 24"><!-- Icon from BoxIcons Solid by Atisa - https://creativecommons.org/licenses/by/4.0/ --><path fill="currentColor" d="M20.309 17.708C22.196 15.66 22.006 13.03 22 13V5a1 1 0 0 0-1-1h-6c-1.103 0-2 .897-2 2v7a1 1 0 0 0 1 1h3.078a2.9 2.9 0 0 1-.429 1.396c-.508.801-1.465 1.348-2.846 1.624l-.803.16V20h1c2.783 0 4.906-.771 6.309-2.292m-11.007 0C11.19 15.66 10.999 13.03 10.993 13V5a1 1 0 0 0-1-1h-6c-1.103 0-2 .897-2 2v7a1 1 0 0 0 1 1h3.078a2.9 2.9 0 0 1-.429 1.396c-.508.801-1.465 1.348-2.846 1.624l-.803.16V20h1c2.783 0 4.906-.771 6.309-2.292"/></svg>
+
+# vote
+vote:thumbsup: <svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" viewBox="0 0 16 16"><!-- Icon from Codicons by Microsoft Corporation - https://github.com/microsoft/vscode-codicons/blob/main/LICENSE --><path fill="currentColor" d="M1 8.5v5c0 .827.673 1.5 1.5 1.5H4V7H2.5C1.673 7 1 7.673 1 8.5m13.571-1.685A1.98 1.98 0 0 0 12.959 6H9.526l.464-2.32a2.24 2.24 0 0 0-.464-1.86A2.23 2.23 0 0 0 7.794 1c-.444 0-.839.298-.951.693l-.464 1.286a16 16 0 0 1-1.378 2.876V15h6.397a1.99 1.99 0 0 0 1.909-1.404l1.562-5a1.98 1.98 0 0 0-.298-1.781"/></svg>
+vote:thumbsdown: <svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" viewBox="0 0 16 16"><!-- Icon from Codicons by Microsoft Corporation - https://github.com/microsoft/vscode-codicons/blob/main/LICENSE --><path fill="currentColor" d="M15 7.5v-5c0-.827-.673-1.5-1.5-1.5H12v8h1.5c.827 0 1.5-.673 1.5-1.5M1.429 9.185c.38.518.969.815 1.612.815h3.433l-.464 2.32a2.24 2.24 0 0 0 .464 1.86c.427.521 1.059.82 1.732.82c.444 0 .839-.298.95-.693l.465-1.286a16 16 0 0 1 1.378-2.876V1H4.602a1.99 1.99 0 0 0-1.91 1.404l-1.561 5a1.98 1.98 0 0 0 .297 1.781"/></svg>
+
+# rating
+rating:star: <svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" viewBox="0 0 48 48"><!-- Icon from Fluent UI System Color Icons by Microsoft Corporation - https://github.com/microsoft/fluentui-system-icons/blob/main/LICENSE --><g fill="none"><path fill="url(#fluentColorStar480)" d="M21.803 6.086c.899-1.821 3.495-1.821 4.394 0l4.852 9.832l10.85 1.576c2.01.293 2.813 2.762 1.358 4.18l-7.85 7.653l1.853 10.806c.343 2.001-1.758 3.528-3.555 2.583L24 37.614l-9.705 5.102c-1.797.945-3.898-.582-3.555-2.583l1.854-10.806l-7.851-7.654c-1.455-1.417-.652-3.886 1.357-4.178l10.85-1.577z"/><defs><linearGradient id="fluentColorStar480" x1="43.995" x2="2.879" y1="43.856" y2="5.054" gradientUnits="userSpaceOnUse"><stop stop-color="#FF6F47"/><stop offset="1" stop-color="#FFCD0F"/></linearGradient></defs></g></svg>

package/languages/en.yml

@@ -36,6 +36,7 @@ meta:
   updated: 'Updated on'
   license: License
   share: Share
+  contributors: Page 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

@@ -7,9 +7,10 @@
     utils.css('<%- theme.comments.artalk.css %>');
     utils.js('<%- theme.comments.artalk.js %>', {defer: true}).then(function () {
       // 监听 Artalk 事件
-      Artalk.use((ctx) => {
-        ctx.on('list-loaded', () => window.lazyLoadInstance?.update())
-      })
+      // FIXME: Artalk开启了懒加载会导致评论输入预览框里的图也变成data-src，导致看不到图
+      // Artalk.use((ctx) => {
+      //   ctx.on('list-loaded', () => window.lazyLoadInstance?.update())
+      // })
       const path = el.getAttribute('comment_id') ?? decodeURI(window.location.pathname);
       const artalk = Artalk.init({
         el: '#artalk_container',
@@ -23,17 +24,17 @@
           let headers = new Headers();
           headers.set('Accept', 'application/json');
           <% if (theme.comments.artalk.imageUploader?.token) { %>
-            headers.set('Authorization', '<%= theme.comments.artalk.imageUploader?.token %>')
+            headers.set('Authorization', '<%- theme.comments.artalk.imageUploader?.token %>')
           <% } %>
           let formData = new FormData();
           formData.append('file', file);
-          return fetch('<%= theme.comments.artalk.imageUploader?.api %>',{
+          return fetch('<%- theme.comments.artalk.imageUploader?.api %>',{
             method: 'POST',
             body: formData,
             headers: headers
             }).then((resp) => resp.json())
-              .then((resp) => resp.<%= theme.comments.artalk.imageUploader?.resp %>)
-        },
+              .then((resp) => resp.<%- theme.comments.artalk.imageUploader?.resp %>)
+          },
         <% } %>
       });
     });

package/layout/_partial/head.ejs

@@ -95,12 +95,14 @@ 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}">`;
+    var path = pretty_url(page.path) || '/';
+    if (path.startsWith('/404') || path.startsWith('404')) {
+      return '';
     }
+    if (path.endsWith('.html') && path.length > 5) {
+      path = path.split('.html')[0];
+    }
+    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" data-api="${commits}"><div class="grid-box"></div></div>
+    </div>
+  </section>
+  `
+  return el
+}
+%>
+<%- layoutDiv() %>

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

@@ -39,7 +39,7 @@ function layoutDiv() {
     el += '<div class="item" id="prev">';
     if (prev) {
       el += '<div class="note">' + title_prev + '</div>';
-      el += '<a href="' + url_for(prev.path) + '">';
+      el += '<a href="' + pretty_url(prev.path) + '">';
       el += prev.title || prev.wiki || date(prev.date, config.date_format);
       el += '</a>';
     }
@@ -48,7 +48,7 @@ function layoutDiv() {
     el += '<div class="item" id="next">';
     if (next) {
       el += '<div class="note">' + title_next + '</div>';
-      el += '<a href="' + url_for(next.path) + '">';
+      el += '<a href="' + pretty_url(next.path) + '">';
       el += next.title || next.wiki || date(next.date, config.date_format);
       el += '</a>';
     }

package/layout/_partial/main/navbar/article_banner.ejs

@@ -31,7 +31,7 @@ function layoutBreadcrumb() {
   // 3.left.top: 面包屑导航
   el += `<div class="flex-row" id="breadcrumb">`
     // 首页
-    el += `<a class="cap breadcrumb" href="${url_for(config.root)}">${__("btn.home")}</a>`
+    el += `<a class="cap breadcrumb" href="${pretty_url(config.root)}">${__("btn.home")}</a>`
     if (theme.wiki.tree[page.wiki]) {
       el += partial('breadcrumb/wiki')
     } else if (page.notebook) {

package/layout/_partial/main/navbar/breadcrumb/blog.ejs

@@ -4,11 +4,11 @@ function layoutDiv() {
   var el = ''
   if (topicObject) { // 专栏文章
     // 专栏列表页
-    const topicIndexPageURL = url_for(theme.site_tree.index_topic.base_dir)
+    const topicIndexPageURL = pretty_url(theme.site_tree.index_topic.base_dir)
     el += `<span class="sep"></span>`
     el += `<a class="cap breadcrumb" id="menu" href="${topicIndexPageURL}">${__("btn.topic")}</a>`
     // 专栏项目名
-    const topicHomePageURL = url_for(topicObject.homepage?.path);
+    const topicHomePageURL = pretty_url(topicObject.homepage?.path);
     if (topicHomePageURL != topicIndexPageURL) {
       el += `<span class="sep"></span>`
       el += `<a class="cap breadcrumb" id="proj" href="${topicHomePageURL}">${topicObject.name || topicObject.title}</a>`
@@ -16,7 +16,7 @@ function layoutDiv() {
   } else { // 普通文章
     // 文章列表页
     el += `<span class="sep"></span>`
-    el += `<a class="cap breadcrumb" href="${url_for(config.index_generator.path)}">${__("btn.blog")}</a>`
+    el += `<a class="cap breadcrumb" href="${pretty_url(config.index_generator.path)}">${__("btn.blog")}</a>`
     // 分类列表页
     if (page.categories?.length > 0) {
       el += `<span class="sep"></span>`

package/layout/_partial/main/navbar/breadcrumb/note.ejs

@@ -1,8 +1,8 @@
 <%# 笔记页面的面包屑 %>
 <span class="sep"></span>
-<a class="cap breadcrumb" href="<%= url_for(theme.site_tree.notebooks.base_dir) %>"><%= __('btn.notebook') %></a>
+<a class="cap breadcrumb" href="<%= pretty_url(theme.site_tree.notebooks.base_dir) %>"><%= __('btn.notebook') %></a>
 <% const notebook = theme.notebooks.tree[page.notebook] %>
 <% if (notebook) { %>
   <span class="sep"></span>
-  <a class="cap breadcrumb" href="<%= url_for(notebook.base_dir) %>"><%= notebook.name || notebook.title %></a>
+  <a class="cap breadcrumb" href="<%= pretty_url(notebook.base_dir) %>"><%= notebook.name || notebook.title %></a>
 <% } %>

package/layout/_partial/main/navbar/breadcrumb/page.ejs

@@ -3,7 +3,7 @@ function layoutDiv() {
   // 普通页面就显示当前页面
   return `
   <span class="sep"></span>
-  <a class="cap breadcrumb" href="${url_for(page.path)}">${page.title}</a>
+  <a class="cap breadcrumb" href="${pretty_url(page.path)}">${page.title}</a>
   `
 }
 %>

package/layout/_partial/main/navbar/breadcrumb/wiki.ejs

@@ -4,11 +4,11 @@ function layoutDiv() {
   var el = ''
   // 文档列表页
   el += `<span class="sep"></span>`
-  const wikiIndexPageURL = url_for(theme.site_tree.index_wiki.base_dir)
+  const wikiIndexPageURL = pretty_url(theme.site_tree.index_wiki.base_dir)
   el += `<a class="cap breadcrumb" id="menu" href="${wikiIndexPageURL}">${__("btn.wiki")}</a>`
   if (wikiObject) {
     // 文档项目名
-    const wikiHomePageURL = url_for(wikiObject.homepage?.path);
+    const wikiHomePageURL = pretty_url(wikiObject.homepage?.path);
     if (wikiHomePageURL != wikiIndexPageURL) {
       el += `<span class="sep"></span>`
       el += `<a class="cap breadcrumb" id="proj" href="${wikiHomePageURL}">${wikiObject.name || wikiObject.title}</a>`

package/layout/_partial/main/navbar/dateinfo.ejs

@@ -21,7 +21,7 @@ function layoutDiv() {
   } else {
     const author = theme.authors ? (theme.authors[page.author] || theme.default_author) : null
     if (author) {
-      el += `<a class="author" href="${url_for(author.path)}">${author.name}</a>`
+      el += `<a class="author" href="${pretty_url(author.path)}">${author.name}</a>`
       el += `<span class="sep"></span>`
     }
     // 发布日期

package/layout/_partial/main/navbar/ghinfo.ejs

@@ -5,7 +5,7 @@ function layoutDiv() {
     return ''
   }
   return `
-  <div class="right ghrepo data-service data-service ds-ghinfo" api="https://${theme.api_host.ghapi}/repos/${repo}">
+  <div class="right ghrepo data-service data-service ds-ghinfo" data-api="https://${theme.api_host.ghapi}/repos/${repo}">
     <a class="repo-link bold" href="https://github.com/${repo}">
       ${icon('github:repo')}
       <span type="text">${repo}</span>

package/layout/_partial/main/navbar/nav_tabs_blog.ejs

@@ -6,44 +6,44 @@ function layoutDiv() {
   el += '<div class="navbar-container">';
   el += '<nav class="post">';
   if (is_home()) {
-    el += '<a class="active" href="' + url_for(config.index_generator.path) + '">' + __("btn.recent_publish") + '</a>';
+    el += '<a class="active" href="' + pretty_url(config.index_generator.path) + '">' + __("btn.recent_publish") + '</a>';
   } else {
-    el += '<a href="' + url_for(config.index_generator.path) + '">' + __("btn.recent_publish") + '</a>';
+    el += '<a href="' + pretty_url(config.index_generator.path) + '">' + __("btn.recent_publish") + '</a>';
   }
 
   if (site.categories && site.categories.length > 0) {
     if (page.category) {
-      el += '<a class="active" href="' + url_for(config.category_dir) + '/">' + __("btn.category") + __("symbol.colon") + page.category + '</a>';
+      el += '<a class="active" href="' + pretty_url(config.category_dir) + '">' + __("btn.category") + __("symbol.colon") + page.category + '</a>';
     } else if (page.layout == "categories") {
-      el += '<a class="active" href="' + url_for(config.category_dir) + '/">' + __("btn.categories") + '</a>';
+      el += '<a class="active" href="' + pretty_url(config.category_dir) + '">' + __("btn.categories") + '</a>';
     } else {
-      el += '<a href="' + url_for(config.category_dir) + '/">' + __("btn.categories") + '</a>';
+      el += '<a href="' + pretty_url(config.category_dir) + '">' + __("btn.categories") + '</a>';
     }
   }
 
   if (site.tags && site.tags.length > 0) {
     if (page.tag) {
-      el += '<a class="active" href="' + url_for(config.tag_dir) + '/">' + __("btn.tag") + __("symbol.colon") + page.tag + '</a>';
+      el += '<a class="active" href="' + pretty_url(config.tag_dir) + '">' + __("btn.tag") + __("symbol.colon") + page.tag + '</a>';
     } else if (page.layout == "tags") {
-      el += '<a class="active" href="' + url_for(config.tag_dir) + '/">' + __("btn.tags") + '</a>';
+      el += '<a class="active" href="' + pretty_url(config.tag_dir) + '">' + __("btn.tags") + '</a>';
     } else {
-      el += '<a href="' + url_for(config.tag_dir) + '/">' + __("btn.tags") + '</a>';
+      el += '<a href="' + pretty_url(config.tag_dir) + '">' + __("btn.tags") + '</a>';
     }
   }
   
   if (theme.topic?.publish_list?.length > 0) {
     if (page.layout == 'index_topic') {
-      el += '<a class="active" href="' + url_for(theme.site_tree.index_topic.base_dir) + '/">' + __("btn.topic") + '</a>';
+      el += '<a class="active" href="' + pretty_url(theme.site_tree.index_topic.base_dir) + '">' + __("btn.topic") + '</a>';
     } else {
-      el += '<a href="' + url_for(theme.site_tree.index_topic.base_dir) + '/">' + __("btn.topic") + '</a>';
+      el += '<a href="' + pretty_url(theme.site_tree.index_topic.base_dir) + '">' + __("btn.topic") + '</a>';
     }
   }
   
   if (site.posts && site.posts.length > 0) {
     if (is_archive()) {
-      el += '<a class="active" href="' + url_for(config.archive_dir) + '/">' + __("btn.archives") + '</a>';
+      el += '<a class="active" href="' + pretty_url(config.archive_dir) + '">' + __("btn.archives") + '</a>';
     } else {
-      el += '<a href="' + url_for(config.archive_dir) + '/">' + __("btn.archives") + '</a>';
+      el += '<a href="' + pretty_url(config.archive_dir) + '">' + __("btn.archives") + '</a>';
     }
   }
   

package/layout/_partial/main/navbar/nav_tabs_wiki.ejs

@@ -10,7 +10,7 @@ function layoutDiv() {
   if (page.filter === false) {
     el += ' class="active"';
   }
-  el += ' href="' + url_for(theme.site_tree.index_wiki.base_dir) + '">' + __("btn.all_wiki") + '</a>';
+  el += ' href="' + pretty_url(theme.site_tree.index_wiki.base_dir) + '">' + __("btn.all_wiki") + '</a>';
   el += '</a>';
   // 项目分类
   const { shelf, all_tags } = theme.wiki;
@@ -22,7 +22,7 @@ function layoutDiv() {
       if (tag.name && tag.name.length > 0 && page.tagName === tag.name) {
         el += ' class="active"';
       }
-      el += ' href="' + url_for(tag.path) + '">' + tag.name + '</a>';
+      el += ' href="' + pretty_url(tag.path) + '">' + tag.name + '</a>';
       el += '</a>';
     }
   }

package/layout/_partial/main/notebook/note_tags.ejs

@@ -3,7 +3,7 @@
   <div class="tag-list">
     <% for (const t of page.tags) { %>
       <% const tag = notebook.tagTree.get(t.toLowerCase()) %>
-      <a class="tag" href="<%= url_for(tag.path) %>"><%= tag.name %></a>
+      <a class="tag" href="<%= pretty_url(tag.path) %>"><%= tag.name %></a>
     <% } %>
   </div>
 <% } %>

package/layout/_partial/scripts/lazyload.ejs

@@ -4,7 +4,7 @@
   // Set the options globally
   // to make LazyLoad self-initialize
   window.lazyLoadOptions = {
-    elements_selector: ".lazy, .lazyload",
+    elements_selector: ".lazy",
     callback_loaded: (el) => {
       el.classList.add('loaded');
       const wrapper = el.closest('.lazy-box');

package/layout/_partial/scripts/utils.ejs

@@ -150,50 +150,82 @@
       }
     },
     request: (el, url, callback, onFailure) => {
-      let retryTimes = 3;
-      utils.onLoading(el);
-      function req() {
-        return new Promise((resolve, reject) => {
-          let status = 0; // 0 等待 1 完成 2 超时
-          let timer = setTimeout(() => {
-            if (status === 0) {
-              status = 2;
-              timer = null;
+      const maxRetry = 3;
+      let retryCount = 0;
+
+      return new Promise((resolve, reject) => {
+        const load = () => {
+          utils.onLoading?.(el);
+
+          let timedOut = false;
+          const timeout = setTimeout(() => {
+            timedOut = true;
+            console.warn('[request] 超时:', url);
+
+            if (++retryCount >= maxRetry) {
+              utils.onLoadFailure?.(el);
+              onFailure?.();
               reject('请求超时');
-              if (retryTimes == 0) {
-                onFailure();
-              }
+            } else {
+              setTimeout(load, 1000);
             }
           }, 5000);
-          fetch(url).then(function (response) {
-            if (status !== 2) {
-              clearTimeout(timer);
-              resolve(response);
-              timer = null;
-              status = 1;
-            }
-            if (response.ok) {
-              return response;
-            }
-            throw new Error('Network response was not ok.');
-          }).then(function (data) {
-            retryTimes = 0;
-            utils.onLoadSuccess(el);
+
+          fetch(url).then(resp => {
+            if (timedOut) return;
+            clearTimeout(timeout);
+
+            if (!resp.ok) throw new Error('响应失败');
+            return resp;
+          }).then(data => {
+            if (timedOut) return;
+            utils.onLoadSuccess?.(el);
             callback(data);
-          }).catch(function (error) {
-            if (retryTimes > 0) {
-              retryTimes -= 1;
-              setTimeout(() => {
-                req();
-              }, 5000);
+            resolve(data);
+          }).catch(err => {
+            clearTimeout(timeout);
+            console.warn('[request] 错误:', err);
+
+            if (++retryCount >= maxRetry) {
+              utils.onLoadFailure?.(el);
+              onFailure?.();
+              reject(err);
             } else {
-              utils.onLoadFailure(el);
-              onFailure();
+              setTimeout(load, 1000);
             }
           });
-        });
-      }
-      req();
+        };
+
+        load();
+      });
+    },
+    requestWithoutLoading: (url, options = {}, maxRetry = 2, timeout = 5000) => {
+      return new Promise((resolve, reject) => {
+        let retryCount = 0;
+
+        const tryRequest = () => {
+          let timedOut = false;
+          const timer = setTimeout(() => {
+            timedOut = true;
+            if (++retryCount > maxRetry) reject('timeout');
+            else tryRequest();
+          }, timeout);
+
+          fetch(url, options)
+            .then(resp => {
+              clearTimeout(timer);
+              if (!resp.ok) throw new Error('bad response');
+              resolve(resp);
+            })
+            .catch(err => {
+              clearTimeout(timer);
+              if (++retryCount > maxRetry) reject(err);
+              else setTimeout(tryRequest, 500);
+            });
+        };
+
+        tryRequest();
+      });
     },
     /********************** requestAnimationFrame ********************************/
     // 1、requestAnimationFrame 会把每一帧中的所有 DOM 操作集中起来，在一次重绘或回流中就完成，并且重绘或回流的时间间隔紧紧跟随浏览器的刷新频率，一般来说，这个频率为每秒60帧。

package/layout/_partial/sidebar/index_leftbar.ejs

@@ -61,7 +61,7 @@ if (typeof page.leftbar == 'string') {
 
 function layoutTitle(main, url, sub) {
   var el = '';
-  el += '<a class="title" href="' + url_for(url || "/") + '">';
+  el += '<a class="title" href="' + pretty_url(url || "/") + '">';
   el += '<div class="main">' + main + '</div>';
   if (sub) {
     let arr = sub.split('|');

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/sidebar/menu.ejs

@@ -6,7 +6,7 @@ function layoutDiv() {
     if (item == undefined || item.id == null || item.url == null) {
       continue
     }
-    el += `<a class="nav-item${item.id == page.menu_id ? ' active' : ''}" title="${item.title}" href="${url_for(item.url)}"`
+    el += `<a class="nav-item${item.id == page.menu_id ? ' active' : ''}" title="${item.title}" href="${pretty_url(item.url)}"`
     if (item.theme?.length > 0) {
       el += ` style="color:${item.theme}"`
     }

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

@@ -1,7 +1,7 @@
 <%
 function layoutDiv() {
   var el = ''
-  const isActive = url_for(item.url) == url_for(page.path)
+  const isActive = pretty_url(item.url) == pretty_url(page.path)
   el += `<a class="link${isActive ? ' active' : ''}" title="${item.title}" href="${item.url}">`
   el += `<div class="flex">`
   if (item.icon) {