Update enum syntax to use the new Rails 7.0 style (#29217)
This commit is contained in:
parent
1d9d14b8de
commit
cfadb87077
15 changed files with 20 additions and 20 deletions
|
@ -85,8 +85,8 @@ class Account < ApplicationRecord
|
||||||
include DomainNormalizable
|
include DomainNormalizable
|
||||||
include Paginable
|
include Paginable
|
||||||
|
|
||||||
enum protocol: { ostatus: 0, activitypub: 1 }
|
enum :protocol, { ostatus: 0, activitypub: 1 }
|
||||||
enum suspension_origin: { local: 0, remote: 1 }, _prefix: true
|
enum :suspension_origin, { local: 0, remote: 1 }, prefix: true
|
||||||
|
|
||||||
validates :username, presence: true
|
validates :username, presence: true
|
||||||
validates_with UniqueUsernameValidator, if: -> { will_save_change_to_username? }
|
validates_with UniqueUsernameValidator, if: -> { will_save_change_to_username? }
|
||||||
|
|
|
@ -17,7 +17,7 @@
|
||||||
#
|
#
|
||||||
|
|
||||||
class AccountWarning < ApplicationRecord
|
class AccountWarning < ApplicationRecord
|
||||||
enum action: {
|
enum :action, {
|
||||||
none: 0,
|
none: 0,
|
||||||
disable: 1_000,
|
disable: 1_000,
|
||||||
mark_statuses_as_sensitive: 1_250,
|
mark_statuses_as_sensitive: 1_250,
|
||||||
|
@ -25,7 +25,7 @@ class AccountWarning < ApplicationRecord
|
||||||
sensitive: 2_000,
|
sensitive: 2_000,
|
||||||
silence: 3_000,
|
silence: 3_000,
|
||||||
suspend: 4_000,
|
suspend: 4_000,
|
||||||
}, _suffix: :action
|
}, suffix: :action
|
||||||
|
|
||||||
normalizes :text, with: ->(text) { text.to_s }, apply_to_nil: true
|
normalizes :text, with: ->(text) { text.to_s }, apply_to_nil: true
|
||||||
|
|
||||||
|
|
|
@ -24,7 +24,7 @@ class BulkImport < ApplicationRecord
|
||||||
belongs_to :account
|
belongs_to :account
|
||||||
has_many :rows, class_name: 'BulkImportRow', inverse_of: :bulk_import, dependent: :delete_all
|
has_many :rows, class_name: 'BulkImportRow', inverse_of: :bulk_import, dependent: :delete_all
|
||||||
|
|
||||||
enum type: {
|
enum :type, {
|
||||||
following: 0,
|
following: 0,
|
||||||
blocking: 1,
|
blocking: 1,
|
||||||
muting: 2,
|
muting: 2,
|
||||||
|
@ -33,7 +33,7 @@ class BulkImport < ApplicationRecord
|
||||||
lists: 5,
|
lists: 5,
|
||||||
}
|
}
|
||||||
|
|
||||||
enum state: {
|
enum :state, {
|
||||||
unconfirmed: 0,
|
unconfirmed: 0,
|
||||||
scheduled: 1,
|
scheduled: 1,
|
||||||
in_progress: 2,
|
in_progress: 2,
|
||||||
|
|
|
@ -31,7 +31,7 @@ class CustomFilter < ApplicationRecord
|
||||||
include Expireable
|
include Expireable
|
||||||
include Redisable
|
include Redisable
|
||||||
|
|
||||||
enum action: { warn: 0, hide: 1 }, _suffix: :action
|
enum :action, { warn: 0, hide: 1 }, suffix: :action
|
||||||
|
|
||||||
belongs_to :account
|
belongs_to :account
|
||||||
has_many :keywords, class_name: 'CustomFilterKeyword', inverse_of: :custom_filter, dependent: :destroy
|
has_many :keywords, class_name: 'CustomFilterKeyword', inverse_of: :custom_filter, dependent: :destroy
|
||||||
|
|
|
@ -21,7 +21,7 @@ class DomainBlock < ApplicationRecord
|
||||||
include DomainNormalizable
|
include DomainNormalizable
|
||||||
include DomainMaterializable
|
include DomainMaterializable
|
||||||
|
|
||||||
enum severity: { silence: 0, suspend: 1, noop: 2 }
|
enum :severity, { silence: 0, suspend: 1, noop: 2 }
|
||||||
|
|
||||||
validates :domain, presence: true, uniqueness: true, domain: true
|
validates :domain, presence: true, uniqueness: true, domain: true
|
||||||
|
|
||||||
|
|
|
@ -28,7 +28,7 @@ class Import < ApplicationRecord
|
||||||
|
|
||||||
belongs_to :account
|
belongs_to :account
|
||||||
|
|
||||||
enum type: { following: 0, blocking: 1, muting: 2, domain_blocking: 3, bookmarks: 4 }
|
enum :type, { following: 0, blocking: 1, muting: 2, domain_blocking: 3, bookmarks: 4 }
|
||||||
|
|
||||||
validates :type, presence: true
|
validates :type, presence: true
|
||||||
|
|
||||||
|
|
|
@ -19,7 +19,7 @@ class IpBlock < ApplicationRecord
|
||||||
include Expireable
|
include Expireable
|
||||||
include Paginable
|
include Paginable
|
||||||
|
|
||||||
enum severity: {
|
enum :severity, {
|
||||||
sign_up_requires_approval: 5000,
|
sign_up_requires_approval: 5000,
|
||||||
sign_up_block: 5500,
|
sign_up_block: 5500,
|
||||||
no_access: 9999,
|
no_access: 9999,
|
||||||
|
|
|
@ -18,7 +18,7 @@ class List < ApplicationRecord
|
||||||
|
|
||||||
PER_ACCOUNT_LIMIT = 50
|
PER_ACCOUNT_LIMIT = 50
|
||||||
|
|
||||||
enum replies_policy: { list: 0, followed: 1, none: 2 }, _prefix: :show
|
enum :replies_policy, { list: 0, followed: 1, none: 2 }, prefix: :show
|
||||||
|
|
||||||
belongs_to :account, optional: true
|
belongs_to :account, optional: true
|
||||||
|
|
||||||
|
|
|
@ -16,7 +16,7 @@
|
||||||
#
|
#
|
||||||
|
|
||||||
class LoginActivity < ApplicationRecord
|
class LoginActivity < ApplicationRecord
|
||||||
enum authentication_method: { password: 'password', otp: 'otp', webauthn: 'webauthn', sign_in_token: 'sign_in_token', omniauth: 'omniauth' }
|
enum :authentication_method, { password: 'password', otp: 'otp', webauthn: 'webauthn', sign_in_token: 'sign_in_token', omniauth: 'omniauth' }
|
||||||
|
|
||||||
belongs_to :user
|
belongs_to :user
|
||||||
|
|
||||||
|
|
|
@ -34,8 +34,8 @@ class MediaAttachment < ApplicationRecord
|
||||||
|
|
||||||
include Attachmentable
|
include Attachmentable
|
||||||
|
|
||||||
enum type: { image: 0, gifv: 1, video: 2, unknown: 3, audio: 4 }
|
enum :type, { image: 0, gifv: 1, video: 2, unknown: 3, audio: 4 }
|
||||||
enum processing: { queued: 0, in_progress: 1, complete: 2, failed: 3 }, _prefix: true
|
enum :processing, { queued: 0, in_progress: 1, complete: 2, failed: 3 }, prefix: true
|
||||||
|
|
||||||
MAX_DESCRIPTION_LENGTH = 1_500
|
MAX_DESCRIPTION_LENGTH = 1_500
|
||||||
|
|
||||||
|
|
|
@ -47,8 +47,8 @@ class PreviewCard < ApplicationRecord
|
||||||
|
|
||||||
self.inheritance_column = false
|
self.inheritance_column = false
|
||||||
|
|
||||||
enum type: { link: 0, photo: 1, video: 2, rich: 3 }
|
enum :type, { link: 0, photo: 1, video: 2, rich: 3 }
|
||||||
enum link_type: { unknown: 0, article: 1 }
|
enum :link_type, { unknown: 0, article: 1 }
|
||||||
|
|
||||||
has_many :preview_cards_statuses, dependent: :delete_all, inverse_of: :preview_card
|
has_many :preview_cards_statuses, dependent: :delete_all, inverse_of: :preview_card
|
||||||
has_many :statuses, through: :preview_cards_statuses
|
has_many :statuses, through: :preview_cards_statuses
|
||||||
|
|
|
@ -15,7 +15,7 @@
|
||||||
class Relay < ApplicationRecord
|
class Relay < ApplicationRecord
|
||||||
validates :inbox_url, presence: true, uniqueness: true, url: true, if: :will_save_change_to_inbox_url?
|
validates :inbox_url, presence: true, uniqueness: true, url: true, if: :will_save_change_to_inbox_url?
|
||||||
|
|
||||||
enum state: { idle: 0, pending: 1, accepted: 2, rejected: 3 }
|
enum :state, { idle: 0, pending: 1, accepted: 2, rejected: 3 }
|
||||||
|
|
||||||
scope :enabled, -> { accepted }
|
scope :enabled, -> { accepted }
|
||||||
|
|
||||||
|
|
|
@ -55,7 +55,7 @@ class Report < ApplicationRecord
|
||||||
# - app/javascript/mastodon/features/notifications/components/report.jsx
|
# - app/javascript/mastodon/features/notifications/components/report.jsx
|
||||||
# - app/javascript/mastodon/features/report/category.jsx
|
# - app/javascript/mastodon/features/report/category.jsx
|
||||||
# - app/javascript/mastodon/components/admin/ReportReasonSelector.jsx
|
# - app/javascript/mastodon/components/admin/ReportReasonSelector.jsx
|
||||||
enum category: {
|
enum :category, {
|
||||||
other: 0,
|
other: 0,
|
||||||
spam: 1_000,
|
spam: 1_000,
|
||||||
legal: 1_500,
|
legal: 1_500,
|
||||||
|
|
|
@ -16,7 +16,7 @@
|
||||||
class SoftwareUpdate < ApplicationRecord
|
class SoftwareUpdate < ApplicationRecord
|
||||||
self.inheritance_column = nil
|
self.inheritance_column = nil
|
||||||
|
|
||||||
enum type: { patch: 0, minor: 1, major: 2 }, _suffix: :type
|
enum :type, { patch: 0, minor: 1, major: 2 }, suffix: :type
|
||||||
|
|
||||||
def gem_version
|
def gem_version
|
||||||
Gem::Version.new(version)
|
Gem::Version.new(version)
|
||||||
|
|
|
@ -50,7 +50,7 @@ class Status < ApplicationRecord
|
||||||
update_index('statuses', :proper)
|
update_index('statuses', :proper)
|
||||||
update_index('public_statuses', :proper)
|
update_index('public_statuses', :proper)
|
||||||
|
|
||||||
enum visibility: { public: 0, unlisted: 1, private: 2, direct: 3, limited: 4 }, _suffix: :visibility
|
enum :visibility, { public: 0, unlisted: 1, private: 2, direct: 3, limited: 4 }, suffix: :visibility
|
||||||
|
|
||||||
belongs_to :application, class_name: 'Doorkeeper::Application', optional: true
|
belongs_to :application, class_name: 'Doorkeeper::Application', optional: true
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue