chore: bump version

Cargo.lock

@@ -190,7 +190,7 @@ dependencies = [
 
 [[package]]
 name = "assets"
-version = "0.2.8"
+version = "0.2.6"
 dependencies = [
  "anyhow",
  "gpui",
@@ -251,9 +251,9 @@ dependencies = [
 
 [[package]]
 name = "async-fs"
-version = "2.2.0"
+version = "2.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8034a681df4aed8b8edbd7fbe472401ecf009251c8b40556b304567052e294c5"
+checksum = "09f7e37c0ed80b2a977691c47dae8625cfb21e205827106c64f7c588766b2e50"
 dependencies = [
  "async-lock",
  "blocking",
@@ -262,11 +262,11 @@ dependencies = [
 
 [[package]]
 name = "async-io"
-version = "2.6.0"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "456b8a8feb6f42d237746d4b3e9a178494627745c3c56c6ea55d92ba50d026fc"
+checksum = "19634d6336019ef220f09fd31168ce5c184b295cbf80345437cc36094ef223ca"
 dependencies = [
- "autocfg",
+ "async-lock",
  "cfg-if",
  "concurrent-queue",
  "futures-io",
@@ -275,7 +275,7 @@ dependencies = [
  "polling",
  "rustix 1.1.2",
  "slab",
- "windows-sys 0.61.0",
+ "windows-sys 0.60.2",
 ]
 
 [[package]]
@@ -302,9 +302,9 @@ dependencies = [
 
 [[package]]
 name = "async-process"
-version = "2.5.0"
+version = "2.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc50921ec0055cdd8a16de48773bfeec5c972598674347252c0399676be7da75"
+checksum = "65daa13722ad51e6ab1a1b9c01299142bc75135b337923cfa10e79bbbd669f00"
 dependencies = [
  "async-channel",
  "async-io",
@@ -331,9 +331,9 @@ dependencies = [
 
 [[package]]
 name = "async-signal"
-version = "0.2.13"
+version = "0.2.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43c070bbf59cd3570b6b2dd54cd772527c7c3620fce8be898406dd3ed6adc64c"
+checksum = "f567af260ef69e1d52c2b560ce0ea230763e6fbb9214a85d768760a920e3e3c1"
 dependencies = [
  "async-io",
  "async-lock",
@@ -344,7 +344,7 @@ dependencies = [
  "rustix 1.1.2",
  "signal-hook-registry",
  "slab",
- "windows-sys 0.61.0",
+ "windows-sys 0.60.2",
 ]
 
 [[package]]
@@ -428,7 +428,7 @@ checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0"
 
 [[package]]
 name = "auto_update"
-version = "0.2.8"
+version = "0.2.6"
 dependencies = [
  "anyhow",
  "cargo-packager-updater",
@@ -1029,7 +1029,7 @@ dependencies = [
 
 [[package]]
 name = "client_keys"
-version = "0.2.8"
+version = "0.2.6"
 dependencies = [
  "anyhow",
  "global",
@@ -1131,7 +1131,7 @@ dependencies = [
 [[package]]
 name = "collections"
 version = "0.1.0"
-source = "git+https://github.com/zed-industries/zed#1090c47a90c586b397dc3fdd0cd09b530f37e5a0"
+source = "git+https://github.com/zed-industries/zed#ded646760467d653fd57ee3ef4fc1edcfafba6ae"
 dependencies = [
  "indexmap",
  "rustc-hash 2.1.1",
@@ -1166,7 +1166,7 @@ dependencies = [
 
 [[package]]
 name = "common"
-version = "0.2.8"
+version = "0.2.6"
 dependencies = [
  "anyhow",
  "chrono",
@@ -1239,7 +1239,7 @@ checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e"
 
 [[package]]
 name = "coop"
-version = "0.2.8"
+version = "0.2.6"
 dependencies = [
  "anyhow",
  "assets",
@@ -1572,7 +1572,7 @@ dependencies = [
 [[package]]
 name = "derive_refineable"
 version = "0.1.0"
-source = "git+https://github.com/zed-industries/zed#1090c47a90c586b397dc3fdd0cd09b530f37e5a0"
+source = "git+https://github.com/zed-industries/zed#ded646760467d653fd57ee3ef4fc1edcfafba6ae"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1824,12 +1824,11 @@ checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f"
 
 [[package]]
 name = "erased-serde"
-version = "0.4.8"
+version = "0.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "259d404d09818dec19332e31d94558aeb442fea04c817006456c24b5460bbd4b"
+checksum = "e004d887f51fcb9fef17317a2f3525c887d8aa3f4f50fed920816a688284a5b7"
 dependencies = [
  "serde",
- "serde_core",
  "typeid",
 ]
 
@@ -2406,7 +2405,7 @@ checksum = "0cc23270f6e1808e30a928bdc84dea0b9b4136a8bc82338574f23baf47bbd280"
 
 [[package]]
 name = "global"
-version = "0.2.8"
+version = "0.2.6"
 dependencies = [
  "anyhow",
  "dirs 5.0.1",
@@ -2499,7 +2498,7 @@ dependencies = [
 [[package]]
 name = "gpui"
 version = "0.1.0"
-source = "git+https://github.com/zed-industries/zed#1090c47a90c586b397dc3fdd0cd09b530f37e5a0"
+source = "git+https://github.com/zed-industries/zed#ded646760467d653fd57ee3ef4fc1edcfafba6ae"
 dependencies = [
  "anyhow",
  "as-raw-xcb-connection",
@@ -2560,6 +2559,7 @@ dependencies = [
  "seahash",
  "semantic_version",
  "serde",
+ "serde_derive",
  "serde_json",
  "slotmap",
  "smallvec",
@@ -2592,7 +2592,7 @@ dependencies = [
 [[package]]
 name = "gpui_macros"
 version = "0.1.0"
-source = "git+https://github.com/zed-industries/zed#1090c47a90c586b397dc3fdd0cd09b530f37e5a0"
+source = "git+https://github.com/zed-industries/zed#ded646760467d653fd57ee3ef4fc1edcfafba6ae"
 dependencies = [
  "heck 0.5.0",
  "proc-macro2",
@@ -2604,7 +2604,7 @@ dependencies = [
 [[package]]
 name = "gpui_tokio"
 version = "0.1.0"
-source = "git+https://github.com/zed-industries/zed#1090c47a90c586b397dc3fdd0cd09b530f37e5a0"
+source = "git+https://github.com/zed-industries/zed#ded646760467d653fd57ee3ef4fc1edcfafba6ae"
 dependencies = [
  "anyhow",
  "gpui",
@@ -2818,7 +2818,7 @@ dependencies = [
 [[package]]
 name = "http_client"
 version = "0.1.0"
-source = "git+https://github.com/zed-industries/zed#1090c47a90c586b397dc3fdd0cd09b530f37e5a0"
+source = "git+https://github.com/zed-industries/zed#ded646760467d653fd57ee3ef4fc1edcfafba6ae"
 dependencies = [
  "anyhow",
  "bytes",
@@ -2838,7 +2838,7 @@ dependencies = [
 [[package]]
 name = "http_client_tls"
 version = "0.1.0"
-source = "git+https://github.com/zed-industries/zed#1090c47a90c586b397dc3fdd0cd09b530f37e5a0"
+source = "git+https://github.com/zed-industries/zed#ded646760467d653fd57ee3ef4fc1edcfafba6ae"
 dependencies = [
  "rustls",
  "rustls-platform-verifier",
@@ -2941,7 +2941,7 @@ dependencies = [
 
 [[package]]
 name = "i18n"
-version = "0.2.8"
+version = "0.2.6"
 dependencies = [
  "rust-i18n",
 ]
@@ -3428,9 +3428,9 @@ checksum = "f9fbbcab51052fe104eb5e5d351cf728d30a5be1fe14d9be8a3b097481fb97de"
 
 [[package]]
 name = "libredox"
-version = "0.1.10"
+version = "0.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "416f7e718bdb06000964960ffa43b4335ad4012ae8b99060261aa4a8088d5ccb"
+checksum = "391290121bad3d37fbddad76d8f5d1c1c314cfc646d143d7e07a3086ddff0ce3"
 dependencies = [
  "bitflags 2.9.4",
  "libc",
@@ -3629,7 +3629,7 @@ dependencies = [
 [[package]]
 name = "media"
 version = "0.1.0"
-source = "git+https://github.com/zed-industries/zed#1090c47a90c586b397dc3fdd0cd09b530f37e5a0"
+source = "git+https://github.com/zed-industries/zed#ded646760467d653fd57ee3ef4fc1edcfafba6ae"
 dependencies = [
  "anyhow",
  "bindgen 0.71.1",
@@ -4594,16 +4594,16 @@ dependencies = [
 
 [[package]]
 name = "polling"
-version = "3.11.0"
+version = "3.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d0e4f59085d47d8241c88ead0f274e8a0cb551f3625263c05eb8dd897c34218"
+checksum = "b5bd19146350fe804f7cb2669c851c03d69da628803dab0d98018142aaa5d829"
 dependencies = [
  "cfg-if",
  "concurrent-queue",
  "hermit-abi",
  "pin-project-lite",
  "rustix 1.1.2",
- "windows-sys 0.61.0",
+ "windows-sys 0.60.2",
 ]
 
 [[package]]
@@ -5069,7 +5069,7 @@ dependencies = [
 [[package]]
 name = "refineable"
 version = "0.1.0"
-source = "git+https://github.com/zed-industries/zed#1090c47a90c586b397dc3fdd0cd09b530f37e5a0"
+source = "git+https://github.com/zed-industries/zed#ded646760467d653fd57ee3ef4fc1edcfafba6ae"
 dependencies = [
  "derive_refineable",
  "workspace-hack",
@@ -5106,7 +5106,7 @@ checksum = "caf4aa5b0f434c91fe5c7f1ecb6a5ece2130b02ad2a590589dda5146df959001"
 
 [[package]]
 name = "registry"
-version = "0.2.8"
+version = "0.2.6"
 dependencies = [
  "anyhow",
  "common",
@@ -5223,7 +5223,7 @@ dependencies = [
 [[package]]
 name = "reqwest_client"
 version = "0.1.0"
-source = "git+https://github.com/zed-industries/zed#1090c47a90c586b397dc3fdd0cd09b530f37e5a0"
+source = "git+https://github.com/zed-industries/zed#ded646760467d653fd57ee3ef4fc1edcfafba6ae"
 dependencies = [
  "anyhow",
  "bytes",
@@ -5758,7 +5758,7 @@ checksum = "0f7d95a54511e0c7be3f51e8867aa8cf35148d7b9445d44de2f943e2b206e749"
 [[package]]
 name = "semantic_version"
 version = "0.1.0"
-source = "git+https://github.com/zed-industries/zed#1090c47a90c586b397dc3fdd0cd09b530f37e5a0"
+source = "git+https://github.com/zed-industries/zed#ded646760467d653fd57ee3ef4fc1edcfafba6ae"
 dependencies = [
  "anyhow",
  "serde",
@@ -5767,34 +5767,24 @@ dependencies = [
 
 [[package]]
 name = "semver"
-version = "1.0.27"
+version = "1.0.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d767eb0aabc880b29956c35734170f26ed551a859dbd361d140cdbeca61ab1e2"
+checksum = "56e6fa9c48d24d85fb3de5ad847117517440f6beceb7798af16b4a87d616b8d0"
 
 [[package]]
 name = "serde"
-version = "1.0.223"
+version = "1.0.219"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a505d71960adde88e293da5cb5eda57093379f64e61cf77bf0e6a63af07a7bac"
+checksum = "5f0e2c6ed6606019b4e29e69dbaba95b11854410e5347d525002456dbbb786b6"
-dependencies = [
- "serde_core",
- "serde_derive",
-]
-
-[[package]]
-name = "serde_core"
-version = "1.0.223"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "20f57cbd357666aa7b3ac84a90b4ea328f1d4ddb6772b430caa5d9e1309bb9e9"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.223"
+version = "1.0.219"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d428d07faf17e306e699ec1e91996e5a165ba5d6bce5b5155173e91a8a01a56"
+checksum = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -5823,16 +5813,15 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.145"
+version = "1.0.143"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "402a6f66d8c709116cf22f558eab210f5a50187f702eb4d7e5ef38d9a7f1c79c"
+checksum = "d401abef1d108fbd9cbaebc3e46611f4b1021f714a0597a71f41ee463f5f4a5a"
 dependencies = [
  "indexmap",
  "itoa",
  "memchr",
  "ryu",
  "serde",
- "serde_core",
 ]
 
 [[package]]
@@ -5904,7 +5893,7 @@ dependencies = [
 
 [[package]]
 name = "settings"
-version = "0.2.8"
+version = "0.2.6"
 dependencies = [
  "anyhow",
  "global",
@@ -5971,7 +5960,7 @@ dependencies = [
 
 [[package]]
 name = "signer_proxy"
-version = "0.2.8"
+version = "0.2.6"
 dependencies = [
  "anyhow",
  "atomic-destructor",
@@ -6210,7 +6199,7 @@ checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292"
 [[package]]
 name = "sum_tree"
 version = "0.1.0"
-source = "git+https://github.com/zed-industries/zed#1090c47a90c586b397dc3fdd0cd09b530f37e5a0"
+source = "git+https://github.com/zed-industries/zed#ded646760467d653fd57ee3ef4fc1edcfafba6ae"
 dependencies = [
  "arrayvec",
  "log",
@@ -6513,7 +6502,7 @@ dependencies = [
 
 [[package]]
 name = "theme"
-version = "0.2.8"
+version = "0.2.6"
 dependencies = [
  "anyhow",
  "gpui",
@@ -6675,7 +6664,7 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
 
 [[package]]
 name = "title_bar"
-version = "0.2.8"
+version = "0.2.6"
 dependencies = [
  "anyhow",
  "common",
@@ -7046,7 +7035,7 @@ dependencies = [
 
 [[package]]
 name = "ui"
-version = "0.2.8"
+version = "0.2.6"
 dependencies = [
  "anyhow",
  "common",
@@ -7240,7 +7229,7 @@ checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be"
 [[package]]
 name = "util"
 version = "0.1.0"
-source = "git+https://github.com/zed-industries/zed#1090c47a90c586b397dc3fdd0cd09b530f37e5a0"
+source = "git+https://github.com/zed-industries/zed#ded646760467d653fd57ee3ef4fc1edcfafba6ae"
 dependencies = [
  "anyhow",
  "async-fs",

Cargo.toml

@@ -4,7 +4,7 @@ members = ["crates/*"]
 default-members = ["crates/coop"]
 
 [workspace.package]
-version = "0.2.8"
+version = "0.2.7"
 edition = "2021"
 publish = false
 

assets/icons/server.svg

@@ -1,4 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="none" viewBox="0 0 24 24">
-  <path stroke="currentColor" stroke-linecap="square" stroke-linejoin="round" stroke-width="1.5" d="M21.25 12V6.75a2 2 0 0 0-2-2H4.75a2 2 0 0 0-2 2V12m18.5 0H2.75m18.5 0v5.25a2 2 0 0 1-2 2H4.75a2 2 0 0 1-2-2V12"/>
-  <path fill="currentColor" stroke="currentColor" stroke-width=".5" d="M6.5 14.875a.75.75 0 1 1 0 1.5.75.75 0 0 1 0-1.5Zm0-7.25a.75.75 0 1 1 0 1.5.75.75 0 0 1 0-1.5Z"/>
-</svg>

crates/client_keys/src/lib.rs

@@ -1,7 +1,5 @@
-use std::sync::atomic::Ordering;
-
 use global::constants::KEYRING_URL;
-use global::css;
+use global::first_run;
 use gpui::{App, AppContext, Context, Entity, Global, Subscription, Window};
 use nostr_sdk::prelude::*;
 use smallvec::{smallvec, SmallVec};
@@ -61,7 +59,6 @@ impl ClientKeys {
             return;
         }
 
-        let css = css();
         let read_client_keys = cx.read_credentials(KEYRING_URL);
 
         cx.spawn_in(window, async move |this, cx| {
@@ -76,7 +73,7 @@ impl ClientKeys {
                     this.set_keys(Some(keys), false, true, cx);
                 })
                 .ok();
-            } else if css.is_first_run.load(Ordering::Acquire) {
+            } else if *first_run() {
                 // If this is the first run, generate new keys and use them for the client keys
                 this.update(cx, |this, cx| {
                     this.new_keys(cx);

crates/coop/Cargo.toml

@@ -14,7 +14,7 @@ product-name = "Coop"
 description = "Chat Freely, Stay Private on Nostr"
 identifier = "su.reya.coop"
 category = "SocialNetworking"
-version = "0.2.8"
+version = "0.2.7"
 out-dir = "../../dist"
 before-packaging-command = "cargo build --release"
 resources = ["Cargo.toml", "src"]

crates/coop/src/chatspace.rs

@@ -9,11 +9,12 @@ use auto_update::AutoUpdater;
 use client_keys::ClientKeys;
 use common::display::ReadableProfile;
 use common::event::EventUtils;
+use flume::{Receiver, Sender};
 use global::constants::{
     ACCOUNT_IDENTIFIER, BOOTSTRAP_RELAYS, DEFAULT_SIDEBAR_WIDTH, METADATA_BATCH_LIMIT,
     METADATA_BATCH_TIMEOUT, SEARCH_RELAYS,
 };
-use global::{css, nostr_client, AuthRequest, Notice, SignalKind, UnwrappingStatus};
+use global::{css, ingester, nostr_client, AuthRequest, Notice, Signal, UnwrappingStatus};
 use gpui::prelude::FluentBuilder;
 use gpui::{
     div, px, rems, App, AppContext, AsyncWindowContext, Axis, Context, Entity, InteractiveElement,
@@ -91,6 +92,7 @@ impl ChatSpace {
         let title_bar = cx.new(|_| TitleBar::new());
         let dock = cx.new(|cx| DockArea::new(window, cx));
 
+        let (pubkey_tx, pubkey_rx) = flume::bounded::<PublicKey>(1024);
         let mut subscriptions = smallvec![];
         let mut tasks = smallvec![];
 
@@ -145,7 +147,7 @@ impl ChatSpace {
                     .await
                     .expect("Failed connect the bootstrap relays. Please restart the application.");
 
-                Self::process_nostr_events()
+                Self::process_nostr_events(&pubkey_tx)
                     .await
                     .expect("Failed to handle nostr events. Please restart the application.");
             }),
@@ -169,7 +171,7 @@ impl ChatSpace {
         tasks.push(
             // Listen all metadata requests then batch them into single subscription
             cx.background_spawn(async move {
-                Self::process_batching_metadata().await;
+                Self::process_batching_metadata(&pubkey_rx).await;
             }),
         );
 
@@ -213,7 +215,7 @@ impl ChatSpace {
 
     async fn observe_signer() {
         let client = nostr_client();
-        let css = css();
+        let ingester = ingester();
         let stream_timeout = Duration::from_secs(5);
         let loop_duration = Duration::from_secs(1);
 
@@ -229,7 +231,7 @@ impl ChatSpace {
             };
 
             // Notify the app that the signer has been set.
-            css.signal.send(SignalKind::SignerSet(public_key)).await;
+            ingester.send(Signal::SignerSet(public_key)).await;
 
             // Subscribe to the NIP-65 relays for the public key.
             let filter = Filter::new()
@@ -237,48 +239,35 @@ impl ChatSpace {
                 .author(public_key)
                 .limit(1);
 
-            let mut nip65_found = false;
-
             match client
                 .stream_events_from(BOOTSTRAP_RELAYS, filter, stream_timeout)
                 .await
             {
                 Ok(mut stream) => {
-                    if stream.next().await.is_some() {
+                    let mut processed_ids = HashSet::new();
-                        nip65_found = true;
-                    } else {
-                        // Timeout
-                        css.signal.send(SignalKind::RelaysNotFound).await;
-                    }
-                }
-                Err(e) => {
-                    log::error!("Error fetching NIP-65 Relay: {e:?}");
-                    css.signal.send(SignalKind::RelaysNotFound).await;
-                }
-            };
 
-            if nip65_found {
+                    if let Some(event) = stream.next().await {
-                // Subscribe to the NIP-17 relays for the public key.
+                        if processed_ids.insert(event.id) {
-                let filter = Filter::new()
+                            // Fetch user's metadata event
-                    .kind(Kind::InboxRelays)
+                            Self::fetch_single_event(Kind::Metadata, event.pubkey).await;
-                    .author(public_key)
+
-                    .limit(1);
+                            // Fetch user's contact list event
+                            Self::fetch_single_event(Kind::ContactList, event.pubkey).await;
+
+                            // Fetch user's inbox relays event
+                            Self::fetch_nip17_relays(event.pubkey).await;
 
-                match client.stream_events(filter, stream_timeout).await {
-                    Ok(mut stream) => {
-                        if stream.next().await.is_some() {
                             break;
+                        }
                     } else {
-                            // Timeout
+                        ingester.send(Signal::DmRelayNotFound).await;
-                            css.signal.send(SignalKind::RelaysNotFound).await;
                     }
                 }
                 Err(e) => {
                     log::error!("Error fetching NIP-17 Relay: {e:?}");
-                        css.signal.send(SignalKind::RelaysNotFound).await;
+                    ingester.send(Signal::DmRelayNotFound).await;
                 }
             };
-            }
 
             break;
         }
@@ -287,6 +276,7 @@ impl ChatSpace {
     async fn observe_giftwrap() {
         let client = nostr_client();
         let css = css();
+        let ingester = ingester();
         let loop_duration = Duration::from_secs(20);
         let mut is_start_processing = false;
         let mut total_loops = 0;
@@ -306,14 +296,14 @@ impl ChatSpace {
                         Ordering::Relaxed,
                     );
 
-                    let signal = SignalKind::GiftWrapStatus(UnwrappingStatus::Processing);
+                    let signal = Signal::GiftWrapProcess(UnwrappingStatus::Processing);
-                    css.signal.send(signal).await;
+                    ingester.send(signal).await;
                 } else {
                     // Only run further if we are already processing
                     // Wait until after 2 loops to prevent exiting early while events are still being processed
                     if is_start_processing && total_loops >= 2 {
-                        let signal = SignalKind::GiftWrapStatus(UnwrappingStatus::Complete);
+                        let signal = Signal::GiftWrapProcess(UnwrappingStatus::Complete);
-                        css.signal.send(signal).await;
+                        ingester.send(signal).await;
 
                         // Reset the counter
                         is_start_processing = false;
@@ -326,8 +316,7 @@ impl ChatSpace {
         }
     }
 
-    async fn process_batching_metadata() {
+    async fn process_batching_metadata(rx: &Receiver<PublicKey>) {
-        let css = css();
         let timeout = Duration::from_millis(METADATA_BATCH_TIMEOUT);
         let mut processed_pubkeys: HashSet<PublicKey> = HashSet::new();
         let mut batch: HashSet<PublicKey> = HashSet::new();
@@ -342,7 +331,7 @@ impl ChatSpace {
         loop {
             let futs = smol::future::or(
                 async move {
-                    if let Ok(public_key) = css.ingester.receiver().recv_async().await {
+                    if let Ok(public_key) = rx.recv_async().await {
                         BatchEvent::PublicKey(public_key)
                     } else {
                         BatchEvent::Closed
@@ -377,8 +366,9 @@ impl ChatSpace {
         }
     }
 
-    async fn process_nostr_events() -> Result<(), Error> {
+    async fn process_nostr_events(pubkey_tx: &Sender<PublicKey>) -> Result<(), Error> {
         let client = nostr_client();
+        let ingester = ingester();
         let css = css();
 
         let mut processed_events: HashSet<EventId> = HashSet::new();
@@ -392,52 +382,12 @@ impl ChatSpace {
 
             match message {
                 RelayMessage::Event { event, .. } => {
-                    // Keep track of which relays have seen this event
-                    css.seen_on_relays
-                        .write()
-                        .await
-                        .entry(event.id)
-                        .or_insert_with(HashSet::new)
-                        .insert(relay_url);
-
                     // Skip events that have already been processed
                     if !processed_events.insert(event.id) {
                         continue;
                     }
 
                     match event.kind {
-                        Kind::RelayList => {
-                            if let Ok(true) = Self::is_self_event(&event).await {
-                                // Fetch user's metadata event
-                                Self::fetch_single_event(Kind::Metadata, event.pubkey).await;
-
-                                // Fetch user's contact list event
-                                Self::fetch_single_event(Kind::ContactList, event.pubkey).await;
-                            }
-                        }
-                        Kind::InboxRelays => {
-                            if let Ok(true) = Self::is_self_event(&event).await {
-                                let relays = nip17::extract_relay_list(&event).collect_vec();
-
-                                if !relays.is_empty() {
-                                    for relay in relays.clone().into_iter() {
-                                        if client.add_relay(relay).await.is_err() {
-                                            let notice = Notice::RelayFailed(relay.clone());
-                                            css.signal.send(SignalKind::Notice(notice)).await;
-                                        }
-                                        if client.connect_relay(relay).await.is_err() {
-                                            let notice = Notice::RelayFailed(relay.clone());
-                                            css.signal.send(SignalKind::Notice(notice)).await;
-                                        }
-                                    }
-
-                                    // Subscribe to gift wrap events only in the current user's NIP-17 relays
-                                    Self::fetch_gift_wrap(relays, event.pubkey).await;
-                                } else {
-                                    css.signal.send(SignalKind::RelaysNotFound).await;
-                                }
-                            }
-                        }
                         Kind::ContactList => {
                             if let Ok(true) = Self::is_self_event(&event).await {
                                 let public_keys = event.tags.public_keys().copied().collect_vec();
@@ -453,28 +403,28 @@ impl ChatSpace {
                             }
                         }
                         Kind::Metadata => {
-                            let metadata = Metadata::from_json(&event.content).unwrap_or_default();
+                            if let Ok(metadata) = Metadata::from_json(&event.content) {
                                 let profile = Profile::new(event.pubkey, metadata);
-
+                                ingester.send(Signal::Metadata(profile)).await;
-                            css.signal.send(SignalKind::NewProfile(profile)).await;
+                            }
                         }
                         Kind::GiftWrap => {
-                            Self::unwrap_gift_wrap(&event).await;
+                            Self::unwrap_gift_wrap(&event, pubkey_tx).await;
                         }
                         _ => {}
                     }
                 }
                 RelayMessage::EndOfStoredEvents(subscription_id) => {
                     if *subscription_id == css.gift_wrap_sub_id {
-                        let signal = SignalKind::GiftWrapStatus(UnwrappingStatus::Processing);
+                        let signal = Signal::GiftWrapProcess(UnwrappingStatus::Processing);
-                        css.signal.send(signal).await;
+                        ingester.send(signal).await;
                     }
                 }
                 RelayMessage::Auth { challenge } => {
                     if challenges.insert(challenge.clone()) {
                         let req = AuthRequest::new(challenge, relay_url);
                         // Send a signal to the ingester to handle the auth request
-                        css.signal.send(SignalKind::Auth(req)).await;
+                        ingester.send(Signal::Auth(req)).await;
                     }
                 }
                 RelayMessage::Ok {
@@ -500,16 +450,17 @@ impl ChatSpace {
     }
 
     async fn process_nostr_signals(view: WeakEntity<ChatSpace>, cx: &mut AsyncWindowContext) {
-        let css = css();
+        let ingester = ingester();
+        let signals = ingester.signals();
         let mut is_open_proxy_modal = false;
 
-        while let Ok(signal) = css.signal.receiver().recv_async().await {
+        while let Ok(signal) = signals.recv_async().await {
             cx.update(|window, cx| {
                 let registry = Registry::global(cx);
                 let settings = AppSettings::global(cx);
 
                 match signal {
-                    SignalKind::SignerSet(public_key) => {
+                    Signal::SignerSet(public_key) => {
                         window.close_modal(cx);
 
                         // Setup the default layout for current workspace
@@ -529,7 +480,7 @@ impl ChatSpace {
                             this.load_rooms(window, cx);
                         });
                     }
-                    SignalKind::SignerUnset => {
+                    Signal::SignerUnset => {
                         // Setup the onboarding layout for current workspace
                         view.update(cx, |this, cx| {
                             this.set_onboarding_layout(window, cx);
@@ -541,7 +492,7 @@ impl ChatSpace {
                             this.reset(cx);
                         });
                     }
-                    SignalKind::Auth(req) => {
+                    Signal::Auth(req) => {
                         let url = &req.url;
                         let auto_auth = AppSettings::get_auto_auth(cx);
                         let is_authenticated = AppSettings::read_global(cx).is_authenticated(url);
@@ -559,7 +510,7 @@ impl ChatSpace {
                         })
                         .ok();
                     }
-                    SignalKind::ProxyDown => {
+                    Signal::ProxyDown => {
                         if !is_open_proxy_modal {
                             is_open_proxy_modal = true;
 
@@ -569,28 +520,28 @@ impl ChatSpace {
                             .ok();
                         }
                     }
-                    SignalKind::GiftWrapStatus(status) => {
+                    Signal::GiftWrapProcess(status) => {
                         registry.update(cx, |this, cx| {
                             this.set_unwrapping_status(status, cx);
                         });
                     }
-                    SignalKind::NewProfile(profile) => {
+                    Signal::Metadata(profile) => {
                         registry.update(cx, |this, cx| {
                             this.insert_or_update_person(profile, cx);
                         });
                     }
-                    SignalKind::NewMessage((gift_wrap_id, event)) => {
+                    Signal::Message((gift_wrap_id, event)) => {
                         registry.update(cx, |this, cx| {
                             this.event_to_message(gift_wrap_id, event, window, cx);
                         });
                     }
-                    SignalKind::RelaysNotFound => {
+                    Signal::DmRelayNotFound => {
                         view.update(cx, |this, cx| {
                             this.set_required_relays(cx);
                         })
                         .ok();
                     }
-                    SignalKind::Notice(msg) => {
+                    Signal::Notice(msg) => {
                         window.push_notification(msg.as_str(), cx);
                     }
                 };
@@ -619,7 +570,49 @@ impl ChatSpace {
         }
     }
 
-    /// Fetches gift wrap events for a given public key and relays
+    pub async fn fetch_nip17_relays(public_key: PublicKey) {
+        let client = nostr_client();
+        let ingester = ingester();
+        let filter = Filter::new()
+            .kind(Kind::InboxRelays)
+            .author(public_key)
+            .limit(1);
+
+        match client.stream_events(filter, Duration::from_secs(5)).await {
+            Ok(mut stream) => {
+                let mut processed_ids = HashSet::new();
+
+                if let Some(event) = stream.next().await {
+                    if processed_ids.insert(event.id) {
+                        let relays = nip17::extract_relay_list(&event).collect_vec();
+
+                        if !relays.is_empty() {
+                            for relay in relays.clone().into_iter() {
+                                if client.add_relay(relay).await.is_err() {
+                                    let notice = Notice::RelayFailed(relay.clone());
+                                    ingester.send(Signal::Notice(notice)).await;
+                                }
+                                if client.connect_relay(relay).await.is_err() {
+                                    let notice = Notice::RelayFailed(relay.clone());
+                                    ingester.send(Signal::Notice(notice)).await;
+                                }
+                            }
+
+                            // Subscribe to gift wrap events only in the current user's NIP-17 relays
+                            Self::fetch_gift_wrap(relays, event.pubkey).await;
+                        }
+                    }
+                } else {
+                    ingester.send(Signal::DmRelayNotFound).await;
+                }
+            }
+            Err(e) => {
+                log::error!("Error fetching NIP-17 Relay: {e:?}");
+                ingester.send(Signal::DmRelayNotFound).await;
+            }
+        };
+    }
+
     pub async fn fetch_gift_wrap(relays: Vec<&RelayUrl>, public_key: PublicKey) {
         let client = nostr_client();
         let sub_id = css().gift_wrap_sub_id.clone();
@@ -696,8 +689,9 @@ impl ChatSpace {
     }
 
     /// Unwraps a gift-wrapped event and processes its contents.
-    async fn unwrap_gift_wrap(target: &Event) {
+    async fn unwrap_gift_wrap(target: &Event, pubkey_tx: &Sender<PublicKey>) {
         let client = nostr_client();
+        let ingester = ingester();
         let css = css();
         let mut message: Option<Event> = None;
 
@@ -718,17 +712,14 @@ impl ChatSpace {
         if let Some(event) = message {
             // Send all pubkeys to the metadata batch to sync data
             for public_key in event.all_pubkeys() {
-                css.ingester.send(public_key).await;
+                pubkey_tx.send_async(public_key).await.ok();
             }
 
             match event.created_at >= css.init_at {
                 // New message: send a signal to notify the UI
                 true => {
-                    // A small delay to prevent UI flickering
                     smol::Timer::after(Duration::from_millis(200)).await;
-                    css.signal
+                    ingester.send(Signal::Message((target.id, event))).await;
-                        .send(SignalKind::NewMessage((target.id, event)))
-                        .await;
                 }
                 // Old message: Coop is probably processing the user's messages during initial load
                 false => {
@@ -1131,7 +1122,7 @@ impl ChatSpace {
     fn on_sign_out(&mut self, _e: &Logout, _window: &mut Window, cx: &mut Context<Self>) {
         cx.background_spawn(async move {
             let client = nostr_client();
-            let css = css();
+            let ingester = ingester();
 
             let filter = Filter::new()
                 .kind(Kind::ApplicationSpecificData)
@@ -1144,7 +1135,7 @@ impl ChatSpace {
             client.reset().await;
 
             // Notify the channel about the signer being unset
-            css.signal.send(SignalKind::SignerUnset).await;
+            ingester.send(Signal::SignerUnset).await;
         })
         .detach();
     }
@@ -1368,7 +1359,7 @@ impl ChatSpace {
 
             this._tasks.push(cx.background_spawn(async move {
                 let client = nostr_client();
-                let css = css();
+                let ingester = ingester();
 
                 if proxy.start().await.is_ok() {
                     webbrowser::open(&url).ok();
@@ -1399,7 +1390,7 @@ impl ChatSpace {
 
                             break;
                         } else {
-                            css.signal.send(SignalKind::ProxyDown).await;
+                            ingester.send(Signal::ProxyDown).await;
                         }
                         smol::Timer::after(Duration::from_secs(1)).await;
                     }

crates/coop/src/main.rs

@@ -2,7 +2,7 @@ use std::sync::Arc;
 
 use assets::Assets;
 use global::constants::{APP_ID, APP_NAME};
-use global::{css, nostr_client};
+use global::{css, ingester, nostr_client};
 use gpui::{
     point, px, size, AppContext, Application, Bounds, KeyBinding, Menu, MenuItem, SharedString,
     TitlebarOptions, WindowBackgroundAppearance, WindowBounds, WindowDecorations, WindowKind,
@@ -26,6 +26,9 @@ fn main() {
     // Initialize the Nostr client
     let _client = nostr_client();
 
+    // Initialize the ingester
+    let _ingester = ingester();
+
     // Initialize the coop simple storage
     let _css = css();
 

crates/coop/src/views/account.rs

@@ -5,7 +5,7 @@ use client_keys::ClientKeys;
 use common::display::ReadableProfile;
 use common::handle_auth::CoopAuthUrlHandler;
 use global::constants::{ACCOUNT_IDENTIFIER, BUNKER_TIMEOUT};
-use global::{css, nostr_client, SignalKind};
+use global::{ingester, nostr_client, Signal};
 use gpui::prelude::FluentBuilder;
 use gpui::{
     div, relative, rems, svg, AnyElement, App, AppContext, Context, Entity, EventEmitter,
@@ -248,7 +248,7 @@ impl Account {
             // Reset the nostr client in the background
             cx.background_spawn(async move {
                 let client = nostr_client();
-                let css = css();
+                let ingester = ingester();
 
                 let filter = Filter::new()
                     .kind(Kind::ApplicationSpecificData)
@@ -261,7 +261,7 @@ impl Account {
                 client.unset_signer().await;
 
                 // Notify the channel about the signer being unset
-                css.signal.send(SignalKind::SignerUnset).await;
+                ingester.send(Signal::SignerUnset).await;
             }),
         );
     }

crates/coop/src/views/chat/mod.rs

@@ -1,5 +1,3 @@
-use std::collections::HashMap;
-
 use anyhow::anyhow;
 use common::display::{ReadableProfile, ReadableTimestamp};
 use common::nip96::nip96_upload;
@@ -26,12 +24,12 @@ use smallvec::{smallvec, SmallVec};
 use smol::fs;
 use theme::ActiveTheme;
 use ui::avatar::Avatar;
-use ui::button::{Button, ButtonVariants};
+use ui::button::{Button, ButtonRounded, ButtonVariants};
 use ui::dock_area::panel::{Panel, PanelEvent};
 use ui::emoji_picker::EmojiPicker;
 use ui::input::{InputEvent, InputState, TextInput};
 use ui::modal::ModalButtonProps;
-use ui::popup_menu::{PopupMenu, PopupMenuExt};
+use ui::popup_menu::PopupMenu;
 use ui::text::RenderedText;
 use ui::{
     h_flex, v_flex, ContextModal, Disableable, Icon, IconName, InteractiveElementExt, Sizable,
@@ -42,7 +40,7 @@ mod subject;
 
 #[derive(Action, Clone, PartialEq, Eq, Deserialize)]
 #[action(namespace = chat, no_json)]
-pub struct SeenOn(pub EventId);
+pub struct ChangeSubject(pub String);
 
 pub fn init(room: Entity<Room>, window: &mut Window, cx: &mut App) -> Entity<Chat> {
     cx.new(|cx| Chat::new(room, window, cx))
@@ -51,9 +49,6 @@ pub fn init(room: Entity<Room>, window: &mut Window, cx: &mut App) -> Entity<Cha
 pub struct Chat {
     // Chat Room
     room: Entity<Room>,
-    relays: Entity<HashMap<PublicKey, Vec<RelayUrl>>>,
-
-    // Messages
     list_state: ListState,
     messages: BTreeSet<Message>,
     rendered_texts_by_id: BTreeMap<EventId, RenderedText>,
@@ -72,20 +67,14 @@ pub struct Chat {
     focus_handle: FocusHandle,
     image_cache: Entity<RetainAllImageCache>,
 
-    _subscriptions: SmallVec<[Subscription; 4]>,
+    _subscriptions: SmallVec<[Subscription; 2]>,
-    _tasks: SmallVec<[Task<()>; 2]>,
+    _tasks: SmallVec<[Task<()>; 1]>,
 }
 
 impl Chat {
     pub fn new(room: Entity<Room>, window: &mut Window, cx: &mut Context<Self>) -> Self {
         let attachments = cx.new(|_| vec![]);
         let replies_to = cx.new(|_| vec![]);
-
-        let relays = cx.new(|_| {
-            let this: HashMap<PublicKey, Vec<RelayUrl>> = HashMap::new();
-            this
-        });
-
         let input = cx.new(|cx| {
             InputState::new(window, cx)
                 .placeholder(t!("chat.placeholder"))
@@ -100,35 +89,11 @@ impl Chat {
         let messages = BTreeSet::from([Message::system()]);
         let list_state = ListState::new(messages.len(), ListAlignment::Bottom, px(1024.));
 
-        let connect_relays = room.read(cx).connect_relays(cx);
         let load_messages = room.read(cx).load_messages(cx);
 
         let mut subscriptions = smallvec![];
         let mut tasks = smallvec![];
 
-        tasks.push(
-            // Load all messages belonging to this room
-            cx.spawn_in(window, async move |this, cx| {
-                match connect_relays.await {
-                    Ok(relays) => {
-                        this.update(cx, |this, cx| {
-                            this.relays.update(cx, |this, cx| {
-                                *this = relays;
-                                cx.notify();
-                            });
-                        })
-                        .ok();
-                    }
-                    Err(e) => {
-                        cx.update(|window, cx| {
-                            window.push_notification(e.to_string(), cx);
-                        })
-                        .ok();
-                    }
-                };
-            }),
-        );
-
         tasks.push(
             // Load all messages belonging to this room
             cx.spawn_in(window, async move |this, cx| {
@@ -174,7 +139,7 @@ impl Chat {
                 match signal {
                     RoomSignal::NewMessage((gift_wrap_id, event)) => {
                         if !this.is_sent_by_coop(gift_wrap_id) {
-                            this.insert_message(Message::user(event), false, cx);
+                            this.insert_message(event, false, cx);
                         }
                     }
                     RoomSignal::Refresh => {
@@ -184,33 +149,6 @@ impl Chat {
             }),
         );
 
-        subscriptions.push(
-            // Observe the messaging relays of the room's members
-            cx.observe_in(&relays, window, |this, entity, _window, cx| {
-                for (public_key, urls) in entity.read(cx).clone().into_iter() {
-                    if urls.is_empty() {
-                        let profile = Registry::read_global(cx).get_person(&public_key, cx);
-                        let content = t!("chat.nip17_not_found", u = profile.name());
-
-                        this.insert_warning(content, cx);
-                    }
-                }
-            }),
-        );
-
-        subscriptions.push(
-            // Observe when user close chat panel
-            cx.on_release_in(window, move |this, window, cx| {
-                this.disconnect_relays(cx);
-                this.messages.clear();
-                this.rendered_texts_by_id.clear();
-                this.reports_by_id.clear();
-                this.image_cache.update(cx, |this, cx| {
-                    this.clear(window, cx);
-                });
-            }),
-        );
-
         Self {
             id: room.read(cx).id.to_string().into(),
             image_cache: RetainAllImageCache::new(cx),
@@ -218,7 +156,6 @@ impl Chat {
             uploading: false,
             rendered_texts_by_id: BTreeMap::new(),
             reports_by_id: BTreeMap::new(),
-            relays,
             messages,
             room,
             list_state,
@@ -230,20 +167,6 @@ impl Chat {
         }
     }
 
-    /// Disconnect all relays when the user closes the chat panel
-    fn disconnect_relays(&mut self, cx: &mut App) {
-        let relays = self.relays.read(cx).clone();
-
-        cx.background_spawn(async move {
-            let client = nostr_client();
-
-            for relay in relays.values().flatten() {
-                client.disconnect_relay(relay).await.ok();
-            }
-        })
-        .detach();
-    }
-
     /// Load all messages belonging to this room
     fn load_messages(&mut self, window: &mut Window, cx: &mut Context<Self>) {
         let load_messages = self.room.read(cx).load_messages(cx);
@@ -337,7 +260,7 @@ impl Chat {
 
         cx.defer_in(window, |this, window, cx| {
             // Optimistically update message list
-            this.insert_message(Message::user(temp_message), true, cx);
+            this.insert_message(temp_message, true, cx);
 
             // Remove all replies
             this.remove_all_replies(cx);
@@ -395,7 +318,6 @@ impl Chat {
                 cx.spawn_in(window, async move |this, cx| {
                     match task.await {
                         Ok(reports) => {
-                            if !reports.is_empty() {
                             this.update(cx, |this, cx| {
                                 this.reports_by_id.entry(id_clone).and_modify(|this| {
                                     *this = reports;
@@ -404,7 +326,6 @@ impl Chat {
                             })
                             .ok();
                         }
-                        }
                         Err(e) => {
                             cx.update(|window, cx| {
                                 window.push_notification(e.to_string(), cx);
@@ -418,41 +339,6 @@ impl Chat {
         }
     }
 
-    /// Insert a message into the chat panel
-    fn insert_message<E>(&mut self, m: E, scroll: bool, cx: &mut Context<Self>)
-    where
-        E: Into<Message>,
-    {
-        let old_len = self.messages.len();
-
-        // Extend the messages list with the new events
-        if self.messages.insert(m.into()) {
-            self.list_state.splice(old_len..old_len, 1);
-
-            if scroll {
-                self.list_state.scroll_to(ListOffset {
-                    item_ix: self.list_state.item_count(),
-                    offset_in_item: px(0.0),
-                });
-                cx.notify();
-            }
-        }
-    }
-
-    /// Convert and insert a vector of nostr events into the chat panel
-    fn insert_messages(&mut self, events: Vec<Event>, cx: &mut Context<Self>) {
-        for event in events.into_iter() {
-            let m = Message::user(event);
-            self.insert_message(m, false, cx);
-        }
-        cx.notify();
-    }
-
-    fn insert_warning(&mut self, content: impl Into<String>, cx: &mut Context<Self>) {
-        let m = Message::warning(content.into());
-        self.insert_message(m, true, cx);
-    }
-
     /// Check if a message failed to send by its ID
     fn is_sent_failed(&self, id: &EventId) -> bool {
         self.reports_by_id
@@ -484,6 +370,35 @@ impl Chat {
         })
     }
 
+    /// Convert and insert a nostr event into the chat panel
+    fn insert_message<E>(&mut self, event: E, scroll: bool, cx: &mut Context<Self>)
+    where
+        E: Into<RenderedMessage>,
+    {
+        let old_len = self.messages.len();
+
+        // Extend the messages list with the new events
+        if self.messages.insert(Message::user(event)) {
+            self.list_state.splice(old_len..old_len, 1);
+
+            if scroll {
+                self.list_state.scroll_to(ListOffset {
+                    item_ix: self.list_state.item_count(),
+                    offset_in_item: px(0.0),
+                });
+                cx.notify();
+            }
+        }
+    }
+
+    /// Convert and insert a vector of nostr events into the chat panel
+    fn insert_messages(&mut self, events: Vec<Event>, cx: &mut Context<Self>) {
+        for event in events.into_iter() {
+            self.insert_message(event, false, cx);
+        }
+        cx.notify();
+    }
+
     fn profile(&self, public_key: &PublicKey, cx: &Context<Self>) -> Profile {
         let registry = Registry::read_global(cx);
         registry.get_person(public_key, cx)
@@ -642,34 +557,6 @@ impl Chat {
             .into_any_element()
     }
 
-    fn render_warning(&mut self, ix: usize, content: String, cx: &mut Context<Self>) -> AnyElement {
-        div()
-            .id(ix)
-            .relative()
-            .w_full()
-            .py_1()
-            .px_3()
-            .bg(cx.theme().warning_background)
-            .child(
-                h_flex()
-                    .gap_3()
-                    .text_sm()
-                    .text_color(cx.theme().warning_foreground)
-                    .child(Avatar::new("brand/system.png").size(rems(2.)))
-                    .child(SharedString::from(content)),
-            )
-            .child(
-                div()
-                    .absolute()
-                    .left_0()
-                    .top_0()
-                    .w(px(2.))
-                    .h_full()
-                    .bg(cx.theme().warning_active),
-            )
-            .into_any_element()
-    }
-
     fn render_message_not_found(&self, ix: usize, cx: &Context<Self>) -> AnyElement {
         div()
             .id(ix)
@@ -730,7 +617,9 @@ impl Chat {
                             .flex_initial()
                             .overflow_hidden()
                             .child(
-                                h_flex()
+                                div()
+                                    .flex()
+                                    .items_center()
                                     .gap_2()
                                     .text_sm()
                                     .text_color(cx.theme().text_placeholder)
@@ -761,7 +650,7 @@ impl Chat {
                                                 .label(t!("common.resend"))
                                                 .danger()
                                                 .xsmall()
-                                                .rounded()
+                                                .rounded(ButtonRounded::Full)
                                                 .on_click(cx.listener(
                                                     move |this, _, window, cx| {
                                                         this.resend_message(&id, window, cx);
@@ -1031,6 +920,31 @@ impl Chat {
     }
 
     fn render_actions(&self, id: &EventId, cx: &Context<Self>) -> impl IntoElement {
+        let groups = vec![
+            Button::new("reply")
+                .icon(IconName::Reply)
+                .tooltip(t!("chat.reply_button"))
+                .small()
+                .ghost()
+                .on_click({
+                    let id = id.to_owned();
+                    cx.listener(move |this, _event, _window, cx| {
+                        this.reply_to(&id, cx);
+                    })
+                }),
+            Button::new("copy")
+                .icon(IconName::Copy)
+                .tooltip(t!("chat.copy_message_button"))
+                .small()
+                .ghost()
+                .on_click({
+                    let id = id.to_owned();
+                    cx.listener(move |this, _event, _window, cx| {
+                        this.copy_message(&id, cx);
+                    })
+                }),
+        ];
+
         h_flex()
             .p_0p5()
             .gap_1()
@@ -1043,45 +957,7 @@ impl Chat {
             .border_1()
             .border_color(cx.theme().border)
             .bg(cx.theme().background)
-            .child(
+            .children(groups)
-                Button::new("reply")
-                    .icon(IconName::Reply)
-                    .tooltip(t!("chat.reply_button"))
-                    .small()
-                    .ghost()
-                    .on_click({
-                        let id = id.to_owned();
-                        cx.listener(move |this, _event, _window, cx| {
-                            this.reply_to(&id, cx);
-                        })
-                    }),
-            )
-            .child(
-                Button::new("copy")
-                    .icon(IconName::Copy)
-                    .tooltip(t!("chat.copy_message_button"))
-                    .small()
-                    .ghost()
-                    .on_click({
-                        let id = id.to_owned();
-                        cx.listener(move |this, _event, _window, cx| {
-                            this.copy_message(&id, cx);
-                        })
-                    }),
-            )
-            .child(div().flex_shrink_0().h_4().w_px().bg(cx.theme().border))
-            .child(
-                Button::new("seen-on")
-                    .icon(IconName::Ellipsis)
-                    .small()
-                    .ghost()
-                    .popup_menu({
-                        let id = id.to_owned();
-                        move |this, _window, _cx| {
-                            this.menu(t!("common.seen_on"), Box::new(SeenOn(id)))
-                        }
-                    }),
-            )
             .group_hover("", |this| this.visible())
     }
 
@@ -1257,62 +1133,6 @@ impl Chat {
                 .ok();
             })
     }
-
-    fn on_open_seen_on(&mut self, ev: &SeenOn, window: &mut Window, cx: &mut Context<Self>) {
-        let id = ev.0;
-
-        let task: Task<Result<Vec<RelayUrl>, Error>> = cx.background_spawn(async move {
-            let client = nostr_client();
-            let css = css();
-            let mut relays: Vec<RelayUrl> = vec![];
-
-            let filter = Filter::new()
-                .kind(Kind::ApplicationSpecificData)
-                .event(id)
-                .limit(1);
-
-            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) = css.seen_on_relays.read().await.get(&id).cloned() {
-                        relays.extend(urls);
-                    }
-                }
-            }
-
-            Ok(relays)
-        });
-
-        cx.spawn_in(window, async move |_, cx| {
-            if let Ok(urls) = task.await {
-                cx.update(|window, cx| {
-                    window.open_modal(cx, move |this, _window, cx| {
-                        this.title(shared_t!("common.seen_on")).child(
-                            v_flex().pb_4().gap_2().children({
-                                let mut items = Vec::with_capacity(urls.len());
-
-                                for url in urls.clone().into_iter() {
-                                    items.push(
-                                        h_flex()
-                                            .h_8()
-                                            .px_2()
-                                            .bg(cx.theme().elevated_surface_background)
-                                            .rounded(cx.theme().radius)
-                                            .font_semibold()
-                                            .text_xs()
-                                            .child(url.to_string()),
-                                    )
-                                }
-
-                                items
-                            }),
-                        )
-                    });
-                })
-                .ok();
-            }
-        })
-        .detach();
-    }
 }
 
 impl Panel for Chat {
@@ -1359,7 +1179,6 @@ impl Focusable for Chat {
 impl Render for Chat {
     fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
         v_flex()
-            .on_action(cx.listener(Self::on_open_seen_on))
             .image_cache(self.image_cache.clone())
             .size_full()
             .child(
@@ -1377,9 +1196,6 @@ impl Render for Chat {
 
                                     this.render_message(ix, rendered, text, cx)
                                 }
-                                Message::Warning(content, _) => {
-                                    this.render_warning(ix, content.to_owned(), cx)
-                                }
                                 Message::System(_) => this.render_announcement(ix, cx),
                             }
                         } else {

crates/coop/src/views/compose.rs

@@ -22,7 +22,7 @@ use smallvec::{smallvec, SmallVec};
 use smol::Timer;
 use theme::ActiveTheme;
 use ui::avatar::Avatar;
-use ui::button::{Button, ButtonVariants};
+use ui::button::{Button, ButtonRounded, ButtonVariants};
 use ui::input::{InputEvent, InputState, TextInput};
 use ui::notification::Notification;
 use ui::{h_flex, v_flex, ContextModal, Disableable, Icon, IconName, Sizable, StyledExt};
@@ -34,7 +34,7 @@ pub fn compose_button() -> impl IntoElement {
             .ghost_alt()
             .cta()
             .small()
-            .rounded()
+            .rounded(ButtonRounded::Full)
             .on_click(move |_, window, cx| {
                 let compose = cx.new(|cx| Compose::new(window, cx));
                 let title = SharedString::new(t!("sidebar.direct_messages"));

crates/coop/src/views/new_account.rs

@@ -14,7 +14,7 @@ use settings::AppSettings;
 use smol::fs;
 use theme::ActiveTheme;
 use ui::avatar::Avatar;
-use ui::button::{Button, ButtonVariants};
+use ui::button::{Button, ButtonRounded, ButtonVariants};
 use ui::dock_area::panel::{Panel, PanelEvent};
 use ui::input::{InputState, TextInput};
 use ui::modal::ModalButtonProps;
@@ -352,7 +352,7 @@ impl Render for NewAccount {
                                             .label(t!("common.upload"))
                                             .ghost()
                                             .small()
-                                            .rounded()
+                                            .rounded(ButtonRounded::Full)
                                             .disabled(self.submitting || self.uploading)
                                             .loading(self.uploading)
                                             .on_click(cx.listener(move |this, _, window, cx| {

crates/coop/src/views/preferences.rs

@@ -10,7 +10,7 @@ use registry::Registry;
 use settings::AppSettings;
 use theme::ActiveTheme;
 use ui::avatar::Avatar;
-use ui::button::{Button, ButtonVariants};
+use ui::button::{Button, ButtonRounded, ButtonVariants};
 use ui::input::{InputState, TextInput};
 use ui::modal::ModalButtonProps;
 use ui::switch::Switch;
@@ -169,7 +169,7 @@ impl Render for Preferences {
                                     .label("Messaging Relays")
                                     .xsmall()
                                     .ghost_alt()
-                                    .rounded()
+                                    .rounded(ButtonRounded::Full)
                                     .on_click(cx.listener(move |this, _e, window, cx| {
                                         this.open_relays(window, cx);
                                     })),

crates/coop/src/views/screening.rs

@@ -17,7 +17,7 @@ use settings::AppSettings;
 use smallvec::{smallvec, SmallVec};
 use theme::ActiveTheme;
 use ui::avatar::Avatar;
-use ui::button::{Button, ButtonVariants};
+use ui::button::{Button, ButtonRounded, ButtonVariants};
 use ui::indicator::Indicator;
 use ui::{h_flex, v_flex, ContextModal, Icon, IconName, Sizable, StyledExt};
 
@@ -29,9 +29,10 @@ pub struct Screening {
     profile: Profile,
     verified: bool,
     followed: bool,
+    dm_relays: Option<bool>,
     last_active: Option<Timestamp>,
     mutual_contacts: Vec<Profile>,
-    _tasks: SmallVec<[Task<()>; 3]>,
+    _tasks: SmallVec<[Task<()>; 4]>,
 }
 
 impl Screening {
@@ -82,6 +83,24 @@ impl Screening {
             activity
         });
 
+        let relay_check = cx.background_spawn(async move {
+            let client = nostr_client();
+            let mut relay = false;
+
+            let filter = Filter::new()
+                .kind(Kind::InboxRelays)
+                .author(public_key)
+                .limit(1);
+
+            if let Ok(mut stream) = client.stream_events(filter, Duration::from_secs(2)).await {
+                while stream.next().await.is_some() {
+                    relay = true
+                }
+            }
+
+            relay
+        });
+
         let addr_check = if let Some(address) = profile.metadata().nip05 {
             Some(Tokio::spawn(cx, async move {
                 nip05_verify(public_key, &address).await.unwrap_or(false)
@@ -117,6 +136,19 @@ impl Screening {
             }),
         );
 
+        tasks.push(
+            // Run the relay check in the background
+            cx.spawn_in(window, async move |this, cx| {
+                let relay = relay_check.await;
+
+                this.update(cx, |this, cx| {
+                    this.dm_relays = Some(relay);
+                    cx.notify();
+                })
+                .ok();
+            }),
+        );
+
         tasks.push(
             // Run the NIP-05 verification in the background
             cx.spawn_in(window, async move |this, cx| {
@@ -136,6 +168,7 @@ impl Screening {
             profile,
             verified: false,
             followed: false,
+            dm_relays: None,
             last_active: None,
             mutual_contacts: vec![],
             _tasks: tasks,
@@ -268,7 +301,7 @@ impl Render for Screening {
                                     .label(t!("profile.njump"))
                                     .secondary()
                                     .small()
-                                    .rounded()
+                                    .rounded(ButtonRounded::Full)
                                     .on_click(cx.listener(move |this, _e, window, cx| {
                                         this.open_njump(window, cx);
                                     })),
@@ -278,7 +311,7 @@ impl Render for Screening {
                                     .tooltip(t!("screening.report"))
                                     .icon(IconName::Report)
                                     .danger()
-                                    .rounded()
+                                    .rounded(ButtonRounded::Full)
                                     .on_click(cx.listener(move |this, _e, window, cx| {
                                         this.report(window, cx);
                                     })),
@@ -330,7 +363,7 @@ impl Render for Screening {
                                                     .icon(IconName::Info)
                                                     .xsmall()
                                                     .ghost()
-                                                    .rounded()
+                                                    .rounded(ButtonRounded::Full)
                                                     .tooltip(t!("screening.active_tooltip")),
                                             ),
                                     )
@@ -402,7 +435,7 @@ impl Render for Screening {
                                                     .icon(IconName::Info)
                                                     .xsmall()
                                                     .ghost()
-                                                    .rounded()
+                                                    .rounded(ButtonRounded::Full)
                                                     .on_click(cx.listener(
                                                         move |this, _, window, cx| {
                                                             this.mutual_contacts(window, cx);
@@ -423,6 +456,37 @@ impl Render for Screening {
                                             }),
                                     ),
                             ),
+                    )
+                    .child(
+                        h_flex()
+                            .items_start()
+                            .gap_2()
+                            .child(status_badge(self.dm_relays, cx))
+                            .child(
+                                v_flex()
+                                    .w_full()
+                                    .text_sm()
+                                    .child({
+                                        if self.dm_relays == Some(true) {
+                                            shared_t!("screening.relay_found")
+                                        } else {
+                                            shared_t!("screening.relay_empty")
+                                        }
+                                    })
+                                    .child(
+                                        div()
+                                            .w_full()
+                                            .line_clamp(1)
+                                            .text_color(cx.theme().text_muted)
+                                            .child({
+                                                if self.dm_relays == Some(true) {
+                                                    shared_t!("screening.relay_found_desc")
+                                                } else {
+                                                    shared_t!("screening.relay_empty_desc")
+                                                }
+                                            }),
+                                    ),
+                            ),
                     ),
             )
     }

crates/coop/src/views/setup_relay.rs

@@ -14,7 +14,7 @@ use nostr_sdk::prelude::*;
 use registry::Registry;
 use smallvec::{smallvec, SmallVec};
 use theme::ActiveTheme;
-use ui::button::{Button, ButtonVariants};
+use ui::button::{Button, ButtonRounded, ButtonVariants};
 use ui::input::{InputEvent, InputState, TextInput};
 use ui::modal::ModalButtonProps;
 use ui::{h_flex, v_flex, ContextModal, IconName, Sizable, StyledExt};
@@ -33,7 +33,7 @@ where
             .label(label)
             .warning()
             .xsmall()
-            .rounded()
+            .rounded(ButtonRounded::Full)
             .on_click(move |_, window, cx| {
                 let view = cx.new(|cx| SetupRelay::new(Kind::InboxRelays, window, cx));
                 let weak_view = view.downgrade();

crates/coop/src/views/sidebar/mod.rs

@@ -9,9 +9,9 @@ use global::constants::{BOOTSTRAP_RELAYS, SEARCH_RELAYS};
 use global::{css, nostr_client, UnwrappingStatus};
 use gpui::prelude::FluentBuilder;
 use gpui::{
-    div, relative, uniform_list, AnyElement, App, AppContext, Context, Entity, EventEmitter,
+    div, uniform_list, AnyElement, App, AppContext, Context, Entity, EventEmitter, FocusHandle,
-    FocusHandle, Focusable, InteractiveElement, IntoElement, ParentElement, Render,
+    Focusable, InteractiveElement, IntoElement, ParentElement, Render, RetainAllImageCache,
-    RetainAllImageCache, SharedString, Styled, Subscription, Task, Window,
+    SharedString, Styled, Subscription, Task, Window,
 };
 use gpui_tokio::Tokio;
 use i18n::{shared_t, t};
@@ -23,7 +23,7 @@ use registry::{Registry, RegistryEvent};
 use settings::AppSettings;
 use smallvec::{smallvec, SmallVec};
 use theme::ActiveTheme;
-use ui::button::{Button, ButtonVariants};
+use ui::button::{Button, ButtonRounded, ButtonVariants};
 use ui::dock_area::panel::{Panel, PanelEvent};
 use ui::input::{InputEvent, InputState, TextInput};
 use ui::popup_menu::{PopupMenu, PopupMenuExt};
@@ -669,7 +669,6 @@ impl Focusable for Sidebar {
 impl Render for Sidebar {
     fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
         let registry = Registry::read_global(cx);
-        let loading = registry.unwrapping_status.read(cx) != &UnwrappingStatus::Complete;
 
         // Get rooms from either search results or the chat registry
         let rooms = if let Some(results) = self.local_result.read(cx).as_ref() {
@@ -689,7 +688,7 @@ impl Render for Sidebar {
         let mut total_rooms = rooms.len();
 
         // Add 3 dummy rooms to display as skeletons
-        if loading {
+        if registry.unwrapping_status.read(cx) != &UnwrappingStatus::Complete {
             total_rooms += 3
         }
 
@@ -753,7 +752,7 @@ impl Render for Sidebar {
                                     .cta()
                                     .bold()
                                     .secondary()
-                                    .rounded()
+                                    .rounded(ButtonRounded::Full)
                                     .selected(self.filter(&RoomKind::Ongoing, cx))
                                     .on_click(cx.listener(|this, _, _, cx| {
                                         this.set_filter(RoomKind::Ongoing, cx);
@@ -774,7 +773,7 @@ impl Render for Sidebar {
                                     .cta()
                                     .bold()
                                     .secondary()
-                                    .rounded()
+                                    .rounded(ButtonRounded::Full)
                                     .selected(!self.filter(&RoomKind::Ongoing, cx))
                                     .on_click(cx.listener(|this, _, _, cx| {
                                         this.set_filter(RoomKind::default(), cx);
@@ -792,7 +791,7 @@ impl Render for Sidebar {
                                             .icon(IconName::Ellipsis)
                                             .xsmall()
                                             .ghost()
-                                            .rounded()
+                                            .rounded(ButtonRounded::Full)
                                             .popup_menu(move |this, _window, _cx| {
                                                 this.menu(
                                                     t!("sidebar.reload_menu"),
@@ -806,57 +805,6 @@ impl Render for Sidebar {
                                     ),
                             ),
                     )
-                    .when(!loading && total_rooms == 0, |this| {
-                        this.map(|this| {
-                            if self.filter(&RoomKind::Ongoing, cx) {
-                                this.child(
-                                    v_flex()
-                                        .py_2()
-                                        .gap_1p5()
-                                        .items_center()
-                                        .justify_center()
-                                        .text_center()
-                                        .child(
-                                            div()
-                                                .text_sm()
-                                                .font_semibold()
-                                                .line_height(relative(1.25))
-                                                .child(shared_t!("sidebar.no_conversations")),
-                                        )
-                                        .child(
-                                            div()
-                                                .text_xs()
-                                                .text_color(cx.theme().text_muted)
-                                                .line_height(relative(1.25))
-                                                .child(shared_t!("sidebar.no_conversations_label")),
-                                        ),
-                                )
-                            } else {
-                                this.child(
-                                    v_flex()
-                                        .py_2()
-                                        .gap_1p5()
-                                        .items_center()
-                                        .justify_center()
-                                        .text_center()
-                                        .child(
-                                            div()
-                                                .text_sm()
-                                                .font_semibold()
-                                                .line_height(relative(1.25))
-                                                .child(shared_t!("sidebar.no_requests")),
-                                        )
-                                        .child(
-                                            div()
-                                                .text_xs()
-                                                .text_color(cx.theme().text_muted)
-                                                .line_height(relative(1.25))
-                                                .child(shared_t!("sidebar.no_requests_label")),
-                                        ),
-                                )
-                            }
-                        })
-                    })
                     .child(
                         uniform_list(
                             "rooms",

crates/coop/src/views/welcome.rs

@@ -1,13 +1,12 @@
 use gpui::{
     div, svg, AnyElement, App, AppContext, Context, Entity, EventEmitter, FocusHandle, Focusable,
-    InteractiveElement, IntoElement, ParentElement, Render, SharedString,
+    IntoElement, ParentElement, Render, SharedString, Styled, Window,
-    StatefulInteractiveElement, Styled, Window,
 };
 use theme::ActiveTheme;
 use ui::button::Button;
 use ui::dock_area::panel::{Panel, PanelEvent};
 use ui::popup_menu::PopupMenu;
-use ui::{v_flex, StyledExt};
+use ui::StyledExt;
 
 pub fn init(window: &mut Window, cx: &mut App) -> Entity<Welcome> {
     Welcome::new(window, cx)
@@ -15,7 +14,8 @@ pub fn init(window: &mut Window, cx: &mut App) -> Entity<Welcome> {
 
 pub struct Welcome {
     name: SharedString,
-    version: SharedString,
+    closable: bool,
+    zoomable: bool,
     focus_handle: FocusHandle,
 }
 
@@ -25,11 +25,10 @@ impl Welcome {
     }
 
     fn view(_window: &mut Window, cx: &mut Context<Self>) -> Self {
-        let version = SharedString::from(format!("Version: {}", env!("CARGO_PKG_VERSION")));
-
         Self {
-            version,
             name: "Welcome".into(),
+            closable: true,
+            zoomable: true,
             focus_handle: cx.focus_handle(),
         }
     }
@@ -40,15 +39,16 @@ impl Panel for Welcome {
         self.name.clone()
     }
 
-    fn title(&self, cx: &App) -> AnyElement {
+    fn title(&self, _cx: &App) -> AnyElement {
-        div()
+        "👋".into_any_element()
-            .child(
+    }
-                svg()
+
-                    .path("brand/coop.svg")
+    fn closable(&self, _cx: &App) -> bool {
-                    .size_4()
+        self.closable
-                    .text_color(cx.theme().element_background),
+    }
-            )
+
-            .into_any_element()
+    fn zoomable(&self, _cx: &App) -> bool {
+        self.zoomable
     }
 
     fn popup_menu(&self, menu: PopupMenu, _cx: &App) -> PopupMenu {
@@ -76,37 +76,23 @@ impl Render for Welcome {
             .items_center()
             .justify_center()
             .child(
-                v_flex()
+                div()
-                    .gap_2()
+                    .flex()
+                    .flex_col()
                     .items_center()
-                    .justify_center()
+                    .gap_1()
                     .child(
                         svg()
                             .path("brand/coop.svg")
                             .size_12()
                             .text_color(cx.theme().elevated_surface_background),
                     )
-                    .child(
-                        v_flex()
-                            .items_center()
-                            .justify_center()
-                            .text_center()
                     .child(
                         div()
-                                    .font_semibold()
+                            .child("coop on nostr")
-                                    .text_color(cx.theme().text_muted)
-                                    .child("coop on nostr"),
-                            )
-                            .child(
-                                div()
-                                    .id("version")
                             .text_color(cx.theme().text_placeholder)
-                                    .text_xs()
+                            .font_semibold()
-                                    .child(self.version.clone())
+                            .text_sm(),
-                                    .on_click(|_, _window, cx| {
-                                        cx.open_url("https://github.com/lumehq/coop/releases");
-                                    }),
-                            ),
                     ),
             )
     }

crates/global/src/lib.rs

@@ -57,7 +57,7 @@ pub enum UnwrappingStatus {
 
 /// Signals sent through the global event channel to notify UI
 #[derive(Debug)]
-pub enum SignalKind {
+pub enum Signal {
     /// A signal to notify UI that the client's signer has been set
     SignerSet(PublicKey),
 
@@ -71,54 +71,25 @@ pub enum SignalKind {
     ProxyDown,
 
     /// A signal to notify UI that a new profile has been received
-    NewProfile(Profile),
+    Metadata(Profile),
 
     /// A signal to notify UI that a new gift wrap event has been received
-    NewMessage((EventId, Event)),
+    Message((EventId, Event)),
 
-    /// A signal to notify UI that no DM relays for current user was found
+    /// A signal to notify UI that gift wrap process status has changed
-    RelaysNotFound,
+    GiftWrapProcess(UnwrappingStatus),
 
-    /// A signal to notify UI that gift wrap status has changed
+    /// A signal to notify UI that no DM relay for current user was found
-    GiftWrapStatus(UnwrappingStatus),
+    DmRelayNotFound,
 
     /// A signal to notify UI that there are errors or notices occurred
     Notice(Notice),
 }
 
-#[derive(Debug)]
-pub struct Signal {
-    rx: Receiver<SignalKind>,
-    tx: Sender<SignalKind>,
-}
-
-impl Default for Signal {
-    fn default() -> Self {
-        Self::new()
-    }
-}
-
-impl Signal {
-    pub fn new() -> Self {
-        let (tx, rx) = flume::bounded::<SignalKind>(2048);
-        Self { rx, tx }
-    }
-
-    pub fn receiver(&self) -> &Receiver<SignalKind> {
-        &self.rx
-    }
-
-    pub async fn send(&self, kind: SignalKind) {
-        if let Err(e) = self.tx.send_async(kind).await {
-            log::error!("Failed to send signal: {e}");
-        }
-    }
-}
-
 #[derive(Debug)]
 pub struct Ingester {
-    rx: Receiver<PublicKey>,
+    rx: Receiver<Signal>,
-    tx: Sender<PublicKey>,
+    tx: Sender<Signal>,
 }
 
 impl Default for Ingester {
@@ -129,47 +100,31 @@ impl Default for Ingester {
 
 impl Ingester {
     pub fn new() -> Self {
-        let (tx, rx) = flume::bounded::<PublicKey>(1024);
+        let (tx, rx) = flume::bounded::<Signal>(2048);
         Self { rx, tx }
     }
 
-    pub fn receiver(&self) -> &Receiver<PublicKey> {
+    pub fn signals(&self) -> &Receiver<Signal> {
         &self.rx
     }
 
-    pub async fn send(&self, public_key: PublicKey) {
+    pub async fn send(&self, signal: Signal) {
-        if let Err(e) = self.tx.send_async(public_key).await {
+        if let Err(e) = self.tx.send_async(signal).await {
-            log::error!("Failed to send public key: {e}");
+            log::error!("Failed to send signal: {e}");
         }
     }
 }
 
-/// A simple storage to store all states that using across the application.
+/// A simple storage to store all runtime states that using across the application.
 #[derive(Debug)]
 pub struct CoopSimpleStorage {
     pub init_at: Timestamp,
-
-    pub last_used_at: Option<Timestamp>,
-
-    pub is_first_run: AtomicBool,
-
     pub gift_wrap_sub_id: SubscriptionId,
-
     pub gift_wrap_processing: AtomicBool,
-
     pub auto_close_opts: Option<SubscribeAutoCloseOptions>,
-
-    pub seen_on_relays: RwLock<HashMap<EventId, HashSet<RelayUrl>>>,
-
     pub sent_ids: RwLock<HashSet<EventId>>,
-
     pub resent_ids: RwLock<Vec<Output<EventId>>>,
-
     pub resend_queue: RwLock<HashMap<EventId, RelayUrl>>,
-
-    pub signal: Signal,
-
-    pub ingester: Ingester,
 }
 
 impl Default for CoopSimpleStorage {
@@ -180,23 +135,13 @@ impl Default for CoopSimpleStorage {
 
 impl CoopSimpleStorage {
     pub fn new() -> Self {
-        let init_at = Timestamp::now();
-        let first_run = first_run();
-        let opts = SubscribeAutoCloseOptions::default().exit_policy(ReqExitPolicy::ExitOnEOSE);
-
-        let signal = Signal::default();
-        let ingester = Ingester::default();
-
         Self {
-            init_at,
+            init_at: Timestamp::now(),
-            signal,
-            ingester,
-            last_used_at: None,
-            is_first_run: AtomicBool::new(first_run),
             gift_wrap_sub_id: SubscriptionId::new("inbox"),
             gift_wrap_processing: AtomicBool::new(false),
-            auto_close_opts: Some(opts),
+            auto_close_opts: Some(
-            seen_on_relays: RwLock::new(HashMap::new()),
+                SubscribeAutoCloseOptions::default().exit_policy(ReqExitPolicy::ExitOnEOSE),
+            ),
             sent_ids: RwLock::new(HashSet::new()),
             resent_ids: RwLock::new(Vec::new()),
             resend_queue: RwLock::new(HashMap::new()),
@@ -205,7 +150,9 @@ impl CoopSimpleStorage {
 }
 
 static NOSTR_CLIENT: OnceLock<Client> = OnceLock::new();
+static INGESTER: OnceLock<Ingester> = OnceLock::new();
 static COOP_SIMPLE_STORAGE: OnceLock<CoopSimpleStorage> = OnceLock::new();
+static FIRST_RUN: OnceLock<bool> = OnceLock::new();
 
 pub fn nostr_client() -> &'static Client {
     NOSTR_CLIENT.get_or_init(|| {
@@ -230,11 +177,16 @@ pub fn nostr_client() -> &'static Client {
     })
 }
 
+pub fn ingester() -> &'static Ingester {
+    INGESTER.get_or_init(Ingester::new)
+}
+
 pub fn css() -> &'static CoopSimpleStorage {
     COOP_SIMPLE_STORAGE.get_or_init(CoopSimpleStorage::new)
 }
 
-fn first_run() -> bool {
+pub fn first_run() -> &'static bool {
+    FIRST_RUN.get_or_init(|| {
         let flag = support_dir().join(format!(".{}-first_run", env!("CARGO_PKG_VERSION")));
 
         if !flag.exists() {
@@ -245,4 +197,5 @@ fn first_run() -> bool {
         } else {
             false // Not first run
         }
+    })
 }

crates/registry/src/message.rs

@@ -5,7 +5,6 @@ use nostr_sdk::prelude::*;
 #[derive(Debug, Clone, Hash, PartialEq, Eq)]
 pub enum Message {
     User(RenderedMessage),
-    Warning(String, Timestamp),
     System(Timestamp),
 }
 
@@ -14,10 +13,6 @@ impl Message {
         Self::User(user.into())
     }
 
-    pub fn warning(content: String) -> Self {
-        Self::Warning(content, Timestamp::now())
-    }
-
     pub fn system() -> Self {
         Self::System(Timestamp::default())
     }
@@ -30,11 +25,6 @@ impl Ord for Message {
             (Message::System(a), Message::System(b)) => a.cmp(b),
             (Message::User(a), Message::System(b)) => a.created_at.cmp(b),
             (Message::System(a), Message::User(b)) => a.cmp(&b.created_at),
-            (Message::Warning(_, a), Message::Warning(_, b)) => a.cmp(b),
-            (Message::Warning(_, a), Message::User(b)) => a.cmp(&b.created_at),
-            (Message::User(a), Message::Warning(_, b)) => a.created_at.cmp(b),
-            (Message::Warning(_, a), Message::System(b)) => a.cmp(b),
-            (Message::System(a), Message::Warning(_, b)) => a.cmp(b),
         }
     }
 }

crates/registry/src/room.rs

@@ -331,44 +331,15 @@ impl Room {
         }
     }
 
-    /// Connects to all members' messaging relays
-    pub fn connect_relays(
-        &self,
-        cx: &App,
-    ) -> Task<Result<HashMap<PublicKey, Vec<RelayUrl>>, Error>> {
-        let members = self.members.clone();
-
-        cx.background_spawn(async move {
-            let client = nostr_client();
-            let timeout = Duration::from_secs(3);
-            let mut processed = HashSet::new();
-            let mut relays: HashMap<PublicKey, Vec<RelayUrl>> = HashMap::new();
-
-            if let Some((_, members)) = members.split_last() {
-                for member in members.iter() {
-                    relays.insert(member.to_owned(), vec![]);
-
-                    let filter = Filter::new()
-                        .kind(Kind::InboxRelays)
-                        .author(member.to_owned())
-                        .limit(1);
-
-                    if let Ok(mut stream) = client.stream_events(filter, timeout).await {
-                        if let Some(event) = stream.next().await {
-                            if processed.insert(event.id) {
-                                let urls = nip17::extract_owned_relay_list(event).collect_vec();
-                                relays.entry(member.to_owned()).or_default().extend(urls);
-                            }
-                        }
-                    }
-                }
-            };
-
-            Ok(relays)
-        })
-    }
-
     /// Loads all messages for this room from the database
+    ///
+    /// # Arguments
+    ///
+    /// * `cx` - The App context
+    ///
+    /// # Returns
+    ///
+    /// A Task that resolves to Result<Vec<Event>, Error> containing all messages for this room
     pub fn load_messages(&self, cx: &App) -> Task<Result<Vec<Event>, Error>> {
         let members = self.members.clone();
 
@@ -394,6 +365,16 @@ impl Room {
         })
     }
 
+    /// Emits a new message signal to the current room
+    pub fn emit_message(&self, gift_wrap_id: EventId, event: Event, cx: &mut Context<Self>) {
+        cx.emit(RoomSignal::NewMessage((gift_wrap_id, Box::new(event))));
+    }
+
+    /// Emits a signal to refresh the current room's messages.
+    pub fn emit_refresh(&mut self, cx: &mut Context<Self>) {
+        cx.emit(RoomSignal::Refresh);
+    }
+
     /// Creates a temporary message for optimistic updates
     ///
     /// The event must not been published to relays.
@@ -612,14 +593,4 @@ impl Room {
             Ok(resend_reports)
         })
     }
-
-    /// Emits a new message signal to the current room
-    pub fn emit_message(&self, gift_wrap_id: EventId, event: Event, cx: &mut Context<Self>) {
-        cx.emit(RoomSignal::NewMessage((gift_wrap_id, Box::new(event))));
-    }
-
-    /// Emits a signal to refresh the current room's messages.
-    pub fn emit_refresh(&mut self, cx: &mut Context<Self>) {
-        cx.emit(RoomSignal::Refresh);
-    }
 }

crates/title_bar/src/platforms/mac.rs

@@ -3,4 +3,4 @@
 ///
 /// Magic number: There is one extra pixel of padding on the left side due to
 /// the 1px border around the window on macOS apps.
-pub const TRAFFIC_LIGHT_PADDING: f32 = 80.;
+pub const TRAFFIC_LIGHT_PADDING: f32 = 71.;

crates/ui/src/button.rs

@@ -10,6 +10,11 @@ use crate::indicator::Indicator;
 use crate::tooltip::Tooltip;
 use crate::{h_flex, Disableable, Icon, Selectable, Sizable, Size, StyledExt};
 
+pub enum ButtonRounded {
+    Normal,
+    Full,
+}
+
 #[derive(Clone, Copy, PartialEq, Eq)]
 pub struct ButtonCustomVariant {
     color: Hsla,
@@ -125,7 +130,7 @@ pub struct Button {
     children: Vec<AnyElement>,
 
     variant: ButtonVariant,
-    rounded: bool,
+    rounded: ButtonRounded,
     size: Size,
 
     disabled: bool,
@@ -158,7 +163,7 @@ impl Button {
             disabled: false,
             selected: false,
             variant: ButtonVariant::default(),
-            rounded: false,
+            rounded: ButtonRounded::Normal,
             size: Size::Medium,
             tooltip: None,
             on_click: None,
@@ -172,9 +177,9 @@ impl Button {
         }
     }
 
-    /// Make the button rounded.
+    /// Set the border radius of the Button.
-    pub fn rounded(mut self) -> Self {
+    pub fn rounded(mut self, rounded: impl Into<ButtonRounded>) -> Self {
-        self.rounded = true;
+        self.rounded = rounded.into();
         self
     }
 
@@ -310,8 +315,8 @@ impl RenderOnce for Button {
             .cursor_default()
             .overflow_hidden()
             .map(|this| match self.rounded {
-                false => this.rounded(cx.theme().radius),
+                ButtonRounded::Normal => this.rounded(cx.theme().radius),
-                true => this.rounded_full(),
+                ButtonRounded::Full => this.rounded_full(),
             })
             .map(|this| {
                 if self.label.is_none() && self.children.is_empty() {

crates/ui/src/dock_area/tab_panel.rs

@@ -412,15 +412,16 @@ impl TabPanel {
         let is_zoomed = self.is_zoomed && state.zoomable;
         let view = cx.entity().clone();
         let build_popup_menu = move |this, cx: &App| view.read(cx).popup_menu(this, cx);
-        let toolbar = self.toolbar_buttons(window, cx);
-        let has_toolbar = !toolbar.is_empty();
 
         h_flex()
-            .p_0p5()
             .gap_1()
             .occlude()
-            .rounded_full()
+            .items_center()
-            .children(toolbar.into_iter().map(|btn| btn.small().ghost().rounded()))
+            .children(
+                self.toolbar_buttons(window, cx)
+                    .into_iter()
+                    .map(|btn| btn.small().ghost()),
+            )
             .when(self.is_zoomed, |this| {
                 this.child(
                     Button::new("zoom")
@@ -433,16 +434,11 @@ impl TabPanel {
                         })),
                 )
             })
-            .when(has_toolbar, |this| {
-                this.bg(cx.theme().surface_background)
-                    .child(div().flex_shrink_0().h_4().w_px().bg(cx.theme().border))
-            })
             .child(
                 Button::new("menu")
                     .icon(IconName::Ellipsis)
                     .small()
                     .ghost()
-                    .rounded()
                     .popup_menu({
                         let zoomable = state.zoomable;
                         let closable = state.closable;
@@ -651,7 +647,7 @@ impl TabPanel {
             .child(
                 div()
                     .size_full()
-                    .rounded_xl()
+                    .rounded_lg()
                     .shadow_sm()
                     .when(cx.theme().mode.is_dark(), |this| this.shadow_lg())
                     .bg(cx.theme().panel_background)
@@ -671,7 +667,7 @@ impl TabPanel {
                             .p_1()
                             .child(
                                 div()
-                                    .rounded_xl()
+                                    .rounded_lg()
                                     .border_1()
                                     .border_color(cx.theme().element_disabled)
                                     .bg(cx.theme().drop_target_background)

crates/ui/src/icon.rs

@@ -52,7 +52,6 @@ pub enum IconName {
     Signal,
     Search,
     Settings,
-    Server,
     SortAscending,
     SortDescending,
     Sun,
@@ -113,7 +112,6 @@ impl IconName {
             Self::Signal => "icons/signal.svg",
             Self::Search => "icons/search.svg",
             Self::Settings => "icons/settings.svg",
-            Self::Server => "icons/server.svg",
             Self::SortAscending => "icons/sort-ascending.svg",
             Self::SortDescending => "icons/sort-descending.svg",
             Self::Sun => "icons/sun.svg",

crates/ui/src/resizable/panel.rs

@@ -405,14 +405,13 @@ impl Render for ResizablePanel {
             return div();
         }
 
+        let view = cx.entity().clone();
         let total_size = self
             .group
             .as_ref()
             .and_then(|group| group.upgrade())
             .map(|group| group.read(cx).total_size());
 
-        let view = cx.entity();
-
         div()
             .flex()
             .flex_grow()

locales/app.yml

@@ -51,8 +51,6 @@ common:
     en: "Recommended:"
   resend:
     en: "Resend"
-  seen_on:
-    en: "Seen on"
 
 auto_update:
   updating:
@@ -401,14 +399,6 @@ sidebar:
     en: "Incoming new conversations"
   trusted_contacts_tooltip:
     en: "Only show rooms from trusted contacts"
-  no_requests:
-    en: "No message requests"
-  no_requests_label:
-    en: "New message requests from people you don't know will appear here."
-  no_conversations:
-    en: "No conversations"
-  no_conversations_label:
-    en: "Start a conversation with someone to get started."
 
 loading:
   label: