From 31a0202546acb20094eb6367061e50f5525cc7ed Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Sun, 2 Oct 2016 15:37:35 +0200 Subject: [PATCH] Slightly improved e-mail notifications --- app/views/notification_mailer/_status.text.erb | 3 +++ app/views/notification_mailer/favourite.text.erb | 2 +- app/views/notification_mailer/mention.text.erb | 4 +--- app/views/notification_mailer/reblog.text.erb | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) create mode 100644 app/views/notification_mailer/_status.text.erb diff --git a/app/views/notification_mailer/_status.text.erb b/app/views/notification_mailer/_status.text.erb new file mode 100644 index 0000000000..24c1543641 --- /dev/null +++ b/app/views/notification_mailer/_status.text.erb @@ -0,0 +1,3 @@ +<%= strip_tags(@status.content) %> + +<%= TagManager.instance.url_for(@status) %> diff --git a/app/views/notification_mailer/favourite.text.erb b/app/views/notification_mailer/favourite.text.erb index e8f7c1105d..1b6fa274cc 100644 --- a/app/views/notification_mailer/favourite.text.erb +++ b/app/views/notification_mailer/favourite.text.erb @@ -2,4 +2,4 @@ Your status was favourited by <%= @account.acct %>: -<%= account_stream_entry_url(@me, @status.stream_entry) %> +<%= render partial: 'status' %> diff --git a/app/views/notification_mailer/mention.text.erb b/app/views/notification_mailer/mention.text.erb index f3582749d4..72dc1b0094 100644 --- a/app/views/notification_mailer/mention.text.erb +++ b/app/views/notification_mailer/mention.text.erb @@ -2,6 +2,4 @@ You were mentioned by <%= @status.account.acct %> in: -<%= strip_tags(@status.content) %> - -<%= TagManager.instance.url_for(@status) %> +<%= render partial: 'status' %> diff --git a/app/views/notification_mailer/reblog.text.erb b/app/views/notification_mailer/reblog.text.erb index 253b22c1e0..2077e949ec 100644 --- a/app/views/notification_mailer/reblog.text.erb +++ b/app/views/notification_mailer/reblog.text.erb @@ -2,4 +2,4 @@ Your status was reblogged by <%= @account.acct %>: -<%= account_stream_entry_url(@me, @status.stream_entry) %> +<%= render partial: 'status' %>