From 70e9dd0b5b2c4b2d695334d8b63c6d58cb1619d8 Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Mon, 3 Oct 2016 18:49:52 +0200 Subject: Blocking will prevent e-mail notifications from blocked user, blocks in UI --- app/services/favourite_service.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/services/favourite_service.rb') diff --git a/app/services/favourite_service.rb b/app/services/favourite_service.rb index 3d0bc718c..98f08d32b 100644 --- a/app/services/favourite_service.rb +++ b/app/services/favourite_service.rb @@ -8,7 +8,7 @@ class FavouriteService < BaseService account.ping!(account_url(account, format: 'atom'), [Rails.configuration.x.hub_url]) if status.local? - NotificationMailer.favourite(status, account).deliver_later + NotificationMailer.favourite(status, account).deliver_later unless status.account.blocking?(account) else NotificationWorker.perform_async(favourite.stream_entry.id, status.account_id) end -- cgit