diff options
author | Anthony Bellew <anthonyreflected@gmail.com> | 2017-01-03 11:51:35 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-01-03 11:51:35 -0700 |
commit | de154dbd5dbb04d083f5a66dc288d9fef7006c01 (patch) | |
tree | 88a1715021c33add55501351dbf74950deeac481 /app/services/unblock_service.rb | |
parent | c3e9ba6a66bfcb9e33edebc73adea0a17d7f02a6 (diff) | |
parent | e6657d7342ee1ce08973bf1e5ab89e423eb8b760 (diff) |
Merge pull request #1 from Gargron/master
Catchup merge
Diffstat (limited to 'app/services/unblock_service.rb')
-rw-r--r-- | app/services/unblock_service.rb | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/app/services/unblock_service.rb b/app/services/unblock_service.rb index 3658dcd71..f389364f9 100644 --- a/app/services/unblock_service.rb +++ b/app/services/unblock_service.rb @@ -2,6 +2,9 @@ class UnblockService < BaseService def call(account, target_account) - account.unblock!(target_account) if account.blocking?(target_account) + return unless account.blocking?(target_account) + + unblock = account.unblock!(target_account) + NotificationWorker.perform_async(unblock.stream_entry.id, target_account.id) unless target_account.local? end end |