Improve blocked view of profiles (#10491)
* Revert "Fix filtering of favourited_by, reblogged_by, followers and following (#10447)" This reverts commit120544067f
. * Revert "Hide blocking accounts from blocked users (#10442)" This reverts commit62bafa20a1
. * Improve blocked view of profiles - Change "You are blocked" to "Profile unavailable" - Hide following/followers in API when blocked - Disable follow button and show "Profile unavailable" on public profile as well
This commit is contained in:
parent
0e8819f0e8
commit
67b3b62b98
26 changed files with 97 additions and 138 deletions
|
@ -156,22 +156,5 @@ describe AccountSearchService, type: :service do
|
|||
expect(results).to eq []
|
||||
end
|
||||
end
|
||||
|
||||
describe 'should not include accounts blocking the requester' do
|
||||
let!(:blocked) { Fabricate(:account) }
|
||||
let!(:blocker) { Fabricate(:account, username: 'exact') }
|
||||
|
||||
before do
|
||||
blocker.block!(blocked)
|
||||
end
|
||||
|
||||
it 'returns the fuzzy match first, and does not return suspended exacts' do
|
||||
partial = Fabricate(:account, username: 'exactness')
|
||||
|
||||
results = subject.call('exact', blocked, limit: 10)
|
||||
expect(results.size).to eq 1
|
||||
expect(results).to eq [partial]
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue