theme-next · jiangtj · Mar 19, 2019 · Mar 19, 2019 · Mar 19, 2019 · Mar 19, 2019
diff --git a/_config.yml b/_config.yml
@@ -598,20 +598,28 @@ calendar:
 # ---------------------------------------------------------------
 # Comments and Widgets
 # See: https://theme-next.org/docs/third-party-services/comments-and-widgets
+# You can set one type to enable.
+# And need to provide additional configurations are required for those types.
+# Note: facebook_comments_plugin and vkontakte have to enable SDK.
 # ---------------------------------------------------------------
+comments:
+  # Type list:
+  # disqus | disqusjs | changyan | valine | livere | gitment | gitalk | facebook_comments_plugin | vkontakte 
+  type:
+  # If comment system support, show comments count in meta area
+  count: 
+    page: true
+    post: true
 
 # Disqus
 disqus:
-  enable: false
   shortname:
-  count: true
   lazyload: false
 
 # DisqusJS
 # Alternative Disqus - Render comment component using Disqus API
 # Demo: https://suka.js.org/DisqusJS/
 disqusjs:
-  enable: false
   # API Endpoint of Disqus API (https://disqus.com/api/)
   # leave api empty if you are able to connect to Disqus API
   # otherwise you need a reverse proxy for Disqus API
@@ -623,15 +631,14 @@ disqusjs:
 
 # Changyan
 changyan:
-  enable: false
   appid:
   appkey:
 
 # Valine
 # You can get your appid and appkey from https://leancloud.cn
 # More info available at https://valine.js.org
+# When comments.type is set to valine, leancloud_visitors is recommended to be closed for the re-initialization problem within different leancloud adk version.
 valine:
-  enable: false # When enable is set to be true, leancloud_visitors is recommended to be closed for the re-initialization problem within different leancloud adk version.
   appid:  # your leancloud application appid
   appkey:  # your leancloud application appkey
   notify: false # mail notifier, See: https://github.com/xCss/Valine/wiki
@@ -642,7 +649,6 @@ valine:
   pageSize: 10 # pagination size
   language: # language, available values: en, zh-cn
   visitor: false # leancloud-counter-security is not supported for now. When visitor is set to be true, appid and appkey are recommended to be the same as leancloud_visitors' for counter compatibility. Article reading statistic https://valine.js.org/visitor.html
-  comment_count: true # if false, comment count will only be displayed in post page, not in home page
 
 # LiveRe comments system
 # You can get your uid from https://livere.com/insight/myCode (General web site)
@@ -651,9 +657,7 @@ valine:
 # Gitment
 # Introduction: https://github.com/imsun/gitment
 gitment:
-  enable: false
   mint: true # RECOMMEND, A mint on Gitment, to support count, language and proxy_gateway
-  count: true # Show comments count in post meta area
   lazy: false # Comments lazy loading with a button
   cleanly: false # Hide 'Powered by ...' on footer, and more
   language: # Force language, or auto switch by theme
@@ -667,7 +671,6 @@ gitment:
 # Gitalk
 # Demo: https://gitalk.github.io
 gitalk:
-  enable: false
   github_id:  # Github repo owner
   repo:  # Repository name to store issues
   client_id:  # Github Application Client ID
@@ -777,7 +780,6 @@ facebook_sdk:
 # This plugin depends on Facebook SDK.
 # If facebook_sdk.enable is false, Facebook comments plugin is unavailable.
 facebook_comments_plugin:
-  enable:       false
   num_of_posts: 10    # min posts num is 1
   width:        100%  # default width is 550px
   scheme:       light # default scheme is light (light or dark)
@@ -788,7 +790,6 @@ vkontakte_api:
   enable:       false
   app_id:       #<app_id>
   like:         true
-  comments:     true
   num_of_posts: 10
 
 # Star rating support to each article.

diff --git a/layout/_macro/post.swig b/layout/_macro/post.swig
@@ -139,54 +139,11 @@
           {% endif %}
 
           {% if post.comments %}
