kosmos/mastodon
kosmos/mastodon
8
0
Fork 0
Code Pull Requests Activity

Remove unneeded reorder(nil) conditions (#32200)

Browse Source
This commit is contained in:
Matt Jankowski 2024-10-02 08:26:16 -04:00 committed by GitHub
parent 4aa26eba53
commit 1f65a95421
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/lib/vacuum/imports_vacuum.rb
View File

@ -9,10 +9,10 @@ class Vacuum::ImportsVacuum
private private
def clean_unconfirmed_imports! 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 end
def clean_old_imports! 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
end end

2
app/models/account_filter.rb
View File

@ -21,7 +21,7 @@ class AccountFilter
end end
def results 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| relevant_params.each do |key, value|
next if key.to_s == 'page' next if key.to_s == 'page'

2
app/models/admin/tag_filter.rb
View File

@ -14,7 +14,7 @@ class Admin::TagFilter
end end
def results def results
scope = Tag.reorder(nil) scope = Tag.all
params.each do |key, value| params.each do |key, value|
next if key == :page next if key == :page

4
app/services/purge_domain_service.rb
View File

@ -16,12 +16,12 @@ class PurgeDomainService < BaseService
end end
def purge_accounts! 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) DeleteAccountService.new.call(account, reserve_username: false, skip_side_effects: true)
end end
end end
def purge_emojis! def purge_emojis!
CustomEmoji.remote.where(domain: @domain).reorder(nil).find_each(&:destroy) CustomEmoji.remote.where(domain: @domain).find_each(&:destroy)
end end
end end

2
app/workers/filtered_notification_cleanup_worker.rb
View File

@ -4,6 +4,6 @@ class FilteredNotificationCleanupWorker
include Sidekiq::Worker include Sidekiq::Worker
def perform(account_id, from_account_id) 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
end end

2
app/workers/scheduler/user_cleanup_scheduler.rb
View File

@ -16,7 +16,7 @@ class Scheduler::UserCleanupScheduler
private private
def clean_unconfirmed_accounts! 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 # We have to do it separately because of missing database constraints
AccountModerationNote.where(target_account_id: batch.map(&:account_id)).delete_all AccountModerationNote.where(target_account_id: batch.map(&:account_id)).delete_all
Account.where(id: batch.map(&:account_id)).delete_all Account.where(id: batch.map(&:account_id)).delete_all