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/main.html | 9 +-------- static/ncatalog.html | 5 +---- static/posts.html | 35 ++++++----------------------------- 3 files changed, 8 insertions(+), 41 deletions(-) (limited to 'static') diff --git a/static/main.html b/static/main.html index 3cb8555..9209ed9 100644 --- a/static/main.html +++ b/static/main.html @@ -53,14 +53,6 @@ color: #789922; } - .reply { - {{ if .Board.Restricted }} - color:#af0a0f; - {{ else }} - color:#000080; - {{ end }} - } - .post { {{ if .Board.Restricted }} background-color: #d5daf0; @@ -85,6 +77,7 @@

[Home]
[ {{$e.Name}} ]

{{ $replies := .Replies }} {{ if $replies }} @@ -121,9 +121,6 @@

{{ if eq $board.ModCred $board.Domain $board.Actor.Id }} [Delete Post] {{ end }} @@ -22,7 +22,6 @@

{{ end }} - {{ .Name }}{{ if .AttributedTo }} {{.AttributedTo }} {{ else }} Anonymous {{ end }} {{ .TripCode }} {{ .Published }} No. {{ .Id }} {{ if ne .Type "Tombstone" }}[Report]{{ end }} -

+ {{ .Name }}{{ if .AttributedTo }} {{.AttributedTo }} {{ else }} Anonymous {{ end }} {{ .TripCode }} {{ .Published }} No. {{ short $board.Actor.Outbox .Id }} {{ if ne .Type "Tombstone" }}[Report]{{ end }} +

{{ if .Replies }} {{ $replies := .Replies }} {{ if gt $replies.TotalItems 5 }} @@ -94,7 +93,7 @@ {{ end }} {{ end }} {{ range $replies.OrderedItems }} -

@@ -176,7 +175,7 @@ } {{ end }} - {{ .Name }}{{ if .AttributedTo }} {{.AttributedTo }} {{ else }} Anonymous {{ end }} {{ .TripCode }} {{ .Published }} No. {{ .Id }} {{ if ne .Type "Tombstone" }}[Report]{{ end }} + {{ .Name }}{{ if .AttributedTo }} {{.AttributedTo }} {{ else }} Anonymous {{ end }} {{ .TripCode }} {{ .Published }} No. {{ short $board.Actor.Outbox .Id }} {{ if ne .Type "Tombstone" }}[Report]{{ end }} {{ $parentId := .Id }} {{ if .Replies.OrderedItems }} {{ range .Replies.OrderedItems }} @@ -187,7 +186,7 @@ {{ end }} {{ end }} -

@@ -196,17 +195,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 }}') - {{ end }} {{ end }} @@ -217,17 +205,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 }}') {{ end }} {{ end }} -- 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 ++-------------------------- static/posts.html | 86 ++-------------------------------------------------- 2 files changed, 5 insertions(+), 127 deletions(-) (limited to 'static') 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 }} - -

+ +

{{ end }} diff --git a/static/posts.html b/static/posts.html index 7552188..b638a10 100644 --- a/static/posts.html +++ b/static/posts.html @@ -19,7 +19,7 @@ File: {{ (index .Attachment 0).Name }}({{ (index .Attachment 0).Size }}) -

{{ end }} {{ .Name }}{{ if .AttributedTo }} {{.AttributedTo }} {{ else }} Anonymous {{ end }} {{ .TripCode }} {{ .Published }} No. {{ short $board.Actor.Outbox .Id }} {{ if ne .Type "Tombstone" }}[Report]{{ end }} -- cgit v1.2.3 From bef846b77490b6f4eb06dcec70aa684490ea0fd7 Mon Sep 17 00:00:00 2001 From: FChannel <> Date: Thu, 22 Jul 2021 15:49:34 -0700 Subject: added actor information requests to cache resets on server restart --- static/faq.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'static') diff --git a/static/faq.html b/static/faq.html index 9baf8ca..6f60d62 100644 --- a/static/faq.html +++ b/static/faq.html @@ -56,7 +56,7 @@

Soon™.

What version is this FChannel instance?

v0.0.11-dev

v0.0.12-dev

