Fix deprecation warning about merging conditions (#23618)

app/models/account_filter.rb

@@ -17,13 +17,13 @@ class AccountFilter
  attr_reader :params
 
  def initialize(params)
- @params = params
+ @params = params.to_h.symbolize_keys
  end
 
  def results
  scope = Account.includes(:account_stat, user: [:ips, :invite_request]).without_instance_actor.reorder(nil)
 
- params.each do |key, value|
+ relevant_params.each do |key, value|
  next if key.to_s == 'page'
 
  scope.merge!(scope_for(key, value)) if value.present?
@@ -34,6 +34,16 @@ def results
 
  private
 
+ def relevant_params
+ params.tap do |args|
+ args.delete(:origin) if origin_is_remote_and_domain_present?
+ end
+ end
+
+ def origin_is_remote_and_domain_present?
+ params[:origin] == 'remote' && params[:by_domain].present?
+ end
+
  def scope_for(key, value)
  case key.to_s
  when 'origin'
@@ -94,7 +104,15 @@ def status_scope(value)
  def order_scope(value)
  case value.to_s
  when 'active'
- accounts_with_users.left_joins(:account_stat).order(Arel.sql('coalesce(users.current_sign_in_at, account_stats.last_status_at, to_timestamp(0)) desc, accounts.id desc'))
+ accounts_with_users
+ .left_joins(:account_stat)
+ .order(
+ Arel.sql(
+ <<~SQL.squish
+ COALESCE(users.current_sign_in_at, account_stats.last_status_at, to_timestamp(0)) DESC, accounts.id DESC
+ SQL
+ )
+ )
  when 'recent'
  Account.recent
  else

spec/models/account_filter_spec.rb

@@ -18,4 +18,30 @@
  expect { filter.results }.to raise_error(/wrong/)
  end
  end
+
+ describe 'with origin and by_domain interacting' do
+ let!(:local_account) { Fabricate(:account, domain: nil) }
+ let!(:remote_account_one) { Fabricate(:account, domain: 'example.org') }
+ let(:remote_account_two) { Fabricate(:account, domain: 'other.domain') }
+
+ it 'works with domain first and origin remote' do
+ filter = described_class.new(by_domain: 'example.org', origin: 'remote')
+ expect(filter.results).to match_array [remote_account_one]
+ end
+
+ it 'works with domain last and origin remote' do
+ filter = described_class.new(origin: 'remote', by_domain: 'example.org')
+ expect(filter.results).to match_array [remote_account_one]
+ end
+
+ it 'works with domain first and origin local' do
+ filter = described_class.new(by_domain: 'example.org', origin: 'local')
+ expect(filter.results).to match_array [local_account]
+ end
+
+ it 'works with domain last and origin local' do
+ filter = described_class.new(origin: 'local', by_domain: 'example.org')
+ expect(filter.results).to match_array [remote_account_one]
+ end
+ end
 end