v0.0.13-release

1 files changed, 14 insertions, 120 deletions

diff --git a/static/posts.html b/static/posts.html
index d16f780..67a755c 100644
--- a/static/posts.html
+++ b/static/posts.html
@@ -7,22 +7,22 @@
 <hr>
 {{ end }}
 <div style="overflow: auto;">
-  <div id="{{ .Id }}" style="overflow: visible; margin-bottom: 12px;">
+  <div id="{{ short $board.Actor.Outbox .Id }}" style="overflow: visible; margin-bottom: 12px;">
     {{ if eq $board.ModCred $board.Domain $board.Actor.Id }}
     <a href="/delete?id={{ .Id }}&board={{ $board.Actor.Name }}">[Delete Post]</a>
     {{ end }}        
     {{ if .Attachment }}
-    {{ if eq $board.ModCred $board.Domain $board.Actor.Id }}    
+    {{ if eq $board.ModCred $board.Domain $board.Actor.Id }}
+    <a href="/banmedia?id={{ .Id }}&board={{ $board.Actor.Name }}">[Ban Media]</a>                        
     <a href="/deleteattach?id={{ .Id }}&board={{ $board.Actor.Name }}">[Delete Attachment]</a>
     <a href="/marksensitive?id={{ .Id }}&board={{ $board.Actor.Name }}">[Mark Sensitive]</a>
     {{ end }}                
     <span style="display: block;">File: <a id="{{ .Id }}-img" href="{{ proxy (index .Attachment 0).Href}}">{{ (index .Attachment 0).Name  }}</a><span id="{{ .Id }}-size">({{ (index .Attachment 0).Size  }})</span></span>
     <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: 250px; max-height: 250px;" src="/static/sensitive.png"><div id="sensitive-text-{{ .Id }}" style="width: 240px; position: absolute; margin-top: 110px; padding: 5px; background-color: black; color: white; cursor: default; ">NSFW Content</div></div></div>    
-    <div id="media-{{ .Id }}"></div>
+    <div id="media-{{ .Id }}">{{ parseAttachment . false }}</div>
     <script>
       media = document.getElementById("media-{{ .Id }}")
-
       if(({{ .Sensitive }} && {{ $board.Actor.Restricted }}) || (isOnion("{{ .Id }}") && !isOnion("{{ $board.Domain }}"))){
           sensitive = document.getElementById("sensitive-{{ .Id }}")
           hide = document.getElementById("hide-{{ .Id }}")
@@ -42,50 +42,10 @@
           sensitive.style = "display: block"
           media.style = "display: none;"          
       }
-      
-      if(getMIMEType({{ (index .Attachment 0).MediaType }}) == "image"){
-          var img = document.createElement("img");
-          img.style = "float: left; margin-right: 10px; margin-bottom: 10px; max-width: 250px; max-height: 250px;"
-          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 = "float: left; margin-right: 10px; margin-bottom: 10px; max-width: 250px; max-height: 250px;"
-          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 = "float: left; margin-right: 10px; margin-bottom: 10px; max-width: 250px; max-height: 250px;"
-          video.innerText = 'Video is not supported.'
-          media.appendChild(video)                                          
-      }                    
     </script>
     {{ end }}
-    <span style="color: #0f0c5d;"><b>{{ .Name }}</b></span><span style="color: #117743;"><b>{{ if .AttributedTo }} {{.AttributedTo }} {{ else }} Anonymous {{ end }}</b></span><span class="tripcode"> {{ .TripCode }} </span><span>{{ .Published }} <a id="{{ .Id }}-anchor" href="/{{ $board.Name }}/">No.</a> <a id="{{ .Id }}-link" title="{{ .Id }}" href="javascript:quote('{{ $board.Actor.Id }}', '{{ $opId }}', '{{ .Id }}')">{{ .Id }}</a> {{ if ne .Type "Tombstone" }}<a href="javascript:report('{{ $board.Actor.Id }}', '{{ .Id }}')">[Report]</a>{{ end }}</span>
-    <p id="{{ .Id }}-content" style="white-space: pre-wrap; margin: 10px 30px 10px 30px;">{{.Content}}</p>
+    <span style="color: #0f0c5d;"><b>{{ .Name }}</b></span><span style="color: #117743;"><b>{{ if .AttributedTo }} {{.AttributedTo }} {{ else }} Anonymous {{ end }}</b></span><span class="tripcode"> {{ .TripCode }} </span><span>{{ .Published }} <a id="{{ .Id }}-anchor" href="/{{ $board.Name }}/{{ short $board.Actor.Outbox $opId }}#{{ short $board.Actor.Outbox .Id }}">No.</a> <a id="{{ .Id }}-link" title="{{ .Id }}" href="javascript:quote('{{ $board.Actor.Id }}', '{{ $opId }}', '{{ .Id }}')">{{ short $board.Actor.Outbox .Id }}</a> {{ if ne .Type "Tombstone" }}<a href="javascript:report('{{ $board.Actor.Id }}', '{{ .Id }}')">[Report]</a>{{ end }}</span>
+    <p id="{{ .Id }}-content" style="white-space: pre-wrap; margin: 10px 30px 10px 30px;">{{.ContentHTML}}</p>
     {{ if .Replies }}
     {{ $replies := .Replies }}
     {{ if gt $replies.TotalItems 5 }}
