blossom: fix url serialization

This was identified when working with whitenoise [pr](parres-hq/whitenoise#237)

Pull-Request: #956
Signed-off-by: Yuki Kishimoto <[email protected]>

Author: delcin-raj

rfs/nostr-blossom/CHANGELOG.md

@@ -23,6 +23,12 @@
 
 -->
 
+## Unreleased
+
+### Fixed
+
+- blossom: fix url serialization (https://github.com/rust-nostr/nostr/pull/956)
+
 ## v0.42.0 - 2025/05/20
 
 First release.

rfs/nostr-blossom/src/client.rs

@@ -59,7 +59,7 @@ impl BlossomClient {
     where
         T: NostrSigner,
     {
-        let url = format!("{}/upload", self.base_url);
+        let url: Url = self.base_url.join("upload")?;
 
         let hash: Sha256Hash = Sha256Hash::hash(&data);
         let file_hashes: Vec<Sha256Hash> = vec![hash];
@@ -111,20 +111,16 @@ impl BlossomClient {
     where
         T: NostrSigner,
     {
-        let mut url = format!("{}/list/{}", self.base_url, pubkey.to_hex());
-
-        let mut query_params = Vec::new();
+        let mut url: Url = self.base_url.join("list")?.join(&pubkey.to_hex())?;
 
         if let Some(since) = since {
-            query_params.push(format!("since=\"{}\"", since));
+            url.query_pairs_mut()
+                .append_pair("since", since.to_string().as_str());
         }
 
         if let Some(until) = until {
-            query_params.push(format!("until=\"{}\"", until));
-        }
-
-        if !query_params.is_empty() {
-            url.push_str(&format!("?{}", query_params.join("&")));
+            url.query_pairs_mut()
+                .append_pair("until", until.to_string().as_str());
         }
 
         let mut request = self.client.get(url);
@@ -169,7 +165,8 @@ impl BlossomClient {
     where
         T: NostrSigner,
     {
-        let url = format!("{}/{}", self.base_url, sha256);
+        let url: Url = self.base_url.join(sha256.to_string().as_str())?;
+
         let mut request = self.client.get(url);
         let mut headers = HeaderMap::new();
 
@@ -224,7 +221,7 @@ impl BlossomClient {
     where
         T: NostrSigner,
     {
-        let url = format!("{}/{}", self.base_url, sha256);
+        let url: Url = self.base_url.join(sha256.to_string().as_str())?;
 
         let mut request = self.client.head(url);
 
@@ -267,7 +264,7 @@ impl BlossomClient {
     where
         T: NostrSigner,
     {
-        let url = format!("{}/{}", self.base_url, sha256);
+        let url: Url = self.base_url.join(sha256.to_string().as_str())?;
 
         let mut headers = HeaderMap::new();
         let default_auth = self.default_auth(

rfs/nostr-blossom/src/error.rs

@@ -8,6 +8,7 @@ use std::fmt;
 
 use nostr::event::builder;
 use nostr::signer::SignerError;
+use nostr::types::ParseError;
 use reqwest::header::{InvalidHeaderValue, ToStrError};
 use reqwest::Response;
 
@@ -22,6 +23,8 @@ pub enum Error {
     Reqwest(reqwest::Error),
     /// Invalid header value
     InvalidHeaderValue(InvalidHeaderValue),
+    /// Url parse error
+    Url(ParseError),
     /// To string error
     ToStr(ToStrError),
     /// Response error
@@ -59,6 +62,7 @@ impl fmt::Display for Error {
             Self::EventBuilder(e) => write!(f, "{e}"),
             Self::Reqwest(e) => write!(f, "{e}"),
             Self::InvalidHeaderValue(e) => write!(f, "{e}"),
+            Self::Url(e) => write!(f, "{e}"),
             Self::ToStr(e) => write!(f, "{e}"),
             Self::Response { prefix, res } => {
                 let reason: &str = res
@@ -102,6 +106,12 @@ impl From<InvalidHeaderValue> for Error {
     }
 }
 
+impl From<ParseError> for Error {
+    fn from(e: ParseError) -> Self {
+        Self::Url(e)
+    }
+}
+
 impl From<ToStrError> for Error {
     fn from(e: ToStrError) -> Self {
         Self::ToStr(e)