hexo-theme-particlex 2.6.0 → 2.6.2

package/README.md

@@ -121,8 +121,6 @@ menu:
 
 图标链接配置和导航栏配置相同
 
-**如果图标链接或友链为空，请在 `iconLinks:` 或 `friendLinks:` 后添加一个 `{}`**
-
 ```yaml
 # Side info card
 card:
@@ -131,7 +129,6 @@ card:
         Description
         ...
     iconLinks:
-        {}
     friendLinks:
         Argvchs: https://argvchs.github.io
 ```
@@ -274,11 +271,7 @@ giscus:
 
 Gitalk 是一个基于 GitHub Issue 和 Preact 的评论系统
 
-考虑到博客可能部署到多个网站同步评论，但 OAuth APP 只能有一个回调 URL，所以添加了 `sites` 参数用于多个网站的评论
-
-**同样如果没有其他网站，请在 `sites:` 后添加一个 `{}`**
-
-由于 Gitalk 官方 CORS 代理用的是 Cloudflare，速度过慢，添加了 `proxy` 参数，搭建 CORS 代理可以看[这篇文章](https://argvchs.github.io/2022/07/04/build-cors-anywhere)
+由于 Gitalk 官方 CORS 代理用的是 Cloudflare，速度过慢，搭建 CORS 代理可以看[这篇文章](https://argvchs.github.io/2022/07/04/build-cors-anywhere)
 
 ```yaml
 # Gitalk
@@ -292,11 +285,6 @@ gitalk:
     admin: # GitHub repo owner and collaborators, only these guys can initialize github issues
     language: zh-CN # en, zh-CN, zh-TW, es-ES, fr, ru, de, pl and ko are currently available
     proxy: # CORS proxy
-    sites: # Sites
-        {}
-        # www.example.com:
-        #    clientID:
-        #    clientSecret:
 ```
 
 ### 3.4.3. Waline
@@ -305,8 +293,6 @@ Waline 是一个简单、安全的评论系统
 
 详见：[在 ParticleX 上使用 Waline | Yuzi's Blog](https://blog.yuzi.dev/posts/bcb4ff00.html)
 
-**注意如果不需要 `locale` 参数，请在 `locale:` 后添加一个 `{}`**
-
 ```yaml
 # Waline
 # https://github.com/walinejs/waline
@@ -314,7 +300,6 @@ waline:
     enable: false
     serverURL: # Waline server address url, you should set this to your own link
     locale: # Locale: https://waline.js.org/guide/client/i18n.html#locale-option
-        {}
     commentCount: true # If false, comment count will only be displayed in post page, not in home page
     pageview: false # Pageviews count, Note: You should not enable both `waline.pageview` and `leancloud_visitors`
     emoji: # Custom emoji

package/_config.yml

@@ -44,7 +44,6 @@ card:
         Description
         ...
     iconLinks:
-        {}
     friendLinks:
         Argvchs: https://argvchs.github.io
 
@@ -114,11 +113,6 @@ gitalk:
     admin: # GitHub repo owner and collaborators, only these guys can initialize github issues
     language: zh-CN # en, zh-CN, zh-TW, es-ES, fr, ru, de, pl and ko are currently available
     proxy: # CORS proxy
-    sites: # Sites
-        {}
-        # www.example.com:
-        #    clientID:
-        #    clientSecret:
 
 # Waline
 # https://github.com/walinejs/waline
@@ -126,7 +120,6 @@ waline:
     enable: false
     serverURL: # Waline server address url, you should set this to your own link
     locale: # Locale: https://waline.js.org/guide/client/i18n.html#locale-option
-        {}
     commentCount: true # If false, comment count will only be displayed in post page, not in home page
     pageview: false # Pageviews count, Note: You should not enable both `waline.pageview` and `leancloud_visitors`
     emoji: # Custom emoji

package/layout/archives.ejs

@@ -31,7 +31,7 @@
                         <span class="icon">
                             <i class="fa-solid fa-tags fa-fw"></i>
                         </span>
-                        <% post.tags.data.forEach(data => { %>
+                        <% post.tags.data.forEach(tag => { %>
                         <span class="tag">
                             <%
                                 const color = [
@@ -43,7 +43,7 @@
                                 ];
                                 let id = Math.floor(Math.random() * color.length);
                             %>
-                            <a href="<%- url_for(data.path) %>" style="<%- color[id] %>"><%= data.name %></a>
+                            <a href="<%- url_for(tag.path) %>" style="<%- color[id] %>"><%= tag.name %></a>
                         </span>
                         <% }); %>
                     </span>

package/layout/card.ejs

@@ -7,24 +7,24 @@
         <div class="description">
             <%- markdown(theme.card.description) %>
         </div>
-        <% if (Object.keys(theme.card.iconLinks).length) { %>
+        <% if (theme.card.iconLinks) { %>
         <div class="icon-links">
-            <% Object.keys(theme.card.iconLinks).forEach(key => { %>
+            <% Object.entries(theme.card.iconLinks).forEach(([key, value]) => { %>
             <span class="icon-link">
-                <a href="<%- url_for(theme.card.iconLinks[key].link) %>">
+                <a href="<%- url_for(value.link) %>">
                     <i
-                        class="fa-<%- theme.card.iconLinks[key].theme %> fa-<%- theme.card.iconLinks[key].name %> fa-fw"
+                        class="fa-<%- value.theme %> fa-<%- value.name %> fa-fw"
                     ></i>
                 </a>
             </span>
             <% }); %>
         </div>
         <% } %>
-        <% if (Object.keys(theme.card.friendLinks).length) { %>
+        <% if (theme.card.friendLinks) { %>
         <div class="friend-links">
-            <% Object.keys(theme.card.friendLinks).forEach(key => { %>
+            <% Object.entries(theme.card.friendLinks).forEach(([key, value]) => { %>
             <div class="friend-link">
-                <a href="<%- url_for(theme.card.friendLinks[key]) %>"><%= key %></a>
+                <a href="<%- url_for(value) %>"><%= key %></a>
             </div>
             <% }); %>
         </div>

package/layout/categories.ejs

@@ -48,7 +48,7 @@
                     <span class="icon">
                         <i class="fa-solid fa-tags fa-fw"></i>
                     </span>
-                    <% post.tags.data.forEach(data => { %>
+                    <% post.tags.data.forEach(tag => { %>
                     <span class="tag">
                         <%
                             const color = [
@@ -60,7 +60,7 @@
                             ];
                             let id = Math.floor(Math.random() * color.length);
                         %>
-                        <a href="<%- url_for(data.path) %>" style="<%- color[id] %>"><%= data.name %></a>
+                        <a href="<%- url_for(tag.path) %>" style="<%- color[id] %>"><%= tag.name %></a>
                     </span>
                     <% }); %>
                 </span>

package/layout/comment.ejs

@@ -18,30 +18,19 @@
 <% } %>
 <% if (theme.gitalk.enable) { %>
 <script>
-    (() => {
-        let clientID = "<%- theme.gitalk.clientID %>",
-            clientSecret = "<%- theme.gitalk.clientSecret %>";
-        <% Object.keys(theme.gitalk.sites).forEach(key => { %>
-        if (window.location.host === "<%- key %>") {
-            clientID = "<%- theme.gitalk.sites[key].clientID %>";
-            clientSecret = "<%- theme.gitalk.sites[key].clientSecret %>";
-        }
-        <% }); %>
-        const gitalk = new Gitalk({
-            clientID: clientID,
-            clientSecret: clientSecret,
-            repo: "<%- theme.gitalk.repo %>",
-            owner: "<%- theme.gitalk.owner %>",
-            admin: ["<%- theme.gitalk.admin %>"],
-            language: "<%- theme.gitalk.language %>",
-            id: location.pathname,
-            distractionFreeMode: false,
-            <% if (theme.gitalk.proxy) { %>
-            proxy: "<%- theme.gitalk.proxy %>",
-            <% } %>
-        })
-        gitalk.render("gitalk-container");
-    })();
+    const gitalk = new Gitalk({
+        clientID: "<%- theme.gitalk.clientID %>",
+        clientSecret: "<%- theme.gitalk.clientSecret %>",
+        repo: "<%- theme.gitalk.repo %>",
+        owner: "<%- theme.gitalk.owner %>",
+        admin: "<%- theme.gitalk.admin %>".split(","),
+        language: "<%- theme.gitalk.language %>",
+        id: location.pathname,
+        <% if (theme.gitalk.proxy) { %>
+        proxy: "<%- theme.gitalk.proxy %>",
+        <% } %>
+    })
+    gitalk.render("gitalk-container");
 </script>
 <% } %>
 <% if (theme.waline.enable) { %>
@@ -51,14 +40,16 @@
         serverURL: "<%- theme.waline.serverURL %>",
         commentCount: <%- theme.waline.commentCount %>,
         pageview: <%- theme.waline.pageview %>,
-        emoji: <%- JSON.stringify(theme.waline.emoji) %>,
-        meta: <%- JSON.stringify(theme.waline.meta) %>,
-        requiredMeta: <%- JSON.stringify(theme.waline.requiredMeta) %>,
+        emoji: "<%- (theme.waline.emoji) %>".split(","),
+        meta: "<%- (theme.waline.meta) %>".split(","),
+        requiredMeta: "<%- theme.waline.requiredMeta %>".split(","),
         lang: "<%- theme.waline.lang %>",
         wordLimit: <%- theme.waline.wordLimit %>,
         pageSize: "<%- theme.waline.pageSize %>",
         login: "<%- theme.waline.login %>",
+        <% if (theme.waline.locale) { %>
         locale: <%- JSON.stringify(theme.waline.locale) %>,
+        <% } %>
     });
 </script>
 <% } %>

package/layout/import.ejs

@@ -40,7 +40,7 @@
 <link rel="stylesheet" href="https://cdn.staticfile.org/waline/2.14.8/waline-meta.min.css" />
 <% } %>
 <% if (theme.twikoo.enable) { %>
-<script src="https://cdn.staticfile.org/twikoo/1.6.10/twikoo.all.min.js"></script>
+<script src="https://cdn.staticfile.org/twikoo/1.6.16/twikoo.all.min.js"></script>
 <% } %>
 <% } %>
 <% if (type === "index") { %>

package/layout/index.ejs

@@ -1,5 +1,5 @@
 <div id="home-head">
-    <div id="home-background" ref="homeBackground" data-images="<%- theme.background.map(i => url_for(i)) %>"></div>
+    <div id="home-background" ref="homeBackground" data-images="<%- theme.background.map(url_for) %>"></div>
     <div id="home-info" @click="homeClick">
         <span class="loop"></span>
         <span class="loop"></span>

package/layout/menu.ejs

@@ -3,9 +3,9 @@
         <a class="title" href="<%- config.root %>">
             <span><%= config.title.toUpperCase() %></span>
         </a>
-        <% Object.keys(theme.menu).forEach(key => { %>
-        <a href="<%- url_for(theme.menu[key].link) %>">
-            <i class="fa-<%- theme.menu[key].theme %> fa-<%- theme.menu[key].name %> fa-fw"></i>
+        <% Object.entries(theme.menu).forEach(([key, value]) => { %>
+        <a href="<%- url_for(value.link) %>">
+            <i class="fa-<%- value.theme %> fa-<%- value.name %> fa-fw"></i>
             <span>&ensp;<%= key %></span>
         </a>
         <% }); %>
@@ -17,11 +17,11 @@
         </div>
         <transition name="slide">
             <div class="items" v-show="showMenuItems">
-                <% Object.keys(theme.menu).forEach(key => { %>
-                <a href="<%- url_for(theme.menu[key].link) %>">
+                <% Object.entries(theme.menu).forEach(([key, value]) => { %>
+                <a href="<%- url_for(value.link) %>">
                     <div class="item">
                         <div style="min-width: 20px; max-width: 50px; width: 10%">
-                            <i class="fa-<%- theme.menu[key].theme %> fa-<%- theme.menu[key].name %> fa-fw"></i>
+                            <i class="fa-<%- value.theme %> fa-<%- value.name %> fa-fw"></i>
                         </div>
                         <div style="min-width: 100px; max-width: 150%; width: 20%"><%= key %></div>
                     </div>

package/layout/post.ejs

@@ -24,7 +24,7 @@
             <span class="icon">
                 <i class="fa-solid fa-tags fa-fw"></i>
             </span>
-            <% page.tags.data.forEach(data => { %>
+            <% page.tags.data.forEach(tag => { %>
             <span class="tag">
                 <%
                     const color = [
@@ -36,7 +36,7 @@
                     ];
                     let id = Math.floor(Math.random() * color.length);
                 %>
-                <a href="<%- url_for(data.path) %>" style="<%- color[id] %>"><%= data.name %></a>
+                <a href="<%- url_for(tag.path) %>" style="<%- color[id] %>"><%= tag.name %></a>
             </span>
             <% }); %>
         </span>

package/layout/posts.ejs

@@ -58,7 +58,7 @@
             <i class="fa-solid fa-tags fa-fw"></i>
         </span>
         <% } %>
-        <% post.tags.data.forEach(data => { %>
+        <% post.tags.data.forEach(tag => { %>
         <span class="tag">
             <%
                 const color = [
@@ -70,7 +70,7 @@
                 ];
                 let id = Math.floor(Math.random() * color.length);
             %>
-            <a href="<%- url_for(data.path) %>" style="<%- color[id] %>"><%= data.name %></a>
+            <a href="<%- url_for(tag.path) %>" style="<%- color[id] %>"><%= tag.name %></a>
         </span>
         <% }); %>
     </div>

package/layout/tags.ejs

@@ -33,7 +33,7 @@
                 <h3><%= post.title %></h3>
             </a>
             <div class="info">
-                <% if (post.categories && post.categories.data.length !== 0){ %>
+                <% if (post.categories && post.categories.data.length){ %>
                 <span class="category">
                     <a href="<%- url_for(post.categories.data[0].path) %>">
                         <span class="icon">
@@ -48,7 +48,7 @@
                     <span class="icon">
                         <i class="fa-solid fa-tags fa-fw"></i>
                     </span>
-                    <% post.tags.data.forEach(data => { %>
+                    <% post.tags.data.forEach(tag => { %>
                     <span class="tag">
                         <%
                             const color = [
@@ -60,7 +60,7 @@
                             ];
                             let id = Math.floor(Math.random() * color.length);
                         %>
-                        <a href="<%- url_for(data.path) %>" style="<%- color[id] %>"><%= data.name %></a>
+                        <a href="<%- url_for(tag.path) %>" style="<%- color[id] %>"><%= tag.name %></a>
                     </span>
                     <% }); %>
                 </span>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hexo-theme-particlex",
-  "version": "2.6.0",
+  "version": "2.6.2",
   "description": "A concise Hexo theme, based on Particle.",
   "repository": {
     "type": "git",