From b35d62ecbb96b6d5f83b0453ca16e8dc45b39657 Mon Sep 17 00:00:00 2001
From: r <r@freesoftwareextremist.com>
Date: Sat, 28 Nov 2020 12:58:18 +0000
Subject: Fix RTL display name rendering

Wrap all the inline display names in a <bdi> tag
---
 templates/notification.tmpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'templates/notification.tmpl')

diff --git a/templates/notification.tmpl b/templates/notification.tmpl
index 10eaafc..3977aa7 100644
--- a/templates/notification.tmpl
+++ b/templates/notification.tmpl
@@ -27,7 +27,7 @@
 		</div>
 		<div class="notification-follow">
 			<div class="notification-info-text">
-				<span class="status-dname"> {{EmojiFilter .Account.DisplayName .Account.Emojis}} </span>  
+				<bdi class="status-dname"> {{EmojiFilter .Account.DisplayName .Account.Emojis}} </bdi>  
 				<span class="notification-text"> followed you - 
 					<time datetime="{{FormatTimeRFC3339 .CreatedAt}}" title="{{FormatTimeRFC822 .CreatedAt}}">{{TimeSince .CreatedAt}}</time> 
 				</span>
-- 
cgit v1.2.3


From 91f68ccfb391ee53bfc36f4877ca8d8f63c8faf2 Mon Sep 17 00:00:00 2001
From: r <r@freesoftwareextremist.com>
Date: Sat, 16 Jan 2021 09:10:02 +0000
Subject: Add follow request support

---
 templates/notification.tmpl | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

(limited to 'templates/notification.tmpl')

diff --git a/templates/notification.tmpl b/templates/notification.tmpl
index 3977aa7..5563425 100644
--- a/templates/notification.tmpl
+++ b/templates/notification.tmpl
@@ -38,6 +38,35 @@
 		</div>
 	</div>
 
+	{{else if eq .Type "follow_request"}}
+	<div class="notification-follow-container">
+		<div class="status-profile-img-container">
+			<a class="img-link" href="/user/{{.Account.ID}}">
+				<img class="status-profile-img" src="{{.Account.AvatarStatic}}" title="@{{.Account.Acct}}" alt="profile-avatar" height="48" />
+			</a>
+		</div>
+		<div class="notification-follow">
+			<div class="notification-info-text">
+				<bdi class="status-dname"> {{EmojiFilter .Account.DisplayName .Account.Emojis}} </bdi>  
+				<span class="notification-text"> wants to follow you - 
+					<time datetime="{{FormatTimeRFC3339 .CreatedAt}}" title="{{FormatTimeRFC822 .CreatedAt}}">{{TimeSince .CreatedAt}}</time> 
+				</span>
+			</div>
+			<div>
+				<a href="/user/{{.Account.ID}}"> <span class="status-uname"> @{{.Account.Acct}} </span> </a>
+			</div>
+			<form class="d-inline" action="/accept/{{.Account.ID}}" method="post" target="_self">
+				<input type="hidden" name="csrf_token" value="{{$.Ctx.CSRFToken}}">
+				<input type="submit" value="accept" class="btn-link">
+			</form>
+			-
+			<form class="d-inline" action="/reject/{{.Account.ID}}" method="post" target="_self">
+				<input type="hidden" name="csrf_token" value="{{$.Ctx.CSRFToken}}">
+				<input type="submit" value="reject" class="btn-link">
+			</form>
+		</div>
+	</div>
+
 	{{else if eq .Type "mention"}}
 	{{template "status" (WithContext .Status $.Ctx)}}
 
-- 
cgit v1.2.3


From e7d24cfa8018a45dbd4ad27ef7a4981035c98ece Mon Sep 17 00:00:00 2001
From: r <r@freesoftwareextremist.com>
Date: Sat, 16 Jan 2021 09:26:59 +0000
Subject: Add fallback notification

---
 templates/notification.tmpl | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

(limited to 'templates/notification.tmpl')

