Unfloyded/Legamunt
0
0
Fork 0
Code Activity

Blocking will prevent e-mail notifications from blocked user, blocks in UI

Browse source
This commit is contained in:
Eugen Rochko 2016-10-03 18:49:52 +02:00
parent 7b9a4af311
commit 70e9dd0b5b
12 changed files with 134 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/services/process_mentions_service.rb
View file

@ -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