]> cat aescling's git repositories - mastodon.git/commitdiff
Fix batch order warnings in BatchedRemoveStatusService (#15409)
authorThibG <thib@sitedethib.com>
Tue, 22 Dec 2020 19:24:55 +0000 (20:24 +0100)
committerGitHub <noreply@github.com>
Tue, 22 Dec 2020 19:24:55 +0000 (20:24 +0100)
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
app/services/batched_remove_status_service.rb

index 63ab89f2d27490b8c641a76f5371ac5cbfb44309..3ec00011040efc6097db33d747be8dc6fe01b8d6 100644 (file)
@@ -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