diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2022-10-28 11:36:25 +0200 |
|---|---|---|
| committer | Claire <claire.github-309c@sitedethib.com> | 2022-10-28 19:23:58 +0200 |
| commit | cb19be67d1b47dd04cb5bb88e09f0101a614bd1c (patch) | |
| tree | 6c85ccc6ac0279ae7b1ed4dff56c8e83f71a0c95 /app/models/domain_block.rb | |
| parent | 371563b0e249b6369e04709fb974a8e57413529f (diff) | |
| parent | 8dfe5179ee7186e549dbe1186a151ffa848fe8ab (diff) | |
Merge branch 'main' into glitch-soc/merge-upstream
Diffstat (limited to 'app/models/domain_block.rb')
| -rw-r--r-- | app/models/domain_block.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/models/domain_block.rb b/app/models/domain_block.rb index b08687787..ad1dc2a38 100644 --- a/app/models/domain_block.rb +++ b/app/models/domain_block.rb @@ -28,8 +28,8 @@ class DomainBlock < ApplicationRecord 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]).or(where(reject_media: true)) } - scope :by_severity, -> { order(Arel.sql('(CASE severity WHEN 0 THEN 1 WHEN 1 THEN 2 WHEN 2 THEN 0 END), reject_media, domain')) } + scope :with_user_facing_limitations, -> { where(severity: [:silence, :suspend]) } + scope :by_severity, -> { order(Arel.sql('(CASE severity WHEN 0 THEN 1 WHEN 1 THEN 2 WHEN 2 THEN 0 END), domain')) } def to_log_human_identifier domain |