mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-11-22 14:53:15 +00:00
Refactor Status#ancestors/descendants (#3092)
This commit is contained in:
parent
b397f69633
commit
59ceeae8ea
|
@ -122,21 +122,13 @@ class Status < ApplicationRecord
|
||||||
end
|
end
|
||||||
|
|
||||||
def ancestors(account = nil)
|
def ancestors(account = nil)
|
||||||
ids = Rails.cache.fetch("ancestors:#{id}") { (Status.find_by_sql(['WITH RECURSIVE search_tree(id, in_reply_to_id, path) AS (SELECT id, in_reply_to_id, ARRAY[id] FROM statuses WHERE id = ? UNION ALL SELECT statuses.id, statuses.in_reply_to_id, path || statuses.id FROM search_tree JOIN statuses ON statuses.id = search_tree.in_reply_to_id WHERE NOT statuses.id = ANY(path)) SELECT id FROM search_tree ORDER BY path DESC', id]) - [self]).pluck(:id) }
|
ids = Rails.cache.fetch("ancestors:#{id}") { (Status.find_by_sql(['WITH RECURSIVE search_tree(id, in_reply_to_id, path) AS (SELECT id, in_reply_to_id, ARRAY[id] FROM statuses WHERE id = ? UNION ALL SELECT statuses.id, statuses.in_reply_to_id, path || statuses.id FROM search_tree JOIN statuses ON statuses.id = search_tree.in_reply_to_id WHERE NOT statuses.id = ANY(path)) SELECT id FROM search_tree ORDER BY path DESC', id]) - [self]).pluck(:id) }
|
||||||
statuses = Status.where(id: ids).group_by(&:id)
|
find_statuses_from_tree_path(ids, account)
|
||||||
results = ids.map { |id| statuses[id]&.first }.compact
|
|
||||||
results = results.reject { |status| filter_from_context?(status, account) }
|
|
||||||
|
|
||||||
results
|
|
||||||
end
|
end
|
||||||
|
|
||||||
def descendants(account = nil)
|
def descendants(account = nil)
|
||||||
ids = (Status.find_by_sql(['WITH RECURSIVE search_tree(id, path) AS (SELECT id, ARRAY[id] FROM statuses WHERE id = ? UNION ALL SELECT statuses.id, path || statuses.id FROM search_tree JOIN statuses ON statuses.in_reply_to_id = search_tree.id WHERE NOT statuses.id = ANY(path)) SELECT id FROM search_tree ORDER BY path', id]) - [self]).pluck(:id)
|
ids = (Status.find_by_sql(['WITH RECURSIVE search_tree(id, path) AS (SELECT id, ARRAY[id] FROM statuses WHERE id = ? UNION ALL SELECT statuses.id, path || statuses.id FROM search_tree JOIN statuses ON statuses.in_reply_to_id = search_tree.id WHERE NOT statuses.id = ANY(path)) SELECT id FROM search_tree ORDER BY path', id]) - [self]).pluck(:id)
|
||||||
statuses = Status.where(id: ids).group_by(&:id)
|
find_statuses_from_tree_path(ids, account)
|
||||||
results = ids.map { |id| statuses[id].first }
|
|
||||||
results = results.reject { |status| filter_from_context?(status, account) }
|
|
||||||
|
|
||||||
results
|
|
||||||
end
|
end
|
||||||
|
|
||||||
def non_sensitive_with_media?
|
def non_sensitive_with_media?
|
||||||
|
@ -291,6 +283,14 @@ class Status < ApplicationRecord
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def find_statuses_from_tree_path(ids, account)
|
||||||
|
statuses = Status.where(id: ids).to_a
|
||||||
|
statuses.reject! { |status| filter_from_context?(status, account) }
|
||||||
|
|
||||||
|
# Order ancestors/descendants by tree path
|
||||||
|
statuses.sort_by! { |status| ids.index(status.id) }
|
||||||
|
end
|
||||||
|
|
||||||
def filter_from_context?(status, account)
|
def filter_from_context?(status, account)
|
||||||
account&.blocking?(status.account_id) || account&.muting?(status.account_id) || (status.account.silenced? && !account&.following?(status.account_id)) || !status.permitted?(account)
|
account&.blocking?(status.account_id) || account&.muting?(status.account_id) || (status.account.silenced? && !account&.following?(status.account_id)) || !status.permitted?(account)
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in a new issue