mastofe

commit: 4b460bc57188c5dab31a921daed3c0012df28761
parent: 7ca173be47c8aa5e8bd2b33aac642193ebb673a0
Author: Eugen Rochko <eugen@zeonfederated.com>
Date:   Sat,  9 Sep 2017 02:02:44 +0200

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


Diffstat:
M
app/services/follow_service.rb
2
+-

1 file changed, 1 insertion(+), 1 deletion(-)
diff --git 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)