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

2016-10-03 18:49:52 +02:00
parent 7b9a4af311
commit 70e9dd0b5b
12 changed files with 134 additions and 32 deletions
--- a/app/services/reblog_service.rb
+++ b/app/services/reblog_service.rb
@ -9,7 +9,7 @@ class ReblogService < BaseService
    account.ping!(account_url(account, format: 'atom'), [Rails.configuration.x.hub_url])

    if reblogged_status.local?
-      NotificationMailer.reblog(reblogged_status, account).deliver_later
+      NotificationMailer.reblog(reblogged_status, account).deliver_later unless reblogged_status.account.blocking?(account)
    else
      NotificationWorker.perform_async(reblog.stream_entry.id, reblogged_status.account_id)
    end