-            {% macro comments() %}
-              <span class="post-comments-count">
-                <span class="post-meta-divider">|</span>
-                <span class="post-meta-item-icon">
-                  <i class="fa fa-comment-o"></i>
-                </span>
-            {% endmacro %}
-            {% if theme.facebook_comments_plugin.enable %}
-              {{ comments() }}
-                <span class="post-meta-item-text">{{ __('post.comments_count') + __('symbol.colon') }}</span>
-                <a href="{{ url_for(post.path) }}#comments" itemprop="discussionUrl">
-                  <span class="post-comments-count fb-comments-count" data-href="{{ post.permalink }}" itemprop="commentCount">0</span>
-                </a>
-              </span>
-            {% elif theme.disqus.enable and theme.disqus.count %}
-              {{ comments() }}
-                <span class="post-meta-item-text">{{ __('post.comments_count') + __('symbol.colon') }}</span>
-                <a href="{{ url_for(post.path) }}#comments" itemprop="discussionUrl">
-                  <span class="post-comments-count disqus-comment-count" data-disqus-identifier="{{ post.path }}" itemprop="commentCount"></span>
-                </a>
-              </span>
-            {% elif theme.changyan.enable and theme.changyan.appid and theme.changyan.appkey %}
-              {{ comments() }}
-              {% if is_post() %}
-                <span class="post-meta-item-text">{{ __('post.comments_count') + __('symbol.colon') }}</span>
-                <a href="{{ url_for(post.path) }}#SOHUCS" itemprop="discussionUrl">
-                  <span id="changyan_count_unit" class="post-comments-count hc-comment-count" data-xid="{{ post.path }}" itemprop="commentCount"></span>
-                </a>
-              {% else %}
-                <span class="post-meta-item-text">{{ __('post.comments_count') + __('symbol.colon') }}</span>
-                <a href="{{ url_for(post.path) }}#SOHUCS" itemprop="discussionUrl">
-                  <span id="url::{{ post.permalink }}" class="cy_cmt_count" data-xid="{{ post.path }}" itemprop="commentCount"></span>
-                </a>
-              {% endif %}
-            {% elif is_post() and theme.gitment.enable and theme.gitment.mint and theme.gitment.count %}
-              {{ comments() }}
-                <span class="post-meta-item-text">{{ __('post.comments_count') + __('symbol.colon') }}</span>
-                <a href="{{ url_for(post.path) }}#comments" itemprop="discussionUrl">
-                  <span class="post-comments-count gitment-comments-count" data-xid="{{ url_for(post.path) }}" itemprop="commentCount"></span>
-                </a>
-              </span>
-            {% elif (is_post() or theme.valine.comment_count) and theme.valine.enable and theme.valine.appid and theme.valine.appkey %}
-              {{ comments() }}
-                <span class="post-meta-item-text">{{ __('post.comments_count') + __('symbol.colon') }}</span>
-                <a href="{{ url_for(post.path) }}#comments" itemprop="discussionUrl">
-                  <span class="post-comments-count valine-comment-count" data-xid="{{ url_for(post.path) }}" itemprop="commentCount"></span>
-                </a>
-              </span>
+            {% set comments_count_post_enable = is_post() and theme.comments.count.post %}
+            {% set comments_count_page_enable = not is_post() and theme.comments.count.page %}
+            {% if theme.comments.type and (comments_count_post_enable or comments_count_page_enable) %}
+              {% set comments_count_path = '_third-party/comments/' + theme.comments.type|lower + '/count.swig' %}
+              {{ partial(comments_count_path,{ post: post }) }}
             {% endif %}
           {% endif %}
 

diff --git a/layout/_partials/comments.swig b/layout/_partials/comments.swig
@@ -1,57 +1,6 @@
 {% if page.comments %}
