From 9dd91ce7cccbc37590cbb4dd088c049bc54787e1 Mon Sep 17 00:00:00 2001 From: Brandon Thomas Date: Wed, 19 Jul 2023 01:09:10 -0400 Subject: [PATCH] only a few compile errors left with storyteller-web --- .../reorder_twitch_event_rules.rs | 1 - .../plugins/billing/src/default_routes.rs | 5 +- .../plugins/users/src/default_routes.rs | 5 +- .../users/src/endpoints/logout_handler.rs | 7 +- .../users/src/utils/session_cookie_manager.rs | 9 +- .../endpoints/api_tokens/create_api_token.rs | 1 - .../endpoints/api_tokens/delete_api_token.rs | 1 - .../endpoints/api_tokens/edit_api_token.rs | 1 - .../endpoints/api_tokens/list_api_tokens.rs | 1 - .../endpoints/categories/create_category.rs | 1 - .../endpoints/categories/get_category.rs | 1 - .../categories/tts/assign_tts_category.rs | 1 - .../download_job/enqueue_generic_download.rs | 1 - .../get_generic_upload_job_status.rs | 1 - .../endpoints/events/list_events.rs | 1 - .../inference_job/get_inference_job_status.rs | 1 - .../disable_demo_mode_handler.rs | 13 +-- .../investor_demo/enable_demo_mode_handler.rs | 5 +- .../list_user_media_uploads_of_type.rs | 1 - .../endpoints/misc/default_route_404.rs | 1 - .../endpoints/misc/detect_locale_handler.rs | 1 - .../misc/enable_alpha_easy_handler.rs | 3 +- .../endpoints/misc/enable_alpha_handler.rs | 8 +- .../http_server/endpoints/misc/root_index.rs | 2 +- .../approval/pending_w2l_templates.rs | 1 - .../moderation/categories/delete_category.rs | 1 - .../moderation/categories/edit_category.rs | 1 - .../list_tts_categories_for_moderation.rs | 1 - .../moderation/ip_bans/add_ip_ban.rs | 1 - .../moderation/ip_bans/delete_ip_ban.rs | 1 - .../moderation/ip_bans/get_ip_ban.rs | 1 - .../moderation/ip_bans/list_ip_bans.rs | 1 - .../jobs/get_tts_inference_queue_count.rs | 1 - .../jobs/get_w2l_inference_queue_count.rs | 1 - .../jobs/kill_tts_inference_jobs.rs | 1 - .../moderation/stats/get_voice_count_stats.rs | 1 - .../moderation/user_bans/ban_user.rs | 1 - .../moderation/user_bans/list_banned_users.rs | 1 - .../moderation/user_roles/list_roles.rs | 1 - .../moderation/user_roles/list_staff.rs | 1 - .../moderation/user_roles/set_user_role.rs | 1 - .../endpoints/moderation/users/list_users.rs | 1 - .../endpoints/service/health_check_handler.rs | 1 - .../endpoints/stubs/app_model_downloads.rs | 1 - .../http_server/endpoints/stubs/app_news.rs | 1 - .../http_server/endpoints/stubs/app_plans.rs | 1 - .../endpoints/stubs/post_app_analytics.rs | 1 - .../endpoints/tts/delete_tts_model.rs | 1 - .../endpoints/tts/delete_tts_result.rs | 1 - .../tts/get_tts_inference_job_status.rs | 1 - .../endpoints/tts/get_tts_model_use_count.rs | 1 - .../endpoints/tts/get_tts_result.rs | 1 - .../tts/get_tts_upload_model_job_status.rs | 1 - .../tts/list_user_tts_inference_results.rs | 1 - .../endpoints/tts/list_user_tts_models.rs | 1 - .../twitch/event_rules/create_event_rule.rs | 1 - .../twitch/event_rules/delete_event_rule.rs | 1 - .../twitch/event_rules/edit_event_rule.rs | 1 - .../twitch/event_rules/get_event_rule.rs | 1 - .../event_rules/list_event_rules_for_user.rs | 1 - .../event_rules/reorder_twitch_event_rules.rs | 1 - .../check_if_voice_clone_request_submitted.rs | 1 - .../create_voice_clone_request.rs | 1 - .../endpoints/w2l/delete_w2l_result.rs | 1 - .../endpoints/w2l/delete_w2l_template.rs | 1 - .../w2l/get_w2l_inference_job_status.rs | 1 - .../endpoints/w2l/get_w2l_result.rs | 1 - .../endpoints/w2l/get_w2l_template.rs | 1 - .../w2l/get_w2l_template_use_count.rs | 1 - .../w2l/get_w2l_upload_template_job_status.rs | 1 - .../w2l/list_user_w2l_inference_results.rs | 1 - .../endpoints/w2l/list_user_w2l_templates.rs | 1 - .../endpoints/w2l/list_w2l_templates.rs | 1 - .../w2l/set_w2l_template_mod_approval.rs | 1 - .../middleware/pushback_filter_middleware.rs | 10 +- .../http_server/web_utils/get_host_header.rs | 4 +- .../web_utils/redis_rate_limiter.rs | 2 +- .../web_utils/response_error_helpers.rs | 4 +- .../web_utils/serialize_as_json_error.rs | 4 +- .../service/web/storyteller_web/src/main.rs | 1 - .../service/web/storyteller_web/src/routes.rs | 96 ++++++++----------- 81 files changed, 79 insertions(+), 164 deletions(-) diff --git a/crates/lib/mysql_queries/src/queries/twitch/twitch_event_rules/reorder_twitch_event_rules.rs b/crates/lib/mysql_queries/src/queries/twitch/twitch_event_rules/reorder_twitch_event_rules.rs index 65ac494f96..28d915e0cc 100644 --- a/crates/lib/mysql_queries/src/queries/twitch/twitch_event_rules/reorder_twitch_event_rules.rs +++ b/crates/lib/mysql_queries/src/queries/twitch/twitch_event_rules/reorder_twitch_event_rules.rs @@ -1,6 +1,5 @@ use anyhow::anyhow; use errors::AnyhowResult; -use log::error; use once_cell::sync::Lazy; use regex::Regex; use sqlx::MySqlPool; diff --git a/crates/service/plugins/billing/src/default_routes.rs b/crates/service/plugins/billing/src/default_routes.rs index 17e5073160..646b1347bc 100644 --- a/crates/service/plugins/billing/src/default_routes.rs +++ b/crates/service/plugins/billing/src/default_routes.rs @@ -11,13 +11,12 @@ use crate::stripe::http_endpoints::customer_portal::stripe_create_customer_porta use crate::stripe::http_endpoints::webhook::stripe_webhook_handler::stripe_webhook_handler; use crate::users::http_endpoints::list_active_user_subscriptions_handler::list_active_user_subscriptions_handler; -pub fn add_suggested_stripe_billing_routes (app: App) -> App +pub fn add_suggested_stripe_billing_routes (app: App) -> App where - B: MessageBody, T: ServiceFactory< ServiceRequest, Config = (), - Response = ServiceResponse, + Response = ServiceResponse, Error = Error, InitError = (), >, diff --git a/crates/service/plugins/users/src/default_routes.rs b/crates/service/plugins/users/src/default_routes.rs index 264c57e9e7..83bf846618 100644 --- a/crates/service/plugins/users/src/default_routes.rs +++ b/crates/service/plugins/users/src/default_routes.rs @@ -11,13 +11,12 @@ use crate::endpoints::session_info_handler::session_info_handler; // NB: This does not include the user edit endpoints since FakeYou's API mounts them alongside other things. // A 'v2' API would mount under a v2 prefix and the entity type. -pub fn add_suggested_api_v1_account_creation_and_session_routes (app: App) -> App +pub fn add_suggested_api_v1_account_creation_and_session_routes (app: App) -> App where - B: MessageBody, T: ServiceFactory< ServiceRequest, Config = (), - Response = ServiceResponse, + Response = ServiceResponse, Error = Error, InitError = (), >, diff --git a/crates/service/plugins/users/src/endpoints/logout_handler.rs b/crates/service/plugins/users/src/endpoints/logout_handler.rs index ae2e77b853..e88065f703 100644 --- a/crates/service/plugins/users/src/endpoints/logout_handler.rs +++ b/crates/service/plugins/users/src/endpoints/logout_handler.rs @@ -52,7 +52,7 @@ pub async fn logout_handler( mysql_pool: web::Data, ) -> Result { - let delete_cookie = match http_request.cookie("session") { + let mut delete_cookie = match http_request.cookie("session") { Some(cookie) => { match session_cookie_manager.decode_session_token(&cookie) { Err(e) => { @@ -77,8 +77,11 @@ pub async fn logout_handler( let body = serde_json::to_string(&response) .map_err(|_e| LogoutError::ServerError)?; + // Mark cookie for deletion + delete_cookie.make_removal(); + Ok(HttpResponse::Ok() - .del_cookie(&delete_cookie) + .cookie(delete_cookie) .content_type("application/json") .body(body)) } diff --git a/crates/service/plugins/users/src/utils/session_cookie_manager.rs b/crates/service/plugins/users/src/utils/session_cookie_manager.rs index e3e7b9abf3..9d3e8cc105 100644 --- a/crates/service/plugins/users/src/utils/session_cookie_manager.rs +++ b/crates/service/plugins/users/src/utils/session_cookie_manager.rs @@ -14,7 +14,6 @@ use jwt::VerifyWithKey; use log::warn; use sha2::Sha256; use std::collections::BTreeMap; -use time::OffsetDateTime; /** * Cookie version history @@ -80,9 +79,11 @@ impl SessionCookieManager { } pub fn delete_cookie(&self) -> Cookie { - Cookie::build(SESSION_COOKIE_NAME, "DELETED") - .expires(OffsetDateTime::unix_epoch()) - .finish() + let mut cookie = Cookie::build(SESSION_COOKIE_NAME, "DELETED") + .expires(actix_web::cookie::time::OffsetDateTime::UNIX_EPOCH) + .finish(); + cookie.make_removal(); + cookie } pub fn decode_session_cookie_payload(&self, session_cookie: &Cookie) diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/api_tokens/create_api_token.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/api_tokens/create_api_token.rs index 4a330743e1..437adb6064 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/api_tokens/create_api_token.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/api_tokens/create_api_token.rs @@ -1,5 +1,4 @@ use actix_http::Error; -use actix_http::http::header; use actix_web::HttpResponseBuilder; use actix_web::cookie::Cookie; use actix_web::error::ResponseError; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/api_tokens/delete_api_token.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/api_tokens/delete_api_token.rs index 519acfe406..212fdb2ebe 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/api_tokens/delete_api_token.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/api_tokens/delete_api_token.rs @@ -1,5 +1,4 @@ use actix_http::Error; -use actix_http::http::header; use actix_web::HttpResponseBuilder; use actix_web::cookie::Cookie; use actix_web::error::ResponseError; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/api_tokens/edit_api_token.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/api_tokens/edit_api_token.rs index ce39738d7e..4b47d6465e 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/api_tokens/edit_api_token.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/api_tokens/edit_api_token.rs @@ -1,5 +1,4 @@ use actix_http::Error; -use actix_http::http::header; use actix_web::HttpResponseBuilder; use actix_web::cookie::Cookie; use actix_web::error::ResponseError; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/api_tokens/list_api_tokens.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/api_tokens/list_api_tokens.rs index 8ca31e2474..ee7ad75b2a 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/api_tokens/list_api_tokens.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/api_tokens/list_api_tokens.rs @@ -1,5 +1,4 @@ use actix_http::Error; -use actix_http::http::header; use actix_web::HttpResponseBuilder; use actix_web::cookie::Cookie; use actix_web::error::ResponseError; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/categories/create_category.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/categories/create_category.rs index 012f20d6dc..57816d6919 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/categories/create_category.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/categories/create_category.rs @@ -1,5 +1,4 @@ use actix_http::Error; -use actix_http::http::header; use actix_web::HttpResponseBuilder; use actix_web::cookie::Cookie; use actix_web::error::ResponseError; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/categories/get_category.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/categories/get_category.rs index bc5866b5b9..998c3154bf 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/categories/get_category.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/categories/get_category.rs @@ -1,5 +1,4 @@ use actix_http::Error; -use actix_http::http::header; use actix_web::HttpResponseBuilder; use actix_web::cookie::Cookie; use actix_web::error::ResponseError; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/categories/tts/assign_tts_category.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/categories/tts/assign_tts_category.rs index b81b221bad..7ad1bb9302 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/categories/tts/assign_tts_category.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/categories/tts/assign_tts_category.rs @@ -1,5 +1,4 @@ use actix_http::Error; -use actix_http::http::header; use actix_web::HttpResponseBuilder; use actix_web::cookie::Cookie; use actix_web::error::ResponseError; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/download_job/enqueue_generic_download.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/download_job/enqueue_generic_download.rs index 386758e1d9..5b1df42628 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/download_job/enqueue_generic_download.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/download_job/enqueue_generic_download.rs @@ -1,5 +1,4 @@ use actix_http::Error; -use actix_http::http::header; use actix_web::HttpResponseBuilder; use actix_web::cookie::Cookie; use actix_web::error::ResponseError; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/download_job/get_generic_upload_job_status.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/download_job/get_generic_upload_job_status.rs index 0ba7af44a1..ac76925082 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/download_job/get_generic_upload_job_status.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/download_job/get_generic_upload_job_status.rs @@ -1,5 +1,4 @@ use actix_http::Error; -use actix_http::http::header; use actix_web::HttpResponseBuilder; use actix_web::cookie::Cookie; use actix_web::error::ResponseError; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/events/list_events.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/events/list_events.rs index 21457af5f8..dd6bf16f38 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/events/list_events.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/events/list_events.rs @@ -1,5 +1,4 @@ use actix_http::Error; -use actix_http::http::header; use actix_web::HttpResponseBuilder; use actix_web::cookie::Cookie; use actix_web::error::ResponseError; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/inference_job/get_inference_job_status.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/inference_job/get_inference_job_status.rs index ec771d6afd..eee9882534 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/inference_job/get_inference_job_status.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/inference_job/get_inference_job_status.rs @@ -1,5 +1,4 @@ use actix_http::Error; -use actix_http::http::header; use actix_web::HttpResponseBuilder; use actix_web::cookie::Cookie; use actix_web::error::ResponseError; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/investor_demo/disable_demo_mode_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/investor_demo/disable_demo_mode_handler.rs index ddbd070863..b22c85fafa 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/investor_demo/disable_demo_mode_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/investor_demo/disable_demo_mode_handler.rs @@ -1,17 +1,17 @@ use actix_http::header; -use actix_http::http::StatusCode; use actix_web::cookie::Cookie; +use actix_web::cookie::time::OffsetDateTime; +use actix_web::http::StatusCode; use actix_web::web::Query; use actix_web::{HttpResponse, HttpRequest, Responder, get, web, HttpMessage}; 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 http_server_common::request::get_request_host::get_request_host; use hyper::header::LOCATION; use log::info; use std::ops::Deref; use std::sync::Arc; -use time::OffsetDateTime; -use http_server_common::request::get_request_host::get_request_host; #[derive(Deserialize)] pub struct QueryFields { @@ -48,7 +48,7 @@ pub async fn disable_demo_mode_handler( // Kill the cookie let mut cookie_builder = Cookie::build(STORYTELLER_DEMO_COOKIE_NAME, "") .secure(server_state.env_config.cookie_secure) // HTTPS-only - .expires(OffsetDateTime::unix_epoch()) + .expires(OffsetDateTime::UNIX_EPOCH) .http_only(false) // This is meant to be exposed to Javascript! // NB: Since we're setting this from direct HTTP access rather than XHR, the browser // implicitly sets the path used to access the cookie, ie. '/demo_mode', which is not what @@ -60,10 +60,11 @@ pub async fn disable_demo_mode_handler( cookie_builder = cookie_builder.domain(cookie_domain); } - let cookie = cookie_builder.finish(); + let mut cookie = cookie_builder.finish(); + cookie.make_removal(); // Remove the cookie HttpResponse::build(StatusCode::FOUND) .append_header((header::LOCATION, safe_redirect_url.to_string())) - .del_cookie(&cookie) + .cookie(cookie) .finish() } diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/investor_demo/enable_demo_mode_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/investor_demo/enable_demo_mode_handler.rs index 2f75d9d206..54f3482bf2 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/investor_demo/enable_demo_mode_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/investor_demo/enable_demo_mode_handler.rs @@ -1,17 +1,16 @@ use actix_http::header; -use actix_http::http::StatusCode; use actix_web::cookie::Cookie; +use actix_web::http::StatusCode; use actix_web::web::Query; use actix_web::{HttpResponse, HttpRequest, Responder, get, web, HttpMessage}; 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 hyper::header::LOCATION; +use http_server_common::request::get_request_host::get_request_host; use log::info; use std::ops::Deref; use std::sync::Arc; use time::OffsetDateTime; -use http_server_common::request::get_request_host::get_request_host; #[derive(Deserialize)] pub struct QueryFields { diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/media_uploads/list_user_media_uploads_of_type.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/media_uploads/list_user_media_uploads_of_type.rs index b7b20bb062..95c86b772d 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/media_uploads/list_user_media_uploads_of_type.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/media_uploads/list_user_media_uploads_of_type.rs @@ -1,5 +1,4 @@ use actix_http::Error; -use actix_http::http::header; use actix_web::HttpResponseBuilder; use actix_web::cookie::Cookie; use actix_web::error::ResponseError; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/misc/default_route_404.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/misc/default_route_404.rs index 6bc7403c15..dd7987189f 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/misc/default_route_404.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/misc/default_route_404.rs @@ -1,4 +1,3 @@ -use actix_http::http::StatusCode; use actix_web::{HttpResponse, HttpRequest, Responder, get}; use log::warn; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/misc/detect_locale_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/misc/detect_locale_handler.rs index 0682b2ad64..f23e545be5 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/misc/detect_locale_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/misc/detect_locale_handler.rs @@ -1,5 +1,4 @@ use actix_http::Error; -use actix_http::http::header; use actix_web::HttpResponseBuilder; use actix_web::cookie::Cookie; use actix_web::error::ResponseError; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/misc/enable_alpha_easy_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/misc/enable_alpha_easy_handler.rs index c93aea0d49..122c0cf4c3 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/misc/enable_alpha_easy_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/misc/enable_alpha_easy_handler.rs @@ -1,10 +1,9 @@ use actix_web::cookie::Cookie; -use actix_http::http::StatusCode; +use actix_web::http::header::LOCATION; use actix_web::web::Query; use actix_web::{HttpResponse, HttpRequest, Responder, get, web, HttpMessage}; use crate::http_server::endpoints::misc::alpha_cookie::alpha_cookie; use crate::server_state::ServerState; -use hyper::header::LOCATION; use log::info; use std::ops::Deref; use std::sync::Arc; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/misc/enable_alpha_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/misc/enable_alpha_handler.rs index b07d763759..b92ee7bbd2 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/misc/enable_alpha_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/misc/enable_alpha_handler.rs @@ -1,5 +1,5 @@ use actix_web::cookie::Cookie; -use actix_http::http::StatusCode; +use actix_web::http::StatusCode; use actix_web::web::Query; use actix_web::{HttpResponse, HttpRequest, Responder, get, web, HttpMessage}; use crate::http_server::endpoints::misc::alpha_cookie::{ALPHA_COOKIE_NAME, alpha_cookie}; @@ -26,7 +26,7 @@ pub async fn enable_alpha_handler(http_request: HttpRequest, { info!("GET /alpha"); - let cookie = alpha_cookie(&server_state); + let mut cookie = alpha_cookie(&server_state); match query.enable { None => { @@ -45,9 +45,11 @@ pub async fn enable_alpha_handler(http_request: HttpRequest, ALPHA_COOKIE_NAME, ENABLE_LINK, DISABLE_LINK, STATUS_LINK)) } Some(false) => { + cookie.make_removal(); // Delete cookie + HttpResponse::build(StatusCode::OK) .content_type(CONTENT_TYPE) - .del_cookie(&cookie) + .cookie(cookie) .body(format!("