diff --git a/templates/notification.tmpl b/templates/notification.tmpl
index 5563425..61353f5 100644
--- a/templates/notification.tmpl
+++ b/templates/notification.tmpl
@@ -97,6 +97,20 @@
 		</span>
 	</div>
 	{{template "status" (WithContext .Status $.Ctx)}}
+
+	{{else}}
+	<div class="retweet-info">
+		<a class="img-link" href="/user/{{.Account.ID}}">
+			<img class="status-profile-img" src="{{.Account.AvatarStatic}}" title="@{{.Account.Acct}}" alt="avatar" height="48" />
+		</a>
+		<a href="/user/{{.Account.ID}}">
+			<span class="status-uname"> @{{.Account.Acct}} </span>
+		</a>
+		<span class="notification-text"> {{.Type}} - 
+			<time datetime="{{FormatTimeRFC3339 .CreatedAt}}" title="{{FormatTimeRFC822 .CreatedAt}}">{{TimeSince .CreatedAt}}</time> 
+		</span>
+	</div>
+	{{if .Status}}{{template "status" (WithContext .Status $.Ctx)}}{{end}}
 	{{end}}
 </div>
 {{end}}
-- 
cgit v1.2.3


From 87e31dbd6688f8e4492d3dc17783c26f2d926e4b Mon Sep 17 00:00:00 2001
From: r <r@freesoftwareextremist.com>
Date: Sat, 16 Jan 2021 10:25:34 +0000
Subject: Make like/retweet notification content semi-transparent

---
 templates/notification.tmpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'templates/notification.tmpl')

diff --git a/templates/notification.tmpl b/templates/notification.tmpl
index 61353f5..567bcf0 100644
--- a/templates/notification.tmpl
+++ b/templates/notification.tmpl
@@ -17,7 +17,7 @@
 </div>
 
 {{range .Notifications}}
-<div class="status-container-container {{if .Pleroma}}{{if not .Pleroma.IsSeen}}unread{{end}}{{end}}">
+<div class="notification-container {{.Type}} {{if .Pleroma}}{{if not .Pleroma.IsSeen}}unread{{end}}{{end}}">
 	{{if eq .Type "follow"}}
 	<div class="notification-follow-container">
 		<div class="status-profile-img-container">
-- 
cgit v1.2.3


From f4620a8c69a71a4e99ed4e51346ec630f7c3aee2 Mon Sep 17 00:00:00 2001
From: r <r@freesoftwareextremist.com>
Date: Sun, 17 Jan 2021 05:44:07 +0000
Subject: Make redirection work without Referer header

---
 templates/notification.tmpl | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'templates/notification.tmpl')

diff --git a/templates/notification.tmpl b/templates/notification.tmpl
index 567bcf0..4eed61b 100644
--- a/templates/notification.tmpl
+++ b/templates/notification.tmpl
@@ -11,6 +11,7 @@
 	{{if .ReadID}}
 	<form class="notification-read" action="/notifications/read?max_id={{.ReadID}}" method="post" target="_self">
 		<input type="hidden" name="csrf_token" value="{{$.Ctx.CSRFToken}}">
+		<input type="hidden" name="referrer" value="{{$.Ctx.Referrer}}">
 		<input type="submit" value="read" class="btn-link" accesskey="C" title="Clear unread notifications (C)">
 	</form>
 	{{end}}
@@ -57,11 +58,13 @@
 			</div>
 			<form class="d-inline" action="/accept/{{.Account.ID}}" method="post" target="_self">
 				<input type="hidden" name="csrf_token" value="{{$.Ctx.CSRFToken}}">
+				<input type="hidden" name="referrer" value="{{$.Ctx.Referrer}}">
 				<input type="submit" value="accept" class="btn-link">
 			</form>
 			-
 			<form class="d-inline" action="/reject/{{.Account.ID}}" method="post" target="_self">
 				<input type="hidden" name="csrf_token" value="{{$.Ctx.CSRFToken}}">
+				<input type="hidden" name="referrer" value="{{$.Ctx.Referrer}}">
 				<input type="submit" value="reject" class="btn-link">
 			</form>
 		</div>
-- 
cgit v1.2.3