diff options
Diffstat (limited to 'app/services')
| -rw-r--r-- | app/services/block_service.rb | 3 | ||||
| -rw-r--r-- | app/services/follow_service.rb | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/app/services/block_service.rb b/app/services/block_service.rb index 6a032a5a1..66146a72a 100644 --- a/app/services/block_service.rb +++ b/app/services/block_service.rb @@ -5,7 +5,10 @@ class BlockService < BaseService return if account.id == target_account.id 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) + clear_timelines(account, target_account) clear_notifications(account, target_account) end diff --git a/app/services/follow_service.rb b/app/services/follow_service.rb index ed9b62455..02baa6553 100644 --- a/app/services/follow_service.rb +++ b/app/services/follow_service.rb @@ -8,6 +8,7 @@ class FollowService < BaseService target_account = follow_remote_account_service.call(uri) raise ActiveRecord::RecordNotFound if target_account.nil? || target_account.id == source_account.id || target_account.suspended? + raise Mastodon::NotPermitted if target_account.blocking?(source_account) follow = source_account.follow!(target_account) |