diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2016-10-03 18:49:52 +0200 |
|---|---|---|
| committer | Eugen Rochko <eugen@zeonfederated.com> | 2016-10-03 18:49:52 +0200 |
| commit | 70e9dd0b5b2c4b2d695334d8b63c6d58cb1619d8 (patch) | |
| tree | d1ff421300703d4b690e111dd8b5b5da665aab5b /app/services/process_feed_service.rb | |
| parent | 7b9a4af3112dc4edcd378dc94190e2eb8e041f56 (diff) | |
Blocking will prevent e-mail notifications from blocked user, blocks in UI
Diffstat (limited to 'app/services/process_feed_service.rb')
| -rw-r--r-- | app/services/process_feed_service.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/services/process_feed_service.rb b/app/services/process_feed_service.rb index 1ea79835b..9585b15dd 100644 --- a/app/services/process_feed_service.rb +++ b/app/services/process_feed_service.rb @@ -69,7 +69,7 @@ class ProcessFeedService < BaseService unless mentioned_account.nil? mentioned_account.mentions.where(status: status).first_or_create(status: status) - NotificationMailer.mention(mentioned_account, status).deliver_later + NotificationMailer.mention(mentioned_account, status).deliver_later unless mentioned_account.blocking?(status.account) end else # What to do about remote user? @@ -114,7 +114,7 @@ class ProcessFeedService < BaseService if !status.reblog.nil? status.save! - NotificationMailer.reblog(status.reblog, status.account).deliver_later if status.reblog.local? + NotificationMailer.reblog(status.reblog, status.account).deliver_later if status.reblog.local? && !status.reblog.account.blocking?(status.account) end end |