Continue redesign for the v1 stable release (#5)

Reviewed-on: #5

crates/common/Cargo.toml

@@ -6,6 +6,7 @@ publish.workspace = true
 
 [dependencies]
 gpui.workspace = true
+nostr.workspace = true
 nostr-sdk.workspace = true
 
 anyhow.workspace = true
@@ -19,5 +20,3 @@ log.workspace = true
 
 dirs = "5.0"
 qrcode = "0.14.1"
-whoami = "1.6.1"
-nostr = { git = "https://github.com/rust-nostr/nostr" }

crates/common/src/constants.rs

@@ -1,28 +0,0 @@
-pub const CLIENT_NAME: &str = "Coop";
-pub const APP_ID: &str = "su.reya.coop";
-
-/// Bootstrap Relays.
-pub const BOOTSTRAP_RELAYS: [&str; 4] = [
-    "wss://relay.damus.io",
-    "wss://relay.primal.net",
-    "wss://relay.nos.social",
-    "wss://user.kindpag.es",
-];
-
-/// Search Relays.
-pub const SEARCH_RELAYS: [&str; 2] = ["wss://search.nos.today", "wss://relay.noswhere.com"];
-
-/// Default relay for Nostr Connect
-pub const NOSTR_CONNECT_RELAY: &str = "wss://relay.nsec.app";
-
-/// Default retry count for fetching NIP-17 relays
-pub const RELAY_RETRY: u64 = 2;
-
-/// Default retry count for sending messages
-pub const SEND_RETRY: u64 = 10;
-
-/// Default timeout (in seconds) for Nostr Connect
-pub const NOSTR_CONNECT_TIMEOUT: u64 = 200;
-
-/// Default timeout (in seconds) for Nostr Connect (Bunker)
-pub const BUNKER_TIMEOUT: u64 = 30;

crates/common/src/display.rs

@@ -12,44 +12,6 @@ const SECONDS_IN_MINUTE: i64 = 60;
 const MINUTES_IN_HOUR: i64 = 60;
 const HOURS_IN_DAY: i64 = 24;
 const DAYS_IN_MONTH: i64 = 30;
-const IMAGE_RESIZER: &str = "https://wsrv.nl";
-
-pub trait RenderedProfile {
-    fn avatar(&self) -> SharedString;
-    fn display_name(&self) -> SharedString;
-}
-
-impl RenderedProfile for Profile {
-    fn avatar(&self) -> SharedString {
-        self.metadata()
-            .picture
-            .as_ref()
-            .filter(|picture| !picture.is_empty())
-            .map(|picture| {
-                let url = format!(
-                    "{IMAGE_RESIZER}/?url={picture}&w=100&h=100&fit=cover&mask=circle&n=-1"
-                );
-                url.into()
-            })
-            .unwrap_or_else(|| "brand/avatar.png".into())
-    }
-
-    fn display_name(&self) -> SharedString {
-        if let Some(display_name) = self.metadata().display_name.as_ref() {
-            if !display_name.is_empty() {
-                return SharedString::from(display_name);
-            }
-        }
-
-        if let Some(name) = self.metadata().name.as_ref() {
-            if !name.is_empty() {
-                return SharedString::from(name);
-            }
-        }
-
-        SharedString::from(shorten_pubkey(self.public_key(), 4))
-    }
-}
 
 pub trait RenderedTimestamp {
     fn to_human_time(&self) -> SharedString;

crates/common/src/lib.rs

@@ -1,66 +1,11 @@
-use std::sync::OnceLock;
-
-pub use constants::*;
 pub use debounced_delay::*;
 pub use display::*;
 pub use event::*;
 pub use nip96::*;
-use nostr_sdk::prelude::*;
 pub use paths::*;
 
-mod constants;
 mod debounced_delay;
 mod display;
 mod event;
 mod nip96;
 mod paths;
-
-static APP_NAME: OnceLock<String> = OnceLock::new();
-static NIP65_RELAYS: OnceLock<Vec<(RelayUrl, Option<RelayMetadata>)>> = OnceLock::new();
-static NIP17_RELAYS: OnceLock<Vec<RelayUrl>> = OnceLock::new();
-
-/// Get the app name
-pub fn app_name() -> &'static String {
-    APP_NAME.get_or_init(|| {
-        let devicename = whoami::devicename();
-        let platform = whoami::platform();
-
-        format!("{CLIENT_NAME} on {platform} ({devicename})")
-    })
-}
-
-/// Default NIP-65 Relays. Used for new account
-pub fn default_nip65_relays() -> &'static Vec<(RelayUrl, Option<RelayMetadata>)> {
-    NIP65_RELAYS.get_or_init(|| {
-        vec![
-            (
-                RelayUrl::parse("wss://nostr.mom").unwrap(),
-                Some(RelayMetadata::Read),
-            ),
-            (
-                RelayUrl::parse("wss://nostr.bitcoiner.social").unwrap(),
-                Some(RelayMetadata::Read),
-            ),
-            (
-                RelayUrl::parse("wss://nos.lol").unwrap(),
-                Some(RelayMetadata::Write),
-            ),
-            (
-                RelayUrl::parse("wss://relay.snort.social").unwrap(),
-                Some(RelayMetadata::Write),
-            ),
-            (RelayUrl::parse("wss://relay.primal.net").unwrap(), None),
-            (RelayUrl::parse("wss://relay.damus.io").unwrap(), None),
-        ]
-    })
-}
-
-/// Default NIP-17 Relays. Used for new account
-pub fn default_nip17_relays() -> &'static Vec<RelayUrl> {
-    NIP17_RELAYS.get_or_init(|| {
-        vec![
-            RelayUrl::parse("wss://nip17.com").unwrap(),
-            RelayUrl::parse("wss://auth.nostr1.com").unwrap(),
-        ]
-    })
-}

crates/common/src/nip96.rs

@@ -72,11 +72,10 @@ pub async fn nip96_upload(
     let json: Value = res.json().await?;
 
     let config = nip96::ServerConfig::from_json(json.to_string())?;
-    let signer = if client.has_signer().await {
-        client.signer().await?
-    } else {
-        Keys::generate().into_nostr_signer()
-    };
+    let signer = client
+        .signer()
+        .cloned()
+        .unwrap_or(Keys::generate().into_nostr_signer());
 
     let url = upload(&signer, &config, file, None).await?;