aboutsummaryrefslogtreecommitdiff
path: root/renderer
diff options
context:
space:
mode:
authorr <r@freesoftwareextremist.com>2022-09-23 17:22:54 +0000
committerr <r@freesoftwareextremist.com>2022-09-23 17:22:54 +0000
commitf55595ddb63bd8afb4c85945b82aa1f174050e6b (patch)
tree3e9f909097c026b065365846ca8143295097a09f /renderer
parentb8c0133bcd5e7f1d4063ad992949cc19d18e7aad (diff)
parent68698a9e1afce43ef807d6b5f892ca1c0f905b8a (diff)
downloadbloat-f55595ddb63bd8afb4c85945b82aa1f174050e6b.tar.gz
bloat-f55595ddb63bd8afb4c85945b82aa1f174050e6b.zip
Merge branch 'master' into absolute_fluorideabsolute_fluoride
Diffstat (limited to 'renderer')
-rw-r--r--renderer/model.go13
-rw-r--r--renderer/renderer.go68
2 files changed, 50 insertions, 31 deletions
diff --git a/renderer/model.go b/renderer/model.go
index 385ac7c..726cee9 100644
--- a/renderer/model.go
+++ b/renderer/model.go
@@ -62,6 +62,19 @@ type TimelineData struct {
PrevLink string
}
+type ListsData struct {
+ *CommonData
+ Lists []*mastodon.List
+}
+
+type ListData struct {
+ *CommonData
+ List *mastodon.List
+ Accounts []*mastodon.Account
+ Q string
+ SearchAccounts []*mastodon.Account
+}
+
type ThreadData struct {
*CommonData
Statuses []*mastodon.Status
diff --git a/renderer/renderer.go b/renderer/renderer.go
index f50e185..50fced7 100644
--- a/renderer/renderer.go
+++ b/renderer/renderer.go
@@ -1,11 +1,11 @@
package renderer
import (
+ "html/template"
"io"
"regexp"
"strconv"
"strings"
- "text/template"
"time"
"bloat/mastodon"
@@ -19,6 +19,8 @@ const (
NavPage = "nav.tmpl"
RootPage = "root.tmpl"
TimelinePage = "timeline.tmpl"
+ ListsPage = "lists.tmpl"
+ ListPage = "list.tmpl"
ThreadPage = "thread.tmpl"
QuickReplyPage = "quickreply.tmpl"
StatusPopup = "status.tmpl"
@@ -53,10 +55,7 @@ func emojiFilter(content string, emojis []mastodon.Emoji) string {
var quoteRE = regexp.MustCompile("(?mU)(^|> *|\n)(&gt;.*)(<br|$)")
-func statusContentFilter(spoiler, content string, emojis []mastodon.Emoji, mentions []mastodon.Mention) string {
- if len(spoiler) > 0 {
- content = spoiler + "<br/>" + content
- }
+func statusContentFilter(content string, emojis []mastodon.Emoji, mentions []mastodon.Mention) string {
content = quoteRE.ReplaceAllString(content, `$1<span class="quote">$2</span>$3`)
var replacements []string
for _, e := range emojis {
@@ -75,45 +74,41 @@ func displayInteractionCount(c int64) string {
return ""
}
-func DurToStr(dur time.Duration) string {
- s := dur.Seconds()
+func durUnit(s int64) (dur int64, unit string) {
if s < 60 {
- return strconv.Itoa(int(s)) + "s"
- }
- m := dur.Minutes()
- if m < 60*2 {
- return strconv.Itoa(int(m)) + "m"
+ if s < 0 {
+ s = 0
+ }
+ return s, "s"
}
- h := dur.Hours()
- if h < 24*2 {
- return strconv.Itoa(int(h)) + "h"
+ m := s / 60
+ h := m / 60
+ if h < 2 {
+ return m, "m"
}
d := h / 24
- if d < 30*2 {
- return strconv.Itoa(int(d)) + "d"
+ if d < 2 {
+ return h, "h"
}
mo := d / 30
- if mo < 12*2 {
- return strconv.Itoa(int(mo)) + "mo"
+ if mo < 2 {
+ return d, "d"
+ }
+ y := d / 365
+ if y < 2 {
+ return mo, "mo"
}
- y := mo / 12
- return strconv.Itoa(int(y)) + "y"
+ return y, "y"
}
func timeSince(t time.Time) string {
- d := time.Since(t)
- if d < 0 {
- d = 0
- }
- return DurToStr(d)
+ d, u := durUnit(time.Now().Unix() - t.Unix())
+ return strconv.FormatInt(d, 10) + u
}
func timeUntil(t time.Time) string {
- d := time.Until(t)
- if d < 0 {
- d = 0
- }
- return DurToStr(d)
+ d, u := durUnit(t.Unix() - time.Now().Unix())
+ return strconv.FormatInt(d, 10) + u
}
func formatTimeRFC3339(t time.Time) string {
@@ -128,6 +123,14 @@ func withContext(data interface{}, ctx *Context) TemplateData {
return TemplateData{data, ctx}
}
+func raw(s string) template.HTML {
+ return template.HTML(s)
+}
+
+func rawCSS(s string) template.CSS {
+ return template.CSS(s)
+}
+
type Renderer interface {
Render(ctx *Context, writer io.Writer, page string, data interface{}) (err error)
}
@@ -147,6 +150,9 @@ func NewRenderer(templateGlobPattern string) (r *renderer, err error) {
"FormatTimeRFC3339": formatTimeRFC3339,
"FormatTimeRFC822": formatTimeRFC822,
"WithContext": withContext,
+ "HTML": template.HTMLEscapeString,
+ "Raw": raw,
+ "RawCSS": rawCSS,
}).ParseGlob(templateGlobPattern)
if err != nil {
return