about summary refs log tree commit diff
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2017-09-09 02:02:44 +0200
committerGitHub <noreply@github.com>2017-09-09 02:02:44 +0200
commit4b460bc57188c5dab31a921daed3c0012df28761 (patch)
tree928e63828cacd5cec157fd22625c841dce83c408
parent7ca173be47c8aa5e8bd2b33aac642193ebb673a0 (diff)
Fix #4852 - Check if already requested from FollowService (#4855)
-rw-r--r--app/services/follow_service.rb2
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)