From 058647e0d36e35b8b97f93cfa9d64ae9fcbd7d2a Mon Sep 17 00:00:00 2001 From: Amit Upadhyay Date: Mon, 17 Jun 2024 12:25:03 +0530 Subject: [PATCH] fastn 0.4.69 (fastn upload endpoint fix) --- Cargo.lock | 8 ++++---- clift/src/api/mod.rs | 15 ++++++++------- fastn/Cargo.toml | 2 +- 3 files changed, 13 insertions(+), 12 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 597ff1c162..84469763bc 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1151,15 +1151,15 @@ dependencies = [ [[package]] name = "derive_more" -version = "0.99.17" +version = "0.99.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321" +checksum = "5f33878137e4dafd7fa914ad4e259e18a4e8e532b9617a2d0150262bf53abfce" dependencies = [ "convert_case 0.4.0", "proc-macro2", "quote", "rustc_version", - "syn 1.0.109", + "syn 2.0.66", ] [[package]] @@ -1416,7 +1416,7 @@ dependencies = [ [[package]] name = "fastn" -version = "0.4.68" +version = "0.4.69" dependencies = [ "actix-web", "camino", diff --git a/clift/src/api/mod.rs b/clift/src/api/mod.rs index 913765b905..9fadbf2f32 100644 --- a/clift/src/api/mod.rs +++ b/clift/src/api/mod.rs @@ -7,7 +7,7 @@ pub use initiate_upload::{ InitiateUploadResponse, PreSignedRequest, }; -pub const ENDPOINT: &str = "https://api.fifthtry.com"; +pub const ENDPOINT: &str = "https://www.fifthtry.com"; #[derive(serde::Deserialize)] pub struct ApiResponse { @@ -17,10 +17,11 @@ pub struct ApiResponse { } pub fn endpoint(name: &str) -> String { - if let Ok(url) = std::env::var("DEBUG_API_FIFTHTRY_COM") { - let url = format!("{}/ft2/api/{name}/", url); - println!("using debug api, only use this for testing: {url}"); - return url; - } - dbg!(format!("{}/ft2/api/{name}/", clift::api::ENDPOINT)) + format!( + "{prefix}/ft2/api/{name}/", + prefix = std::env::var("DEBUG_API_FIFTHTRY_COM") + .as_ref() + .map(|s| s.as_str()) + .unwrap_or_else(|_| clift::api::ENDPOINT) + ) } diff --git a/fastn/Cargo.toml b/fastn/Cargo.toml index 340b811271..1e021ef350 100644 --- a/fastn/Cargo.toml +++ b/fastn/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "fastn" -version = "0.4.68" +version = "0.4.69" authors.workspace = true edition.workspace = true license.workspace = true