Unfloyded/Legamunt
0
0
Fork 0
Code Activity

Fix error when following locked accounts (#4896)

Browse source
This commit is contained in:
Eugen Rochko 2017-09-11 23:50:37 +02:00 • committed by GitHub
parent a6a206ef85
commit 0ef9d45d05
2 changed files with 37 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

15
app/controllers/api/v1/accounts_controller.rb
View file

@ -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