From ed02880e29f8dea56b7276978d3822f25d5f15e9 Mon Sep 17 00:00:00 2001
From: hossainemruz <hossainemruz@gmail.com>
Date: Thu, 28 Oct 2021 21:04:46 +0600
Subject: [PATCH] Make comment section backward compatible with old config

Signed-off-by: hossainemruz <hossainemruz@gmail.com>
---
 layouts/_default/single.html | 29 +++++++++++++++--------------
 layouts/partials/disqus.html |  7 ++++++-
 layouts/partials/valine.html | 26 +++++++++++++-------------
 3 files changed, 34 insertions(+), 28 deletions(-)

diff --git a/layouts/_default/single.html b/layouts/_default/single.html
index 3ba95bd..2423a98 100644
--- a/layouts/_default/single.html
+++ b/layouts/_default/single.html
@@ -156,22 +156,23 @@
         {{ partial "navigators/next-prev-navigator.html" . }}
       <hr />
 
-      <!-- Add comment support  -->
-      {{ $commentEnabled:= false }}
-      {{ if or site.Params.features.comment.enabled site.DisqusShortname }}
-        {{ $commentEnabled = true }}
-      {{ end }}
-      {{ if $commentEnabled }}
-          {{ with site.Params.features.comment }}
-              <!-- Add Disqus forum  -->
-              {{ if or .disqus.shortName site.DisqusShortname }}
-                  {{ partial "disqus.html" . }}
-              <!-- Add valine -->
-              {{ else if .valine }}
-                  {{ partial "valine.html" . }}
-              {{ end }}
+      <!----- Add comment support  ----->
+      {{ with site.Params.features.comment }}
+        {{ if .enable }}
+          <!-- Add Disqus forum  -->
+          {{ if .disqus.shortName }}
+              {{ partial "disqus.html" . }}
+          <!-- Add valine -->
+          {{ else if .valine }}
+              {{ partial "valine.html" . }}
           {{ end }}
+        {{ end }}
       {{ end }}
+      <!-- Keep backward compatibility with old config.yaml -->
+      {{ if site.DisqusShortname }}
+        {{ partial "disqus.html" . }}
+      {{ end }}
+
       </div>
     </div>
   </div>
diff --git a/layouts/partials/disqus.html b/layouts/partials/disqus.html
index 71fef21..4ccd9e2 100644
--- a/layouts/partials/disqus.html
+++ b/layouts/partials/disqus.html
@@ -1,3 +1,8 @@
+{{ $disqusShortName := site.DisqusShortname }}
+{{ if site.Params.features.disqus.shortName }}
+  {{ $disqusShortName = site.Params.features.disqus.shortName }}
+{{ end }}
+
 <div id="disqus_thread"></div>
 <script type="text/javascript">
   (function () {
@@ -8,7 +13,7 @@
     var dsq = document.createElement("script");
     dsq.type = "text/javascript";
     dsq.async = true;
-    var disqus_shortname = "{{ site.DisqusShortname }}";
+    var disqus_shortname = "{{ $disqusShortName }}";
     dsq.src = "//" + disqus_shortname + ".disqus.com/embed.js";
     (
       document.getElementsByTagName("head")[0] ||
diff --git a/layouts/partials/valine.html b/layouts/partials/valine.html
index 09850da..c72e28a 100644
--- a/layouts/partials/valine.html
+++ b/layouts/partials/valine.html
@@ -1,17 +1,17 @@
 <!-- valine -->
 <div id="vcomments"></div>
 <script src="//cdn1.lncld.net/static/js/3.0.4/av-min.js"></script>
-<script src='//unpkg.com/valine/dist/Valine.min.js'></script>
+<script src="//unpkg.com/valine/dist/Valine.min.js"></script>
 <script type="text/javascript">
-new Valine({
-    el: '#vcomments' ,
-    appId: {{ site.Params.features.comment.valine.appId }},
-    appKey: {{ site.Params.features.comment.valine.appKey }},
-    avatar: {{ site.Params.features.comment.valine.avatar }},
-    placeholder: {{ site.Params.features.comment.valine.placeholder }},
-    visitor: {{ site.Params.features.comment.valine.visitor }},
-    lang: {{ site.Params.features.comment.valine.lang }},
-    recordIP: {{ site.Params.features.comment.valine.recordIP }},
-    enableQQ: {{ site.Params.features.comment.valine.enableQQ }}
-});
-</script>
\ No newline at end of file
+  new Valine({
+    el: "#vcomments",
+    appId: "{{ .valine.appId }}",
+    appKey: "{{ .valine.appKey }}",
+    avatar: "{{ .valine.avatar }}",
+    placeholder: "{{ .valine.placeholder }}",
+    visitor: "{{ .valine.visitor }}",
+    lang: "{{ .valine.lang }}",
+    recordIP: "{{ .valine.recordIP }}",
+    enableQQ: "{{ .valine.enableQQ }}",
+  });
+</script>