about summary refs log tree commit diff
path: root/app/services/process_mentions_service.rb
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2016-10-03 18:49:52 +0200
committerEugen Rochko <eugen@zeonfederated.com>2016-10-03 18:49:52 +0200
commit70e9dd0b5b2c4b2d695334d8b63c6d58cb1619d8 (patch)
treed1ff421300703d4b690e111dd8b5b5da665aab5b /app/services/process_mentions_service.rb
parent7b9a4af3112dc4edcd378dc94190e2eb8e041f56 (diff)
Blocking will prevent e-mail notifications from blocked user, blocks in UI
Diffstat (limited to 'app/services/process_mentions_service.rb')
-rw-r--r--app/services/process_mentions_service.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/services/process_mentions_service.rb b/app/services/process_mentions_service.rb
index 2d09fc2cd..8baa03d07 100644
--- a/app/services/process_mentions_service.rb
+++ b/app/services/process_mentions_service.rb
@@ -27,7 +27,7 @@ class ProcessMentionsService < BaseService
       mentioned_account = mention.account
 
       if mentioned_account.local?
-        NotificationMailer.mention(mentioned_account, status).deliver_later
+        NotificationMailer.mention(mentioned_account, status).deliver_later unless mentioned_account.blocking?(status.account)
       else
         NotificationWorker.perform_async(status.stream_entry.id, mentioned_account.id)
       end