hexo-theme-stellar 1.32.4 → 1.33.0

package/_config.yml

@@ -1,6 +1,6 @@
 ######## Stellar info ########
 stellar:
-  version: '1.32.4'
+  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
@@ -708,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

@@ -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,7 +36,7 @@ meta:
   updated: 'Updated on'
   license: License
   share: Share
-  contributors: Contributors
+  contributors: Page Contributors
   date_suffix:
     just: Just
     min: minutes ago

package/languages/zh-CN.yml

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

package/languages/zh-TW.yml

@@ -36,7 +36,7 @@ meta:
   updated: 更新於
   license: 授權條款
   share: 分享文章
-  contributors: 貢獻者
+  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,16 +24,16 @@
           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,7 +95,13 @@ function custom_inject() {
 function generate_canonical() {
   const originalHost = theme.canonical.originalHost || '';
   if (originalHost.length > 0) {
-    const path = url_for(page.path).replace(/index\.html$/, '') || '/';
+    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/contributors.ejs

@@ -24,7 +24,7 @@ function layoutDiv() {
       </a>
     </div>
     <div class="body">
-      <div class="ds-contributors users-wrap" api-type="commits" api="${commits}"><div class="grid-box"></div></div>
+      <div class="ds-contributors users-wrap" api-type="commits" data-api="${commits}"><div class="grid-box"></div></div>
     </div>
   </section>
   `

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,52 +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) {
-                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);
-              if (onFailure) {
-                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/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) {

package/layout/_partial/widgets/ghissues.ejs

@@ -27,7 +27,13 @@ function layoutDiv() {
     }
     el += '<div class="widget-body fs14">';
       el += '<div class="tag-plugin timeline data-service ds-timeline"';
-      ['api', 'user'].forEach(key => {
+      // dataset
+      ['api'].forEach(key => {
+        if (item[key]) {
+          el += ' data-' + key + '="' + item[key] + '"';
+        }
+      });
+      ['user'].forEach(key => {
         if (item[key]) {
           el += ' ' + key + '="' + item[key] + '"';
         }

package/layout/_partial/widgets/ghrepo.ejs

@@ -19,7 +19,7 @@ function layoutDiv() {
   el += `<widget class="widget-wrapper${scrollreveal(' ')} ghrepo">`
   // body
   el += '<div class="widget-body">';
-  el += '<div class="items data-service ds-ghinfo" api="https://' + theme.api_host.ghapi + '/repos/' + repo + '">';
+  el += '<div class="items data-service ds-ghinfo" data-api="https://' + theme.api_host.ghapi + '/repos/' + repo + '">';
   el += '<a class="repo" href="https://github.com/' + repo + '" target="_blank" rel="external nofollow noopener noreferrer">';
     el += '<div class="repo-name flex-row">';
       el += icon('github:repo')
@@ -35,7 +35,7 @@ function layoutDiv() {
         el += icon('github:fork')
         el += '<span type="text" id="forks_count"></span>';
       el += '</div>';
-      el += '<div class="flex-row data-service ds-ghinfo" index="0" api="https://' + theme.api_host.ghapi + '/repos/' + repo + '/tags">';
+      el += '<div class="flex-row data-service ds-ghinfo" index="0" data-api="https://' + theme.api_host.ghapi + '/repos/' + repo + '/tags">';
         el += icon('github:tag')
         el += '<span type="text" id="latest-tag-name">0</span>';
       el += '</div>';

package/layout/_partial/widgets/ghuser.ejs

@@ -24,7 +24,7 @@ function layoutDiv() {
 
   el += `<widget class="widget-wrapper${scrollreveal(' ')} user-card ghuser">`
   // body
-  el += '<div class="widget-body data-service ds-ghinfo" api="https://' + theme.api_host.ghapi + '/users/' + item.username + '">';
+  el += '<div class="widget-body data-service ds-ghinfo" data-api="https://' + theme.api_host.ghapi + '/users/' + item.username + '">';
     if (item.avatar) {
       el += '<div class="avatar" ><img no-lazy type="img" id="avatar_url" src="' + config.avatar + '"></div>';
     }

package/layout/_partial/widgets/recent.ejs

@@ -34,7 +34,7 @@ function layoutDiv() {
   arr.length = item.limit
   arr.forEach(post => {
     if (!post) { return }
-    el += `<a class="item title" href="${url_for(post.link || post.path)}">`
+    el += `<a class="item title" href="${pretty_url(post.link || post.path)}">`
     el += '<span class="title">'
     if (post.wiki) {
       const proj = theme.wiki.tree[post.wiki];

package/layout/_partial/widgets/related.ejs

@@ -15,7 +15,7 @@ function relatedPostsInTopic() {
   el += `<div class="widget-body">`
   for (let post of topic.pages) {
     const isActive = post.path == page.path
-    el += `<a class="item${isActive ? ' active' : ''}" href="${url_for(post.path)}">`
+    el += `<a class="item${isActive ? ' active' : ''}" href="${pretty_url(post.path)}">`
     el += `<span class="title">${post.title}</span>`
     if (isActive) {
       el += icon('default:bookmark.active')
@@ -42,7 +42,7 @@ function relatedWiki() {
     for (let id of relatedItem.items) {
       // 同一个分组中的其它项目
       let item = theme.wiki.tree[id]
-      el += `<a class="item wiki" href="${url_for(item.homepage?.path)}">`
+      el += `<a class="item wiki" href="${pretty_url(item.homepage?.path)}">`
       el += `<span class="title">${item.title}</span>`
       if (item.description && item.description.length > 0) {
         el += `<span class="excerpt">${item.description}</span>`

package/layout/_partial/widgets/tagtree.ejs

@@ -9,7 +9,7 @@
 
 <% function layoutTag(tag, level) { %>
   <% const active = page.activeTag === tag.id %>
-  <a class="link<%= active ? ' active' : '' %>" href="<%= url_for(tag.path) %>">
+  <a class="link<%= active ? ' active' : '' %>" href="<%= pretty_url(tag.path) %>">
     <span class="toc-text"<% if (level > 0) { %> style="padding-left: <%= level * 0.875 %>rem;"<% } %>>
       <% if (tag.id === '') { %>
         <%= __('meta.all_notes') %>