-
-  {% if theme.facebook_sdk.enable and theme.facebook_comments_plugin.enable %}
-    <div class="comments" id="comments">
-      <div class="fb-comments"
-           data-href="{{ page.permalink }}"
-           data-numposts="{{ theme.facebook_comments_plugin.num_of_posts }}"
-           data-width="{{ theme.facebook_comments_plugin.width }}"
-           data-colorscheme="{{ theme.facebook_comments_plugin.scheme }}">
-      </div>
-    </div>
-
-  {% elif theme.vkontakte_api.enable and theme.vkontakte_api.comments %}
-    <div class="comments" id="comments">
-      <div id="vk_comments"></div>
-    </div>
-
-  {% elif theme.disqus.enable or (theme.disqusjs.enable and theme.disqusjs.apikey and theme.disqusjs.shortname) %}
-    <div class="comments" id="comments">
-      <div id="disqus_thread">
-        <noscript>{#
-        #}Please enable JavaScript to view the comments powered by Disqus.{#
-      #}</noscript>
-      </div>
-    </div>
-
-  {% elif theme.livere_uid %}
-    <div class="comments" id="comments">
-      <div id="lv-container" data-id="city" data-uid="{{ theme.livere_uid }}"></div>
-    </div>
-
-  {% elif theme.changyan.enable and theme.changyan.appid and theme.changyan.appkey %}
-    <div class="comments" id="comments">
-      <div id="SOHUCS"></div>
-    </div>
-
-  {% elif theme.gitment.enable %}
-    <div class="comments" id="comments">
-      {% if theme.gitment.lazy %}
-        <div onclick="showGitment()" id="gitment-display-button">{{ __('gitmentbutton') }}</div>
-        <div id="gitment-container" style="display: none"></div>
-      {% else %}
-        <div id="gitment-container"></div>
-      {% endif %}
-    </div>
-
-  {% elif theme.valine.enable and theme.valine.appid and theme.valine.appkey %}
-    <div class="comments" id="comments">
-    </div>
-
-  {% elif theme.gitalk.enable %}
-    <div class="comments" id="gitalk-container">
-    </div>
-
+  {% if theme.comments.type %}
+    {% set comments_comment_path = '_third-party/comments/' + theme.comments.type|lower + '/comment.swig' %}
+    {{ partial(comments_comment_path) }}
   {% endif %}
-
 {% endif %}
diff --git a/layout/_third-party/analytics/vkontakte-api.swig b/layout/_third-party/analytics/vkontakte-api.swig
@@ -10,7 +10,7 @@
         VK.Widgets.Like("vk_like", {type: "mini", height: 20});
       {% endif %}
 
-      {% if page.comments and theme.vkontakte_api.comments %}
+      {% if page.comments and theme.comments.type|lower === 'vkontakte' %}
         VK.Widgets.Comments("vk_comments", {limit: {{ theme.vkontakte_api.num_of_posts }}, attach: "*"});
       {% endif %}
     };

diff --git a/layout/_third-party/comments/changyan/comment.swig b/layout/_third-party/comments/changyan/comment.swig
@@ -0,0 +1,5 @@
+{% if theme.changyan.appid and theme.changyan.appkey %}
+  <div class="comments" id="comments">
+    <div id="SOHUCS"></div>
+  </div>
+{% endif %}
diff --git a/layout/_third-party/comments/changyan/count.swig b/layout/_third-party/comments/changyan/count.swig
@@ -0,0 +1,19 @@
+{% if theme.changyan.appid and theme.changyan.appkey %}
+  <span class="post-comments-count">
+    <span class="post-meta-divider">|</span>
+    <span class="post-meta-item-icon">
+      <i class="fa fa-comment-o"></i>
+    </span>
+    {% if is_post() %}
+      <span class="post-meta-item-text">{{ __('post.comments_count') + __('symbol.colon') }}</span>
+      <a href="{{ url_for(post.path) }}#SOHUCS" itemprop="discussionUrl">
+        <span id="changyan_count_unit" class="post-comments-count hc-comment-count" data-xid="{{ post.path }}" itemprop="commentCount"></span>
+      </a>
+    {% else %}
+      <span class="post-meta-item-text">{{ __('post.comments_count') + __('symbol.colon') }}</span>
+      <a href="{{ url_for(post.path) }}#SOHUCS" itemprop="discussionUrl">
+        <span id="url::{{ post.permalink }}" class="cy_cmt_count" data-xid="{{ post.path }}" itemprop="commentCount"></span>
+      </a>
+    {% endif %}
+  </span>
+{% endif %}
diff --git a/layout/_third-party/comments/changyan.swig → ..._third-party/comments/changyan/index.swig b/layout/_third-party/comments/changyan.swig → ..._third-party/comments/changyan/index.swig
@@ -1,3 +1,4 @@
+{% if theme.changyan.appid and theme.changyan.appkey %}
 {% if is_home() %}
   <script id="cy_cmt_num" src="https://changyan.sohu.com/upload/plugins/plugins.list.count.js?clientId={{ theme.changyan.appid }}"></script>
 {% elif page.comments %}
