From 2d49ff9fb4ea9b0e88df1621e954246bc1851de6 Mon Sep 17 00:00:00 2001
From: r <r@freesoftwareextremist.com>
Date: Wed, 30 Mar 2022 15:52:30 +0000
Subject: Switch to html/template

---
 templates/status.tmpl | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

(limited to 'templates/status.tmpl')

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 @@
 		<a class="img-link" href="/user/{{.Account.ID}}">
 			<img class="status-profile-img" src="{{.Account.Avatar}}" title="@{{.Account.Acct}}" alt="avatar" height="24" />
 		</a>
-		<bdi class="status-dname"> {{EmojiFilter (html .Account.DisplayName) .Account.Emojis}} </bdi>  
+		<bdi class="status-dname"> {{EmojiFilter (HTML .Account.DisplayName) .Account.Emojis | Raw}} </bdi>
 		<a href="/user/{{.Account.ID}}"> 
 			<span class="status-uname"> @{{.Account.Acct}} </span> 
 		</a>
@@ -23,7 +23,7 @@
 		</div>
 		<div class="status"> 
 			<div class="status-name">
-				<bdi class="status-dname"> {{EmojiFilter (html .Account.DisplayName) .Account.Emojis}} </bdi> 
+				<bdi class="status-dname"> {{EmojiFilter (HTML .Account.DisplayName) .Account.Emojis | Raw}} </bdi>
 				<a href="/user/{{.Account.ID}}">
 					<span class="status-uname"> @{{.Account.Acct}} </span>
 				</a>
@@ -91,7 +91,10 @@
 				{{end}}
 			</div>
 			{{if (or .Content .SpoilerText)}}
-			<div class="status-content"> {{StatusContentFilter (html .SpoilerText) .Content .Emojis .Mentions}} </div>
+			<div class="status-content">
+				{{if .SpoilerText}}{{EmojiFilter (HTML .SpoilerText) .Emojis | Raw}}<br/>{{end}}
+				{{StatusContentFilter .Content .Emojis .Mentions | Raw}}
+			</div>
 			{{end}}
 			{{if .MediaAttachments}}
 			<div class="status-media-container">
@@ -156,12 +159,12 @@
 				{{range $i, $o := .Poll.Options}}
 				<div class="poll-option">
 					{{if (or $s.Poll.Expired $s.Poll.Voted)}}
-					<div> {{EmojiFilter (html $o.Title) $s.Emojis}} - {{$o.VotesCount}} votes </div>
+					<div> {{EmojiFilter (HTML $o.Title) $s.Emojis | Raw}} - {{$o.VotesCount}} votes </div>
 					{{else}}
 					<input type="{{if $s.Poll.Multiple}}checkbox{{else}}radio{{end}}" name="choices" 
 						id="poll-{{$s.ID}}-{{$i}}" value="{{$i}}">
 					<label for="poll-{{$s.ID}}-{{$i}}"> 
-						{{EmojiFilter (html $o.Title) $s.Emojis}} 
+						{{EmojiFilter (HTML $o.Title) $s.Emojis | Raw}}
 					</label>
 					{{end}}
 				</div>
-- 
cgit v1.2.3


From 94ff5c93ded09cf6d9cff3e18969df3e9c6cb186 Mon Sep 17 00:00:00 2001
From: r <r@freesoftwareextremist.com>
Date: Wed, 30 Mar 2022 17:59:42 +0000
Subject: Show attachment metadata when attachment preview is disabled

---
 templates/status.tmpl | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'templates/status.tmpl')

diff --git a/templates/status.tmpl b/templates/status.tmpl
index fd0940f..5ada84e 100644
--- a/templates/status.tmpl
+++ b/templates/status.tmpl
@@ -103,7 +103,7 @@
 				{{if eq .Type "image"}}
 				{{if $.Ctx.HideAttachments}}
 				<a href="{{.URL}}" target="_blank">
-					{{if .Description}}[{{.Description}}]{{else}}[image]{{end}}
+					[image{{if $s.Sensitive}}/nsfw{{end}}{{if .Description}}: {{.Description}}{{end}}]
 				</a>
 				{{else}}
 				<a class="img-link" href="{{.URL}}" target="_blank" title="{{.Description}}">
@@ -117,7 +117,7 @@
 				{{else if eq .Type "audio"}}
 				{{if $.Ctx.HideAttachments}}
 				<a href="{{.URL}}" target="_blank">
-					{{if .Description}}[{{.Description}}]{{else}}[audio]{{end}}
+					[audio{{if $s.Sensitive}}/nsfw{{end}}{{if .Description}}: {{.Description}}{{end}}]
 				</a>
 				{{else}}
 				<audio class="status-audio" controls title="{{.Description}}">
@@ -129,7 +129,7 @@
 				{{else if eq .Type "video"}}
 				{{if $.Ctx.HideAttachments}}
 				<a href="{{.URL}}" target="_blank">
-					{{if .Description}}[{{.Description}}]{{else}}[video]{{end}}
+					[video{{if $s.Sensitive}}/nsfw{{end}}{{if .Description}}: {{.Description}}{{end}}]
 				</a>
 				{{else}}
 				<div class="status-video-container" title="{{.Description}}">
@@ -145,7 +145,7 @@
 
 				{{else}}
 				<a href="{{.URL}}" target="_blank"> 
-					{{if .Description}}[{{.Description}}]{{else}}[attachment]{{end}}
+					[attachment{{if $s.Sensitive}}/nsfw{{end}}{{if .Description}}: {{.Description}}{{end}}]
 				</a>
 				{{end}}
 				{{end}}
-- 
cgit v1.2.3