Continue redesign for the v1 stable release (#5)

Reviewed-on: #5

crates/person/Cargo.toml

@@ -7,6 +7,7 @@ publish.workspace = true
 [dependencies]
 common = { path = "../common" }
 state = { path = "../state" }
+device = { path = "../device" }
 
 gpui.workspace = true
 nostr-sdk.workspace = true

crates/person/src/lib.rs

@@ -4,12 +4,13 @@ use std::rc::Rc;
 use std::time::Duration;
 
 use anyhow::{anyhow, Error};
-use common::{EventUtils, BOOTSTRAP_RELAYS};
+use common::EventUtils;
+use device::Announcement;
 use gpui::{App, AppContext, Context, Entity, Global, Task};
 use nostr_sdk::prelude::*;
 pub use person::*;
 use smallvec::{smallvec, SmallVec};
-use state::{Announcement, NostrRegistry, TIMEOUT};
+use state::{NostrRegistry, BOOTSTRAP_RELAYS, TIMEOUT};
 
 mod person;
 
@@ -139,20 +140,14 @@ impl PersonRegistry {
     /// Handle nostr notifications
     async fn handle_notifications(client: &Client, tx: &flume::Sender<Dispatch>) {
         let mut notifications = client.notifications();
-        let mut processed_events = HashSet::new();
 
-        while let Ok(notification) = notifications.recv().await {
-            let RelayPoolNotification::Message { message, .. } = notification else {
+        while let Some(notification) = notifications.next().await {
+            let ClientNotification::Message { message, .. } = notification else {
                 // Skip if the notification is not a message
                 continue;
             };
 
             if let RelayMessage::Event { event, .. } = message {
-                if !processed_events.insert(event.id) {
-                    // Skip if the event has already been processed
-                    continue;
-                }
-
                 match event.kind {
                     Kind::Metadata => {
                         let metadata = Metadata::from_json(&event.content).unwrap_or_default();
@@ -230,9 +225,13 @@ impl PersonRegistry {
             .authors(authors)
             .limit(limit);
 
-        client
-            .subscribe_to(BOOTSTRAP_RELAYS, filter, Some(opts))
-            .await?;
+        // Construct target for subscription
+        let target = BOOTSTRAP_RELAYS
+            .into_iter()
+            .map(|relay| (relay, vec![filter.clone()]))
+            .collect::<HashMap<_, _>>();
+
+        client.subscribe(target).close_on(opts).await?;
 
         Ok(())
     }

crates/person/src/person.rs

@@ -1,9 +1,11 @@
 use std::cmp::Ordering;
 use std::hash::{Hash, Hasher};
 
+use device::Announcement;
 use gpui::SharedString;
 use nostr_sdk::prelude::*;
-use state::Announcement;
+
+const IMAGE_RESIZER: &str = "https://wsrv.nl";
 
 /// Person
 #[derive(Debug, Clone)]
@@ -86,7 +88,12 @@ impl Person {
             .picture
             .as_ref()
             .filter(|picture| !picture.is_empty())
-            .map(|picture| picture.into())
+            .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())
     }