Merge remote-tracking branch 'parent/main' into upstream-20240225

lib/mastodon/cli/media.rb

@@ -289,6 +289,16 @@ module Mastodon::CLI
       fail_with_message 'Invalid URL'
     end
 
+    PRELOADED_MODELS = %w(
+      Account
+      Backup
+      CustomEmoji
+      Import
+      MediaAttachment
+      PreviewCard
+      SiteUpload
+    ).freeze
+
     private
 
     def object_storage_summary
@@ -310,16 +320,6 @@ module Mastodon::CLI
       SQL
     end
 
-    PRELOADED_MODELS = %w(
-      Account
-      Backup
-      CustomEmoji
-      Import
-      MediaAttachment
-      PreviewCard
-      SiteUpload
-    ).freeze
-
     def preload_records_from_mixed_objects(objects)
       preload_map = Hash.new { |hash, key| hash[key] = [] }