diff --git a/src/v1/builtin/mod.rs b/src/v1/builtin/mod.rs index 5ddb2de..f975734 100644 --- a/src/v1/builtin/mod.rs +++ b/src/v1/builtin/mod.rs @@ -1,6 +1,6 @@ use warp::Filter; -pub fn get_builtin_routes() -> impl warp::Filter + Clone { +pub fn get_builtin_routes() -> impl warp::Filter + Clone { warp::path("v1") .and((warp::path("help").map(|| "Please refer to the wiki at https://wiki.jonasjones.dev/Api/")) .or(warp::path("ping").map(|| "pong")) diff --git a/src/v1/debug/mod.rs b/src/v1/debug/mod.rs index db85e7a..44256a0 100644 --- a/src/v1/debug/mod.rs +++ b/src/v1/debug/mod.rs @@ -1,6 +1,6 @@ use warp::Filter; -pub fn get_debug_routes() -> impl warp::Filter + Clone { +pub fn get_debug_routes() -> impl warp::Filter + Clone { warp::path("debug") .and(warp::path("headers").and(warp::header::headers_cloned().map(handle_with_headers))) } diff --git a/src/v1/kcomebacks/filter/mod.rs b/src/v1/kcomebacks/filter/mod.rs index 5d6fb1b..158bac2 100644 --- a/src/v1/kcomebacks/filter/mod.rs +++ b/src/v1/kcomebacks/filter/mod.rs @@ -6,7 +6,7 @@ use warp::Filter; use crate::{error_responses::{BadRequestError, InternalServerError}, v1::kcomebacks::{fetch_data, create_json_response, parse_item, Item as EntryItem}}; -pub fn get_kcomebacks_filter_routes() -> impl warp::Filter + Clone { +pub fn get_kcomebacks_filter_routes() -> impl warp::Filter + Clone { warp::path("filter") .and((warp::path("id").and(warp::get()).and(warp::query::>()).and_then(filter_id_handler)) .or(warp::path("getall").and(warp::get()).and(warp::query::>()).and_then(filter_getall_handler)) diff --git a/src/v1/kcomebacks/mod.rs b/src/v1/kcomebacks/mod.rs index 0a985a3..6ddb102 100644 --- a/src/v1/kcomebacks/mod.rs +++ b/src/v1/kcomebacks/mod.rs @@ -10,7 +10,7 @@ use filter::get_kcomebacks_filter_routes; use upcoming::get_kcomebacks_upcoming_routes; use crate::error_responses::InternalServerError; -pub fn get_kcomebacks_routes() -> impl warp::Filter + Clone { +pub fn get_kcomebacks_routes() -> impl warp::Filter + Clone { warp::path("v1").and(warp::path("kcomebacks")) .and(warp::path("last_update").and(warp::get()).and_then(last_update) diff --git a/src/v1/kcomebacks/upcoming/mod.rs b/src/v1/kcomebacks/upcoming/mod.rs index 6f23aff..0e29b44 100644 --- a/src/v1/kcomebacks/upcoming/mod.rs +++ b/src/v1/kcomebacks/upcoming/mod.rs @@ -4,7 +4,7 @@ use warp::Filter; use crate::v1::kcomebacks::filter::filter_daterange_handler; -pub fn get_kcomebacks_upcoming_routes() -> impl warp::Filter + Clone { +pub fn get_kcomebacks_upcoming_routes() -> impl warp::Filter + Clone { warp::path("upcoming") .and((warp::path("today").and(warp::get()).and(warp::query::>()).and_then(upcoming_today_handler)) .or(warp::path("week").and(warp::get()).and(warp::query::>()).and_then(upcoming_week_handler)) diff --git a/src/v1/mod.rs b/src/v1/mod.rs index 49c86a4..80e064a 100644 --- a/src/v1/mod.rs +++ b/src/v1/mod.rs @@ -12,7 +12,7 @@ pub use update::get_update_routes as get_v1_updates_routes; use warp::Filter; -pub fn get_v1_routes() -> impl warp::Filter + Clone { +pub fn get_v1_routes() -> impl warp::Filter + Clone { return get_v1_builtin_routes() .or(get_v1_debug_routes()) .or(get_v1_kcomebacks_routes()) diff --git a/src/v1/projects/filter/mod.rs b/src/v1/projects/filter/mod.rs index 952b81c..d200078 100644 --- a/src/v1/projects/filter/mod.rs +++ b/src/v1/projects/filter/mod.rs @@ -5,7 +5,7 @@ use warp::Filter; use crate::{error_responses::BadRequestError, v1::projects::{fetch_data, create_json_response, Project as EntryProject}}; -pub fn get_project_filter_routes() -> impl warp::Filter + Clone { +pub fn get_project_filter_routes() -> impl warp::Filter + Clone { warp::path("filter") .and((warp::path("getall").and(warp::get()).and(warp::query::>()).and_then(filter_getall_handler)) .or(warp::path("lastupdaterange").and(warp::get()).and(warp::query::>()).and_then(filter_lastupdaterange_handler)) diff --git a/src/v1/projects/mod.rs b/src/v1/projects/mod.rs index 55689b1..777e69e 100644 --- a/src/v1/projects/mod.rs +++ b/src/v1/projects/mod.rs @@ -10,7 +10,7 @@ use filter::get_project_filter_routes; use crate::error_responses::InternalServerError; -pub fn get_project_routes() -> impl warp::Filter + Clone { +pub fn get_project_routes() -> impl warp::Filter + Clone { warp::path("v1").and(warp::path("projects")) .and(warp::path("last_update").and(warp::get()).and_then(last_update) diff --git a/src/v1/update/mod.rs b/src/v1/update/mod.rs index 68e97dc..abb148f 100644 --- a/src/v1/update/mod.rs +++ b/src/v1/update/mod.rs @@ -16,7 +16,7 @@ pub struct DiscographyQuery { artists: String, } -pub fn get_update_routes() -> impl warp::Filter + Clone { +pub fn get_update_routes() -> impl warp::Filter + Clone { warp::path("v1").and(warp::path("update")) // update/kcomebacks // update/projects