From 3b2c8a4c78ade9e819b61aa055039ae00e517a3e Mon Sep 17 00:00:00 2001
From: FChannel <>
Date: Thu, 22 Jul 2021 13:50:11 -0700
Subject: fixed quote bug and moved comment parsing server side without
 javascript

---
 static/ncatalog.html | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'static/ncatalog.html')

diff --git a/static/ncatalog.html b/static/ncatalog.html
index 68bb01a..d007d62 100644
--- a/static/ncatalog.html
+++ b/static/ncatalog.html
@@ -105,7 +105,7 @@
         document.getElementById("{{ .Id }}-anchor").href = "/{{ $board.Name }}/" + shortURL("{{$board.Actor.Id}}", "{{ .Id }}")        
       </script>                        
       {{ end }}
-      <a id="{{ .Id }}-link" href="/{{ $board.Name }}/">
+      <a id="{{ .Id }}-link" href="/{{ $board.Name }}/{{ short $board.Actor.Outbox .Id }}">
       <div>
         {{ $replies := .Replies }}
         {{ if $replies }}
@@ -121,9 +121,6 @@
       </div>
       </a>
   </div>
-  <script>
-    document.getElementById("{{ .Id }}-link").href = "/{{ $board.Name }}/" + shortURL("{{$board.Actor.Id}}", "{{ .Id }}")
-  </script>
   {{ end }}
 </div>
 <hr>
-- 
cgit v1.2.3


From fa895350a8bdf2eb93495dbf569fa3fe0680d2af Mon Sep 17 00:00:00 2001
From: FChannel <>
Date: Thu, 22 Jul 2021 15:14:14 -0700
Subject: removed media javascript parsing it on server

---
 static/ncatalog.html | 46 ++--------------------------------------------
 1 file changed, 2 insertions(+), 44 deletions(-)

(limited to 'static/ncatalog.html')

diff --git a/static/ncatalog.html b/static/ncatalog.html
index d007d62..c7f5b30 100644
--- a/static/ncatalog.html
+++ b/static/ncatalog.html
@@ -37,8 +37,8 @@
     {{ end }}        
     <div id="hide-{{ .Id }}" style="display: none;">[Hide]</div>
     <div id="sensitive-{{ .Id }}" style="display: none;"><div style="position: relative; text-align: center;"><img id="sensitive-img-{{ .Id }}" style="float: left; margin-right: 10px; margin-bottom: 10px; max-width: 180px; max-height: 180px;" src="/static/sensitive.png"><div id="sensitive-text-{{ .Id }}" style="width: 170px; position: absolute; margin-top: 75px; padding: 5px; background-color: black; color: white; cursor: default; ">NSFW Content</div></div></div>    
-    <a id="{{ .Id }}-anchor" href="/{{ $board.Name }}/">      
-      <div id="media-{{ .Id }}" style="width:180px;"></div>
+    <a id="{{ .Id }}-anchor" href="/{{ $board.Name }}/{{ short $board.Actor.Outbox .Id}}">      
+      <div id="media-{{ .Id }}" style="width:180px;"> {{ parseAttachment . true }}</div>
     </a>
       <script>
         media = document.getElementById("media-{{ .Id }}")
@@ -61,48 +61,6 @@
             sensitive.style = "display: block"
             media.style = "display: none;"          
         }        
-        
-        if(getMIMEType({{ (index .Attachment 0).MediaType }}) == "image"){
-            var img = document.createElement("img");
-            img.style = "max-width: 180px; max-height: 180px;"
-            img.setAttribute("id", "img")
-            img.setAttribute("main", "1")
-            img.setAttribute("enlarge", "0")
-            img.setAttribute("attachment", "{{ proxy (index .Attachment 0).Href }}")            
-            {{ if .Preview.Href }} 
-            img.setAttribute("src", "{{  proxy .Preview.Href }}")
-            img.setAttribute("preview", "{{ proxy .Preview.Href }}")          
-            {{ else }}
-            img.setAttribute("src", "{{  proxy (index .Attachment 0).Href }}")
-            img.setAttribute("preview", "{{ proxy (index .Attachment 0).Href }}")                    
-            {{ end }}            
-            media.appendChild(img)
-        }                                
-
-        if(getMIMEType({{ (index .Attachment 0).MediaType }}) == "audio"){
-            var audio = document.createElement("audio")
-            audio.controls = 'controls'
-            audio.preload    = 'metadata'              
-            audio.src      = '{{ proxy (index .Attachment 0).Href }}'
-            audio.type     = '{{ (index .Attachment 0).MediaType }}'              
-            audio.style = "margin-right: 10px; margin-bottom: 10px; max-width: 180px; max-height: 180px;"
-            audio.innerText = 'Audio is not supported.'
-            media.appendChild(audio)                            
-        }
-
-        if(getMIMEType({{ (index .Attachment 0).MediaType }}) == "video"){
-            var video = document.createElement("video")
-            video.controls = 'controls'
-            video.preload    = 'metadata'                          
-            video.muted    = 'muted'              
-            video.src      = '{{ proxy (index .Attachment 0).Href }}'
-            video.type     = '{{ (index .Attachment 0).MediaType }}'              
-            video.style = "margin-right: 10px; margin-bottom: 10px; max-width: 180px; max-height: 180px;"
-            video.innerText = 'Video is not supported.'
-            media.appendChild(video)                                          
-        }
-        
-        document.getElementById("{{ .Id }}-anchor").href = "/{{ $board.Name }}/" + shortURL("{{$board.Actor.Id}}", "{{ .Id }}")        
       </script>                        
       {{ end }}
       <a id="{{ .Id }}-link" href="/{{ $board.Name }}/{{ short $board.Actor.Outbox .Id }}">
-- 
cgit v1.2.3