Remove unused `matches_domain` scopes on Account, DomainAllow, DomainBlock (#28803)
This commit is contained in:
parent
0b853678a4
commit
d0b3bc23d7
|
@ -125,7 +125,6 @@ class Account < ApplicationRecord
|
||||||
scope :alphabetic, -> { order(domain: :asc, username: :asc) }
|
scope :alphabetic, -> { order(domain: :asc, username: :asc) }
|
||||||
scope :matches_username, ->(value) { where('lower((username)::text) LIKE lower(?)', "#{value}%") }
|
scope :matches_username, ->(value) { where('lower((username)::text) LIKE lower(?)', "#{value}%") }
|
||||||
scope :matches_display_name, ->(value) { where(arel_table[:display_name].matches("#{value}%")) }
|
scope :matches_display_name, ->(value) { where(arel_table[:display_name].matches("#{value}%")) }
|
||||||
scope :matches_domain, ->(value) { where(arel_table[:domain].matches("%#{value}%")) }
|
|
||||||
scope :without_unapproved, -> { left_outer_joins(:user).merge(User.approved.confirmed).or(remote) }
|
scope :without_unapproved, -> { left_outer_joins(:user).merge(User.approved.confirmed).or(remote) }
|
||||||
scope :searchable, -> { without_unapproved.without_suspended.where(moved_to_account_id: nil) }
|
scope :searchable, -> { without_unapproved.without_suspended.where(moved_to_account_id: nil) }
|
||||||
scope :discoverable, -> { searchable.without_silenced.where(discoverable: true).joins(:account_stat) }
|
scope :discoverable, -> { searchable.without_silenced.where(discoverable: true).joins(:account_stat) }
|
||||||
|
|
|
@ -17,8 +17,6 @@ class DomainAllow < ApplicationRecord
|
||||||
|
|
||||||
validates :domain, presence: true, uniqueness: true, domain: true
|
validates :domain, presence: true, uniqueness: true, domain: true
|
||||||
|
|
||||||
scope :matches_domain, ->(value) { where(arel_table[:domain].matches("%#{value}%")) }
|
|
||||||
|
|
||||||
def to_log_human_identifier
|
def to_log_human_identifier
|
||||||
domain
|
domain
|
||||||
end
|
end
|
||||||
|
|
|
@ -28,7 +28,6 @@ class DomainBlock < ApplicationRecord
|
||||||
has_many :accounts, foreign_key: :domain, primary_key: :domain, inverse_of: false, dependent: nil
|
has_many :accounts, foreign_key: :domain, primary_key: :domain, inverse_of: false, dependent: nil
|
||||||
delegate :count, to: :accounts, prefix: true
|
delegate :count, to: :accounts, prefix: true
|
||||||
|
|
||||||
scope :matches_domain, ->(value) { where(arel_table[:domain].matches("%#{value}%")) }
|
|
||||||
scope :with_user_facing_limitations, -> { where(severity: [:silence, :suspend]) }
|
scope :with_user_facing_limitations, -> { where(severity: [:silence, :suspend]) }
|
||||||
scope :with_limitations, -> { where(severity: [:silence, :suspend]).or(where(reject_media: true)) }
|
scope :with_limitations, -> { where(severity: [:silence, :suspend]).or(where(reject_media: true)) }
|
||||||
scope :by_severity, -> { in_order_of(:severity, %w(noop silence suspend)).order(:domain) }
|
scope :by_severity, -> { in_order_of(:severity, %w(noop silence suspend)).order(:domain) }
|
||||||
|
|
|
@ -3,16 +3,18 @@
|
||||||
require 'rails_helper'
|
require 'rails_helper'
|
||||||
|
|
||||||
describe DomainAllow do
|
describe DomainAllow do
|
||||||
describe 'scopes' do
|
describe 'Validations' do
|
||||||
describe 'matches_domain' do
|
it 'is invalid without a domain' do
|
||||||
let(:domain) { Fabricate(:domain_allow, domain: 'example.com') }
|
domain_allow = Fabricate.build(:domain_allow, domain: nil)
|
||||||
let(:other_domain) { Fabricate(:domain_allow, domain: 'example.biz') }
|
domain_allow.valid?
|
||||||
|
expect(domain_allow).to model_have_error_on_field(:domain)
|
||||||
|
end
|
||||||
|
|
||||||
it 'returns the correct records' do
|
it 'is invalid if the same normalized domain already exists' do
|
||||||
results = described_class.matches_domain('example.com')
|
_domain_allow = Fabricate(:domain_allow, domain: 'にゃん')
|
||||||
|
domain_allow_with_normalized_value = Fabricate.build(:domain_allow, domain: 'xn--r9j5b5b')
|
||||||
expect(results).to eq([domain])
|
domain_allow_with_normalized_value.valid?
|
||||||
end
|
expect(domain_allow_with_normalized_value).to model_have_error_on_field(:domain)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in New Issue