From 1f65a95421a4dcbe44e25bd9e36329830a396eef Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Wed, 2 Oct 2024 08:26:16 -0400
Subject: [PATCH] Remove unneeded `reorder(nil)` conditions (#32200)

---
 app/lib/vacuum/imports_vacuum.rb                    | 4 ++--
 app/models/account_filter.rb                        | 2 +-
 app/models/admin/tag_filter.rb                      | 2 +-
 app/services/purge_domain_service.rb                | 4 ++--
 app/workers/filtered_notification_cleanup_worker.rb | 2 +-
 app/workers/scheduler/user_cleanup_scheduler.rb     | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/lib/vacuum/imports_vacuum.rb b/app/lib/vacuum/imports_vacuum.rb
index 700bd81847..b67865194f 100644
--- a/app/lib/vacuum/imports_vacuum.rb
+++ b/app/lib/vacuum/imports_vacuum.rb
@@ -9,10 +9,10 @@ class Vacuum::ImportsVacuum
   private
 
   def clean_unconfirmed_imports!
-    BulkImport.state_unconfirmed.where(created_at: ..10.minutes.ago).reorder(nil).in_batches.delete_all
+    BulkImport.state_unconfirmed.where(created_at: ..10.minutes.ago).in_batches.delete_all
   end
 
   def clean_old_imports!
-    BulkImport.where(created_at: ..1.week.ago).reorder(nil).in_batches.delete_all
+    BulkImport.where(created_at: ..1.week.ago).in_batches.delete_all
   end
 end
diff --git a/app/models/account_filter.rb b/app/models/account_filter.rb
index 42b1c49538..e2f359a8c3 100644
--- a/app/models/account_filter.rb
+++ b/app/models/account_filter.rb
@@ -21,7 +21,7 @@ class AccountFilter
   end
 
   def results
-    scope = Account.includes(:account_stat, user: [:ips, :invite_request]).without_instance_actor.reorder(nil)
+    scope = Account.includes(:account_stat, user: [:ips, :invite_request]).without_instance_actor
 
     relevant_params.each do |key, value|
       next if key.to_s == 'page'
diff --git a/app/models/admin/tag_filter.rb b/app/models/admin/tag_filter.rb
index 6149c52175..5e75757b23 100644
--- a/app/models/admin/tag_filter.rb
+++ b/app/models/admin/tag_filter.rb
@@ -14,7 +14,7 @@ class Admin::TagFilter
   end
 
   def results
-    scope = Tag.reorder(nil)
+    scope = Tag.all
 
     params.each do |key, value|
       next if key == :page
diff --git a/app/services/purge_domain_service.rb b/app/services/purge_domain_service.rb
index ca0f0d441f..feab8aa1dd 100644
--- a/app/services/purge_domain_service.rb
+++ b/app/services/purge_domain_service.rb
@@ -16,12 +16,12 @@ class PurgeDomainService < BaseService
   end
 
   def purge_accounts!
-    Account.remote.where(domain: @domain).reorder(nil).find_each do |account|
+    Account.remote.where(domain: @domain).find_each do |account|
       DeleteAccountService.new.call(account, reserve_username: false, skip_side_effects: true)
     end
   end
 
   def purge_emojis!
-    CustomEmoji.remote.where(domain: @domain).reorder(nil).find_each(&:destroy)
+    CustomEmoji.remote.where(domain: @domain).find_each(&:destroy)
   end
 end
diff --git a/app/workers/filtered_notification_cleanup_worker.rb b/app/workers/filtered_notification_cleanup_worker.rb
index 2b955da3c0..87ff6a9eb5 100644
--- a/app/workers/filtered_notification_cleanup_worker.rb
+++ b/app/workers/filtered_notification_cleanup_worker.rb
@@ -4,6 +4,6 @@ class FilteredNotificationCleanupWorker
   include Sidekiq::Worker
 
   def perform(account_id, from_account_id)
-    Notification.where(account_id: account_id, from_account_id: from_account_id, filtered: true).reorder(nil).in_batches(order: :desc).delete_all
+    Notification.where(account_id: account_id, from_account_id: from_account_id, filtered: true).in_batches(order: :desc).delete_all
   end
 end
diff --git a/app/workers/scheduler/user_cleanup_scheduler.rb b/app/workers/scheduler/user_cleanup_scheduler.rb
index 9f58d9225b..f755128332 100644
--- a/app/workers/scheduler/user_cleanup_scheduler.rb
+++ b/app/workers/scheduler/user_cleanup_scheduler.rb
@@ -16,7 +16,7 @@ class Scheduler::UserCleanupScheduler
   private
 
   def clean_unconfirmed_accounts!
-    User.unconfirmed.where(confirmation_sent_at: ..UNCONFIRMED_ACCOUNTS_MAX_AGE_DAYS.days.ago).reorder(nil).find_in_batches do |batch|
+    User.unconfirmed.where(confirmation_sent_at: ..UNCONFIRMED_ACCOUNTS_MAX_AGE_DAYS.days.ago).find_in_batches do |batch|
       # We have to do it separately because of missing database constraints
       AccountModerationNote.where(target_account_id: batch.map(&:account_id)).delete_all
       Account.where(id: batch.map(&:account_id)).delete_all