diff --git a/src/clients/tts_inference_sidecar_client.rs b/src/clients/tts_inference_sidecar_client.rs index a302d081f2..2d762df964 100644 --- a/src/clients/tts_inference_sidecar_client.rs +++ b/src/clients/tts_inference_sidecar_client.rs @@ -1,11 +1,10 @@ -//use actix_web::client::Client; use actix_web::http::header; use anyhow::anyhow; use crate::util::anyhow_result::AnyhowResult; use hyper::client::Client; +use hyper::{Body, Request}; use log::info; use std::path::Path; -use hyper::{Body, Request}; pub struct TtsInferenceSidecarClient { hostname: String, diff --git a/src/database_helpers/boolean_converters.rs b/src/database/helpers/boolean_converters.rs similarity index 100% rename from src/database_helpers/boolean_converters.rs rename to src/database/helpers/boolean_converters.rs diff --git a/src/database_helpers/enums.rs b/src/database/helpers/enums.rs similarity index 100% rename from src/database_helpers/enums.rs rename to src/database/helpers/enums.rs diff --git a/src/database/helpers/mod.rs b/src/database/helpers/mod.rs new file mode 100644 index 0000000000..81606ff216 --- /dev/null +++ b/src/database/helpers/mod.rs @@ -0,0 +1,3 @@ +pub mod boolean_converters; +pub mod enums; +pub mod tokens; \ No newline at end of file diff --git a/src/common_queries/tokens.rs b/src/database/helpers/tokens.rs similarity index 100% rename from src/common_queries/tokens.rs rename to src/database/helpers/tokens.rs diff --git a/src/common_queries/badge_granter.rs b/src/database/mediators/badge_granter.rs similarity index 98% rename from src/common_queries/badge_granter.rs rename to src/database/mediators/badge_granter.rs index 7c19b458eb..1d8bd4734b 100644 --- a/src/common_queries/badge_granter.rs +++ b/src/database/mediators/badge_granter.rs @@ -1,5 +1,6 @@ use anyhow::anyhow; -use crate::common_queries::tokens::Tokens; +use crate::database::helpers::tokens::Tokens; +use crate::database::mediators::firehose_publisher::FirehosePublisher; use crate::util::anyhow_result::AnyhowResult; use crate::util::random_prefix_crockford_token::random_prefix_crockford_token; use log::{warn,info}; @@ -7,7 +8,6 @@ use sqlx::error::Error::Database; use sqlx::mysql::MySqlDone; use sqlx::{MySqlPool}; use std::sync::Arc; -use crate::common_queries::firehose_publisher::FirehosePublisher; #[derive(Debug, Clone, Copy)] pub enum UserBadge { diff --git a/src/common_queries/firehose_publisher.rs b/src/database/mediators/firehose_publisher.rs similarity index 99% rename from src/common_queries/firehose_publisher.rs rename to src/database/mediators/firehose_publisher.rs index 512e2d7d05..850f4a8a73 100644 --- a/src/common_queries/firehose_publisher.rs +++ b/src/database/mediators/firehose_publisher.rs @@ -1,5 +1,5 @@ use anyhow::anyhow; -use crate::common_queries::tokens::Tokens; +use crate::database::helpers::tokens::Tokens; use crate::util::anyhow_result::AnyhowResult; use crate::util::random_prefix_crockford_token::random_prefix_crockford_token; use log::{warn,info}; diff --git a/src/database/mediators/mod.rs b/src/database/mediators/mod.rs new file mode 100644 index 0000000000..5cc9617e88 --- /dev/null +++ b/src/database/mediators/mod.rs @@ -0,0 +1,2 @@ +pub mod badge_granter; +pub mod firehose_publisher; \ No newline at end of file diff --git a/src/database/mod.rs b/src/database/mod.rs new file mode 100644 index 0000000000..d160ea03e0 --- /dev/null +++ b/src/database/mod.rs @@ -0,0 +1,3 @@ +pub mod helpers; +pub mod mediators; +pub mod queries; \ No newline at end of file diff --git a/src/common_queries/badges.rs b/src/database/queries/badges.rs similarity index 100% rename from src/common_queries/badges.rs rename to src/database/queries/badges.rs diff --git a/src/common_queries/sessions.rs b/src/database/queries/create_session.rs similarity index 95% rename from src/common_queries/sessions.rs rename to src/database/queries/create_session.rs index 991338c84f..14ea5d8446 100644 --- a/src/common_queries/sessions.rs +++ b/src/database/queries/create_session.rs @@ -1,6 +1,6 @@ use anyhow::anyhow; use crate::AnyhowResult; -use crate::common_queries::tokens::Tokens; +use crate::database::helpers::tokens::Tokens; use crate::util::random_crockford_token::random_crockford_token; use crate::util::random_prefix_crockford_token::random_prefix_crockford_token; use log::{info, warn}; diff --git a/src/common_queries/delete_tts_model.rs b/src/database/queries/delete_tts_model.rs similarity index 100% rename from src/common_queries/delete_tts_model.rs rename to src/database/queries/delete_tts_model.rs diff --git a/src/common_queries/list_ip_bans.rs b/src/database/queries/list_ip_bans.rs similarity index 100% rename from src/common_queries/list_ip_bans.rs rename to src/database/queries/list_ip_bans.rs diff --git a/src/common_queries/list_tts_inference_results.rs b/src/database/queries/list_tts_inference_results.rs similarity index 100% rename from src/common_queries/list_tts_inference_results.rs rename to src/database/queries/list_tts_inference_results.rs diff --git a/src/common_queries/list_tts_models.rs b/src/database/queries/list_tts_models.rs similarity index 98% rename from src/common_queries/list_tts_models.rs rename to src/database/queries/list_tts_models.rs index a9468463d7..420a632c5a 100644 --- a/src/common_queries/list_tts_models.rs +++ b/src/database/queries/list_tts_models.rs @@ -1,9 +1,9 @@ use anyhow::anyhow; use chrono::{DateTime, Utc}; +use crate::database::helpers::boolean_converters::i8_to_bool; use crate::util::anyhow_result::AnyhowResult; use log::{warn, info}; use sqlx::MySqlPool; -use crate::database_helpers::boolean_converters::i8_to_bool; #[derive(Serialize)] pub struct TtsModelRecordForList { diff --git a/src/common_queries/list_user_badges.rs b/src/database/queries/list_user_badges.rs similarity index 100% rename from src/common_queries/list_user_badges.rs rename to src/database/queries/list_user_badges.rs diff --git a/src/common_queries/list_user_roles.rs b/src/database/queries/list_user_roles.rs similarity index 98% rename from src/common_queries/list_user_roles.rs rename to src/database/queries/list_user_roles.rs index a606f8b9fa..da4619f772 100644 --- a/src/common_queries/list_user_roles.rs +++ b/src/database/queries/list_user_roles.rs @@ -1,6 +1,6 @@ use anyhow::anyhow; use chrono::{DateTime, Utc}; -use crate::database_helpers::boolean_converters::{nullable_i8_to_optional_bool, i8_to_bool}; +use crate::database::helpers::boolean_converters::{nullable_i8_to_optional_bool, i8_to_bool}; use crate::util::anyhow_result::AnyhowResult; use log::{warn, info}; use sqlx::MySqlPool; diff --git a/src/common_queries/list_w2l_inference_results.rs b/src/database/queries/list_w2l_inference_results.rs similarity index 100% rename from src/common_queries/list_w2l_inference_results.rs rename to src/database/queries/list_w2l_inference_results.rs diff --git a/src/common_queries/list_w2l_templates.rs b/src/database/queries/list_w2l_templates.rs similarity index 98% rename from src/common_queries/list_w2l_templates.rs rename to src/database/queries/list_w2l_templates.rs index e294aa8f47..c403b8c244 100644 --- a/src/common_queries/list_w2l_templates.rs +++ b/src/database/queries/list_w2l_templates.rs @@ -1,9 +1,9 @@ use anyhow::anyhow; use chrono::{DateTime, Utc}; +use crate::database::helpers::boolean_converters::nullable_i8_to_optional_bool; use crate::util::anyhow_result::AnyhowResult; use log::{warn, info}; use sqlx::MySqlPool; -use crate::database_helpers::boolean_converters::nullable_i8_to_optional_bool; #[derive(Serialize)] pub struct W2lTemplateRecordForList { diff --git a/src/common_queries/mod.rs b/src/database/queries/mod.rs similarity index 75% rename from src/common_queries/mod.rs rename to src/database/queries/mod.rs index 0396d24fca..a74deffd40 100644 --- a/src/common_queries/mod.rs +++ b/src/database/queries/mod.rs @@ -1,7 +1,6 @@ -pub mod badge_granter; pub mod badges; +pub mod create_session; pub mod delete_tts_model; -pub mod firehose_publisher; pub mod list_ip_bans; pub mod list_tts_inference_results; pub mod list_tts_models; @@ -13,6 +12,4 @@ pub mod query_tts_model; pub mod query_tts_result; pub mod query_user_profile; pub mod query_w2l_result; -pub mod query_w2l_template; -pub mod sessions; -pub mod tokens; \ No newline at end of file +pub mod query_w2l_template; \ No newline at end of file diff --git a/src/common_queries/query_tts_model.rs b/src/database/queries/query_tts_model.rs similarity index 97% rename from src/common_queries/query_tts_model.rs rename to src/database/queries/query_tts_model.rs index 32db56d7bf..5eb2ab758d 100644 --- a/src/common_queries/query_tts_model.rs +++ b/src/database/queries/query_tts_model.rs @@ -1,8 +1,8 @@ use anyhow::anyhow; use chrono::{DateTime, Utc}; use crate::AnyhowResult; -use crate::database_helpers::boolean_converters::i8_to_bool; -use crate::database_helpers::boolean_converters::nullable_i8_to_optional_bool; +use crate::database::helpers::boolean_converters::i8_to_bool; +use crate::database::helpers::boolean_converters::nullable_i8_to_optional_bool; use derive_more::{Display, Error}; use log::{info, warn, log}; use regex::Regex; diff --git a/src/common_queries/query_tts_result.rs b/src/database/queries/query_tts_result.rs similarity index 98% rename from src/common_queries/query_tts_result.rs rename to src/database/queries/query_tts_result.rs index e6636a2d14..e1a82097b3 100644 --- a/src/common_queries/query_tts_result.rs +++ b/src/database/queries/query_tts_result.rs @@ -1,8 +1,8 @@ use anyhow::anyhow; use chrono::{DateTime, Utc}; use crate::AnyhowResult; -use crate::database_helpers::boolean_converters::i8_to_bool; -use crate::database_helpers::boolean_converters::nullable_i8_to_optional_bool; +use crate::database::helpers::boolean_converters::i8_to_bool; +use crate::database::helpers::boolean_converters::nullable_i8_to_optional_bool; use derive_more::{Display, Error}; use log::{info, warn, log}; use regex::Regex; diff --git a/src/common_queries/query_user_profile.rs b/src/database/queries/query_user_profile.rs similarity index 98% rename from src/common_queries/query_user_profile.rs rename to src/database/queries/query_user_profile.rs index 530b302158..b848460a56 100644 --- a/src/common_queries/query_user_profile.rs +++ b/src/database/queries/query_user_profile.rs @@ -1,16 +1,16 @@ use anyhow::anyhow; +use chrono::{DateTime, Utc}; use crate::AnyhowResult; +use crate::database::helpers::boolean_converters::i8_to_bool; use derive_more::{Display, Error}; use log::{info, warn, log}; +use md5::{Md5, Digest}; use regex::Regex; use sqlx::MySqlPool; use sqlx::error::DatabaseError; use sqlx::error::Error::Database; use sqlx::mysql::MySqlDatabaseError; use std::sync::Arc; -use chrono::{DateTime, Utc}; -use md5::{Md5, Digest}; -use crate::database_helpers::boolean_converters::i8_to_bool; // TODO: This duplicates the get_profile_handler. diff --git a/src/common_queries/query_w2l_result.rs b/src/database/queries/query_w2l_result.rs similarity index 98% rename from src/common_queries/query_w2l_result.rs rename to src/database/queries/query_w2l_result.rs index 8183d0d8f8..c3497301fd 100644 --- a/src/common_queries/query_w2l_result.rs +++ b/src/database/queries/query_w2l_result.rs @@ -1,8 +1,8 @@ use anyhow::anyhow; use chrono::{DateTime, Utc}; use crate::AnyhowResult; -use crate::database_helpers::boolean_converters::i8_to_bool; -use crate::database_helpers::boolean_converters::nullable_i8_to_optional_bool; +use crate::database::helpers::boolean_converters::i8_to_bool; +use crate::database::helpers::boolean_converters::nullable_i8_to_optional_bool; use derive_more::{Display, Error}; use log::{info, warn, log}; use regex::Regex; diff --git a/src/common_queries/query_w2l_template.rs b/src/database/queries/query_w2l_template.rs similarity index 97% rename from src/common_queries/query_w2l_template.rs rename to src/database/queries/query_w2l_template.rs index f544bc5d9b..cba7f16fde 100644 --- a/src/common_queries/query_w2l_template.rs +++ b/src/database/queries/query_w2l_template.rs @@ -1,8 +1,8 @@ use anyhow::anyhow; use chrono::{DateTime, Utc}; use crate::AnyhowResult; -use crate::database_helpers::boolean_converters::nullable_i8_to_optional_bool; -use crate::database_helpers::boolean_converters::i8_to_bool; +use crate::database::helpers::boolean_converters::i8_to_bool; +use crate::database::helpers::boolean_converters::nullable_i8_to_optional_bool; use derive_more::{Display, Error}; use log::{info, warn, log}; use regex::Regex; diff --git a/src/database_helpers/mod.rs b/src/database_helpers/mod.rs deleted file mode 100644 index b5f78fd29f..0000000000 --- a/src/database_helpers/mod.rs +++ /dev/null @@ -1,2 +0,0 @@ -pub mod boolean_converters; -pub mod enums; \ No newline at end of file diff --git a/src/http_server/endpoints/events/list_events.rs b/src/http_server/endpoints/events/list_events.rs index 3f1bdad007..847b1fff8b 100644 --- a/src/http_server/endpoints/events/list_events.rs +++ b/src/http_server/endpoints/events/list_events.rs @@ -7,11 +7,11 @@ use actix_web::http::StatusCode; use actix_web::{Responder, web, HttpResponse, error, HttpRequest, HttpMessage}; use chrono::{DateTime, Utc}; use crate::AnyhowResult; -use crate::common_queries::list_w2l_templates::{list_w2l_templates, W2lTemplateRecordForList}; -use crate::common_queries::sessions::create_session_for_user; +use crate::database::queries::list_w2l_templates::{list_w2l_templates, W2lTemplateRecordForList}; use crate::http_server::endpoints::users::create_account::CreateAccountError::{BadInput, ServerError, UsernameTaken, EmailTaken}; use crate::http_server::endpoints::users::login::LoginSuccessResponse; use crate::http_server::web_utils::ip_address::get_request_ip; +use crate::http_server::web_utils::response_error_helpers::to_simple_json_error; use crate::http_server::web_utils::session_checker::SessionRecord; use crate::server_state::ServerState; use crate::util::random_crockford_token::random_crockford_token; @@ -25,7 +25,6 @@ use sqlx::error::DatabaseError; use sqlx::error::Error::Database; use sqlx::mysql::MySqlDatabaseError; use std::sync::Arc; -use crate::http_server::web_utils::response_error_helpers::to_simple_json_error; #[derive(Serialize)] pub struct EventRecord { diff --git a/src/http_server/endpoints/moderation/ip_bans/add_ip_ban.rs b/src/http_server/endpoints/moderation/ip_bans/add_ip_ban.rs index 1788d140e3..99ea56639c 100644 --- a/src/http_server/endpoints/moderation/ip_bans/add_ip_ban.rs +++ b/src/http_server/endpoints/moderation/ip_bans/add_ip_ban.rs @@ -5,13 +5,14 @@ use actix_web::dev::HttpResponseBuilder; use actix_web::error::ResponseError; use actix_web::http::StatusCode; use actix_web::{Responder, web, HttpResponse, error, HttpRequest}; -use crate::database_helpers::enums::{DownloadUrlType, CreatorSetVisibility, W2lTemplateType}; +use crate::database::helpers::enums::{DownloadUrlType, CreatorSetVisibility, W2lTemplateType}; use crate::http_server::web_utils::ip_address::get_request_ip; use crate::http_server::web_utils::response_error_helpers::to_simple_json_error; use crate::http_server::web_utils::response_success_helpers::simple_json_success; use crate::server_state::ServerState; use crate::util::random_prefix_crockford_token::random_prefix_crockford_token; use crate::validations::check_for_slurs::contains_slurs; +use crate::validations::ip_addresses::validate_moderator_provided_ip_address; use crate::validations::model_uploads::validate_model_title; use crate::validations::passwords::validate_passwords; use crate::validations::username::validate_username; @@ -22,7 +23,6 @@ use sqlx::error::DatabaseError; use sqlx::error::Error::Database; use sqlx::mysql::MySqlDatabaseError; use std::sync::Arc; -use crate::validations::ip_addresses::validate_moderator_provided_ip_address; #[derive(Deserialize)] pub struct AddIpBanRequest { diff --git a/src/http_server/endpoints/moderation/ip_bans/delete_ip_ban.rs b/src/http_server/endpoints/moderation/ip_bans/delete_ip_ban.rs index 1aef770a33..348a922964 100644 --- a/src/http_server/endpoints/moderation/ip_bans/delete_ip_ban.rs +++ b/src/http_server/endpoints/moderation/ip_bans/delete_ip_ban.rs @@ -4,8 +4,9 @@ use actix_web::cookie::Cookie; use actix_web::dev::HttpResponseBuilder; use actix_web::error::ResponseError; use actix_web::http::StatusCode; +use actix_web::web::Path; use actix_web::{Responder, web, HttpResponse, error, HttpRequest}; -use crate::database_helpers::enums::{DownloadUrlType, CreatorSetVisibility, W2lTemplateType}; +use crate::database::helpers::enums::{DownloadUrlType, CreatorSetVisibility, W2lTemplateType}; use crate::http_server::web_utils::ip_address::get_request_ip; use crate::http_server::web_utils::response_error_helpers::to_simple_json_error; use crate::http_server::web_utils::response_success_helpers::simple_json_success; @@ -22,7 +23,6 @@ use sqlx::error::DatabaseError; use sqlx::error::Error::Database; use sqlx::mysql::MySqlDatabaseError; use std::sync::Arc; -use actix_web::web::Path; /// For the URL PathInfo #[derive(Deserialize)] diff --git a/src/http_server/endpoints/moderation/ip_bans/get_ip_ban.rs b/src/http_server/endpoints/moderation/ip_bans/get_ip_ban.rs index 9ed864f63e..5ba8b6bf2e 100644 --- a/src/http_server/endpoints/moderation/ip_bans/get_ip_ban.rs +++ b/src/http_server/endpoints/moderation/ip_bans/get_ip_ban.rs @@ -7,7 +7,7 @@ use actix_web::http::StatusCode; use actix_web::web::Path; use actix_web::{Responder, web, HttpResponse, error, HttpRequest}; use chrono::{DateTime, Utc}; -use crate::database_helpers::enums::{DownloadUrlType, CreatorSetVisibility, W2lTemplateType}; +use crate::database::helpers::enums::{DownloadUrlType, CreatorSetVisibility, W2lTemplateType}; use crate::http_server::web_utils::ip_address::get_request_ip; use crate::http_server::web_utils::response_error_helpers::to_simple_json_error; use crate::http_server::web_utils::response_success_helpers::simple_json_success; diff --git a/src/http_server/endpoints/moderation/ip_bans/list_ip_bans.rs b/src/http_server/endpoints/moderation/ip_bans/list_ip_bans.rs index 59cabe5bfd..ca2cebdca1 100644 --- a/src/http_server/endpoints/moderation/ip_bans/list_ip_bans.rs +++ b/src/http_server/endpoints/moderation/ip_bans/list_ip_bans.rs @@ -7,7 +7,7 @@ use actix_web::http::StatusCode; use actix_web::web::Path; use actix_web::{Responder, web, HttpResponse, error, HttpRequest}; use chrono::{DateTime, Utc}; -use crate::database_helpers::enums::{DownloadUrlType, CreatorSetVisibility, W2lTemplateType}; +use crate::database::helpers::enums::{DownloadUrlType, CreatorSetVisibility, W2lTemplateType}; use crate::http_server::web_utils::ip_address::get_request_ip; use crate::http_server::web_utils::response_error_helpers::to_simple_json_error; use crate::http_server::web_utils::response_success_helpers::simple_json_success; diff --git a/src/http_server/endpoints/moderation/user_roles/list_roles.rs b/src/http_server/endpoints/moderation/user_roles/list_roles.rs index 836f0b91bc..81c1262c5b 100644 --- a/src/http_server/endpoints/moderation/user_roles/list_roles.rs +++ b/src/http_server/endpoints/moderation/user_roles/list_roles.rs @@ -7,9 +7,9 @@ use actix_web::http::StatusCode; use actix_web::web::Path; use actix_web::{Responder, web, HttpResponse, error, HttpRequest}; use chrono::{DateTime, Utc}; -use crate::common_queries::list_user_roles::UserRoleForList; -use crate::common_queries::list_user_roles::list_user_roles; -use crate::database_helpers::enums::{DownloadUrlType, CreatorSetVisibility, W2lTemplateType}; +use crate::database::helpers::enums::{DownloadUrlType, CreatorSetVisibility, W2lTemplateType}; +use crate::database::queries::list_user_roles::UserRoleForList; +use crate::database::queries::list_user_roles::list_user_roles; use crate::http_server::web_utils::ip_address::get_request_ip; use crate::http_server::web_utils::response_error_helpers::to_simple_json_error; use crate::http_server::web_utils::response_success_helpers::simple_json_success; diff --git a/src/http_server/endpoints/moderation/user_roles/list_staff.rs b/src/http_server/endpoints/moderation/user_roles/list_staff.rs index 3c21a63977..9a43ba5afd 100644 --- a/src/http_server/endpoints/moderation/user_roles/list_staff.rs +++ b/src/http_server/endpoints/moderation/user_roles/list_staff.rs @@ -7,7 +7,7 @@ use actix_web::http::StatusCode; use actix_web::web::Path; use actix_web::{Responder, web, HttpResponse, error, HttpRequest}; use chrono::{DateTime, Utc}; -use crate::database_helpers::enums::{DownloadUrlType, CreatorSetVisibility, W2lTemplateType}; +use crate::database::helpers::enums::{DownloadUrlType, CreatorSetVisibility, W2lTemplateType}; use crate::http_server::web_utils::ip_address::get_request_ip; use crate::http_server::web_utils::response_error_helpers::to_simple_json_error; use crate::http_server::web_utils::response_success_helpers::simple_json_success; diff --git a/src/http_server/endpoints/moderation/user_roles/set_user_role.rs b/src/http_server/endpoints/moderation/user_roles/set_user_role.rs index d07942f284..0fdf59f97f 100644 --- a/src/http_server/endpoints/moderation/user_roles/set_user_role.rs +++ b/src/http_server/endpoints/moderation/user_roles/set_user_role.rs @@ -6,10 +6,12 @@ use actix_web::error::ResponseError; use actix_web::http::StatusCode; use actix_web::web::Path; use actix_web::{Responder, web, HttpResponse, error, HttpRequest}; -use crate::common_queries::query_user_profile::select_user_profile_by_username; -use crate::common_queries::list_user_roles::list_user_roles; -use crate::database_helpers::enums::{DownloadUrlType, CreatorSetVisibility, W2lTemplateType}; +use crate::database::helpers::enums::{DownloadUrlType, CreatorSetVisibility, W2lTemplateType}; +use crate::database::queries::list_user_roles::list_user_roles; +use crate::database::queries::query_user_profile::select_user_profile_by_username; use crate::http_server::web_utils::ip_address::get_request_ip; +use crate::http_server::web_utils::response_error_helpers::to_simple_json_error; +use crate::http_server::web_utils::response_success_helpers::simple_json_success; use crate::server_state::ServerState; use crate::util::random_crockford_token::random_crockford_token; use crate::validations::model_uploads::validate_model_title; @@ -22,8 +24,6 @@ use sqlx::error::DatabaseError; use sqlx::error::Error::Database; use sqlx::mysql::MySqlDatabaseError; use std::sync::Arc; -use crate::http_server::web_utils::response_error_helpers::to_simple_json_error; -use crate::http_server::web_utils::response_success_helpers::simple_json_success; /// For the URL PathInfo #[derive(Deserialize)] diff --git a/src/http_server/endpoints/tts/delete_tts_model.rs b/src/http_server/endpoints/tts/delete_tts_model.rs index f254615c77..4e3d77d9d3 100644 --- a/src/http_server/endpoints/tts/delete_tts_model.rs +++ b/src/http_server/endpoints/tts/delete_tts_model.rs @@ -6,12 +6,12 @@ use actix_web::error::ResponseError; use actix_web::http::StatusCode; use actix_web::web::Path; use actix_web::{Responder, web, HttpResponse, error, HttpRequest}; -use crate::common_queries::delete_tts_model::delete_tts_model_as_mod; -use crate::common_queries::delete_tts_model::delete_tts_model_as_user; -use crate::common_queries::delete_tts_model::undelete_tts_model_as_mod; -use crate::common_queries::delete_tts_model::undelete_tts_model_as_user; -use crate::common_queries::query_tts_model::select_tts_model_by_token; -use crate::common_queries::query_tts_result::select_tts_result_by_token; +use crate::database::queries::delete_tts_model::delete_tts_model_as_mod; +use crate::database::queries::delete_tts_model::delete_tts_model_as_user; +use crate::database::queries::delete_tts_model::undelete_tts_model_as_mod; +use crate::database::queries::delete_tts_model::undelete_tts_model_as_user; +use crate::database::queries::query_tts_model::select_tts_model_by_token; +use crate::database::queries::query_tts_result::select_tts_result_by_token; use crate::http_server::web_utils::ip_address::get_request_ip; use crate::http_server::web_utils::response_error_helpers::to_simple_json_error; use crate::http_server::web_utils::response_success_helpers::simple_json_success; diff --git a/src/http_server/endpoints/tts/delete_tts_result.rs b/src/http_server/endpoints/tts/delete_tts_result.rs index 3dc15cf2e7..6111a0665f 100644 --- a/src/http_server/endpoints/tts/delete_tts_result.rs +++ b/src/http_server/endpoints/tts/delete_tts_result.rs @@ -6,7 +6,7 @@ use actix_web::error::ResponseError; use actix_web::http::StatusCode; use actix_web::web::Path; use actix_web::{Responder, web, HttpResponse, error, HttpRequest}; -use crate::common_queries::query_tts_result::select_tts_result_by_token; +use crate::database::queries::query_tts_result::select_tts_result_by_token; use crate::http_server::web_utils::ip_address::get_request_ip; use crate::http_server::web_utils::response_error_helpers::to_simple_json_error; use crate::http_server::web_utils::response_success_helpers::simple_json_success; diff --git a/src/http_server/endpoints/tts/edit_tts_model.rs b/src/http_server/endpoints/tts/edit_tts_model.rs index 47c733a147..68029a2f5d 100644 --- a/src/http_server/endpoints/tts/edit_tts_model.rs +++ b/src/http_server/endpoints/tts/edit_tts_model.rs @@ -6,8 +6,7 @@ use actix_web::error::ResponseError; use actix_web::http::StatusCode; use actix_web::web::{Path, Json}; use actix_web::{Responder, web, HttpResponse, error, HttpRequest}; -use crate::common_queries::query_tts_model::select_tts_model_by_token; -use crate::common_queries::sessions::create_session_for_user; +use crate::database::queries::query_tts_model::select_tts_model_by_token; use crate::http_server::web_utils::ip_address::get_request_ip; use crate::http_server::web_utils::response_error_helpers::to_simple_json_error; use crate::http_server::web_utils::response_success_helpers::simple_json_success; @@ -20,11 +19,11 @@ use crate::validations::check_for_slurs::contains_slurs; use derive_more::{Display, Error}; use log::{info, warn, log}; use regex::Regex; +use sqlx::MySqlPool; use sqlx::error::DatabaseError; use sqlx::error::Error::Database; use sqlx::mysql::MySqlDatabaseError; use std::sync::Arc; -use sqlx::MySqlPool; /// For the URL PathInfo #[derive(Deserialize)] diff --git a/src/http_server/endpoints/tts/enqueue_infer_tts.rs b/src/http_server/endpoints/tts/enqueue_infer_tts.rs index 07297108a5..ea221ff696 100644 --- a/src/http_server/endpoints/tts/enqueue_infer_tts.rs +++ b/src/http_server/endpoints/tts/enqueue_infer_tts.rs @@ -5,8 +5,8 @@ use actix_web::dev::HttpResponseBuilder; use actix_web::error::ResponseError; use actix_web::http::StatusCode; use actix_web::{Responder, web, HttpResponse, error, HttpRequest}; -use crate::common_queries::tokens::Tokens; -use crate::database_helpers::enums::{DownloadUrlType, CreatorSetVisibility, W2lTemplateType}; +use crate::database::helpers::enums::{DownloadUrlType, CreatorSetVisibility, W2lTemplateType}; +use crate::database::helpers::tokens::Tokens; use crate::http_server::web_utils::ip_address::get_request_ip; use crate::http_server::web_utils::response_error_helpers::to_simple_json_error; use crate::server_state::ServerState; diff --git a/src/http_server/endpoints/tts/enqueue_upload_tts_model.rs b/src/http_server/endpoints/tts/enqueue_upload_tts_model.rs index 6614dcfbb7..0747e85529 100644 --- a/src/http_server/endpoints/tts/enqueue_upload_tts_model.rs +++ b/src/http_server/endpoints/tts/enqueue_upload_tts_model.rs @@ -5,8 +5,8 @@ use actix_web::dev::HttpResponseBuilder; use actix_web::error::ResponseError; use actix_web::http::StatusCode; use actix_web::{Responder, web, HttpResponse, error, HttpRequest}; -use crate::common_queries::tokens::Tokens; -use crate::database_helpers::enums::{DownloadUrlType, TtsModelType, CreatorSetVisibility}; +use crate::database::helpers::enums::{DownloadUrlType, TtsModelType, CreatorSetVisibility}; +use crate::database::helpers::tokens::Tokens; use crate::http_server::web_utils::ip_address::get_request_ip; use crate::http_server::web_utils::response_error_helpers::to_simple_json_error; use crate::server_state::ServerState; diff --git a/src/http_server/endpoints/tts/get_tts_inference_job_status.rs b/src/http_server/endpoints/tts/get_tts_inference_job_status.rs index 33de8929c4..c74a66dc34 100644 --- a/src/http_server/endpoints/tts/get_tts_inference_job_status.rs +++ b/src/http_server/endpoints/tts/get_tts_inference_job_status.rs @@ -8,10 +8,10 @@ use actix_web::web::Path; use actix_web::{Responder, web, HttpResponse, error, HttpRequest, HttpMessage}; use chrono::{DateTime, Utc}; use crate::AnyhowResult; -use crate::common_queries::sessions::create_session_for_user; use crate::http_server::endpoints::users::create_account::CreateAccountError::{BadInput, ServerError, UsernameTaken, EmailTaken}; use crate::http_server::endpoints::users::login::LoginSuccessResponse; use crate::http_server::web_utils::ip_address::get_request_ip; +use crate::http_server::web_utils::response_error_helpers::to_simple_json_error; use crate::http_server::web_utils::session_checker::SessionRecord; use crate::server_state::ServerState; use crate::util::random_crockford_token::random_crockford_token; @@ -25,7 +25,6 @@ use sqlx::error::DatabaseError; use sqlx::error::Error::Database; use sqlx::mysql::MySqlDatabaseError; use std::sync::Arc; -use crate::http_server::web_utils::response_error_helpers::to_simple_json_error; /// For the URL PathInfo #[derive(Deserialize)] diff --git a/src/http_server/endpoints/tts/get_tts_model.rs b/src/http_server/endpoints/tts/get_tts_model.rs index bbaf138d5b..f20effb37e 100644 --- a/src/http_server/endpoints/tts/get_tts_model.rs +++ b/src/http_server/endpoints/tts/get_tts_model.rs @@ -8,9 +8,8 @@ use actix_web::web::Path; use actix_web::{Responder, web, HttpResponse, error, HttpRequest, HttpMessage}; use chrono::{DateTime, Utc}; use crate::AnyhowResult; -use crate::common_queries::query_tts_model::TtsModelRecordForResponse; -use crate::common_queries::query_tts_model::select_tts_model_by_token; -use crate::common_queries::sessions::create_session_for_user; +use crate::database::queries::query_tts_model::TtsModelRecordForResponse; +use crate::database::queries::query_tts_model::select_tts_model_by_token; use crate::http_server::endpoints::users::create_account::CreateAccountError::{BadInput, ServerError, UsernameTaken, EmailTaken}; use crate::http_server::endpoints::users::login::LoginSuccessResponse; use crate::http_server::web_utils::ip_address::get_request_ip; diff --git a/src/http_server/endpoints/tts/get_tts_model_use_count.rs b/src/http_server/endpoints/tts/get_tts_model_use_count.rs index 1610c235b4..00d5109827 100644 --- a/src/http_server/endpoints/tts/get_tts_model_use_count.rs +++ b/src/http_server/endpoints/tts/get_tts_model_use_count.rs @@ -8,7 +8,6 @@ use actix_web::web::Path; use actix_web::{Responder, web, HttpResponse, error, HttpRequest, HttpMessage}; use chrono::{DateTime, Utc}; use crate::AnyhowResult; -use crate::common_queries::sessions::create_session_for_user; use crate::http_server::endpoints::users::create_account::CreateAccountError::{BadInput, ServerError, UsernameTaken, EmailTaken}; use crate::http_server::endpoints::users::login::LoginSuccessResponse; use crate::http_server::web_utils::ip_address::get_request_ip; diff --git a/src/http_server/endpoints/tts/get_tts_result.rs b/src/http_server/endpoints/tts/get_tts_result.rs index fdf6597276..7124f7c737 100644 --- a/src/http_server/endpoints/tts/get_tts_result.rs +++ b/src/http_server/endpoints/tts/get_tts_result.rs @@ -8,10 +8,10 @@ use actix_web::web::Path; use actix_web::{Responder, web, HttpResponse, error, HttpRequest, HttpMessage}; use chrono::{DateTime, Utc}; use crate::AnyhowResult; -use crate::common_queries::query_tts_result::TtsResultRecordForResponse; -use crate::common_queries::query_tts_result::select_tts_result_by_token; -use crate::common_queries::sessions::create_session_for_user; +use crate::database::queries::query_tts_result::TtsResultRecordForResponse; +use crate::database::queries::query_tts_result::select_tts_result_by_token; use crate::http_server::web_utils::ip_address::get_request_ip; +use crate::http_server::web_utils::response_error_helpers::to_simple_json_error; use crate::http_server::web_utils::session_checker::SessionRecord; use crate::server_state::ServerState; use crate::util::random_crockford_token::random_crockford_token; @@ -25,7 +25,6 @@ use sqlx::error::DatabaseError; use sqlx::error::Error::Database; use sqlx::mysql::MySqlDatabaseError; use std::sync::Arc; -use crate::http_server::web_utils::response_error_helpers::to_simple_json_error; /// For the URL PathInfo #[derive(Deserialize)] diff --git a/src/http_server/endpoints/tts/get_tts_upload_model_job_status.rs b/src/http_server/endpoints/tts/get_tts_upload_model_job_status.rs index cbde835a1a..877698df2b 100644 --- a/src/http_server/endpoints/tts/get_tts_upload_model_job_status.rs +++ b/src/http_server/endpoints/tts/get_tts_upload_model_job_status.rs @@ -8,10 +8,10 @@ use actix_web::web::Path; use actix_web::{Responder, web, HttpResponse, error, HttpRequest, HttpMessage}; use chrono::{DateTime, Utc}; use crate::AnyhowResult; -use crate::common_queries::sessions::create_session_for_user; use crate::http_server::endpoints::users::create_account::CreateAccountError::{BadInput, ServerError, UsernameTaken, EmailTaken}; use crate::http_server::endpoints::users::login::LoginSuccessResponse; use crate::http_server::web_utils::ip_address::get_request_ip; +use crate::http_server::web_utils::response_error_helpers::to_simple_json_error; use crate::http_server::web_utils::session_checker::SessionRecord; use crate::server_state::ServerState; use crate::util::random_crockford_token::random_crockford_token; @@ -25,7 +25,6 @@ use sqlx::error::DatabaseError; use sqlx::error::Error::Database; use sqlx::mysql::MySqlDatabaseError; use std::sync::Arc; -use crate::http_server::web_utils::response_error_helpers::to_simple_json_error; /// For the URL PathInfo #[derive(Deserialize)] diff --git a/src/http_server/endpoints/tts/list_tts_models.rs b/src/http_server/endpoints/tts/list_tts_models.rs index 9e947487e6..4ad973581d 100644 --- a/src/http_server/endpoints/tts/list_tts_models.rs +++ b/src/http_server/endpoints/tts/list_tts_models.rs @@ -5,11 +5,12 @@ use actix_web::dev::HttpResponseBuilder; use actix_web::error::ResponseError; use actix_web::http::StatusCode; use actix_web::{Responder, web, HttpResponse, error, HttpRequest, HttpMessage}; +use chrono::{DateTime, Utc}; use crate::AnyhowResult; -use crate::common_queries::sessions::create_session_for_user; use crate::http_server::endpoints::users::create_account::CreateAccountError::{BadInput, ServerError, UsernameTaken, EmailTaken}; use crate::http_server::endpoints::users::login::LoginSuccessResponse; use crate::http_server::web_utils::ip_address::get_request_ip; +use crate::http_server::web_utils::response_error_helpers::to_simple_json_error; use crate::http_server::web_utils::session_checker::SessionRecord; use crate::server_state::ServerState; use crate::util::random_crockford_token::random_crockford_token; @@ -23,8 +24,6 @@ use sqlx::error::DatabaseError; use sqlx::error::Error::Database; use sqlx::mysql::MySqlDatabaseError; use std::sync::Arc; -use chrono::{DateTime, Utc}; -use crate::http_server::web_utils::response_error_helpers::to_simple_json_error; #[derive(Serialize)] pub struct TtsModelRecordForResponse { diff --git a/src/http_server/endpoints/users/create_account.rs b/src/http_server/endpoints/users/create_account.rs index e077105def..6729cfe7d0 100644 --- a/src/http_server/endpoints/users/create_account.rs +++ b/src/http_server/endpoints/users/create_account.rs @@ -5,13 +5,19 @@ use actix_web::dev::HttpResponseBuilder; use actix_web::error::ResponseError; use actix_web::http::StatusCode; use actix_web::{Responder, web, HttpResponse, error, HttpRequest}; -use crate::common_queries::sessions::create_session_for_user; +use crate::database::helpers::tokens::Tokens; +use crate::database::queries::create_session::create_session_for_user; use crate::http_server::endpoints::users::create_account::CreateAccountError::{BadInput, ServerError, UsernameTaken, EmailTaken}; use crate::http_server::web_utils::ip_address::get_request_ip; +use crate::http_server::web_utils::response_error_helpers::to_simple_json_error; use crate::server_state::ServerState; +use crate::util::email_to_gravatar::email_to_gravatar; use crate::util::random_crockford_token::random_crockford_token; +use crate::util::random_prefix_crockford_token::random_prefix_crockford_token; +use crate::validations::check_for_slurs::contains_slurs; use crate::validations::passwords::validate_passwords; use crate::validations::username::validate_username; +use crate::validations::username_reservations::is_reserved_username; use derive_more::{Display, Error}; use log::{info, warn, log}; use regex::Regex; @@ -19,12 +25,6 @@ use sqlx::error::DatabaseError; use sqlx::error::Error::Database; use sqlx::mysql::MySqlDatabaseError; use std::sync::Arc; -use crate::util::email_to_gravatar::email_to_gravatar; -use crate::validations::username_reservations::is_reserved_username; -use crate::util::random_prefix_crockford_token::random_prefix_crockford_token; -use crate::validations::check_for_slurs::contains_slurs; -use crate::http_server::web_utils::response_error_helpers::to_simple_json_error; -use crate::common_queries::tokens::Tokens; const NEW_USER_ROLE: &'static str = "user"; diff --git a/src/http_server/endpoints/users/edit_profile.rs b/src/http_server/endpoints/users/edit_profile.rs index 2ece9f5c35..b0b9e55a0a 100644 --- a/src/http_server/endpoints/users/edit_profile.rs +++ b/src/http_server/endpoints/users/edit_profile.rs @@ -6,8 +6,10 @@ use actix_web::error::ResponseError; use actix_web::http::StatusCode; use actix_web::web::Path; use actix_web::{Responder, web, HttpResponse, error, HttpRequest}; -use crate::common_queries::sessions::create_session_for_user; +use crate::database::queries::create_session::create_session_for_user; +use crate::database::queries::query_user_profile::select_user_profile_by_username; use crate::http_server::web_utils::ip_address::get_request_ip; +use crate::http_server::web_utils::response_error_helpers::to_simple_json_error; use crate::server_state::ServerState; use crate::util::email_to_gravatar::email_to_gravatar; use crate::util::markdown_to_html::markdown_to_html; @@ -30,8 +32,6 @@ use sqlx::error::DatabaseError; use sqlx::error::Error::Database; use sqlx::mysql::MySqlDatabaseError; use std::sync::Arc; -use crate::common_queries::query_user_profile::select_user_profile_by_username; -use crate::http_server::web_utils::response_error_helpers::to_simple_json_error; /// For the URL PathInfo #[derive(Deserialize)] diff --git a/src/http_server/endpoints/users/get_profile.rs b/src/http_server/endpoints/users/get_profile.rs index 318ee98f62..4981f8c812 100644 --- a/src/http_server/endpoints/users/get_profile.rs +++ b/src/http_server/endpoints/users/get_profile.rs @@ -9,10 +9,9 @@ use actix_web::{Responder, web, HttpResponse, error, HttpRequest, HttpMessage}; use anyhow::anyhow; use chrono::{DateTime, Utc}; use crate::AnyhowResult; -use crate::common_queries::list_user_badges::UserBadgeForList; -use crate::common_queries::list_user_badges::list_user_badges; -use crate::common_queries::sessions::create_session_for_user; -use crate::database_helpers::boolean_converters::i8_to_bool; +use crate::database::helpers::boolean_converters::i8_to_bool; +use crate::database::queries::list_user_badges::UserBadgeForList; +use crate::database::queries::list_user_badges::list_user_badges; use crate::http_server::endpoints::users::create_account::CreateAccountError::{BadInput, ServerError, UsernameTaken, EmailTaken}; use crate::http_server::endpoints::users::login::LoginSuccessResponse; use crate::http_server::web_utils::ip_address::get_request_ip; diff --git a/src/http_server/endpoints/users/list_user_tts_inference_results.rs b/src/http_server/endpoints/users/list_user_tts_inference_results.rs index cfc3de9c07..4086f10b20 100644 --- a/src/http_server/endpoints/users/list_user_tts_inference_results.rs +++ b/src/http_server/endpoints/users/list_user_tts_inference_results.rs @@ -8,9 +8,9 @@ use actix_web::web::{Path, Query}; use actix_web::{Responder, web, HttpResponse, error, HttpRequest, HttpMessage}; use chrono::{DateTime, Utc}; use crate::AnyhowResult; -use crate::common_queries::list_tts_inference_results::ListTtsResultsQueryBuilder; -use crate::common_queries::list_tts_inference_results::TtsInferenceRecordForList; -use crate::common_queries::sessions::create_session_for_user; +use crate::database::queries::create_session::create_session_for_user; +use crate::database::queries::list_tts_inference_results::ListTtsResultsQueryBuilder; +use crate::database::queries::list_tts_inference_results::TtsInferenceRecordForList; use crate::http_server::endpoints::users::create_account::CreateAccountError::{BadInput, ServerError, UsernameTaken, EmailTaken}; use crate::http_server::endpoints::users::login::LoginSuccessResponse; use crate::http_server::web_utils::ip_address::get_request_ip; diff --git a/src/http_server/endpoints/users/list_user_tts_models.rs b/src/http_server/endpoints/users/list_user_tts_models.rs index 3024060668..17cf9544e0 100644 --- a/src/http_server/endpoints/users/list_user_tts_models.rs +++ b/src/http_server/endpoints/users/list_user_tts_models.rs @@ -8,11 +8,11 @@ use actix_web::web::Path; use actix_web::{Responder, web, HttpResponse, error, HttpRequest, HttpMessage}; use chrono::{DateTime, Utc}; use crate::AnyhowResult; -use crate::common_queries::list_tts_models::{TtsModelRecordForList, list_tts_models}; -use crate::common_queries::sessions::create_session_for_user; +use crate::database::queries::list_tts_models::{TtsModelRecordForList, list_tts_models}; use crate::http_server::endpoints::users::create_account::CreateAccountError::{BadInput, ServerError, UsernameTaken, EmailTaken}; use crate::http_server::endpoints::users::login::LoginSuccessResponse; use crate::http_server::web_utils::ip_address::get_request_ip; +use crate::http_server::web_utils::response_error_helpers::to_simple_json_error; use crate::http_server::web_utils::session_checker::SessionRecord; use crate::server_state::ServerState; use crate::util::random_crockford_token::random_crockford_token; @@ -26,7 +26,6 @@ use sqlx::error::DatabaseError; use sqlx::error::Error::Database; use sqlx::mysql::MySqlDatabaseError; use std::sync::Arc; -use crate::http_server::web_utils::response_error_helpers::to_simple_json_error; /// For the URL PathInfo #[derive(Deserialize)] diff --git a/src/http_server/endpoints/users/list_user_w2l_inference_results.rs b/src/http_server/endpoints/users/list_user_w2l_inference_results.rs index d8adb03969..5413459842 100644 --- a/src/http_server/endpoints/users/list_user_w2l_inference_results.rs +++ b/src/http_server/endpoints/users/list_user_w2l_inference_results.rs @@ -4,15 +4,16 @@ use actix_web::cookie::Cookie; use actix_web::dev::HttpResponseBuilder; use actix_web::error::ResponseError; use actix_web::http::StatusCode; +use actix_web::web::{Path, Query}; use actix_web::{Responder, web, HttpResponse, error, HttpRequest, HttpMessage}; use chrono::{DateTime, Utc}; use crate::AnyhowResult; -use crate::common_queries::list_w2l_inference_results::W2lInferenceRecordForList; -use crate::common_queries::list_w2l_inference_results::ListW2lResultsQueryBuilder; -use crate::common_queries::sessions::create_session_for_user; +use crate::database::queries::list_w2l_inference_results::ListW2lResultsQueryBuilder; +use crate::database::queries::list_w2l_inference_results::W2lInferenceRecordForList; use crate::http_server::endpoints::users::create_account::CreateAccountError::{BadInput, ServerError, UsernameTaken, EmailTaken}; use crate::http_server::endpoints::users::login::LoginSuccessResponse; use crate::http_server::web_utils::ip_address::get_request_ip; +use crate::http_server::web_utils::response_error_helpers::to_simple_json_error; use crate::http_server::web_utils::session_checker::SessionRecord; use crate::server_state::ServerState; use crate::util::random_crockford_token::random_crockford_token; @@ -26,8 +27,6 @@ use sqlx::error::DatabaseError; use sqlx::error::Error::Database; use sqlx::mysql::MySqlDatabaseError; use std::sync::Arc; -use actix_web::web::{Path, Query}; -use crate::http_server::web_utils::response_error_helpers::to_simple_json_error; /// For the URL PathInfo #[derive(Deserialize)] diff --git a/src/http_server/endpoints/users/list_user_w2l_templates.rs b/src/http_server/endpoints/users/list_user_w2l_templates.rs index 30b13dd5c0..f4f0e78931 100644 --- a/src/http_server/endpoints/users/list_user_w2l_templates.rs +++ b/src/http_server/endpoints/users/list_user_w2l_templates.rs @@ -4,14 +4,15 @@ use actix_web::cookie::Cookie; use actix_web::dev::HttpResponseBuilder; use actix_web::error::ResponseError; use actix_web::http::StatusCode; +use actix_web::web::Path; use actix_web::{Responder, web, HttpResponse, error, HttpRequest, HttpMessage}; use chrono::{DateTime, Utc}; use crate::AnyhowResult; -use crate::common_queries::list_w2l_templates::{W2lTemplateRecordForList, list_w2l_templates}; -use crate::common_queries::sessions::create_session_for_user; +use crate::database::queries::list_w2l_templates::{W2lTemplateRecordForList, list_w2l_templates}; use crate::http_server::endpoints::users::create_account::CreateAccountError::{BadInput, ServerError, UsernameTaken, EmailTaken}; use crate::http_server::endpoints::users::login::LoginSuccessResponse; use crate::http_server::web_utils::ip_address::get_request_ip; +use crate::http_server::web_utils::response_error_helpers::to_simple_json_error; use crate::http_server::web_utils::session_checker::SessionRecord; use crate::server_state::ServerState; use crate::util::random_crockford_token::random_crockford_token; @@ -25,8 +26,6 @@ use sqlx::error::DatabaseError; use sqlx::error::Error::Database; use sqlx::mysql::MySqlDatabaseError; use std::sync::Arc; -use actix_web::web::Path; -use crate::http_server::web_utils::response_error_helpers::to_simple_json_error; /// For the URL PathInfo #[derive(Deserialize)] diff --git a/src/http_server/endpoints/users/login.rs b/src/http_server/endpoints/users/login.rs index 71d8258a93..848e551dbb 100644 --- a/src/http_server/endpoints/users/login.rs +++ b/src/http_server/endpoints/users/login.rs @@ -6,11 +6,11 @@ use actix_web::error::ResponseError; use actix_web::http::StatusCode; use actix_web::{Responder, web, HttpResponse, error, HttpRequest}; use crate::AnyhowResult; -use crate::common_queries::sessions::create_session_for_user; +use crate::database::queries::create_session::create_session_for_user; use crate::http_server::endpoints::users::create_account::CreateAccountError::{BadInput, ServerError, UsernameTaken, EmailTaken}; use crate::http_server::web_utils::ip_address::get_request_ip; +use crate::http_server::web_utils::response_error_helpers::to_simple_json_error; use crate::server_state::ServerState; -use crate::util::random_crockford_token::random_crockford_token; use crate::validations::passwords::validate_passwords; use crate::validations::username::validate_username; use derive_more::{Display, Error}; @@ -21,7 +21,6 @@ use sqlx::error::DatabaseError; use sqlx::error::Error::Database; use sqlx::mysql::MySqlDatabaseError; use std::sync::Arc; -use crate::http_server::web_utils::response_error_helpers::to_simple_json_error; #[derive(Deserialize)] pub struct LoginRequest { diff --git a/src/http_server/endpoints/users/logout.rs b/src/http_server/endpoints/users/logout.rs index 32ee04d7de..18fb79d47f 100644 --- a/src/http_server/endpoints/users/logout.rs +++ b/src/http_server/endpoints/users/logout.rs @@ -6,10 +6,10 @@ use actix_web::error::ResponseError; use actix_web::http::StatusCode; use actix_web::{Responder, web, HttpResponse, error, HttpRequest, HttpMessage}; use crate::AnyhowResult; -use crate::common_queries::sessions::create_session_for_user; use crate::http_server::endpoints::users::create_account::CreateAccountError::{BadInput, ServerError, UsernameTaken, EmailTaken}; use crate::http_server::endpoints::users::login::LoginSuccessResponse; use crate::http_server::web_utils::ip_address::get_request_ip; +use crate::http_server::web_utils::response_error_helpers::to_simple_json_error; use crate::server_state::ServerState; use crate::util::random_crockford_token::random_crockford_token; use crate::validations::passwords::validate_passwords; @@ -22,7 +22,6 @@ use sqlx::error::DatabaseError; use sqlx::error::Error::Database; use sqlx::mysql::MySqlDatabaseError; use std::sync::Arc; -use crate::http_server::web_utils::response_error_helpers::to_simple_json_error; #[derive(Serialize)] pub struct LogoutSuccessResponse { diff --git a/src/http_server/endpoints/users/session_info.rs b/src/http_server/endpoints/users/session_info.rs index 76697f4678..712cf9a46b 100644 --- a/src/http_server/endpoints/users/session_info.rs +++ b/src/http_server/endpoints/users/session_info.rs @@ -6,10 +6,10 @@ use actix_web::error::ResponseError; use actix_web::http::StatusCode; use actix_web::{Responder, web, HttpResponse, error, HttpRequest, HttpMessage}; use crate::AnyhowResult; -use crate::common_queries::sessions::create_session_for_user; use crate::http_server::endpoints::users::create_account::CreateAccountError::{BadInput, ServerError, UsernameTaken, EmailTaken}; use crate::http_server::endpoints::users::login::LoginSuccessResponse; use crate::http_server::web_utils::ip_address::get_request_ip; +use crate::http_server::web_utils::response_error_helpers::to_simple_json_error; use crate::http_server::web_utils::session_checker::SessionRecord; use crate::server_state::ServerState; use crate::util::random_crockford_token::random_crockford_token; @@ -23,7 +23,6 @@ use sqlx::error::DatabaseError; use sqlx::error::Error::Database; use sqlx::mysql::MySqlDatabaseError; use std::sync::Arc; -use crate::http_server::web_utils::response_error_helpers::to_simple_json_error; #[derive(Serialize)] pub struct UserInfo { diff --git a/src/http_server/endpoints/w2l/delete_w2l_result.rs b/src/http_server/endpoints/w2l/delete_w2l_result.rs index 7fa7b9216d..7315b7f14a 100644 --- a/src/http_server/endpoints/w2l/delete_w2l_result.rs +++ b/src/http_server/endpoints/w2l/delete_w2l_result.rs @@ -6,12 +6,11 @@ use actix_web::error::ResponseError; use actix_web::http::StatusCode; use actix_web::web::Path; use actix_web::{Responder, web, HttpResponse, error, HttpRequest}; -use crate::common_queries::query_w2l_result::select_w2l_result_by_token; +use crate::database::queries::query_w2l_result::select_w2l_result_by_token; use crate::http_server::web_utils::ip_address::get_request_ip; use crate::http_server::web_utils::response_error_helpers::to_simple_json_error; use crate::http_server::web_utils::response_success_helpers::simple_json_success; use crate::server_state::ServerState; -use crate::util::random_crockford_token::random_crockford_token; use crate::validations::model_uploads::validate_model_title; use crate::validations::passwords::validate_passwords; use crate::validations::username::validate_username; diff --git a/src/http_server/endpoints/w2l/delete_w2l_template.rs b/src/http_server/endpoints/w2l/delete_w2l_template.rs index 5033aa2193..b111eb2198 100644 --- a/src/http_server/endpoints/w2l/delete_w2l_template.rs +++ b/src/http_server/endpoints/w2l/delete_w2l_template.rs @@ -6,9 +6,11 @@ use actix_web::error::ResponseError; use actix_web::http::StatusCode; use actix_web::web::Path; use actix_web::{Responder, web, HttpResponse, error, HttpRequest}; -use crate::common_queries::query_w2l_template::select_w2l_template_by_token; -use crate::database_helpers::enums::{DownloadUrlType, CreatorSetVisibility, W2lTemplateType}; +use crate::database::helpers::enums::{DownloadUrlType, CreatorSetVisibility, W2lTemplateType}; +use crate::database::queries::query_w2l_template::select_w2l_template_by_token; use crate::http_server::web_utils::ip_address::get_request_ip; +use crate::http_server::web_utils::response_error_helpers::to_simple_json_error; +use crate::http_server::web_utils::response_success_helpers::simple_json_success; use crate::server_state::ServerState; use crate::util::random_crockford_token::random_crockford_token; use crate::validations::model_uploads::validate_model_title; @@ -17,13 +19,11 @@ use crate::validations::username::validate_username; use derive_more::{Display, Error}; use log::{info, warn, log}; use regex::Regex; +use sqlx::MySqlPool; use sqlx::error::DatabaseError; use sqlx::error::Error::Database; use sqlx::mysql::MySqlDatabaseError; use std::sync::Arc; -use sqlx::MySqlPool; -use crate::http_server::web_utils::response_success_helpers::simple_json_success; -use crate::http_server::web_utils::response_error_helpers::to_simple_json_error; /// For the URL PathInfo #[derive(Deserialize)] diff --git a/src/http_server/endpoints/w2l/edit_w2l_template.rs b/src/http_server/endpoints/w2l/edit_w2l_template.rs index 86ebc0fbb2..a71e9ad0f8 100644 --- a/src/http_server/endpoints/w2l/edit_w2l_template.rs +++ b/src/http_server/endpoints/w2l/edit_w2l_template.rs @@ -6,8 +6,7 @@ use actix_web::error::ResponseError; use actix_web::http::StatusCode; use actix_web::web::{Path, Json}; use actix_web::{Responder, web, HttpResponse, error, HttpRequest}; -use crate::common_queries::query_w2l_template::select_w2l_template_by_token; -use crate::common_queries::sessions::create_session_for_user; +use crate::database::queries::query_w2l_template::select_w2l_template_by_token; use crate::http_server::web_utils::ip_address::get_request_ip; use crate::http_server::web_utils::response_error_helpers::to_simple_json_error; use crate::http_server::web_utils::response_success_helpers::simple_json_success; diff --git a/src/http_server/endpoints/w2l/enqueue_infer_w2l.rs b/src/http_server/endpoints/w2l/enqueue_infer_w2l.rs index d2da24e8a9..b1a7a7d8a8 100644 --- a/src/http_server/endpoints/w2l/enqueue_infer_w2l.rs +++ b/src/http_server/endpoints/w2l/enqueue_infer_w2l.rs @@ -5,7 +5,7 @@ use actix_web::dev::HttpResponseBuilder; use actix_web::error::ResponseError; use actix_web::http::StatusCode; use actix_web::{Responder, web, HttpResponse, error, HttpRequest}; -use crate::database_helpers::enums::{DownloadUrlType, CreatorSetVisibility, W2lTemplateType}; +use crate::database::helpers::enums::{DownloadUrlType, CreatorSetVisibility, W2lTemplateType}; use crate::http_server::web_utils::ip_address::get_request_ip; use crate::http_server::web_utils::response_error_helpers::to_simple_json_error; use crate::server_state::ServerState; diff --git a/src/http_server/endpoints/w2l/enqueue_infer_w2l_with_uploads.rs b/src/http_server/endpoints/w2l/enqueue_infer_w2l_with_uploads.rs index 460b19c280..53161eb7a9 100644 --- a/src/http_server/endpoints/w2l/enqueue_infer_w2l_with_uploads.rs +++ b/src/http_server/endpoints/w2l/enqueue_infer_w2l_with_uploads.rs @@ -7,7 +7,7 @@ use actix_web::http::header::ContentDisposition; use actix_web::web::{Data, Json, BytesMut}; use actix_web::{middleware, web, App, Error, HttpResponse, HttpServer, HttpRequest, Either, ResponseError}; use anyhow::anyhow; -use crate::common_queries::tokens::Tokens; +use crate::database::helpers::tokens::Tokens; use crate::http_server::web_utils::ip_address::get_request_ip; use crate::http_server::web_utils::read_multipart_field_bytes::checked_read_multipart_bytes; use crate::http_server::web_utils::read_multipart_field_bytes::read_multipart_field_as_boolean; diff --git a/src/http_server/endpoints/w2l/enqueue_upload_w2l_template.rs b/src/http_server/endpoints/w2l/enqueue_upload_w2l_template.rs index ddd45089c6..9d3a9b0cfb 100644 --- a/src/http_server/endpoints/w2l/enqueue_upload_w2l_template.rs +++ b/src/http_server/endpoints/w2l/enqueue_upload_w2l_template.rs @@ -5,8 +5,8 @@ use actix_web::dev::HttpResponseBuilder; use actix_web::error::ResponseError; use actix_web::http::StatusCode; use actix_web::{Responder, web, HttpResponse, error, HttpRequest}; -use crate::common_queries::tokens::Tokens; -use crate::database_helpers::enums::{DownloadUrlType, CreatorSetVisibility, W2lTemplateType}; +use crate::database::helpers::enums::{DownloadUrlType, CreatorSetVisibility, W2lTemplateType}; +use crate::database::helpers::tokens::Tokens; use crate::http_server::web_utils::ip_address::get_request_ip; use crate::http_server::web_utils::response_error_helpers::to_simple_json_error; use crate::server_state::ServerState; diff --git a/src/http_server/endpoints/w2l/get_w2l_inference_job_status.rs b/src/http_server/endpoints/w2l/get_w2l_inference_job_status.rs index 6e0ef10c9e..3ba632c06e 100644 --- a/src/http_server/endpoints/w2l/get_w2l_inference_job_status.rs +++ b/src/http_server/endpoints/w2l/get_w2l_inference_job_status.rs @@ -8,10 +8,10 @@ use actix_web::web::Path; use actix_web::{Responder, web, HttpResponse, error, HttpRequest, HttpMessage}; use chrono::{DateTime, Utc}; use crate::AnyhowResult; -use crate::common_queries::sessions::create_session_for_user; use crate::http_server::endpoints::users::create_account::CreateAccountError::{BadInput, ServerError, UsernameTaken, EmailTaken}; use crate::http_server::endpoints::users::login::LoginSuccessResponse; use crate::http_server::web_utils::ip_address::get_request_ip; +use crate::http_server::web_utils::response_error_helpers::to_simple_json_error; use crate::http_server::web_utils::session_checker::SessionRecord; use crate::server_state::ServerState; use crate::util::random_crockford_token::random_crockford_token; @@ -25,7 +25,6 @@ use sqlx::error::DatabaseError; use sqlx::error::Error::Database; use sqlx::mysql::MySqlDatabaseError; use std::sync::Arc; -use crate::http_server::web_utils::response_error_helpers::to_simple_json_error; /// For the URL PathInfo #[derive(Deserialize)] diff --git a/src/http_server/endpoints/w2l/get_w2l_result.rs b/src/http_server/endpoints/w2l/get_w2l_result.rs index 80797ec7a4..07d4532219 100644 --- a/src/http_server/endpoints/w2l/get_w2l_result.rs +++ b/src/http_server/endpoints/w2l/get_w2l_result.rs @@ -8,12 +8,12 @@ use actix_web::web::Path; use actix_web::{Responder, web, HttpResponse, error, HttpRequest, HttpMessage}; use chrono::{DateTime, Utc}; use crate::AnyhowResult; -use crate::common_queries::query_w2l_result::W2lResultRecordForResponse; -use crate::common_queries::query_w2l_result::select_w2l_result_by_token; -use crate::common_queries::sessions::create_session_for_user; +use crate::database::queries::query_w2l_result::W2lResultRecordForResponse; +use crate::database::queries::query_w2l_result::select_w2l_result_by_token; use crate::http_server::endpoints::users::create_account::CreateAccountError::{BadInput, ServerError, UsernameTaken, EmailTaken}; use crate::http_server::endpoints::users::login::LoginSuccessResponse; use crate::http_server::web_utils::ip_address::get_request_ip; +use crate::http_server::web_utils::response_error_helpers::to_simple_json_error; use crate::http_server::web_utils::session_checker::SessionRecord; use crate::server_state::ServerState; use crate::util::random_crockford_token::random_crockford_token; @@ -27,7 +27,6 @@ use sqlx::error::DatabaseError; use sqlx::error::Error::Database; use sqlx::mysql::MySqlDatabaseError; use std::sync::Arc; -use crate::http_server::web_utils::response_error_helpers::to_simple_json_error; /// For the URL PathInfo #[derive(Deserialize)] diff --git a/src/http_server/endpoints/w2l/get_w2l_template.rs b/src/http_server/endpoints/w2l/get_w2l_template.rs index 03e04703ec..66819823e1 100644 --- a/src/http_server/endpoints/w2l/get_w2l_template.rs +++ b/src/http_server/endpoints/w2l/get_w2l_template.rs @@ -8,11 +8,11 @@ use actix_web::web::Path; use actix_web::{Responder, web, HttpResponse, error, HttpRequest, HttpMessage}; use chrono::{DateTime, Utc}; use crate::AnyhowResult; -use crate::common_queries::query_w2l_template::W2lTemplateRecordForResponse; -use crate::common_queries::query_w2l_template::select_w2l_template_by_token; -use crate::common_queries::sessions::create_session_for_user; -use crate::database_helpers::boolean_converters::nullable_i8_to_optional_bool; +use crate::database::helpers::boolean_converters::nullable_i8_to_optional_bool; +use crate::database::queries::query_w2l_template::W2lTemplateRecordForResponse; +use crate::database::queries::query_w2l_template::select_w2l_template_by_token; use crate::http_server::web_utils::ip_address::get_request_ip; +use crate::http_server::web_utils::response_error_helpers::to_simple_json_error; use crate::server_state::ServerState; use crate::util::random_crockford_token::random_crockford_token; use crate::validations::passwords::validate_passwords; @@ -25,7 +25,6 @@ use sqlx::error::DatabaseError; use sqlx::error::Error::Database; use sqlx::mysql::MySqlDatabaseError; use std::sync::Arc; -use crate::http_server::web_utils::response_error_helpers::to_simple_json_error; /// For the URL PathInfo #[derive(Deserialize)] diff --git a/src/http_server/endpoints/w2l/get_w2l_template_use_count.rs b/src/http_server/endpoints/w2l/get_w2l_template_use_count.rs index d5d22188e1..48ea0387fd 100644 --- a/src/http_server/endpoints/w2l/get_w2l_template_use_count.rs +++ b/src/http_server/endpoints/w2l/get_w2l_template_use_count.rs @@ -8,7 +8,6 @@ use actix_web::web::Path; use actix_web::{Responder, web, HttpResponse, error, HttpRequest, HttpMessage}; use chrono::{DateTime, Utc}; use crate::AnyhowResult; -use crate::common_queries::sessions::create_session_for_user; use crate::http_server::endpoints::users::create_account::CreateAccountError::{BadInput, ServerError, UsernameTaken, EmailTaken}; use crate::http_server::endpoints::users::login::LoginSuccessResponse; use crate::http_server::web_utils::ip_address::get_request_ip; diff --git a/src/http_server/endpoints/w2l/get_w2l_upload_template_job_status.rs b/src/http_server/endpoints/w2l/get_w2l_upload_template_job_status.rs index cc3b996759..0674d2ccdc 100644 --- a/src/http_server/endpoints/w2l/get_w2l_upload_template_job_status.rs +++ b/src/http_server/endpoints/w2l/get_w2l_upload_template_job_status.rs @@ -8,10 +8,10 @@ use actix_web::web::Path; use actix_web::{Responder, web, HttpResponse, error, HttpRequest, HttpMessage}; use chrono::{DateTime, Utc}; use crate::AnyhowResult; -use crate::common_queries::sessions::create_session_for_user; use crate::http_server::endpoints::users::create_account::CreateAccountError::{BadInput, ServerError, UsernameTaken, EmailTaken}; use crate::http_server::endpoints::users::login::LoginSuccessResponse; use crate::http_server::web_utils::ip_address::get_request_ip; +use crate::http_server::web_utils::response_error_helpers::to_simple_json_error; use crate::http_server::web_utils::session_checker::SessionRecord; use crate::server_state::ServerState; use crate::util::random_crockford_token::random_crockford_token; @@ -25,7 +25,6 @@ use sqlx::error::DatabaseError; use sqlx::error::Error::Database; use sqlx::mysql::MySqlDatabaseError; use std::sync::Arc; -use crate::http_server::web_utils::response_error_helpers::to_simple_json_error; /// For the URL PathInfo #[derive(Deserialize)] diff --git a/src/http_server/endpoints/w2l/list_w2l_templates.rs b/src/http_server/endpoints/w2l/list_w2l_templates.rs index 197a8a12d4..f7621f464a 100644 --- a/src/http_server/endpoints/w2l/list_w2l_templates.rs +++ b/src/http_server/endpoints/w2l/list_w2l_templates.rs @@ -5,11 +5,13 @@ use actix_web::dev::HttpResponseBuilder; use actix_web::error::ResponseError; use actix_web::http::StatusCode; use actix_web::{Responder, web, HttpResponse, error, HttpRequest, HttpMessage}; +use chrono::{DateTime, Utc}; use crate::AnyhowResult; -use crate::common_queries::sessions::create_session_for_user; +use crate::database::queries::list_w2l_templates::{list_w2l_templates, W2lTemplateRecordForList}; use crate::http_server::endpoints::users::create_account::CreateAccountError::{BadInput, ServerError, UsernameTaken, EmailTaken}; use crate::http_server::endpoints::users::login::LoginSuccessResponse; use crate::http_server::web_utils::ip_address::get_request_ip; +use crate::http_server::web_utils::response_error_helpers::to_simple_json_error; use crate::http_server::web_utils::session_checker::SessionRecord; use crate::server_state::ServerState; use crate::util::random_crockford_token::random_crockford_token; @@ -23,9 +25,6 @@ use sqlx::error::DatabaseError; use sqlx::error::Error::Database; use sqlx::mysql::MySqlDatabaseError; use std::sync::Arc; -use chrono::{DateTime, Utc}; -use crate::common_queries::list_w2l_templates::{list_w2l_templates, W2lTemplateRecordForList}; -use crate::http_server::web_utils::response_error_helpers::to_simple_json_error; #[derive(Serialize)] pub struct ListW2lTemplatesSuccessResponse { diff --git a/src/http_server/endpoints/w2l/set_w2l_template_mod_approval.rs b/src/http_server/endpoints/w2l/set_w2l_template_mod_approval.rs index 46cf707786..d2612a1d6d 100644 --- a/src/http_server/endpoints/w2l/set_w2l_template_mod_approval.rs +++ b/src/http_server/endpoints/w2l/set_w2l_template_mod_approval.rs @@ -6,9 +6,10 @@ use actix_web::error::ResponseError; use actix_web::http::StatusCode; use actix_web::web::Path; use actix_web::{Responder, web, HttpResponse, error, HttpRequest}; -use crate::common_queries::query_w2l_template::select_w2l_template_by_token; -use crate::database_helpers::enums::{DownloadUrlType, CreatorSetVisibility, W2lTemplateType}; +use crate::database::helpers::enums::{DownloadUrlType, CreatorSetVisibility, W2lTemplateType}; +use crate::database::queries::query_w2l_template::select_w2l_template_by_token; use crate::http_server::web_utils::ip_address::get_request_ip; +use crate::http_server::web_utils::response_error_helpers::to_simple_json_error; use crate::server_state::ServerState; use crate::util::random_crockford_token::random_crockford_token; use crate::validations::model_uploads::validate_model_title; @@ -21,7 +22,6 @@ use sqlx::error::DatabaseError; use sqlx::error::Error::Database; use sqlx::mysql::MySqlDatabaseError; use std::sync::Arc; -use crate::http_server::web_utils::response_error_helpers::to_simple_json_error; /// For the URL PathInfo #[derive(Deserialize)] diff --git a/src/http_server/web_utils/ip_address.rs b/src/http_server/web_utils/ip_address.rs index 5372c5f26e..93d82ce294 100644 --- a/src/http_server/web_utils/ip_address.rs +++ b/src/http_server/web_utils/ip_address.rs @@ -1,7 +1,7 @@ use actix_web::HttpRequest; +use actix_web::dev::ServiceRequest; use actix_web::http::HeaderName; use log::{info}; -use actix_web::dev::ServiceRequest; pub fn get_request_ip(request: &HttpRequest) -> String { match request.headers().get(HeaderName::from_static("x-voder-proxy-for")) { diff --git a/src/http_server/web_utils/session_checker.rs b/src/http_server/web_utils/session_checker.rs index 4d4f2e6a41..5488b6b2b9 100644 --- a/src/http_server/web_utils/session_checker.rs +++ b/src/http_server/web_utils/session_checker.rs @@ -1,7 +1,7 @@ use actix_web::HttpRequest; use anyhow::anyhow; use crate::AnyhowResult; -use crate::database_helpers::boolean_converters::{i8_to_bool, nullable_i8_to_optional_bool}; +use crate::database::helpers::boolean_converters::{i8_to_bool, nullable_i8_to_optional_bool}; use crate::http_server::web_utils::cookie_manager::CookieManager; use log::{info, warn}; use sqlx::MySqlPool; diff --git a/src/job_queries/tts_download_job_queries.rs b/src/job_queries/tts_download_job_queries.rs index bdf6c950da..712b6c4a57 100644 --- a/src/job_queries/tts_download_job_queries.rs +++ b/src/job_queries/tts_download_job_queries.rs @@ -4,12 +4,12 @@ use anyhow::anyhow; use chrono::Utc; +use crate::database::helpers::tokens::Tokens; use crate::util::anyhow_result::AnyhowResult; use crate::util::random_crockford_token::random_crockford_token; -use sqlx::MySqlPool; use crate::util::random_prefix_crockford_token::random_prefix_crockford_token; +use sqlx::MySqlPool; use std::path::Path; -use crate::common_queries::tokens::Tokens; /// table: tts_model_upload_jobs #[derive(Debug)] diff --git a/src/job_queries/tts_inference_job_queries.rs b/src/job_queries/tts_inference_job_queries.rs index 7cd1f12fe2..040ca6e8a5 100644 --- a/src/job_queries/tts_inference_job_queries.rs +++ b/src/job_queries/tts_inference_job_queries.rs @@ -4,12 +4,12 @@ use anyhow::anyhow; use chrono::{Utc, DateTime}; +use crate::database::helpers::tokens::Tokens; use crate::util::anyhow_result::AnyhowResult; use crate::util::random_prefix_crockford_token::random_prefix_crockford_token; use log::{warn, info}; use sqlx::{MySqlPool, Transaction, MySql}; use std::path::Path; -use crate::common_queries::tokens::Tokens; /// table: tts_inference_jobs #[derive(Debug)] diff --git a/src/job_queries/w2l_download_job_queries.rs b/src/job_queries/w2l_download_job_queries.rs index cfe9940180..6f8d8705d9 100644 --- a/src/job_queries/w2l_download_job_queries.rs +++ b/src/job_queries/w2l_download_job_queries.rs @@ -4,7 +4,7 @@ use anyhow::anyhow; use chrono::Utc; -use crate::common_queries::tokens::Tokens; +use crate::database::helpers::tokens::Tokens; use crate::util::anyhow_result::AnyhowResult; use crate::util::random_crockford_token::random_crockford_token; use crate::util::random_prefix_crockford_token::random_prefix_crockford_token; diff --git a/src/job_queries/w2l_inference_job_queries.rs b/src/job_queries/w2l_inference_job_queries.rs index 0d7987a631..33702c7a83 100644 --- a/src/job_queries/w2l_inference_job_queries.rs +++ b/src/job_queries/w2l_inference_job_queries.rs @@ -4,13 +4,13 @@ use anyhow::anyhow; use chrono::{Utc, DateTime}; +use crate::database::helpers::tokens::Tokens; use crate::util::anyhow_result::AnyhowResult; use crate::util::random_crockford_token::random_crockford_token; use crate::util::random_prefix_crockford_token::random_prefix_crockford_token; use log::{warn, info}; use sqlx::MySqlPool; use std::path::Path; -use crate::common_queries::tokens::Tokens; /// table: w2l_inference_jobs #[derive(Debug)] diff --git a/src/main.rs b/src/main.rs index 0fe6f75802..89f16e8264 100644 --- a/src/main.rs +++ b/src/main.rs @@ -17,8 +17,7 @@ pub const RESERVED_SUBSTRINGS : &'static str = include_str!("../db/reserved_user pub const BANNED_SLURS : &'static str = include_str!("../db/banned_slurs.txt"); pub mod clients; -pub mod common_queries; -pub mod database_helpers; +pub mod database; pub mod http_server; pub mod server_state; pub mod shared_constants; @@ -33,8 +32,8 @@ use actix_cors::Cors; use actix_http::http; use actix_web::middleware::{Logger, DefaultHeaders}; use actix_web::{HttpServer, web, HttpResponse, App}; -use crate::common_queries::badge_granter::BadgeGranter; -use crate::common_queries::firehose_publisher::FirehosePublisher; +use crate::database::mediators::badge_granter::BadgeGranter; +use crate::database::mediators::firehose_publisher::FirehosePublisher; use crate::http_server::endpoints::default_route_404::default_route_404; use crate::http_server::endpoints::events::list_events::list_events_handler; use crate::http_server::endpoints::misc::enable_alpha::enable_alpha; @@ -46,6 +45,7 @@ use crate::http_server::endpoints::moderation::user_roles::list_roles::list_user use crate::http_server::endpoints::moderation::user_roles::list_staff::list_staff_handler; use crate::http_server::endpoints::moderation::user_roles::set_user_role::set_user_role_handler; use crate::http_server::endpoints::root_index::get_root_index; +use crate::http_server::endpoints::tts::delete_tts_model::delete_tts_model_handler; use crate::http_server::endpoints::tts::delete_tts_result::delete_tts_inference_result_handler; use crate::http_server::endpoints::tts::edit_tts_model::edit_tts_model_handler; use crate::http_server::endpoints::tts::enqueue_infer_tts::infer_tts_handler; @@ -100,7 +100,6 @@ use sqlx::MySqlPool; use sqlx::mysql::MySqlPoolOptions; use std::sync::Arc; use std::time::Duration; -use crate::http_server::endpoints::tts::delete_tts_model::delete_tts_model_handler; // TODO TODO TODO TODO // TODO TODO TODO TODO diff --git a/src/server_state.rs b/src/server_state.rs index c40e7bd2c9..19301e9ef3 100644 --- a/src/server_state.rs +++ b/src/server_state.rs @@ -1,5 +1,5 @@ -use crate::common_queries::badge_granter::BadgeGranter; -use crate::common_queries::firehose_publisher::FirehosePublisher; +use crate::database::mediators::badge_granter::BadgeGranter; +use crate::database::mediators::firehose_publisher::FirehosePublisher; use crate::http_server::web_utils::cookie_manager::CookieManager; use crate::http_server::web_utils::session_checker::SessionChecker; use crate::threads::ip_banlist_set::IpBanlistSet; diff --git a/src/threads/poll_ip_banlist_thread.rs b/src/threads/poll_ip_banlist_thread.rs index 81ff51d471..d71c04ae8b 100644 --- a/src/threads/poll_ip_banlist_thread.rs +++ b/src/threads/poll_ip_banlist_thread.rs @@ -1,5 +1,5 @@ use anyhow::Error; -use crate::common_queries::list_ip_bans::list_ip_bans; +use crate::database::queries::list_ip_bans::list_ip_bans; use crate::threads::ip_banlist_set::IpBanlistSet; use log::info; use log::warn;