vbatts/mastodon
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix error when response contains reblogs of soft-deleted statuses in REST API

Browse source
This commit is contained in:
Eugen Rochko 2022-04-30 06:22:01 +02:00
parent f6d35ed57d
commit 25843710c3
2 changed files with 8 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

18
app/models/status.rb
View file

@ -336,22 +336,18 @@ class Status < ApplicationRecord
end end
def reload_stale_associations!(cached_items) def reload_stale_associations!(cached_items)
account_ids = [] account_ids = cached_items.each_with_object([]) do |item, arr|
arr << item.account_id
cached_items.each do |item| arr << item.reblog&.account_id if item.reblog?
account_ids << item.account_id end.compact.uniq
account_ids << item.reblog.account_id if item.reblog?
end
account_ids.uniq!
return if account_ids.empty? return if account_ids.empty?
accounts = Account.where(id: account_ids).includes(:account_stat, :user).index_by(&:id) accounts_map = Account.where(id: account_ids).includes(:account_stat, :user).index_by(&:id)
cached_items.each do |item| cached_items.each do |item|
item.account = accounts[item.account_id] item.account = accounts_map[item.account_id]
item.reblog.account = accounts[item.reblog.account_id] if item.reblog? item.reblog.account = accounts_map[item.reblog.account_id] if item.reblog? && item.reblog
end end
end end

2
app/presenters/status_relationships_presenter.rb
View file

@ -15,7 +15,7 @@ class StatusRelationshipsPresenter
statuses = statuses.compact statuses = statuses.compact
status_ids = statuses.flat_map { |s| [s.id, s.reblog_of_id] }.uniq.compact status_ids = statuses.flat_map { |s| [s.id, s.reblog_of_id] }.uniq.compact
conversation_ids = statuses.filter_map(&:conversation_id).uniq conversation_ids = statuses.filter_map(&:conversation_id).uniq
pinnable_status_ids = statuses.map(&:proper).filter_map { |s| s.id if s.account_id == current_account_id && %w(public unlisted private).include?(s.visibility) } pinnable_status_ids = statuses.filter_map(&:proper).filter_map { |s| s.id if s.account_id == current_account_id && %w(public unlisted private).include?(s.visibility) }
@reblogs_map = Status.reblogs_map(status_ids, current_account_id).merge(options[:reblogs_map] || {}) @reblogs_map = Status.reblogs_map(status_ids, current_account_id).merge(options[:reblogs_map] || {})
@favourites_map = Status.favourites_map(status_ids, current_account_id).merge(options[:favourites_map] || {}) @favourites_map = Status.favourites_map(status_ids, current_account_id).merge(options[:favourites_map] || {})