diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2017-02-05 20:58:09 +0100 |
|---|---|---|
| committer | Eugen Rochko <eugen@zeonfederated.com> | 2017-02-05 21:04:22 +0100 |
| commit | 0af3401553bfc8366779bf64ebe257c962eb82eb (patch) | |
| tree | 8a58782e808655729a789ca0da66bcd52bd2d76a /app/services | |
| parent | eee8afb0b711205b793cb881ad6e875305d6d45e (diff) | |
Don't allow people to follow people they blocked without unblocking first
Diffstat (limited to 'app/services')
| -rw-r--r-- | app/services/follow_service.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/services/follow_service.rb b/app/services/follow_service.rb index 87c16a621..9f34cb6ac 100644 --- a/app/services/follow_service.rb +++ b/app/services/follow_service.rb @@ -8,7 +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) + raise Mastodon::NotPermitted if target_account.blocking?(source_account) || source_account.blocking?(target_account) if target_account.locked? request_follow(source_account, target_account) |