From 2d49ff9fb4ea9b0e88df1621e954246bc1851de6 Mon Sep 17 00:00:00 2001 From: r Date: Wed, 30 Mar 2022 15:52:30 +0000 Subject: Switch to html/template --- templates/header.tmpl | 2 +- templates/list.tmpl | 2 +- templates/nav.tmpl | 2 +- templates/notification.tmpl | 4 ++-- templates/requestlist.tmpl | 2 +- templates/search.tmpl | 2 +- templates/status.tmpl | 13 ++++++++----- templates/user.tmpl | 6 +++--- templates/userlistitem.tmpl | 2 +- templates/usersearch.tmpl | 4 ++-- 10 files changed, 21 insertions(+), 18 deletions(-) (limited to 'templates') diff --git a/templates/header.tmpl b/templates/header.tmpl index 8eb53f6..1abb6dd 100644 --- a/templates/header.tmpl +++ b/templates/header.tmpl @@ -17,7 +17,7 @@ {{if .RefreshInterval}} {{end}} - {{if gt .Count 0}}({{.Count}}){{end}} {{.Title | html}} + {{if gt .Count 0}}({{.Count}}){{end}} {{.Title}} {{if .CustomCSS}} diff --git a/templates/list.tmpl b/templates/list.tmpl index 1b15278..dcc6ee8 100644 --- a/templates/list.tmpl +++ b/templates/list.tmpl @@ -33,7 +33,7 @@
- +
diff --git a/templates/nav.tmpl b/templates/nav.tmpl index e7a7981..db88aa0 100644 --- a/templates/nav.tmpl +++ b/templates/nav.tmpl @@ -8,7 +8,7 @@
- {{EmojiFilter (html .Account.DisplayName) .Account.Emojis}} + {{EmojiFilter (HTML .Account.DisplayName) .Account.Emojis | Raw}} followed you - @@ -48,7 +48,7 @@
- {{EmojiFilter (html .Account.DisplayName) .Account.Emojis}} + {{EmojiFilter (HTML .Account.DisplayName) .Account.Emojis | Raw}} wants to follow you - diff --git a/templates/requestlist.tmpl b/templates/requestlist.tmpl index d9b2b0a..1a51e31 100644 --- a/templates/requestlist.tmpl +++ b/templates/requestlist.tmpl @@ -9,7 +9,7 @@
-
{{EmojiFilter (html .DisplayName) .Emojis}}
+
{{EmojiFilter (HTML .DisplayName) .Emojis | Raw}}
@{{.Acct}}
diff --git a/templates/search.tmpl b/templates/search.tmpl index 7338cad..0473d4a 100644 --- a/templates/search.tmpl +++ b/templates/search.tmpl @@ -5,7 +5,7 @@
- + diff --git a/templates/status.tmpl b/templates/status.tmpl index dda1d79..fd0940f 100644 --- a/templates/status.tmpl +++ b/templates/status.tmpl @@ -5,7 +5,7 @@ avatar - {{EmojiFilter (html .Account.DisplayName) .Account.Emojis}} + {{EmojiFilter (HTML .Account.DisplayName) .Account.Emojis | Raw}} @{{.Account.Acct}} @@ -23,7 +23,7 @@
- {{EmojiFilter (html .Account.DisplayName) .Account.Emojis}} + {{EmojiFilter (HTML .Account.DisplayName) .Account.Emojis | Raw}} @{{.Account.Acct}} @@ -91,7 +91,10 @@ {{end}}
{{if (or .Content .SpoilerText)}} -
{{StatusContentFilter (html .SpoilerText) .Content .Emojis .Mentions}}
+
+ {{if .SpoilerText}}{{EmojiFilter (HTML .SpoilerText) .Emojis | Raw}}
{{end}} + {{StatusContentFilter .Content .Emojis .Mentions | Raw}} +
{{end}} {{if .MediaAttachments}}
@@ -156,12 +159,12 @@ {{range $i, $o := .Poll.Options}}
{{if (or $s.Poll.Expired $s.Poll.Voted)}} -
{{EmojiFilter (html $o.Title) $s.Emojis}} - {{$o.VotesCount}} votes
+
{{EmojiFilter (HTML $o.Title) $s.Emojis | Raw}} - {{$o.VotesCount}} votes
{{else}} {{end}}
diff --git a/templates/user.tmpl b/templates/user.tmpl index 2532a91..fd838b9 100644 --- a/templates/user.tmpl +++ b/templates/user.tmpl @@ -11,7 +11,7 @@
{{if .User.Fields}}{{range .User.Fields}} -
{{.Name}} - {{.Value}}
+
{{.Name}} - {{.Value | Raw}}
{{end}}{{end}}
diff --git a/templates/userlistitem.tmpl b/templates/userlistitem.tmpl index 51261c8..50b9d0c 100644 --- a/templates/userlistitem.tmpl +++ b/templates/userlistitem.tmpl @@ -6,7 +6,7 @@
-
{{EmojiFilter (html .DisplayName) .Emojis}}
+
{{EmojiFilter (HTML .DisplayName) .Emojis | Raw}}
@{{.Acct}}
diff --git a/templates/usersearch.tmpl b/templates/usersearch.tmpl index e95129c..52001c9 100644 --- a/templates/usersearch.tmpl +++ b/templates/usersearch.tmpl @@ -1,11 +1,11 @@ {{with .Data}} {{template "header.tmpl" (WithContext .CommonData $.Ctx)}} -
Search {{EmojiFilter (html .User.DisplayName) .User.Emojis}}'s statuses
+
Search {{EmojiFilter (HTML .User.DisplayName) .User.Emojis | Raw}}'s statuses
Query - + -- cgit v1.2.3