diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2017-09-09 02:02:44 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-09 02:02:44 +0200 |
| commit | 4b460bc57188c5dab31a921daed3c0012df28761 (patch) | |
| tree | 928e63828cacd5cec157fd22625c841dce83c408 /app/services/follow_service.rb | |
| parent | 7ca173be47c8aa5e8bd2b33aac642193ebb673a0 (diff) | |
Fix #4852 - Check if already requested from FollowService (#4855)
Diffstat (limited to 'app/services/follow_service.rb')
| -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 a92eb6b88..941556b60 100644 --- a/app/services/follow_service.rb +++ b/app/services/follow_service.rb @@ -12,7 +12,7 @@ class FollowService < BaseService raise ActiveRecord::RecordNotFound if target_account.nil? || target_account.id == source_account.id || target_account.suspended? raise Mastodon::NotPermittedError if target_account.blocking?(source_account) || source_account.blocking?(target_account) - return if source_account.following?(target_account) + return if source_account.following?(target_account) || source_account.requested?(target_account) if target_account.locked? || target_account.activitypub? request_follow(source_account, target_account) |