Vocodes 2.0

unsetting `{}` cookie

{} | {} | {}", ALPHA_COOKIE_NAME, ENABLE_LINK, DISABLE_LINK, STATUS_LINK)) } diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/misc/root_index.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/misc/root_index.rs index 960d858d00..68dfd6ca4e 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/misc/root_index.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/misc/root_index.rs @@ -1,7 +1,7 @@ -use actix_http::http::StatusCode; use actix_web::Error; use actix_web::Responder; use actix_web::Result; +use actix_web::http::StatusCode; use actix_web::web::Data; use actix_web::{HttpResponse, HttpRequest, get}; use crate::server_state::ServerState; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/approval/pending_w2l_templates.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/approval/pending_w2l_templates.rs index ac64726e68..2b7de326f8 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/approval/pending_w2l_templates.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/approval/pending_w2l_templates.rs @@ -1,5 +1,4 @@ use actix_http::Error; -use actix_http::http::header; use actix_web::HttpResponseBuilder; use actix_web::cookie::Cookie; use actix_web::error::ResponseError; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/categories/delete_category.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/categories/delete_category.rs index 1a5855a714..3ddecb0798 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/categories/delete_category.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/categories/delete_category.rs @@ -1,5 +1,4 @@ use actix_http::Error; -use actix_http::http::header; use actix_web::HttpResponseBuilder; use actix_web::cookie::Cookie; use actix_web::error::ResponseError; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/categories/edit_category.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/categories/edit_category.rs index 97f4253a06..8baeb76467 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/categories/edit_category.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/categories/edit_category.rs @@ -1,5 +1,4 @@ use actix_http::Error; -use actix_http::http::header; use actix_web::HttpResponseBuilder; use actix_web::cookie::Cookie; use actix_web::error::ResponseError; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/categories/list_tts_categories_for_moderation.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/categories/list_tts_categories_for_moderation.rs index ac52242b91..410a2805af 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/categories/list_tts_categories_for_moderation.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/categories/list_tts_categories_for_moderation.rs @@ -1,5 +1,4 @@ use actix_http::Error; -use actix_http::http::header; use actix_web::HttpResponseBuilder; use actix_web::cookie::Cookie; use actix_web::error::ResponseError; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/ip_bans/add_ip_ban.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/ip_bans/add_ip_ban.rs index 5fd2a159c0..12e3958123 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/ip_bans/add_ip_ban.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/ip_bans/add_ip_ban.rs @@ -1,5 +1,4 @@ use actix_http::Error; -use actix_http::http::header; use actix_web::HttpResponseBuilder; use actix_web::cookie::Cookie; use actix_web::error::ResponseError; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/ip_bans/delete_ip_ban.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/ip_bans/delete_ip_ban.rs index 2b1e7714a2..0310595794 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/ip_bans/delete_ip_ban.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/ip_bans/delete_ip_ban.rs @@ -1,5 +1,4 @@ use actix_http::Error; -use actix_http::http::header; use actix_web::HttpResponseBuilder; use actix_web::cookie::Cookie; use actix_web::error::ResponseError; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/ip_bans/get_ip_ban.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/ip_bans/get_ip_ban.rs index 28ffb360cf..b0db4e5ac4 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/ip_bans/get_ip_ban.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/ip_bans/get_ip_ban.rs @@ -1,5 +1,4 @@ use actix_http::Error; -use actix_http::http::header; use actix_web::HttpResponseBuilder; use actix_web::cookie::Cookie; use actix_web::error::ResponseError; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/ip_bans/list_ip_bans.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/ip_bans/list_ip_bans.rs index cb74ccf786..a07e2236fe 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/ip_bans/list_ip_bans.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/ip_bans/list_ip_bans.rs @@ -1,5 +1,4 @@ use actix_http::Error; -use actix_http::http::header; use actix_web::HttpResponseBuilder; use actix_web::cookie::Cookie; use actix_web::error::ResponseError; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/jobs/get_tts_inference_queue_count.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/jobs/get_tts_inference_queue_count.rs index 2622e5d8a9..0e9dafc4e3 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/jobs/get_tts_inference_queue_count.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/jobs/get_tts_inference_queue_count.rs @@ -1,5 +1,4 @@ use actix_http::Error; -use actix_http::http::header; use actix_web::HttpResponseBuilder; use actix_web::cookie::Cookie; use actix_web::error::ResponseError; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/jobs/get_w2l_inference_queue_count.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/jobs/get_w2l_inference_queue_count.rs index ac19f61c53..53bd1f9700 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/jobs/get_w2l_inference_queue_count.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/jobs/get_w2l_inference_queue_count.rs @@ -1,5 +1,4 @@ use actix_http::Error; -use actix_http::http::header; use actix_web::cookie::Cookie; use actix_web::HttpResponseBuilder; use actix_web::error::ResponseError; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/jobs/kill_tts_inference_jobs.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/jobs/kill_tts_inference_jobs.rs index c9af3e565d..2e3daa7dee 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/jobs/kill_tts_inference_jobs.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/jobs/kill_tts_inference_jobs.rs @@ -1,5 +1,4 @@ use actix_http::Error; -use actix_http::http::header; use actix_web::HttpResponseBuilder; use actix_web::cookie::Cookie; use actix_web::error::ResponseError; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/stats/get_voice_count_stats.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/stats/get_voice_count_stats.rs index ad0a7cbb8a..ffa7b25684 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/stats/get_voice_count_stats.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/stats/get_voice_count_stats.rs @@ -1,5 +1,4 @@ use actix_http::Error; -use actix_http::http::header; use actix_web::HttpResponseBuilder; use actix_web::cookie::Cookie; use actix_web::error::ResponseError; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/user_bans/ban_user.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/user_bans/ban_user.rs index 4fd6d51229..534a30b90a 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/user_bans/ban_user.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/user_bans/ban_user.rs @@ -1,5 +1,4 @@ use actix_http::Error; -use actix_http::http::header; use actix_web::HttpResponseBuilder; use actix_web::cookie::Cookie; use actix_web::error::ResponseError; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/user_bans/list_banned_users.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/user_bans/list_banned_users.rs index 310c64a9a9..4c207aaa8d 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/user_bans/list_banned_users.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/user_bans/list_banned_users.rs @@ -1,5 +1,4 @@ use actix_http::Error; -use actix_http::http::header; use actix_web::cookie::Cookie; use actix_web::HttpResponseBuilder; use actix_web::error::ResponseError; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/user_roles/list_roles.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/user_roles/list_roles.rs index 876515e566..64032091ef 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/user_roles/list_roles.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/user_roles/list_roles.rs @@ -1,5 +1,4 @@ use actix_http::Error; -use actix_http::http::header; use actix_web::HttpResponseBuilder; use actix_web::cookie::Cookie; use actix_web::error::ResponseError; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/user_roles/list_staff.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/user_roles/list_staff.rs index f0816027e5..85ac53f107 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/user_roles/list_staff.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/user_roles/list_staff.rs @@ -1,5 +1,4 @@ use actix_http::Error; -use actix_http::http::header; use actix_web::HttpResponseBuilder; use actix_web::cookie::Cookie; use actix_web::error::ResponseError; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/user_roles/set_user_role.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/user_roles/set_user_role.rs index 2f97a6f2f7..556f23cddd 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/user_roles/set_user_role.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/user_roles/set_user_role.rs @@ -1,5 +1,4 @@ use actix_http::Error; -use actix_http::http::header; use actix_web::HttpResponseBuilder; use actix_web::cookie::Cookie; use actix_web::error::ResponseError; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/users/list_users.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/users/list_users.rs index 30f840e6a1..57340bd5f3 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/users/list_users.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/users/list_users.rs @@ -1,5 +1,4 @@ use actix_http::Error; -use actix_http::http::header; use actix_web::HttpResponseBuilder; use actix_web::cookie::Cookie; use actix_web::error::ResponseError; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/service/health_check_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/service/health_check_handler.rs index 9fd046343e..d75f0b78be 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/service/health_check_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/service/health_check_handler.rs @@ -1,5 +1,4 @@ use actix_http::Error; -use actix_http::http::header; use actix_web::HttpResponseBuilder; use actix_web::cookie::Cookie; use actix_web::error::ResponseError; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/stubs/app_model_downloads.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/stubs/app_model_downloads.rs index b44bea307f..bf59c08d37 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/stubs/app_model_downloads.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/stubs/app_model_downloads.rs @@ -1,5 +1,4 @@ use actix_http::Error; -use actix_http::http::header; use actix_web::HttpResponseBuilder; use actix_web::cookie::Cookie; use actix_web::error::ResponseError; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/stubs/app_news.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/stubs/app_news.rs index 24609dfa8d..33500ea5c9 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/stubs/app_news.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/stubs/app_news.rs @@ -1,5 +1,4 @@ use actix_http::Error; -use actix_http::http::header; use actix_web::HttpResponseBuilder; use actix_web::cookie::Cookie; use actix_web::error::ResponseError; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/stubs/app_plans.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/stubs/app_plans.rs index ec97622197..30daed7171 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/stubs/app_plans.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/stubs/app_plans.rs @@ -1,5 +1,4 @@ use actix_http::Error; -use actix_http::http::header; use actix_web::HttpResponseBuilder; use actix_web::cookie::Cookie; use actix_web::error::ResponseError; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/stubs/post_app_analytics.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/stubs/post_app_analytics.rs index 4c719eae34..dc5a79d732 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/stubs/post_app_analytics.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/stubs/post_app_analytics.rs @@ -1,5 +1,4 @@ use actix_http::Error; -use actix_http::http::header; use actix_web::HttpResponseBuilder; use actix_web::cookie::Cookie; use actix_web::error::ResponseError; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/tts/delete_tts_model.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/tts/delete_tts_model.rs index 739febf9a2..c21fe83e49 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/tts/delete_tts_model.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/tts/delete_tts_model.rs @@ -1,5 +1,4 @@ use actix_http::Error; -use actix_http::http::header; use actix_web::HttpResponseBuilder; use actix_web::cookie::Cookie; use actix_web::error::ResponseError; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/tts/delete_tts_result.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/tts/delete_tts_result.rs index 450d638f12..302b81aec4 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/tts/delete_tts_result.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/tts/delete_tts_result.rs @@ -1,5 +1,4 @@ use actix_http::Error; -use actix_http::http::header; use actix_web::HttpResponseBuilder; use actix_web::cookie::Cookie; use actix_web::error::ResponseError; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/tts/get_tts_inference_job_status.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/tts/get_tts_inference_job_status.rs index c4ea9ad279..11be0da4b8 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/tts/get_tts_inference_job_status.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/tts/get_tts_inference_job_status.rs @@ -1,5 +1,4 @@ use actix_http::Error; -use actix_http::http::header; use actix_web::HttpResponseBuilder; use actix_web::cookie::Cookie; use actix_web::error::ResponseError; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/tts/get_tts_model_use_count.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/tts/get_tts_model_use_count.rs index a1936be3aa..9845795bbe 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/tts/get_tts_model_use_count.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/tts/get_tts_model_use_count.rs @@ -1,5 +1,4 @@ use actix_http::Error; -use actix_http::http::header; use actix_web::cookie::Cookie; use actix_web::HttpResponseBuilder; use actix_web::error::ResponseError; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/tts/get_tts_result.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/tts/get_tts_result.rs index abaca6cb6b..cffff7e183 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/tts/get_tts_result.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/tts/get_tts_result.rs @@ -1,5 +1,4 @@ use actix_http::Error; -use actix_http::http::header; use actix_web::HttpResponseBuilder; use actix_web::cookie::Cookie; use actix_web::error::ResponseError; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/tts/get_tts_upload_model_job_status.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/tts/get_tts_upload_model_job_status.rs index e03d3ac54a..c9fbb5550e 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/tts/get_tts_upload_model_job_status.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/tts/get_tts_upload_model_job_status.rs @@ -1,5 +1,4 @@ use actix_http::Error; -use actix_http::http::header; use actix_web::HttpResponseBuilder; use actix_web::cookie::Cookie; use actix_web::error::ResponseError; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/tts/list_user_tts_inference_results.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/tts/list_user_tts_inference_results.rs index ee05dde7b5..5917988e72 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/tts/list_user_tts_inference_results.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/tts/list_user_tts_inference_results.rs @@ -1,5 +1,4 @@ use actix_http::Error; -use actix_http::http::header; use actix_web::HttpResponseBuilder; use actix_web::cookie::Cookie; use actix_web::error::ResponseError; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/tts/list_user_tts_models.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/tts/list_user_tts_models.rs index e78c627178..22b61bb009 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/tts/list_user_tts_models.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/tts/list_user_tts_models.rs @@ -1,5 +1,4 @@ use actix_http::Error; -use actix_http::http::header; use actix_web::HttpResponseBuilder; use actix_web::cookie::Cookie; use actix_web::error::ResponseError; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/twitch/event_rules/create_event_rule.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/twitch/event_rules/create_event_rule.rs index 3cf38460b0..d07c0f7c70 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/twitch/event_rules/create_event_rule.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/twitch/event_rules/create_event_rule.rs @@ -1,5 +1,4 @@ use actix_http::Error; -use actix_http::http::header; use actix_web::HttpResponseBuilder; use actix_web::cookie::Cookie; use actix_web::error::ResponseError; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/twitch/event_rules/delete_event_rule.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/twitch/event_rules/delete_event_rule.rs index 232af3bf71..586835816d 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/twitch/event_rules/delete_event_rule.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/twitch/event_rules/delete_event_rule.rs @@ -1,5 +1,4 @@ use actix_http::Error; -use actix_http::http::header; use actix_web::HttpResponseBuilder; use actix_web::cookie::Cookie; use actix_web::error::ResponseError; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/twitch/event_rules/edit_event_rule.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/twitch/event_rules/edit_event_rule.rs index 7741a57231..83ed8b8989 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/twitch/event_rules/edit_event_rule.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/twitch/event_rules/edit_event_rule.rs @@ -1,5 +1,4 @@ use actix_http::Error; -use actix_http::http::header; use actix_web::HttpResponseBuilder; use actix_web::cookie::Cookie; use actix_web::error::ResponseError; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/twitch/event_rules/get_event_rule.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/twitch/event_rules/get_event_rule.rs index 6795a7fc57..7707f7edaa 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/twitch/event_rules/get_event_rule.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/twitch/event_rules/get_event_rule.rs @@ -1,5 +1,4 @@ use actix_http::Error; -use actix_http::http::header; use actix_web::HttpResponseBuilder; use actix_web::cookie::Cookie; use actix_web::error::ResponseError; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/twitch/event_rules/list_event_rules_for_user.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/twitch/event_rules/list_event_rules_for_user.rs index 19d337e14f..d51b7eb8a9 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/twitch/event_rules/list_event_rules_for_user.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/twitch/event_rules/list_event_rules_for_user.rs @@ -1,5 +1,4 @@ use actix_http::Error; -use actix_http::http::header; use actix_web::HttpResponseBuilder; use actix_web::cookie::Cookie; use actix_web::error::ResponseError; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/twitch/event_rules/reorder_twitch_event_rules.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/twitch/event_rules/reorder_twitch_event_rules.rs index 5a7b8e6c46..9e8b9fefe3 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/twitch/event_rules/reorder_twitch_event_rules.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/twitch/event_rules/reorder_twitch_event_rules.rs @@ -1,5 +1,4 @@ use actix_http::Error; -use actix_http::http::header; use actix_web::HttpResponseBuilder; use actix_web::cookie::Cookie; use actix_web::error::ResponseError; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/voice_clone_requests/check_if_voice_clone_request_submitted.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/voice_clone_requests/check_if_voice_clone_request_submitted.rs index 897f07075d..1187e38247 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/voice_clone_requests/check_if_voice_clone_request_submitted.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/voice_clone_requests/check_if_voice_clone_request_submitted.rs @@ -1,5 +1,4 @@ use actix_http::Error; -use actix_http::http::header; use actix_web::HttpResponseBuilder; use actix_web::cookie::Cookie; use actix_web::error::ResponseError; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/voice_clone_requests/create_voice_clone_request.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/voice_clone_requests/create_voice_clone_request.rs index a8c7252e12..1fbdadc26c 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/voice_clone_requests/create_voice_clone_request.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/voice_clone_requests/create_voice_clone_request.rs @@ -1,5 +1,4 @@ use actix_http::Error; -use actix_http::http::header; use actix_web::HttpResponseBuilder; use actix_web::cookie::Cookie; use actix_web::error::ResponseError; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/w2l/delete_w2l_result.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/w2l/delete_w2l_result.rs index d0b70e8f29..ca3b0a5ad1 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/w2l/delete_w2l_result.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/w2l/delete_w2l_result.rs @@ -1,5 +1,4 @@ use actix_http::Error; -use actix_http::http::header; use actix_web::HttpResponseBuilder; use actix_web::cookie::Cookie; use actix_web::error::ResponseError; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/w2l/delete_w2l_template.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/w2l/delete_w2l_template.rs index 3a9397b272..7fe5bcf79f 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/w2l/delete_w2l_template.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/w2l/delete_w2l_template.rs @@ -1,5 +1,4 @@ use actix_http::Error; -use actix_http::http::header; use actix_web::HttpResponseBuilder; use actix_web::cookie::Cookie; use actix_web::error::ResponseError; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/w2l/get_w2l_inference_job_status.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/w2l/get_w2l_inference_job_status.rs index 0e7749a328..99cbd92ca3 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/w2l/get_w2l_inference_job_status.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/w2l/get_w2l_inference_job_status.rs @@ -1,5 +1,4 @@ use actix_http::Error; -use actix_http::http::header; use actix_web::HttpResponseBuilder; use actix_web::cookie::Cookie; use actix_web::error::ResponseError; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/w2l/get_w2l_result.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/w2l/get_w2l_result.rs index 5b2a16c279..be568051f5 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/w2l/get_w2l_result.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/w2l/get_w2l_result.rs @@ -1,5 +1,4 @@ use actix_http::Error; -use actix_http::http::header; use actix_web::HttpResponseBuilder; use actix_web::cookie::Cookie; use actix_web::error::ResponseError; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/w2l/get_w2l_template.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/w2l/get_w2l_template.rs index 4d135bb635..d3bfe0d3a8 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/w2l/get_w2l_template.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/w2l/get_w2l_template.rs @@ -1,5 +1,4 @@ use actix_http::Error; -use actix_http::http::header; use actix_web::HttpResponseBuilder; use actix_web::cookie::Cookie; use actix_web::error::ResponseError; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/w2l/get_w2l_template_use_count.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/w2l/get_w2l_template_use_count.rs index e754d93702..53b4338c7a 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/w2l/get_w2l_template_use_count.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/w2l/get_w2l_template_use_count.rs @@ -1,5 +1,4 @@ use actix_http::Error; -use actix_http::http::header; use actix_web::cookie::Cookie; use actix_web::HttpResponseBuilder; use actix_web::error::ResponseError; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/w2l/get_w2l_upload_template_job_status.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/w2l/get_w2l_upload_template_job_status.rs index ba9b0f4663..cbf4f14585 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/w2l/get_w2l_upload_template_job_status.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/w2l/get_w2l_upload_template_job_status.rs @@ -1,5 +1,4 @@ use actix_http::Error; -use actix_http::http::header; use actix_web::cookie::Cookie; use actix_web::HttpResponseBuilder; use actix_web::error::ResponseError; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/w2l/list_user_w2l_inference_results.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/w2l/list_user_w2l_inference_results.rs index c65b9cd4d5..4aaaa24a09 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/w2l/list_user_w2l_inference_results.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/w2l/list_user_w2l_inference_results.rs @@ -1,5 +1,4 @@ use actix_http::Error; -use actix_http::http::header; use actix_web::HttpResponseBuilder; use actix_web::cookie::Cookie; use actix_web::error::ResponseError; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/w2l/list_user_w2l_templates.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/w2l/list_user_w2l_templates.rs index e540d8ccbf..2bb091cbde 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/w2l/list_user_w2l_templates.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/w2l/list_user_w2l_templates.rs @@ -1,5 +1,4 @@ use actix_http::Error; -use actix_http::http::header; use actix_web::HttpResponseBuilder; use actix_web::cookie::Cookie; use actix_web::error::ResponseError; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/w2l/list_w2l_templates.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/w2l/list_w2l_templates.rs index 0f93a69b23..6ade45c837 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/w2l/list_w2l_templates.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/w2l/list_w2l_templates.rs @@ -1,5 +1,4 @@ use actix_http::Error; -use actix_http::http::header; use actix_web::HttpResponseBuilder; use actix_web::cookie::Cookie; use actix_web::error::ResponseError; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/w2l/set_w2l_template_mod_approval.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/w2l/set_w2l_template_mod_approval.rs index b2b534a2bf..f30d5abcb4 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/w2l/set_w2l_template_mod_approval.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/w2l/set_w2l_template_mod_approval.rs @@ -1,5 +1,4 @@ use actix_http::Error; -use actix_http::http::header; use actix_web::HttpResponseBuilder; use actix_web::cookie::Cookie; use actix_web::error::ResponseError; diff --git a/crates/service/web/storyteller_web/src/http_server/middleware/pushback_filter_middleware.rs b/crates/service/web/storyteller_web/src/http_server/middleware/pushback_filter_middleware.rs index 1f955a41e6..c69c3a3900 100644 --- a/crates/service/web/storyteller_web/src/http_server/middleware/pushback_filter_middleware.rs +++ b/crates/service/web/storyteller_web/src/http_server/middleware/pushback_filter_middleware.rs @@ -1,9 +1,9 @@ use actix_http::StatusCode; -use actix_http::http::{header, HeaderMap, HeaderValue}; -use actix_http::{error, body::Body, Response}; +use actix_http::body::BoxBody; +use actix_http::header::HeaderName; +use actix_http::{error, Response}; use actix_web::dev::{Service, Transform}; use actix_web::dev::{ServiceRequest, ServiceResponse}; -use actix_web::http::HeaderName; use actix_web::http::header::USER_AGENT; use actix_web::web::{BytesMut, Buf, BufMut}; use actix_web::{Error, HttpResponse}; @@ -13,9 +13,9 @@ use crate::server_state::StaticFeatureFlags; use errors::AnyhowResult; use futures_util::future::{err, ok, Either, Ready}; use http_server_common::request::get_request_ip::get_service_request_ip; +use log::warn; use std::io::Write; use std::task::{Context, Poll}; -use log::warn; // There are two steps in middleware processing. // 1. Middleware initialization, middleware factory gets called with @@ -39,7 +39,7 @@ impl ResponseError for PushbackError { StatusCode::TOO_MANY_REQUESTS } - fn error_response(&self) -> HttpResponse { + fn error_response(&self) -> HttpResponse { // NB: I'm setting a string error code because I mistakenly got caught by this in local dev // and couldn't figure out the issue for a bit. At least I can grep for this string. // However, I need to balance this requirement with not cluing in those that are banned. diff --git a/crates/service/web/storyteller_web/src/http_server/web_utils/get_host_header.rs b/crates/service/web/storyteller_web/src/http_server/web_utils/get_host_header.rs index e3e1bfe86b..15879bedd7 100644 --- a/crates/service/web/storyteller_web/src/http_server/web_utils/get_host_header.rs +++ b/crates/service/web/storyteller_web/src/http_server/web_utils/get_host_header.rs @@ -1,7 +1,5 @@ -use actix_http::http::HeaderMap; -use actix_http::http::HeaderName; +use actix_http::header::{HeaderMap, HeaderName}; use actix_web::HttpRequest; -use actix_web::http::HeaderValue; use errors::AnyhowResult; // NB: This is extracted because CLion is having incredible difficulty with these types. diff --git a/crates/service/web/storyteller_web/src/http_server/web_utils/redis_rate_limiter.rs b/crates/service/web/storyteller_web/src/http_server/web_utils/redis_rate_limiter.rs index bcdc89e668..a89c8ef251 100644 --- a/crates/service/web/storyteller_web/src/http_server/web_utils/redis_rate_limiter.rs +++ b/crates/service/web/storyteller_web/src/http_server/web_utils/redis_rate_limiter.rs @@ -1,7 +1,7 @@ //! NB: This doesn't live in the `util.redis` package because it depends on `http_server`. //! It's only used for the server anyway, so living here makes sense. -use actix_http::http::{HeaderName, HeaderMap}; +use actix_http::header::HeaderName; use actix_web::HttpRequest; use futures_old_for_limiter::Future; use http_server_common::request::get_request_ip::get_request_ip; diff --git a/crates/service/web/storyteller_web/src/http_server/web_utils/response_error_helpers.rs b/crates/service/web/storyteller_web/src/http_server/web_utils/response_error_helpers.rs index e950731d73..606a3b240b 100644 --- a/crates/service/web/storyteller_web/src/http_server/web_utils/response_error_helpers.rs +++ b/crates/service/web/storyteller_web/src/http_server/web_utils/response_error_helpers.rs @@ -1,4 +1,4 @@ -use actix_http::http::header; +use actix_http::header::CONTENT_TYPE; use actix_web::HttpResponseBuilder; use actix_web::http::StatusCode; use actix_web::{HttpResponse, ResponseError}; @@ -25,6 +25,6 @@ pub fn to_simple_json_error( }; HttpResponseBuilder::new(status_code) - .set_header(header::CONTENT_TYPE, "application/json") + .set_header(CONTENT_TYPE, "application/json") .body(body) } \ No newline at end of file diff --git a/crates/service/web/storyteller_web/src/http_server/web_utils/serialize_as_json_error.rs b/crates/service/web/storyteller_web/src/http_server/web_utils/serialize_as_json_error.rs index d288c9205e..fa1cb27022 100644 --- a/crates/service/web/storyteller_web/src/http_server/web_utils/serialize_as_json_error.rs +++ b/crates/service/web/storyteller_web/src/http_server/web_utils/serialize_as_json_error.rs @@ -1,4 +1,4 @@ -use actix_http::http::{StatusCode, header}; +use actix_http::header::CONTENT_TYPE; use actix_web::HttpResponse; use actix_web::HttpResponseBuilder; use actix_web::error::ResponseError; @@ -16,6 +16,6 @@ pub fn serialize_as_json_error( }; HttpResponseBuilder::new(error_payload.status_code()) - .set_header(header::CONTENT_TYPE, "application/json") + .set_header(CONTENT_TYPE, "application/json") .body(body) } diff --git a/crates/service/web/storyteller_web/src/main.rs b/crates/service/web/storyteller_web/src/main.rs index 9f30608159..9f28e84a45 100644 --- a/crates/service/web/storyteller_web/src/main.rs +++ b/crates/service/web/storyteller_web/src/main.rs @@ -39,7 +39,6 @@ use actix_helpers::middleware::banned_cidr_filter::load_cidr_ban_set_from_file:: use actix_helpers::middleware::banned_ip_filter::banned_ip_filter::BannedIpFilter; use actix_helpers::middleware::banned_ip_filter::ip_ban_list::ip_ban_list::IpBanList; use actix_helpers::middleware::banned_ip_filter::ip_ban_list::load_ip_ban_list_from_directory::load_ip_ban_list_from_directory; -use actix_http::http; use actix_web::middleware::{Logger, DefaultHeaders}; use actix_web::{HttpServer, web, HttpResponse, App, middleware}; use anyhow::anyhow; diff --git a/crates/service/web/storyteller_web/src/routes.rs b/crates/service/web/storyteller_web/src/routes.rs index e8426661ae..96431e93a5 100644 --- a/crates/service/web/storyteller_web/src/routes.rs +++ b/crates/service/web/storyteller_web/src/routes.rs @@ -1,5 +1,4 @@ use actix_helpers::route_builder::RouteBuilder; -use actix_http::body::MessageBody; use actix_service::ServiceFactory; use actix_web::dev::{ServiceRequest, ServiceResponse}; use actix_web::error::Error; @@ -117,13 +116,12 @@ use users_component::default_routes::add_suggested_api_v1_account_creation_and_s use users_component::endpoints::edit_profile_handler::edit_profile_handler; use users_component::endpoints::get_profile_handler::get_profile_handler; -pub fn add_routes (app: App) -> App +pub fn add_routes (app: App) -> App where - B: MessageBody, T: ServiceFactory< ServiceRequest, Config = (), - Response = ServiceResponse, + Response = ServiceResponse, Error = Error, InitError = (), >, @@ -211,13 +209,12 @@ pub fn add_routes (app: App) -> App // ==================== MODERATOR ROUTES ==================== -fn add_moderator_routes (app: App) -> App +fn add_moderator_routes (app: App) -> App where - B: MessageBody, T: ServiceFactory< ServiceRequest, Config = (), - Response = ServiceResponse, + Response = ServiceResponse, Error = Error, InitError = (), >, @@ -353,13 +350,12 @@ fn add_moderator_routes (app: App) -> App // ==================== TTS ROUTES ==================== -fn add_tts_routes (app: App) -> App +fn add_tts_routes (app: App) -> App where - B: MessageBody, T: ServiceFactory< ServiceRequest, Config = (), - Response = ServiceResponse, + Response = ServiceResponse, Error = Error, InitError = (), >, @@ -436,13 +432,12 @@ fn add_tts_routes (app: App) -> App // ==================== WAV2LIP ROUTES ==================== -fn add_w2l_routes (app: App) -> App +fn add_w2l_routes (app: App) -> App where - B: MessageBody, T: ServiceFactory< ServiceRequest, Config = (), - Response = ServiceResponse, + Response = ServiceResponse, Error = Error, InitError = (), >, @@ -519,13 +514,12 @@ fn add_w2l_routes (app: App) -> App // ==================== WEB VOICE CONVERSION ROUTES ==================== -fn add_web_vc_routes (app: App) -> App +fn add_web_vc_routes (app: App) -> App where - B: MessageBody, T: ServiceFactory< ServiceRequest, Config = (), - Response = ServiceResponse, + Response = ServiceResponse, Error = Error, InitError = (), >, @@ -603,13 +597,12 @@ fn add_web_vc_routes (app: App) -> App // ==================== VOCODER ROUTES ==================== -fn add_vocoder_routes (app: App) -> App +fn add_vocoder_routes (app: App) -> App where - B: MessageBody, T: ServiceFactory< ServiceRequest, Config = (), - Response = ServiceResponse, + Response = ServiceResponse, Error = Error, InitError = (), >, @@ -641,13 +634,12 @@ fn add_vocoder_routes (app: App) -> App // ==================== RETRIEVAL ROUTES ("GENERIC_DOWNLOAD_JOBS") ==================== -fn add_remote_download_routes (app: App) -> App +fn add_remote_download_routes (app: App) -> App where - B: MessageBody, T: ServiceFactory< ServiceRequest, Config = (), - Response = ServiceResponse, + Response = ServiceResponse, Error = Error, InitError = (), >, @@ -664,13 +656,12 @@ fn add_remote_download_routes (app: App) -> App // ==================== CATEGORY ROUTES ==================== -fn add_category_routes (app: App) -> App +fn add_category_routes (app: App) -> App where - B: MessageBody, T: ServiceFactory< ServiceRequest, Config = (), - Response = ServiceResponse, + Response = ServiceResponse, Error = Error, InitError = (), >, @@ -735,13 +726,12 @@ fn add_category_routes (app: App) -> App // ==================== USER PROFILE ROUTES ==================== -fn add_user_profile_routes (app: App) -> App +fn add_user_profile_routes (app: App) -> App where - B: MessageBody, T: ServiceFactory< ServiceRequest, Config = (), - Response = ServiceResponse, + Response = ServiceResponse, Error = Error, InitError = (), >, @@ -783,13 +773,12 @@ fn add_user_profile_routes (app: App) -> App // ==================== API TOKEN ROUTES ==================== -fn add_api_token_routes (app: App) -> App +fn add_api_token_routes (app: App) -> App where - B: MessageBody, T: ServiceFactory< ServiceRequest, Config = (), - Response = ServiceResponse, + Response = ServiceResponse, Error = Error, InitError = (), >, @@ -816,13 +805,12 @@ fn add_api_token_routes (app: App) -> App // ==================== API TOKEN ROUTES ==================== -fn add_voice_clone_request_routes (app: App) -> App +fn add_voice_clone_request_routes (app: App) -> App where - B: MessageBody, T: ServiceFactory< ServiceRequest, Config = (), - Response = ServiceResponse, + Response = ServiceResponse, Error = Error, InitError = (), >, @@ -841,13 +829,12 @@ fn add_voice_clone_request_routes (app: App) -> App // ==================== INVESTOR DEMO MODE ==================== -fn add_investor_demo_routes (app: App) -> App +fn add_investor_demo_routes (app: App) -> App where - B: MessageBody, T: ServiceFactory< ServiceRequest, Config = (), - Response = ServiceResponse, + Response = ServiceResponse, Error = Error, InitError = (), >, @@ -866,13 +853,12 @@ fn add_investor_demo_routes (app: App) -> App // ==================== FLAG ROUTES ==================== -fn add_flag_routes (app: App) -> App +fn add_flag_routes (app: App) -> App where - B: MessageBody, T: ServiceFactory< ServiceRequest, Config = (), - Response = ServiceResponse, + Response = ServiceResponse, Error = Error, InitError = (), >, @@ -893,13 +879,12 @@ fn add_flag_routes (app: App) -> App // ==================== DESKTOP APP ROUTES ==================== -fn add_desktop_app_routes (app: App) -> App +fn add_desktop_app_routes (app: App) -> App where - B: MessageBody, T: ServiceFactory< ServiceRequest, Config = (), - Response = ServiceResponse, + Response = ServiceResponse, Error = Error, InitError = (), >, @@ -926,13 +911,12 @@ fn add_desktop_app_routes (app: App) -> App // ==================== MEDIA UPLOAD ROUTES ==================== -fn add_media_upload_routes (app: App) -> App +fn add_media_upload_routes (app: App) -> App where - B: MessageBody, T: ServiceFactory< ServiceRequest, Config = (), - Response = ServiceResponse, + Response = ServiceResponse, Error = Error, InitError = (), >, @@ -955,13 +939,12 @@ fn add_media_upload_routes (app: App) -> App // ==================== TRENDING ROUTES ==================== -fn add_trending_routes (app: App) -> App +fn add_trending_routes (app: App) -> App where - B: MessageBody, T: ServiceFactory< ServiceRequest, Config = (), - Response = ServiceResponse, + Response = ServiceResponse, Error = Error, InitError = (), >, @@ -975,13 +958,12 @@ fn add_trending_routes (app: App) -> App } // ==================== USER RATING ROUTES ==================== -fn add_user_rating_routes (app: App) -> App +fn add_user_rating_routes (app: App) -> App where - B: MessageBody, T: ServiceFactory< ServiceRequest, Config = (), - Response = ServiceResponse, + Response = ServiceResponse, Error = Error, InitError = (), >, @@ -1003,13 +985,12 @@ fn add_user_rating_routes (app: App) -> App // TODO: Maybe move these into an "oauth-gateway" type http service. // We'll want the domain to have reputation and not confuse people. // It'll also be nice to accrue all oauth things here. -fn add_twitch_routes (app: App) -> App +fn add_twitch_routes (app: App) -> App where - B: MessageBody, T: ServiceFactory< ServiceRequest, Config = (), - Response = ServiceResponse, + Response = ServiceResponse, Error = Error, InitError = (), >, @@ -1064,13 +1045,12 @@ fn add_twitch_routes (app: App) -> App } // ============= SUBSCRIPTION ROUTES =================== -fn add_subscription_routes (app: App) -> App +fn add_subscription_routes (app: App) -> App where - B: MessageBody, T: ServiceFactory< ServiceRequest, Config = (), - Response = ServiceResponse, + Response = ServiceResponse, Error = Error, InitError = (), >,