about summary refs log tree commit diff
path: root/app/services/block_service.rb
diff options
context:
space:
mode:
authorAnthony Bellew <anthonyreflected@gmail.com>2017-01-03 11:51:35 -0700
committerGitHub <noreply@github.com>2017-01-03 11:51:35 -0700
commitde154dbd5dbb04d083f5a66dc288d9fef7006c01 (patch)
tree88a1715021c33add55501351dbf74950deeac481 /app/services/block_service.rb
parentc3e9ba6a66bfcb9e33edebc73adea0a17d7f02a6 (diff)
parente6657d7342ee1ce08973bf1e5ab89e423eb8b760 (diff)
Merge pull request #1 from Gargron/master
Catchup merge
Diffstat (limited to 'app/services/block_service.rb')
-rw-r--r--app/services/block_service.rb4
1 files changed, 3 insertions, 1 deletions
diff --git a/app/services/block_service.rb b/app/services/block_service.rb
index 66146a72a..b08cf8ca8 100644
--- a/app/services/block_service.rb
+++ b/app/services/block_service.rb
@@ -7,10 +7,12 @@ class BlockService < BaseService
     UnfollowService.new.call(account, target_account) if account.following?(target_account)
     UnfollowService.new.call(target_account, account) if target_account.following?(account)
 
-    account.block!(target_account)
+    block = account.block!(target_account)
 
     clear_timelines(account, target_account)
     clear_notifications(account, target_account)
+
+    NotificationWorker.perform_async(block.stream_entry.id, target_account.id) unless target_account.local?
   end
 
   private