From 6c9b0a5c2abe241ce336b52928be5302b2eaef3e Mon Sep 17 00:00:00 2001 From: Brandon Thomas Date: Thu, 14 Dec 2023 18:30:54 -0500 Subject: [PATCH] fix bad github merge --- .../http_server/endpoints/media_files/mod.rs | 3 +-- .../service/web/storyteller_web/src/routes.rs | 19 +++++++++---------- 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/mod.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/mod.rs index 1883621d7a..8365645e1f 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/mod.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/mod.rs @@ -1,8 +1,7 @@ pub mod delete_media_file; pub mod drain_multipart_request; pub mod get_media_file; -pub mod delete_media_file; -pub mod update_media_file; pub mod list_featured_media_files; pub mod list_media_files; pub mod list_media_files_for_user; +pub mod update_media_file; diff --git a/crates/service/web/storyteller_web/src/routes.rs b/crates/service/web/storyteller_web/src/routes.rs index 79c10e153a..aafc1d1442 100644 --- a/crates/service/web/storyteller_web/src/routes.rs +++ b/crates/service/web/storyteller_web/src/routes.rs @@ -29,11 +29,6 @@ use crate::http_server::endpoints::comments::list_comments_handler::list_comment use crate::http_server::endpoints::download_job::enqueue_generic_download::enqueue_generic_download_handler; use crate::http_server::endpoints::download_job::get_generic_upload_job_status::get_generic_download_job_status_handler; use crate::http_server::endpoints::events::list_events::list_events_handler; -use crate::http_server::endpoints::user_bookmarks::create_user_bookmark_handler::create_user_bookmark_handler; -use crate::http_server::endpoints::user_bookmarks::delete_user_bookmark_handler::delete_user_bookmark_handler; -use crate::http_server::endpoints::user_bookmarks::list_user_bookmarks_for_entity_handler::list_user_bookmarks_for_entity_handler; -use crate::http_server::endpoints::user_bookmarks::list_user_bookmarks_for_session_handler::list_user_bookmarks_for_session_handler; -use crate::http_server::endpoints::user_bookmarks::list_user_bookmarks_for_user_handler::list_user_bookmarks_for_user_handler; use crate::http_server::endpoints::flags::design_refresh_flag::disable_design_refresh_flag_handler::disable_design_refresh_flag_handler; use crate::http_server::endpoints::flags::design_refresh_flag::enable_design_refresh_flag_handler::enable_design_refresh_flag_handler; use crate::http_server::endpoints::inference_job::get_inference_job_status::get_inference_job_status_handler; @@ -45,10 +40,10 @@ use crate::http_server::endpoints::investor_demo::enable_demo_mode_handler::enab use crate::http_server::endpoints::leaderboard::get_leaderboard::leaderboard_handler; use crate::http_server::endpoints::media_files::delete_media_file::delete_media_file_handler; use crate::http_server::endpoints::media_files::get_media_file::get_media_file_handler; -use crate::http_server::endpoints::media_files::update_media_file::update_media_file_handler; use crate::http_server::endpoints::media_files::list_featured_media_files::list_featured_media_files_handler; use crate::http_server::endpoints::media_files::list_media_files::list_media_files_handler; use crate::http_server::endpoints::media_files::list_media_files_for_user::list_media_files_for_user_handler; +use crate::http_server::endpoints::media_files::update_media_file::update_media_file_handler; use crate::http_server::endpoints::media_uploads::list_user_media_uploads_of_type::list_user_media_uploads_of_type_handler; use crate::http_server::endpoints::media_uploads::upload_audio::upload_audio_handler; use crate::http_server::endpoints::media_uploads::upload_image::upload_image_handler; @@ -112,6 +107,11 @@ use crate::http_server::endpoints::twitch::oauth::check_oauth_status::check_oaut use crate::http_server::endpoints::twitch::oauth::oauth_begin_json::oauth_begin_enroll_json; use crate::http_server::endpoints::twitch::oauth::oauth_begin_redirect::oauth_begin_enroll_redirect; use crate::http_server::endpoints::twitch::oauth::oauth_end::oauth_end_enroll_from_redirect; +use crate::http_server::endpoints::user_bookmarks::create_user_bookmark_handler::create_user_bookmark_handler; +use crate::http_server::endpoints::user_bookmarks::delete_user_bookmark_handler::delete_user_bookmark_handler; +use crate::http_server::endpoints::user_bookmarks::list_user_bookmarks_for_entity_handler::list_user_bookmarks_for_entity_handler; +use crate::http_server::endpoints::user_bookmarks::list_user_bookmarks_for_session_handler::list_user_bookmarks_for_session_handler; +use crate::http_server::endpoints::user_bookmarks::list_user_bookmarks_for_user_handler::list_user_bookmarks_for_user_handler; use crate::http_server::endpoints::user_ratings::get_user_rating_handler::get_user_rating_handler; use crate::http_server::endpoints::user_ratings::set_user_rating_handler::set_user_rating_handler; use crate::http_server::endpoints::vocoders::get_vocoder::get_vocoder_handler; @@ -154,14 +154,12 @@ use crate::http_server::endpoints::w2l::list_user_w2l_inference_results::list_us use crate::http_server::endpoints::w2l::list_user_w2l_templates::list_user_w2l_templates_handler; use crate::http_server::endpoints::w2l::list_w2l_templates::list_w2l_templates_handler; use crate::http_server::endpoints::w2l::set_w2l_template_mod_approval::set_w2l_template_mod_approval_handler; - -use crate::http_server::endpoints::weights::get_weight::get_weight_handler; use crate::http_server::endpoints::weights::delete_weight::delete_weight_handler; -use crate::http_server::endpoints::weights::update_weight::update_weight_handler; +use crate::http_server::endpoints::weights::get_weight::get_weight_handler; use crate::http_server::endpoints::weights::list_available_weights::list_available_weights_handler; use crate::http_server::endpoints::weights::list_featured_weights::list_featured_weights_handler; use crate::http_server::endpoints::weights::list_weights_by_user::list_weights_by_user_handler; - +use crate::http_server::endpoints::weights::update_weight::update_weight_handler; pub fn add_routes (app: App, server_environment: ServerEnvironment) -> App where @@ -1024,6 +1022,7 @@ fn add_media_file_routes (app: App) -> App ) .service(web::resource("/file/{token}/update") .route(web::post().to(update_media_file_handler)) + ) .service(web::resource("/list") .route(web::get().to(list_media_files_handler)) .route(web::head().to(|| HttpResponse::Ok()))