luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-12-22 13:17:13 +00:00
Code Issues Projects Releases Wiki Activity

Thread toot notification mails by conversation (#5061)

Browse source 
* Thread toot notification mails by conversation

* Make codeclimate happy and avoid potential mis-threading
This commit is contained in:
ThibG 2017-09-24 11:19:42 +02:00 committed by Eugen Rochko
parent ab625c57ce
commit c267acfcf7
1 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
app/mailers/notification_mailer.rb
View file

@ -8,6 +8,7 @@ class NotificationMailer < ApplicationMailer
@status = notification.target_status @status = notification.target_status
locale_for_account(@me) do locale_for_account(@me) do
thread_by_conversation(@status.conversation)
mail to: @me.user.email, subject: I18n.t('notification_mailer.mention.subject', name: @status.account.acct) mail to: @me.user.email, subject: I18n.t('notification_mailer.mention.subject', name: @status.account.acct)
end end
end end
@ -27,6 +28,7 @@ class NotificationMailer < ApplicationMailer
@status = notification.target_status @status = notification.target_status
locale_for_account(@me) do locale_for_account(@me) do
thread_by_conversation(@status.conversation)
mail to: @me.user.email, subject: I18n.t('notification_mailer.favourite.subject', name: @account.acct) mail to: @me.user.email, subject: I18n.t('notification_mailer.favourite.subject', name: @account.acct)
end end
end end
@ -37,6 +39,7 @@ class NotificationMailer < ApplicationMailer
@status = notification.target_status @status = notification.target_status
locale_for_account(@me) do locale_for_account(@me) do
thread_by_conversation(@status.conversation)
mail to: @me.user.email, subject: I18n.t('notification_mailer.reblog.subject', name: @account.acct) mail to: @me.user.email, subject: I18n.t('notification_mailer.reblog.subject', name: @account.acct)
end end
end end
@ -67,4 +70,13 @@ class NotificationMailer < ApplicationMailer
) )
end end
end end
private
def thread_by_conversation(conversation)
return if conversation.nil?
msg_id = "<conversation-#{conversation.id}.#{conversation.created_at.strftime('%Y-%m-%d')}@#{Rails.configuration.x.local_domain}>"
headers['In-Reply-To'] = msg_id
headers['References'] = msg_id
end
end end