Fix #4852 - Check if already requested from FollowService (#4855)

mastodon · Sep 9, 2017 · 4b460bc · 4b460bc
1 parent 7ca173b
commit 4b460bc
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/app/services/follow_service.rb b/app/services/follow_service.rb
@@ -12,7 +12,7 @@ def call(source_account, uri)
     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)