about summary refs log tree commit diff
path: root/app
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2017-09-11 23:50:37 +0200
committerDavid Yip <yipdw@member.fsf.org>2017-09-16 11:10:33 -0500
commitad8e856a5b053096e32debdc12ce9c6d05924657 (patch)
tree23478c6ecdc63633c7216de205e0d1322ae4a351 /app
parent7ebd6ed03cb643df2485aadfec31845f829d0a64 (diff)
Fix error when following locked accounts (#4896)
(cherry picked from commit 0ef9d45d0581dddf2f325033c43721f42fcfca9e)
Diffstat (limited to 'app')
-rw-r--r--app/controllers/api/v1/accounts_controller.rb15
1 files changed, 4 insertions, 11 deletions
diff --git a/app/controllers/api/v1/accounts_controller.rb b/app/controllers/api/v1/accounts_controller.rb
index ec3abfbf5..4676f60de 100644
--- a/app/controllers/api/v1/accounts_controller.rb
+++ b/app/controllers/api/v1/accounts_controller.rb
@@ -15,16 +15,9 @@ 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
+    options = @account.locked? ? {} : { following_map: { @account.id => true }, requested_map: { @account.id => false } }
 
-    render json: @account, serializer: REST::RelationshipSerializer, relationships: relationships
+    render json: @account, serializer: REST::RelationshipSerializer, relationships: relationships(options)
   end
 
   def block
@@ -58,7 +51,7 @@ class Api::V1::AccountsController < Api::BaseController
     @account = Account.find(params[:id])
   end
 
-  def relationships
-    AccountRelationshipsPresenter.new([@account.id], current_user.account_id)
+  def relationships(options = {})
+    AccountRelationshipsPresenter.new([@account.id], current_user.account_id, options)
   end
 end