astrid
/
mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Display content warning in mail notification emails (#6832)

pull/6843/head
ThibG 2018-03-19 20:12:20 +01:00 committed by Eugen Rochko
parent 33ee347c99
commit 6b76a6212d
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/views/notification_mailer/_status.html.haml
View File

@ -24,6 +24,11 @@
%bdi= display_name(status.account) %bdi= display_name(status.account)
= "@#{status.account.acct}" = "@#{status.account.acct}"
- if status.spoiler_text?
%div{ dir: rtl_status?(status) ? 'rtl' : 'ltr' }
%p
= Formatter.instance.format_spoiler(status)
%div{ dir: rtl_status?(status) ? 'rtl' : 'ltr' } %div{ dir: rtl_status?(status) ? 'rtl' : 'ltr' }
= Formatter.instance.format(status) = Formatter.instance.format(status)

5
app/views/notification_mailer/_status.text.erb
View File

@ -1,3 +1,8 @@
<% if status.spoiler_text? %>
<%= raw status.spoiler_text %>
----
<% end %>
<%= raw Formatter.instance.plaintext(status) %> <%= raw Formatter.instance.plaintext(status) %>
<%= raw t('application_mailer.view')%> <%= web_url("statuses/#{status.id}") %> <%= raw t('application_mailer.view')%> <%= web_url("statuses/#{status.id}") %>