@@ -94,7 +54,7 @@
     {{ end }}
     {{ end }}
     {{ range $replies.OrderedItems }}
-    <div id="{{ .Id }}">
+    <div id="{{ short $board.Actor.Outbox .Id }}">    
       <div  style="display: inline-block; overflow: auto;">
         <div style="float: left; display: block; margin-right: 5px;">>></div>
         <div class="post" style="overflow: auto; padding: 5px; margin-bottom: 2px;">
@@ -102,15 +62,16 @@
           <a href="/delete?id={{ .Id }}&board={{ $board.Actor.Name }}">[Delete Post]</a>
           {{ end }}              
           {{ if .Attachment }}
-          {{ if eq $board.ModCred $board.Domain $board.Actor.Id }}                    
+          {{ if eq $board.ModCred $board.Domain $board.Actor.Id }}
+          <a href="/banmedia?id={{ .Id }}&board={{ $board.Actor.Name }}">[Ban Media]</a>                              
           <a href="/deleteattach?id={{ .Id }}&board={{ $board.Actor.Name }}">[Delete Attachment]</a>
-          <a href="/marksensitive?id={{ .Id }}&board={{ $board.Actor.Name }}">[Mark Sensitive]</a>          
+          <a href="/marksensitive?id={{ .Id }}&board={{ $board.Actor.Name }}">[Mark Sensitive]</a>
           {{ end }}
           <span style="display: block;">File <a id="{{ .Id }}-img" href="{{ proxy (index .Attachment 0).Href}}">{{ (index .Attachment 0).Name  }}</a> <span id="{{ .Id }}-size">({{ (index .Attachment 0).Size  }})</span></span>
           <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: 250px; max-height: 250px;" src="/static/sensitive.png"><div id="sensitive-text-{{ .Id }}" style="width: 240px; position: absolute; margin-top: 110px; padding: 5px; background-color: black; color: white; cursor: default; ">NSFW Content</div></div></div>              
           <div> </div>
-          <div id="media-{{ .Id }}" sensitive="0"></div>
+          <div id="media-{{ .Id }}" sensitive="0">{{ parseAttachment . false }}</div>
           <script>
             media = document.getElementById("media-{{ .Id }}")
             
@@ -133,61 +94,16 @@
                 sensitive.style = "display: block"
                 media.style = "display: none;"          
             }            
