Silence more scope order warnings (#1604)

diff --git a/app/services/after_block_service.rb b/app/services/after_block_service.rb
index 0f478bcb7dd8c3c867e50e21fa86f15cedfcbfc5..d1a846f21c79fdc83724455a9c2f3b3f546d851b 100644 (file)
--- a/app/services/after_block_service.rb
+++ b/app/services/after_block_service.rb
@@ -12,7 +12,7 @@ class AfterBlockService < BaseService
     home_key = FeedManager.instance.key(:home, account.id)
 
     redis.pipelined do
-      target_account.statuses.select('id').find_each do |status|
+      target_account.statuses.select('id').reorder(nil).find_each do |status|
         redis.zrem(home_key, status.id)
       end
     end

diff --git a/app/services/fan_out_on_write_service.rb b/app/services/fan_out_on_write_service.rb
index 19eedc0a75d2e85d9f2fa8ea89e8ad0449c17dd7..055fda8a9b001154df562f2f2484d1d73aff9ba6 100644 (file)
--- a/app/services/fan_out_on_write_service.rb
+++ b/app/services/fan_out_on_write_service.rb
@@ -34,7 +34,7 @@ class FanOutOnWriteService < BaseService
   def deliver_to_followers(status)
     Rails.logger.debug "Delivering status #{status.id} to followers"
 
-    status.account.followers.where(domain: nil).joins(:user).where('users.current_sign_in_at > ?', 14.days.ago).select(:id).find_each do |follower|
+    status.account.followers.where(domain: nil).joins(:user).where('users.current_sign_in_at > ?', 14.days.ago).select(:id).reorder(nil).find_each do |follower|
       FeedInsertWorker.perform_async(status.id, follower.id)
     end
   end

diff --git a/app/services/mute_service.rb b/app/services/mute_service.rb
index 0050cfc8d02e145761ca66675dc7f4cd5b217788..1a650ed2a0c3a3a00e25db0b43443f38356c8d82 100644 (file)
--- a/app/services/mute_service.rb
+++ b/app/services/mute_service.rb
@@ -12,7 +12,7 @@ class MuteService < BaseService
   def clear_home_timeline(account, target_account)
     home_key = FeedManager.instance.key(:home, account.id)
 
-    target_account.statuses.select('id').find_each do |status|
+    target_account.statuses.select('id').reorder(nil).find_each do |status|
       redis.zrem(home_key, status.id)
     end
   end

diff --git a/app/services/suspend_account_service.rb b/app/services/suspend_account_service.rb
index 8528ef62afac0875482f16775a5e2f5b08df2893..42ff4dcb78c2039488003a47b477d6c24a7b37c2 100644 (file)
--- a/app/services/suspend_account_service.rb
+++ b/app/services/suspend_account_service.rb
@@ -12,7 +12,7 @@ class SuspendAccountService < BaseService
   private
 
   def purge_content
-    @account.statuses.find_each do |status|
+    @account.statuses.reorder(nil).find_each do |status|
       RemoveStatusService.new.call(status)
     end