nostr: change TagStandard::Server variant inner value

Change the inner value of `TagStandard::Server` variant from `String` to `Url`.

Signed-off-by: Yuki Kishimoto <[email protected]>

Author: yukibtc

crates/nostr-blossom/src/bud01.rs

@@ -3,7 +3,7 @@
 use std::fmt;
 
 use nostr::hashes::sha256::Hash as Sha256Hash;
-use nostr::{EventBuilder, Kind, Tag, TagStandard, Timestamp};
+use nostr::{EventBuilder, Kind, Tag, TagStandard, Timestamp, Url};
 
 /// Represents the authorization data for accessing a Blossom server.
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
@@ -45,7 +45,7 @@ pub enum BlossomAuthorizationScope {
     /// Authorizes access to blobs with the given SHA256 hashes.
     BlobSha256Hashes(Vec<Sha256Hash>),
     /// Authorizes access to the given server URL.
-    ServerUrl(String),
+    ServerUrl(Url),
 }
 
 /// Represents the possible actions that can be authorized by a Blossom authorization event.

crates/nostr-blossom/src/client.rs

@@ -7,7 +7,7 @@ use base64::Engine;
 use nostr::hashes::sha256::Hash as Sha256Hash;
 use nostr::hashes::Hash;
 use nostr::signer::NostrSigner;
-use nostr::{Event, EventBuilder, JsonUtil, PublicKey, Timestamp};
+use nostr::{Event, EventBuilder, JsonUtil, PublicKey, Timestamp, Url};
 use reqwest::header::{HeaderMap, HeaderValue, AUTHORIZATION, CONTENT_TYPE, RANGE};
 #[cfg(not(target_arch = "wasm32"))]
 use reqwest::redirect::Policy;
@@ -134,10 +134,12 @@ impl BlossomClient {
         let mut headers = HeaderMap::new();
 
         if let Some(signer) = signer {
+            // TODO: change self.base_url type to Url
+            let url = Url::parse(&self.base_url).unwrap();
             let default_auth = self.default_auth(
                 BlossomAuthorizationVerb::List,
                 "Blossom list authorization",
-                BlossomAuthorizationScope::ServerUrl(self.base_url.clone()),
+                BlossomAuthorizationScope::ServerUrl(url),
             );
             let final_auth = authorization_options
                 .map(|opts| Self::update_authorization_fixture(&default_auth, opts))

crates/nostr/src/event/tag/standard.rs

@@ -188,7 +188,7 @@ pub enum TagStandard {
         key: String,
         iv: String,
     },
-    Server(String),
+    Server(Url),
     Sha256(Sha256Hash),
     Size(usize),
     Dim(ImageDimensions),
@@ -427,7 +427,7 @@ impl TagStandard {
                 TagKind::Title => Ok(Self::Title(tag_1.to_string())),
                 TagKind::Image => Ok(Self::Image(Url::parse(tag_1)?, None)),
                 TagKind::Thumb => Ok(Self::Thumb(Url::parse(tag_1)?, None)),
-                TagKind::Server => Ok(Self::Server(tag_1.to_string())),
+                TagKind::Server => Ok(Self::Server(Url::parse(tag_1)?)),
                 TagKind::Summary => Ok(Self::Summary(tag_1.to_string())),
                 TagKind::PublishedAt => Ok(Self::PublishedAt(Timestamp::from_str(tag_1)?)),
                 TagKind::Description => Ok(Self::Description(tag_1.to_string())),
@@ -930,7 +930,7 @@ impl From<TagStandard> for Vec<String> {
             TagStandard::Url(url) => vec![tag_kind, url.to_string()],
             TagStandard::MimeType(mime) => vec![tag_kind, mime],
             TagStandard::Aes256Gcm { key, iv } => vec![tag_kind, key, iv],
-            TagStandard::Server(url) => vec![tag_kind, url],
+            TagStandard::Server(url) => vec![tag_kind, url.to_string()],
             TagStandard::Sha256(hash) => vec![tag_kind, hash.to_string()],
             TagStandard::Size(bytes) => vec![tag_kind, bytes.to_string()],
             TagStandard::Dim(dim) => vec![tag_kind, dim.to_string()],