chore: update gpui and nostr-sdk

crates/common/src/lib.rs

@@ -2,48 +2,17 @@ use std::collections::HashSet;
 use std::hash::{DefaultHasher, Hash, Hasher};
 use std::sync::Arc;
 
-use anyhow::{anyhow, Error, Result};
 use gpui::{Image, ImageFormat};
 use itertools::Itertools;
 use nostr_sdk::prelude::*;
 use qrcode_generator::QrCodeEcc;
-use reqwest::Client as ReqClient;
 
 pub mod debounced_delay;
 pub mod handle_auth;
+pub mod nip05;
+pub mod nip96;
 pub mod profile;
 
-pub async fn verify_nip05(public_key: PublicKey, address: &str) -> Result<bool, Error> {
-    let req_client = ReqClient::new();
-    let address = Nip05Address::parse(address)?;
-    let res = req_client.get(address.url().to_string()).send().await?;
-    let json: Value = res.json().await?;
-    let verify = nip05::verify_from_json(&public_key, &address, &json);
-
-    Ok(verify)
-}
-
-pub async fn nip05_profile(address: &str) -> Result<Nip05Profile, Error> {
-    let req_client = ReqClient::new();
-    let address = Nip05Address::parse(address)?;
-    let res = req_client.get(address.url().to_string()).send().await?;
-    let json: Value = res.json().await?;
-
-    if let Ok(profile) = Nip05Profile::from_json(&address, &json) {
-        Ok(profile)
-    } else {
-        Err(anyhow!("Failed to get NIP-05 profile"))
-    }
-}
-
-pub async fn nip96_upload(client: &Client, server: Url, file: Vec<u8>) -> Result<Url, Error> {
-    let signer = client.signer().await?;
-    let config = nip96::get_server_config(server.to_owned(), None).await?;
-    let url = nip96::upload_data(&signer, &config, file, None, None).await?;
-
-    Ok(url)
-}
-
 pub fn room_hash(event: &Event) -> u64 {
     let mut hasher = DefaultHasher::new();
     let mut pubkeys: Vec<PublicKey> = vec![];

crates/common/src/nip05.rs

@@ -0,0 +1,31 @@
+use anyhow::anyhow;
+use nostr::prelude::*;
+use reqwest::Client as ReqClient;
+
+pub async fn nip05_verify(public_key: PublicKey, address: &str) -> Result<bool, anyhow::Error> {
+    let req_client = ReqClient::new();
+    let address = Nip05Address::parse(address)?;
+
+    // Get NIP-05 response
+    let res = req_client.get(address.url().to_string()).send().await?;
+    let json: Value = res.json().await?;
+
+    let verify = nip05::verify_from_json(&public_key, &address, &json);
+
+    Ok(verify)
+}
+
+pub async fn nip05_profile(address: &str) -> Result<Nip05Profile, anyhow::Error> {
+    let req_client = ReqClient::new();
+    let address = Nip05Address::parse(address)?;
+
+    // Get NIP-05 response
+    let res = req_client.get(address.url().to_string()).send().await?;
+    let json: Value = res.json().await?;
+
+    if let Ok(profile) = Nip05Profile::from_json(&address, &json) {
+        Ok(profile)
+    } else {
+        Err(anyhow!("Failed to get NIP-05 profile"))
+    }
+}

crates/common/src/nip96.rs

@@ -0,0 +1,82 @@
+use anyhow::anyhow;
+use nostr::hashes::sha256::Hash as Sha256Hash;
+use nostr::hashes::Hash;
+use nostr::prelude::*;
+use nostr_sdk::prelude::*;
+use reqwest::multipart;
+use reqwest::Client as ReqClient;
+use reqwest::Response;
+
+pub(crate) fn make_multipart_form(
+    file_data: Vec<u8>,
+    mime_type: Option<&str>,
+) -> Result<multipart::Form, anyhow::Error> {
+    let form_file_part = multipart::Part::bytes(file_data).file_name("filename");
+
+    // Set the part's MIME type, or leave it as is if mime_type is None
+
+    let part = match mime_type {
+        Some(mime) => form_file_part.mime_str(mime)?,
+        None => form_file_part,
+    };
+
+    Ok(multipart::Form::new().part("file", part))
+}
+
+pub(crate) async fn upload<T>(
+    signer: &T,
+    desc: &ServerConfig,
+    file_data: Vec<u8>,
+    mime_type: Option<&str>,
+) -> Result<Url, anyhow::Error>
+where
+    T: NostrSigner,
+{
+    let payload: Sha256Hash = Sha256Hash::hash(&file_data);
+    let data: HttpData = HttpData::new(desc.api_url.clone(), HttpMethod::POST).payload(payload);
+    let nip98_auth: String = data.to_authorization(signer).await?;
+
+    // Make form
+    let form: multipart::Form = make_multipart_form(file_data, mime_type)?;
+
+    // Make req client
+    let req_client = ReqClient::new();
+
+    // Send
+    let response: Response = req_client
+        .post(desc.api_url.clone())
+        .header("Authorization", nip98_auth)
+        .multipart(form)
+        .send()
+        .await?;
+
+    // Parse response
+    let json: Value = response.json().await?;
+    let upload_response = nip96::UploadResponse::from_json(json.to_string())?;
+
+    if upload_response.status == UploadResponseStatus::Error {
+        return Err(anyhow!(upload_response.message));
+    }
+
+    Ok(upload_response.download_url()?.to_owned())
+}
+
+pub async fn nip96_upload(
+    client: &Client,
+    server: &Url,
+    file: Vec<u8>,
+) -> Result<Url, anyhow::Error> {
+    let req_client = ReqClient::new();
+    let config_url = nip96::get_server_config_url(server)?;
+
+    // Get
+    let res = req_client.get(config_url.to_string()).send().await?;
+    let json: Value = res.json().await?;
+
+    let config = nip96::ServerConfig::from_json(json.to_string())?;
+    let signer = client.signer().await?;
+
+    let url = upload(&signer, &config, file, None).await?;
+
+    Ok(url)
+}

crates/common/src/profile.rs

@@ -18,8 +18,7 @@ impl RenderProfile for Profile {
             .map(|picture| {
                 if proxy {
                     format!(
-                        "{}/?url={}&w=100&h=100&fit=cover&mask=circle&default={}&n=-1",
-                        IMAGE_RESIZE_SERVICE, picture, FALLBACK_IMG
+                        "{IMAGE_RESIZE_SERVICE}/?url={picture}&w=100&h=100&fit=cover&mask=circle&default={FALLBACK_IMG}&n=-1"
                     )
                     .into()
                 } else {