-            
-            if(getMIMEType({{ (index .Attachment 0).MediaType }}) == "image"){
-                var img = document.createElement("img");
-                img.style = "float: left; margin-right: 10px; margin-bottom: 10px; max-width: 250px; max-height: 250px;"
-                img.setAttribute("id", "img")
-                img.setAttribute("main", "1")
-                img.setAttribute("enlarge", "0")
-                img.setAttribute("attachment", "{{ proxy (index .Attachment 0).Href }}")
-                img.setAttribute("post", "{{ .Id }}")
-                {{ if and .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 = "float: left; margin-right: 10px; margin-bottom: 10px; max-width: 250px; max-height: 250px;"
-                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 = "float: left; margin-right: 10px; margin-bottom: 10px; max-width: 250px; max-height: 250px;"
-                video.innerText = 'Video is not supported.'
-                media.appendChild(video)                                                        
-            }                    
           </script>              
           {{ end }}
-          <span style="color: #0f0c5d;"><b>{{ .Name }}</b></span><span style="color: #117743;"><b>{{ if .AttributedTo }} {{.AttributedTo }} {{ else }} Anonymous {{ end }}</b></span><span class="tripcode"> {{ .TripCode }} </span><span>{{ .Published }} <a id="{{ .Id }}-anchor" href="/{{ $board.Name }}/post/{{ $opId }}#{{ .Id }}">No. </a><a id="{{ .Id }}-link" title="{{ .Id }}" href="javascript:quote('{{ $board.Actor.Id }}', '{{ $opId }}', '{{ .Id }}')">{{ .Id }}</a> {{ if ne .Type "Tombstone" }}<a href="javascript:report('{{ $board.Actor.Id }}', '{{ .Id }}')">[Report]</a>{{ end }}</span>
+          <span style="color: #0f0c5d;"><b>{{ .Name }}</b></span><span style="color: #117743;"><b>{{ if .AttributedTo }} {{.AttributedTo }} {{ else }} Anonymous {{ end }}</b></span><span class="tripcode"> {{ .TripCode }} </span><span>{{ .Published }} <a id="{{ .Id }}-anchor" href="/{{ $board.Name }}/{{ short $board.Actor.Outbox $opId }}#{{ short $board.Actor.Outbox .Id }}">No. </a><a id="{{ .Id }}-link" title="{{ .Id }}" href="javascript:quote('{{ $board.Actor.Id }}', '{{ $opId }}', '{{ .Id }}')">{{ short $board.Actor.Outbox .Id }}</a> {{ if ne .Type "Tombstone" }}<a href="javascript:report('{{ $board.Actor.Id }}', '{{ .Id }}')">[Report]</a>{{ end }}</span>
           {{ $parentId := .Id }}
           {{ if .Replies.OrderedItems }}
           {{ range .Replies.OrderedItems }}
-          <span id="{{$parentId}}-replyto-{{.Id}}"></span>
-          <script>
-            var content = convertContentNoLink('{{$board.Actor.Id}}', '{{ .Content }}', '{{ $opId }}')                    
-            document.getElementById("{{ $parentId }}-replyto-{{.Id}}").innerHTML = "<a title='" + content  +"' href='/{{ $board.Name }}/" + shortURL("{{ $board.Actor.Id }}", "{{ $opId }}") + "#" + shortURL("{{ $board.Actor.Id }}", "{{ .Id }}") + "'>>>" + shortURL("{{ $board.Actor.Id }}", "{{ .Id }}") + "</a>";
-          </script>
+          <span id="{{$parentId}}-replyto-{{.Id}}">{{ parseReplyLink $board.Actor.Id $opId .Id .Content }}</span>
           {{ end }}
           {{ end }}
-          <p id="{{ .Id }}-content" style="white-space: pre-wrap; margin: 10px 30px 10px 30px;">{{.Content}}</p>
+          <p id="{{ .Id }}-content" style="white-space: pre-wrap; margin: 10px 30px 10px 30px;">{{.ContentHTML}}</p>
         </div>
       </div>
     </div>
@@ -196,17 +112,6 @@
       document.getElementById("{{ .Id }}-size").innerText = " (" + convertSize({{ (index .Attachment 0).Size }}) + ")";
       document.getElementById("{{ .Id }}-img").innerText = shortImg("{{ (index .Attachment 0).Name }}");
       {{ end }}
-
-      document.getElementById("{{ .Id }}-link").innerText = shortURL("{{ $board.Actor.Id }}", "{{ .Id }}");
-
-      document.getElementById("{{ .Id }}-anchor").href = "/{{ $board.Name }}/" + shortURL("{{$board.Actor.Id}}", "{{ $opId }}") +
-    "#" + shortURL("{{$board.Actor.Id}}", "{{ .Id }}");                
-      document.getElementById("{{ .Id }}").setAttribute("id", shortURL("{{$board.Actor.Id}}", "{{ .Id }}"));
-
-      var content = document.getElementById("{{ .Id }}-content");
-
-      content.innerHTML = convertContent('{{$board.Actor.Id}}', content.innerText, '{{ $opId }}')        
-
     </script>      
     {{ end }}
     {{ end }}
@@ -217,17 +122,6 @@
   document.getElementById("{{ .Id }}-size").innerText = " (" + convertSize({{ (index .Attachment 0).Size }}) + ")";
   document.getElementById("{{ .Id }}-img").innerText = shortImg("{{ (index .Attachment 0).Name }}");
   {{ end }}
-
-  document.getElementById("{{ .Id }}-link").innerText = shortURL("{{ $board.Actor.Id }}", "{{ .Id }}");
-
-  document.getElementById("{{ .Id }}").setAttribute("id", shortURL("{{ $board.Actor.Id }}", "{{ .Id }}"));
-
-  document.getElementById("{{ .Id }}-anchor").href = "/{{ $board.Name }}/" + shortURL("{{$board.Actor.Id}}", "{{ $opId }}") +
-    "#" + shortURL("{{$board.Actor.Id}}", "{{ .Id }}");
-
-  var content = document.getElementById("{{ .Id }}-content");
-
-  content.innerHTML = convertContent('{{$board.Actor.Id}}', content.innerText, '{{ $opId }}')              
 </script>
 {{ end }}
 {{ end }}