diff --git a/templates/nav.tmpl b/templates/nav.tmpl index db88aa0..4413823 100644 --- a/templates/nav.tmpl +++ b/templates/nav.tmpl @@ -8,9 +8,9 @@
- {{EmojiFilter (HTML .User.DisplayName) .User.Emojis | Raw}} + {{EmojiFilter (HTML .User.DisplayName) .User.Emojis | Raw}} - @{{.User.Acct}} + @{{.User.Acct}}
diff --git a/templates/notification.tmpl b/templates/notification.tmpl index f62726b..f1336d3 100644 --- a/templates/notification.tmpl +++ b/templates/notification.tmpl @@ -28,13 +28,13 @@
- {{EmojiFilter (HTML .Account.DisplayName) .Account.Emojis | Raw}} + {{EmojiFilter (HTML .Account.DisplayName) .Account.Emojis | Raw}} followed you -
- @{{.Account.Acct}} + @{{.Account.Acct}}
@@ -48,13 +48,13 @@
- {{EmojiFilter (HTML .Account.DisplayName) .Account.Emojis | Raw}} + {{EmojiFilter (HTML .Account.DisplayName) .Account.Emojis | Raw}} wants to follow you -
- @{{.Account.Acct}} + @{{.Account.Acct}}
@@ -79,7 +79,7 @@ avatar - @{{.Account.Acct}} + @{{.Account.Acct}} retweeted your post - @@ -93,7 +93,7 @@ avatar - @{{.Account.Acct}} + @{{.Account.Acct}} liked your post - @@ -107,7 +107,7 @@ avatar - @{{.Account.Acct}} + @{{.Account.Acct}} {{.Type}} - diff --git a/templates/requestlist.tmpl b/templates/requestlist.tmpl index 1a51e31..f0b2dee 100644 --- a/templates/requestlist.tmpl +++ b/templates/requestlist.tmpl @@ -9,9 +9,9 @@
-
{{EmojiFilter (HTML .DisplayName) .Emojis | Raw}}
+
{{EmojiFilter (HTML .DisplayName) .Emojis | Raw}}
-
@{{.Acct}}
+
{{.Acct}}
diff --git a/templates/status.tmpl b/templates/status.tmpl index 5ada84e..0b09dfb 100644 --- a/templates/status.tmpl +++ b/templates/status.tmpl @@ -5,9 +5,9 @@ avatar - {{EmojiFilter (HTML .Account.DisplayName) .Account.Emojis | Raw}} + {{EmojiFilter (HTML .Account.DisplayName) .Account.Emojis | Raw}} - @{{.Account.Acct}} + @{{.Account.Acct}} retweeted
@@ -23,9 +23,9 @@
- {{EmojiFilter (HTML .Account.DisplayName) .Account.Emojis | Raw}} + {{EmojiFilter (HTML .Account.DisplayName) .Account.Emojis | Raw}} - @{{.Account.Acct}} + @{{.Account.Acct}}
{{if (or .Content .SpoilerText)}}
- {{if .SpoilerText}}{{EmojiFilter (HTML .SpoilerText) .Emojis | Raw}}
{{end}} - {{StatusContentFilter .Content .Emojis .Mentions | Raw}} + {{- if .SpoilerText}}{{EmojiFilter (HTML .SpoilerText) .Emojis | Raw}}
{{end -}} + {{- StatusContentFilter .Content .Emojis .Mentions | Raw -}}
{{end}} {{if .MediaAttachments}} diff --git a/templates/user.tmpl b/templates/user.tmpl index 3146964..3adc1a0 100644 --- a/templates/user.tmpl +++ b/templates/user.tmpl @@ -10,8 +10,8 @@
{{if .User.Fields}}
{{range .User.Fields}} -
{{EmojiFilter .Name $.Data.User.Emojis | Raw}} - {{EmojiFilter .Value $.Data.User.Emojis | Raw}}
+
{{- EmojiFilter .Name $.Data.User.Emojis | Raw}} - {{EmojiFilter .Value $.Data.User.Emojis | Raw -}}
{{end}}
{{end}} diff --git a/templates/userlistitem.tmpl b/templates/userlistitem.tmpl index 50b9d0c..ed53b2e 100644 --- a/templates/userlistitem.tmpl +++ b/templates/userlistitem.tmpl @@ -6,9 +6,9 @@
-
{{EmojiFilter (HTML .DisplayName) .Emojis | Raw}}
+
{{EmojiFilter (HTML .DisplayName) .Emojis | Raw}}
-
@{{.Acct}}
+
@{{.Acct}}