@@ -16,3 +17,4 @@
   </script>
   <script src="https://assets.changyan.sohu.com/upload/plugins/plugins.count.js"></script>
 {% endif %}
+{% endif %}
diff --git a/layout/_third-party/comments/disqus/comment.swig b/layout/_third-party/comments/disqus/comment.swig
@@ -0,0 +1,9 @@
+{% if theme.disqus.shortname %}
+  <div class="comments" id="comments">
+    <div id="disqus_thread">
+      <noscript>{#
+       #}Please enable JavaScript to view the comments powered by Disqus.{#
+    #}</noscript>
+    </div>
+  </div>
+{% endif %}
diff --git a/layout/_third-party/comments/disqus/count.swig b/layout/_third-party/comments/disqus/count.swig
@@ -0,0 +1,12 @@
+{% if theme.disqus.shortname %}
+  <span class="post-comments-count">
+    <span class="post-meta-divider">|</span>
+    <span class="post-meta-item-icon">
+      <i class="fa fa-comment-o"></i>
+    </span>
+    <span class="post-meta-item-text">{{ __('post.comments_count') + __('symbol.colon') }}</span>
+    <a href="{{ url_for(post.path) }}#comments" itemprop="discussionUrl">
+      <span class="post-comments-count disqus-comment-count" data-disqus-identifier="{{ post.path }}" itemprop="commentCount"></span>
+    </a>
+  </span>
+{% endif %}
diff --git a/layout/_third-party/comments/disqus.swig → ...t/_third-party/comments/disqus/index.swig b/layout/_third-party/comments/disqus.swig → ...t/_third-party/comments/disqus/index.swig
@@ -1,4 +1,5 @@
-{% if theme.disqus.count %}
+{% if theme.disqus.shortname %}
+{% if theme.comments.count.post or theme.comments.count.page %}
   <script id="dsq-count-scr" src="https://{{ theme.disqus.shortname }}.disqus.com/count.js" async></script>
 {% endif %}
 {% if page.comments %}
@@ -42,3 +43,4 @@
   {% endif %}
 </script>
 {% endif %}
+{% endif %}
diff --git a/layout/_third-party/comments/disqusjs/comment.swig b/layout/_third-party/comments/disqusjs/comment.swig
@@ -0,0 +1,9 @@
+{% if theme.disqusjs.apikey and theme.disqusjs.shortname %}
+<div class="comments" id="comments">
+  <div id="disqus_thread">
+    <noscript>{#
+     #}Please enable JavaScript to view the comments powered by Disqus.{#
+  #}</noscript>
+  </div>
+</div>
+{% endif %}
diff --git a/layout/_third-party/comments/disqusjs.swig → ..._third-party/comments/disqusjs/index.swig b/layout/_third-party/comments/disqusjs.swig → ..._third-party/comments/disqusjs/index.swig
@@ -1,3 +1,4 @@
+{% if page.comments and theme.disqusjs.apikey and theme.disqusjs.shortname %}
 {% set disqusjs_css_url = '//cdn.jsdelivr.net/npm/disqusjs@1/dist/disqusjs.css' %}
 {% if theme.vendors.disqusjs_css %}
   {% set disqusjs_css_url = theme.vendors.disqusjs_css %}
@@ -17,3 +18,4 @@
     shortname: '{{ theme.disqusjs.shortname }}'
   });
 </script>
