update

_config.yml

@@ -11,16 +11,12 @@ style: pure        # pure: 导航栏和标题栏背景是白色
 
 
 ############################### 服务开关 ###############################
-# 服务开关，如果你想禁用某些功能，直接设置为false或者注释掉，相关的js脚本就不会加载。
-# 有些服务这里打开了也未必会生效，还需要额外的配置，详见文档。
 services:
   # cdn: true
   scrollreveal: true
   nodewaves: true
   busuanzi: true
   # fastclick: true
-  comments: true
-  volantis: true
   # music: true
   # share: true
 
@@ -192,6 +188,7 @@ share:
 # valine
 valine:
   enable: true # 如果你想用Valine评论系统，请设置enable为true
+  volantis: true # 是否启用volantis版本（禁止匿名，增加若干贴吧、QQ表情）
   # 还需要在根目录配置文件中添加下面这三行内容
   # leancloud:
   #   app_id: 你的appId

layout/_partial/article.ejs

@@ -25,7 +25,7 @@
                 %>
                 <%- items.join(' ') %>
               <% } %>
-              <% if (theme.services && theme.services.share == true && theme.share && (!page.meta || page.meta.share != false)) { %>
+              <% if (theme.services.share == true && theme.share && (!page.meta || page.meta.share != false)) { %>
                 <%- partial('../_third-party/share') %>
               <% } %>
             </div>

layout/_partial/footer.ejs

@@ -16,7 +16,7 @@
   <%}%>
   <br>
   <div><%- markdown(__('footer.license')) %></div>
-  <div><%- __('footer.use') %> <a href="https://xaoxuu.com/wiki/material-x/" target="_blank" class="codename">Material X</a> <%- __('footer.theme') %><% if (theme.services && theme.services.busuanzi == true) { %><%- __('symbol.comma') %><%- __('footer.total_views') %> <span id="busuanzi_value_site_pv"><i class="fas fa-spinner fa-spin fa-fw" aria-hidden="true"></i></span> <%- __('footer.times') %><% } %><%- __('symbol.period') %>
+  <div><%- __('footer.use') %> <a href="https://xaoxuu.com/wiki/material-x/" target="_blank" class="codename">Material X</a> <%- __('footer.theme') %><% if (theme.services.busuanzi == true) { %><%- __('symbol.comma') %><%- __('footer.total_views') %> <span id="busuanzi_value_site_pv"><i class="fas fa-spinner fa-spin fa-fw" aria-hidden="true"></i></span> <%- __('footer.times') %><% } %><%- __('symbol.period') %>
   </div>
 </footer>
 <script>setLoadingBarProgress(80);</script>

layout/_partial/head.ejs

@@ -46,7 +46,7 @@
 
   <!-- link -->
   <link rel="stylesheet" href="https://cdn.jsdelivr.net/gh/fancyapps/fancybox@3.5.7/dist/jquery.fancybox.min.css" />
-  <% if (theme.services && theme.services.nodewaves == true) { %>
+  <% if (theme.services.nodewaves == true) { %>
   <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/node-waves@0.7.6/dist/waves.min.css">
   <% } %>
   <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@fortawesome/fontawesome-free@5.6.3/css/all.min.css">

layout/_partial/meta.ejs

@@ -67,7 +67,7 @@
           </div>
         <% } %>
       <% } %>
-      <% if(!isPostList && theme.services && (!post.meta || post.meta.counter != false)){ %>
+      <% if(!isPostList && (!post.meta || post.meta.counter != false)){ %>
         <% if (theme.services.busuanzi == true) { %>
           <div class="new-meta-item browse busuanzi">
             <a class='notlink'>

layout/_partial/scripts.ejs

@@ -63,7 +63,7 @@
   var enableDisqus = false;
   var enableLivere = false;
   var enableValine = false;
-  if (page && theme.services && theme.services.comments == true && page.comments != false) {
+  if (page && page.comments != false) {
     if (config.disqus_shortname) {
       enableDisqus = true;
     }
@@ -104,8 +104,8 @@
 <% } %>
 <% if (enableValine){ %>
   <script src="//cdn1.lncld.net/static/js/3.0.4/av-min.js"></script>
-  <% if (theme.services.volantis == true) { %>
-    <% if (theme.services && theme.services.cdn == true) { %>
+  <% if (theme.valine.volantis == true) { %>
+    <% if (theme.services.cdn == true) { %>
       <script src="https://cdn.jsdelivr.net/gh/xaoxuu/volantis@1/js/volantis.min.js"></script>
     <% } else { %>
       <%- js('js/volantis.js') %>

layout/_third-party/aplayer.ejs

@@ -1,4 +1,4 @@
-<% if (theme.services && theme.services.music == true) { %>
+<% if (theme.services.music == true) { %>
   <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/aplayer@1.7.0/dist/APlayer.min.css">
   <div class="aplayer"
     data-theme="<%- aplayer_theme != undefined ? aplayer_theme : theme.music.color %>"

layout/_third-party/comments.ejs

@@ -3,7 +3,7 @@
   var enableDisqus = false;
   var enableLivere = false;
   var enableValine = false;
-  if (page && theme.services && theme.services.comments == true && page.comments != false) {
+  if (page && page.comments != false) {
     if (config.disqus_shortname) {
       enableDisqus = true;
     }

layout/_third-party/share.ejs

@@ -1,4 +1,4 @@
-<% if (theme.services && theme.services.share == true && theme.share && page.layout == 'post' && page.share != false) { %>
+<% if (theme.services.share == true && theme.share && page.layout == 'post' && page.share != false) { %>
   <div class="new-meta-item share -mob-share-list">
     <i class="fas fa-share-alt" aria-hidden="true"></i>
     <div class="-mob-share-list share-body">

layout/_widget/music.ejs

@@ -8,7 +8,7 @@ if (page.widget && page.widget.music == false) {
 }
 %>
 
-<% if (theme.services && theme.services.music == true && needDisplay == true) { %>
+<% if (theme.services.music == true && needDisplay == true) { %>
   <section class='<%- item.widget %>'>
     <%- partial('header', {item: item, defIcon: '', defTitle: ''}) %>
     <div class='content <%= theme.style %>'>