From 62bafa20a112ccdddaedb25723fc819dbbcd8e9a Mon Sep 17 00:00:00 2001 From: ThibG Date: Mon, 1 Apr 2019 20:06:13 +0200 Subject: Hide blocking accounts from blocked users (#10442) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Revert "Add indication that you have been blocked in web UI (#10420)" This reverts commit bd02ec6daa974dcd3231e73826a56e08dbeedadc. * Revert "Add `blocked_by` relationship to the REST API (#10373)" This reverts commit 9745de883b198375ba23f7fde879f6d75ce2df0f. * 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 from bd02ec6daa974dcd3231e73826a56e08dbeedadc * Refactor by adding `without_blocking` scope --- spec/services/account_search_service_spec.rb | 17 ++++++++++++++++ spec/services/search_service_spec.rb | 30 +++++++++++++++------------- 2 files changed, 33 insertions(+), 14 deletions(-) (limited to 'spec/services') diff --git a/spec/services/account_search_service_spec.rb b/spec/services/account_search_service_spec.rb index 7b071b378..40ef4b84a 100644 --- a/spec/services/account_search_service_spec.rb +++ b/spec/services/account_search_service_spec.rb @@ -156,5 +156,22 @@ 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 diff --git a/spec/services/search_service_spec.rb b/spec/services/search_service_spec.rb index d064cd9b8..900533e71 100644 --- a/spec/services/search_service_spec.rb +++ b/spec/services/search_service_spec.rb @@ -3,6 +3,8 @@ require 'rails_helper' describe SearchService, type: :service do + let(:current_account) { Fabricate(:user).account } + subject { described_class.new } describe '#call' do @@ -10,7 +12,7 @@ describe SearchService, type: :service do it 'returns empty results without searching' do allow(AccountSearchService).to receive(:new) allow(Tag).to receive(:search_for) - results = subject.call('', nil, 10) + results = subject.call('', current_account, 10) expect(results).to eq(empty_results) expect(AccountSearchService).not_to have_received(:new) @@ -27,33 +29,33 @@ describe SearchService, type: :service do it 'returns the empty results' do service = double(call: nil) allow(ResolveURLService).to receive(:new).and_return(service) - results = subject.call(@query, nil, 10) + results = subject.call(@query, current_account, 10) - expect(service).to have_received(:call).with(@query, on_behalf_of: nil) + expect(service).to have_received(:call).with(@query, on_behalf_of: current_account) expect(results).to eq empty_results end end context 'that finds an account' do it 'includes the account in the results' do - account = Account.new + account = Fabricate(:account) service = double(call: account) allow(ResolveURLService).to receive(:new).and_return(service) - results = subject.call(@query, nil, 10) - expect(service).to have_received(:call).with(@query, on_behalf_of: nil) + results = subject.call(@query, current_account, 10) + expect(service).to have_received(:call).with(@query, on_behalf_of: current_account) expect(results).to eq empty_results.merge(accounts: [account]) end end context 'that finds a status' do it 'includes the status in the results' do - status = Status.new + status = Fabricate(:status) service = double(call: status) allow(ResolveURLService).to receive(:new).and_return(service) - results = subject.call(@query, nil, 10) - expect(service).to have_received(:call).with(@query, on_behalf_of: nil) + results = subject.call(@query, current_account, 10) + expect(service).to have_received(:call).with(@query, on_behalf_of: current_account) expect(results).to eq empty_results.merge(statuses: [status]) end end @@ -63,12 +65,12 @@ describe SearchService, type: :service do context 'that matches an account' do it 'includes the account in the results' do query = 'username' - account = Account.new + account = Fabricate(:account) service = double(call: [account]) allow(AccountSearchService).to receive(:new).and_return(service) - results = subject.call(query, nil, 10) - expect(service).to have_received(:call).with(query, nil, limit: 10, offset: 0, resolve: false) + results = subject.call(query, current_account, 10) + expect(service).to have_received(:call).with(query, current_account, limit: 10, offset: 0, resolve: false) expect(results).to eq empty_results.merge(accounts: [account]) end end @@ -79,7 +81,7 @@ describe SearchService, type: :service do tag = Tag.new allow(Tag).to receive(:search_for).with('tag', 10, 0).and_return([tag]) - results = subject.call(query, nil, 10) + results = subject.call(query, current_account, 10) expect(Tag).to have_received(:search_for).with('tag', 10, 0) expect(results).to eq empty_results.merge(hashtags: [tag]) end @@ -87,7 +89,7 @@ describe SearchService, type: :service do query = '@username' allow(Tag).to receive(:search_for) - results = subject.call(query, nil, 10) + results = subject.call(query, current_account, 10) expect(Tag).not_to have_received(:search_for) expect(results).to eq empty_results end -- cgit