From: ThibG <thib@sitedethib.com>
Date: Tue, 22 Dec 2020 19:24:55 +0000 (+0100)
Subject: Fix batch order warnings in BatchedRemoveStatusService (#15409)
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=f18349640b686a3c3866711bfcd1d14edd5bc41a;p=mastodon.git

Fix batch order warnings in BatchedRemoveStatusService (#15409)

Co-authored-by: Claire <claire.github-309c@sitedethib.com>
---

diff --git a/app/services/batched_remove_status_service.rb b/app/services/batched_remove_status_service.rb
index 63ab89f2d..3ec000110 100644
--- a/app/services/batched_remove_status_service.rb
+++ b/app/services/batched_remove_status_service.rb
@@ -61,7 +61,7 @@ class BatchedRemoveStatusService < BaseService
   private
 
   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|
         FeedManager.instance.unpush_from_home(follower, status)
       end
@@ -75,7 +75,7 @@ class BatchedRemoveStatusService < BaseService
   end
 
   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|
         FeedManager.instance.unpush_from_list(list, status)
       end