mirrors/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2024-11-20 03:25:17 +01:00
Code Issues Projects Releases Wiki Activity

Update enum away from deprecated (#29678)

Browse Source
This commit is contained in:
Matt Jankowski 2024-03-21 04:32:35 -04:00 committed by GitHub
parent 01464074c9
commit cdd168f5d3
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/relationship_severance_event.rb
View File

@ -16,7 +16,7 @@ class RelationshipSeveranceEvent < ApplicationRecord
has_many :severed_relationships, inverse_of: :relationship_severance_event, dependent: :delete_all has_many :severed_relationships, inverse_of: :relationship_severance_event, dependent: :delete_all
enum type: { enum :type, {
domain_block: 0, domain_block: 0,
user_domain_block: 1, user_domain_block: 1,
account_suspension: 2, account_suspension: 2,

2
app/models/severed_relationship.rb
View File

@ -20,7 +20,7 @@ class SeveredRelationship < ApplicationRecord
belongs_to :local_account, class_name: 'Account' belongs_to :local_account, class_name: 'Account'
belongs_to :remote_account, class_name: 'Account' belongs_to :remote_account, class_name: 'Account'
enum direction: { enum :direction, {
passive: 0, # analogous to `local_account.passive_relationships` passive: 0, # analogous to `local_account.passive_relationships`
active: 1, # analogous to `local_account.active_relationships` active: 1, # analogous to `local_account.active_relationships`
} }

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

@ -42,7 +42,7 @@ module Mastodon::CLI
class SeveredRelationship < ApplicationRecord; end class SeveredRelationship < ApplicationRecord; end
class DomainBlock < ApplicationRecord class DomainBlock < ApplicationRecord
enum severity: { silence: 0, suspend: 1, noop: 2 } enum :severity, { silence: 0, suspend: 1, noop: 2 }
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) }
end end