mastofe

commit: 6b76a6212d8aa596379115b248ec145905946c42
parent: 33ee347c995515946e0a045394fe693875ee1cdf
Author: ThibG <thib@sitedethib.com>
Date:   Mon, 19 Mar 2018 20:12:20 +0100

Display content warning in mail notification emails (#6832)


Diffstat:
M
app/views/notification_mailer/_status.html.haml
5
+++++
M
app/views/notification_mailer/_status.text.erb
5
+++++

2 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/app/views/notification_mailer/_status.html.haml b/app/views/notification_mailer/_status.html.haml
@@ -24,6 +24,11 @@
                                       %bdi= display_name(status.account)
                                       = "@#{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' }
                                 = Formatter.instance.format(status)
 
diff --git a/app/views/notification_mailer/_status.text.erb b/app/views/notification_mailer/_status.text.erb
@@ -1,3 +1,8 @@
+<% if status.spoiler_text? %>
+<%= raw status.spoiler_text %>
+----
+
+<% end %>
 <%= raw Formatter.instance.plaintext(status) %>
 
 <%= raw t('application_mailer.view')%> <%= web_url("statuses/#{status.id}") %>