specter/mastodon
1
0
Fork 1
forked from fedi/mastodon
Code Pull requests Activity

Refactor StatusThreadingConcern (#9626)

Browse source 
* Remove #filter_from_context?

* Create scope Status.with_accounts

Retrieving AR objects should be
their model's scope
This commit is contained in:
ysksn 2020-01-11 19:55:33 +09:00 committed by Yamagishi Kazutoshi
parent c10ff359a2
commit 6f8f018e3e
2 changed files with 3 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
app/models/concerns/status_threading_concern.rb
View file

@ -81,12 +81,12 @@ module StatusThreadingConcern
end end
def find_statuses_from_tree_path(ids, account, promote: false) def find_statuses_from_tree_path(ids, account, promote: false)
statuses = statuses_with_accounts(ids).to_a statuses = Status.with_accounts(ids).to_a
account_ids = statuses.map(&:account_id).uniq account_ids = statuses.map(&:account_id).uniq
domains = statuses.map(&:account_domain).compact.uniq domains = statuses.map(&:account_domain).compact.uniq
relations = relations_map_for_account(account, account_ids, domains) relations = relations_map_for_account(account, account_ids, domains)
statuses.reject! { |status| filter_from_context?(status, account, relations) } statuses.reject! { |status| StatusFilter.new(status, account, relations).filtered? }
# Order ancestors/descendants by tree path # Order ancestors/descendants by tree path
statuses.sort_by! { |status| ids.index(status.id) } statuses.sort_by! { |status| ids.index(status.id) }
@ -125,12 +125,4 @@ module StatusThreadingConcern
domain_blocking_by_domain: Account.domain_blocking_map_by_domain(domains, account.id), domain_blocking_by_domain: Account.domain_blocking_map_by_domain(domains, account.id),
} }
end end
def statuses_with_accounts(ids)
Status.where(id: ids).includes(:account)
end
def filter_from_context?(status, account, relations)
StatusFilter.new(status, account, relations).filtered?
end
end end

1
app/models/status.rb
View file

@ -83,6 +83,7 @@ class Status < ApplicationRecord
scope :remote, -> { where(local: false).where.not(uri: nil) } scope :remote, -> { where(local: false).where.not(uri: nil) }
scope :local, -> { where(local: true).or(where(uri: nil)) } scope :local, -> { where(local: true).or(where(uri: nil)) }
scope :with_accounts, ->(ids) { where(id: ids).includes(:account) }
scope :without_replies, -> { where('statuses.reply = FALSE OR statuses.in_reply_to_account_id = statuses.account_id') } scope :without_replies, -> { where('statuses.reply = FALSE OR statuses.in_reply_to_account_id = statuses.account_id') }
scope :without_reblogs, -> { where('statuses.reblog_of_id IS NULL') } scope :without_reblogs, -> { where('statuses.reblog_of_id IS NULL') }
scope :with_public_visibility, -> { where(visibility: :public) } scope :with_public_visibility, -> { where(visibility: :public) }