Add updated relationship to follow request API responses (#11800)
Fixes #11747remotes/1727458204337373841/tmp_refs/heads/signup-info-prompt
parent
17389c63c8
commit
4faaa5b25e
|
@ -14,12 +14,12 @@ class Api::V1::FollowRequestsController < Api::BaseController
|
|||
def authorize
|
||||
AuthorizeFollowService.new.call(account, current_account)
|
||||
NotifyService.new.call(current_account, Follow.find_by(account: account, target_account: current_account))
|
||||
render_empty
|
||||
render json: account, serializer: REST::RelationshipSerializer, relationships: relationships
|
||||
end
|
||||
|
||||
def reject
|
||||
RejectFollowService.new.call(account, current_account)
|
||||
render_empty
|
||||
render json: account, serializer: REST::RelationshipSerializer, relationships: relationships
|
||||
end
|
||||
|
||||
private
|
||||
|
@ -28,6 +28,10 @@ class Api::V1::FollowRequestsController < Api::BaseController
|
|||
Account.find(params[:id])
|
||||
end
|
||||
|
||||
def relationships(**options)
|
||||
AccountRelationshipsPresenter.new([params[:id]], current_user.account_id, options)
|
||||
end
|
||||
|
||||
def load_accounts
|
||||
default_accounts.merge(paginated_follow_requests).to_a
|
||||
end
|
||||
|
|
|
@ -38,6 +38,12 @@ RSpec.describe Api::V1::FollowRequestsController, type: :controller do
|
|||
it 'allows follower to follow' do
|
||||
expect(follower.following?(user.account)).to be true
|
||||
end
|
||||
|
||||
it 'returns JSON with followed_by=true' do
|
||||
json = body_as_json
|
||||
|
||||
expect(json[:followed_by]).to be true
|
||||
end
|
||||
end
|
||||
|
||||
describe 'POST #reject' do
|
||||
|
@ -54,5 +60,11 @@ RSpec.describe Api::V1::FollowRequestsController, type: :controller do
|
|||
it 'removes follow request' do
|
||||
expect(FollowRequest.where(target_account: user.account, account: follower).count).to eq 0
|
||||
end
|
||||
|
||||
it 'returns JSON with followed_by=false' do
|
||||
json = body_as_json
|
||||
|
||||
expect(json[:followed_by]).to be false
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
Loading…
Reference in New Issue