[Home][Rules][FAQ] -- cgit v1.2.3 From 16b4165e5102fc9b4766e1bd1204ca9cf23199aa Mon Sep 17 00:00:00 2001 From: FChannel <> Date: Thu, 22 Jul 2021 19:03:28 -0700 Subject: added banning media by saving hash in database --- static/posts.html | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'static') diff --git a/static/posts.html b/static/posts.html index b638a10..d7f46b9 100644 --- a/static/posts.html +++ b/static/posts.html @@ -12,7 +12,8 @@ [Delete Post] {{ end }} {{ if .Attachment }} - {{ if eq $board.ModCred $board.Domain $board.Actor.Id }} + {{ if eq $board.ModCred $board.Domain $board.Actor.Id }} + [Ban Media] [Delete Attachment] [Mark Sensitive] {{ end }} @@ -41,7 +42,6 @@ sensitive.style = "display: block" media.style = "display: none;" } - {{ end }} {{ .Name }}{{ if .AttributedTo }} {{.AttributedTo }} {{ else }} Anonymous {{ end }} {{ .TripCode }} {{ .Published }} No. {{ short $board.Actor.Outbox .Id }} {{ if ne .Type "Tombstone" }}[Report]{{ end }} @@ -62,9 +62,10 @@ [Delete Post] {{ end }} {{ if .Attachment }} - {{ if eq $board.ModCred $board.Domain $board.Actor.Id }} + {{ if eq $board.ModCred $board.Domain $board.Actor.Id }} + [Ban Media] [Delete Attachment] - [Mark Sensitive] + [Mark Sensitive] {{ end }} File {{ (index .Attachment 0).Name }} ({{ (index .Attachment 0).Size }}) -- cgit v1.2.3 From 8f7386f2906716d40099fb50f029d48796dd1bbd Mon Sep 17 00:00:00 2001 From: FChannel <> Date: Fri, 23 Jul 2021 22:45:44 -0700 Subject: added cross post support. could blow up if referencing a link that is not local to the database or cache. --- static/posts.html | 4 ---- 1 file changed, 4 deletions(-) (limited to 'static') diff --git a/static/posts.html b/static/posts.html index d7f46b9..5810348 100644 --- a/static/posts.html +++ b/static/posts.html @@ -101,10 +101,6 @@ {{ if .Replies.OrderedItems }} {{ range .Replies.OrderedItems }} - {{ end }} {{ end }}

-- cgit v1.2.3 From def81637bc3d9f7ff73fed2786dbaa7a78086799 Mon Sep 17 00:00:00 2001 From: FChannel <> Date: Sun, 25 Jul 2021 13:25:47 -0700 Subject: fixed auto follow logic as well as out of sync following --- static/manage.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'static') diff --git a/static/manage.html b/static/manage.html index 2647532..3bd621b 100644 --- a/static/manage.html +++ b/static/manage.html @@ -22,7 +22,7 @@ {{ if .IsLocal }}

[Home][Rules][FAQ] -- cgit v1.2.3 From 6846150cb48d080112981633d6dddabef5ce4439 Mon Sep 17 00:00:00 2001 From: FChannel <> Date: Sun, 25 Jul 2021 16:00:25 -0700 Subject: fixed bug with escaping html less than symbol for parsing content --- static/npost.html | 2 +- static/posts.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'static') diff --git a/static/npost.html b/static/npost.html index 3df4090..419a1a9 100644 --- a/static/npost.html +++ b/static/npost.html @@ -17,7 +17,6 @@ {{ end }} - {{ end }} {{ define "content" }} @@ -52,6 +51,7 @@ {{ define "script" }} + diff --git a/static/posts.html b/static/posts.html index 5810348..17421af 100644 --- a/static/posts.html +++ b/static/posts.html @@ -54,7 +54,7 @@ {{ end }} {{ end }} {{ range $replies.OrderedItems }} -

-- cgit v1.2.3 From 87fc54c9d41bdbe7eaa8769386776a3723580b34 Mon Sep 17 00:00:00 2001 From: FChannel <> Date: Sun, 25 Jul 2021 17:35:41 -0700 Subject: showing post replies bug fix --- static/posts.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'static') diff --git a/static/posts.html b/static/posts.html index 17421af..67a755c 100644 --- a/static/posts.html +++ b/static/posts.html @@ -54,7 +54,7 @@ {{ end }} {{ end }} {{ range $replies.OrderedItems }} -

@@ -100,7 +100,7 @@ {{ $parentId := .Id }} {{ if .Replies.OrderedItems }} {{ range .Replies.OrderedItems }} - + {{ parseReplyLink $board.Actor.Id $opId .Id .Content }} {{ end }} {{ end }}

-- cgit v1.2.3

What version is this FChannel instance?

Following

What version is this FChannel instance?