mirror of
https://github.com/mastodon/mastodon.git
synced 2026-04-24 15:18:46 -05:00
Merge 87a4901ded into 28284b8452
This commit is contained in:
commit
367c2cc47a
|
|
@ -19,17 +19,15 @@ class NotificationMailer < ApplicationMailer
|
|||
|
||||
default to: -> { email_address_with_name(@user.email, @me.username) }
|
||||
|
||||
rescue_from(ActiveRecord::RecordNotFound) { self.perform_deliveries = false }
|
||||
|
||||
layout 'mailer'
|
||||
|
||||
def mention
|
||||
return if @status.blank?
|
||||
|
||||
mail subject: default_i18n_subject(name: @status.account.acct)
|
||||
end
|
||||
|
||||
def quote
|
||||
return if @status.blank?
|
||||
|
||||
mail subject: default_i18n_subject(name: @status.account.acct)
|
||||
end
|
||||
|
||||
|
|
@ -38,14 +36,10 @@ class NotificationMailer < ApplicationMailer
|
|||
end
|
||||
|
||||
def favourite
|
||||
return if @status.blank?
|
||||
|
||||
mail subject: default_i18n_subject(name: @account.acct)
|
||||
end
|
||||
|
||||
def reblog
|
||||
return if @status.blank?
|
||||
|
||||
mail subject: default_i18n_subject(name: @account.acct)
|
||||
end
|
||||
|
||||
|
|
@ -64,7 +58,7 @@ class NotificationMailer < ApplicationMailer
|
|||
end
|
||||
|
||||
def set_status
|
||||
@status = @notification.target_status
|
||||
@status = @notification.target_status || raise(ActiveRecord::RecordNotFound)
|
||||
end
|
||||
|
||||
def set_account
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user