Slightly improved e-mail notifications

diff --git a/app/views/notification_mailer/_status.text.erb b/app/views/notification_mailer/_status.text.erb
new file mode 100644 (file)
index 0000000..24c1543
--- /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 e8f7c1105dff3462d546fca4273ecc0dcc980d70..1b6fa274cc3e18e978af279733c1ad4bcf4c662b 100644 (file)
--- 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 f3582749d4888b5e698a06dcf8f0ec79149babdd..72dc1b00949ab61225ea19acbf4c72159ec1fa35 100644 (file)
--- 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 253b22c1e0d7ba7a5093657302cb1e5039f817e6..2077e949ecd8a41ca7a61d6d07c1bb770dd0490a 100644 (file)
--- 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' %>