Leatherface/mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2025-12-15 16:59:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit '5dc634796aba951f6a085e1ed0e1b807e25d7d41' into glitch-soc/merge-upstream

Browse Source
This commit is contained in:
Claire
2024-01-10 18:41:04 +01:00
parent 09376a8207 5dc634796a
commit 47d213e701
53 changed files with 738 additions and 203 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lib/mastodon/cli/maintenance.rb
View File

@@ -41,7 +41,8 @@ module Mastodon::CLI
class SoftwareUpdate < ApplicationRecord; end
class DomainBlock < ApplicationRecord
scope :by_severity, -> { order(Arel.sql('(CASE severity WHEN 0 THEN 1 WHEN 1 THEN 2 WHEN 2 THEN 0 END), domain')) }
enum severity: { silence: 0, suspend: 1, noop: 2 }
scope :by_severity, -> { in_order_of(:severity, %w(noop silence suspend)).order(:domain) }
end
class PreviewCard < ApplicationRecord