chore: rewrite the backend (not tested) (#203)

* wip: refactor

* refactor

* clean up

* .

* rename

* add relay auth

* .

* .

* optimize

* .

* clean up

* add encryption crate

* .

* .

* .

* .

* .

* add encryption crate

* .

* refactor nip4e

* .

* fix endless loop

* fix metadata fetching

crates/chat_ui/Cargo.toml

@@ -5,11 +5,12 @@ edition.workspace = true
 publish.workspace = true
 
 [dependencies]
+state = { path = "../state" }
 ui = { path = "../ui" }
 theme = { path = "../theme" }
 common = { path = "../common" }
-states = { path = "../states" }
 account = { path = "../account" }
+encryption = { path = "../encryption" }
 person = { path = "../person" }
 chat = { path = "../chat" }
 settings = { path = "../settings" }
@@ -17,7 +18,6 @@ settings = { path = "../settings" }
 gpui.workspace = true
 gpui_tokio.workspace = true
 
-nostr.workspace = true
 nostr-sdk.workspace = true
 anyhow.workspace = true
 itertools.workspace = true

crates/chat_ui/src/actions.rs

@@ -1,7 +1,7 @@
+use encryption::SignerKind;
 use gpui::Action;
 use nostr_sdk::prelude::*;
 use serde::Deserialize;
-use states::SignerKind;
 
 #[derive(Action, Clone, PartialEq, Eq, Deserialize)]
 #[action(namespace = chat, no_json)]

crates/chat_ui/src/lib.rs

@@ -2,16 +2,15 @@ use std::collections::HashSet;
 use std::time::Duration;
 
 pub use actions::*;
-use chat::message::{Message, RenderedMessage};
-use chat::room::{Room, RoomKind, RoomSignal, SendOptions, SendReport};
-use common::display::{RenderedProfile, RenderedTimestamp};
-use common::nip96::nip96_upload;
+use chat::{Message, RenderedMessage, Room, RoomKind, RoomSignal, SendOptions, SendReport};
+use common::{nip96_upload, RenderedProfile, RenderedTimestamp};
+use encryption::SignerKind;
 use gpui::prelude::FluentBuilder;
 use gpui::{
     div, img, list, px, red, relative, rems, svg, white, AnyElement, App, AppContext,
     ClipboardItem, Context, Element, Entity, EventEmitter, Flatten, FocusHandle, Focusable,
     InteractiveElement, IntoElement, ListAlignment, ListOffset, ListState, MouseButton, ObjectFit,
-    ParentElement, PathPromptOptions, Render, RetainAllImageCache, SharedString, SharedUri,
+    ParentElement, PathPromptOptions, Render, RetainAllImageCache, SharedString,
     StatefulInteractiveElement, Styled, StyledImage, Subscription, Task, Window,
 };
 use gpui_tokio::Tokio;
@@ -22,7 +21,7 @@ use person::PersonRegistry;
 use settings::AppSettings;
 use smallvec::{smallvec, SmallVec};
 use smol::fs;
-use states::{app_state, SignerKind};
+use state::NostrRegistry;
 use theme::ActiveTheme;
 use ui::avatar::Avatar;
 use ui::button::{Button, ButtonVariants};
@@ -147,16 +146,16 @@ impl ChatPanel {
             cx.subscribe_in(&room, window, move |this, _, signal, window, cx| {
                 match signal {
                     RoomSignal::NewMessage((gift_wrap_id, event)) => {
+                        let nostr = NostrRegistry::global(cx);
+                        let tracker = nostr.read(cx).tracker();
                         let gift_wrap_id = gift_wrap_id.to_owned();
                         let message = Message::user(event.clone());
 
                         cx.spawn_in(window, async move |this, cx| {
-                            let states = app_state();
-                            let event_tracker = states.tracker().read().await;
-                            let sent_ids = event_tracker.sent_ids();
+                            let tracker = tracker.read().await;
 
                             this.update_in(cx, |this, _window, cx| {
-                                if !sent_ids.contains(&gift_wrap_id) {
+                                if !tracker.sent_ids().contains(&gift_wrap_id) {
                                     this.insert_message(message, false, cx);
                                 }
                             })
@@ -488,6 +487,9 @@ impl ChatPanel {
     }
 
     fn upload(&mut self, window: &mut Window, cx: &mut Context<Self>) {
+        let nostr = NostrRegistry::global(cx);
+        let client = nostr.read(cx).client();
+
         // Get the user's configured NIP96 server
         let nip96_server = AppSettings::get_media_server(cx);
 
@@ -503,9 +505,8 @@ impl ChatPanel {
             let path = paths.pop()?;
 
             let upload = Tokio::spawn(cx, async move {
-                let client = app_state().client();
                 let file = fs::read(path).await.ok()?;
-                let url = nip96_upload(client, &nip96_server, file).await.ok()?;
+                let url = nip96_upload(&client, &nip96_server, file).await.ok()?;
 
                 Some(url)
             });
@@ -1071,7 +1072,7 @@ impl ChatPanel {
             .relative()
             .w_16()
             .child(
-                img(SharedUri::from(url.to_string()))
+                img(url.as_str())
                     .size_16()
                     .shadow_lg()
                     .rounded(cx.theme().radius)
@@ -1238,11 +1239,12 @@ impl ChatPanel {
 
     fn on_open_seen_on(&mut self, ev: &SeenOn, window: &mut Window, cx: &mut Context<Self>) {
         let id = ev.0;
+        let nostr = NostrRegistry::global(cx);
+        let client = nostr.read(cx).client();
+        let tracker = nostr.read(cx).tracker();
 
         let task: Task<Result<Vec<RelayUrl>, Error>> = cx.background_spawn(async move {
-            let states = app_state();
-            let client = states.client();
-            let event_tracker = states.tracker().read().await;
+            let tracker = tracker.read().await;
             let mut relays: Vec<RelayUrl> = vec![];
 
             let filter = Filter::new()
@@ -1252,7 +1254,7 @@ impl ChatPanel {
 
             if let Some(event) = client.database().query(filter).await?.first_owned() {
                 if let Some(Ok(id)) = event.tags.identifier().map(EventId::parse) {
-                    if let Some(urls) = event_tracker.seen_on_relays.get(&id).cloned() {
+                    if let Some(urls) = tracker.seen_on_relays.get(&id).cloned() {
                         relays.extend(urls);
                     }
                 }

crates/chat_ui/src/text.rs

@@ -1,7 +1,7 @@
 use std::ops::Range;
 use std::sync::Arc;
 
-use common::display::RenderedProfile;
+use common::RenderedProfile;
 use gpui::{
     AnyElement, App, ElementId, HighlightStyle, InteractiveText, IntoElement, SharedString,
     StyledText, UnderlineStyle, Window,
@@ -129,8 +129,6 @@ fn render_plain_text_mut(
         let range = link.start()..link.end();
         let url = link.as_str().to_string();
 
-        log::info!("Found URL: {}", url);
-
         url_matches.push((range, url));
     }