luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-11-19 05:13:01 +00:00
Code Issues Projects Releases Wiki Activity

Fix nil error in StatusFilter (#7470)

Browse source 
Fix #7462
This commit is contained in:
Eugen Rochko 2018-05-13 20:26:30 +02:00 committed by GitHub
parent f1ed855f96
commit f31e58af9e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -74,8 +74,17 @@ module StatusThreadingConcern
statuses = statuses_with_accounts(ids).to_a statuses = statuses_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)
statuses.reject! { |status| filter_from_context?(status, account, relations) }
# Order ancestors/descendants by tree path
statuses.sort_by! { |status| ids.index(status.id) }
end
def relations_map_for_account(account, account_ids, domains)
return {} if account.nil?
relations = if account.present?
{ {
blocking: Account.blocking_map(account_ids, account.id), blocking: Account.blocking_map(account_ids, account.id),
blocked_by: Account.blocked_by_map(account_ids, account.id), blocked_by: Account.blocked_by_map(account_ids, account.id),
@ -85,12 +94,6 @@ module StatusThreadingConcern
} }
end end
statuses.reject! { |status| filter_from_context?(status, account, relations) }
# Order ancestors/descendants by tree path
statuses.sort_by! { |status| ids.index(status.id) }
end
def statuses_with_accounts(ids) def statuses_with_accounts(ids)
Status.where(id: ids).includes(:account) Status.where(id: ids).includes(:account)
end end