clean up

crates/coop/src/dialogs/mod.rs

@@ -1,2 +1,3 @@
 pub mod compose;
+pub mod profile;
 pub mod screening;

crates/coop/src/dialogs/profile.rs

@@ -9,7 +9,7 @@ use gpui::{
 };
 use gpui_tokio::Tokio;
 use nostr_sdk::prelude::*;
-use person::{Person, PersonRegistry};
+use person::PersonRegistry;
 use smallvec::{smallvec, SmallVec};
 use state::NostrRegistry;
 use theme::ActiveTheme;
@@ -17,13 +17,13 @@ use ui::avatar::Avatar;
 use ui::button::{Button, ButtonVariants};
 use ui::{h_flex, v_flex, Icon, IconName, Sizable, StyledExt};
 
-pub fn init(public_key: PublicKey, window: &mut Window, cx: &mut App) -> Entity<ProfileViewer> {
-    cx.new(|cx| ProfileViewer::new(public_key, window, cx))
+pub fn init(public_key: PublicKey, window: &mut Window, cx: &mut App) -> Entity<ProfileDialog> {
+    cx.new(|cx| ProfileDialog::new(public_key, window, cx))
 }
 
 #[derive(Debug)]
-pub struct ProfileViewer {
-    profile: Person,
+pub struct ProfileDialog {
+    public_key: PublicKey,
 
     /// Follow status
     followed: bool,
@@ -38,13 +38,13 @@ pub struct ProfileViewer {
     _tasks: SmallVec<[Task<()>; 1]>,
 }
 
-impl ProfileViewer {
-    pub fn new(target: PublicKey, window: &mut Window, cx: &mut Context<Self>) -> Self {
+impl ProfileDialog {
+    pub fn new(public_key: PublicKey, window: &mut Window, cx: &mut Context<Self>) -> Self {
         let nostr = NostrRegistry::global(cx);
         let client = nostr.read(cx).client();
 
         let persons = PersonRegistry::global(cx);
-        let profile = persons.read(cx).get(&target, cx);
+        let profile = persons.read(cx).get(&public_key, cx);
 
         let mut tasks = smallvec![];
 
@@ -53,12 +53,12 @@ impl ProfileViewer {
             let public_key = signer.get_public_key().await?;
             let contact_list = client.database().contacts_public_keys(public_key).await?;
 
-            Ok(contact_list.contains(&target))
+            Ok(contact_list.contains(&public_key))
         });
 
         let verify_nip05 = if let Some(address) = profile.metadata().nip05 {
             Some(Tokio::spawn(cx, async move {
-                nip05_verify(target, &address).await.unwrap_or(false)
+                nip05_verify(public_key, &address).await.unwrap_or(false)
             }))
         } else {
             None
@@ -90,7 +90,7 @@ impl ProfileViewer {
         );
 
         Self {
-            profile,
+            public_key,
             followed: false,
             verified: false,
             copied: false,
@@ -98,12 +98,18 @@ impl ProfileViewer {
         }
     }
 
-    fn address(&self, _cx: &Context<Self>) -> Option<String> {
-        self.profile.metadata().nip05
+    fn address(&self, cx: &Context<Self>) -> Option<String> {
+        let persons = PersonRegistry::global(cx);
+        let profile = persons.read(cx).get(&self.public_key, cx);
+
+        profile.metadata().nip05
     }
 
     fn copy_pubkey(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        let Ok(bech32) = self.profile.public_key().to_bech32();
+        let persons = PersonRegistry::global(cx);
+        let profile = persons.read(cx).get(&self.public_key, cx);
+
+        let Ok(bech32) = profile.public_key().to_bech32();
         let item = ClipboardItem::new_string(bech32);
         cx.write_to_clipboard(item);
 
@@ -132,9 +138,11 @@ impl ProfileViewer {
     }
 }
 
-impl Render for ProfileViewer {
+impl Render for ProfileDialog {
     fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        let bech32 = shorten_pubkey(self.profile.public_key(), 16);
+        let persons = PersonRegistry::global(cx);
+        let profile = persons.read(cx).get(&self.public_key, cx);
+        let bech32 = shorten_pubkey(profile.public_key(), 16);
         let shared_bech32 = SharedString::from(bech32);
 
         v_flex()
@@ -146,14 +154,14 @@ impl Render for ProfileViewer {
                     .items_center()
                     .justify_center()
                     .text_center()
-                    .child(Avatar::new(self.profile.avatar()).size(rems(4.)))
+                    .child(Avatar::new(profile.avatar()).size(rems(4.)))
                     .child(
                         v_flex()
                             .child(
                                 div()
                                     .font_semibold()
                                     .line_height(relative(1.25))
-                                    .child(self.profile.name()),
+                                    .child(profile.name()),
                             )
                             .when_some(self.address(cx), |this, address| {
                                 this.child(
@@ -208,7 +216,7 @@ impl Render for ProfileViewer {
                             .rounded(cx.theme().radius)
                             .bg(cx.theme().elevated_surface_background)
                             .child(
-                                self.profile
+                                profile
                                     .metadata()
                                     .about
                                     .map(SharedString::from)

crates/coop/src/main.rs

@@ -15,7 +15,6 @@ mod actions;
 mod dialogs;
 mod panels;
 mod sidebar;
-mod user;
 mod workspace;
 
 fn main() {

crates/coop/src/panels/greeter.rs

@@ -140,7 +140,7 @@ impl Render for GreeterPanel {
                                         .gap_2()
                                         .when(relay_list_state == RelayState::NotSet, |this| {
                                             this.child(
-                                                Button::new("connect")
+                                                Button::new("relaylist")
                                                     .icon(Icon::new(IconName::Door))
                                                     .label("Set up relay list")
                                                     .ghost()

crates/coop/src/panels/import.rs

@@ -47,7 +47,7 @@ pub struct ImportPanel {
 
 impl ImportPanel {
     fn new(window: &mut Window, cx: &mut Context<Self>) -> Self {
-        let key_input = cx.new(|cx| InputState::new(window, cx));
+        let key_input = cx.new(|cx| InputState::new(window, cx).masked(true));
         let pass_input = cx.new(|cx| InputState::new(window, cx).masked(true));
 
         let error = cx.new(|_| None);

crates/coop/src/user/mod.rs

@@ -1,388 +0,0 @@
-use std::str::FromStr;
-use std::time::Duration;
-
-use anyhow::{anyhow, Error};
-use common::{nip96_upload, shorten_pubkey};
-use gpui::prelude::FluentBuilder;
-use gpui::{
-    div, img, App, AppContext, ClipboardItem, Context, Entity, IntoElement, ParentElement,
-    PathPromptOptions, Render, SharedString, Styled, Task, Window,
-};
-use gpui_tokio::Tokio;
-use nostr_sdk::prelude::*;
-use person::Person;
-use settings::AppSettings;
-use smallvec::{smallvec, SmallVec};
-use smol::fs;
-use state::NostrRegistry;
-use theme::ActiveTheme;
-use ui::button::{Button, ButtonVariants};
-use ui::input::{InputState, TextInput};
-use ui::{h_flex, v_flex, Disableable, IconName, Sizable, StyledExt, WindowExtension};
-
-pub mod viewer;
-
-pub fn init(window: &mut Window, cx: &mut App) -> Entity<UserProfile> {
-    cx.new(|cx| UserProfile::new(window, cx))
-}
-
-#[derive(Debug)]
-pub struct UserProfile {
-    /// User profile
-    profile: Option<Profile>,
-
-    /// User's name text input
-    name_input: Entity<InputState>,
-
-    /// User's avatar url text input
-    avatar_input: Entity<InputState>,
-
-    /// User's bio multi line input
-    bio_input: Entity<InputState>,
-
-    /// User's website url text input
-    website_input: Entity<InputState>,
-
-    /// Uploading state
-    uploading: bool,
-
-    /// Copied states
-    copied: bool,
-
-    /// Async operations
-    _tasks: SmallVec<[Task<()>; 1]>,
-}
-
-impl UserProfile {
-    pub fn new(window: &mut Window, cx: &mut Context<Self>) -> Self {
-        let name_input = cx.new(|cx| InputState::new(window, cx).placeholder("Alice"));
-        let avatar_input = cx.new(|cx| InputState::new(window, cx).placeholder("alice.me/a.jpg"));
-        let website_input = cx.new(|cx| InputState::new(window, cx).placeholder("alice.me"));
-
-        // Use multi-line input for bio
-        let bio_input = cx.new(|cx| {
-            InputState::new(window, cx)
-                .multi_line()
-                .auto_grow(3, 8)
-                .placeholder("A short introduce about you.")
-        });
-
-        let get_profile = Self::get_profile(cx);
-        let mut tasks = smallvec![];
-
-        tasks.push(
-            // Get metadata in the background
-            cx.spawn_in(window, async move |this, cx| {
-                if let Ok(profile) = get_profile.await {
-                    this.update_in(cx, |this, window, cx| {
-                        this.set_profile(profile, window, cx);
-                    })
-                    .ok();
-                }
-            }),
-        );
-
-        Self {
-            profile: None,
-            name_input,
-            avatar_input,
-            bio_input,
-            website_input,
-            uploading: false,
-            copied: false,
-            _tasks: tasks,
-        }
-    }
-
-    fn get_profile(cx: &App) -> Task<Result<Profile, Error>> {
-        let nostr = NostrRegistry::global(cx);
-        let client = nostr.read(cx).client();
-
-        cx.background_spawn(async move {
-            let signer = client.signer().await?;
-            let public_key = signer.get_public_key().await?;
-
-            let metadata = client
-                .database()
-                .metadata(public_key)
-                .await?
-                .unwrap_or_default();
-
-            Ok(Profile::new(public_key, metadata))
-        })
-    }
-
-    fn set_profile(&mut self, profile: Profile, window: &mut Window, cx: &mut Context<Self>) {
-        let metadata = profile.metadata();
-
-        self.avatar_input.update(cx, |this, cx| {
-            if let Some(avatar) = metadata.picture.as_ref() {
-                this.set_value(avatar, window, cx);
-            }
-        });
-
-        self.bio_input.update(cx, |this, cx| {
-            if let Some(bio) = metadata.about.as_ref() {
-                this.set_value(bio, window, cx);
-            }
-        });
-
-        self.name_input.update(cx, |this, cx| {
-            if let Some(display_name) = metadata.display_name.as_ref() {
-                this.set_value(display_name, window, cx);
-            }
-        });
-
-        self.website_input.update(cx, |this, cx| {
-            if let Some(website) = metadata.website.as_ref() {
-                this.set_value(website, window, cx);
-            }
-        });
-
-        self.profile = Some(profile);
-        cx.notify();
-    }
-
-    fn copy(&mut self, value: String, window: &mut Window, cx: &mut Context<Self>) {
-        let item = ClipboardItem::new_string(value);
-        cx.write_to_clipboard(item);
-
-        self.set_copied(true, window, cx);
-    }
-
-    fn set_copied(&mut self, status: bool, window: &mut Window, cx: &mut Context<Self>) {
-        self.copied = status;
-        cx.notify();
-
-        if status {
-            self._tasks.push(
-                // Reset the copied state after a delay
-                cx.spawn_in(window, async move |this, cx| {
-                    cx.background_executor().timer(Duration::from_secs(2)).await;
-                    cx.update(|window, cx| {
-                        this.update(cx, |this, cx| {
-                            this.set_copied(false, window, cx);
-                        })
-                        .ok();
-                    })
-                    .ok();
-                }),
-            );
-        }
-    }
-
-    fn uploading(&mut self, status: bool, cx: &mut Context<Self>) {
-        self.uploading = status;
-        cx.notify();
-    }
-
-    fn upload(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        self.uploading(true, cx);
-
-        let nostr = NostrRegistry::global(cx);
-        let client = nostr.read(cx).client();
-
-        // Get the user's configured NIP96 server
-        let nip96_server = AppSettings::get_file_server(cx);
-
-        // Open native file dialog
-        let paths = cx.prompt_for_paths(PathPromptOptions {
-            files: true,
-            directories: false,
-            multiple: false,
-            prompt: None,
-        });
-
-        let task = Tokio::spawn(cx, async move {
-            match paths.await {
-                Ok(Ok(Some(mut paths))) => {
-                    if let Some(path) = paths.pop() {
-                        let file = fs::read(path).await?;
-                        let url = nip96_upload(&client, &nip96_server, file).await?;
-
-                        Ok(url)
-                    } else {
-                        Err(anyhow!("Path not found"))
-                    }
-                }
-                _ => Err(anyhow!("Error")),
-            }
-        });
-
-        cx.spawn_in(window, async move |this, cx| {
-            let result = task.await;
-
-            this.update_in(cx, |this, window, cx| {
-                match result {
-                    Ok(Ok(url)) => {
-                        this.avatar_input.update(cx, |this, cx| {
-                            this.set_value(url.to_string(), window, cx);
-                        });
-                    }
-                    Ok(Err(e)) => {
-                        window.push_notification(e.to_string(), cx);
-                    }
-                    Err(e) => {
-                        log::warn!("Failed to upload avatar: {e}");
-                    }
-                };
-                this.uploading(false, cx);
-            })
-            .expect("Entity has been released");
-        })
-        .detach();
-    }
-
-    pub fn set_metadata(&mut self, cx: &mut Context<Self>) -> Task<Result<Person, Error>> {
-        let avatar = self.avatar_input.read(cx).value().to_string();
-        let name = self.name_input.read(cx).value().to_string();
-        let bio = self.bio_input.read(cx).value().to_string();
-        let website = self.website_input.read(cx).value().to_string();
-
-        // Get the current profile metadata
-        let old_metadata = self
-            .profile
-            .as_ref()
-            .map(|profile| profile.metadata())
-            .unwrap_or_default();
-
-        // Construct the new metadata
-        let mut new_metadata = old_metadata.display_name(name).about(bio);
-
-        if let Ok(url) = Url::from_str(&avatar) {
-            new_metadata = new_metadata.picture(url);
-        };
-
-        if let Ok(url) = Url::from_str(&website) {
-            new_metadata = new_metadata.website(url);
-        }
-
-        let nostr = NostrRegistry::global(cx);
-        let client = nostr.read(cx).client();
-        let public_key = nostr.read(cx).identity().read(cx).public_key();
-        let write_relays = nostr.read(cx).write_relays(&public_key, cx);
-
-        cx.background_spawn(async move {
-            let urls = write_relays.await;
-            let signer = client.signer().await?;
-
-            // Sign the new metadata event
-            let event = EventBuilder::metadata(&new_metadata).sign(&signer).await?;
-
-            // Send event to user's write relayss
-            client.send_event_to(urls, &event).await?;
-
-            // Return the updated profile
-            let metadata = Metadata::from_json(&event.content).unwrap_or_default();
-            let profile = Person::new(event.pubkey, metadata);
-
-            Ok(profile)
-        })
-    }
-}
-
-impl Render for UserProfile {
-    fn render(&mut self, _window: &mut gpui::Window, cx: &mut Context<Self>) -> impl IntoElement {
-        v_flex()
-            .gap_3()
-            .child(
-                v_flex()
-                    .relative()
-                    .w_full()
-                    .h_32()
-                    .items_center()
-                    .justify_center()
-                    .gap_2()
-                    .bg(cx.theme().surface_background)
-                    .rounded(cx.theme().radius)
-                    .map(|this| {
-                        let picture = self.avatar_input.read(cx).value();
-                        let source = if picture.is_empty() {
-                            "brand/avatar.png"
-                        } else {
-                            picture.as_str()
-                        };
-                        this.child(img(source).rounded_full().size_10().flex_shrink_0())
-                    })
-                    .child(
-                        Button::new("upload")
-                            .icon(IconName::Upload)
-                            .label("Change")
-                            .ghost()
-                            .small()
-                            .disabled(self.uploading)
-                            .on_click(cx.listener(move |this, _, window, cx| {
-                                this.upload(window, cx);
-                            })),
-                    ),
-            )
-            .child(
-                v_flex()
-                    .gap_1()
-                    .text_sm()
-                    .child(SharedString::from("Name:"))
-                    .child(TextInput::new(&self.name_input).small()),
-            )
-            .child(
-                v_flex()
-                    .gap_1()
-                    .text_sm()
-                    .child(SharedString::from("Bio:"))
-                    .child(TextInput::new(&self.bio_input).small()),
-            )
-            .child(
-                v_flex()
-                    .gap_1()
-                    .text_sm()
-                    .child(SharedString::from("Website:"))
-                    .child(TextInput::new(&self.website_input).small()),
-            )
-            .when_some(self.profile.as_ref(), |this, profile| {
-                let public_key = profile.public_key();
-                let display = SharedString::from(shorten_pubkey(profile.public_key(), 8));
-
-                this.child(div().my_1().h_px().w_full().bg(cx.theme().border))
-                    .child(
-                        v_flex()
-                            .gap_1()
-                            .child(
-                                div()
-                                    .text_xs()
-                                    .text_color(cx.theme().text_placeholder)
-                                    .font_semibold()
-                                    .child(SharedString::from("Public Key:")),
-                            )
-                            .child(
-                                h_flex()
-                                    .gap_2()
-                                    .w_full()
-                                    .h_12()
-                                    .justify_center()
-                                    .bg(cx.theme().surface_background)
-                                    .rounded(cx.theme().radius)
-                                    .text_sm()
-                                    .child(display)
-                                    .child(
-                                        Button::new("copy")
-                                            .icon({
-                                                if self.copied {
-                                                    IconName::CheckCircle
-                                                } else {
-                                                    IconName::Copy
-                                                }
-                                            })
-                                            .xsmall()
-                                            .ghost()
-                                            .on_click(cx.listener(move |this, _e, window, cx| {
-                                                this.copy(
-                                                    public_key.to_bech32().unwrap(),
-                                                    window,
-                                                    cx,
-                                                );
-                                            })),
-                                    ),
-                            ),
-                    )
-            })
-    }
-}

crates/coop/src/workspace.rs

@@ -11,17 +11,16 @@ use gpui::{
     IntoElement, ParentElement, Render, SharedString, Styled, Subscription, Window,
 };
 use nostr_connect::prelude::*;
-use person::PersonRegistry;
 use smallvec::{smallvec, SmallVec};
 use theme::{ActiveTheme, Theme, ThemeRegistry};
 use ui::button::{Button, ButtonVariants};
 use ui::modal::ModalButtonProps;
 use ui::{h_flex, v_flex, Root, Sizable, WindowExtension};
 
-use crate::actions::{reset, KeyringPopup, Logout, Themes, ViewProfile};
+use crate::actions::{reset, KeyringPopup, Logout, Themes};
+use crate::dialogs::profile;
 use crate::panels::greeter;
-use crate::user::viewer;
-use crate::{sidebar, user};
+use crate::sidebar;
 
 pub fn init(window: &mut Window, cx: &mut App) -> Entity<Workspace> {
     cx.new(|cx| Workspace::new(window, cx))
@@ -150,53 +149,6 @@ impl Workspace {
         });
     }
 
-    fn on_profile(&mut self, _ev: &ViewProfile, window: &mut Window, cx: &mut Context<Self>) {
-        let view = user::init(window, cx);
-        let entity = view.downgrade();
-
-        window.open_modal(cx, move |modal, _window, _cx| {
-            let entity = entity.clone();
-
-            modal
-                .title("Profile")
-                .confirm()
-                .child(view.clone())
-                .button_props(ModalButtonProps::default().ok_text("Update"))
-                .on_ok(move |_, window, cx| {
-                    entity
-                        .update(cx, |this, cx| {
-                            let persons = PersonRegistry::global(cx);
-                            let set_metadata = this.set_metadata(cx);
-
-                            cx.spawn_in(window, async move |this, cx| {
-                                let result = set_metadata.await;
-
-                                this.update_in(cx, |_, window, cx| {
-                                    match result {
-                                        Ok(person) => {
-                                            persons.update(cx, |this, cx| {
-                                                this.insert(person, cx);
-                                                // Close the edit profile modal
-                                                window.close_all_modals(cx);
-                                            });
-                                        }
-                                        Err(e) => {
-                                            window.push_notification(e.to_string(), cx);
-                                        }
-                                    };
-                                })
-                                .ok();
-                            })
-                            .detach();
-                        })
-                        .ok();
-
-                    // false to keep the modal open
-                    false
-                })
-        });
-    }
-
     fn on_themes(&mut self, _ev: &Themes, window: &mut Window, cx: &mut Context<Self>) {
         window.open_modal(cx, move |this, _window, cx| {
             let registry = ThemeRegistry::global(cx);
@@ -255,7 +207,7 @@ impl Workspace {
 
     fn on_open_pubkey(&mut self, ev: &OpenPublicKey, window: &mut Window, cx: &mut Context<Self>) {
         let public_key = ev.0;
-        let view = viewer::init(public_key, window, cx);
+        let view = profile::init(public_key, window, cx);
 
         window.open_modal(cx, move |this, _window, _cx| {
             this.alert()
@@ -319,7 +271,6 @@ impl Render for Workspace {
 
         div()
             .id(SharedString::from("workspace"))
-            .on_action(cx.listener(Self::on_profile))
             .on_action(cx.listener(Self::on_themes))
             .on_action(cx.listener(Self::on_sign_out))
             .on_action(cx.listener(Self::on_open_pubkey))