nightpool
/
mastodon
forked from cybrespace/mastodon
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix batch order warnings in BatchedRemoveStatusService (#15409) 

Co-authored-by: Claire <claire.github-309c@sitedethib.com>
This commit is contained in:
ThibG 2020-12-22 20:24:55 +01:00 committed by GitHub
parent 1cf2c3a810
commit f18349640b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/services/batched_remove_status_service.rb
View File

@ -61,7 +61,7 @@ class BatchedRemoveStatusService < BaseService
private private
def unpush_from_home_timelines(account, statuses) def unpush_from_home_timelines(account, statuses)
account.followers_for_local_distribution.includes(:user).find_each do |follower| account.followers_for_local_distribution.includes(:user).reorder(nil).find_each do |follower|
statuses.each do |status| statuses.each do |status|
FeedManager.instance.unpush_from_home(follower, status) FeedManager.instance.unpush_from_home(follower, status)
end end
@ -75,7 +75,7 @@ class BatchedRemoveStatusService < BaseService
end end
def unpush_from_list_timelines(account, statuses) def unpush_from_list_timelines(account, statuses)
account.lists_for_local_distribution.select(:id, :account_id).includes(account: :user).find_each do |list| account.lists_for_local_distribution.select(:id, :account_id).includes(account: :user).reorder(nil).find_each do |list|
statuses.each do |status| statuses.each do |status|
FeedManager.instance.unpush_from_list(list, status) FeedManager.instance.unpush_from_list(list, status)
end end