Merge pull request #2565 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes up to cd37048439
th-downstream
@ -0,0 +1,11 @@
|
||||
const config = {
|
||||
'*': 'prettier --ignore-unknown --write',
|
||||
'Capfile|Gemfile|*.{rb,ruby,ru,rake}':
|
||||
'bundle exec rubocop --force-exclusion -a',
|
||||
'*.{js,jsx,ts,tsx}': 'eslint --fix',
|
||||
'*.{css,scss}': 'stylelint --fix',
|
||||
'*.haml': 'bundle exec haml-lint -a',
|
||||
'**/*.ts?(x)': () => 'tsc -p tsconfig.json --noEmit',
|
||||
};
|
||||
|
||||
module.exports = config;
|
Before Width: | Height: | Size: 1.0 KiB After Width: | Height: | Size: 1.1 KiB |
Before Width: | Height: | Size: 2.7 KiB After Width: | Height: | Size: 2.4 KiB |
Before Width: | Height: | Size: 750 B After Width: | Height: | Size: 671 B |
After Width: | Height: | Size: 1.9 KiB |
After Width: | Height: | Size: 4.2 KiB |
Before Width: | Height: | Size: 638 B After Width: | Height: | Size: 575 B |
Before Width: | Height: | Size: 697 B After Width: | Height: | Size: 583 B |
Before Width: | Height: | Size: 318 B After Width: | Height: | Size: 276 B |
Before Width: | Height: | Size: 347 B After Width: | Height: | Size: 313 B |
Before Width: | Height: | Size: 992 B After Width: | Height: | Size: 1.0 KiB |
After Width: | Height: | Size: 977 B |
Before Width: | Height: | Size: 2.9 KiB After Width: | Height: | Size: 1.6 KiB |
Before Width: | Height: | Size: 2.2 KiB After Width: | Height: | Size: 1.4 KiB |
After Width: | Height: | Size: 368 B |
After Width: | Height: | Size: 368 B |
After Width: | Height: | Size: 368 B |
After Width: | Height: | Size: 4.9 KiB |
After Width: | Height: | Size: 1.2 KiB |
After Width: | Height: | Size: 1.9 KiB |
After Width: | Height: | Size: 1.8 KiB |
After Width: | Height: | Size: 3.6 KiB |
After Width: | Height: | Size: 982 B |
After Width: | Height: | Size: 3.9 KiB |
After Width: | Height: | Size: 2.9 KiB |
After Width: | Height: | Size: 2.1 KiB |
After Width: | Height: | Size: 4.3 KiB |
After Width: | Height: | Size: 1.6 KiB |
After Width: | Height: | Size: 3.5 KiB |
After Width: | Height: | Size: 2.5 KiB |
After Width: | Height: | Size: 2.0 KiB |
After Width: | Height: | Size: 2.4 KiB |
After Width: | Height: | Size: 1.3 KiB |
After Width: | Height: | Size: 1.8 KiB |
After Width: | Height: | Size: 958 B |
After Width: | Height: | Size: 958 B |
After Width: | Height: | Size: 958 B |
After Width: | Height: | Size: 1.0 KiB |
After Width: | Height: | Size: 958 B |
After Width: | Height: | Size: 958 B |
After Width: | Height: | Size: 947 B |
After Width: | Height: | Size: 948 B |
After Width: | Height: | Size: 947 B |
After Width: | Height: | Size: 947 B |
After Width: | Height: | Size: 947 B |
After Width: | Height: | Size: 947 B |
@ -0,0 +1,6 @@
|
||||
# frozen_string_literal: true
|
||||
|
||||
Fabricator(:follow_recommendation_mute) do
|
||||
account { Fabricate.build(:account) }
|
||||
target_account { Fabricate.build(:account) }
|
||||
end
|
@ -0,0 +1,57 @@
|
||||
# frozen_string_literal: true
|
||||
|
||||
require 'rails_helper'
|
||||
|
||||
RSpec.describe AccountSuggestions::Source do
|
||||
describe '#base_account_scope' do
|
||||
subject { FakeSource.new }
|
||||
|
||||
before do
|
||||
stub_const 'FakeSource', fake_source_class
|
||||
end
|
||||
|
||||
context 'with follows and follow requests' do
|
||||
let!(:account_domain_blocked_account) { Fabricate(:account, domain: 'blocked.host') }
|
||||
let!(:account) { Fabricate(:account) }
|
||||
let!(:blocked_account) { Fabricate(:account) }
|
||||
let!(:eligible_account) { Fabricate(:account) }
|
||||
let!(:follow_recommendation_muted_account) { Fabricate(:account) }
|
||||
let!(:follow_requested_account) { Fabricate(:account) }
|
||||
let!(:following_account) { Fabricate(:account) }
|
||||
let!(:moved_account) { Fabricate(:account, moved_to_account: Fabricate(:account)) }
|
||||
|
||||
before do
|
||||
Fabricate :account_domain_block, account: account, domain: account_domain_blocked_account.domain
|
||||
Fabricate :block, account: account, target_account: blocked_account
|
||||
Fabricate :follow_recommendation_mute, account: account, target_account: follow_recommendation_muted_account
|
||||
Fabricate :follow_request, account: account, target_account: follow_requested_account
|
||||
Fabricate :follow, account: account, target_account: following_account
|
||||
end
|
||||
|
||||
it 'returns eligible accounts' do
|
||||
results = subject.get(account)
|
||||
|
||||
expect(results)
|
||||
.to include(eligible_account)
|
||||
.and not_include(account_domain_blocked_account)
|
||||
.and not_include(account)
|
||||
.and not_include(blocked_account)
|
||||
.and not_include(follow_recommendation_muted_account)
|
||||
.and not_include(follow_requested_account)
|
||||
.and not_include(following_account)
|
||||
.and not_include(moved_account)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
private
|
||||
|
||||
def fake_source_class
|
||||
Class.new described_class do
|
||||
def get(account, limit: 10)
|
||||
base_account_scope(account)
|
||||
.limit(limit)
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|