From: ThibG Date: Thu, 25 Apr 2019 00:47:33 +0000 (+0200) Subject: Reject follow requests of blocked users (#10633) X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=b1a0322a06e6f8eca736132b1f7f2af8dc179afb;p=mastodon.git Reject follow requests of blocked users (#10633) --- diff --git a/app/services/block_service.rb b/app/services/block_service.rb index 140b238df..10ed470e0 100644 --- a/app/services/block_service.rb +++ b/app/services/block_service.rb @@ -6,6 +6,7 @@ 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) + RejectFollowService.new.call(account, target_account) if target_account.requested?(account) block = account.block!(target_account)