about summary refs log tree commit diff
path: root/app/controllers
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2017-09-05 17:48:13 +0200
committerGitHub <noreply@github.com>2017-09-05 17:48:13 +0200
commit9b994c4aee379f7998d2ddb562a08ccff92e0b0b (patch)
treeee658c5973b3317d58f47942eeb8a0431d81c506 /app/controllers
parent4c3dd0b25472b4d291f607979d255dd406856bef (diff)
Fix #4794 - Fake instant follow in API response when account is believed unlocked (#4799)
Diffstat (limited to 'app/controllers')
-rw-r--r--app/controllers/api/v1/accounts_controller.rb10
1 files changed, 10 insertions, 0 deletions
diff --git a/app/controllers/api/v1/accounts_controller.rb b/app/controllers/api/v1/accounts_controller.rb
index f621aa245..656cacd8a 100644
--- a/app/controllers/api/v1/accounts_controller.rb
+++ b/app/controllers/api/v1/accounts_controller.rb
@@ -14,6 +14,16 @@ class Api::V1::AccountsController < Api::BaseController
 
   def follow
     FollowService.new.call(current_user.account, @account.acct)
+
+    unless @account.locked?
+      relationships = AccountRelationshipsPresenter.new(
+        [@account.id],
+        current_user.account_id,
+        following_map: { @account.id => true },
+        requested_map: { @account.id => false }
+      )
+    end
+
     render json: @account, serializer: REST::RelationshipSerializer, relationships: relationships
   end