refactor chats (#15)

* refactor

* update

* update

* update

* remove nostrprofile struct

* update

* refactor contacts

* prevent double login

crates/app/src/views/contacts.rs

@@ -1,10 +1,14 @@
-use common::profile::NostrProfile;
+use std::collections::BTreeSet;
+
+use anyhow::Error;
+use common::profile::SharedProfile;
 use global::get_client;
 use gpui::{
     div, img, prelude::FluentBuilder, px, uniform_list, AnyElement, App, AppContext, Context,
     Entity, EventEmitter, FocusHandle, Focusable, InteractiveElement, IntoElement, ParentElement,
-    Render, SharedString, Styled, Window,
+    Render, SharedString, Styled, Task, Window,
 };
+use itertools::Itertools;
 use nostr_sdk::prelude::*;
 use ui::{
     button::Button,
@@ -20,7 +24,7 @@ pub fn init(window: &mut Window, cx: &mut App) -> Entity<Contacts> {
 }
 
 pub struct Contacts {
-    contacts: Entity<Option<Vec<NostrProfile>>>,
+    contacts: Option<Vec<Profile>>,
     // Panel
     name: SharedString,
     closable: bool,
@@ -29,48 +33,42 @@ pub struct Contacts {
 }
 
 impl Contacts {
-    pub fn new(_window: &mut Window, cx: &mut App) -> Entity<Self> {
-        let contacts = cx.new(|_| None);
-        let async_contact = contacts.clone();
+    pub fn new(window: &mut Window, cx: &mut App) -> Entity<Self> {
+        cx.new(|cx| Self::view(window, cx))
+    }
 
-        cx.spawn(async move |cx| {
+    fn view(_window: &mut Window, cx: &mut Context<Self>) -> Self {
+        cx.spawn(async move |this, cx| {
             let client = get_client();
-            let (tx, rx) = oneshot::channel::<Vec<NostrProfile>>();
 
-            cx.background_executor()
-                .spawn(async move {
-                    let signer = client.signer().await.unwrap();
-                    let public_key = signer.get_public_key().await.unwrap();
+            let task: Task<Result<BTreeSet<Profile>, Error>> = cx.background_spawn(async move {
+                let signer = client.signer().await?;
+                let public_key = signer.get_public_key().await?;
+                let profiles = client.database().contacts(public_key).await?;
 
-                    if let Ok(profiles) = client.database().contacts(public_key).await {
-                        let members: Vec<NostrProfile> = profiles
-                            .into_iter()
-                            .map(|profile| {
-                                NostrProfile::new(profile.public_key(), profile.metadata())
-                            })
-                            .collect();
+                Ok(profiles)
+            });
 
-                        _ = tx.send(members);
-                    }
+            if let Ok(contacts) = task.await {
+                cx.update(|cx| {
+                    this.update(cx, |this, cx| {
+                        this.contacts = Some(contacts.into_iter().collect_vec());
+                        cx.notify();
+                    })
+                    .ok();
                 })
-                .detach();
-
-            if let Ok(contacts) = rx.await {
-                _ = cx.update_entity(&async_contact, |this, cx| {
-                    *this = Some(contacts);
-                    cx.notify();
-                });
+                .ok();
             }
         })
         .detach();
 
-        cx.new(|cx| Self {
-            contacts,
+        Self {
+            contacts: None,
             name: "Contacts".into(),
             closable: true,
             zoomable: true,
             focus_handle: cx.focus_handle(),
-        })
+        }
     }
 }
 
@@ -111,7 +109,7 @@ impl Focusable for Contacts {
 impl Render for Contacts {
     fn render(&mut self, _window: &mut gpui::Window, cx: &mut Context<Self>) -> impl IntoElement {
         div().size_full().pt_2().px_2().map(|this| {
-            if let Some(contacts) = self.contacts.read(cx).clone() {
+            if let Some(contacts) = self.contacts.clone() {
                 this.child(
                     uniform_list(
                         cx.entity().clone(),
@@ -141,9 +139,9 @@ impl Render for Contacts {
                                                 .child(
                                                     div()
                                                         .flex_shrink_0()
-                                                        .child(img(item.avatar).size_6()),
+                                                        .child(img(item.shared_avatar()).size_6()),
                                                 )
-                                                .child(item.name),
+                                                .child(item.shared_name()),
                                         )
                                         .hover(|this| {
                                             this.bg(cx.theme().base.step(cx, ColorScaleStep::THREE))