about summary refs log tree commit diff
path: root/app/services/follow_service.rb
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2016-12-22 21:34:19 +0100
committerEugen Rochko <eugen@zeonfederated.com>2016-12-22 21:34:19 +0100
commit2d2154ba75279186b064c887452b7d6ee70b8ba2 (patch)
treee27a84e2245184c899f2b347d63af16210973660 /app/services/follow_service.rb
parentf91b6fa9e15029f23be7be3b796eca122e5b5588 (diff)
Add "locked" flag to accounts, prevent blocked users from following, force-unfollow blocked users
Diffstat (limited to 'app/services/follow_service.rb')
-rw-r--r--app/services/follow_service.rb1
1 files changed, 1 insertions, 0 deletions
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)