Major refactoring

1 files changed, 22 insertions, 17 deletions

diff --git a/src/js/arching-kaos-modules-comments.js b/src/js/arching-kaos-modules-comments.js
index aad581f..8db1b57 100644
--- a/src/js/arching-kaos-modules-comments.js
+++ b/src/js/arching-kaos-modules-comments.js
@@ -5,32 +5,37 @@
  * @license magnet:?xt=urn:btih:0b31508aeb0634b347b8270c7bee4d411b5d4109&dn=agpl-3.0.txt AGPL v3.0
  *
  */
-function akModuleComments(zblockIPFSHash, blockObject, json){
+import { makeElement } from "./arching-kaos-generator.js";
+import {
+    getFullText,
+    getNicknameAssossiatedWithGPG
+} from "./arching-kaos-tools.js";
+import { archingKaosFetchText } from "./arching-kaos-fetch.js";
+import { getIPFSURL } from "./url-generators.js";
+
+export function akModuleComments(zblockIPFSHash, blockObject, json){
     if (!document.querySelector('#comment-'+zblockIPFSHash)){
         var divs = document.querySelector('#comments-section');
         var art = {
             element:"article",
-            id: 'comment-'+zblockIPFSHash
+            id: `comment-${zblockIPFSHash}`,
+            innerHTML: [
+                {
+                    element:"p",
+                    innerText:"Published: " + new Date(json.datetime*1000)
+                },
+                {
+                    element:"p",
+                    innerText:"Contributor: " + getNicknameAssossiatedWithGPG(blockObject.gpg)
+                }
+            ]
         };
         makeElement(art, divs);
-        art = document.querySelector('#comment-'+zblockIPFSHash);
-        if(json.datetime){
-            var small = {
-                element:"p",
-                innerText:"Published: " + new Date(json.datetime*1000)
-            };
-            makeElement(small, art);
-        }
-        var small = {
-            element:"p",
-            innerText:"Contributor: " + getNicknameAssossiatedWithGPG(blockObject.gpg)
-        };
-        makeElement(small, art);
         if(json.ipfs){
-            getipfstext(json.ipfs,art.id);
+            archingKaosFetchText(getIPFSURL(json.ipfs), getFullText, [`#comment-${zblockIPFSHash}`]);
         }
         if (document.querySelector("#comments-sec-not-found")) document.querySelector("#comments-sec-not-found").hidden=true;
-        makeElement(document.createElement("hr"), divs);
+        makeElement({element:"hr"}, divs);
     }
 }
 // @license-end