From 4628aa4c5052dedebff276792bbc818cce1ba1e4 Mon Sep 17 00:00:00 2001
From: xaoxuu <me@xaoxuu.com>
Date: Fri, 23 Jul 2021 23:44:25 +0800
Subject: [PATCH] update comments

---
 _config.yml                                   |  4 ++
 .../plugins/comments/beaudar/script.ejs       | 43 ++++++++++---------
 .../plugins/comments/utterances/script.ejs    | 43 ++++++++++---------
 source/css/_plugins/comments/beaudar.styl     |  3 ++
 source/css/_plugins/index.styl                |  4 ++
 5 files changed, 55 insertions(+), 42 deletions(-)
 create mode 100644 source/css/_plugins/comments/beaudar.styl

diff --git a/_config.yml b/_config.yml
index 4a67aa1..33955cf 100755
--- a/_config.yml
+++ b/_config.yml
@@ -76,9 +76,12 @@ comments:
     issue-term: pathname
     issue-number:
     theme: preferred-color-scheme
+    label:
     input-position: top # top/bottom 评论框位置
     comment-order: desc # desc 排序
     keep-theme: # true/false
+    loading: false
+    branch: main
   # utterances
   # https://utteranc.es/
   utterances:
@@ -86,6 +89,7 @@ comments:
     issue-term: pathname
     issue-number:
     theme: preferred-color-scheme
+    label:
   valine:
     js: https://cdn.jsdelivr.net/gh/XuxuGood/simple-blog-cdn@main/js/Valine.min.js
     appId: # your appId
diff --git a/layout/_partial/plugins/comments/beaudar/script.ejs b/layout/_partial/plugins/comments/beaudar/script.ejs
index 8b518b8..e1c66df 100644
--- a/layout/_partial/plugins/comments/beaudar/script.ejs
+++ b/layout/_partial/plugins/comments/beaudar/script.ejs
@@ -1,25 +1,26 @@
 <script>
-  function beaudar(){
-    if(!document.getElementById("beaudar"))return;
-    setTimeout(function() {
-      var checkbeaudar = setInterval(function () {
-        var el = document.getElementById("beaudar");
-        if (!el) return
-        clearInterval(checkbeaudar)
-        try {
-          el.innerHTML="";
-        } catch (error) {}
-        var script = document.createElement('script');
-        script.src = 'https://beaudar.lipk.org/client.js';
-        const keys = ['repo', 'issue-term', 'issue-number', 'theme', 'label', 'crossorigin', 'input-position', 'comment-order', 'keep-theme'];
-        keys.forEach((key, i) => {
-          if (el.attributes[key] && el.attributes[key].value) {
-            script.setAttribute(key, el.attributes[key].value);
-          }
-        });
-        el.appendChild(script);
-       }, 200)
+  function loadBeaudar() {
+    const els = document.querySelectorAll("#comments #beaudar");
+    if (els.length === 0) return;
+    els.forEach((el, i) => {
+      try {
+        el.innerHTML = '';
+      } catch (error) {
+        console.log(error);
+      }
+      var script = document.createElement('script');
+      script.src = 'https://beaudar.lipk.org/client.js';
+      script.async = true;
+      for (let key of Object.keys(el.attributes)) {
+        let attr = el.attributes[key];
+        if (['class', 'id'].includes(attr.name) === false) {
+          script.setAttribute(attr.name, attr.value);
+        }
+      }
+      el.appendChild(script);
     });
   }
-  beaudar();
+  window.addEventListener('DOMContentLoaded', (event) => {
+      loadBeaudar();
+  });
 </script>
diff --git a/layout/_partial/plugins/comments/utterances/script.ejs b/layout/_partial/plugins/comments/utterances/script.ejs
index 2d808a8..84409f0 100644
--- a/layout/_partial/plugins/comments/utterances/script.ejs
+++ b/layout/_partial/plugins/comments/utterances/script.ejs
@@ -1,25 +1,26 @@
 <script>
-  function utterances(){
-    if(!document.getElementById("utterances"))return;
-    setTimeout(function() {
-      var checkUtterances = setInterval(function () {
-        var el = document.getElementById("utterances");
-        if (!el) return
-        clearInterval(checkUtterances)
-        try {
-          el.innerHTML="";
-        } catch (error) {}
-        var script = document.createElement('script');
-        script.src = 'https://utteranc.es/client.js';
-        const keys = ['repo', 'issue-term', 'issue-number', 'theme', 'label', 'crossorigin'];
-        keys.forEach((key, i) => {
-          if (el.attributes[key] && el.attributes[key].value) {
-            script.setAttribute(key, el.attributes[key].value);
-          }
-        });
-        el.appendChild(script);
-       }, 200)
+  function loadUtterances() {
+    const els = document.querySelectorAll("#comments #utterances");
+    if (els.length === 0) return;
+    els.forEach((el, i) => {
+      try {
+        el.innerHTML = '';
+      } catch (error) {
+        console.log(error);
+      }
+      var script = document.createElement('script');
+      script.src = 'https://utteranc.es/client.js';
+      script.async = true;
+      for (let key of Object.keys(el.attributes)) {
+        let attr = el.attributes[key];
+        if (['class', 'id'].includes(attr.name) === false) {
+          script.setAttribute(attr.name, attr.value);
+        }
+      }
+      el.appendChild(script);
     });
   }
-  utterances();
+  window.addEventListener('DOMContentLoaded', (event) => {
+      loadUtterances();
+  });
 </script>
diff --git a/source/css/_plugins/comments/beaudar.styl b/source/css/_plugins/comments/beaudar.styl
new file mode 100644
index 0000000..bac821b
--- /dev/null
+++ b/source/css/_plugins/comments/beaudar.styl
@@ -0,0 +1,3 @@
+.cmt-body.beaudar
+  margin: 0 -4px
+  width: 'calc(100% + %s)' % 8px
diff --git a/source/css/_plugins/index.styl b/source/css/_plugins/index.styl
index 0669ed0..30cef8d 100644
--- a/source/css/_plugins/index.styl
+++ b/source/css/_plugins/index.styl
@@ -7,6 +7,10 @@ if hexo-config('plugins.scrollreveal.enable')
   @import 'scrollreveal'
 
 // 评论
+if hexo-config('comments.service') == 'beaudar'
+  @import 'comments/beaudar'
+if hexo-config('comments.service') == 'twikoo'
+  @import 'comments/twikoo'
 if hexo-config('comments.service') == 'utterances'
   @import 'comments/utterances'
 if hexo-config('comments.service') == 'valine'