Merge pull request #147 from yipdw/sync/upstream

Fix error when following locked accounts (#4896)
rebase/4.0.0rc2
David Yip 2017-09-16 11:37:53 -05:00 committed by GitHub
commit f5d6bdd9c0
2 changed files with 37 additions and 21 deletions

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

View File

@ -18,25 +18,48 @@ RSpec.describe Api::V1::AccountsController, type: :controller do
end
describe 'POST #follow' do
let(:other_account) { Fabricate(:user, email: 'bob@example.com', account: Fabricate(:account, username: 'bob')).account }
let(:other_account) { Fabricate(:user, email: 'bob@example.com', account: Fabricate(:account, username: 'bob', locked: locked)).account }
before do
post :follow, params: { id: other_account.id }
end
it 'returns http success' do
expect(response).to have_http_status(:success)
context 'with unlocked account' do
let(:locked) { false }
it 'returns http success' do
expect(response).to have_http_status(:success)
end
it 'returns JSON with following=true and requested=false' do
json = body_as_json
expect(json[:following]).to be true
expect(json[:requested]).to be false
end
it 'creates a following relation between user and target user' do
expect(user.account.following?(other_account)).to be true
end
end
it 'returns JSON with following=true and requested=false' do
json = body_as_json
context 'with locked account' do
let(:locked) { true }
expect(json[:following]).to be true
expect(json[:requested]).to be false
end
it 'returns http success' do
expect(response).to have_http_status(:success)
end
it 'creates a following relation between user and target user' do
expect(user.account.following?(other_account)).to be true
it 'returns JSON with following=false and requested=true' do
json = body_as_json
expect(json[:following]).to be false
expect(json[:requested]).to be true
end
it 'creates a follow request relation between user and target user' do
expect(user.account.requested?(other_account)).to be true
end
end
end