summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatt Jankowski <matt@jankowski.online>2024-03-21 04:32:35 -0400
committerGitHub <noreply@github.com>2024-03-21 08:32:35 +0000
commitcdd168f5d3222fc63bdbc8da36236c1b027507a8 (patch)
treeea712afac235e8b924fda757a55f8f597afb7f87
parent01464074c91f9b7a720928fc4ee912be3d8002d2 (diff)
Update `enum` away from deprecated (#29678)
-rw-r--r--app/models/relationship_severance_event.rb2
-rw-r--r--app/models/severed_relationship.rb2
-rw-r--r--lib/mastodon/cli/maintenance.rb2
3 files changed, 3 insertions, 3 deletions
diff --git a/app/models/relationship_severance_event.rb b/app/models/relationship_severance_event.rb
index d9775150e83..30ada257671 100644
--- a/app/models/relationship_severance_event.rb
+++ b/app/models/relationship_severance_event.rb
@@ -16,7 +16,7 @@ class RelationshipSeveranceEvent < ApplicationRecord
has_many :severed_relationships, inverse_of: :relationship_severance_event, dependent: :delete_all
- enum type: {
+ enum :type, {
domain_block: 0,
user_domain_block: 1,
account_suspension: 2,
diff --git a/app/models/severed_relationship.rb b/app/models/severed_relationship.rb
index 00a913f7fc8..d71b2610fe3 100644
--- a/app/models/severed_relationship.rb
+++ b/app/models/severed_relationship.rb
@@ -20,7 +20,7 @@ class SeveredRelationship < ApplicationRecord
belongs_to :local_account, class_name: 'Account'
belongs_to :remote_account, class_name: 'Account'
- enum direction: {
+ enum :direction, {
passive: 0, # analogous to `local_account.passive_relationships`
active: 1, # analogous to `local_account.active_relationships`
}
diff --git a/lib/mastodon/cli/maintenance.rb b/lib/mastodon/cli/maintenance.rb
index e6a346ae263..f376bcee079 100644
--- a/lib/mastodon/cli/maintenance.rb
+++ b/lib/mastodon/cli/maintenance.rb
@@ -42,7 +42,7 @@ module Mastodon::CLI
class SeveredRelationship < ApplicationRecord; end
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) }
end