Merge remote-tracking branch 'parent/main' into upstream-20240524
This commit is contained in:
commit
c546939a40
213 changed files with 2260 additions and 986 deletions
|
@ -61,6 +61,7 @@ class Admin::ActionLogFilter
|
|||
unsuspend_account: { target_type: 'Account', action: 'unsuspend' }.freeze,
|
||||
update_announcement: { target_type: 'Announcement', action: 'update' }.freeze,
|
||||
update_custom_emoji: { target_type: 'CustomEmoji', action: 'update' }.freeze,
|
||||
update_report: { target_type: 'Report', action: 'update' }.freeze,
|
||||
update_status: { target_type: 'Status', action: 'update' }.freeze,
|
||||
force_cw_status: { target_type: 'Status', action: 'force_cw' }.freeze,
|
||||
force_sensitive_status: { target_type: 'Status', action: 'force_sensitive' }.freeze,
|
||||
|
|
|
@ -20,7 +20,6 @@ class CanonicalEmailBlock < ApplicationRecord
|
|||
validates :canonical_email_hash, presence: true, uniqueness: true
|
||||
|
||||
scope :matching_email, ->(email) { where(canonical_email_hash: email_to_canonical_email_hash(email)) }
|
||||
scope :matching_account, ->(account) { matching_email(account&.user_email).or(where(reference_account: account)) }
|
||||
|
||||
def to_log_human_identifier
|
||||
canonical_email_hash
|
||||
|
|
|
@ -4,7 +4,7 @@ module Expireable
|
|||
extend ActiveSupport::Concern
|
||||
|
||||
included do
|
||||
scope :expired, -> { where.not(expires_at: nil).where('expires_at < ?', Time.now.utc) }
|
||||
scope :expired, -> { where.not(expires_at: nil).where(expires_at: ...Time.now.utc) }
|
||||
|
||||
def expires_in
|
||||
return @expires_in if defined?(@expires_in)
|
||||
|
|
|
@ -24,7 +24,7 @@ class Invite < ApplicationRecord
|
|||
belongs_to :user, inverse_of: :invites
|
||||
has_many :users, inverse_of: :invite, dependent: nil
|
||||
|
||||
scope :available, -> { where(expires_at: nil).or(where('expires_at >= ?', Time.now.utc)) }
|
||||
scope :available, -> { where(expires_at: nil).or(where(expires_at: Time.now.utc..)) }
|
||||
|
||||
validates :comment, length: { maximum: COMMENT_SIZE_LIMIT }
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue