zelo72
/
mastodon
mirror of https://github.com/mastodon/mastodon
2
2
Fork 1
Code Issues 9 Releases Wiki Activity

Merge 44cb03d4f9 into 65093c619f

This commit is contained in:
Matt Jankowski 2024-04-26 18:07:04 +00:00 committed by GitHub
parent 65093c619f 44cb03d4f9
commit 2e52f2b395
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/models/account.rb
View File

@ -119,8 +119,10 @@ class Account < ApplicationRecord
scope :silenced, -> { where.not(silenced_at: nil) }
scope :suspended, -> { where.not(suspended_at: nil) }
scope :sensitized, -> { where.not(sensitized_at: nil) }
scope :migrated, -> { where.not(moved_to_account_id: nil) }
scope :without_suspended, -> { where(suspended_at: nil) }
scope :without_silenced, -> { where(silenced_at: nil) }
scope :without_migrated, -> { where(moved_to_account_id: nil) }
scope :without_instance_actor, -> { where.not(id: INSTANCE_ACTOR_ID) }
scope :recent, -> { reorder(id: :desc) }
scope :bots, -> { where(actor_type: %w(Application Service)) }
@ -131,7 +133,7 @@ class Account < ApplicationRecord
scope :matches_display_name, ->(value) { where(arel_table[:display_name].matches("#{value}%")) }
scope :without_unapproved, -> { left_outer_joins(:user).merge(User.approved.confirmed).or(remote) }
scope :auditable, -> { where(id: Admin::ActionLog.select(:account_id).distinct) }
scope :searchable, -> { without_unapproved.without_suspended.where(moved_to_account_id: nil) }
scope :searchable, -> { without_unapproved.without_suspended.without_migrated }
scope :discoverable, -> { searchable.without_silenced.where(discoverable: true).joins(:account_stat) }
scope :by_recent_status, -> { includes(:account_stat).merge(AccountStat.by_recent_status).references(:account_stat) }
scope :by_recent_activity, -> { left_joins(:user, :account_stat).order(coalesced_activity_timestamps.desc).order(id: :desc) }

4
app/models/relationship_filter.rb
View File

@ -92,9 +92,9 @@ class RelationshipFilter
def status_scope(value)
case value
when 'moved'
Account.where.not(moved_to_account_id: nil)
Account.migrated
when 'primary'
Account.where(moved_to_account_id: nil)
Account.without_migrated
else
raise Mastodon::InvalidParameterError, "Unknown status: #{value}"
end