+{% endif %}
diff --git a/layout/_third-party/comments/facebook_comments_plugin/comment.swig b/layout/_third-party/comments/facebook_comments_plugin/comment.swig
@@ -0,0 +1,10 @@
+{% if theme.facebook_sdk.enable %}
+  <div class="comments" id="comments">
+    <div class="fb-comments"
+         data-href="{{ page.permalink }}"
+          data-numposts="{{ theme.facebook_comments_plugin.num_of_posts }}"
+          data-width="{{ theme.facebook_comments_plugin.width }}"
+         data-colorscheme="{{ theme.facebook_comments_plugin.scheme }}">
+    </div>
+  </div>
+{% endif %}
diff --git a/layout/_third-party/comments/facebook_comments_plugin/count.swig b/layout/_third-party/comments/facebook_comments_plugin/count.swig
@@ -0,0 +1,12 @@
+{% if theme.facebook_sdk.enable %}
+  <span class="post-comments-count">
+    <span class="post-meta-divider">|</span>
+    <span class="post-meta-item-icon">
+      <i class="fa fa-comment-o"></i>
+    </span>
+    <span class="post-meta-item-text">{{ __('post.comments_count') + __('symbol.colon') }}</span>
+    <a href="{{ url_for(post.path) }}#comments" itemprop="discussionUrl">
+      <span class="post-comments-count fb-comments-count" data-href="{{ post.permalink }}" itemprop="commentCount">0</span>
+    </a>
+  </span>
+{% endif %}
diff --git a/layout/_third-party/comments/gitalk/comment.swig b/layout/_third-party/comments/gitalk/comment.swig
@@ -0,0 +1 @@
+<div class="comments" id="gitalk-container"></div>
diff --git a/layout/_third-party/comments/gitalk.swig → ...t/_third-party/comments/gitalk/index.swig b/layout/_third-party/comments/gitalk.swig → ...t/_third-party/comments/gitalk/index.swig
@@ -1,3 +1,4 @@
+{% if page.comments %}
 {% set gitalk_js_url = '//cdn.jsdelivr.net/npm/gitalk@1/dist/gitalk.min.js' %}
 {% if theme.vendors.gitalk_js %}
   {% set gitalk_js_url = theme.vendors.gitalk_js %}
@@ -33,3 +34,4 @@
   });
   gitalk.render('gitalk-container');
 </script>
+{% endif %}
diff --git a/layout/_third-party/comments/gitment/comment.swig b/layout/_third-party/comments/gitment/comment.swig
@@ -0,0 +1,8 @@
+<div class="comments" id="comments">
+  {% if theme.gitment.lazy %}
+     <div onclick="showGitment()" id="gitment-display-button">{{ __('gitmentbutton') }}</div>
+     <div id="gitment-container" style="display: none"></div>
+  {% else %}
+     <div id="gitment-container"></div>
+   {% endif %}
+</div>
diff --git a/layout/_third-party/comments/gitment/count.swig b/layout/_third-party/comments/gitment/count.swig
@@ -0,0 +1,12 @@
+{% if is_post() and theme.gitment.mint %}
+  <span class="post-comments-count">
+    <span class="post-meta-divider">|</span>
+    <span class="post-meta-item-icon">
+      <i class="fa fa-comment-o"></i>
+    </span>
+    <span class="post-meta-item-text">{{ __('post.comments_count') + __('symbol.colon') }}</span>
+    <a href="{{ url_for(post.path) }}#comments" itemprop="discussionUrl">
+      <span class="post-comments-count gitment-comments-count" data-xid="{{ url_for(post.path) }}" itemprop="commentsCount"></span>
+    </a>
+  </span>
+{% endif %}
diff --git a/layout/_third-party/comments/gitment.swig → .../_third-party/comments/gitment/index.swig b/layout/_third-party/comments/gitment.swig → .../_third-party/comments/gitment/index.swig
@@ -1,3 +1,4 @@
+{% if page.comments and theme.gitment.client_id %}
 <!-- LOCAL: You can save these files to your site and update links -->
 {% if theme.gitment.mint %}
   {% set CommentsClass = 'Gitmint' %}
@@ -43,3 +44,4 @@
     }
   {% endif %}
 </script>
+{% endif %}