clean up

crates/device/Cargo.toml

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

crates/device/src/device.rs

@@ -1,62 +0,0 @@
-use gpui::SharedString;
-use nostr_sdk::prelude::*;
-
-#[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord, Hash, Default)]
-pub enum DeviceState {
-    #[default]
-    Initial,
-    Requesting,
-    Set,
-}
-
-/// Announcement
-#[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]
-pub struct Announcement {
-    /// The public key of the device that created this announcement.
-    public_key: PublicKey,
-
-    /// The name of the device that created this announcement.
-    client_name: Option<String>,
-}
-
-impl From<&Event> for Announcement {
-    fn from(val: &Event) -> Self {
-        let public_key = val
-            .tags
-            .iter()
-            .find(|tag| tag.kind().as_str() == "n")
-            .and_then(|tag| tag.content())
-            .and_then(|c| PublicKey::parse(c).ok())
-            .unwrap_or(val.pubkey);
-
-        let client_name = val
-            .tags
-            .find(TagKind::Client)
-            .and_then(|tag| tag.content())
-            .map(|c| c.to_string());
-
-        Self::new(public_key, client_name)
-    }
-}
-
-impl Announcement {
-    pub fn new(public_key: PublicKey, client_name: Option<String>) -> Self {
-        Self {
-            public_key,
-            client_name,
-        }
-    }
-
-    /// Returns the public key of the device that created this announcement.
-    pub fn public_key(&self) -> PublicKey {
-        self.public_key
-    }
-
-    /// Returns the client name of the device that created this announcement.
-    pub fn client_name(&self) -> SharedString {
-        self.client_name
-            .as_ref()
-            .map(SharedString::from)
-            .unwrap_or(SharedString::from("Unknown"))
-    }
-}

crates/device/src/lib.rs

@@ -4,12 +4,11 @@ use std::time::Duration;
 use anyhow::{anyhow, Context as AnyhowContext, Error};
 use gpui::{App, AppContext, Context, Entity, Global, Subscription, Task, Window};
 use nostr_sdk::prelude::*;
+use person::PersonRegistry;
 use smallvec::{smallvec, SmallVec};
-use state::{app_name, NostrRegistry, RelayState, DEVICE_GIFTWRAP, TIMEOUT};
-
-mod device;
-
-pub use device::*;
+use state::{
+    app_name, Announcement, DeviceState, NostrRegistry, RelayState, DEVICE_GIFTWRAP, TIMEOUT,
+};
 
 const IDENTIFIER: &str = "coop:device";
 
@@ -218,16 +217,17 @@ impl DeviceRegistry {
         let signer = nostr.read(cx).signer();
         let public_key = signer.public_key().unwrap();
 
-        let messaging_relays = nostr.read(cx).messaging_relays(&public_key, cx);
+        let persons = PersonRegistry::global(cx);
+        let profile = persons.read(cx).get(&public_key, cx);
+        let relay_urls = profile.messaging_relays().clone();
 
         cx.background_spawn(async move {
-            let relay_urls = messaging_relays.await;
             let filter = Filter::new().kind(Kind::GiftWrap).pubkey(public_key);
             let id = SubscriptionId::new(DEVICE_GIFTWRAP);
 
             // Construct target for subscription
-            let target: HashMap<&RelayUrl, Filter> = relay_urls
-                .iter()
+            let target: HashMap<RelayUrl, Filter> = relay_urls
+                .into_iter()
                 .map(|relay| (relay, filter.clone()))
                 .collect();