Add user handle to notification mail recipient address (#24240)
Co-authored-by: luccamps <luccamps@users.noreply.github.com> Co-authored-by: Leonardo Negreiros de Oliveira <negreirosleo12@gmail.com> Co-authored-by: Marcio Flavio <mflaviof1995@gmail.com> Co-authored-by: Gabriel Quaresma <j.quaresmasantos_98@hotmail.com>
This commit is contained in:
parent
bc4745f482
commit
4601e0dcbb
2 changed files with 10 additions and 10 deletions
|
@ -14,7 +14,7 @@ class NotificationMailer < ApplicationMailer
|
|||
|
||||
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: email_address_with_name(@me.user.email, @me.user.account.username), subject: I18n.t('notification_mailer.mention.subject', name: @status.account.acct)
|
||||
end
|
||||
end
|
||||
|
||||
|
@ -25,7 +25,7 @@ class NotificationMailer < ApplicationMailer
|
|||
return unless @me.user.functional?
|
||||
|
||||
locale_for_account(@me) do
|
||||
mail to: @me.user.email, subject: I18n.t('notification_mailer.follow.subject', name: @account.acct)
|
||||
mail to: email_address_with_name(@me.user.email, @me.user.account.username), subject: I18n.t('notification_mailer.follow.subject', name: @account.acct)
|
||||
end
|
||||
end
|
||||
|
||||
|
@ -38,7 +38,7 @@ class NotificationMailer < ApplicationMailer
|
|||
|
||||
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: email_address_with_name(@me.user.email, @me.user.account.username), subject: I18n.t('notification_mailer.favourite.subject', name: @account.acct)
|
||||
end
|
||||
end
|
||||
|
||||
|
@ -51,7 +51,7 @@ class NotificationMailer < ApplicationMailer
|
|||
|
||||
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: email_address_with_name(@me.user.email, @me.user.account.username), subject: I18n.t('notification_mailer.reblog.subject', name: @account.acct)
|
||||
end
|
||||
end
|
||||
|
||||
|
@ -62,7 +62,7 @@ class NotificationMailer < ApplicationMailer
|
|||
return unless @me.user.functional?
|
||||
|
||||
locale_for_account(@me) do
|
||||
mail to: @me.user.email, subject: I18n.t('notification_mailer.follow_request.subject', name: @account.acct)
|
||||
mail to: email_address_with_name(@me.user.email, @me.user.account.username), subject: I18n.t('notification_mailer.follow_request.subject', name: @account.acct)
|
||||
end
|
||||
end
|
||||
|
||||
|
|
|
@ -29,7 +29,7 @@ RSpec.describe NotificationMailer, type: :mailer do
|
|||
|
||||
it 'renders the headers' do
|
||||
expect(mail.subject).to eq('You were mentioned by bob')
|
||||
expect(mail.to).to eq([receiver.email])
|
||||
expect(mail[:to].value).to eq("#{receiver.account.username} <#{receiver.email}>")
|
||||
end
|
||||
|
||||
it 'renders the body' do
|
||||
|
@ -46,7 +46,7 @@ RSpec.describe NotificationMailer, type: :mailer do
|
|||
|
||||
it 'renders the headers' do
|
||||
expect(mail.subject).to eq('bob is now following you')
|
||||
expect(mail.to).to eq([receiver.email])
|
||||
expect(mail[:to].value).to eq("#{receiver.account.username} <#{receiver.email}>")
|
||||
end
|
||||
|
||||
it 'renders the body' do
|
||||
|
@ -62,7 +62,7 @@ RSpec.describe NotificationMailer, type: :mailer do
|
|||
|
||||
it 'renders the headers' do
|
||||
expect(mail.subject).to eq('bob favourited your post')
|
||||
expect(mail.to).to eq([receiver.email])
|
||||
expect(mail[:to].value).to eq("#{receiver.account.username} <#{receiver.email}>")
|
||||
end
|
||||
|
||||
it 'renders the body' do
|
||||
|
@ -79,7 +79,7 @@ RSpec.describe NotificationMailer, type: :mailer do
|
|||
|
||||
it 'renders the headers' do
|
||||
expect(mail.subject).to eq('bob boosted your post')
|
||||
expect(mail.to).to eq([receiver.email])
|
||||
expect(mail[:to].value).to eq("#{receiver.account.username} <#{receiver.email}>")
|
||||
end
|
||||
|
||||
it 'renders the body' do
|
||||
|
@ -96,7 +96,7 @@ RSpec.describe NotificationMailer, type: :mailer do
|
|||
|
||||
it 'renders the headers' do
|
||||
expect(mail.subject).to eq('Pending follower: bob')
|
||||
expect(mail.to).to eq([receiver.email])
|
||||
expect(mail[:to].value).to eq("#{receiver.account.username} <#{receiver.email}>")
|
||||
end
|
||||
|
||||
it 'renders the body' do
|
||||
|
|
Loading…
Reference in a new issue