diff --git a/Cargo.lock b/Cargo.lock index d0fcfd14..dd1554d3 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1131,7 +1131,7 @@ dependencies = [ [[package]] name = "collections" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#0283bfb04949295086b5ce6c892defa9c3ecc008" +source = "git+https://github.com/zed-industries/zed#a51585d2daaa975409a835f43574c8bb5bcc9d5b" dependencies = [ "indexmap", "rustc-hash 2.1.1", @@ -1520,7 +1520,7 @@ dependencies = [ [[package]] name = "derive_refineable" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#0283bfb04949295086b5ce6c892defa9c3ecc008" +source = "git+https://github.com/zed-industries/zed#a51585d2daaa975409a835f43574c8bb5bcc9d5b" dependencies = [ "proc-macro2", "quote", @@ -2402,7 +2402,7 @@ dependencies = [ [[package]] name = "gpui" version = "0.2.2" -source = "git+https://github.com/zed-industries/zed#0283bfb04949295086b5ce6c892defa9c3ecc008" +source = "git+https://github.com/zed-industries/zed#a51585d2daaa975409a835f43574c8bb5bcc9d5b" dependencies = [ "anyhow", "as-raw-xcb-connection", @@ -2562,7 +2562,7 @@ dependencies = [ [[package]] name = "gpui_macros" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#0283bfb04949295086b5ce6c892defa9c3ecc008" +source = "git+https://github.com/zed-industries/zed#a51585d2daaa975409a835f43574c8bb5bcc9d5b" dependencies = [ "heck 0.5.0", "proc-macro2", @@ -2573,7 +2573,7 @@ dependencies = [ [[package]] name = "gpui_tokio" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#0283bfb04949295086b5ce6c892defa9c3ecc008" +source = "git+https://github.com/zed-industries/zed#a51585d2daaa975409a835f43574c8bb5bcc9d5b" dependencies = [ "anyhow", "gpui", @@ -2800,7 +2800,7 @@ dependencies = [ [[package]] name = "http_client" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#0283bfb04949295086b5ce6c892defa9c3ecc008" +source = "git+https://github.com/zed-industries/zed#a51585d2daaa975409a835f43574c8bb5bcc9d5b" dependencies = [ "anyhow", "async-compression", @@ -2825,7 +2825,7 @@ dependencies = [ [[package]] name = "http_client_tls" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#0283bfb04949295086b5ce6c892defa9c3ecc008" +source = "git+https://github.com/zed-industries/zed#a51585d2daaa975409a835f43574c8bb5bcc9d5b" dependencies = [ "rustls", "rustls-platform-verifier", @@ -3081,7 +3081,7 @@ dependencies = [ "rgb", "tiff", "zune-core 0.5.0", - "zune-jpeg 0.5.6", + "zune-jpeg 0.5.7", ] [[package]] @@ -3526,6 +3526,7 @@ dependencies = [ "nostr-connect", "nostr-sdk", "oneshot", + "person", "reqwest_client", "serde", "serde_json", @@ -3670,7 +3671,7 @@ dependencies = [ [[package]] name = "media" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#0283bfb04949295086b5ce6c892defa9c3ecc008" +source = "git+https://github.com/zed-industries/zed#a51585d2daaa975409a835f43574c8bb5bcc9d5b" dependencies = [ "anyhow", "bindgen", @@ -3773,9 +3774,9 @@ dependencies = [ [[package]] name = "moxcms" -version = "0.7.10" +version = "0.7.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80986bbbcf925ebd3be54c26613d861255284584501595cf418320c078945608" +checksum = "ac9557c559cd6fc9867e122e20d2cbefc9ca29d80d027a8e39310920ed2f0a97" dependencies = [ "num-traits", "pxfm", @@ -4540,13 +4541,29 @@ checksum = "9b4f627cb1b25917193a259e49bdad08f671f8d9708acfd5fe0a8c1455d87220" [[package]] name = "perf" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#0283bfb04949295086b5ce6c892defa9c3ecc008" +source = "git+https://github.com/zed-industries/zed#a51585d2daaa975409a835f43574c8bb5bcc9d5b" dependencies = [ "collections", "serde", "serde_json", ] +[[package]] +name = "person" +version = "0.0.1" +dependencies = [ + "anyhow", + "common", + "gpui", + "log", + "nostr-sdk", + "serde", + "serde_json", + "smallvec", + "smol", + "state", +] + [[package]] name = "phf" version = "0.11.3" @@ -5158,7 +5175,7 @@ dependencies = [ [[package]] name = "refineable" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#0283bfb04949295086b5ce6c892defa9c3ecc008" +source = "git+https://github.com/zed-industries/zed#a51585d2daaa975409a835f43574c8bb5bcc9d5b" dependencies = [ "derive_refineable", ] @@ -5239,7 +5256,7 @@ dependencies = [ [[package]] name = "reqwest_client" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#0283bfb04949295086b5ce6c892defa9c3ecc008" +source = "git+https://github.com/zed-industries/zed#a51585d2daaa975409a835f43574c8bb5bcc9d5b" dependencies = [ "anyhow", "bytes", @@ -6218,7 +6235,7 @@ checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" [[package]] name = "sum_tree" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#0283bfb04949295086b5ce6c892defa9c3ecc008" +source = "git+https://github.com/zed-industries/zed#a51585d2daaa975409a835f43574c8bb5bcc9d5b" dependencies = [ "arrayvec", "log", @@ -7174,7 +7191,7 @@ checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be" [[package]] name = "util" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#0283bfb04949295086b5ce6c892defa9c3ecc008" +source = "git+https://github.com/zed-industries/zed#a51585d2daaa975409a835f43574c8bb5bcc9d5b" dependencies = [ "anyhow", "async-fs", @@ -7210,7 +7227,7 @@ dependencies = [ [[package]] name = "util_macros" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#0283bfb04949295086b5ce6c892defa9c3ecc008" +source = "git+https://github.com/zed-industries/zed#a51585d2daaa975409a835f43574c8bb5bcc9d5b" dependencies = [ "perf", "quote", @@ -8693,7 +8710,7 @@ dependencies = [ [[package]] name = "zlog" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#0283bfb04949295086b5ce6c892defa9c3ecc008" +source = "git+https://github.com/zed-industries/zed#a51585d2daaa975409a835f43574c8bb5bcc9d5b" dependencies = [ "anyhow", "chrono", @@ -8704,7 +8721,7 @@ dependencies = [ [[package]] name = "ztracing" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#0283bfb04949295086b5ce6c892defa9c3ecc008" +source = "git+https://github.com/zed-industries/zed#a51585d2daaa975409a835f43574c8bb5bcc9d5b" dependencies = [ "tracing", "tracing-subscriber", @@ -8715,7 +8732,7 @@ dependencies = [ [[package]] name = "ztracing_macro" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#0283bfb04949295086b5ce6c892defa9c3ecc008" +source = "git+https://github.com/zed-industries/zed#a51585d2daaa975409a835f43574c8bb5bcc9d5b" [[package]] name = "zune-core" @@ -8749,9 +8766,9 @@ dependencies = [ [[package]] name = "zune-jpeg" -version = "0.5.6" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f520eebad972262a1dde0ec455bce4f8b298b1e5154513de58c114c4c54303e8" +checksum = "51d915729b0e7d5fe35c2f294c5dc10b30207cc637920e5b59077bfa3da63f28" dependencies = [ "zune-core 0.5.0", ] diff --git a/crates/account/src/lib.rs b/crates/account/src/lib.rs index 498f69dd..3e9628fb 100644 --- a/crates/account/src/lib.rs +++ b/crates/account/src/lib.rs @@ -1,3 +1,4 @@ +use std::collections::HashSet; use std::env; use anyhow::Error; @@ -15,9 +16,12 @@ struct GlobalAccount(Entity); impl Global for GlobalAccount {} pub struct Account { - /// The public key of the account + /// Public Key of the account public_key: Option, + /// Contact List of the account + pub contacts: Entity>, + /// Event subscriptions _subscriptions: SmallVec<[Subscription; 1]>, @@ -48,6 +52,8 @@ impl Account { /// Create a new account instance fn new(cx: &mut Context) -> Self { + let contacts = cx.new(|_| HashSet::default()); + // Collect command line arguments let args: Vec = env::args().collect(); let account = args.get(1).and_then(|s| Keys::parse(s).ok()); @@ -56,11 +62,11 @@ impl Account { let mut tasks = smallvec![]; if let Some(keys) = account { + let public_key = keys.public_key(); + tasks.push( // Set signer in background cx.spawn(async move |this, cx| { - let public_key = keys.public_key(); - // Set the signer cx.background_executor() .await_on_background(async move { @@ -91,22 +97,12 @@ impl Account { Self { public_key: None, + contacts, _subscriptions: subscriptions, _tasks: tasks, } } - /// Check if the account entity has a public key - pub fn has_account(&self) -> bool { - self.public_key.is_some() - } - - /// Get the public key of the account - pub fn public_key(&self) -> PublicKey { - // This method is only called when user is logged in, so unwrap safely - self.public_key.unwrap() - } - fn init(&mut self, public_key: PublicKey, cx: &mut Context) { let task: Task> = cx.background_spawn(async move { let client = client(); @@ -137,4 +133,41 @@ impl Account { self._tasks.push(task); } + + /// Check if the account entity has a public key + pub fn has_account(&self) -> bool { + self.public_key.is_some() + } + + /// Get the public key of the account + pub fn public_key(&self) -> PublicKey { + // This method is only called when user is logged in, so unwrap safely + self.public_key.unwrap() + } + + /// Load the contacts of the account from the database + pub fn load_contacts(&mut self, cx: &mut Context) { + let task: Task, Error>> = cx.background_spawn(async move { + let client = client(); + let signer = client.signer().await?; + let public_key = signer.get_public_key().await?; + let contacts = client.database().contacts_public_keys(public_key).await?; + + Ok(contacts) + }); + + self._tasks.push(cx.spawn(async move |this, cx| { + if let Ok(contacts) = task.await { + this.update(cx, |this, cx| { + this.contacts.update(cx, |this, cx| { + this.extend(contacts); + cx.notify(); + }); + }) + .ok(); + } + + Ok(()) + })); + } } diff --git a/crates/lume/Cargo.toml b/crates/lume/Cargo.toml index 24ac0828..f8cd87e3 100644 --- a/crates/lume/Cargo.toml +++ b/crates/lume/Cargo.toml @@ -13,6 +13,7 @@ common = { path = "../common" } assets = { path = "../assets" } state = { path = "../state" } account = { path = "../account" } +person = { path = "../person" } gpui.workspace = true gpui-component.workspace = true diff --git a/crates/lume/src/main.rs b/crates/lume/src/main.rs index 4304b6cd..4fb54078 100644 --- a/crates/lume/src/main.rs +++ b/crates/lume/src/main.rs @@ -90,6 +90,9 @@ fn main() { // Initialize account account::init(cx); + // Initialize person registry + person::init(cx); + let workspace = cx.new(|cx| Workspace::new(window, cx)); cx.new(|cx| Root::new(workspace, window, cx)) }) diff --git a/crates/lume/src/sidebar/mod.rs b/crates/lume/src/sidebar/mod.rs index 128c22d0..5a1e389b 100644 --- a/crates/lume/src/sidebar/mod.rs +++ b/crates/lume/src/sidebar/mod.rs @@ -1,13 +1,26 @@ +use account::Account; +use common::BOOTSTRAP_RELAYS; use gpui::{ - div, App, AppContext, Context, Entity, EventEmitter, FocusHandle, Focusable, IntoElement, - ParentElement, Render, Window, + div, App, AppContext, Context, Entity, EventEmitter, FocusHandle, Focusable, + InteractiveElement, IntoElement, ParentElement, Render, SharedString, + StatefulInteractiveElement, Styled, Window, }; use gpui_component::dock::{Panel, PanelEvent}; +use gpui_component::scroll::ScrollableElement; +use gpui_component::{h_flex, v_flex, ActiveTheme, StyledExt}; +use nostr_sdk::prelude::*; +use person::PersonRegistry; pub fn init(window: &mut Window, cx: &mut App) -> Entity { cx.new(|cx| Sidebar::new(window, cx)) } +#[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord)] +pub enum SidebarEvent { + OpenPublicKey(PublicKey), + OpenRelay(RelayUrl), +} + pub struct Sidebar { focus_handle: FocusHandle, } @@ -27,6 +40,7 @@ impl Panel for Sidebar { } impl EventEmitter for Sidebar {} +impl EventEmitter for Sidebar {} impl Focusable for Sidebar { fn focus_handle(&self, _cx: &App) -> FocusHandle { @@ -35,7 +49,87 @@ impl Focusable for Sidebar { } impl Render for Sidebar { - fn render(&mut self, _window: &mut Window, _cx: &mut Context) -> impl IntoElement { - div().child("Sidebar") + fn render(&mut self, _window: &mut Window, cx: &mut Context) -> impl IntoElement { + let person = PersonRegistry::global(cx); + let account = Account::global(cx); + let contacts = account.read(cx).contacts.read(cx); + + v_flex() + .id("sidebar-wrapper") + .size_full() + .relative() + .px_2() + .overflow_y_scrollbar() + .child( + v_flex() + .gap_1p5() + .child( + div() + .mt_4() + .mb_2() + .font_semibold() + .text_xs() + .text_color(cx.theme().muted_foreground) + .child("Relays"), + ) + .child(v_flex().gap_2().children({ + let mut items = Vec::with_capacity(BOOTSTRAP_RELAYS.len()); + + for (ix, relay) in BOOTSTRAP_RELAYS.into_iter().enumerate() { + items.push( + h_flex() + .id(SharedString::from(format!("relay-{ix}"))) + .h_7() + .px_2() + .rounded(cx.theme().radius) + .hover(|this| this.bg(cx.theme().list_hover)) + .child(div().text_sm().child(SharedString::from(relay))) + .on_click(cx.listener(move |_this, _ev, _window, cx| { + if let Ok(url) = RelayUrl::parse(relay) { + cx.emit(SidebarEvent::OpenRelay(url)); + } + })), + ) + } + + items + })), + ) + .child( + v_flex() + .gap_1p5() + .child( + div() + .mt_4() + .mb_2() + .font_semibold() + .text_xs() + .text_color(cx.theme().muted_foreground) + .child("Contacts"), + ) + .child(v_flex().gap_2().children({ + let mut items = Vec::with_capacity(contacts.len()); + + for (ix, contact) in contacts.iter().enumerate() { + let profile = person.read(cx).get(contact, cx); + let name = SharedString::from(profile.name()); + + items.push( + h_flex() + .id(SharedString::from(format!("contact-{ix}"))) + .h_7() + .px_2() + .rounded(cx.theme().radius) + .hover(|this| this.bg(cx.theme().list_hover)) + .child(div().text_sm().child(name.clone())) + .on_click(cx.listener(move |_this, _ev, _window, cx| { + cx.emit(SidebarEvent::OpenPublicKey(profile.public_key())); + })), + ) + } + + items + })), + ) } } diff --git a/crates/lume/src/workspace.rs b/crates/lume/src/workspace.rs index 89badf00..2bd30856 100644 --- a/crates/lume/src/workspace.rs +++ b/crates/lume/src/workspace.rs @@ -1,8 +1,9 @@ +use std::collections::HashSet; use std::sync::Arc; use account::Account; use anyhow::Error; -use common::{CLIENT_NAME, DEFAULT_SIDEBAR_WIDTH}; +use common::{BOOTSTRAP_RELAYS, CLIENT_NAME, DEFAULT_SIDEBAR_WIDTH}; use gpui::{ div, px, AppContext, Axis, Context, Entity, InteractiveElement, IntoElement, ParentElement, Render, Styled, Subscription, Task, Window, @@ -10,11 +11,12 @@ use gpui::{ use gpui_component::dock::{DockArea, DockItem}; use gpui_component::{v_flex, Root, Theme}; use nostr_sdk::prelude::*; +use person::PersonRegistry; use smallvec::{smallvec, SmallVec}; use state::{client, StateEvent}; use crate::panels::startup; -use crate::sidebar; +use crate::sidebar::{self, SidebarEvent}; use crate::title_bar::AppTitleBar; #[derive(Debug)] @@ -60,37 +62,90 @@ impl Workspace { // Handle nostr notifications tasks.push(cx.background_spawn(async move { let client = client(); + let opts = SubscribeAutoCloseOptions::default().exit_policy(ReqExitPolicy::ExitOnEOSE); let mut notifications = client.notifications(); + let mut processed_events: HashSet = HashSet::default(); while let Ok(notification) = notifications.recv().await { - let RelayPoolNotification::Message { message, relay_url } = notification else { + let RelayPoolNotification::Message { message, .. } = notification else { continue; }; match message { RelayMessage::Event { event, .. } => { - // TODO + // Skip if already processed + if !processed_events.insert(event.id) { + continue; + } + + match event.kind { + Kind::TextNote => { + // TODO + } + Kind::ContactList => { + // Get all public keys from the event + let public_keys: Vec = + event.tags.public_keys().copied().collect(); + + // Construct a filter to get metadata for each public key + let filter = Filter::new() + .kind(Kind::Metadata) + .limit(public_keys.len()) + .authors(public_keys); + + // Subscribe to metadata events in the bootstrap relays + client + .subscribe_to(BOOTSTRAP_RELAYS, filter, Some(opts)) + .await?; + + // Notify GPUI of received contact list + tx.send_async(StateEvent::ReceivedContactList).await.ok(); + } + Kind::Metadata => { + // Parse metadata from event, default if invalid + let metadata = + Metadata::from_json(&event.content).unwrap_or_default(); + + // Construct nostr profile with metadata and public key + let profile = Box::new(Profile::new(event.pubkey, metadata)); + + // Notify GPUI of received profile + tx.send_async(StateEvent::ReceivedProfile(profile)) + .await + .ok(); + } + _ => {} + } } - RelayMessage::EndOfStoredEvents(subscription_id) => { + RelayMessage::EndOfStoredEvents(_) => { // TODO } _ => {} } } - Ok(()) })); // Handle state events - tasks.push(cx.spawn_in(window, async move |this, cx| { + tasks.push(cx.spawn_in(window, async move |_this, cx| { while let Ok(event) = rx.recv_async().await { - cx.update(|window, cx| { - // TODO + cx.update(|_window, cx| match event { + StateEvent::ReceivedContactList => { + let account = Account::global(cx); + account.update(cx, |this, cx| { + this.load_contacts(cx); + }); + } + StateEvent::ReceivedProfile(profile) => { + let person = PersonRegistry::global(cx); + person.update(cx, |this, cx| { + this.insert_or_update(&profile, cx); + }); + } }) // Entity has been released, ignore any errors .ok(); } - Ok(()) })); @@ -102,14 +157,29 @@ impl Workspace { } } - fn init_app_layout(&self, window: &mut Window, cx: &mut Context) { + fn init_app_layout(&mut self, window: &mut Window, cx: &mut Context) { let weak_dock = self.dock.downgrade(); - let sidebar = Arc::new(sidebar::init(window, cx)); + let sidebar = sidebar::init(window, cx); let startup = Arc::new(startup::init(window, cx)); + self._subscriptions.push(cx.subscribe_in( + &sidebar, + window, + |_this, _sidebar, event: &SidebarEvent, _window, _cx| { + match event { + SidebarEvent::OpenPublicKey(public_key) => { + log::info!("Open public key: {public_key}"); + } + SidebarEvent::OpenRelay(relay) => { + log::info!("Open relay url: {relay}") + } + }; + }, + )); + // Construct left dock (sidebar) - let left = DockItem::panel(sidebar); + let left = DockItem::panel(Arc::new(sidebar)); // Construct center dock let center = DockItem::split_with_sizes( diff --git a/crates/person/Cargo.toml b/crates/person/Cargo.toml new file mode 100644 index 00000000..cd71d410 --- /dev/null +++ b/crates/person/Cargo.toml @@ -0,0 +1,19 @@ +[package] +name = "person" +version.workspace = true +edition.workspace = true +publish.workspace = true + +[dependencies] +common = { path = "../common" } +state = { path = "../state" } + +gpui.workspace = true +nostr-sdk.workspace = true + +anyhow.workspace = true +smallvec.workspace = true +smol.workspace = true +log.workspace = true +serde.workspace = true +serde_json.workspace = true diff --git a/crates/person/src/lib.rs b/crates/person/src/lib.rs new file mode 100644 index 00000000..5aa13223 --- /dev/null +++ b/crates/person/src/lib.rs @@ -0,0 +1,117 @@ +use std::collections::HashMap; + +use gpui::{App, AppContext, AsyncApp, Context, Entity, Global, Task}; +use nostr_sdk::prelude::*; +use smallvec::{smallvec, SmallVec}; +use state::client; + +pub fn init(cx: &mut App) { + PersonRegistry::set_global(cx.new(PersonRegistry::new), cx); +} + +struct GlobalPersonRegistry(Entity); + +impl Global for GlobalPersonRegistry {} + +/// Person Registry +#[derive(Debug)] +pub struct PersonRegistry { + /// Collection of all profiels + pub persons: HashMap>, + + /// Tasks for asynchronous operations + _tasks: SmallVec<[Task<()>; 2]>, +} + +impl PersonRegistry { + /// Retrieve the global person registry state + pub fn global(cx: &App) -> Entity { + cx.global::().0.clone() + } + + /// Set the global person registry instance + pub(crate) fn set_global(state: Entity, cx: &mut App) { + cx.set_global(GlobalPersonRegistry(state)); + } + + /// Create a new person registry instance + pub(crate) fn new(cx: &mut Context) -> Self { + let mut tasks = smallvec![]; + + tasks.push( + // Load all user profiles from the database + cx.spawn(async move |this, cx| { + let task = Self::init(cx); + + match task.await { + Ok(profiles) => { + this.update(cx, |this, cx| { + this.bulk_insert(profiles, cx); + }) + .ok(); + } + Err(e) => { + log::error!("Failed to load user profiles from database: {e}"); + } + } + }), + ); + + Self { + persons: HashMap::new(), + _tasks: tasks, + } + } + + /// Load all user profiles from the database + fn init(cx: &AsyncApp) -> Task, Error>> { + cx.background_spawn(async move { + let client = client(); + let filter = Filter::new().kind(Kind::Metadata).limit(200); + let events = client.database().query(filter).await?; + + let mut profiles = vec![]; + + for event in events.into_iter() { + let metadata = Metadata::from_json(event.content).unwrap_or_default(); + let profile = Profile::new(event.pubkey, metadata); + profiles.push(profile); + } + + Ok(profiles) + }) + } + + /// Insert batch of persons + fn bulk_insert(&mut self, profiles: Vec, cx: &mut Context) { + for profile in profiles.into_iter() { + self.persons + .insert(profile.public_key(), cx.new(|_| profile)); + } + cx.notify(); + } + + /// Insert or update a person + pub fn insert_or_update(&mut self, profile: &Profile, cx: &mut App) { + let public_key = profile.public_key(); + + if let Some(person) = self.persons.get(&public_key) { + person.update(cx, |this, cx| { + *this = profile.to_owned(); + cx.notify(); + }); + } else { + self.persons + .insert(public_key, cx.new(|_| profile.to_owned())); + } + } + + /// Get person + pub fn get(&self, public_key: &PublicKey, cx: &App) -> Profile { + self.persons + .get(public_key) + .map(|e| e.read(cx)) + .cloned() + .unwrap_or(Profile::new(public_key.to_owned(), Metadata::default())) + } +} diff --git a/crates/state/src/event.rs b/crates/state/src/event.rs index 3c4afcac..185fe2be 100644 --- a/crates/state/src/event.rs +++ b/crates/state/src/event.rs @@ -1,4 +1,7 @@ -#[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord)] +use nostr_sdk::prelude::*; + +#[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord)] pub enum StateEvent { - // + ReceivedContactList, + ReceivedProfile(Box), }