about summary refs log tree commit diff
diff options
context:
space:
mode:
authorThibG <thib@sitedethib.com>2020-12-22 20:24:55 +0100
committerGitHub <noreply@github.com>2020-12-22 20:24:55 +0100
commitf18349640b686a3c3866711bfcd1d14edd5bc41a (patch)
tree3b35d8a77fa5bea2c8ea9fff57a9db7a28e9fa86
parent1cf2c3a810bba937c7702c342a3ff37c3d37391a (diff)
Fix batch order warnings in BatchedRemoveStatusService (#15409)
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
-rw-r--r--app/services/batched_remove_status_service.rb4
1 files changed, 2 insertions, 2 deletions
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