From f8a092c21c58f45bb152db14b8eed88d6e96149d Mon Sep 17 00:00:00 2001 From: Brandon Thomas Date: Tue, 27 Aug 2024 18:46:54 -0400 Subject: [PATCH] codegen db, fix build errors --- ...819a839885245c60f8ce2c13a73155917942.json} | 37 +++++++---- ...1babd78df3df361b3be566993b78a46efef2.json} | 66 ++++++++++++------- ...3c2fc8b587c0480354a42f11409d9671afbe.json} | 37 +++++++---- ...8cc708b05c5c59ba1c322dcfb775e4b9e7a6.json} | 66 ++++++++++++------- .../delete_all_anonymous_user_images.rs | 1 + .../delete_user_files/delete_user_files.rs | 1 + ...create_dimensional_media_file_documents.rs | 3 + 7 files changed, 141 insertions(+), 70 deletions(-) rename .sqlx/{query-481493c8b377197b5f596d7ee842ab4b580da384a2fa8ed330082515b7990d58.json => query-295ac99103e49c817d545d5a7b8a819a839885245c60f8ce2c13a73155917942.json} (88%) rename .sqlx/{query-bfd3551e4e7b2b67bf4996d3a958e6b546fe42c54091bd2d849b5c08c26d98e6.json => query-57fa22e6cd4e82b801605c96eac21babd78df3df361b3be566993b78a46efef2.json} (82%) rename .sqlx/{query-0049a4b3dd3770564c3a466ade7479f0a11508bd4a48b2344b28ff0a20e0b9ca.json => query-d2d05678aa1c4c3b2d95bbb2ed563c2fc8b587c0480354a42f11409d9671afbe.json} (89%) rename .sqlx/{query-e63bdc49ac2203f723d73f2ede7c0f74705da8e69de3c048120bcfd28ae83ba6.json => query-f6c37066ab3e508050e81cf3bea38cc708b05c5c59ba1c322dcfb775e4b9e7a6.json} (82%) diff --git a/.sqlx/query-481493c8b377197b5f596d7ee842ab4b580da384a2fa8ed330082515b7990d58.json b/.sqlx/query-295ac99103e49c817d545d5a7b8a819a839885245c60f8ce2c13a73155917942.json similarity index 88% rename from .sqlx/query-481493c8b377197b5f596d7ee842ab4b580da384a2fa8ed330082515b7990d58.json rename to .sqlx/query-295ac99103e49c817d545d5a7b8a819a839885245c60f8ce2c13a73155917942.json index 088219678d..fc20fc974f 100644 --- a/.sqlx/query-481493c8b377197b5f596d7ee842ab4b580da384a2fa8ed330082515b7990d58.json +++ b/.sqlx/query-295ac99103e49c817d545d5a7b8a819a839885245c60f8ce2c13a73155917942.json @@ -1,6 +1,6 @@ { "db_name": "MySQL", - "query": "\nSELECT\n tts.token as model_token,\n tts.tts_model_type as `tts_model_type: enums::by_table::tts_models::tts_model_type::TtsModelType`,\n tts.text_pipeline_type,\n tts.text_preprocessing_algorithm,\n tts.maybe_default_pretrained_vocoder,\n\n tts.use_default_mel_multiply_factor,\n tts.maybe_custom_mel_multiply_factor,\n\n tts.creator_user_token,\n users.username as creator_username,\n users.display_name as creator_display_name,\n users.email_gravatar_hash as creator_gravatar_hash,\n users.is_banned as creator_is_banned,\n\n tts.title,\n tts.description_markdown,\n tts.description_rendered_html,\n\n tts.ietf_language_tag,\n tts.ietf_primary_language_subtag,\n\n tts.is_front_page_featured,\n tts.is_twitch_featured,\n\n tts.maybe_suggested_unique_bot_command,\n\n tts.user_ratings_positive_count,\n tts.user_ratings_negative_count,\n tts.user_ratings_total_count,\n\n tts.creator_set_visibility,\n\n tts.is_locked_from_use,\n tts.is_locked_from_user_modification,\n\n tts.maybe_custom_vocoder_token,\n vocoder.title as maybe_custom_vocoder_title,\n vocoder_user.token as maybe_custom_vocoder_creator_user_token,\n vocoder_user.username as maybe_custom_vocoder_creator_username,\n vocoder_user.display_name as maybe_custom_vocoder_creator_display_name,\n vocoder_user.email_gravatar_hash as maybe_custom_vocoder_creator_gravatar_hash,\n\n tts.created_at,\n tts.updated_at,\n\n tts.creator_ip_address_creation,\n tts.creator_ip_address_last_update,\n tts.mod_deleted_at,\n tts.user_deleted_at\n\nFROM tts_models as tts\nJOIN users\n ON users.token = tts.creator_user_token\n\nLEFT OUTER JOIN vocoder_models AS vocoder\n ON vocoder.token = tts.maybe_custom_vocoder_token\nLEFT OUTER JOIN users AS vocoder_user\n ON vocoder_user.token = vocoder.creator_user_token\n\nWHERE tts.token = ?\n ", + "query": "\nSELECT\n tts.token as model_token,\n tts.tts_model_type as `tts_model_type: enums::by_table::tts_models::tts_model_type::TtsModelType`,\n tts.text_pipeline_type,\n tts.text_preprocessing_algorithm,\n tts.maybe_default_pretrained_vocoder,\n\n tts.use_default_mel_multiply_factor,\n tts.maybe_custom_mel_multiply_factor,\n\n tts.creator_user_token,\n users.username as creator_username,\n users.display_name as creator_display_name,\n users.email_gravatar_hash as creator_gravatar_hash,\n users.is_banned as creator_is_banned,\n\n tts.title,\n tts.description_markdown,\n tts.description_rendered_html,\n\n tts.ietf_language_tag,\n tts.ietf_primary_language_subtag,\n\n tts.is_front_page_featured,\n tts.is_twitch_featured,\n\n tts.maybe_suggested_unique_bot_command,\n\n tts.user_ratings_positive_count,\n tts.user_ratings_negative_count,\n tts.user_ratings_total_count,\n\n tts.creator_set_visibility,\n\n tts.is_locked_from_use,\n tts.is_locked_from_user_modification,\n\n tts.maybe_migration_new_model_weights_token,\n\n tts.maybe_custom_vocoder_token,\n vocoder.title as maybe_custom_vocoder_title,\n vocoder_user.token as maybe_custom_vocoder_creator_user_token,\n vocoder_user.username as maybe_custom_vocoder_creator_username,\n vocoder_user.display_name as maybe_custom_vocoder_creator_display_name,\n vocoder_user.email_gravatar_hash as maybe_custom_vocoder_creator_gravatar_hash,\n\n tts.created_at,\n tts.updated_at,\n\n tts.creator_ip_address_creation,\n tts.creator_ip_address_last_update,\n tts.mod_deleted_at,\n tts.user_deleted_at\n\nFROM tts_models as tts\nJOIN users\n ON users.token = tts.creator_user_token\n\nLEFT OUTER JOIN vocoder_models AS vocoder\n ON vocoder.token = tts.maybe_custom_vocoder_token\nLEFT OUTER JOIN users AS vocoder_user\n ON vocoder_user.token = vocoder.creator_user_token\n\nWHERE\n tts.token = ?\n AND tts.user_deleted_at IS NULL\n AND tts.mod_deleted_at IS NULL\n ", "describe": { "columns": [ { @@ -265,6 +265,16 @@ }, { "ordinal": 26, + "name": "maybe_migration_new_model_weights_token", + "type_info": { + "type": "VarString", + "flags": "UNIQUE_KEY | BINARY", + "char_set": 224, + "max_size": 128 + } + }, + { + "ordinal": 27, "name": "maybe_custom_vocoder_token", "type_info": { "type": "VarString", @@ -274,7 +284,7 @@ } }, { - "ordinal": 27, + "ordinal": 28, "name": "maybe_custom_vocoder_title", "type_info": { "type": "VarString", @@ -284,7 +294,7 @@ } }, { - "ordinal": 28, + "ordinal": 29, "name": "maybe_custom_vocoder_creator_user_token", "type_info": { "type": "VarString", @@ -294,7 +304,7 @@ } }, { - "ordinal": 29, + "ordinal": 30, "name": "maybe_custom_vocoder_creator_username", "type_info": { "type": "VarString", @@ -304,7 +314,7 @@ } }, { - "ordinal": 30, + "ordinal": 31, "name": "maybe_custom_vocoder_creator_display_name", "type_info": { "type": "VarString", @@ -314,7 +324,7 @@ } }, { - "ordinal": 31, + "ordinal": 32, "name": "maybe_custom_vocoder_creator_gravatar_hash", "type_info": { "type": "String", @@ -324,7 +334,7 @@ } }, { - "ordinal": 32, + "ordinal": 33, "name": "created_at", "type_info": { "type": "Timestamp", @@ -334,7 +344,7 @@ } }, { - "ordinal": 33, + "ordinal": 34, "name": "updated_at", "type_info": { "type": "Timestamp", @@ -344,7 +354,7 @@ } }, { - "ordinal": 34, + "ordinal": 35, "name": "creator_ip_address_creation", "type_info": { "type": "VarString", @@ -354,7 +364,7 @@ } }, { - "ordinal": 35, + "ordinal": 36, "name": "creator_ip_address_last_update", "type_info": { "type": "VarString", @@ -364,7 +374,7 @@ } }, { - "ordinal": 36, + "ordinal": 37, "name": "mod_deleted_at", "type_info": { "type": "Timestamp", @@ -374,7 +384,7 @@ } }, { - "ordinal": 37, + "ordinal": 38, "name": "user_deleted_at", "type_info": { "type": "Timestamp", @@ -420,6 +430,7 @@ true, true, true, + true, false, false, false, @@ -428,5 +439,5 @@ true ] }, - "hash": "481493c8b377197b5f596d7ee842ab4b580da384a2fa8ed330082515b7990d58" + "hash": "295ac99103e49c817d545d5a7b8a819a839885245c60f8ce2c13a73155917942" } diff --git a/.sqlx/query-bfd3551e4e7b2b67bf4996d3a958e6b546fe42c54091bd2d849b5c08c26d98e6.json b/.sqlx/query-57fa22e6cd4e82b801605c96eac21babd78df3df361b3be566993b78a46efef2.json similarity index 82% rename from .sqlx/query-bfd3551e4e7b2b67bf4996d3a958e6b546fe42c54091bd2d849b5c08c26d98e6.json rename to .sqlx/query-57fa22e6cd4e82b801605c96eac21babd78df3df361b3be566993b78a46efef2.json index 04110c9073..5690c5a3a9 100644 --- a/.sqlx/query-bfd3551e4e7b2b67bf4996d3a958e6b546fe42c54091bd2d849b5c08c26d98e6.json +++ b/.sqlx/query-57fa22e6cd4e82b801605c96eac21babd78df3df361b3be566993b78a46efef2.json @@ -1,6 +1,6 @@ { "db_name": "MySQL", - "query": "\nSELECT\n m.token as `token: tokens::tokens::media_files::MediaFileToken`,\n\n m.media_class as `media_class: enums::by_table::media_files::media_file_class::MediaFileClass`,\n m.media_type as `media_type: enums::by_table::media_files::media_file_type::MediaFileType`,\n\n m.maybe_engine_category as `maybe_engine_category: enums::by_table::media_files::media_file_engine_category::MediaFileEngineCategory`,\n m.maybe_animation_type as `maybe_animation_type: enums::by_table::media_files::media_file_animation_type::MediaFileAnimationType`,\n\n m.maybe_media_subtype as `maybe_media_subtype: enums::by_table::media_files::media_file_subtype::MediaFileSubtype`,\n\n m.maybe_mime_type,\n\n users.token as `maybe_creator_user_token: tokens::tokens::users::UserToken`,\n users.username as maybe_creator_username,\n users.display_name as maybe_creator_display_name,\n users.email_gravatar_hash as maybe_creator_gravatar_hash,\n\n m.maybe_creator_anonymous_visitor_token as `maybe_creator_anonymous_visitor_token: tokens::tokens::anonymous_visitor_tracking::AnonymousVisitorTrackingToken`,\n\n m.maybe_batch_token as `maybe_batch_token: tokens::tokens::batch_generations::BatchGenerationToken`,\n\n m.maybe_style_transfer_source_media_file_token as `maybe_style_transfer_source_media_file_token: tokens::tokens::media_files::MediaFileToken`,\n m.maybe_scene_source_media_file_token as `maybe_scene_source_media_file_token: tokens::tokens::media_files::MediaFileToken`,\n\n\n m.maybe_title,\n m.maybe_text_transcript,\n\n m.maybe_origin_filename,\n\n m.maybe_duration_millis,\n\n m.maybe_prompt_token as `maybe_prompt_token: tokens::tokens::prompts::PromptToken`,\n prompts.maybe_other_args as maybe_other_prompt_args,\n\n media_file_cover_image.public_bucket_directory_hash as maybe_file_cover_image_public_bucket_hash,\n media_file_cover_image.maybe_public_bucket_prefix as maybe_file_cover_image_public_bucket_prefix,\n media_file_cover_image.maybe_public_bucket_extension as maybe_file_cover_image_public_bucket_extension,\n\n m.creator_set_visibility as `creator_set_visibility: enums::common::visibility::Visibility`,\n\n model_weights.token as `maybe_model_weights_token: tokens::tokens::model_weights::ModelWeightToken`,\n model_weights.title as maybe_model_weights_title,\n model_weights.weights_type as `maybe_model_weights_type: enums::by_table::model_weights::weights_types::WeightsType`,\n model_weights.weights_category as `maybe_model_weights_category: enums::by_table::model_weights::weights_category::WeightsCategory`,\n\n model_weight_cover_image.public_bucket_directory_hash as maybe_model_cover_image_public_bucket_hash,\n model_weight_cover_image.maybe_public_bucket_prefix as maybe_model_cover_image_public_bucket_prefix,\n model_weight_cover_image.maybe_public_bucket_extension as maybe_model_cover_image_public_bucket_extension,\n\n model_weight_creator.token as `maybe_model_weight_creator_user_token: tokens::tokens::users::UserToken`,\n model_weight_creator.username as maybe_model_weight_creator_username,\n model_weight_creator.display_name as maybe_model_weight_creator_display_name,\n model_weight_creator.email_gravatar_hash as maybe_model_weight_creator_gravatar_hash,\n\n m.extra_file_modification_info,\n\n m.public_bucket_directory_hash,\n m.maybe_public_bucket_prefix,\n m.maybe_public_bucket_extension,\n\n entity_stats.ratings_positive_count as maybe_ratings_positive_count,\n entity_stats.ratings_negative_count as maybe_ratings_negative_count,\n entity_stats.bookmark_count as maybe_bookmark_count,\n\n featured_items.entity_token IS NOT NULL AS is_featured,\n\n m.created_at,\n m.updated_at\n\nFROM media_files AS m\nLEFT OUTER JOIN users\n ON m.maybe_creator_user_token = users.token\nLEFT OUTER JOIN model_weights\n ON m.maybe_origin_model_token = model_weights.token\nLEFT OUTER JOIN media_files as media_file_cover_image\n ON media_file_cover_image.token = m.maybe_cover_image_media_file_token\nLEFT OUTER JOIN media_files as model_weight_cover_image\n ON model_weight_cover_image.token = model_weights.maybe_cover_image_media_file_token\nLEFT OUTER JOIN users as model_weight_creator\n ON model_weight_creator.token = model_weights.creator_user_token\nLEFT OUTER JOIN entity_stats\n ON entity_stats.entity_type = \"media_file\"\n AND entity_stats.entity_token = m.token\nLEFT OUTER JOIN prompts\n ON prompts.token = m.maybe_prompt_token\nLEFT OUTER JOIN featured_items\n ON featured_items.entity_type = 'media_file'\n AND featured_items.entity_token = m.token\n AND featured_items.deleted_at IS NULL\nWHERE\n m.token = ?\n AND m.user_deleted_at IS NULL\n AND m.mod_deleted_at IS NULL\n ", + "query": "\nSELECT\n m.token as `token: tokens::tokens::media_files::MediaFileToken`,\n\n m.media_class as `media_class: enums::by_table::media_files::media_file_class::MediaFileClass`,\n m.media_type as `media_type: enums::by_table::media_files::media_file_type::MediaFileType`,\n\n m.maybe_engine_category as `maybe_engine_category: enums::by_table::media_files::media_file_engine_category::MediaFileEngineCategory`,\n m.maybe_animation_type as `maybe_animation_type: enums::by_table::media_files::media_file_animation_type::MediaFileAnimationType`,\n\n m.maybe_media_subtype as `maybe_media_subtype: enums::by_table::media_files::media_file_subtype::MediaFileSubtype`,\n\n m.maybe_mime_type,\n\n users.token as `maybe_creator_user_token: tokens::tokens::users::UserToken`,\n users.username as maybe_creator_username,\n users.display_name as maybe_creator_display_name,\n users.email_gravatar_hash as maybe_creator_gravatar_hash,\n\n m.maybe_creator_anonymous_visitor_token as `maybe_creator_anonymous_visitor_token: tokens::tokens::anonymous_visitor_tracking::AnonymousVisitorTrackingToken`,\n\n m.maybe_batch_token as `maybe_batch_token: tokens::tokens::batch_generations::BatchGenerationToken`,\n\n m.maybe_style_transfer_source_media_file_token as `maybe_style_transfer_source_media_file_token: tokens::tokens::media_files::MediaFileToken`,\n m.maybe_scene_source_media_file_token as `maybe_scene_source_media_file_token: tokens::tokens::media_files::MediaFileToken`,\n\n\n m.maybe_title,\n m.maybe_text_transcript,\n\n m.maybe_origin_filename,\n\n m.maybe_duration_millis,\n\n m.maybe_prompt_token as `maybe_prompt_token: tokens::tokens::prompts::PromptToken`,\n prompts.maybe_other_args as maybe_other_prompt_args,\n\n media_file_cover_image.public_bucket_directory_hash as maybe_file_cover_image_public_bucket_hash,\n media_file_cover_image.maybe_public_bucket_prefix as maybe_file_cover_image_public_bucket_prefix,\n media_file_cover_image.maybe_public_bucket_extension as maybe_file_cover_image_public_bucket_extension,\n\n m.creator_set_visibility as `creator_set_visibility: enums::common::visibility::Visibility`,\n\n m.is_user_upload,\n m.is_intermediate_system_file,\n\n model_weights.token as `maybe_model_weights_token: tokens::tokens::model_weights::ModelWeightToken`,\n model_weights.title as maybe_model_weights_title,\n model_weights.weights_type as `maybe_model_weights_type: enums::by_table::model_weights::weights_types::WeightsType`,\n model_weights.weights_category as `maybe_model_weights_category: enums::by_table::model_weights::weights_category::WeightsCategory`,\n\n model_weight_cover_image.public_bucket_directory_hash as maybe_model_cover_image_public_bucket_hash,\n model_weight_cover_image.maybe_public_bucket_prefix as maybe_model_cover_image_public_bucket_prefix,\n model_weight_cover_image.maybe_public_bucket_extension as maybe_model_cover_image_public_bucket_extension,\n\n model_weight_creator.token as `maybe_model_weight_creator_user_token: tokens::tokens::users::UserToken`,\n model_weight_creator.username as maybe_model_weight_creator_username,\n model_weight_creator.display_name as maybe_model_weight_creator_display_name,\n model_weight_creator.email_gravatar_hash as maybe_model_weight_creator_gravatar_hash,\n\n m.extra_file_modification_info,\n\n m.public_bucket_directory_hash,\n m.maybe_public_bucket_prefix,\n m.maybe_public_bucket_extension,\n\n entity_stats.ratings_positive_count as maybe_ratings_positive_count,\n entity_stats.ratings_negative_count as maybe_ratings_negative_count,\n entity_stats.bookmark_count as maybe_bookmark_count,\n\n featured_items.entity_token IS NOT NULL AS is_featured,\n\n m.created_at,\n m.updated_at\n\nFROM media_files AS m\nLEFT OUTER JOIN users\n ON m.maybe_creator_user_token = users.token\nLEFT OUTER JOIN model_weights\n ON m.maybe_origin_model_token = model_weights.token\nLEFT OUTER JOIN media_files as media_file_cover_image\n ON media_file_cover_image.token = m.maybe_cover_image_media_file_token\nLEFT OUTER JOIN media_files as model_weight_cover_image\n ON model_weight_cover_image.token = model_weights.maybe_cover_image_media_file_token\nLEFT OUTER JOIN users as model_weight_creator\n ON model_weight_creator.token = model_weights.creator_user_token\nLEFT OUTER JOIN entity_stats\n ON entity_stats.entity_type = \"media_file\"\n AND entity_stats.entity_token = m.token\nLEFT OUTER JOIN prompts\n ON prompts.token = m.maybe_prompt_token\nLEFT OUTER JOIN featured_items\n ON featured_items.entity_type = 'media_file'\n AND featured_items.entity_token = m.token\n AND featured_items.deleted_at IS NULL\nWHERE\n m.token = ?\n AND m.user_deleted_at IS NULL\n AND m.mod_deleted_at IS NULL\n ", "describe": { "columns": [ { @@ -255,6 +255,26 @@ }, { "ordinal": 25, + "name": "is_user_upload", + "type_info": { + "type": "Tiny", + "flags": "NOT_NULL | MULTIPLE_KEY", + "char_set": 63, + "max_size": 1 + } + }, + { + "ordinal": 26, + "name": "is_intermediate_system_file", + "type_info": { + "type": "Tiny", + "flags": "NOT_NULL | MULTIPLE_KEY", + "char_set": 63, + "max_size": 1 + } + }, + { + "ordinal": 27, "name": "maybe_model_weights_token: tokens::tokens::model_weights::ModelWeightToken", "type_info": { "type": "VarString", @@ -264,7 +284,7 @@ } }, { - "ordinal": 26, + "ordinal": 28, "name": "maybe_model_weights_title", "type_info": { "type": "VarString", @@ -274,7 +294,7 @@ } }, { - "ordinal": 27, + "ordinal": 29, "name": "maybe_model_weights_type: enums::by_table::model_weights::weights_types::WeightsType", "type_info": { "type": "VarString", @@ -284,7 +304,7 @@ } }, { - "ordinal": 28, + "ordinal": 30, "name": "maybe_model_weights_category: enums::by_table::model_weights::weights_category::WeightsCategory", "type_info": { "type": "VarString", @@ -294,7 +314,7 @@ } }, { - "ordinal": 29, + "ordinal": 31, "name": "maybe_model_cover_image_public_bucket_hash", "type_info": { "type": "VarString", @@ -304,7 +324,7 @@ } }, { - "ordinal": 30, + "ordinal": 32, "name": "maybe_model_cover_image_public_bucket_prefix", "type_info": { "type": "VarString", @@ -314,7 +334,7 @@ } }, { - "ordinal": 31, + "ordinal": 33, "name": "maybe_model_cover_image_public_bucket_extension", "type_info": { "type": "VarString", @@ -324,7 +344,7 @@ } }, { - "ordinal": 32, + "ordinal": 34, "name": "maybe_model_weight_creator_user_token: tokens::tokens::users::UserToken", "type_info": { "type": "VarString", @@ -334,7 +354,7 @@ } }, { - "ordinal": 33, + "ordinal": 35, "name": "maybe_model_weight_creator_username", "type_info": { "type": "VarString", @@ -344,7 +364,7 @@ } }, { - "ordinal": 34, + "ordinal": 36, "name": "maybe_model_weight_creator_display_name", "type_info": { "type": "VarString", @@ -354,7 +374,7 @@ } }, { - "ordinal": 35, + "ordinal": 37, "name": "maybe_model_weight_creator_gravatar_hash", "type_info": { "type": "String", @@ -364,7 +384,7 @@ } }, { - "ordinal": 36, + "ordinal": 38, "name": "extra_file_modification_info", "type_info": { "type": "Blob", @@ -374,7 +394,7 @@ } }, { - "ordinal": 37, + "ordinal": 39, "name": "public_bucket_directory_hash", "type_info": { "type": "VarString", @@ -384,7 +404,7 @@ } }, { - "ordinal": 38, + "ordinal": 40, "name": "maybe_public_bucket_prefix", "type_info": { "type": "VarString", @@ -394,7 +414,7 @@ } }, { - "ordinal": 39, + "ordinal": 41, "name": "maybe_public_bucket_extension", "type_info": { "type": "VarString", @@ -404,7 +424,7 @@ } }, { - "ordinal": 40, + "ordinal": 42, "name": "maybe_ratings_positive_count", "type_info": { "type": "Long", @@ -414,7 +434,7 @@ } }, { - "ordinal": 41, + "ordinal": 43, "name": "maybe_ratings_negative_count", "type_info": { "type": "Long", @@ -424,7 +444,7 @@ } }, { - "ordinal": 42, + "ordinal": 44, "name": "maybe_bookmark_count", "type_info": { "type": "Long", @@ -434,7 +454,7 @@ } }, { - "ordinal": 43, + "ordinal": 45, "name": "is_featured", "type_info": { "type": "LongLong", @@ -444,7 +464,7 @@ } }, { - "ordinal": 44, + "ordinal": 46, "name": "created_at", "type_info": { "type": "Timestamp", @@ -454,7 +474,7 @@ } }, { - "ordinal": 45, + "ordinal": 47, "name": "updated_at", "type_info": { "type": "Timestamp", @@ -493,6 +513,8 @@ true, true, false, + false, + false, true, true, true, @@ -516,5 +538,5 @@ false ] }, - "hash": "bfd3551e4e7b2b67bf4996d3a958e6b546fe42c54091bd2d849b5c08c26d98e6" + "hash": "57fa22e6cd4e82b801605c96eac21babd78df3df361b3be566993b78a46efef2" } diff --git a/.sqlx/query-0049a4b3dd3770564c3a466ade7479f0a11508bd4a48b2344b28ff0a20e0b9ca.json b/.sqlx/query-d2d05678aa1c4c3b2d95bbb2ed563c2fc8b587c0480354a42f11409d9671afbe.json similarity index 89% rename from .sqlx/query-0049a4b3dd3770564c3a466ade7479f0a11508bd4a48b2344b28ff0a20e0b9ca.json rename to .sqlx/query-d2d05678aa1c4c3b2d95bbb2ed563c2fc8b587c0480354a42f11409d9671afbe.json index 7695b4c620..3faed67856 100644 --- a/.sqlx/query-0049a4b3dd3770564c3a466ade7479f0a11508bd4a48b2344b28ff0a20e0b9ca.json +++ b/.sqlx/query-d2d05678aa1c4c3b2d95bbb2ed563c2fc8b587c0480354a42f11409d9671afbe.json @@ -1,6 +1,6 @@ { "db_name": "MySQL", - "query": "\nSELECT\n tts.token as model_token,\n tts.tts_model_type as `tts_model_type: enums::by_table::tts_models::tts_model_type::TtsModelType`,\n tts.text_pipeline_type,\n tts.text_preprocessing_algorithm,\n tts.maybe_default_pretrained_vocoder,\n\n tts.use_default_mel_multiply_factor,\n tts.maybe_custom_mel_multiply_factor,\n\n tts.creator_user_token,\n users.username as creator_username,\n users.display_name as creator_display_name,\n users.email_gravatar_hash as creator_gravatar_hash,\n users.is_banned as creator_is_banned,\n\n tts.title,\n tts.description_markdown,\n tts.description_rendered_html,\n\n tts.ietf_language_tag,\n tts.ietf_primary_language_subtag,\n\n tts.is_front_page_featured,\n tts.is_twitch_featured,\n\n tts.maybe_suggested_unique_bot_command,\n\n tts.user_ratings_positive_count,\n tts.user_ratings_negative_count,\n tts.user_ratings_total_count,\n\n tts.creator_set_visibility,\n\n tts.is_locked_from_use,\n tts.is_locked_from_user_modification,\n\n tts.maybe_custom_vocoder_token,\n vocoder.title as maybe_custom_vocoder_title,\n vocoder_user.token as maybe_custom_vocoder_creator_user_token,\n vocoder_user.username as maybe_custom_vocoder_creator_username,\n vocoder_user.display_name as maybe_custom_vocoder_creator_display_name,\n vocoder_user.email_gravatar_hash as maybe_custom_vocoder_creator_gravatar_hash,\n\n tts.created_at,\n tts.updated_at,\n\n tts.creator_ip_address_creation,\n tts.creator_ip_address_last_update,\n tts.mod_deleted_at,\n tts.user_deleted_at\n\nFROM tts_models as tts\nJOIN users\n ON users.token = tts.creator_user_token\n\nLEFT OUTER JOIN vocoder_models AS vocoder\n ON vocoder.token = tts.maybe_custom_vocoder_token\nLEFT OUTER JOIN users AS vocoder_user\n ON vocoder_user.token = vocoder.creator_user_token\n\nWHERE\n tts.token = ?\n AND tts.user_deleted_at IS NULL\n AND tts.mod_deleted_at IS NULL\n ", + "query": "\nSELECT\n tts.token as model_token,\n tts.tts_model_type as `tts_model_type: enums::by_table::tts_models::tts_model_type::TtsModelType`,\n tts.text_pipeline_type,\n tts.text_preprocessing_algorithm,\n tts.maybe_default_pretrained_vocoder,\n\n tts.use_default_mel_multiply_factor,\n tts.maybe_custom_mel_multiply_factor,\n\n tts.creator_user_token,\n users.username as creator_username,\n users.display_name as creator_display_name,\n users.email_gravatar_hash as creator_gravatar_hash,\n users.is_banned as creator_is_banned,\n\n tts.title,\n tts.description_markdown,\n tts.description_rendered_html,\n\n tts.ietf_language_tag,\n tts.ietf_primary_language_subtag,\n\n tts.is_front_page_featured,\n tts.is_twitch_featured,\n\n tts.maybe_suggested_unique_bot_command,\n\n tts.user_ratings_positive_count,\n tts.user_ratings_negative_count,\n tts.user_ratings_total_count,\n\n tts.creator_set_visibility,\n\n tts.is_locked_from_use,\n tts.is_locked_from_user_modification,\n\n tts.maybe_migration_new_model_weights_token,\n\n tts.maybe_custom_vocoder_token,\n vocoder.title as maybe_custom_vocoder_title,\n vocoder_user.token as maybe_custom_vocoder_creator_user_token,\n vocoder_user.username as maybe_custom_vocoder_creator_username,\n vocoder_user.display_name as maybe_custom_vocoder_creator_display_name,\n vocoder_user.email_gravatar_hash as maybe_custom_vocoder_creator_gravatar_hash,\n\n tts.created_at,\n tts.updated_at,\n\n tts.creator_ip_address_creation,\n tts.creator_ip_address_last_update,\n tts.mod_deleted_at,\n tts.user_deleted_at\n\nFROM tts_models as tts\nJOIN users\n ON users.token = tts.creator_user_token\n\nLEFT OUTER JOIN vocoder_models AS vocoder\n ON vocoder.token = tts.maybe_custom_vocoder_token\nLEFT OUTER JOIN users AS vocoder_user\n ON vocoder_user.token = vocoder.creator_user_token\n\nWHERE tts.token = ?\n ", "describe": { "columns": [ { @@ -265,6 +265,16 @@ }, { "ordinal": 26, + "name": "maybe_migration_new_model_weights_token", + "type_info": { + "type": "VarString", + "flags": "UNIQUE_KEY | BINARY", + "char_set": 224, + "max_size": 128 + } + }, + { + "ordinal": 27, "name": "maybe_custom_vocoder_token", "type_info": { "type": "VarString", @@ -274,7 +284,7 @@ } }, { - "ordinal": 27, + "ordinal": 28, "name": "maybe_custom_vocoder_title", "type_info": { "type": "VarString", @@ -284,7 +294,7 @@ } }, { - "ordinal": 28, + "ordinal": 29, "name": "maybe_custom_vocoder_creator_user_token", "type_info": { "type": "VarString", @@ -294,7 +304,7 @@ } }, { - "ordinal": 29, + "ordinal": 30, "name": "maybe_custom_vocoder_creator_username", "type_info": { "type": "VarString", @@ -304,7 +314,7 @@ } }, { - "ordinal": 30, + "ordinal": 31, "name": "maybe_custom_vocoder_creator_display_name", "type_info": { "type": "VarString", @@ -314,7 +324,7 @@ } }, { - "ordinal": 31, + "ordinal": 32, "name": "maybe_custom_vocoder_creator_gravatar_hash", "type_info": { "type": "String", @@ -324,7 +334,7 @@ } }, { - "ordinal": 32, + "ordinal": 33, "name": "created_at", "type_info": { "type": "Timestamp", @@ -334,7 +344,7 @@ } }, { - "ordinal": 33, + "ordinal": 34, "name": "updated_at", "type_info": { "type": "Timestamp", @@ -344,7 +354,7 @@ } }, { - "ordinal": 34, + "ordinal": 35, "name": "creator_ip_address_creation", "type_info": { "type": "VarString", @@ -354,7 +364,7 @@ } }, { - "ordinal": 35, + "ordinal": 36, "name": "creator_ip_address_last_update", "type_info": { "type": "VarString", @@ -364,7 +374,7 @@ } }, { - "ordinal": 36, + "ordinal": 37, "name": "mod_deleted_at", "type_info": { "type": "Timestamp", @@ -374,7 +384,7 @@ } }, { - "ordinal": 37, + "ordinal": 38, "name": "user_deleted_at", "type_info": { "type": "Timestamp", @@ -420,6 +430,7 @@ true, true, true, + true, false, false, false, @@ -428,5 +439,5 @@ true ] }, - "hash": "0049a4b3dd3770564c3a466ade7479f0a11508bd4a48b2344b28ff0a20e0b9ca" + "hash": "d2d05678aa1c4c3b2d95bbb2ed563c2fc8b587c0480354a42f11409d9671afbe" } diff --git a/.sqlx/query-e63bdc49ac2203f723d73f2ede7c0f74705da8e69de3c048120bcfd28ae83ba6.json b/.sqlx/query-f6c37066ab3e508050e81cf3bea38cc708b05c5c59ba1c322dcfb775e4b9e7a6.json similarity index 82% rename from .sqlx/query-e63bdc49ac2203f723d73f2ede7c0f74705da8e69de3c048120bcfd28ae83ba6.json rename to .sqlx/query-f6c37066ab3e508050e81cf3bea38cc708b05c5c59ba1c322dcfb775e4b9e7a6.json index 673e748404..edb44c109f 100644 --- a/.sqlx/query-e63bdc49ac2203f723d73f2ede7c0f74705da8e69de3c048120bcfd28ae83ba6.json +++ b/.sqlx/query-f6c37066ab3e508050e81cf3bea38cc708b05c5c59ba1c322dcfb775e4b9e7a6.json @@ -1,6 +1,6 @@ { "db_name": "MySQL", - "query": "\nSELECT\n m.token as `token: tokens::tokens::media_files::MediaFileToken`,\n\n m.media_class as `media_class: enums::by_table::media_files::media_file_class::MediaFileClass`,\n m.media_type as `media_type: enums::by_table::media_files::media_file_type::MediaFileType`,\n\n m.maybe_engine_category as `maybe_engine_category: enums::by_table::media_files::media_file_engine_category::MediaFileEngineCategory`,\n m.maybe_animation_type as `maybe_animation_type: enums::by_table::media_files::media_file_animation_type::MediaFileAnimationType`,\n\n m.maybe_media_subtype as `maybe_media_subtype: enums::by_table::media_files::media_file_subtype::MediaFileSubtype`,\n\n m.maybe_mime_type,\n\n users.token as `maybe_creator_user_token: tokens::tokens::users::UserToken`,\n users.username as maybe_creator_username,\n users.display_name as maybe_creator_display_name,\n users.email_gravatar_hash as maybe_creator_gravatar_hash,\n\n m.maybe_creator_anonymous_visitor_token as `maybe_creator_anonymous_visitor_token: tokens::tokens::anonymous_visitor_tracking::AnonymousVisitorTrackingToken`,\n\n m.maybe_batch_token as `maybe_batch_token: tokens::tokens::batch_generations::BatchGenerationToken`,\n\n m.maybe_style_transfer_source_media_file_token as `maybe_style_transfer_source_media_file_token: tokens::tokens::media_files::MediaFileToken`,\n m.maybe_scene_source_media_file_token as `maybe_scene_source_media_file_token: tokens::tokens::media_files::MediaFileToken`,\n\n m.maybe_title,\n m.maybe_text_transcript,\n\n m.maybe_origin_filename,\n\n m.maybe_duration_millis,\n\n m.maybe_prompt_token as `maybe_prompt_token: tokens::tokens::prompts::PromptToken`,\n prompts.maybe_other_args as maybe_other_prompt_args,\n\n media_file_cover_image.public_bucket_directory_hash as maybe_file_cover_image_public_bucket_hash,\n media_file_cover_image.maybe_public_bucket_prefix as maybe_file_cover_image_public_bucket_prefix,\n media_file_cover_image.maybe_public_bucket_extension as maybe_file_cover_image_public_bucket_extension,\n\n m.creator_set_visibility as `creator_set_visibility: enums::common::visibility::Visibility`,\n\n model_weights.token as `maybe_model_weights_token: tokens::tokens::model_weights::ModelWeightToken`,\n model_weights.title as maybe_model_weights_title,\n model_weights.weights_type as `maybe_model_weights_type: enums::by_table::model_weights::weights_types::WeightsType`,\n model_weights.weights_category as `maybe_model_weights_category: enums::by_table::model_weights::weights_category::WeightsCategory`,\n\n model_weight_cover_image.public_bucket_directory_hash as maybe_model_cover_image_public_bucket_hash,\n model_weight_cover_image.maybe_public_bucket_prefix as maybe_model_cover_image_public_bucket_prefix,\n model_weight_cover_image.maybe_public_bucket_extension as maybe_model_cover_image_public_bucket_extension,\n\n model_weight_creator.token as `maybe_model_weight_creator_user_token: tokens::tokens::users::UserToken`,\n model_weight_creator.username as maybe_model_weight_creator_username,\n model_weight_creator.display_name as maybe_model_weight_creator_display_name,\n model_weight_creator.email_gravatar_hash as maybe_model_weight_creator_gravatar_hash,\n\n m.extra_file_modification_info,\n\n m.public_bucket_directory_hash,\n m.maybe_public_bucket_prefix,\n m.maybe_public_bucket_extension,\n\n entity_stats.ratings_positive_count as maybe_ratings_positive_count,\n entity_stats.ratings_negative_count as maybe_ratings_negative_count,\n entity_stats.bookmark_count as maybe_bookmark_count,\n\n featured_items.entity_token IS NOT NULL AS is_featured,\n\n m.created_at,\n m.updated_at\n\nFROM media_files AS m\nLEFT OUTER JOIN users\n ON m.maybe_creator_user_token = users.token\nLEFT OUTER JOIN model_weights\n ON m.maybe_origin_model_token = model_weights.token\nLEFT OUTER JOIN media_files as media_file_cover_image\n ON media_file_cover_image.token = m.maybe_cover_image_media_file_token\nLEFT OUTER JOIN media_files as model_weight_cover_image\n ON model_weight_cover_image.token = model_weights.maybe_cover_image_media_file_token\nLEFT OUTER JOIN users as model_weight_creator\n ON model_weight_creator.token = model_weights.creator_user_token\nLEFT OUTER JOIN entity_stats\n ON entity_stats.entity_type = \"media_file\"\n AND entity_stats.entity_token = m.token\nLEFT OUTER JOIN prompts\n ON prompts.token = m.maybe_prompt_token\nLEFT OUTER JOIN featured_items\n ON featured_items.entity_type = 'media_file'\n AND featured_items.entity_token = m.token\n AND featured_items.deleted_at IS NULL\nWHERE\n m.token = ?\n ", + "query": "\nSELECT\n m.token as `token: tokens::tokens::media_files::MediaFileToken`,\n\n m.media_class as `media_class: enums::by_table::media_files::media_file_class::MediaFileClass`,\n m.media_type as `media_type: enums::by_table::media_files::media_file_type::MediaFileType`,\n\n m.maybe_engine_category as `maybe_engine_category: enums::by_table::media_files::media_file_engine_category::MediaFileEngineCategory`,\n m.maybe_animation_type as `maybe_animation_type: enums::by_table::media_files::media_file_animation_type::MediaFileAnimationType`,\n\n m.maybe_media_subtype as `maybe_media_subtype: enums::by_table::media_files::media_file_subtype::MediaFileSubtype`,\n\n m.maybe_mime_type,\n\n users.token as `maybe_creator_user_token: tokens::tokens::users::UserToken`,\n users.username as maybe_creator_username,\n users.display_name as maybe_creator_display_name,\n users.email_gravatar_hash as maybe_creator_gravatar_hash,\n\n m.maybe_creator_anonymous_visitor_token as `maybe_creator_anonymous_visitor_token: tokens::tokens::anonymous_visitor_tracking::AnonymousVisitorTrackingToken`,\n\n m.maybe_batch_token as `maybe_batch_token: tokens::tokens::batch_generations::BatchGenerationToken`,\n\n m.maybe_style_transfer_source_media_file_token as `maybe_style_transfer_source_media_file_token: tokens::tokens::media_files::MediaFileToken`,\n m.maybe_scene_source_media_file_token as `maybe_scene_source_media_file_token: tokens::tokens::media_files::MediaFileToken`,\n\n m.maybe_title,\n m.maybe_text_transcript,\n\n m.maybe_origin_filename,\n\n m.maybe_duration_millis,\n\n m.maybe_prompt_token as `maybe_prompt_token: tokens::tokens::prompts::PromptToken`,\n prompts.maybe_other_args as maybe_other_prompt_args,\n\n media_file_cover_image.public_bucket_directory_hash as maybe_file_cover_image_public_bucket_hash,\n media_file_cover_image.maybe_public_bucket_prefix as maybe_file_cover_image_public_bucket_prefix,\n media_file_cover_image.maybe_public_bucket_extension as maybe_file_cover_image_public_bucket_extension,\n\n m.creator_set_visibility as `creator_set_visibility: enums::common::visibility::Visibility`,\n\n m.is_user_upload,\n m.is_intermediate_system_file,\n\n model_weights.token as `maybe_model_weights_token: tokens::tokens::model_weights::ModelWeightToken`,\n model_weights.title as maybe_model_weights_title,\n model_weights.weights_type as `maybe_model_weights_type: enums::by_table::model_weights::weights_types::WeightsType`,\n model_weights.weights_category as `maybe_model_weights_category: enums::by_table::model_weights::weights_category::WeightsCategory`,\n\n model_weight_cover_image.public_bucket_directory_hash as maybe_model_cover_image_public_bucket_hash,\n model_weight_cover_image.maybe_public_bucket_prefix as maybe_model_cover_image_public_bucket_prefix,\n model_weight_cover_image.maybe_public_bucket_extension as maybe_model_cover_image_public_bucket_extension,\n\n model_weight_creator.token as `maybe_model_weight_creator_user_token: tokens::tokens::users::UserToken`,\n model_weight_creator.username as maybe_model_weight_creator_username,\n model_weight_creator.display_name as maybe_model_weight_creator_display_name,\n model_weight_creator.email_gravatar_hash as maybe_model_weight_creator_gravatar_hash,\n\n m.extra_file_modification_info,\n\n m.public_bucket_directory_hash,\n m.maybe_public_bucket_prefix,\n m.maybe_public_bucket_extension,\n\n entity_stats.ratings_positive_count as maybe_ratings_positive_count,\n entity_stats.ratings_negative_count as maybe_ratings_negative_count,\n entity_stats.bookmark_count as maybe_bookmark_count,\n\n featured_items.entity_token IS NOT NULL AS is_featured,\n\n m.created_at,\n m.updated_at\n\nFROM media_files AS m\nLEFT OUTER JOIN users\n ON m.maybe_creator_user_token = users.token\nLEFT OUTER JOIN model_weights\n ON m.maybe_origin_model_token = model_weights.token\nLEFT OUTER JOIN media_files as media_file_cover_image\n ON media_file_cover_image.token = m.maybe_cover_image_media_file_token\nLEFT OUTER JOIN media_files as model_weight_cover_image\n ON model_weight_cover_image.token = model_weights.maybe_cover_image_media_file_token\nLEFT OUTER JOIN users as model_weight_creator\n ON model_weight_creator.token = model_weights.creator_user_token\nLEFT OUTER JOIN entity_stats\n ON entity_stats.entity_type = \"media_file\"\n AND entity_stats.entity_token = m.token\nLEFT OUTER JOIN prompts\n ON prompts.token = m.maybe_prompt_token\nLEFT OUTER JOIN featured_items\n ON featured_items.entity_type = 'media_file'\n AND featured_items.entity_token = m.token\n AND featured_items.deleted_at IS NULL\nWHERE\n m.token = ?\n ", "describe": { "columns": [ { @@ -255,6 +255,26 @@ }, { "ordinal": 25, + "name": "is_user_upload", + "type_info": { + "type": "Tiny", + "flags": "NOT_NULL | MULTIPLE_KEY", + "char_set": 63, + "max_size": 1 + } + }, + { + "ordinal": 26, + "name": "is_intermediate_system_file", + "type_info": { + "type": "Tiny", + "flags": "NOT_NULL | MULTIPLE_KEY", + "char_set": 63, + "max_size": 1 + } + }, + { + "ordinal": 27, "name": "maybe_model_weights_token: tokens::tokens::model_weights::ModelWeightToken", "type_info": { "type": "VarString", @@ -264,7 +284,7 @@ } }, { - "ordinal": 26, + "ordinal": 28, "name": "maybe_model_weights_title", "type_info": { "type": "VarString", @@ -274,7 +294,7 @@ } }, { - "ordinal": 27, + "ordinal": 29, "name": "maybe_model_weights_type: enums::by_table::model_weights::weights_types::WeightsType", "type_info": { "type": "VarString", @@ -284,7 +304,7 @@ } }, { - "ordinal": 28, + "ordinal": 30, "name": "maybe_model_weights_category: enums::by_table::model_weights::weights_category::WeightsCategory", "type_info": { "type": "VarString", @@ -294,7 +314,7 @@ } }, { - "ordinal": 29, + "ordinal": 31, "name": "maybe_model_cover_image_public_bucket_hash", "type_info": { "type": "VarString", @@ -304,7 +324,7 @@ } }, { - "ordinal": 30, + "ordinal": 32, "name": "maybe_model_cover_image_public_bucket_prefix", "type_info": { "type": "VarString", @@ -314,7 +334,7 @@ } }, { - "ordinal": 31, + "ordinal": 33, "name": "maybe_model_cover_image_public_bucket_extension", "type_info": { "type": "VarString", @@ -324,7 +344,7 @@ } }, { - "ordinal": 32, + "ordinal": 34, "name": "maybe_model_weight_creator_user_token: tokens::tokens::users::UserToken", "type_info": { "type": "VarString", @@ -334,7 +354,7 @@ } }, { - "ordinal": 33, + "ordinal": 35, "name": "maybe_model_weight_creator_username", "type_info": { "type": "VarString", @@ -344,7 +364,7 @@ } }, { - "ordinal": 34, + "ordinal": 36, "name": "maybe_model_weight_creator_display_name", "type_info": { "type": "VarString", @@ -354,7 +374,7 @@ } }, { - "ordinal": 35, + "ordinal": 37, "name": "maybe_model_weight_creator_gravatar_hash", "type_info": { "type": "String", @@ -364,7 +384,7 @@ } }, { - "ordinal": 36, + "ordinal": 38, "name": "extra_file_modification_info", "type_info": { "type": "Blob", @@ -374,7 +394,7 @@ } }, { - "ordinal": 37, + "ordinal": 39, "name": "public_bucket_directory_hash", "type_info": { "type": "VarString", @@ -384,7 +404,7 @@ } }, { - "ordinal": 38, + "ordinal": 40, "name": "maybe_public_bucket_prefix", "type_info": { "type": "VarString", @@ -394,7 +414,7 @@ } }, { - "ordinal": 39, + "ordinal": 41, "name": "maybe_public_bucket_extension", "type_info": { "type": "VarString", @@ -404,7 +424,7 @@ } }, { - "ordinal": 40, + "ordinal": 42, "name": "maybe_ratings_positive_count", "type_info": { "type": "Long", @@ -414,7 +434,7 @@ } }, { - "ordinal": 41, + "ordinal": 43, "name": "maybe_ratings_negative_count", "type_info": { "type": "Long", @@ -424,7 +444,7 @@ } }, { - "ordinal": 42, + "ordinal": 44, "name": "maybe_bookmark_count", "type_info": { "type": "Long", @@ -434,7 +454,7 @@ } }, { - "ordinal": 43, + "ordinal": 45, "name": "is_featured", "type_info": { "type": "LongLong", @@ -444,7 +464,7 @@ } }, { - "ordinal": 44, + "ordinal": 46, "name": "created_at", "type_info": { "type": "Timestamp", @@ -454,7 +474,7 @@ } }, { - "ordinal": 45, + "ordinal": 47, "name": "updated_at", "type_info": { "type": "Timestamp", @@ -493,6 +513,8 @@ true, true, false, + false, + false, true, true, true, @@ -516,5 +538,5 @@ false ] }, - "hash": "e63bdc49ac2203f723d73f2ede7c0f74705da8e69de3c048120bcfd28ae83ba6" + "hash": "f6c37066ab3e508050e81cf3bea38cc708b05c5c59ba1c322dcfb775e4b9e7a6" } diff --git a/crates/cli/production/db-cleanup/src/operations/delete_all_anonymous_user_images/delete_all_anonymous_user_images.rs b/crates/cli/production/db-cleanup/src/operations/delete_all_anonymous_user_images/delete_all_anonymous_user_images.rs index a507b4c127..6e141fa267 100644 --- a/crates/cli/production/db-cleanup/src/operations/delete_all_anonymous_user_images/delete_all_anonymous_user_images.rs +++ b/crates/cli/production/db-cleanup/src/operations/delete_all_anonymous_user_images/delete_all_anonymous_user_images.rs @@ -33,6 +33,7 @@ pub async fn delete_all_anonymous_user_images(_args: &Args, mysql: &Pool) view_as: ViewAs::Moderator, mysql_pool: &mysql, maybe_filter_engine_categories: None, + include_user_uploads: true, }).await?; if media_files.records.is_empty() { diff --git a/crates/cli/production/db-cleanup/src/operations/delete_user_files/delete_user_files.rs b/crates/cli/production/db-cleanup/src/operations/delete_user_files/delete_user_files.rs index 303cc17402..25c3e35ebd 100644 --- a/crates/cli/production/db-cleanup/src/operations/delete_user_files/delete_user_files.rs +++ b/crates/cli/production/db-cleanup/src/operations/delete_user_files/delete_user_files.rs @@ -46,6 +46,7 @@ pub async fn delete_all_files(username: &str, mysql: &Pool) -> AnyhowResu maybe_filter_media_types: None, maybe_filter_media_classes: None, maybe_filter_engine_categories: None, + include_user_uploads: true, page_size: 100, page_index, sort_ascending: false, diff --git a/crates/cli/production/elasticsearch-cli/src/plans/media_files/create_dimensional_media_file_documents.rs b/crates/cli/production/elasticsearch-cli/src/plans/media_files/create_dimensional_media_file_documents.rs index c0b1644410..d487723191 100644 --- a/crates/cli/production/elasticsearch-cli/src/plans/media_files/create_dimensional_media_file_documents.rs +++ b/crates/cli/production/elasticsearch-cli/src/plans/media_files/create_dimensional_media_file_documents.rs @@ -130,6 +130,9 @@ async fn create_document_from_record(elasticsearch: &Elasticsearch, record: Medi is_featured: record.is_featured, + is_user_upload: Some(record.is_user_upload), + is_intermediate_system_file: Some(record.is_intermediate_system_file), + created_at: record.created_at, updated_at: record.updated_at, user_deleted_at: record.user_deleted_at,