Hide blocking accounts from blocked users (#10442)
* Revert "Add indication that you have been blocked in web UI (#10420)" This reverts commitbd02ec6daa
. * Revert "Add `blocked_by` relationship to the REST API (#10373)" This reverts commit9745de883b
. * Hide blocking accounts from search results * Filter blocking accouts from account followers * Filter blocking accouts from account's following accounts * Filter blocking accounts from “reblogged by” and “favourited by” lists * Remove blocking account from URL search * Return 410 on trying to fetch user data from a user who blocked us * Return 410 in /api/v1/account/statuses for suspended or blocking accounts * Fix status filtering when performing URL search * Restore some React improvements Restore some cleanup frombd02ec6daa
* Refactor by adding `without_blocking` scope
This commit is contained in:
parent
67eb47e25f
commit
62bafa20a1
20 changed files with 136 additions and 62 deletions
|
@ -7,15 +7,40 @@ describe Api::V1::Accounts::FollowerAccountsController do
|
|||
let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: 'read:accounts') }
|
||||
|
||||
before do
|
||||
Fabricate(:follow, target_account: user.account)
|
||||
allow(controller).to receive(:doorkeeper_token) { token }
|
||||
end
|
||||
|
||||
describe 'GET #index' do
|
||||
let(:simon) { Fabricate(:account, username: 'simon') }
|
||||
let(:lewis) { Fabricate(:account, username: 'lewis') }
|
||||
|
||||
before do
|
||||
simon.follow!(lewis)
|
||||
end
|
||||
|
||||
it 'returns http success' do
|
||||
get :index, params: { account_id: user.account.id, limit: 1 }
|
||||
get :index, params: { account_id: lewis.id, limit: 1 }
|
||||
|
||||
expect(response).to have_http_status(200)
|
||||
end
|
||||
|
||||
it 'returns JSON with correct data' do
|
||||
get :index, params: { account_id: lewis.id, limit: 1 }
|
||||
|
||||
json = body_as_json
|
||||
|
||||
expect(json).to be_a Enumerable
|
||||
expect(json.first[:username]).to eq 'simon'
|
||||
end
|
||||
|
||||
it 'does not return accounts blocking you' do
|
||||
simon.block!(user.account)
|
||||
get :index, params: { account_id: lewis.id, limit: 1 }
|
||||
|
||||
json = body_as_json
|
||||
|
||||
expect(json).to be_a Enumerable
|
||||
expect(json.size).to eq 0
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue