move server_state into module

2026-11-04 17:38:10 +00:00 · 2024-07-05 20:56:00 -04:00
1 parent 37ccf0f60d
commit bbaed857d0
@@ -32,20 +32,16 @@ use tokio::runtime::Runtime;
 use errors::AnyhowResult;

 use crate::configs::static_api_tokens::{StaticApiTokenConfig, StaticApiTokens, StaticApiTokenSet};
-use crate::server_state::{DurableInMemoryCaches, EnvConfig, EphemeralInMemoryCaches, InMemoryCaches, RedisRateLimiters, ServerInfo, ServerState, StaticFeatureFlags, StripeSettings, TrollBans};
+use crate::state::server_state::{DurableInMemoryCaches, EnvConfig, EphemeralInMemoryCaches, InMemoryCaches, RedisRateLimiters, ServerInfo, ServerState, StaticFeatureFlags, StripeSettings, TrollBans};

 pub mod billing;
 pub mod configs;
-pub mod cookies;
 pub mod http_server;
 pub mod memory_cache;
 pub mod model;
-pub mod routes;
-pub mod server_state;
-pub mod subscriptions;
+pub mod state;
 pub mod threads;
 pub mod util;
-pub mod validations;

 use std::{
  error::Error,
@@ -29,20 +29,16 @@ use api_doc::ApiDoc;
 use errors::AnyhowResult;

 use crate::configs::static_api_tokens::StaticApiTokenSet;
-use crate::server_state::ServerState;
+use crate::state::server_state::ServerState;

 pub mod billing;
 pub mod configs;
-pub mod cookies;
 pub mod http_server;
 pub mod memory_cache;
 pub mod model;
-pub mod routes;
-pub mod server_state;
-pub mod subscriptions;
+pub mod state;
 pub mod threads;
 pub mod util;
-pub mod validations;

 pub mod api_doc;

@@ -8,7 +8,7 @@ use limitation::Limiter;

 use crate::configs::app_startup::username_set::UsernameSet;
 use crate::http_server::web_utils::redis_rate_limiter::RedisRateLimiter;
-use crate::server_state::RedisRateLimiters;
+use crate::state::server_state::RedisRateLimiters;

 /// Build the various rate limiters
 pub fn configure_redis_rate_limiters(common_env: &CommonEnv) -> AnyhowResult<RedisRateLimiters> {
@@ -32,7 +32,7 @@ use crate::http_server::endpoints::moderation::user_feature_flags::edit_user_fea
 use crate::http_server::web_utils::require_moderator::{require_moderator, RequireModeratorError};
 use crate::http_server::web_utils::require_user_session::RequireUserSessionError;
 use crate::http_server::web_utils::response_error_helpers::to_simple_json_error;
-use crate::server_state::ServerState;
+use crate::state::server_state::ServerState;

 #[derive(Deserialize, ToSchema)]
 pub struct LogBrowserSessionRequest {
@@ -28,7 +28,7 @@ use users_component::session::lookup::user_session_extended::UserSessionExtended

 use crate::configs::plans::get_correct_plan_for_session::get_correct_plan_for_session;
 use crate::http_server::web_utils::response_error_helpers::to_simple_json_error;
-use crate::server_state::ServerState;
+use crate::state::server_state::ServerState;

 /// Debug requests can get routed to special "debug-only" workers, which can
 /// be used to trial new code, run debugging, etc.
@@ -27,7 +27,7 @@ use users_component::session::lookup::user_session_extended::UserSessionExtended

 use crate::configs::plans::get_correct_plan_for_session::get_correct_plan_for_session;
 use crate::http_server::web_utils::response_error_helpers::to_simple_json_error;
-use crate::server_state::ServerState;
+use crate::state::server_state::ServerState;

 /// Debug requests can get routed to special "debug-only" workers, which can
 /// be used to trial new code, run debugging, etc.
@@ -10,7 +10,7 @@ use http_server_common::request::get_request_ip::get_request_ip;
 use http_server_common::response::serialize_as_json_error::serialize_as_json_error;
 use mysql_queries::queries::api_tokens::create_api_token::create_api_token_for_user;

-use crate::server_state::ServerState;
+use crate::state::server_state::ServerState;

 // =============== Request ===============

@@ -12,7 +12,7 @@ use http_server_common::response::serialize_as_json_error::serialize_as_json_err
 use mysql_queries::queries::api_tokens::delete_api_token::delete_api_token;
 use mysql_queries::queries::api_tokens::list_available_api_tokens_for_user::list_available_api_tokens_for_user;

-use crate::server_state::ServerState;
+use crate::state::server_state::ServerState;

 // =============== Request ===============

@@ -11,7 +11,7 @@ use http_server_common::response::serialize_as_json_error::serialize_as_json_err
 use mysql_queries::queries::api_tokens::edit_api_token::edit_api_token;
 use mysql_queries::queries::api_tokens::list_available_api_tokens_for_user::list_available_api_tokens_for_user;

-use crate::server_state::ServerState;
+use crate::state::server_state::ServerState;

 // =============== Request ===============

@@ -10,7 +10,7 @@ use log::{log, warn};
 use http_server_common::response::serialize_as_json_error::serialize_as_json_error;
 use mysql_queries::queries::api_tokens::list_available_api_tokens_for_user::list_available_api_tokens_for_user;

-use crate::server_state::ServerState;
+use crate::state::server_state::ServerState;

 // =============== Success Response ===============

@@ -29,7 +29,7 @@ use user_input_common::markdown_to_html::markdown_to_html;
 use crate::http_server::endpoints::moderation::user_feature_flags::edit_user_feature_flags_handler::EditUserFeatureFlagsError;
 use crate::http_server::web_utils::require_moderator::{require_moderator, RequireModeratorError, UseDatabase};
 use crate::http_server::web_utils::response_error_helpers::to_simple_json_error;
-use crate::server_state::ServerState;
+use crate::state::server_state::ServerState;

 const MAXIMUM_KEYS : u32 = 100;

@@ -34,7 +34,7 @@ use crate::http_server::endpoints::media_files::get::get_media_file_handler::Get
 use crate::http_server::endpoints::moderation::user_feature_flags::edit_user_feature_flags_handler::EditUserFeatureFlagsError;
 use crate::http_server::web_utils::require_moderator::{require_moderator, RequireModeratorError, UseDatabase};
 use crate::http_server::web_utils::response_error_helpers::to_simple_json_error;
-use crate::server_state::ServerState;
+use crate::state::server_state::ServerState;

 /// For the URL PathInfo
 #[derive(Deserialize, ToSchema)]
@@ -33,7 +33,7 @@ use crate::http_server::endpoints::media_files::get::get_media_file_handler::Get
 use crate::http_server::endpoints::moderation::user_feature_flags::edit_user_feature_flags_handler::EditUserFeatureFlagsError;
 use crate::http_server::web_utils::require_moderator::{require_moderator, RequireModeratorError, UseDatabase};
 use crate::http_server::web_utils::response_error_helpers::to_simple_json_error;
-use crate::server_state::ServerState;
+use crate::state::server_state::ServerState;

 /// For the URL PathInfo
 #[derive(Deserialize, ToSchema)]
@@ -37,7 +37,7 @@ use crate::http_server::endpoints::beta_keys::create_beta_keys_handler::CreateBe
 use crate::http_server::endpoints::events::list_events::ListEventsError;
 use crate::http_server::web_utils::require_moderator::{require_moderator, RequireModeratorError};
 use crate::http_server::web_utils::require_user_session::{require_user_session, RequireUserSessionError};
-use crate::server_state::ServerState;
+use crate::state::server_state::ServerState;
 use crate::util::allowed_explore_media_access::allowed_explore_media_access;

 #[derive(Copy, Clone, Deserialize, ToSchema)]
@@ -39,7 +39,7 @@ use crate::http_server::web_utils::require_moderator::RequireModeratorError;
 use crate::http_server::web_utils::require_user_session::{require_user_session, RequireUserSessionError};
 use crate::http_server::web_utils::response_error_helpers::to_simple_json_error;
 use crate::http_server::web_utils::try_delete_session_cache::try_delete_session_cache;
-use crate::server_state::ServerState;
+use crate::state::server_state::ServerState;

 #[derive(Deserialize, ToSchema)]
 pub struct RedeemBetaKeyRequest {
@@ -11,7 +11,7 @@ use http_server_common::response::serialize_as_json_error::serialize_as_json_err
 use mysql_queries::queries::model_categories::create_category::{create_category, CreateCategoryArgs};
 use tokens::tokens::model_categories::ModelCategoryToken;

-use crate::server_state::ServerState;
+use crate::state::server_state::ServerState;

 const DEFAULT_CAN_DIRECTLY_HAVE_MODELS : bool = true;
 const DEFAULT_CAN_HAVE_SUBCATEGORIES : bool = false;
@@ -11,7 +11,7 @@ use log::{log, warn};
 use http_server_common::response::serialize_as_json_error::serialize_as_json_error;
 use mysql_queries::queries::model_categories::get_category_by_token::get_category_by_token;

-use crate::server_state::ServerState;
+use crate::state::server_state::ServerState;

 // =============== Request ===============

@@ -12,7 +12,7 @@ use mysql_queries::queries::model_categories::assign_tts_category::{assign_tts_c
 use mysql_queries::queries::model_categories::get_category_by_token::get_category_by_token;
 use mysql_queries::queries::tts::tts_models::get_tts_model::get_tts_model_by_token;

-use crate::server_state::ServerState;
+use crate::state::server_state::ServerState;

 // =============== Request ===============

@@ -18,7 +18,7 @@ use tokens::tokens::tts_models::TtsModelToken;

 use crate::http_server::endpoints::categories::tts::list_fully_computed_assigned_tts_categories::error::ListFullyComputedAssignedTtsCategoriesError;
 use crate::http_server::endpoints::categories::tts::list_fully_computed_assigned_tts_categories::query_and_construct_payload::query_and_construct_payload;
-use crate::server_state::ServerState;
+use crate::state::server_state::ServerState;

 // =============== Success Response ===============

@@ -19,7 +19,7 @@ use tokens::tokens::model_categories::ModelCategoryToken;

 use crate::model::cached_queries::list_cached_tts_categories_for_public_dropdown::list_cached_tts_categories_for_public_dropdown_db_pool;
 use crate::model::categories::synthetic_category_list::SYNTHETIC_CATEGORY_LIST;
-use crate::server_state::ServerState;
+use crate::state::server_state::ServerState;

 // =============== Success Response ===============

@@ -16,7 +16,7 @@ use log::warn;
 use http_server_common::response::serialize_as_json_error::serialize_as_json_error;
 use mysql_queries::queries::tts::tts_category_assignments::list_assigned_tts_categories_query_builder::ListAssignedTtsCategoriesQueryBuilder;

-use crate::server_state::ServerState;
+use crate::state::server_state::ServerState;

 // =============== Request ===============

@@ -28,7 +28,7 @@ use user_input_common::check_for_slurs::contains_slurs;
 use user_input_common::markdown_to_html::markdown_to_html;

 use crate::http_server::web_utils::response_error_helpers::to_simple_json_error;
-use crate::server_state::ServerState;
+use crate::state::server_state::ServerState;

 #[derive(Deserialize, ToSchema)]
 pub struct CreateCommentRequest {
@@ -19,7 +19,7 @@ use tokens::tokens::comments::CommentToken;

 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::state::server_state::ServerState;

 /// For the URL PathInfo
 #[derive(Deserialize, ToSchema)]
@@ -24,7 +24,7 @@ use users_component::common_responses::user_avatars::default_avatar_from_usernam
 use users_component::common_responses::user_details_lite::{UserDefaultAvatarInfo, UserDetailsLight};

 use crate::http_server::web_utils::response_error_helpers::to_simple_json_error;
-use crate::server_state::ServerState;
+use crate::state::server_state::ServerState;

 /// For the URL PathInfo
 #[derive(Deserialize, ToSchema)]
@@ -32,7 +32,7 @@ use tokens::tokens::users::UserToken;
 use crate::configs::plans::get_correct_plan_for_session::get_correct_plan_for_session;
 use crate::http_server::endpoints::workflows::enqueue_comfy_ui_handler::EnqueueComfyError;
 use crate::http_server::web_utils::response_error_helpers::to_simple_json_error;
-use crate::server_state::ServerState;
+use crate::state::server_state::ServerState;
 use crate::util::allowed_studio_access::allowed_studio_access;

 /// Debug requests can get routed to special "debug-only" workers, which can
@@ -32,7 +32,7 @@ use tokens::tokens::users::UserToken;
 use crate::configs::plans::get_correct_plan_for_session::get_correct_plan_for_session;
 use crate::http_server::endpoints::conversion::enqueue_fbx_to_gltf_handler::EnqueueFbxToGltfRequestError;
 use crate::http_server::web_utils::response_error_helpers::to_simple_json_error;
-use crate::server_state::ServerState;
+use crate::state::server_state::ServerState;
 use crate::util::allowed_studio_access::allowed_studio_access;

 /// Debug requests can get routed to special "debug-only" workers, which can
@@ -13,7 +13,7 @@ use http_server_common::request::get_request_ip::get_request_ip;
 use http_server_common::response::serialize_as_json_error::serialize_as_json_error;
 use mysql_queries::queries::generic_download::web::insert_generic_download_job::{insert_generic_download_job, InsertGenericDownloadJobArgs};

-use crate::server_state::ServerState;
+use crate::state::server_state::ServerState;
 use crate::http_server::validations::validate_model_title::validate_model_title;
 use crate::http_server::validations::validate_idempotency_token_format::validate_idempotency_token_format;

@@ -14,7 +14,7 @@ use mysql_queries::queries::generic_download::web::get_generic_download_job_stat
 use redis_common::redis_keys::RedisKeys;
 use tokens::tokens::generic_download_jobs::DownloadJobToken;

-use crate::server_state::ServerState;
+use crate::state::server_state::ServerState;

 /// For the URL PathInfo
 #[derive(Deserialize)]
@@ -23,7 +23,7 @@ use mysql_queries::queries::media_files::create::insert_media_file_from_file_upl
 use tokens::tokens::media_files::MediaFileToken;

 use crate::http_server::endpoints::engine::drain_multipart_request::drain_multipart_request;
-use crate::server_state::ServerState;
+use crate::state::server_state::ServerState;
 use crate::http_server::validations::validate_idempotency_token_format::validate_idempotency_token_format;

 #[derive(Debug, Serialize, ToSchema)]
@@ -22,7 +22,7 @@ use users_component::common_responses::user_details_lite::UserDetailsLight;

 use crate::http_server::common_responses::simple_entity_stats::SimpleEntityStats;
 use crate::http_server::web_utils::response_error_helpers::to_simple_json_error;
-use crate::server_state::ServerState;
+use crate::state::server_state::ServerState;

 /// For the URL PathInfo
 #[derive(Deserialize, ToSchema)]
@@ -19,7 +19,7 @@ use tokens::tokens::media_files::MediaFileToken;

 use crate::http_server::endpoints::media_files::upload::upload_error::MediaFileUploadError;
 use crate::http_server::endpoints::media_files::upload::upload_generic::drain_multipart_request::{drain_multipart_request, MediaFileUploadSource};
-use crate::server_state::ServerState;
+use crate::state::server_state::ServerState;
 use crate::http_server::validations::validate_idempotency_token_format::validate_idempotency_token_format;

 // TODO(bt,2023-12-20): THIS CODE NEEDS CLEANUP. This has been cargo culted three+ times.
@@ -6,7 +6,7 @@ use actix_web::{HttpRequest, HttpResponse, web};
 use tokens::tokens::media_files::MediaFileToken;

 use crate::http_server::endpoints::media_uploads::common::upload_error::UploadError;
-use crate::server_state::ServerState;
+use crate::state::server_state::ServerState;

 #[derive(Serialize)]
 pub struct UpdateSceneSuccessResponse {
@@ -12,7 +12,7 @@ use users_component::common_responses::user_avatars::default_avatar_color_from_u
 use users_component::common_responses::user_avatars::default_avatar_from_username::default_avatar_from_username;

 use crate::http_server::web_utils::response_error_helpers::to_simple_json_error;
-use crate::server_state::ServerState;
+use crate::state::server_state::ServerState;

 #[derive(Serialize)]
 pub struct EventRecord {
@@ -36,7 +36,7 @@ use tokens::tokens::w2l_templates::W2lTemplateToken;
 use tokens::tokens::zs_voices::ZsVoiceToken;

 use crate::http_server::web_utils::response_error_helpers::to_simple_json_error;
-use crate::server_state::ServerState;
+use crate::state::server_state::ServerState;

 #[derive(Deserialize, ToSchema)]
 pub struct CreateFeaturedItemRequest {
@@ -29,7 +29,7 @@ use tokens::tokens::users::UserToken;
 use crate::http_server::endpoints::featured_items::create_featured_item_handler::CreateFeaturedItemError;
 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::state::server_state::ServerState;

 #[derive(Deserialize, ToSchema)]
 pub struct DeleteFeaturedItemRequest {
@@ -37,7 +37,7 @@ use tokens::tokens::zs_voices::ZsVoiceToken;

 use crate::http_server::endpoints::weights::get_weight_handler::GetWeightPathInfo;
 use crate::http_server::web_utils::response_error_helpers::to_simple_json_error;
-use crate::server_state::ServerState;
+use crate::state::server_state::ServerState;

 #[derive(Deserialize, ToSchema)]
 pub struct GetIsFeaturedItemPathInfo {
@@ -1,6 +1,6 @@
 use actix_web::cookie::{Cookie, CookieBuilder};

-use crate::server_state::ServerState;
+use crate::state::server_state::ServerState;

 const REFRESH_COOKIE_NAME : &str = "refresh";

@@ -39,7 +39,7 @@ use tokens::tokens::users::UserToken;
 use crate::configs::plans::get_correct_plan_for_session::get_correct_plan_for_session;
 use crate::http_server::endpoints::image_gen::prompt_enrichment::enrich_prompt;
 use crate::http_server::web_utils::response_error_helpers::to_simple_json_error;
-use crate::server_state::ServerState;
+use crate::state::server_state::ServerState;
 use crate::util::allowed_studio_access::allowed_studio_access;
 use crate::http_server::validations::validate_idempotency_token_format::validate_idempotency_token_format;

@@ -28,7 +28,7 @@ use crate::http_server::endpoints::inference_job::utils::estimate_job_progress::
 use crate::http_server::endpoints::media_files::get::batch_get_media_files_handler::BatchGetMediaFilesQueryParams;
 use crate::http_server::web_utils::filter_model_name::maybe_filter_model_name;
 use crate::http_server::web_utils::response_error_helpers::to_simple_json_error;
-use crate::server_state::ServerState;
+use crate::state::server_state::ServerState;

 /// For certain jobs or job classes (eg. non-premium), we kill the jobs if the user hasn't
 /// maintained a keepalive. This prevents wasted work when users who are unlikely to return
@@ -17,7 +17,7 @@ use tokens::tokens::generic_inference_jobs::InferenceJobToken;
 use crate::http_server::endpoints::inference_job::terminate_inference_job_handler::TerminateInferenceJobError;
 use crate::http_server::web_utils::require_user_session::require_user_session;
 use crate::http_server::web_utils::response_error_helpers::to_simple_json_error;
-use crate::server_state::ServerState;
+use crate::state::server_state::ServerState;

 #[derive(Serialize, ToSchema)]
 pub struct DismissFinishedSessionJobsSuccessResponse {
@@ -24,7 +24,7 @@ use tokens::tokens::generic_inference_jobs::InferenceJobToken;
 use crate::http_server::endpoints::inference_job::utils::estimate_job_progress::estimate_job_progress;
 use crate::http_server::web_utils::filter_model_name::maybe_filter_model_name;
 use crate::http_server::web_utils::response_error_helpers::to_simple_json_error;
-use crate::server_state::ServerState;
+use crate::state::server_state::ServerState;

 /// For certain jobs or job classes (eg. non-premium), we kill the jobs if the user hasn't
 /// maintained a keepalive. This prevents wasted work when users who are unlikely to return
@@ -13,7 +13,7 @@ use http_server_common::response::serialize_as_json_error::serialize_as_json_err
 use mysql_queries::queries::generic_inference::web::kill_generic_inference_jobs;
 use mysql_queries::queries::generic_inference::web::kill_generic_inference_jobs::{kill_generic_inference_jobs, KillGenericInferenceJobsArgs};

-use crate::server_state::ServerState;
+use crate::state::server_state::ServerState;

 /// Only certain job statuses should be modified.
 #[derive(Copy, Clone, PartialEq, Eq, Hash, Deserialize)]
@@ -28,7 +28,7 @@ use tokens::tokens::users::UserToken;
 use crate::http_server::endpoints::inference_job::utils::estimate_job_progress::estimate_job_progress;
 use crate::http_server::web_utils::filter_model_name::maybe_filter_model_name;
 use crate::http_server::web_utils::response_error_helpers::to_simple_json_error;
-use crate::server_state::ServerState;
+use crate::state::server_state::ServerState;

 /// For certain jobs or job classes (eg. non-premium), we kill the jobs if the user hasn't
 /// maintained a keepalive. This prevents wasted work when users who are unlikely to return
@@ -14,7 +14,7 @@ use mysql_queries::queries::generic_inference::web::mark_generic_inference_job_c
 use tokens::tokens::generic_inference_jobs::InferenceJobToken;

 use crate::http_server::web_utils::response_error_helpers::to_simple_json_error;
-use crate::server_state::ServerState;
+use crate::state::server_state::ServerState;

 /// For the URL PathInfo
 #[derive(Deserialize, ToSchema)]
@@ -11,7 +11,7 @@ use http_server_common::request::get_request_host::get_request_host;

 use crate::http_server::endpoints::investor_demo::default_redirect::{DEFAULT_INVESTOR_REDIRECT, redirect_is_allowed};
 use crate::http_server::endpoints::investor_demo::demo_cookie::STORYTELLER_DEMO_COOKIE_NAME;
-use crate::server_state::ServerState;
+use crate::state::server_state::ServerState;

 #[derive(Deserialize)]
 pub struct QueryFields {
@@ -10,7 +10,7 @@ use http_server_common::request::get_request_host::get_request_host;

 use crate::http_server::endpoints::investor_demo::default_redirect::{DEFAULT_INVESTOR_REDIRECT, redirect_is_allowed};
 use crate::http_server::endpoints::investor_demo::demo_cookie::STORYTELLER_DEMO_COOKIE_NAME;
-use crate::server_state::ServerState;
+use crate::state::server_state::ServerState;

 #[derive(Deserialize)]
 pub struct QueryFields {
@@ -21,7 +21,7 @@ use users_component::common_responses::user_avatars::default_avatar_from_usernam
 use users_component::common_responses::user_details_lite::{UserDefaultAvatarInfo, UserDetailsLight};

 use crate::http_server::web_utils::serialize_as_json_error::serialize_as_json_error;
-use crate::server_state::ServerState;
+use crate::state::server_state::ServerState;

 #[derive(Serialize)]
 pub struct LeaderboardResponse {
@@ -14,7 +14,7 @@ use mysql_queries::queries::media_files::get::get_media_file::get_media_file;
 use tokens::tokens::media_files::MediaFileToken;

 use crate::http_server::web_utils::response_success_helpers::simple_json_success;
-use crate::server_state::ServerState;
+use crate::state::server_state::ServerState;
 use crate::util::delete_role_disambiguation::{delete_role_disambiguation, DeleteRole};

 #[derive(Deserialize, ToSchema)]
@@ -16,7 +16,7 @@ use mysql_queries::queries::media_files::edit::update_media_file_visibility::{up
 use mysql_queries::queries::media_files::get::get_media_file::get_media_file;
 use tokens::tokens::media_files::MediaFileToken;

-use crate::server_state::ServerState;
+use crate::state::server_state::ServerState;

 #[derive(Deserialize, ToSchema)]
 pub struct ChangeMediaFileVisibilityRequest {
@@ -15,7 +15,7 @@ use mysql_queries::queries::media_files::rename_media_file::rename_media_file;
 use tokens::tokens::media_files::MediaFileToken;

 use crate::http_server::web_utils::response_success_helpers::simple_json_success;
-use crate::server_state::ServerState;
+use crate::state::server_state::ServerState;
 use crate::util::delete_role_disambiguation::{delete_role_disambiguation, DeleteRole};

 #[derive(Deserialize, ToSchema)]
@@ -17,7 +17,7 @@ use tokens::tokens::media_files::MediaFileToken;

 use crate::http_server::endpoints::weights::set_model_weight_cover_image_handler::SetModelWeightCoverImageError;
 use crate::http_server::web_utils::response_success_helpers::simple_json_success;
-use crate::server_state::ServerState;
+use crate::state::server_state::ServerState;
 use crate::util::delete_role_disambiguation::{delete_role_disambiguation, DeleteRole};

 #[derive(Deserialize, ToSchema)]
@@ -15,7 +15,7 @@ use mysql_queries::queries::media_files::edit::update_media_file_visibility::{up
 use mysql_queries::queries::media_files::get::get_media_file::get_media_file;
 use tokens::tokens::media_files::MediaFileToken;

-use crate::server_state::ServerState;
+use crate::state::server_state::ServerState;

 #[derive(Deserialize)]
 pub struct UpdateMediaFileRequest {
@@ -33,7 +33,7 @@ use users_component::common_responses::user_details_lite::UserDetailsLight;
 use crate::http_server::common_responses::media_file_cover_image_details::{MediaFileCoverImageDetails, MediaFileDefaultCover};
 use crate::http_server::common_responses::simple_entity_stats::SimpleEntityStats;
 use crate::http_server::web_utils::response_error_helpers::to_simple_json_error;
-use crate::server_state::ServerState;
+use crate::state::server_state::ServerState;

 // =============== Request ===============

@@ -30,7 +30,7 @@ use users_component::common_responses::user_details_lite::UserDetailsLight;
 use crate::http_server::common_responses::media_file_cover_image_details::{MediaFileCoverImageDetails, MediaFileDefaultCover};
 use crate::http_server::common_responses::simple_entity_stats::SimpleEntityStats;
 use crate::http_server::web_utils::response_error_helpers::to_simple_json_error;
-use crate::server_state::ServerState;
+use crate::state::server_state::ServerState;

 /// For the URL PathInfo
 #[derive(Deserialize, ToSchema)]
@@ -31,7 +31,7 @@ use crate::http_server::common_responses::simple_entity_stats::SimpleEntityStats
 use crate::http_server::endpoints::media_files::helpers::get_scoped_engine_categories::get_scoped_engine_categories;
 use crate::http_server::endpoints::media_files::helpers::get_scoped_media_classes::get_scoped_media_classes;
 use crate::http_server::endpoints::media_files::helpers::get_scoped_media_types::get_scoped_media_types;
-use crate::server_state::ServerState;
+use crate::state::server_state::ServerState;
 use crate::util::allowed_explore_media_access::allowed_explore_media_access;

 #[derive(Deserialize, ToSchema, IntoParams)]
@@ -29,7 +29,7 @@ use crate::http_server::common_responses::media_file_origin_details::MediaFileOr
 use crate::http_server::common_responses::pagination_page::PaginationPage;
 use crate::http_server::common_responses::simple_entity_stats::SimpleEntityStats;
 use crate::http_server::web_utils::response_error_helpers::to_simple_json_error;
-use crate::server_state::ServerState;
+use crate::state::server_state::ServerState;
 use crate::util::allowed_studio_access::allowed_studio_access;

 #[derive(Deserialize, ToSchema)]
@@ -31,7 +31,7 @@ use crate::http_server::endpoints::media_files::helpers::get_scoped_engine_categ
 use crate::http_server::endpoints::media_files::helpers::get_scoped_media_classes::get_scoped_media_classes;
 use crate::http_server::endpoints::media_files::helpers::get_scoped_media_types::get_scoped_media_types;
 use crate::http_server::web_utils::response_error_helpers::to_simple_json_error;
-use crate::server_state::ServerState;
+use crate::state::server_state::ServerState;
 use crate::util::allowed_studio_access::allowed_studio_access;

 #[derive(Deserialize, ToSchema)]
@@ -31,7 +31,7 @@ use crate::http_server::endpoints::media_files::helpers::get_scoped_engine_categ
 use crate::http_server::endpoints::media_files::helpers::get_scoped_media_classes::get_scoped_media_classes;
 use crate::http_server::endpoints::media_files::helpers::get_scoped_media_types::get_scoped_media_types;
 use crate::http_server::web_utils::response_error_helpers::to_simple_json_error;
-use crate::server_state::ServerState;
+use crate::state::server_state::ServerState;
 use crate::util::allowed_explore_media_access::allowed_explore_media_access;
 use crate::util::allowed_studio_access::allowed_studio_access;

@@ -24,7 +24,7 @@ use users_component::common_responses::user_details_lite::UserDetailsLight;
 use crate::http_server::common_responses::media_file_cover_image_details::{MediaFileCoverImageDetails, MediaFileDefaultCover};
 use crate::http_server::common_responses::media_file_origin_details::MediaFileOriginDetails;
 use crate::http_server::common_responses::simple_entity_stats::SimpleEntityStats;
-use crate::server_state::ServerState;
+use crate::state::server_state::ServerState;

 #[derive(Serialize, ToSchema)]
 pub struct ListPinnedMediaFilesSuccessResponse {
@@ -31,7 +31,7 @@ use crate::http_server::endpoints::media_files::helpers::get_scoped_engine_categ
 use crate::http_server::endpoints::media_files::helpers::get_scoped_media_classes::get_scoped_media_classes;
 use crate::http_server::endpoints::media_files::helpers::get_scoped_media_types::get_scoped_media_types;
 use crate::http_server::web_utils::response_error_helpers::to_simple_json_error;
-use crate::server_state::ServerState;
+use crate::state::server_state::ServerState;
 use crate::util::allowed_explore_media_access::allowed_explore_media_access;
 use crate::util::allowed_studio_access::allowed_studio_access;

@@ -32,7 +32,7 @@ use crate::http_server::endpoints::media_files::helpers::get_scoped_engine_categ
 use crate::http_server::endpoints::media_files::helpers::get_scoped_media_classes::get_scoped_media_classes;
 use crate::http_server::endpoints::media_files::helpers::get_scoped_media_types::get_scoped_media_types;
 use crate::http_server::web_utils::response_error_helpers::to_simple_json_error;
-use crate::server_state::ServerState;
+use crate::state::server_state::ServerState;
 use crate::util::allowed_explore_media_access::allowed_explore_media_access;
 use crate::util::allowed_studio_access::allowed_studio_access;

@@ -31,7 +31,7 @@ use tokens::tokens::media_files::MediaFileToken;
 use videos::get_mp4_info::{get_mp4_info, get_mp4_info_for_bytes, get_mp4_info_for_bytes_and_len};

 use crate::http_server::endpoints::media_files::upload::upload_error::MediaFileUploadError;
-use crate::server_state::ServerState;
+use crate::state::server_state::ServerState;
 use crate::util::check_creator_tokens::{check_creator_tokens, CheckCreatorTokenArgs, CheckCreatorTokenResult};
 use crate::http_server::validations::validate_idempotency_token_format::validate_idempotency_token_format;

@@ -24,7 +24,7 @@ use videos::get_mp4_info::{get_mp4_info, get_mp4_info_for_bytes, get_mp4_info_fo

 use crate::http_server::endpoints::media_files::upload::upload_engine_asset::drain_multipart_request::drain_multipart_request;
 use crate::http_server::endpoints::media_files::upload::upload_error::MediaFileUploadError;
-use crate::server_state::ServerState;
+use crate::state::server_state::ServerState;
 use crate::http_server::validations::validate_idempotency_token_format::validate_idempotency_token_format;

 #[derive(Serialize, ToSchema)]
@@ -20,7 +20,7 @@ use tokens::tokens::media_files::MediaFileToken;

 use crate::http_server::endpoints::media_files::upload::upload_error::MediaFileUploadError;
 use crate::http_server::endpoints::media_files::upload::upload_generic::drain_multipart_request::{drain_multipart_request, MediaFileUploadSource};
-use crate::server_state::ServerState;
+use crate::state::server_state::ServerState;
 use crate::http_server::validations::validate_idempotency_token_format::validate_idempotency_token_format;

 // TODO(bt,2023-12-20): THIS CODE NEEDS CLEANUP. This has been cargo culted three+ times.
@@ -10,7 +10,7 @@ use tokens::tokens::media_files::MediaFileToken;

 use crate::http_server::endpoints::media_files::upload::upload_error::MediaFileUploadError;
 use crate::http_server::endpoints::media_files::upload::upload_generic::process_upload_media_file::process_upload_media_file;
-use crate::server_state::ServerState;
+use crate::state::server_state::ServerState;

 #[derive(Serialize, ToSchema)]
 pub struct UploadMediaSuccessResponse {
@@ -31,7 +31,7 @@ use mysql_queries::queries::media_files::get::get_media_file::get_media_file;
 use tokens::tokens::media_files::MediaFileToken;

 use crate::http_server::endpoints::media_files::upload::upload_error::MediaFileUploadError;
-use crate::server_state::ServerState;
+use crate::state::server_state::ServerState;
 use crate::util::check_creator_tokens::{check_creator_tokens, CheckCreatorTokenArgs, CheckCreatorTokenResult};
 use crate::http_server::validations::validate_idempotency_token_format::validate_idempotency_token_format;

@@ -31,7 +31,7 @@ use videos::get_mp4_info::{get_mp4_info, get_mp4_info_for_bytes, get_mp4_info_fo
 use crate::http_server::endpoints::media_files::upload::upload_engine_asset::drain_multipart_request::drain_multipart_request;
 use crate::http_server::endpoints::media_files::upload::upload_error::MediaFileUploadError;
 use crate::http_server::endpoints::media_files::upload::upload_new_scene_media_file_handler::UploadNewSceneMediaFileForm;
-use crate::server_state::ServerState;
+use crate::state::server_state::ServerState;
 use crate::http_server::validations::validate_idempotency_token_format::validate_idempotency_token_format;

 /// Form-multipart request fields.
@@ -30,7 +30,7 @@ use tokens::tokens::media_files::MediaFileToken;
 use videos::get_mp4_info::{get_mp4_info, get_mp4_info_for_bytes, get_mp4_info_for_bytes_and_len};

 use crate::http_server::endpoints::media_files::upload::upload_error::MediaFileUploadError;
-use crate::server_state::ServerState;
+use crate::state::server_state::ServerState;
 use crate::util::check_creator_tokens::{check_creator_tokens, CheckCreatorTokenArgs, CheckCreatorTokenResult};
 use crate::http_server::validations::validate_idempotency_token_format::validate_idempotency_token_format;

@@ -32,7 +32,7 @@ use tokens::tokens::media_files::MediaFileToken;
 use videos::get_mp4_info::{get_mp4_info, get_mp4_info_for_bytes, get_mp4_info_for_bytes_and_len};

 use crate::http_server::endpoints::media_files::upload::upload_error::MediaFileUploadError;
-use crate::server_state::ServerState;
+use crate::state::server_state::ServerState;
 use crate::util::check_creator_tokens::{check_creator_tokens, CheckCreatorTokenArgs, CheckCreatorTokenResult};
 use crate::http_server::validations::validate_idempotency_token_format::validate_idempotency_token_format;

@@ -33,7 +33,7 @@ use crate::http_server::endpoints::media_files::upload::upload_error::MediaFileU
 use crate::http_server::endpoints::media_files::upload::upload_new_scene_media_file_handler::UploadNewSceneMediaFileForm;
 use crate::http_server::endpoints::media_files::upload::upload_pmx::extract_and_upload_pmx_files::{extract_and_upload_pmx_files, PmxError};
 use crate::http_server::web_utils::require_moderator::{require_moderator, RequireModeratorError, UseDatabase};
-use crate::server_state::ServerState;
+use crate::state::server_state::ServerState;
 use crate::http_server::validations::validate_idempotency_token_format::validate_idempotency_token_format;

 /// Form-multipart request fields.
@@ -34,7 +34,7 @@ use videos::get_mp4_info::{get_mp4_info, get_mp4_info_for_bytes, get_mp4_info_fo
 use crate::http_server::endpoints::media_files::get::get_media_file_handler::GetMediaFilePathInfo;
 use crate::http_server::endpoints::media_files::upload::upload_error::MediaFileUploadError;
 use crate::http_server::endpoints::media_files::upsert_upload::write_error::MediaFileWriteError;
-use crate::server_state::ServerState;
+use crate::state::server_state::ServerState;
 use crate::util::check_creator_tokens::{check_creator_tokens, CheckCreatorTokenArgs, CheckCreatorTokenResult};
 use crate::http_server::validations::validate_idempotency_token_format::validate_idempotency_token_format;

@@ -30,7 +30,7 @@ use tokens::tokens::media_files::MediaFileToken;
 use videos::get_mp4_info::{get_mp4_info, get_mp4_info_for_bytes, get_mp4_info_for_bytes_and_len};

 use crate::http_server::endpoints::media_files::upload::upload_error::MediaFileUploadError;
-use crate::server_state::ServerState;
+use crate::state::server_state::ServerState;
 use crate::util::check_creator_tokens::{check_creator_tokens, CheckCreatorTokenArgs, CheckCreatorTokenResult};
 use crate::http_server::validations::validate_idempotency_token_format::validate_idempotency_token_format;

@@ -24,7 +24,7 @@ use videos::get_mp4_info::{get_mp4_info, get_mp4_info_for_bytes, get_mp4_info_fo
 use crate::http_server::endpoints::media_files::upload::upload_error::MediaFileUploadError;
 use crate::http_server::endpoints::media_files::upload::upload_video::drain_multipart_request::drain_multipart_request;
 use crate::http_server::endpoints::media_files::upload::upload_video::drain_multipart_request::MediaFileUploadSource;
-use crate::server_state::ServerState;
+use crate::state::server_state::ServerState;
 use crate::http_server::validations::validate_idempotency_token_format::validate_idempotency_token_format;

 #[derive(Serialize, ToSchema)]
@@ -26,7 +26,7 @@ use videos::get_mp4_info::{get_mp4_info, get_mp4_info_for_bytes, get_mp4_info_fo

 use crate::http_server::endpoints::media_files::upsert_upload::write_engine_asset::drain_multipart_request::drain_multipart_request;
 use crate::http_server::endpoints::media_files::upsert_upload::write_error::MediaFileWriteError;
-use crate::server_state::ServerState;
+use crate::state::server_state::ServerState;
 use crate::util::check_creator_tokens::{check_creator_tokens, CheckCreatorTokenArgs, CheckCreatorTokenResult};
 use crate::http_server::validations::validate_idempotency_token_format::validate_idempotency_token_format;

@@ -28,7 +28,7 @@ use videos::get_mp4_info::{get_mp4_info, get_mp4_info_for_bytes, get_mp4_info_fo

 use crate::http_server::endpoints::media_files::upsert_upload::write_error::MediaFileWriteError;
 use crate::http_server::endpoints::media_files::upsert_upload::write_scene_file::drain_multipart_request::drain_multipart_request;
-use crate::server_state::ServerState;
+use crate::state::server_state::ServerState;
 use crate::util::check_creator_tokens::{check_creator_tokens, CheckCreatorTokenArgs, CheckCreatorTokenResult};
 use crate::http_server::validations::validate_idempotency_token_format::validate_idempotency_token_format;

@@ -19,7 +19,7 @@ use tokens::tokens::media_uploads::MediaUploadToken;

 use crate::http_server::endpoints::media_uploads::common::drain_multipart_request::{drain_multipart_request, MediaSource};
 use crate::http_server::endpoints::media_uploads::common::upload_error::UploadError;
-use crate::server_state::ServerState;
+use crate::state::server_state::ServerState;
 use crate::http_server::validations::validate_idempotency_token_format::validate_idempotency_token_format;

 pub enum SuccessCase {
@@ -16,7 +16,7 @@ use tokens::tokens::users::UserToken;
 use users_component::session::lookup::user_session_extended::UserSessionExtended;

 use crate::http_server::web_utils::response_error_helpers::to_simple_json_error;
-use crate::server_state::ServerState;
+use crate::state::server_state::ServerState;

 /// For the URL PathInfo
 #[deprecated(note = "Use `media_files` instead of `media_uploads`.")]
@@ -9,7 +9,7 @@ use tokens::tokens::media_uploads::MediaUploadToken;

 use crate::http_server::endpoints::media_uploads::common::handle_upload::handle_upload;
 use crate::http_server::endpoints::media_uploads::common::upload_error::UploadError;
-use crate::server_state::ServerState;
+use crate::state::server_state::ServerState;

 #[deprecated(note = "Use `media_files` instead of `media_uploads`.")]
 #[derive(Serialize)]
@@ -9,7 +9,7 @@ use tokens::tokens::media_uploads::MediaUploadToken;

 use crate::http_server::endpoints::media_uploads::common::handle_upload::handle_upload;
 use crate::http_server::endpoints::media_uploads::common::upload_error::UploadError;
-use crate::server_state::ServerState;
+use crate::state::server_state::ServerState;

 #[deprecated(note = "Use `media_files` instead of `media_uploads`.")]
 #[derive(Serialize)]
@@ -9,7 +9,7 @@ use tokens::tokens::media_uploads::MediaUploadToken;

 use crate::http_server::endpoints::media_uploads::common::handle_upload::handle_upload;
 use crate::http_server::endpoints::media_uploads::common::upload_error::UploadError;
-use crate::server_state::ServerState;
+use crate::state::server_state::ServerState;

 #[deprecated(note = "Use `media_files` instead of `media_uploads`.")]
 #[derive(Serialize)]
@@ -1,6 +1,6 @@
 use actix_web::cookie::Cookie;

-use crate::server_state::ServerState;
+use crate::state::server_state::ServerState;

 pub const ALPHA_COOKIE_NAME : &str = "enable-alpha";

@@ -10,7 +10,7 @@ use http_server_common::request::get_request_header_optional::get_request_header
 use http_server_common::request::parse_accept_language::parse_accept_language;
 use http_server_common::response::serialize_as_json_error::serialize_as_json_error;

-use crate::server_state::ServerState;
+use crate::state::server_state::ServerState;

 // =============== Success Response ===============

@@ -6,7 +6,7 @@ use actix_web::http::header::LOCATION;
 use log::info;

 use crate::http_server::endpoints::misc::alpha_cookie::alpha_cookie;
-use crate::server_state::ServerState;
+use crate::state::server_state::ServerState;

 #[get("/enable")]
 pub async fn enable_alpha_easy_handler(
@@ -6,7 +6,7 @@ use actix_web::web::Query;
 use log::info;

 use crate::http_server::endpoints::misc::alpha_cookie::{alpha_cookie, ALPHA_COOKIE_NAME};
-use crate::server_state::ServerState;
+use crate::state::server_state::ServerState;

 const CONTENT_TYPE : &str = "text/html; charset=utf-8";

@@ -5,7 +5,7 @@ use actix_web::HttpResponse;
 use actix_web::web::Data;
 use log::debug;

-use crate::server_state::ServerState;
+use crate::state::server_state::ServerState;

 pub async fn get_root_index(server_state: Data<Arc<ServerState>>) -> HttpResponse {
  debug!("GET /"); // NB: Google load balancer hits this a lot, and it spams.
@@ -27,7 +27,7 @@ use users_component::session::lookup::user_session_extended::UserSessionExtended

 use crate::configs::plans::get_correct_plan_for_session::get_correct_plan_for_session;
 use crate::http_server::web_utils::response_error_helpers::to_simple_json_error;
-use crate::server_state::ServerState;
+use crate::state::server_state::ServerState;
 use crate::http_server::validations::validate_idempotency_token_format::validate_idempotency_token_format;

 /// Debug requests can get routed to special "debug-only" workers, which can
@@ -10,7 +10,7 @@ use log::{log, warn};
 use mysql_queries::queries::w2l::w2l_templates::list_pending_w2l_templates::list_pending_w2l_templates;

 use crate::http_server::web_utils::serialize_as_json_error::serialize_as_json_error;
-use crate::server_state::ServerState;
+use crate::state::server_state::ServerState;

 #[derive(Serialize)]
 pub struct GetPendingW2lTemplatesResponse {
@@ -10,7 +10,7 @@ use log::{log, warn};
 use http_server_common::response::serialize_as_json_error::serialize_as_json_error;
 use mysql_queries::queries::model_categories::toggle_model_category_soft_delete::{toggle_model_category_soft_delete, ToggleSoftDeleteState};

-use crate::server_state::ServerState;
+use crate::state::server_state::ServerState;

 // =============== Request ===============

@@ -11,7 +11,7 @@ use http_server_common::response::serialize_as_json_error::serialize_as_json_err
 use mysql_queries::queries::model_categories::get_category_by_token::get_category_by_token;
 use mysql_queries::queries::model_categories::update_model_category::{update_model_category, UpdateModelCategoryArgs};

-use crate::server_state::ServerState;
+use crate::state::server_state::ServerState;

 // =============== Request ===============

@@ -10,7 +10,7 @@ use log::{log, warn};
 use http_server_common::response::serialize_as_json_error::serialize_as_json_error;
 use mysql_queries::queries::model_categories::list_categories_query_builder::ListCategoriesQueryBuilder;

-use crate::server_state::ServerState;
+use crate::state::server_state::ServerState;

 // =============== Request ===============

@@ -28,7 +28,7 @@ use tokens::tokens::users::UserToken;

 use crate::http_server::web_utils::require_moderator::{require_moderator, RequireModeratorError, UseDatabase};
 use crate::http_server::web_utils::serialize_as_json_error::serialize_as_json_error;
-use crate::server_state::ServerState;
+use crate::state::server_state::ServerState;

 /// For the URL PathInfo
 #[derive(Deserialize, ToSchema)]
@@ -11,7 +11,7 @@ use user_input_common::validate_user_provided_ip_address::validate_user_provided

 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::state::server_state::ServerState;

 #[derive(Deserialize)]
 pub struct AddIpBanRequest {
@@ -11,7 +11,7 @@ use mysql_queries::queries::ip_bans::toggle_ip_ban::{IpBanToggleState, toggle_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::state::server_state::ServerState;

 /// For the URL PathInfo
 #[derive(Deserialize)]
@@ -11,7 +11,7 @@ use log::{error, log, warn};
 use mysql_queries::queries::ip_bans::get_ip_ban::get_ip_ban;

 use crate::http_server::web_utils::response_error_helpers::to_simple_json_error;
-use crate::server_state::ServerState;
+use crate::state::server_state::ServerState;

 /// For the URL PathInfo
 #[derive(Deserialize)]
@@ -9,7 +9,7 @@ use log::{error, log, warn};
 use mysql_queries::queries::ip_bans::list_ip_bans::list_ip_bans;

 use crate::http_server::web_utils::response_error_helpers::to_simple_json_error;
-use crate::server_state::ServerState;
+use crate::state::server_state::ServerState;

 #[derive(Serialize)]
 pub struct ListIpBansResponse {
@@ -9,7 +9,7 @@ use log::{log, warn};
 use mysql_queries::queries::tts::tts_inference_jobs::get_pending_tts_inference_job_detailed_stats::{get_pending_tts_inference_job_detailed_stats, PendingCountResult};

 use crate::http_server::web_utils::serialize_as_json_error::serialize_as_json_error;
-use crate::server_state::ServerState;
+use crate::state::server_state::ServerState;

 #[derive(Serialize)]
 pub struct GetTtsInferenceQueueCountResponse {
@@ -9,7 +9,7 @@ use log::{error, log, warn};
 use mysql_queries::queries::w2l::w2l_inference_jobs::get_pending_w2l_inference_job_detailed_stats::{get_pending_w2l_inference_job_detailed_stats, PendingCountResult};

 use crate::http_server::web_utils::serialize_as_json_error::serialize_as_json_error;
-use crate::server_state::ServerState;
+use crate::state::server_state::ServerState;

 #[derive(Serialize)]
 pub struct GetW2lInferenceQueueCountResponse {
@@ -9,7 +9,7 @@ use log::{error, log, warn};
 use http_server_common::response::serialize_as_json_error::serialize_as_json_error;
 use mysql_queries::queries::tts::tts_inference_jobs::kill_tts_inference_jobs::{JobStatus, kill_tts_inference_jobs};

-use crate::server_state::ServerState;
+use crate::state::server_state::ServerState;

 // =============== Request ===============

@@ -8,7 +8,7 @@ use log::{log, warn};
 use mysql_queries::queries::stats::get_voice_count_stats::get_voice_count_stats;

 use crate::http_server::web_utils::serialize_as_json_error::serialize_as_json_error;
-use crate::server_state::ServerState;
+use crate::state::server_state::ServerState;

 #[derive(Serialize)]
 pub struct GetVoiceCountStatsResponse {
@@ -11,7 +11,7 @@ use mysql_queries::queries::users::user_profiles::get_user_profile_by_username::

 use crate::http_server::web_utils::response_success_helpers::simple_json_success;
 use crate::http_server::web_utils::serialize_as_json_error::serialize_as_json_error;
-use crate::server_state::ServerState;
+use crate::state::server_state::ServerState;

 #[derive(Deserialize)]
 pub struct BanUserRequest {