diff options
| author | David Yip <yipdw@member.fsf.org> | 2017-09-09 14:28:08 -0500 |
|---|---|---|
| committer | David Yip <yipdw@member.fsf.org> | 2017-09-09 14:28:08 -0500 |
| commit | 514fc908a373306b32b2b6b9fc0d849161d88271 (patch) | |
| tree | 0f0028e424b43dcf4a59b21ccc7170dfe883746b /app/controllers/api/v1 | |
| parent | b9f7bc149b2a6abfbdaee83e6992b617b8bdb18e (diff) | |
| parent | 11bddd31ce33b654ef72b00221715e6026486e7c (diff) | |
Merge tag 'v1.6.0rc3' into sync/upstream
Diffstat (limited to 'app/controllers/api/v1')
| -rw-r--r-- | app/controllers/api/v1/accounts_controller.rb | 10 |
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 |