feat: rewrite the nip-4e implementation (#1)

Make NIP-4e a core feature, not an optional feature.

Note:
- The UI is broken and needs to be updated in a separate PR.

Reviewed-on: #1

Cargo.toml

@@ -4,17 +4,11 @@ members = ["crates/*"]
 default-members = ["crates/coop"]
 
 [workspace.package]
-version = "0.2.10"
+version = "0.3.0"
 edition = "2021"
 publish = false
 
-[workspace.metadata.i18n]
-available-locales = ["en"]
-default-locale = "en"
-load-path = "locales"
-
 [workspace.dependencies]
-i18n = { path = "crates/i18n" }
 
 # GPUI
 gpui = { git = "https://github.com/zed-industries/zed" }
@@ -22,21 +16,13 @@ gpui_tokio = { git = "https://github.com/zed-industries/zed" }
 reqwest_client = { git = "https://github.com/zed-industries/zed" }
 
 # Nostr
-nostr = { git = "https://github.com/rust-nostr/nostr" }
+nostr-lmdb = { git = "https://github.com/rust-nostr/nostr" }
 nostr-connect = { git = "https://github.com/rust-nostr/nostr" }
-nostr-sdk = { git = "https://github.com/rust-nostr/nostr", features = [
-    "lmdb",
-    "nip96",
-    "nip59",
-    "nip49",
-    "nip44",
-] }
+nostr-sdk = { git = "https://github.com/rust-nostr/nostr", features = [ "nip96", "nip59", "nip49", "nip44" ] }
 
 # Others
 anyhow = "1.0.44"
 chrono = "0.4.38"
-dirs = "5.0"
-emojis = "0.6.4"
 futures = "0.3"
 itertools = "0.13.0"
 log = "0.4"
@@ -44,9 +30,9 @@ oneshot = "0.1.10"
 reqwest = { version = "0.12", features = ["multipart", "stream", "json"] }
 flume = { version = "0.11.1", default-features = false, features = ["async", "select"] }
 rust-embed = "8.5.0"
-rust-i18n = "3"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
+schemars = "1"
 smallvec = "1.14.0"
 smol = "2"
 tracing = "0.1.40"

assets/icons/encryption.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="none" viewBox="0 0 24 24">
+  <path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="M12 8.75a1.5 1.5 0 1 0 0 3 1.5 1.5 0 0 0 0-3Zm0 0v6m8.25-2.838v-4.97a2 2 0 0 0-1.367-1.898l-6.25-2.083a2 2 0 0 0-1.265 0l-6.25 2.083A2 2 0 0 0 3.75 6.942v4.97c0 4.973 4.25 7.338 8.25 9.496 4-2.158 8.25-4.523 8.25-9.496Z"/>
+</svg>

assets/themes/catppuccin-frappe.json

@@ -0,0 +1,136 @@
+{
+  "id": "catppuccin-frappe",
+  "name": "Catppuccin Frappé",
+  "author": "Catppuccin",
+  "url": "https://github.com/catppuccin/catppuccin",
+  "light": {
+    "background": "#303446",
+    "surface_background": "#292c3c",
+    "elevated_surface_background": "#232634",
+    "panel_background": "#303446",
+    "overlay": "#c6d0f51a",
+    "title_bar": "#00000000",
+    "title_bar_inactive": "#303446",
+    "window_border": "#626880",
+    "border": "#626880",
+    "border_variant": "#51576d",
+    "border_focused": "#8caaee",
+    "border_selected": "#8caaee",
+    "border_transparent": "#00000000",
+    "border_disabled": "#414559",
+    "ring": "#8caaee",
+    "text": "#c6d0f5",
+    "text_muted": "#b5bfe2",
+    "text_placeholder": "#a5adce",
+    "text_accent": "#8caaee",
+    "icon": "#c6d0f5",
+    "icon_muted": "#b5bfe2",
+    "icon_accent": "#8caaee",
+    "element_foreground": "#303446",
+    "element_background": "#8caaee",
+    "element_hover": "#8caaeee6",
+    "element_active": "#7e99d6",
+    "element_selected": "#7088be",
+    "element_disabled": "#8caaee4d",
+    "secondary_foreground": "#8caaee",
+    "secondary_background": "#414559",
+    "secondary_hover": "#8caaee1a",
+    "secondary_active": "#51576d",
+    "secondary_selected": "#51576d",
+    "secondary_disabled": "#8caaee4d",
+    "danger_foreground": "#303446",
+    "danger_background": "#e78284",
+    "danger_hover": "#e78284e6",
+    "danger_active": "#d07576",
+    "danger_selected": "#b96869",
+    "danger_disabled": "#e782844d",
+    "warning_foreground": "#303446",
+    "warning_background": "#e5c890",
+    "warning_hover": "#e5c890e6",
+    "warning_active": "#ceb481",
+    "warning_selected": "#b7a072",
+    "warning_disabled": "#e5c8904d",
+    "ghost_element_background": "#00000000",
+    "ghost_element_background_alt": "#414559",
+    "ghost_element_hover": "#c6d0f51a",
+    "ghost_element_active": "#51576d",
+    "ghost_element_selected": "#51576d",
+    "ghost_element_disabled": "#c6d0f50d",
+    "tab_inactive_background": "#414559",
+    "tab_hover_background": "#51576d",
+    "tab_active_background": "#626880",
+    "scrollbar_thumb_background": "#c6d0f533",
+    "scrollbar_thumb_hover_background": "#c6d0f54d",
+    "scrollbar_thumb_border": "#00000000",
+    "scrollbar_track_background": "#00000000",
+    "scrollbar_track_border": "#51576d",
+    "drop_target_background": "#8caaee1a",
+    "cursor": "#99d1db",
+    "selection": "#99d1db40"
+  },
+  "dark": {
+    "background": "#303446",
+    "surface_background": "#292c3c",
+    "elevated_surface_background": "#232634",
+    "panel_background": "#303446",
+    "overlay": "#c6d0f51a",
+    "title_bar": "#00000000",
+    "title_bar_inactive": "#303446",
+    "window_border": "#626880",
+    "border": "#626880",
+    "border_variant": "#51576d",
+    "border_focused": "#8caaee",
+    "border_selected": "#8caaee",
+    "border_transparent": "#00000000",
+    "border_disabled": "#414559",
+    "ring": "#8caaee",
+    "text": "#c6d0f5",
+    "text_muted": "#b5bfe2",
+    "text_placeholder": "#a5adce",
+    "text_accent": "#8caaee",
+    "icon": "#c6d0f5",
+    "icon_muted": "#b5bfe2",
+    "icon_accent": "#8caaee",
+    "element_foreground": "#303446",
+    "element_background": "#8caaee",
+    "element_hover": "#8caaeee6",
+    "element_active": "#7e99d6",
+    "element_selected": "#7088be",
+    "element_disabled": "#8caaee4d",
+    "secondary_foreground": "#8caaee",
+    "secondary_background": "#414559",
+    "secondary_hover": "#8caaee1a",
+    "secondary_active": "#51576d",
+    "secondary_selected": "#51576d",
+    "secondary_disabled": "#8caaee4d",
+    "danger_foreground": "#303446",
+    "danger_background": "#e78284",
+    "danger_hover": "#e78284e6",
+    "danger_active": "#d07576",
+    "danger_selected": "#b96869",
+    "danger_disabled": "#e782844d",
+    "warning_foreground": "#303446",
+    "warning_background": "#e5c890",
+    "warning_hover": "#e5c890e6",
+    "warning_active": "#ceb481",
+    "warning_selected": "#b7a072",
+    "warning_disabled": "#e5c8904d",
+    "ghost_element_background": "#00000000",
+    "ghost_element_background_alt": "#414559",
+    "ghost_element_hover": "#c6d0f51a",
+    "ghost_element_active": "#51576d",
+    "ghost_element_selected": "#51576d",
+    "ghost_element_disabled": "#c6d0f50d",
+    "tab_inactive_background": "#414559",
+    "tab_hover_background": "#51576d",
+    "tab_active_background": "#626880",
+    "scrollbar_thumb_background": "#c6d0f533",
+    "scrollbar_thumb_hover_background": "#c6d0f54d",
+    "scrollbar_thumb_border": "#00000000",
+    "scrollbar_track_background": "#00000000",
+    "scrollbar_track_border": "#51576d",
+    "drop_target_background": "#8caaee1a",
+    "cursor": "#99d1db",
+    "selection": "#99d1db40"
+  }
+}

assets/themes/catppuccin-latte.json

@@ -0,0 +1,136 @@
+{
+  "id": "catppuccin-latte",
+  "name": "Catppuccin Latte",
+  "author": "Catppuccin",
+  "url": "https://github.com/catppuccin/catppuccin",
+  "light": {
+    "background": "#eff1f5",
+    "surface_background": "#e6e9ef",
+    "elevated_surface_background": "#dce0e8",
+    "panel_background": "#eff1f5",
+    "overlay": "#4c4f691a",
+    "title_bar": "#00000000",
+    "title_bar_inactive": "#eff1f5",
+    "window_border": "#acb0be",
+    "border": "#acb0be",
+    "border_variant": "#bcc0cc",
+    "border_focused": "#1e66f5",
+    "border_selected": "#1e66f5",
+    "border_transparent": "#00000000",
+    "border_disabled": "#ccd0da",
+    "ring": "#1e66f5",
+    "text": "#4c4f69",
+    "text_muted": "#5c5f77",
+    "text_placeholder": "#6c6f85",
+    "text_accent": "#1e66f5",
+    "icon": "#4c4f69",
+    "icon_muted": "#5c5f77",
+    "icon_accent": "#1e66f5",
+    "element_foreground": "#eff1f5",
+    "element_background": "#1e66f5",
+    "element_hover": "#1e66f5e6",
+    "element_active": "#1b5cdc",
+    "element_selected": "#1852c3",
+    "element_disabled": "#1e66f54d",
+    "secondary_foreground": "#1e66f5",
+    "secondary_background": "#e6e9ef",
+    "secondary_hover": "#1e66f51a",
+    "secondary_active": "#dce0e8",
+    "secondary_selected": "#dce0e8",
+    "secondary_disabled": "#1e66f54d",
+    "danger_foreground": "#eff1f5",
+    "danger_background": "#d20f39",
+    "danger_hover": "#d20f39e6",
+    "danger_active": "#bc0e33",
+    "danger_selected": "#a60c2d",
+    "danger_disabled": "#d20f394d",
+    "warning_foreground": "#4c4f69",
+    "warning_background": "#df8e1d",
+    "warning_hover": "#df8e1de6",
+    "warning_active": "#c9801a",
+    "warning_selected": "#b47217",
+    "warning_disabled": "#df8e1d4d",
+    "ghost_element_background": "#00000000",
+    "ghost_element_background_alt": "#e6e9ef",
+    "ghost_element_hover": "#4c4f691a",
+    "ghost_element_active": "#dce0e8",
+    "ghost_element_selected": "#dce0e8",
+    "ghost_element_disabled": "#4c4f690d",
+    "tab_inactive_background": "#e6e9ef",
+    "tab_hover_background": "#dce0e8",
+    "tab_active_background": "#ccd0da",
+    "scrollbar_thumb_background": "#4c4f6933",
+    "scrollbar_thumb_hover_background": "#4c4f694d",
+    "scrollbar_thumb_border": "#00000000",
+    "scrollbar_track_background": "#00000000",
+    "scrollbar_track_border": "#dce0e8",
+    "drop_target_background": "#1e66f51a",
+    "cursor": "#04a5e5",
+    "selection": "#04a5e540"
+  },
+  "dark": {
+    "background": "#eff1f5",
+    "surface_background": "#e6e9ef",
+    "elevated_surface_background": "#dce0e8",
+    "panel_background": "#eff1f5",
+    "overlay": "#4c4f691a",
+    "title_bar": "#00000000",
+    "title_bar_inactive": "#eff1f5",
+    "window_border": "#acb0be",
+    "border": "#acb0be",
+    "border_variant": "#bcc0cc",
+    "border_focused": "#1e66f5",
+    "border_selected": "#1e66f5",
+    "border_transparent": "#00000000",
+    "border_disabled": "#ccd0da",
+    "ring": "#1e66f5",
+    "text": "#4c4f69",
+    "text_muted": "#5c5f77",
+    "text_placeholder": "#6c6f85",
+    "text_accent": "#1e66f5",
+    "icon": "#4c4f69",
+    "icon_muted": "#5c5f77",
+    "icon_accent": "#1e66f5",
+    "element_foreground": "#eff1f5",
+    "element_background": "#1e66f5",
+    "element_hover": "#1e66f5e6",
+    "element_active": "#1b5cdc",
+    "element_selected": "#1852c3",
+    "element_disabled": "#1e66f54d",
+    "secondary_foreground": "#1e66f5",
+    "secondary_background": "#e6e9ef",
+    "secondary_hover": "#1e66f51a",
+    "secondary_active": "#dce0e8",
+    "secondary_selected": "#dce0e8",
+    "secondary_disabled": "#1e66f54d",
+    "danger_foreground": "#eff1f5",
+    "danger_background": "#d20f39",
+    "danger_hover": "#d20f39e6",
+    "danger_active": "#bc0e33",
+    "danger_selected": "#a60c2d",
+    "danger_disabled": "#d20f394d",
+    "warning_foreground": "#4c4f69",
+    "warning_background": "#df8e1d",
+    "warning_hover": "#df8e1de6",
+    "warning_active": "#c9801a",
+    "warning_selected": "#b47217",
+    "warning_disabled": "#df8e1d4d",
+    "ghost_element_background": "#00000000",
+    "ghost_element_background_alt": "#e6e9ef",
+    "ghost_element_hover": "#4c4f691a",
+    "ghost_element_active": "#dce0e8",
+    "ghost_element_selected": "#dce0e8",
+    "ghost_element_disabled": "#4c4f690d",
+    "tab_inactive_background": "#e6e9ef",
+    "tab_hover_background": "#dce0e8",
+    "tab_active_background": "#ccd0da",
+    "scrollbar_thumb_background": "#4c4f6933",
+    "scrollbar_thumb_hover_background": "#4c4f694d",
+    "scrollbar_thumb_border": "#00000000",
+    "scrollbar_track_background": "#00000000",
+    "scrollbar_track_border": "#dce0e8",
+    "drop_target_background": "#1e66f51a",
+    "cursor": "#04a5e5",
+    "selection": "#04a5e540"
+  }
+}

assets/themes/catppuccin-macchiato.json

@@ -0,0 +1,136 @@
+{
+  "id": "catppuccin-macchiato",
+  "name": "Catppuccin Macchiato",
+  "author": "Catppuccin",
+  "url": "https://github.com/catppuccin/catppuccin",
+  "light": {
+    "background": "#24273a",
+    "surface_background": "#1e2030",
+    "elevated_surface_background": "#181926",
+    "panel_background": "#24273a",
+    "overlay": "#cad3f51a",
+    "title_bar": "#00000000",
+    "title_bar_inactive": "#24273a",
+    "window_border": "#5b6078",
+    "border": "#5b6078",
+    "border_variant": "#494d64",
+    "border_focused": "#8aadf4",
+    "border_selected": "#8aadf4",
+    "border_transparent": "#00000000",
+    "border_disabled": "#363a4f",
+    "ring": "#8aadf4",
+    "text": "#cad3f5",
+    "text_muted": "#b8c0e0",
+    "text_placeholder": "#a5adcb",
+    "text_accent": "#8aadf4",
+    "icon": "#cad3f5",
+    "icon_muted": "#b8c0e0",
+    "icon_accent": "#8aadf4",
+    "element_foreground": "#24273a",
+    "element_background": "#8aadf4",
+    "element_hover": "#8aadf4e6",
+    "element_active": "#7c9cdc",
+    "element_selected": "#6e8bc4",
+    "element_disabled": "#8aadf44d",
+    "secondary_foreground": "#8aadf4",
+    "secondary_background": "#363a4f",
+    "secondary_hover": "#8aadf41a",
+    "secondary_active": "#494d64",
+    "secondary_selected": "#494d64",
+    "secondary_disabled": "#8aadf44d",
+    "danger_foreground": "#24273a",
+    "danger_background": "#ed8796",
+    "danger_hover": "#ed8796e6",
+    "danger_active": "#d57a87",
+    "danger_selected": "#bd6d78",
+    "danger_disabled": "#ed87964d",
+    "warning_foreground": "#24273a",
+    "warning_background": "#eed49f",
+    "warning_hover": "#eed49fe6",
+    "warning_active": "#d6bf8f",
+    "warning_selected": "#beaa7f",
+    "warning_disabled": "#eed49f4d",
+    "ghost_element_background": "#00000000",
+    "ghost_element_background_alt": "#363a4f",
+    "ghost_element_hover": "#cad3f51a",
+    "ghost_element_active": "#494d64",
+    "ghost_element_selected": "#494d64",
+    "ghost_element_disabled": "#cad3f50d",
+    "tab_inactive_background": "#363a4f",
+    "tab_hover_background": "#494d64",
+    "tab_active_background": "#5b6078",
+    "scrollbar_thumb_background": "#cad3f533",
+    "scrollbar_thumb_hover_background": "#cad3f54d",
+    "scrollbar_thumb_border": "#00000000",
+    "scrollbar_track_background": "#00000000",
+    "scrollbar_track_border": "#494d64",
+    "drop_target_background": "#8aadf41a",
+    "cursor": "#91d7e3",
+    "selection": "#91d7e340"
+  },
+  "dark": {
+    "background": "#24273a",
+    "surface_background": "#1e2030",
+    "elevated_surface_background": "#181926",
+    "panel_background": "#24273a",
+    "overlay": "#cad3f51a",
+    "title_bar": "#00000000",
+    "title_bar_inactive": "#24273a",
+    "window_border": "#5b6078",
+    "border": "#5b6078",
+    "border_variant": "#494d64",
+    "border_focused": "#8aadf4",
+    "border_selected": "#8aadf4",
+    "border_transparent": "#00000000",
+    "border_disabled": "#363a4f",
+    "ring": "#8aadf4",
+    "text": "#cad3f5",
+    "text_muted": "#b8c0e0",
+    "text_placeholder": "#a5adcb",
+    "text_accent": "#8aadf4",
+    "icon": "#cad3f5",
+    "icon_muted": "#b8c0e0",
+    "icon_accent": "#8aadf4",
+    "element_foreground": "#24273a",
+    "element_background": "#8aadf4",
+    "element_hover": "#8aadf4e6",
+    "element_active": "#7c9cdc",
+    "element_selected": "#6e8bc4",
+    "element_disabled": "#8aadf44d",
+    "secondary_foreground": "#8aadf4",
+    "secondary_background": "#363a4f",
+    "secondary_hover": "#8aadf41a",
+    "secondary_active": "#494d64",
+    "secondary_selected": "#494d64",
+    "secondary_disabled": "#8aadf44d",
+    "danger_foreground": "#24273a",
+    "danger_background": "#ed8796",
+    "danger_hover": "#ed8796e6",
+    "danger_active": "#d57a87",
+    "danger_selected": "#bd6d78",
+    "danger_disabled": "#ed87964d",
+    "warning_foreground": "#24273a",
+    "warning_background": "#eed49f",
+    "warning_hover": "#eed49fe6",
+    "warning_active": "#d6bf8f",
+    "warning_selected": "#beaa7f",
+    "warning_disabled": "#eed49f4d",
+    "ghost_element_background": "#00000000",
+    "ghost_element_background_alt": "#363a4f",
+    "ghost_element_hover": "#cad3f51a",
+    "ghost_element_active": "#494d64",
+    "ghost_element_selected": "#494d64",
+    "ghost_element_disabled": "#cad3f50d",
+    "tab_inactive_background": "#363a4f",
+    "tab_hover_background": "#494d64",
+    "tab_active_background": "#5b6078",
+    "scrollbar_thumb_background": "#cad3f533",
+    "scrollbar_thumb_hover_background": "#cad3f54d",
+    "scrollbar_thumb_border": "#00000000",
+    "scrollbar_track_background": "#00000000",
+    "scrollbar_track_border": "#494d64",
+    "drop_target_background": "#8aadf41a",
+    "cursor": "#91d7e3",
+    "selection": "#91d7e340"
+  }
+}

assets/themes/catppuccin-mocha.json

@@ -0,0 +1,136 @@
+{
+  "id": "catppuccin-mocha",
+  "name": "Catppuccin Mocha",
+  "author": "Catppuccin",
+  "url": "https://github.com/catppuccin/catppuccin",
+  "light": {
+    "background": "#1e1e2e",
+    "surface_background": "#181825",
+    "elevated_surface_background": "#11111b",
+    "panel_background": "#1e1e2e",
+    "overlay": "#cdd6f41a",
+    "title_bar": "#00000000",
+    "title_bar_inactive": "#1e1e2e",
+    "window_border": "#585b70",
+    "border": "#585b70",
+    "border_variant": "#45475a",
+    "border_focused": "#89b4fa",
+    "border_selected": "#89b4fa",
+    "border_transparent": "#00000000",
+    "border_disabled": "#313244",
+    "ring": "#89b4fa",
+    "text": "#cdd6f4",
+    "text_muted": "#bac2de",
+    "text_placeholder": "#a6adc8",
+    "text_accent": "#89b4fa",
+    "icon": "#cdd6f4",
+    "icon_muted": "#bac2de",
+    "icon_accent": "#89b4fa",
+    "element_foreground": "#1e1e2e",
+    "element_background": "#89b4fa",
+    "element_hover": "#89b4fae6",
+    "element_active": "#7ba2e1",
+    "element_selected": "#6d90c8",
+    "element_disabled": "#89b4fa4d",
+    "secondary_foreground": "#89b4fa",
+    "secondary_background": "#313244",
+    "secondary_hover": "#89b4fa1a",
+    "secondary_active": "#45475a",
+    "secondary_selected": "#45475a",
+    "secondary_disabled": "#89b4fa4d",
+    "danger_foreground": "#1e1e2e",
+    "danger_background": "#f38ba8",
+    "danger_hover": "#f38ba8e6",
+    "danger_active": "#db7d97",
+    "danger_selected": "#c36f86",
+    "danger_disabled": "#f38ba84d",
+    "warning_foreground": "#1e1e2e",
+    "warning_background": "#f9e2af",
+    "warning_hover": "#f9e2afe6",
+    "warning_active": "#e0cb9e",
+    "warning_selected": "#c7b48d",
+    "warning_disabled": "#f9e2af4d",
+    "ghost_element_background": "#00000000",
+    "ghost_element_background_alt": "#313244",
+    "ghost_element_hover": "#cdd6f41a",
+    "ghost_element_active": "#45475a",
+    "ghost_element_selected": "#45475a",
+    "ghost_element_disabled": "#cdd6f50d",
+    "tab_inactive_background": "#313244",
+    "tab_hover_background": "#45475a",
+    "tab_active_background": "#585b70",
+    "scrollbar_thumb_background": "#cdd6f533",
+    "scrollbar_thumb_hover_background": "#cdd6f54d",
+    "scrollbar_thumb_border": "#00000000",
+    "scrollbar_track_background": "#00000000",
+    "scrollbar_track_border": "#45475a",
+    "drop_target_background": "#89b4fa1a",
+    "cursor": "#89dceb",
+    "selection": "#89dceb40"
+  },
+  "dark": {
+    "background": "#1e1e2e",
+    "surface_background": "#181825",
+    "elevated_surface_background": "#11111b",
+    "panel_background": "#1e1e2e",
+    "overlay": "#cdd6f41a",
+    "title_bar": "#00000000",
+    "title_bar_inactive": "#1e1e2e",
+    "window_border": "#585b70",
+    "border": "#585b70",
+    "border_variant": "#45475a",
+    "border_focused": "#89b4fa",
+    "border_selected": "#89b4fa",
+    "border_transparent": "#00000000",
+    "border_disabled": "#313244",
+    "ring": "#89b4fa",
+    "text": "#cdd6f4",
+    "text_muted": "#bac2de",
+    "text_placeholder": "#a6adc8",
+    "text_accent": "#89b4fa",
+    "icon": "#cdd6f4",
+    "icon_muted": "#bac2de",
+    "icon_accent": "#89b4fa",
+    "element_foreground": "#1e1e2e",
+    "element_background": "#89b4fa",
+    "element_hover": "#89b4fae6",
+    "element_active": "#7ba2e1",
+    "element_selected": "#6d90c8",
+    "element_disabled": "#89b4fa4d",
+    "secondary_foreground": "#89b4fa",
+    "secondary_background": "#313244",
+    "secondary_hover": "#89b4fa1a",
+    "secondary_active": "#45475a",
+    "secondary_selected": "#45475a",
+    "secondary_disabled": "#89b4fa4d",
+    "danger_foreground": "#1e1e2e",
+    "danger_background": "#f38ba8",
+    "danger_hover": "#f38ba8e6",
+    "danger_active": "#db7d97",
+    "danger_selected": "#c36f86",
+    "danger_disabled": "#f38ba84d",
+    "warning_foreground": "#1e1e2e",
+    "warning_background": "#f9e2af",
+    "warning_hover": "#f9e2afe6",
+    "warning_active": "#e0cb9e",
+    "warning_selected": "#c7b48d",
+    "warning_disabled": "#f9e2af4d",
+    "ghost_element_background": "#00000000",
+    "ghost_element_background_alt": "#313244",
+    "ghost_element_hover": "#cdd6f41a",
+    "ghost_element_active": "#45475a",
+    "ghost_element_selected": "#45475a",
+    "ghost_element_disabled": "#cdd6f50d",
+    "tab_inactive_background": "#313244",
+    "tab_hover_background": "#45475a",
+    "tab_active_background": "#585b70",
+    "scrollbar_thumb_background": "#cdd6f533",
+    "scrollbar_thumb_hover_background": "#cdd6f54d",
+    "scrollbar_thumb_border": "#00000000",
+    "scrollbar_track_background": "#00000000",
+    "scrollbar_track_border": "#45475a",
+    "drop_target_background": "#89b4fa1a",
+    "cursor": "#89dceb",
+    "selection": "#89dceb40"
+  }
+}

assets/themes/flexoki.json

@@ -0,0 +1,136 @@
+{
+  "id": "flexoki",
+  "name": "Flexoki",
+  "author": "Steph Ango",
+  "url": "https://stephango.com/flexoki",
+  "light": {
+    "background": "#FFFCF0",
+    "surface_background": "#F2F0E5",
+    "elevated_surface_background": "#E6E4D9",
+    "panel_background": "#FFFCF0",
+    "overlay": "#100F0F1a",
+    "title_bar": "#00000000",
+    "title_bar_inactive": "#FFFCF0",
+    "window_border": "#CECDC3",
+    "border": "#CECDC3",
+    "border_variant": "#DAD8CE",
+    "border_focused": "#24837B",
+    "border_selected": "#24837B",
+    "border_transparent": "#00000000",
+    "border_disabled": "#E6E4D9",
+    "ring": "#24837B",
+    "text": "#100F0F",
+    "text_muted": "#6F6E69",
+    "text_placeholder": "#878580",
+    "text_accent": "#24837B",
+    "icon": "#100F0F",
+    "icon_muted": "#6F6E69",
+    "icon_accent": "#24837B",
+    "element_foreground": "#DDF1E4",
+    "element_background": "#24837B",
+    "element_hover": "#24837Be5",
+    "element_active": "#20756E",
+    "element_selected": "#1C6861",
+    "element_disabled": "#24837B4c",
+    "secondary_foreground": "#24837B",
+    "secondary_background": "#E6E4D9",
+    "secondary_hover": "#24837B1a",
+    "secondary_active": "#DAD8CE",
+    "secondary_selected": "#DAD8CE",
+    "secondary_disabled": "#24837B4c",
+    "danger_foreground": "#FFE1D5",
+    "danger_background": "#AF3029",
+    "danger_hover": "#AF3029e5",
+    "danger_active": "#9E2B25",
+    "danger_selected": "#8D2620",
+    "danger_disabled": "#AF30294c",
+    "warning_foreground": "#FFE7CE",
+    "warning_background": "#BC5215",
+    "warning_hover": "#BC5215e5",
+    "warning_active": "#A94913",
+    "warning_selected": "#964011",
+    "warning_disabled": "#BC52154c",
+    "ghost_element_background": "#00000000",
+    "ghost_element_background_alt": "#E6E4D9",
+    "ghost_element_hover": "#100F0F1a",
+    "ghost_element_active": "#DAD8CE",
+    "ghost_element_selected": "#DAD8CE",
+    "ghost_element_disabled": "#100F0F0d",
+    "tab_inactive_background": "#E6E4D9",
+    "tab_hover_background": "#DAD8CE",
+    "tab_active_background": "#CECDC3",
+    "scrollbar_thumb_background": "#100F0F33",
+    "scrollbar_thumb_hover_background": "#100F0F4d",
+    "scrollbar_thumb_border": "#00000000",
+    "scrollbar_track_background": "#00000000",
+    "scrollbar_track_border": "#DAD8CE",
+    "drop_target_background": "#24837B1a",
+    "cursor": "#205EA6",
+    "selection": "#24837B40"
+  },
+  "dark": {
+    "background": "#100F0F",
+    "surface_background": "#1C1B1A",
+    "elevated_surface_background": "#282726",
+    "panel_background": "#100F0F",
+    "overlay": "#FFFCF01a",
+    "title_bar": "#00000000",
+    "title_bar_inactive": "#100F0F",
+    "window_border": "#403E3C",
+    "border": "#403E3C",
+    "border_variant": "#343331",
+    "border_focused": "#3AA99F",
+    "border_selected": "#3AA99F",
+    "border_transparent": "#00000000",
+    "border_disabled": "#282726",
+    "ring": "#3AA99F",
+    "text": "#FFFCF0",
+    "text_muted": "#878580",
+    "text_placeholder": "#575653",
+    "text_accent": "#3AA99F",
+    "icon": "#FFFCF0",
+    "icon_muted": "#878580",
+    "icon_accent": "#3AA99F",
+    "element_foreground": "#101F1D",
+    "element_background": "#3AA99F",
+    "element_hover": "#3AA99Fe5",
+    "element_active": "#34988F",
+    "element_selected": "#2F877F",
+    "element_disabled": "#3AA99F4c",
+    "secondary_foreground": "#3AA99F",
+    "secondary_background": "#282726",
+    "secondary_hover": "#3AA99F1a",
+    "secondary_active": "#343331",
+    "secondary_selected": "#343331",
+    "secondary_disabled": "#3AA99F4c",
+    "danger_foreground": "#261312",
+    "danger_background": "#D14D41",
+    "danger_hover": "#D14D41e5",
+    "danger_active": "#BC453A",
+    "danger_selected": "#A73D33",
+    "danger_disabled": "#D14D414c",
+    "warning_foreground": "#27180E",
+    "warning_background": "#DA702C",
+    "warning_hover": "#DA702Ce5",
+    "warning_active": "#C46527",
+    "warning_selected": "#AF5A22",
+    "warning_disabled": "#DA702C4c",
+    "ghost_element_background": "#00000000",
+    "ghost_element_background_alt": "#282726",
+    "ghost_element_hover": "#FFFCF01a",
+    "ghost_element_active": "#343331",
+    "ghost_element_selected": "#343331",
+    "ghost_element_disabled": "#FFFCF00d",
+    "tab_inactive_background": "#282726",
+    "tab_hover_background": "#343331",
+    "tab_active_background": "#403E3C",
+    "scrollbar_thumb_background": "#FFFCF033",
+    "scrollbar_thumb_hover_background": "#FFFCF04d",
+    "scrollbar_thumb_border": "#00000000",
+    "scrollbar_track_background": "#00000000",
+    "scrollbar_track_border": "#343331",
+    "drop_target_background": "#3AA99F1a",
+    "cursor": "#4385BE",
+    "selection": "#3AA99F40"
+  }
+}

assets/themes/rose-pine-dawn.json

@@ -0,0 +1,136 @@
+{
+  "id": "rose-pine-dawn",
+  "name": "Rosé Pine Dawn",
+  "author": "Rosé Pine",
+  "url": "https://rosepinetheme.com/",
+  "light": {
+    "background": "#faf4ed",
+    "surface_background": "#fffaf3",
+    "elevated_surface_background": "#f2e9e1",
+    "panel_background": "#fffaf3",
+    "overlay": "#5752791a",
+    "title_bar": "#00000000",
+    "title_bar_inactive": "#faf4ed",
+    "window_border": "#cecacd",
+    "border": "#cecacd",
+    "border_variant": "#dfdad9",
+    "border_focused": "#286983",
+    "border_selected": "#286983",
+    "border_transparent": "#00000000",
+    "border_disabled": "#f4ede8",
+    "ring": "#286983",
+    "text": "#575279",
+    "text_muted": "#797593",
+    "text_placeholder": "#9893a5",
+    "text_accent": "#907aa9",
+    "icon": "#575279",
+    "icon_muted": "#797593",
+    "icon_accent": "#907aa9",
+    "element_foreground": "#faf4ed",
+    "element_background": "#286983",
+    "element_hover": "#286983e6",
+    "element_active": "#245f76",
+    "element_selected": "#205569",
+    "element_disabled": "#2869834d",
+    "secondary_foreground": "#286983",
+    "secondary_background": "#f4ede8",
+    "secondary_hover": "#2869831a",
+    "secondary_active": "#dfdad9",
+    "secondary_selected": "#dfdad9",
+    "secondary_disabled": "#2869834d",
+    "danger_foreground": "#faf4ed",
+    "danger_background": "#b4637a",
+    "danger_hover": "#b4637ae6",
+    "danger_active": "#a2596e",
+    "danger_selected": "#904f62",
+    "danger_disabled": "#b4637a4d",
+    "warning_foreground": "#faf4ed",
+    "warning_background": "#ea9d34",
+    "warning_hover": "#ea9d34e6",
+    "warning_active": "#d38d2f",
+    "warning_selected": "#bc7d2a",
+    "warning_disabled": "#ea9d344d",
+    "ghost_element_background": "#00000000",
+    "ghost_element_background_alt": "#f4ede8",
+    "ghost_element_hover": "#5752791a",
+    "ghost_element_active": "#dfdad9",
+    "ghost_element_selected": "#dfdad9",
+    "ghost_element_disabled": "#5752790d",
+    "tab_inactive_background": "#f4ede8",
+    "tab_hover_background": "#dfdad9",
+    "tab_active_background": "#cecacd",
+    "scrollbar_thumb_background": "#57527933",
+    "scrollbar_thumb_hover_background": "#5752794d",
+    "scrollbar_thumb_border": "#00000000",
+    "scrollbar_track_background": "#00000000",
+    "scrollbar_track_border": "#dfdad9",
+    "drop_target_background": "#2869831a",
+    "cursor": "#56949f",
+    "selection": "#56949f40"
+  },
+  "dark": {
+    "background": "#faf4ed",
+    "surface_background": "#fffaf3",
+    "elevated_surface_background": "#f2e9e1",
+    "panel_background": "#fffaf3",
+    "overlay": "#5752791a",
+    "title_bar": "#00000000",
+    "title_bar_inactive": "#faf4ed",
+    "window_border": "#cecacd",
+    "border": "#cecacd",
+    "border_variant": "#dfdad9",
+    "border_focused": "#286983",
+    "border_selected": "#286983",
+    "border_transparent": "#00000000",
+    "border_disabled": "#f4ede8",
+    "ring": "#286983",
+    "text": "#575279",
+    "text_muted": "#797593",
+    "text_placeholder": "#9893a5",
+    "text_accent": "#907aa9",
+    "icon": "#575279",
+    "icon_muted": "#797593",
+    "icon_accent": "#907aa9",
+    "element_foreground": "#faf4ed",
+    "element_background": "#286983",
+    "element_hover": "#286983e6",
+    "element_active": "#245f76",
+    "element_selected": "#205569",
+    "element_disabled": "#2869834d",
+    "secondary_foreground": "#286983",
+    "secondary_background": "#f4ede8",
+    "secondary_hover": "#2869831a",
+    "secondary_active": "#dfdad9",
+    "secondary_selected": "#dfdad9",
+    "secondary_disabled": "#2869834d",
+    "danger_foreground": "#faf4ed",
+    "danger_background": "#b4637a",
+    "danger_hover": "#b4637ae6",
+    "danger_active": "#a2596e",
+    "danger_selected": "#904f62",
+    "danger_disabled": "#b4637a4d",
+    "warning_foreground": "#faf4ed",
+    "warning_background": "#ea9d34",
+    "warning_hover": "#ea9d34e6",
+    "warning_active": "#d38d2f",
+    "warning_selected": "#bc7d2a",
+    "warning_disabled": "#ea9d344d",
+    "ghost_element_background": "#00000000",
+    "ghost_element_background_alt": "#f4ede8",
+    "ghost_element_hover": "#5752791a",
+    "ghost_element_active": "#dfdad9",
+    "ghost_element_selected": "#dfdad9",
+    "ghost_element_disabled": "#5752790d",
+    "tab_inactive_background": "#f4ede8",
+    "tab_hover_background": "#dfdad9",
+    "tab_active_background": "#cecacd",
+    "scrollbar_thumb_background": "#57527933",
+    "scrollbar_thumb_hover_background": "#5752794d",
+    "scrollbar_thumb_border": "#00000000",
+    "scrollbar_track_background": "#00000000",
+    "scrollbar_track_border": "#dfdad9",
+    "drop_target_background": "#2869831a",
+    "cursor": "#56949f",
+    "selection": "#56949f40"
+  }
+}

assets/themes/rose-pine-moon.json

@@ -0,0 +1,136 @@
+{
+  "id": "rose-pine-moon",
+  "name": "Rosé Pine Moon",
+  "author": "Rosé Pine",
+  "url": "https://rosepinetheme.com/",
+  "light": {
+    "background": "#232136",
+    "surface_background": "#2a273f",
+    "elevated_surface_background": "#393552",
+    "panel_background": "#2a273f",
+    "overlay": "#e0def41a",
+    "title_bar": "#00000000",
+    "title_bar_inactive": "#232136",
+    "window_border": "#56526e",
+    "border": "#56526e",
+    "border_variant": "#44415a",
+    "border_focused": "#3e8fb0",
+    "border_selected": "#3e8fb0",
+    "border_transparent": "#00000000",
+    "border_disabled": "#2a283e",
+    "ring": "#3e8fb0",
+    "text": "#e0def4",
+    "text_muted": "#908caa",
+    "text_placeholder": "#6e6a86",
+    "text_accent": "#c4a7e7",
+    "icon": "#e0def4",
+    "icon_muted": "#908caa",
+    "icon_accent": "#c4a7e7",
+    "element_foreground": "#232136",
+    "element_background": "#3e8fb0",
+    "element_hover": "#3e8fb0e6",
+    "element_active": "#38809d",
+    "element_selected": "#32718a",
+    "element_disabled": "#3e8fb04d",
+    "secondary_foreground": "#3e8fb0",
+    "secondary_background": "#2a283e",
+    "secondary_hover": "#3e8fb01a",
+    "secondary_active": "#44415a",
+    "secondary_selected": "#44415a",
+    "secondary_disabled": "#3e8fb04d",
+    "danger_foreground": "#232136",
+    "danger_background": "#eb6f92",
+    "danger_hover": "#eb6f92e6",
+    "danger_active": "#d46483",
+    "danger_selected": "#bd5974",
+    "danger_disabled": "#eb6f924d",
+    "warning_foreground": "#232136",
+    "warning_background": "#f6c177",
+    "warning_hover": "#f6c177e6",
+    "warning_active": "#ddae6b",
+    "warning_selected": "#c49b5f",
+    "warning_disabled": "#f6c1774d",
+    "ghost_element_background": "#00000000",
+    "ghost_element_background_alt": "#2a283e",
+    "ghost_element_hover": "#e0def41a",
+    "ghost_element_active": "#44415a",
+    "ghost_element_selected": "#44415a",
+    "ghost_element_disabled": "#e0def40d",
+    "tab_inactive_background": "#2a283e",
+    "tab_hover_background": "#44415a",
+    "tab_active_background": "#56526e",
+    "scrollbar_thumb_background": "#e0def433",
+    "scrollbar_thumb_hover_background": "#e0def44d",
+    "scrollbar_thumb_border": "#00000000",
+    "scrollbar_track_background": "#00000000",
+    "scrollbar_track_border": "#44415a",
+    "drop_target_background": "#3e8fb01a",
+    "cursor": "#9ccfd8",
+    "selection": "#9ccfd840"
+  },
+  "dark": {
+    "background": "#232136",
+    "surface_background": "#2a273f",
+    "elevated_surface_background": "#393552",
+    "panel_background": "#2a273f",
+    "overlay": "#e0def41a",
+    "title_bar": "#00000000",
+    "title_bar_inactive": "#232136",
+    "window_border": "#56526e",
+    "border": "#56526e",
+    "border_variant": "#44415a",
+    "border_focused": "#3e8fb0",
+    "border_selected": "#3e8fb0",
+    "border_transparent": "#00000000",
+    "border_disabled": "#2a283e",
+    "ring": "#3e8fb0",
+    "text": "#e0def4",
+    "text_muted": "#908caa",
+    "text_placeholder": "#6e6a86",
+    "text_accent": "#c4a7e7",
+    "icon": "#e0def4",
+    "icon_muted": "#908caa",
+    "icon_accent": "#c4a7e7",
+    "element_foreground": "#232136",
+    "element_background": "#3e8fb0",
+    "element_hover": "#3e8fb0e6",
+    "element_active": "#38809d",
+    "element_selected": "#32718a",
+    "element_disabled": "#3e8fb04d",
+    "secondary_foreground": "#3e8fb0",
+    "secondary_background": "#2a283e",
+    "secondary_hover": "#3e8fb01a",
+    "secondary_active": "#44415a",
+    "secondary_selected": "#44415a",
+    "secondary_disabled": "#3e8fb04d",
+    "danger_foreground": "#232136",
+    "danger_background": "#eb6f92",
+    "danger_hover": "#eb6f92e6",
+    "danger_active": "#d46483",
+    "danger_selected": "#bd5974",
+    "danger_disabled": "#eb6f924d",
+    "warning_foreground": "#232136",
+    "warning_background": "#f6c177",
+    "warning_hover": "#f6c177e6",
+    "warning_active": "#ddae6b",
+    "warning_selected": "#c49b5f",
+    "warning_disabled": "#f6c1774d",
+    "ghost_element_background": "#00000000",
+    "ghost_element_background_alt": "#2a283e",
+    "ghost_element_hover": "#e0def41a",
+    "ghost_element_active": "#44415a",
+    "ghost_element_selected": "#44415a",
+    "ghost_element_disabled": "#e0def40d",
+    "tab_inactive_background": "#2a283e",
+    "tab_hover_background": "#44415a",
+    "tab_active_background": "#56526e",
+    "scrollbar_thumb_background": "#e0def433",
+    "scrollbar_thumb_hover_background": "#e0def44d",
+    "scrollbar_thumb_border": "#00000000",
+    "scrollbar_track_background": "#00000000",
+    "scrollbar_track_border": "#44415a",
+    "drop_target_background": "#3e8fb01a",
+    "cursor": "#9ccfd8",
+    "selection": "#9ccfd840"
+  }
+}

assets/themes/rose-pine.json

@@ -0,0 +1,136 @@
+{
+  "id": "rose-pine",
+  "name": "Rosé Pine",
+  "author": "Rosé Pine",
+  "url": "https://rosepinetheme.com/",
+  "light": {
+    "background": "#191724",
+    "surface_background": "#1f1d2e",
+    "elevated_surface_background": "#26233a",
+    "panel_background": "#1f1d2e",
+    "overlay": "#e0def41a",
+    "title_bar": "#00000000",
+    "title_bar_inactive": "#191724",
+    "window_border": "#524f67",
+    "border": "#524f67",
+    "border_variant": "#403d52",
+    "border_focused": "#31748f",
+    "border_selected": "#31748f",
+    "border_transparent": "#00000000",
+    "border_disabled": "#21202e",
+    "ring": "#31748f",
+    "text": "#e0def4",
+    "text_muted": "#908caa",
+    "text_placeholder": "#6e6a86",
+    "text_accent": "#c4a7e7",
+    "icon": "#e0def4",
+    "icon_muted": "#908caa",
+    "icon_accent": "#c4a7e7",
+    "element_foreground": "#191724",
+    "element_background": "#31748f",
+    "element_hover": "#31748fe6",
+    "element_active": "#2c6980",
+    "element_selected": "#275e71",
+    "element_disabled": "#31748f4d",
+    "secondary_foreground": "#31748f",
+    "secondary_background": "#21202e",
+    "secondary_hover": "#31748f1a",
+    "secondary_active": "#403d52",
+    "secondary_selected": "#403d52",
+    "secondary_disabled": "#31748f4d",
+    "danger_foreground": "#191724",
+    "danger_background": "#eb6f92",
+    "danger_hover": "#eb6f92e6",
+    "danger_active": "#d46483",
+    "danger_selected": "#bd5974",
+    "danger_disabled": "#eb6f924d",
+    "warning_foreground": "#191724",
+    "warning_background": "#f6c177",
+    "warning_hover": "#f6c177e6",
+    "warning_active": "#ddae6b",
+    "warning_selected": "#c49b5f",
+    "warning_disabled": "#f6c1774d",
+    "ghost_element_background": "#00000000",
+    "ghost_element_background_alt": "#21202e",
+    "ghost_element_hover": "#e0def41a",
+    "ghost_element_active": "#403d52",
+    "ghost_element_selected": "#403d52",
+    "ghost_element_disabled": "#e0def40d",
+    "tab_inactive_background": "#21202e",
+    "tab_hover_background": "#403d52",
+    "tab_active_background": "#524f67",
+    "scrollbar_thumb_background": "#e0def433",
+    "scrollbar_thumb_hover_background": "#e0def44d",
+    "scrollbar_thumb_border": "#00000000",
+    "scrollbar_track_background": "#00000000",
+    "scrollbar_track_border": "#403d52",
+    "drop_target_background": "#31748f1a",
+    "cursor": "#9ccfd8",
+    "selection": "#9ccfd840"
+  },
+  "dark": {
+    "background": "#191724",
+    "surface_background": "#1f1d2e",
+    "elevated_surface_background": "#26233a",
+    "panel_background": "#1f1d2e",
+    "overlay": "#e0def41a",
+    "title_bar": "#00000000",
+    "title_bar_inactive": "#191724",
+    "window_border": "#524f67",
+    "border": "#524f67",
+    "border_variant": "#403d52",
+    "border_focused": "#31748f",
+    "border_selected": "#31748f",
+    "border_transparent": "#00000000",
+    "border_disabled": "#21202e",
+    "ring": "#31748f",
+    "text": "#e0def4",
+    "text_muted": "#908caa",
+    "text_placeholder": "#6e6a86",
+    "text_accent": "#c4a7e7",
+    "icon": "#e0def4",
+    "icon_muted": "#908caa",
+    "icon_accent": "#c4a7e7",
+    "element_foreground": "#191724",
+    "element_background": "#31748f",
+    "element_hover": "#31748fe6",
+    "element_active": "#2c6980",
+    "element_selected": "#275e71",
+    "element_disabled": "#31748f4d",
+    "secondary_foreground": "#31748f",
+    "secondary_background": "#21202e",
+    "secondary_hover": "#31748f1a",
+    "secondary_active": "#403d52",
+    "secondary_selected": "#403d52",
+    "secondary_disabled": "#31748f4d",
+    "danger_foreground": "#191724",
+    "danger_background": "#eb6f92",
+    "danger_hover": "#eb6f92e6",
+    "danger_active": "#d46483",
+    "danger_selected": "#bd5974",
+    "danger_disabled": "#eb6f924d",
+    "warning_foreground": "#191724",
+    "warning_background": "#f6c177",
+    "warning_hover": "#f6c177e6",
+    "warning_active": "#ddae6b",
+    "warning_selected": "#c49b5f",
+    "warning_disabled": "#f6c1774d",
+    "ghost_element_background": "#00000000",
+    "ghost_element_background_alt": "#21202e",
+    "ghost_element_hover": "#e0def41a",
+    "ghost_element_active": "#403d52",
+    "ghost_element_selected": "#403d52",
+    "ghost_element_disabled": "#e0def40d",
+    "tab_inactive_background": "#21202e",
+    "tab_hover_background": "#403d52",
+    "tab_active_background": "#524f67",
+    "scrollbar_thumb_background": "#e0def433",
+    "scrollbar_thumb_hover_background": "#e0def44d",
+    "scrollbar_thumb_border": "#00000000",
+    "scrollbar_track_background": "#00000000",
+    "scrollbar_track_border": "#403d52",
+    "drop_target_background": "#31748f1a",
+    "cursor": "#9ccfd8",
+    "selection": "#9ccfd840"
+  }
+}

crates/assets/src/lib.rs

@@ -5,8 +5,9 @@ use rust_embed::RustEmbed;
 #[derive(RustEmbed)]
 #[folder = "../../assets"]
 #[include = "fonts/**/*"]
-#[include = "brand/*"]
+#[include = "brand/**/*"]
 #[include = "icons/**/*"]
+#[include = "themes/**/*"]
 #[exclude = "*.DS_Store"]
 pub struct Assets;
 
@@ -47,13 +48,4 @@ impl Assets {
 
         cx.text_system().add_fonts(embedded_fonts)
     }
-
-    pub fn load_test_fonts(&self, cx: &App) {
-        cx.text_system()
-            .add_fonts(vec![self
-                .load("fonts/plex-mono/ZedPlexMono-Regular.ttf")
-                .unwrap()
-                .unwrap()])
-            .unwrap()
-    }
 }

crates/auto_update/Cargo.toml

@@ -6,13 +6,16 @@ publish.workspace = true
 
 [dependencies]
 common = { path = "../common" }
-global = { path = "../global" }
+state = { path = "../state" }
 
 gpui.workspace = true
+gpui_tokio.workspace = true
+reqwest.workspace = true
 nostr-sdk.workspace = true
 anyhow.workspace = true
 smol.workspace = true
 log.workspace = true
 smallvec.workspace = true
 
-cargo-packager-updater = "0.2.3"
+semver = "1.0.27"
+tempfile = "3.23.0"

crates/auto_update/src/lib.rs

@@ -1,10 +1,22 @@
-use anyhow::Error;
-use cargo_packager_updater::semver::Version;
-use cargo_packager_updater::{check_update, Config, Update};
-use global::constants::{APP_PUBKEY, APP_UPDATER_ENDPOINT};
-use gpui::http_client::Url;
-use gpui::{App, AppContext, Context, Entity, Global, Subscription, Task, Window};
+use std::ffi::OsString;
+use std::path::{Path, PathBuf};
+use std::sync::Arc;
+use std::time::Duration;
+
+use anyhow::{anyhow, Context as AnyhowContext, Error};
+use common::BOOTSTRAP_RELAYS;
+use gpui::http_client::{AsyncBody, HttpClient};
+use gpui::{
+    App, AppContext, AsyncApp, BackgroundExecutor, Context, Entity, Global, Subscription, Task,
+};
+use nostr_sdk::prelude::*;
+use semver::Version;
 use smallvec::{smallvec, SmallVec};
+use smol::fs::File;
+use smol::process::Command;
+use state::NostrRegistry;
+
+const APP_PUBKEY: &str = "npub1y9jvl5vznq49eh9f2gj7679v4042kj80lp7p8fte3ql2cr7hty7qsyca8q";
 
 pub fn init(cx: &mut App) {
     AutoUpdater::set_global(cx.new(AutoUpdater::new), cx);
@@ -14,16 +26,101 @@ struct GlobalAutoUpdater(Entity<AutoUpdater>);
 
 impl Global for GlobalAutoUpdater {}
 
-#[derive(Debug, Clone)]
+#[cfg(not(target_os = "windows"))]
+struct InstallerDir(tempfile::TempDir);
+
+#[cfg(not(target_os = "windows"))]
+impl InstallerDir {
+    async fn new() -> Result<Self, Error> {
+        Ok(Self(
+            tempfile::Builder::new()
+                .prefix("coop-auto-update")
+                .tempdir()?,
+        ))
+    }
+
+    fn path(&self) -> &Path {
+        self.0.path()
+    }
+}
+
+#[cfg(target_os = "windows")]
+struct InstallerDir(PathBuf);
+
+#[cfg(target_os = "windows")]
+impl InstallerDir {
+    async fn new() -> Result<Self, Error> {
+        let installer_dir = std::env::current_exe()?
+            .parent()
+            .context("No parent dir for Coop.exe")?
+            .join("updates");
+
+        if smol::fs::metadata(&installer_dir).await.is_ok() {
+            smol::fs::remove_dir_all(&installer_dir).await?;
+        }
+
+        smol::fs::create_dir(&installer_dir).await?;
+
+        Ok(Self(installer_dir))
+    }
+
+    fn path(&self) -> &Path {
+        self.0.as_path()
+    }
+}
+
+struct MacOsUnmounter<'a> {
+    mount_path: PathBuf,
+    background_executor: &'a BackgroundExecutor,
+}
+
+impl Drop for MacOsUnmounter<'_> {
+    fn drop(&mut self) {
+        let mount_path = std::mem::take(&mut self.mount_path);
+
+        self.background_executor
+            .spawn(async move {
+                let unmount_output = Command::new("hdiutil")
+                    .args(["detach", "-force"])
+                    .arg(&mount_path)
+                    .output()
+                    .await;
+
+                match unmount_output {
+                    Ok(output) if output.status.success() => {
+                        log::info!("Successfully unmounted the disk image");
+                    }
+                    Ok(output) => {
+                        log::error!(
+                            "Failed to unmount disk image: {:?}",
+                            String::from_utf8_lossy(&output.stderr)
+                        );
+                    }
+                    Err(error) => {
+                        log::error!("Error while trying to unmount disk image: {:?}", error);
+                    }
+                }
+            })
+            .detach();
+    }
+}
+
+#[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord)]
 pub enum AutoUpdateStatus {
     Idle,
     Checking,
-    Checked { update: Box<Update> },
+    Checked { files: Vec<EventId> },
     Installing,
     Updated,
     Errored { msg: Box<String> },
 }
 
+impl AsRef<AutoUpdateStatus> for AutoUpdateStatus {
+    fn as_ref(&self) -> &AutoUpdateStatus {
+        self
+    }
+}
+
 impl AutoUpdateStatus {
     pub fn is_updating(&self) -> bool {
         matches!(self, Self::Checked { .. } | Self::Installing)
@@ -33,10 +130,8 @@ impl AutoUpdateStatus {
         matches!(self, Self::Updated)
     }
 
-    pub fn checked(update: Update) -> Self {
-        Self::Checked {
-            update: Box::new(update),
-        }
+    pub fn checked(files: Vec<EventId>) -> Self {
+        Self::Checked { files }
     }
 
     pub fn error(e: String) -> Self {
@@ -44,109 +139,89 @@ impl AutoUpdateStatus {
     }
 }
 
+#[derive(Debug)]
 pub struct AutoUpdater {
+    /// Current status of the auto updater
     pub status: AutoUpdateStatus,
-    config: Config,
-    version: Version,
-    #[allow(dead_code)]
-    subscriptions: SmallVec<[Subscription; 1]>,
+
+    /// Current version of the application
+    pub version: Version,
+
+    /// Event subscriptions
+    _subscriptions: SmallVec<[Subscription; 1]>,
+
+    /// Background tasks
+    _tasks: SmallVec<[Task<()>; 2]>,
 }
 
 impl AutoUpdater {
-    /// Retrieve the Global Auto Updater instance
+    /// Retrieve the global auto updater instance
     pub fn global(cx: &App) -> Entity<Self> {
         cx.global::<GlobalAutoUpdater>().0.clone()
     }
 
-    /// Retrieve the Auto Updater instance
-    pub fn read_global(cx: &App) -> &Self {
-        cx.global::<GlobalAutoUpdater>().0.read(cx)
-    }
-
-    /// Set the Global Auto Updater instance
-    pub(crate) fn set_global(state: Entity<Self>, cx: &mut App) {
+    /// Set the global auto updater instance
+    fn set_global(state: Entity<Self>, cx: &mut App) {
         cx.set_global(GlobalAutoUpdater(state));
     }
 
-    pub(crate) fn new(cx: &mut Context<Self>) -> Self {
-        let config = cargo_packager_updater::Config {
-            endpoints: vec![Url::parse(APP_UPDATER_ENDPOINT).expect("Endpoint is not valid")],
-            pubkey: String::from(APP_PUBKEY),
-            ..Default::default()
-        };
-        let version = Version::parse(env!("CARGO_PKG_VERSION")).expect("Failed to parse version");
-        let mut subscriptions = smallvec![];
+    fn new(cx: &mut Context<Self>) -> Self {
+        let version = Version::parse(env!("CARGO_PKG_VERSION")).unwrap();
+        let async_version = version.clone();
 
-        subscriptions.push(cx.observe_new::<Self>(|this, window, cx| {
-            if let Some(window) = window {
-                this.check_for_updates(window, cx);
-            }
-        }));
+        let mut subscriptions = smallvec![];
+        let mut tasks = smallvec![];
+
+        tasks.push(
+            // Subscribe to get the new update event in the bootstrap relays
+            Self::subscribe_to_updates(cx),
+        );
+
+        tasks.push(
+            // Subscribe to get the new update event in the bootstrap relays
+            cx.spawn(async move |this, cx| {
+                // Check for updates after 2 minutes
+                cx.background_executor()
+                    .timer(Duration::from_secs(120))
+                    .await;
+
+                // Update the status to checking
+                _ = this.update(cx, |this, cx| {
+                    this.set_status(AutoUpdateStatus::Checking, cx);
+                });
+
+                match Self::check_for_updates(async_version, cx).await {
+                    Ok(ids) => {
+                        // Update the status to downloading
+                        _ = this.update(cx, |this, cx| {
+                            this.set_status(AutoUpdateStatus::checked(ids), cx);
+                        });
+                    }
+                    Err(e) => {
+                        _ = this.update(cx, |this, cx| {
+                            this.set_status(AutoUpdateStatus::Idle, cx);
+                        });
+
+                        log::warn!("{e}");
+                    }
+                }
+            }),
+        );
+
+        subscriptions.push(
+            // Observe the status
+            cx.observe_self(|this, cx| {
+                if let AutoUpdateStatus::Checked { files } = this.status.clone() {
+                    this.get_latest_release(&files, cx);
+                }
+            }),
+        );
 
         Self {
             status: AutoUpdateStatus::Idle,
             version,
-            config,
-            subscriptions,
-        }
-    }
-
-    pub fn check_for_updates(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        let config = self.config.clone();
-        let current_version = self.version.clone();
-
-        log::info!("Checking for updates...");
-        self.set_status(AutoUpdateStatus::Checking, cx);
-
-        let checking: Task<Result<Option<Update>, Error>> = cx.background_spawn(async move {
-            if let Some(update) = check_update(current_version, config)? {
-                Ok(Some(update))
-            } else {
-                Ok(None)
-            }
-        });
-
-        cx.spawn_in(window, async move |this, cx| {
-            if let Ok(Some(update)) = checking.await {
-                this.update_in(cx, |this, window, cx| {
-                    this.set_status(AutoUpdateStatus::checked(update), cx);
-                    this.install_update(window, cx);
-                })
-                .ok();
-            } else {
-                this.update(cx, |this, cx| {
-                    this.set_status(AutoUpdateStatus::Idle, cx);
-                })
-                .ok();
-            }
-        })
-        .detach();
-    }
-
-    pub(crate) fn install_update(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        self.set_status(AutoUpdateStatus::Installing, cx);
-
-        if let AutoUpdateStatus::Checked { update } = self.status.clone() {
-            let install: Task<Result<(), Error>> =
-                cx.background_spawn(async move { Ok(update.download_and_install()?) });
-
-            cx.spawn_in(window, async move |this, cx| {
-                match install.await {
-                    Ok(_) => {
-                        this.update(cx, |this, cx| {
-                            this.set_status(AutoUpdateStatus::Updated, cx);
-                        })
-                        .ok();
-                    }
-                    Err(e) => {
-                        this.update(cx, |this, cx| {
-                            this.set_status(AutoUpdateStatus::error(e.to_string()), cx);
-                        })
-                        .ok();
-                    }
-                };
-            })
-            .detach();
+            _subscriptions: subscriptions,
+            _tasks: tasks,
         }
     }
 
@@ -154,4 +229,266 @@ impl AutoUpdater {
         self.status = status;
         cx.notify();
     }
+
+    fn subscribe_to_updates(cx: &App) -> Task<()> {
+        let nostr = NostrRegistry::global(cx);
+        let client = nostr.read(cx).client();
+
+        cx.background_spawn(async move {
+            let opts = SubscribeAutoCloseOptions::default().exit_policy(ReqExitPolicy::ExitOnEOSE);
+            let app_pubkey = PublicKey::parse(APP_PUBKEY).unwrap();
+
+            let filter = Filter::new()
+                .kind(Kind::ReleaseArtifactSet)
+                .author(app_pubkey)
+                .limit(1);
+
+            if let Err(e) = client
+                .subscribe_to(BOOTSTRAP_RELAYS, filter, Some(opts))
+                .await
+            {
+                log::error!("Failed to subscribe to updates: {e}");
+            };
+        })
+    }
+
+    fn check_for_updates(version: Version, cx: &AsyncApp) -> Task<Result<Vec<EventId>, Error>> {
+        let client = cx.update(|cx| {
+            let nostr = NostrRegistry::global(cx);
+            nostr.read(cx).client()
+        });
+
+        cx.background_spawn(async move {
+            let opts = SubscribeAutoCloseOptions::default().exit_policy(ReqExitPolicy::ExitOnEOSE);
+            let app_pubkey = PublicKey::parse(APP_PUBKEY).unwrap();
+
+            let filter = Filter::new()
+                .kind(Kind::ReleaseArtifactSet)
+                .author(app_pubkey)
+                .limit(1);
+
+            if let Some(event) = client.database().query(filter).await?.first_owned() {
+                let new_version: Version = event
+                    .tags
+                    .find(TagKind::d())
+                    .and_then(|tag| tag.content())
+                    .and_then(|content| content.split("@").last())
+                    .and_then(|content| Version::parse(content).ok())
+                    .context("Failed to parse version")?;
+
+                if new_version > version {
+                    // Get all file metadata event ids
+                    let ids: Vec<EventId> = event.tags.event_ids().copied().collect();
+
+                    let filter = Filter::new()
+                        .kind(Kind::FileMetadata)
+                        .author(app_pubkey)
+                        .ids(ids.clone());
+
+                    // Get all files for this release
+                    client
+                        .subscribe_to(BOOTSTRAP_RELAYS, filter, Some(opts))
+                        .await?;
+
+                    Ok(ids)
+                } else {
+                    Err(anyhow!("No update available"))
+                }
+            } else {
+                Err(anyhow!("No update available"))
+            }
+        })
+    }
+
+    fn get_latest_release(&mut self, ids: &[EventId], cx: &mut Context<Self>) {
+        let nostr = NostrRegistry::global(cx);
+        let client = nostr.read(cx).client();
+        let http_client = cx.http_client();
+        let ids = ids.to_vec();
+
+        let task: Task<Result<(InstallerDir, PathBuf), Error>> = cx.background_spawn(async move {
+            let app_pubkey = PublicKey::parse(APP_PUBKEY).unwrap();
+            let os = std::env::consts::OS;
+
+            let filter = Filter::new()
+                .kind(Kind::FileMetadata)
+                .author(app_pubkey)
+                .ids(ids);
+
+            // Get all urls for this release
+            let events = client.database().query(filter).await?;
+
+            for event in events.into_iter() {
+                // Only process events that match current platform
+                if event.content != os {
+                    continue;
+                }
+
+                // Parse the url
+                let url = event
+                    .tags
+                    .find(TagKind::Url)
+                    .and_then(|tag| tag.content())
+                    .and_then(|content| Url::parse(content).ok())
+                    .context("Failed to parse url")?;
+
+                let installer_dir = InstallerDir::new().await?;
+                let target_path = Self::target_path(&installer_dir).await?;
+
+                // Download the release
+                download(url.as_str(), &target_path, http_client).await?;
+
+                return Ok((installer_dir, target_path));
+            }
+
+            Err(anyhow!("Failed to get latest release"))
+        });
+
+        self._tasks.push(
+            // Install the new release
+            cx.spawn(async move |this, cx| {
+                _ = this.update(cx, |this, cx| {
+                    this.set_status(AutoUpdateStatus::Installing, cx);
+                });
+
+                match task.await {
+                    Ok((installer_dir, target_path)) => {
+                        if Self::install(installer_dir, target_path, cx).await.is_ok() {
+                            // Update the status to updated
+                            _ = this.update(cx, |this, cx| {
+                                this.set_status(AutoUpdateStatus::Updated, cx);
+                            });
+                        }
+                    }
+                    Err(e) => {
+                        // Update the status to error including the error message
+                        _ = this.update(cx, |this, cx| {
+                            this.set_status(AutoUpdateStatus::error(e.to_string()), cx);
+                        });
+                    }
+                }
+            }),
+        );
+    }
+
+    async fn target_path(installer_dir: &InstallerDir) -> Result<PathBuf, Error> {
+        let filename = match std::env::consts::OS {
+            "macos" => anyhow::Ok("Coop.dmg"),
+            "windows" => Ok("Coop.exe"),
+            unsupported_os => anyhow::bail!("not supported: {unsupported_os}"),
+        }?;
+
+        Ok(installer_dir.path().join(filename))
+    }
+
+    async fn install(
+        installer_dir: InstallerDir,
+        target_path: PathBuf,
+        cx: &AsyncApp,
+    ) -> Result<(), Error> {
+        match std::env::consts::OS {
+            "macos" => install_release_macos(&installer_dir, target_path, cx).await,
+            "windows" => install_release_windows(target_path).await,
+            unsupported_os => anyhow::bail!("Not supported: {unsupported_os}"),
+        }
+    }
+}
+
+async fn download(
+    url: &str,
+    target_path: &std::path::Path,
+    client: Arc<dyn HttpClient>,
+) -> Result<(), Error> {
+    let body = AsyncBody::default();
+    let mut target_file = File::create(&target_path).await?;
+    let mut response = client.get(url, body, true).await?;
+
+    // Copy the response body to the target file
+    smol::io::copy(response.body_mut(), &mut target_file).await?;
+
+    Ok(())
+}
+
+async fn install_release_macos(
+    temp_dir: &InstallerDir,
+    downloaded_dmg: PathBuf,
+    cx: &AsyncApp,
+) -> Result<(), Error> {
+    let running_app_path = cx.update(|cx| cx.app_path())?;
+    let running_app_filename = running_app_path
+        .file_name()
+        .with_context(|| format!("invalid running app path {running_app_path:?}"))?;
+
+    let mount_path = temp_dir.path().join("Coop");
+    let mut mounted_app_path: OsString = mount_path.join(running_app_filename).into();
+
+    mounted_app_path.push("/");
+
+    let output = Command::new("hdiutil")
+        .args(["attach", "-nobrowse"])
+        .arg(&downloaded_dmg)
+        .arg("-mountroot")
+        .arg(temp_dir.path())
+        .output()
+        .await?;
+
+    anyhow::ensure!(
+        output.status.success(),
+        "failed to mount: {:?}",
+        String::from_utf8_lossy(&output.stderr)
+    );
+
+    // Create an MacOsUnmounter that will be dropped (and thus unmount the disk) when this function exits
+    let _unmounter = MacOsUnmounter {
+        mount_path: mount_path.clone(),
+        background_executor: cx.background_executor(),
+    };
+
+    let output = Command::new("rsync")
+        .args(["-av", "--delete"])
+        .arg(&mounted_app_path)
+        .arg(&running_app_path)
+        .output()
+        .await?;
+
+    anyhow::ensure!(
+        output.status.success(),
+        "failed to copy app: {:?}",
+        String::from_utf8_lossy(&output.stderr)
+    );
+
+    Ok(())
+}
+
+async fn install_release_windows(downloaded_installer: PathBuf) -> Result<(), Error> {
+    //const CREATE_NO_WINDOW: u32 = 0x08000000;
+
+    let system_root = std::env::var("SYSTEMROOT");
+    let powershell_path = system_root.as_ref().map_or_else(
+        |_| "powershell.exe".to_string(),
+        |p| format!("{p}\\System32\\WindowsPowerShell\\v1.0\\powershell.exe"),
+    );
+
+    let mut installer_path = std::ffi::OsString::new();
+    installer_path.push("\"");
+    installer_path.push(&downloaded_installer);
+    installer_path.push("\"");
+
+    let output = Command::new(powershell_path)
+        //.creation_flags(CREATE_NO_WINDOW)
+        .args(["-NoProfile", "-WindowStyle", "Hidden"])
+        .args(["Start-Process"])
+        .arg(installer_path)
+        .arg("-ArgumentList")
+        .args(["/P", "/R"])
+        .output()
+        .await?;
+
+    anyhow::ensure!(
+        output.status.success(),
+        "failed to start installer: {:?}",
+        String::from_utf8_lossy(&output.stderr)
+    );
+
+    Ok(())
 }

crates/chat/Cargo.toml

@@ -0,0 +1,27 @@
+[package]
+name = "chat"
+version.workspace = true
+edition.workspace = true
+publish.workspace = true
+
+[dependencies]
+common = { path = "../common" }
+state = { path = "../state" }
+device = { path = "../device" }
+person = { path = "../person" }
+settings = { path = "../settings" }
+
+gpui.workspace = true
+nostr-sdk.workspace = true
+
+anyhow.workspace = true
+itertools.workspace = true
+smallvec.workspace = true
+smol.workspace = true
+log.workspace = true
+futures.workspace = true
+flume.workspace = true
+serde.workspace = true
+serde_json.workspace = true
+
+fuzzy-matcher = "0.3.7"

crates/chat/src/lib.rs

@@ -0,0 +1,718 @@
+use std::cmp::Reverse;
+use std::collections::{HashMap, HashSet};
+use std::hash::{DefaultHasher, Hash, Hasher};
+use std::sync::atomic::{AtomicBool, Ordering};
+use std::sync::Arc;
+use std::time::Duration;
+
+use anyhow::{anyhow, Context as AnyhowContext, Error};
+use common::EventUtils;
+use device::DeviceRegistry;
+use flume::Sender;
+use fuzzy_matcher::skim::SkimMatcherV2;
+use fuzzy_matcher::FuzzyMatcher;
+use gpui::{
+    App, AppContext, Context, Entity, EventEmitter, Global, Subscription, Task, WeakEntity,
+};
+use nostr_sdk::prelude::*;
+use settings::AppSettings;
+use smallvec::{smallvec, SmallVec};
+use state::{tracker, NostrRegistry, GIFTWRAP_SUBSCRIPTION};
+
+mod message;
+mod room;
+
+pub use message::*;
+pub use room::*;
+
+pub fn init(cx: &mut App) {
+    ChatRegistry::set_global(cx.new(ChatRegistry::new), cx);
+}
+
+struct GlobalChatRegistry(Entity<ChatRegistry>);
+
+impl Global for GlobalChatRegistry {}
+
+/// Chat event.
+#[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord)]
+pub enum ChatEvent {
+    /// An event to open a room by its ID
+    OpenRoom(u64),
+    /// An event to close a room by its ID
+    CloseRoom(u64),
+    /// An event to notify UI about a new chat request
+    Ping,
+}
+
+/// Channel signal.
+#[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord)]
+enum NostrEvent {
+    /// Message received from relay pool
+    Message(NewMessage),
+    /// Unwrapping status
+    Unwrapping(bool),
+    /// Eose received from relay pool
+    Eose,
+}
+
+/// Chat Registry
+#[derive(Debug)]
+pub struct ChatRegistry {
+    /// Collection of all chat rooms
+    rooms: Vec<Entity<Room>>,
+
+    /// Loading status of the registry
+    loading: bool,
+
+    /// Tracking the status of unwrapping gift wrap events.
+    tracking_flag: Arc<AtomicBool>,
+
+    /// Channel's sender for communication between nostr and gpui
+    sender: Sender<NostrEvent>,
+
+    /// Handle notifications asynchronous task
+    notifications: Option<Task<Result<(), Error>>>,
+
+    /// Tasks for asynchronous operations
+    tasks: Vec<Task<()>>,
+
+    /// Subscriptions
+    _subscriptions: SmallVec<[Subscription; 1]>,
+}
+
+impl EventEmitter<ChatEvent> for ChatRegistry {}
+
+impl ChatRegistry {
+    /// Retrieve the global chat registry state
+    pub fn global(cx: &App) -> Entity<Self> {
+        cx.global::<GlobalChatRegistry>().0.clone()
+    }
+
+    /// Set the global chat registry instance
+    fn set_global(state: Entity<Self>, cx: &mut App) {
+        cx.set_global(GlobalChatRegistry(state));
+    }
+
+    /// Create a new chat registry instance
+    fn new(cx: &mut Context<Self>) -> Self {
+        let nostr = NostrRegistry::global(cx);
+        let identity = nostr.read(cx).identity();
+
+        let device = DeviceRegistry::global(cx);
+        let device_signer = device.read(cx).device_signer.clone();
+
+        // A flag to indicate if the registry is loading
+        let tracking_flag = Arc::new(AtomicBool::new(true));
+
+        // Channel for communication between nostr and gpui
+        let (tx, rx) = flume::bounded::<NostrEvent>(2048);
+
+        let mut tasks = vec![];
+        let mut subscriptions = smallvec![];
+
+        subscriptions.push(
+            // Observe the identity
+            cx.observe(&identity, |this, state, cx| {
+                if state.read(cx).has_public_key() {
+                    // Handle nostr notifications
+                    this.handle_notifications(cx);
+                    // Track unwrapping progress
+                    this.tracking(cx);
+                }
+            }),
+        );
+
+        subscriptions.push(
+            // Observe the device signer state
+            cx.observe(&device_signer, |this, state, cx| {
+                if state.read(cx).is_some() {
+                    this.handle_notifications(cx);
+                }
+            }),
+        );
+
+        tasks.push(
+            // Update GPUI states
+            cx.spawn(async move |this, cx| {
+                while let Ok(message) = rx.recv_async().await {
+                    match message {
+                        NostrEvent::Message(message) => {
+                            this.update(cx, |this, cx| {
+                                this.new_message(message, cx);
+                            })
+                            .ok();
+                        }
+                        NostrEvent::Eose => {
+                            this.update(cx, |this, cx| {
+                                this.get_rooms(cx);
+                            })
+                            .ok();
+                        }
+                        NostrEvent::Unwrapping(status) => {
+                            this.update(cx, |this, cx| {
+                                this.set_loading(status, cx);
+                                this.get_rooms(cx);
+                            })
+                            .ok();
+                        }
+                    };
+                }
+            }),
+        );
+
+        Self {
+            rooms: vec![],
+            loading: true,
+            tracking_flag,
+            sender: tx.clone(),
+            notifications: None,
+            tasks,
+            _subscriptions: subscriptions,
+        }
+    }
+
+    /// Handle nostr notifications
+    fn handle_notifications(&mut self, cx: &mut Context<Self>) {
+        let nostr = NostrRegistry::global(cx);
+        let client = nostr.read(cx).client();
+
+        let device = DeviceRegistry::global(cx);
+        let device_signer = device.read(cx).signer(cx);
+
+        let status = self.tracking_flag.clone();
+        let tx = self.sender.clone();
+
+        self.tasks.push(cx.background_spawn(async move {
+            let initialized_at = Timestamp::now();
+            let subscription_id = SubscriptionId::new(GIFTWRAP_SUBSCRIPTION);
+
+            let mut notifications = client.notifications();
+            let mut processed_events = HashSet::new();
+
+            while let Ok(notification) = notifications.recv().await {
+                let RelayPoolNotification::Message { message, .. } = notification else {
+                    // Skip non-message notifications
+                    continue;
+                };
+
+                match message {
+                    RelayMessage::Event { event, .. } => {
+                        if !processed_events.insert(event.id) {
+                            // Skip if the event has already been processed
+                            continue;
+                        }
+
+                        if event.kind != Kind::GiftWrap {
+                            // Skip non-gift wrap events
+                            continue;
+                        }
+
+                        // Extract the rumor from the gift wrap event
+                        match Self::extract_rumor(&client, &device_signer, event.as_ref()).await {
+                            Ok(rumor) => match rumor.created_at >= initialized_at {
+                                true => {
+                                    // Check if the event is sent by coop
+                                    let sent_by_coop = {
+                                        let tracker = tracker().read().await;
+                                        tracker.is_sent_by_coop(&event.id)
+                                    };
+                                    // No need to emit if sent by coop
+                                    // the event is already emitted
+                                    if !sent_by_coop {
+                                        let new_message = NewMessage::new(event.id, rumor);
+                                        let signal = NostrEvent::Message(new_message);
+
+                                        tx.send_async(signal).await.ok();
+                                    }
+                                }
+                                false => {
+                                    status.store(true, Ordering::Release);
+                                }
+                            },
+                            Err(e) => {
+                                log::warn!("Failed to unwrap: {e}");
+                            }
+                        }
+                    }
+                    RelayMessage::EndOfStoredEvents(id) => {
+                        if id.as_ref() == &subscription_id {
+                            tx.send_async(NostrEvent::Eose).await.ok();
+                        }
+                    }
+                    _ => {}
+                }
+            }
+        }));
+    }
+
+    /// Tracking the status of unwrapping gift wrap events.
+    fn tracking(&mut self, cx: &mut Context<Self>) {
+        let nostr = NostrRegistry::global(cx);
+        let client = nostr.read(cx).client();
+
+        let status = self.tracking_flag.clone();
+        let tx = self.sender.clone();
+
+        self.notifications = Some(cx.background_spawn(async move {
+            let loop_duration = Duration::from_secs(12);
+
+            let mut is_start_processing = false;
+            let mut total_loops = 0;
+
+            loop {
+                if client.has_signer().await {
+                    total_loops += 1;
+
+                    if status.load(Ordering::Acquire) {
+                        is_start_processing = true;
+                        // Reset gift wrap processing flag
+                        _ = status.compare_exchange(
+                            true,
+                            false,
+                            Ordering::Release,
+                            Ordering::Relaxed,
+                        );
+
+                        tx.send_async(NostrEvent::Unwrapping(true)).await.ok();
+                    } 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 {
+                            tx.send_async(NostrEvent::Unwrapping(false)).await.ok();
+
+                            // Reset the counter
+                            is_start_processing = false;
+                            total_loops = 0;
+                        }
+                    }
+                }
+                smol::Timer::after(loop_duration).await;
+            }
+        }));
+    }
+
+    /// Get the loading status of the chat registry
+    pub fn loading(&self) -> bool {
+        self.loading
+    }
+
+    /// Set the loading status of the chat registry
+    pub fn set_loading(&mut self, loading: bool, cx: &mut Context<Self>) {
+        self.loading = loading;
+        cx.notify();
+    }
+
+    /// Get a weak reference to a room by its ID.
+    pub fn room(&self, id: &u64, cx: &App) -> Option<WeakEntity<Room>> {
+        self.rooms
+            .iter()
+            .find(|this| &this.read(cx).id == id)
+            .map(|this| this.downgrade())
+    }
+
+    /// Get all ongoing rooms.
+    pub fn ongoing_rooms(&self, cx: &App) -> Vec<Entity<Room>> {
+        self.rooms
+            .iter()
+            .filter(|room| room.read(cx).kind == RoomKind::Ongoing)
+            .cloned()
+            .collect()
+    }
+
+    /// Get all request rooms.
+    pub fn request_rooms(&self, cx: &App) -> Vec<Entity<Room>> {
+        self.rooms
+            .iter()
+            .filter(|room| room.read(cx).kind != RoomKind::Ongoing)
+            .cloned()
+            .collect()
+    }
+
+    /// Add a new room to the start of list.
+    pub fn add_room<I>(&mut self, room: I, cx: &mut Context<Self>)
+    where
+        I: Into<Room>,
+    {
+        self.rooms.insert(0, cx.new(|_| room.into()));
+        cx.notify();
+    }
+
+    /// Emit an open room event.
+    /// If the room is new, add it to the registry.
+    pub fn emit_room(&mut self, room: WeakEntity<Room>, cx: &mut Context<Self>) {
+        if let Some(room) = room.upgrade() {
+            let id = room.read(cx).id;
+
+            // If the room is new, add it to the registry.
+            if !self.rooms.iter().any(|r| r.read(cx).id == id) {
+                self.rooms.insert(0, room);
+            }
+
+            // Emit the open room event.
+            cx.emit(ChatEvent::OpenRoom(id));
+        }
+    }
+
+    /// Close a room.
+    pub fn close_room(&mut self, id: u64, cx: &mut Context<Self>) {
+        if self.rooms.iter().any(|r| r.read(cx).id == id) {
+            cx.emit(ChatEvent::CloseRoom(id));
+        }
+    }
+
+    /// Sort rooms by their created at.
+    pub fn sort(&mut self, cx: &mut Context<Self>) {
+        self.rooms.sort_by_key(|ev| Reverse(ev.read(cx).created_at));
+        cx.notify();
+    }
+
+    /// Search rooms by their name.
+    pub fn search(&self, query: &str, cx: &App) -> Vec<Entity<Room>> {
+        let matcher = SkimMatcherV2::default();
+
+        self.rooms
+            .iter()
+            .filter(|room| {
+                matcher
+                    .fuzzy_match(room.read(cx).display_name(cx).as_ref(), query)
+                    .is_some()
+            })
+            .cloned()
+            .collect()
+    }
+
+    /// Search rooms by public keys.
+    pub fn search_by_public_key(&self, public_key: PublicKey, cx: &App) -> Vec<Entity<Room>> {
+        self.rooms
+            .iter()
+            .filter(|room| room.read(cx).members.contains(&public_key))
+            .cloned()
+            .collect()
+    }
+
+    /// Reset the registry.
+    pub fn reset(&mut self, cx: &mut Context<Self>) {
+        self.rooms.clear();
+        cx.notify();
+    }
+
+    /// Extend the registry with new rooms.
+    fn extend_rooms(&mut self, rooms: HashSet<Room>, cx: &mut Context<Self>) {
+        let mut room_map: HashMap<u64, usize> = self
+            .rooms
+            .iter()
+            .enumerate()
+            .map(|(idx, room)| (room.read(cx).id, idx))
+            .collect();
+
+        for new_room in rooms.into_iter() {
+            // Check if we already have a room with this ID
+            if let Some(&index) = room_map.get(&new_room.id) {
+                self.rooms[index].update(cx, |this, cx| {
+                    if new_room.created_at > this.created_at {
+                        *this = new_room;
+                        cx.notify();
+                    }
+                });
+            } else {
+                let new_room_id = new_room.id;
+                self.rooms.push(cx.new(|_| new_room));
+
+                let new_index = self.rooms.len();
+                room_map.insert(new_room_id, new_index);
+            }
+        }
+    }
+
+    /// Load all rooms from the database.
+    pub fn get_rooms(&mut self, cx: &mut Context<Self>) {
+        let task = self.create_get_rooms_task(cx);
+
+        self.tasks.push(
+            // Run and finished in the background
+            cx.spawn(async move |this, cx| {
+                match task.await {
+                    Ok(rooms) => {
+                        this.update(cx, move |this, cx| {
+                            this.extend_rooms(rooms, cx);
+                            this.sort(cx);
+                        })
+                        .expect("Entity has been released");
+                    }
+                    Err(e) => {
+                        log::error!("Failed to load rooms: {e}")
+                    }
+                };
+            }),
+        );
+    }
+
+    /// Create a task to load rooms from the database
+    fn create_get_rooms_task(&self, cx: &App) -> Task<Result<HashSet<Room>, Error>> {
+        let nostr = NostrRegistry::global(cx);
+        let client = nostr.read(cx).client();
+
+        // Get the contact bypass setting
+        let bypass_setting = AppSettings::get_contact_bypass(cx);
+
+        cx.background_spawn(async move {
+            let signer = client.signer().await?;
+            let public_key = signer.get_public_key().await?;
+            let contacts = client.database().contacts_public_keys(public_key).await?;
+
+            let authored_filter = Filter::new()
+                .kind(Kind::ApplicationSpecificData)
+                .custom_tag(SingleLetterTag::lowercase(Alphabet::A), public_key);
+
+            // Get all authored events
+            let authored = client.database().query(authored_filter).await?;
+
+            let addressed_filter = Filter::new()
+                .kind(Kind::ApplicationSpecificData)
+                .custom_tag(SingleLetterTag::lowercase(Alphabet::P), public_key);
+
+            // Get all addressed events
+            let addressed = client.database().query(addressed_filter).await?;
+
+            // Merge authored and addressed events
+            let events = authored.merge(addressed);
+
+            let mut rooms: HashSet<Room> = HashSet::new();
+            let mut grouped: HashMap<u64, Vec<UnsignedEvent>> = HashMap::new();
+
+            // Process each event and group by room hash
+            for raw in events.into_iter() {
+                if let Ok(rumor) = UnsignedEvent::from_json(&raw.content) {
+                    if rumor.tags.public_keys().peekable().peek().is_some() {
+                        grouped.entry(rumor.uniq_id()).or_default().push(rumor);
+                    }
+                }
+            }
+
+            for (_id, mut messages) in grouped.into_iter() {
+                messages.sort_by_key(|m| Reverse(m.created_at));
+
+                let Some(latest) = messages.first() else {
+                    continue;
+                };
+
+                let mut room = Room::from(latest);
+
+                if rooms.iter().any(|r| r.id == room.id) {
+                    continue;
+                }
+
+                let mut public_keys = room.members();
+                public_keys.retain(|pk| pk != &public_key);
+
+                // Check if the user has responded to the room
+                let user_sent = messages.iter().any(|m| m.pubkey == public_key);
+
+                // Determine if the room is ongoing or not
+                let mut bypassed = false;
+
+                // Check if public keys are from the user's contacts
+                if bypass_setting {
+                    bypassed = public_keys.iter().any(|k| contacts.contains(k));
+                }
+
+                // Set the room's kind based on status
+                if user_sent || bypassed {
+                    room = room.kind(RoomKind::Ongoing);
+                }
+
+                rooms.insert(room);
+            }
+
+            Ok(rooms)
+        })
+    }
+
+    /// Trigger a refresh of the opened chat rooms by their IDs
+    pub fn refresh_rooms(&mut self, ids: Option<Vec<u64>>, cx: &mut Context<Self>) {
+        if let Some(ids) = ids {
+            for room in self.rooms.iter() {
+                if ids.contains(&room.read(cx).id) {
+                    room.update(cx, |this, cx| {
+                        this.emit_refresh(cx);
+                    });
+                }
+            }
+        }
+    }
+
+    /// Parse a Nostr event into a Coop Message and push it to the belonging room
+    ///
+    /// If the room doesn't exist, it will be created.
+    /// Updates room ordering based on the most recent messages.
+    pub fn new_message(&mut self, message: NewMessage, cx: &mut Context<Self>) {
+        let nostr = NostrRegistry::global(cx);
+        // Get the unique id
+        let id = message.rumor.uniq_id();
+        // Get the author
+        let author = message.rumor.pubkey;
+
+        match self.rooms.iter().find(|room| room.read(cx).id == id) {
+            Some(room) => {
+                let new_message = message.rumor.created_at > room.read(cx).created_at;
+                let created_at = message.rumor.created_at;
+
+                // Update room
+                room.update(cx, |this, cx| {
+                    // Update the last timestamp if the new message is newer
+                    if new_message {
+                        this.set_created_at(created_at, cx);
+                    }
+
+                    // Set this room is ongoing if the new message is from current user
+                    if author == nostr.read(cx).identity().read(cx).public_key() {
+                        this.set_ongoing(cx);
+                    }
+
+                    // Emit the new message to the room
+                    this.emit_message(message, cx);
+                });
+
+                // Resort all rooms in the registry by their created at (after updated)
+                if new_message {
+                    self.sort(cx);
+                }
+            }
+            None => {
+                // Push the new room to the front of the list
+                self.add_room(&message.rumor, cx);
+
+                // Notify the UI about the new room
+                cx.emit(ChatEvent::Ping);
+            }
+        }
+    }
+
+    // Unwraps a gift-wrapped event and processes its contents.
+    async fn extract_rumor(
+        client: &Client,
+        device_signer: &Option<Arc<dyn NostrSigner>>,
+        gift_wrap: &Event,
+    ) -> Result<UnsignedEvent, Error> {
+        // Try to get cached rumor first
+        if let Ok(event) = Self::get_rumor(client, gift_wrap.id).await {
+            return Ok(event);
+        }
+
+        // Try to unwrap with the available signer
+        let unwrapped = Self::try_unwrap(client, device_signer, gift_wrap).await?;
+        let mut rumor_unsigned = unwrapped.rumor;
+
+        // Generate event id for the rumor if it doesn't have one
+        rumor_unsigned.ensure_id();
+
+        // Cache the rumor
+        Self::set_rumor(client, gift_wrap.id, &rumor_unsigned).await?;
+
+        Ok(rumor_unsigned)
+    }
+
+    // Helper method to try unwrapping with different signers
+    async fn try_unwrap(
+        client: &Client,
+        device_signer: &Option<Arc<dyn NostrSigner>>,
+        gift_wrap: &Event,
+    ) -> Result<UnwrappedGift, Error> {
+        if let Some(signer) = device_signer.as_ref() {
+            let seal = signer
+                .nip44_decrypt(&gift_wrap.pubkey, &gift_wrap.content)
+                .await?;
+
+            let seal: Event = Event::from_json(seal)?;
+            seal.verify_with_ctx(&SECP256K1)?;
+
+            let rumor = signer.nip44_decrypt(&seal.pubkey, &seal.content).await?;
+            let rumor = UnsignedEvent::from_json(rumor)?;
+
+            return Ok(UnwrappedGift {
+                sender: seal.pubkey,
+                rumor,
+            });
+        }
+
+        let signer = client.signer().await?;
+        let unwrapped = UnwrappedGift::from_gift_wrap(&signer, gift_wrap).await?;
+
+        Ok(unwrapped)
+    }
+
+    /// Stores an unwrapped event in local database with reference to original
+    async fn set_rumor(client: &Client, id: EventId, rumor: &UnsignedEvent) -> Result<(), Error> {
+        let rumor_id = rumor.id.context("Rumor is missing an event id")?;
+        let author = rumor.pubkey;
+        let conversation = Self::conversation_id(rumor);
+
+        let mut tags = rumor.tags.clone().to_vec();
+
+        // Add a unique identifier
+        tags.push(Tag::identifier(id));
+
+        // Add a reference to the rumor's author
+        tags.push(Tag::custom(
+            TagKind::SingleLetter(SingleLetterTag::lowercase(Alphabet::A)),
+            [author],
+        ));
+
+        // Add a conversation id
+        tags.push(Tag::custom(
+            TagKind::SingleLetter(SingleLetterTag::lowercase(Alphabet::C)),
+            [conversation.to_string()],
+        ));
+
+        // Add a reference to the rumor's id
+        tags.push(Tag::event(rumor_id));
+
+        // Add references to the rumor's participants
+        for receiver in rumor.tags.public_keys().copied() {
+            tags.push(Tag::custom(
+                TagKind::SingleLetter(SingleLetterTag::lowercase(Alphabet::P)),
+                [receiver],
+            ));
+        }
+
+        // Convert rumor to json
+        let content = rumor.as_json();
+
+        // Construct the event
+        let event = EventBuilder::new(Kind::ApplicationSpecificData, content)
+            .tags(tags)
+            .sign(&Keys::generate())
+            .await?;
+
+        // Save the event to the database
+        client.database().save_event(&event).await?;
+
+        Ok(())
+    }
+
+    /// Retrieves a previously unwrapped event from local database
+    async fn get_rumor(client: &Client, gift_wrap: EventId) -> Result<UnsignedEvent, Error> {
+        let filter = Filter::new()
+            .kind(Kind::ApplicationSpecificData)
+            .identifier(gift_wrap)
+            .limit(1);
+
+        if let Some(event) = client.database().query(filter).await?.first_owned() {
+            UnsignedEvent::from_json(event.content).map_err(|e| anyhow!(e))
+        } else {
+            Err(anyhow!("Event is not cached yet."))
+        }
+    }
+
+    /// Get the conversation ID for a given rumor (message).
+    fn conversation_id(rumor: &UnsignedEvent) -> u64 {
+        let mut hasher = DefaultHasher::new();
+        let mut pubkeys: Vec<PublicKey> = rumor.tags.public_keys().copied().collect();
+        pubkeys.push(rumor.pubkey);
+        pubkeys.sort();
+        pubkeys.dedup();
+        pubkeys.hash(&mut hasher);
+
+        hasher.finish()
+    }
+}

crates/chat/src/message.rs

@@ -2,6 +2,20 @@ use std::hash::Hash;
 
 use nostr_sdk::prelude::*;
 
+/// New message.
+#[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord)]
+pub struct NewMessage {
+    pub gift_wrap: EventId,
+    pub rumor: UnsignedEvent,
+}
+
+impl NewMessage {
+    pub fn new(gift_wrap: EventId, rumor: UnsignedEvent) -> Self {
+        Self { gift_wrap, rumor }
+    }
+}
+
+/// Message.
 #[derive(Debug, Clone, Hash, PartialEq, Eq)]
 pub enum Message {
     User(RenderedMessage),
@@ -10,12 +24,18 @@ pub enum Message {
 }
 
 impl Message {
-    pub fn user(user: impl Into<RenderedMessage>) -> Self {
+    pub fn user<I>(user: I) -> Self
+    where
+        I: Into<RenderedMessage>,
+    {
         Self::User(user.into())
     }
 
-    pub fn warning(content: String) -> Self {
-        Self::Warning(content, Timestamp::now())
+    pub fn warning<I>(content: I) -> Self
+    where
+        I: Into<String>,
+    {
+        Self::Warning(content.into(), Timestamp::now())
     }
 
     pub fn system() -> Self {
@@ -31,6 +51,18 @@ impl Message {
     }
 }
 
+impl From<&NewMessage> for Message {
+    fn from(val: &NewMessage) -> Self {
+        Self::User(val.into())
+    }
+}
+
+impl From<&UnsignedEvent> for Message {
+    fn from(val: &UnsignedEvent) -> Self {
+        Self::User(val.into())
+    }
+}
+
 impl Ord for Message {
     fn cmp(&self, other: &Self) -> std::cmp::Ordering {
         match (self, other) {
@@ -51,6 +83,7 @@ impl PartialOrd for Message {
     }
 }
 
+/// Rendered message.
 #[derive(Debug, Clone)]
 pub struct RenderedMessage {
     pub id: EventId,
@@ -66,48 +99,53 @@ pub struct RenderedMessage {
     pub replies_to: Vec<EventId>,
 }
 
-impl From<Event> for RenderedMessage {
-    fn from(inner: Event) -> Self {
-        let mentions = extract_mentions(&inner.content);
-        let replies_to = extract_reply_ids(&inner.tags);
+impl From<&Event> for RenderedMessage {
+    fn from(val: &Event) -> Self {
+        let mentions = extract_mentions(&val.content);
+        let replies_to = extract_reply_ids(&val.tags);
 
         Self {
-            id: inner.id,
-            author: inner.pubkey,
-            content: inner.content,
-            created_at: inner.created_at,
+            id: val.id,
+            author: val.pubkey,
+            content: val.content.clone(),
+            created_at: val.created_at,
             mentions,
             replies_to,
         }
     }
 }
 
-impl From<UnsignedEvent> for RenderedMessage {
-    fn from(inner: UnsignedEvent) -> Self {
-        let mentions = extract_mentions(&inner.content);
-        let replies_to = extract_reply_ids(&inner.tags);
+impl From<&UnsignedEvent> for RenderedMessage {
+    fn from(val: &UnsignedEvent) -> Self {
+        let mentions = extract_mentions(&val.content);
+        let replies_to = extract_reply_ids(&val.tags);
 
         Self {
             // Event ID must be known
-            id: inner.id.unwrap(),
-            author: inner.pubkey,
-            content: inner.content,
-            created_at: inner.created_at,
+            id: val.id.unwrap(),
+            author: val.pubkey,
+            content: val.content.clone(),
+            created_at: val.created_at,
             mentions,
             replies_to,
         }
     }
 }
 
-impl From<Box<Event>> for RenderedMessage {
-    fn from(inner: Box<Event>) -> Self {
-        (*inner).into()
-    }
-}
+impl From<&NewMessage> for RenderedMessage {
+    fn from(val: &NewMessage) -> Self {
+        let mentions = extract_mentions(&val.rumor.content);
+        let replies_to = extract_reply_ids(&val.rumor.tags);
 
-impl From<&Box<Event>> for RenderedMessage {
-    fn from(inner: &Box<Event>) -> Self {
-        inner.to_owned().into()
+        Self {
+            // Event ID must be known
+            id: val.rumor.id.unwrap(),
+            author: val.rumor.pubkey,
+            content: val.rumor.content.clone(),
+            created_at: val.rumor.created_at,
+            mentions,
+            replies_to,
+        }
     }
 }
 
@@ -137,6 +175,7 @@ impl Hash for RenderedMessage {
     }
 }
 
+/// Extracts all mentions (public keys) from a content string.
 fn extract_mentions(content: &str) -> Vec<PublicKey> {
     let parser = NostrParser::new();
     let tokens = parser.parse(content);
@@ -153,6 +192,7 @@ fn extract_mentions(content: &str) -> Vec<PublicKey> {
         .collect::<Vec<_>>()
 }
 
+/// Extracts all reply (ids) from the event tags.
 fn extract_reply_ids(inner: &Tags) -> Vec<EventId> {
     let mut replies_to = vec![];
 

crates/chat/src/room.rs

@@ -0,0 +1,625 @@
+use std::cmp::Ordering;
+use std::collections::{HashMap, HashSet};
+use std::hash::{Hash, Hasher};
+use std::time::Duration;
+
+use anyhow::Error;
+use common::EventUtils;
+use gpui::{App, AppContext, Context, EventEmitter, SharedString, Task};
+use itertools::Itertools;
+use nostr_sdk::prelude::*;
+use person::{Person, PersonRegistry};
+use state::{tracker, NostrRegistry};
+
+use crate::NewMessage;
+
+const SEND_RETRY: usize = 10;
+
+#[derive(Debug, Clone)]
+pub struct SendReport {
+    pub receiver: PublicKey,
+    pub status: Option<Output<EventId>>,
+    pub error: Option<SharedString>,
+    pub on_hold: Option<Event>,
+    pub encryption: bool,
+    pub relays_not_found: bool,
+    pub device_not_found: bool,
+}
+
+impl SendReport {
+    pub fn new(receiver: PublicKey) -> Self {
+        Self {
+            receiver,
+            status: None,
+            error: None,
+            on_hold: None,
+            encryption: false,
+            relays_not_found: false,
+            device_not_found: false,
+        }
+    }
+
+    pub fn status(mut self, output: Output<EventId>) -> Self {
+        self.status = Some(output);
+        self
+    }
+
+    pub fn error(mut self, error: impl Into<SharedString>) -> Self {
+        self.error = Some(error.into());
+        self
+    }
+
+    pub fn on_hold(mut self, event: Event) -> Self {
+        self.on_hold = Some(event);
+        self
+    }
+
+    pub fn encryption(mut self) -> Self {
+        self.encryption = true;
+        self
+    }
+
+    pub fn relays_not_found(mut self) -> Self {
+        self.relays_not_found = true;
+        self
+    }
+
+    pub fn device_not_found(mut self) -> Self {
+        self.device_not_found = true;
+        self
+    }
+
+    pub fn is_relay_error(&self) -> bool {
+        self.error.is_some() || self.relays_not_found
+    }
+
+    pub fn is_sent_success(&self) -> bool {
+        if let Some(output) = self.status.as_ref() {
+            !output.success.is_empty()
+        } else {
+            false
+        }
+    }
+}
+
+/// Room event.
+#[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord)]
+pub enum RoomEvent {
+    /// Incoming message.
+    Incoming(NewMessage),
+    /// Reloads the current room's messages.
+    Reload,
+}
+
+/// Room kind.
+#[derive(Clone, Copy, Hash, Debug, PartialEq, Eq, PartialOrd, Ord, Default)]
+pub enum RoomKind {
+    #[default]
+    Request,
+    Ongoing,
+}
+
+#[derive(Debug)]
+pub struct Room {
+    /// Conversation ID
+    pub id: u64,
+    /// The timestamp of the last message in the room
+    pub created_at: Timestamp,
+    /// Subject of the room
+    pub subject: Option<SharedString>,
+    /// All members of the room
+    pub members: Vec<PublicKey>,
+    /// Kind
+    pub kind: RoomKind,
+}
+
+impl Ord for Room {
+    fn cmp(&self, other: &Self) -> Ordering {
+        self.created_at.cmp(&other.created_at)
+    }
+}
+
+impl PartialOrd for Room {
+    fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
+        Some(self.cmp(other))
+    }
+}
+
+impl PartialEq for Room {
+    fn eq(&self, other: &Self) -> bool {
+        self.id == other.id
+    }
+}
+
+impl Hash for Room {
+    fn hash<H: Hasher>(&self, state: &mut H) {
+        self.id.hash(state);
+    }
+}
+
+impl Eq for Room {}
+
+impl EventEmitter<RoomEvent> for Room {}
+
+impl From<&UnsignedEvent> for Room {
+    fn from(val: &UnsignedEvent) -> Self {
+        let id = val.uniq_id();
+        let created_at = val.created_at;
+
+        // Get the members from the event's tags and event's pubkey
+        let members = val.extract_public_keys();
+
+        // Get subject from tags
+        let subject = val
+            .tags
+            .find(TagKind::Subject)
+            .and_then(|tag| tag.content().map(|s| s.to_owned().into()));
+
+        Room {
+            id,
+            created_at,
+            subject,
+            members,
+            kind: RoomKind::default(),
+        }
+    }
+}
+
+impl Room {
+    /// Constructs a new room with the given receiver and tags.
+    pub fn new(subject: Option<String>, author: PublicKey, receivers: Vec<PublicKey>) -> Self {
+        // Convert receiver's public keys into tags
+        let mut tags: Tags = Tags::from_list(
+            receivers
+                .iter()
+                .map(|pubkey| Tag::public_key(pubkey.to_owned()))
+                .collect(),
+        );
+
+        // Add subject if it is present
+        if let Some(subject) = subject {
+            tags.push(Tag::from_standardized_without_cell(TagStandard::Subject(
+                subject,
+            )));
+        }
+
+        let mut event = EventBuilder::new(Kind::PrivateDirectMessage, "")
+            .tags(tags)
+            .build(author);
+
+        // Generate event ID
+        event.ensure_id();
+
+        Room::from(&event)
+    }
+
+    /// Sets the kind of the room and returns the modified room
+    pub fn kind(mut self, kind: RoomKind) -> Self {
+        self.kind = kind;
+        self
+    }
+
+    /// Sets this room is ongoing conversation
+    pub fn set_ongoing(&mut self, cx: &mut Context<Self>) {
+        if self.kind != RoomKind::Ongoing {
+            self.kind = RoomKind::Ongoing;
+            cx.notify();
+        }
+    }
+
+    /// Updates the creation timestamp of the room
+    pub fn set_created_at(&mut self, created_at: impl Into<Timestamp>, cx: &mut Context<Self>) {
+        self.created_at = created_at.into();
+        cx.notify();
+    }
+
+    /// Updates the subject of the room
+    pub fn set_subject<T>(&mut self, subject: T, cx: &mut Context<Self>)
+    where
+        T: Into<SharedString>,
+    {
+        self.subject = Some(subject.into());
+        cx.notify();
+    }
+
+    /// Returns the members of the room
+    pub fn members(&self) -> Vec<PublicKey> {
+        self.members.clone()
+    }
+
+    /// Returns the members of the room with their messaging relays
+    pub fn members_with_relays(&self, cx: &App) -> Task<Vec<(PublicKey, Vec<RelayUrl>)>> {
+        let nostr = NostrRegistry::global(cx);
+        let mut tasks = vec![];
+
+        for member in self.members.iter() {
+            let task = nostr.read(cx).messaging_relays(member, cx);
+            tasks.push((*member, task));
+        }
+
+        cx.background_spawn(async move {
+            let mut results = vec![];
+
+            for (public_key, task) in tasks.into_iter() {
+                let urls = task.await;
+                results.push((public_key, urls));
+            }
+
+            results
+        })
+    }
+
+    /// Checks if the room has more than two members (group)
+    pub fn is_group(&self) -> bool {
+        self.members.len() > 2
+    }
+
+    /// Gets the display name for the room
+    pub fn display_name(&self, cx: &App) -> SharedString {
+        if let Some(value) = self.subject.clone() {
+            value
+        } else {
+            self.merged_name(cx)
+        }
+    }
+
+    /// Gets the display image for the room
+    pub fn display_image(&self, cx: &App) -> SharedString {
+        if !self.is_group() {
+            self.display_member(cx).avatar()
+        } else {
+            SharedString::from("brand/group.png")
+        }
+    }
+
+    /// Get a member to represent the room
+    ///
+    /// Display member is always different from the current user.
+    pub fn display_member(&self, cx: &App) -> Person {
+        let persons = PersonRegistry::global(cx);
+        let nostr = NostrRegistry::global(cx);
+        let public_key = nostr.read(cx).identity().read(cx).public_key();
+
+        let target_member = self
+            .members
+            .iter()
+            .find(|&member| member != &public_key)
+            .or_else(|| self.members.first())
+            .expect("Room should have at least one member");
+
+        persons.read(cx).get(target_member, cx)
+    }
+
+    /// Merge the names of the first two members of the room.
+    fn merged_name(&self, cx: &App) -> SharedString {
+        let persons = PersonRegistry::global(cx);
+
+        if self.is_group() {
+            let profiles: Vec<Person> = self
+                .members
+                .iter()
+                .map(|public_key| persons.read(cx).get(public_key, cx))
+                .collect();
+
+            let mut name = profiles
+                .iter()
+                .take(2)
+                .map(|p| p.name())
+                .collect::<Vec<_>>()
+                .join(", ");
+
+            if profiles.len() > 2 {
+                name = format!("{}, +{}", name, profiles.len() - 2);
+            }
+
+            SharedString::from(name)
+        } else {
+            self.display_member(cx).name()
+        }
+    }
+
+    /// Emits a new message signal to the current room
+    pub fn emit_message(&self, message: NewMessage, cx: &mut Context<Self>) {
+        cx.emit(RoomEvent::Incoming(message));
+    }
+
+    /// Emits a signal to reload the current room's messages.
+    pub fn emit_refresh(&mut self, cx: &mut Context<Self>) {
+        cx.emit(RoomEvent::Reload);
+    }
+
+    /// Get gossip relays for each member
+    pub fn connect(&self, cx: &App) -> Task<Result<(), Error>> {
+        let nostr = NostrRegistry::global(cx);
+        let client = nostr.read(cx).client();
+        let members = self.members();
+        let id = SubscriptionId::new(format!("room-{}", self.id));
+
+        cx.background_spawn(async move {
+            let signer = client.signer().await?;
+            let public_key = signer.get_public_key().await?;
+
+            // Subscription options
+            let opts = SubscribeAutoCloseOptions::default()
+                .timeout(Some(Duration::from_secs(2)))
+                .exit_policy(ReqExitPolicy::ExitOnEOSE);
+
+            for member in members.into_iter() {
+                if member == public_key {
+                    continue;
+                };
+
+                // Construct a filter for gossip relays
+                let filter = Filter::new().kind(Kind::RelayList).author(member).limit(1);
+
+                // Subscribe to get member's gossip relays
+                client
+                    .subscribe_with_id(id.clone(), filter, Some(opts))
+                    .await?;
+            }
+
+            Ok(())
+        })
+    }
+
+    /// Get all messages belonging to the room
+    pub fn get_messages(&self, cx: &App) -> Task<Result<Vec<UnsignedEvent>, Error>> {
+        let nostr = NostrRegistry::global(cx);
+        let client = nostr.read(cx).client();
+        let conversation_id = self.id.to_string();
+
+        cx.background_spawn(async move {
+            let filter = Filter::new()
+                .kind(Kind::ApplicationSpecificData)
+                .custom_tag(SingleLetterTag::lowercase(Alphabet::C), conversation_id);
+
+            let messages = client
+                .database()
+                .query(filter)
+                .await?
+                .into_iter()
+                .filter_map(|event| UnsignedEvent::from_json(&event.content).ok())
+                .sorted_by_key(|message| message.created_at)
+                .collect();
+
+            Ok(messages)
+        })
+    }
+
+    /// Create a new message event (unsigned)
+    pub fn create_message(&self, content: &str, replies: &[EventId], cx: &App) -> UnsignedEvent {
+        let nostr = NostrRegistry::global(cx);
+
+        // Get current user
+        let public_key = nostr.read(cx).identity().read(cx).public_key();
+
+        // Get room's subject
+        let subject = self.subject.clone();
+
+        let mut tags = vec![];
+
+        // Add receivers
+        //
+        // NOTE: current user will be removed from the list of receivers
+        for member in self.members.iter() {
+            // Get relay hint if available
+            let relay_url = nostr.read(cx).relay_hint(member, cx);
+
+            // Construct a public key tag with relay hint
+            let tag = TagStandard::PublicKey {
+                public_key: member.to_owned(),
+                relay_url,
+                alias: None,
+                uppercase: false,
+            };
+
+            tags.push(Tag::from_standardized_without_cell(tag));
+        }
+
+        // Add subject tag if it's present
+        if let Some(value) = subject {
+            tags.push(Tag::from_standardized_without_cell(TagStandard::Subject(
+                value.to_string(),
+            )));
+        }
+
+        // Add reply/quote tag
+        if replies.len() == 1 {
+            tags.push(Tag::event(replies[0]))
+        } else {
+            for id in replies {
+                let tag = TagStandard::Quote {
+                    event_id: id.to_owned(),
+                    relay_url: None,
+                    public_key: None,
+                };
+                tags.push(Tag::from_standardized_without_cell(tag))
+            }
+        }
+
+        // Construct a direct message event
+        //
+        // WARNING: never sign and send this event to relays
+        let mut event = EventBuilder::new(Kind::PrivateDirectMessage, content)
+            .tags(tags)
+            .build(public_key);
+
+        // Ensure the event id has been generated
+        event.ensure_id();
+
+        event
+    }
+
+    /// Create a task to send a message to all room members
+    pub fn send_message(
+        &self,
+        rumor: &UnsignedEvent,
+        cx: &App,
+    ) -> Task<Result<Vec<SendReport>, Error>> {
+        let nostr = NostrRegistry::global(cx);
+        let client = nostr.read(cx).client();
+
+        // Get current user's public key and relays
+        let current_user = nostr.read(cx).identity().read(cx).public_key();
+        let current_user_relays = nostr.read(cx).messaging_relays(&current_user, cx);
+
+        let rumor = rumor.to_owned();
+
+        // Get all members and their messaging relays
+        let task = self.members_with_relays(cx);
+
+        cx.background_spawn(async move {
+            let signer = client.signer().await?;
+            let current_user_relays = current_user_relays.await;
+            let mut members = task.await;
+
+            // Remove the current user's public key from the list of receivers
+            // the current user will be handled separately
+            members.retain(|(this, _)| this != &current_user);
+
+            // Collect the send reports
+            let mut reports: Vec<SendReport> = vec![];
+
+            for (receiver, relays) in members.into_iter() {
+                // Check if there are any relays to send the message to
+                if relays.is_empty() {
+                    reports.push(SendReport::new(receiver).relays_not_found());
+                    continue;
+                }
+
+                // Ensure relay connection
+                for url in relays.iter() {
+                    client.add_relay(url).await?;
+                    client.connect_relay(url).await?;
+                }
+
+                // Construct the gift wrap event
+                let event =
+                    EventBuilder::gift_wrap(&signer, &receiver, rumor.clone(), vec![]).await?;
+
+                // Send the gift wrap event to the messaging relays
+                match client.send_event_to(relays, &event).await {
+                    Ok(output) => {
+                        let id = output.id().to_owned();
+                        let auth = output.failed.iter().any(|(_, s)| s.starts_with("auth-"));
+                        let report = SendReport::new(receiver).status(output);
+                        let tracker = tracker().read().await;
+
+                        if auth {
+                            // Wait for authenticated and resent event successfully
+                            for attempt in 0..=SEND_RETRY {
+                                // Check if event was successfully resent
+                                if tracker.is_sent_by_coop(&id) {
+                                    let output = Output::new(id);
+                                    let report = SendReport::new(receiver).status(output);
+                                    reports.push(report);
+                                    break;
+                                }
+
+                                // Check if retry limit exceeded
+                                if attempt == SEND_RETRY {
+                                    reports.push(report);
+                                    break;
+                                }
+
+                                smol::Timer::after(Duration::from_millis(1200)).await;
+                            }
+                        } else {
+                            reports.push(report);
+                        }
+                    }
+                    Err(e) => {
+                        reports.push(SendReport::new(receiver).error(e.to_string()));
+                    }
+                }
+            }
+
+            // Construct the gift-wrapped event
+            let event =
+                EventBuilder::gift_wrap(&signer, &current_user, rumor.clone(), vec![]).await?;
+
+            // Only send a backup message to current user if sent successfully to others
+            if reports.iter().all(|r| r.is_sent_success()) {
+                // Check if there are any relays to send the event to
+                if current_user_relays.is_empty() {
+                    reports.push(SendReport::new(current_user).relays_not_found());
+                    return Ok(reports);
+                }
+
+                // Ensure relay connection
+                for url in current_user_relays.iter() {
+                    client.add_relay(url).await?;
+                    client.connect_relay(url).await?;
+                }
+
+                // Send the event to the messaging relays
+                match client.send_event_to(current_user_relays, &event).await {
+                    Ok(output) => {
+                        reports.push(SendReport::new(current_user).status(output));
+                    }
+                    Err(e) => {
+                        reports.push(SendReport::new(current_user).error(e.to_string()));
+                    }
+                }
+            } else {
+                reports.push(SendReport::new(current_user).on_hold(event));
+            }
+
+            Ok(reports)
+        })
+    }
+
+    /// Create a task to resend a failed message
+    pub fn resend_message(
+        &self,
+        reports: Vec<SendReport>,
+        cx: &App,
+    ) -> Task<Result<Vec<SendReport>, Error>> {
+        let nostr = NostrRegistry::global(cx);
+        let client = nostr.read(cx).client();
+
+        cx.background_spawn(async move {
+            let mut resend_reports = vec![];
+
+            for report in reports.into_iter() {
+                let receiver = report.receiver;
+
+                // Process failed events
+                if let Some(output) = report.status {
+                    let id = output.id();
+                    let urls: Vec<&RelayUrl> = output.failed.keys().collect();
+
+                    if let Some(event) = client.database().event_by_id(id).await? {
+                        for url in urls.into_iter() {
+                            let relay = client.pool().relay(url).await?;
+                            let id = relay.send_event(&event).await?;
+
+                            let resent: Output<EventId> = Output {
+                                val: id,
+                                success: HashSet::from([url.to_owned()]),
+                                failed: HashMap::new(),
+                            };
+
+                            resend_reports.push(SendReport::new(receiver).status(resent));
+                        }
+                    }
+                }
+
+                // Process the on hold event if it exists
+                if let Some(event) = report.on_hold {
+                    // Send the event to the messaging relays
+                    match client.send_event(&event).await {
+                        Ok(output) => {
+                            resend_reports.push(SendReport::new(receiver).status(output));
+                        }
+                        Err(e) => {
+                            resend_reports.push(SendReport::new(receiver).error(e.to_string()));
+                        }
+                    }
+                }
+            }
+
+            Ok(resend_reports)
+        })
+    }
+}

crates/chat_ui/Cargo.toml

@@ -0,0 +1,31 @@
+[package]
+name = "chat_ui"
+version.workspace = true
+edition.workspace = true
+publish.workspace = true
+
+[dependencies]
+state = { path = "../state" }
+ui = { path = "../ui" }
+theme = { path = "../theme" }
+common = { path = "../common" }
+person = { path = "../person" }
+chat = { path = "../chat" }
+settings = { path = "../settings" }
+
+gpui.workspace = true
+gpui_tokio.workspace = true
+
+nostr-sdk.workspace = true
+anyhow.workspace = true
+itertools.workspace = true
+smallvec.workspace = true
+smol.workspace = true
+log.workspace = true
+serde.workspace = true
+serde_json.workspace = true
+
+indexset = "0.12.3"
+emojis = "0.6.4"
+once_cell = "1.19.0"
+regex = "1"

crates/chat_ui/src/actions.rs

@@ -0,0 +1,17 @@
+use gpui::Action;
+use nostr_sdk::prelude::*;
+use serde::Deserialize;
+
+#[derive(Action, Clone, PartialEq, Eq, Deserialize)]
+#[action(namespace = chat, no_json)]
+pub struct SeenOn(pub EventId);
+
+/// Define a open public key action
+#[derive(Action, Clone, PartialEq, Eq, Deserialize, Debug)]
+#[action(namespace = pubkey, no_json)]
+pub struct OpenPublicKey(pub PublicKey);
+
+/// Define a copy inline public key action
+#[derive(Action, Clone, PartialEq, Eq, Deserialize, Debug)]
+#[action(namespace = pubkey, no_json)]
+pub struct CopyPublicKey(pub PublicKey);

crates/chat_ui/src/emoji.rs

@@ -6,11 +6,10 @@ use gpui::{
     RenderOnce, SharedString, StatefulInteractiveElement, Styled, WeakEntity, Window,
 };
 use theme::ActiveTheme;
-
-use crate::button::{Button, ButtonVariants};
-use crate::input::InputState;
-use crate::popover::{Popover, PopoverContent};
-use crate::{Icon, Sizable, Size};
+use ui::button::{Button, ButtonVariants};
+use ui::input::InputState;
+use ui::popover::{Popover, PopoverContent};
+use ui::{Icon, Sizable, Size};
 
 static EMOJIS: OnceLock<Vec<SharedString>> = OnceLock::new();
 
@@ -31,27 +30,33 @@ fn get_emojis() -> &'static Vec<SharedString> {
 
 #[derive(IntoElement)]
 pub struct EmojiPicker {
+    target: Option<WeakEntity<InputState>>,
     icon: Option<Icon>,
-    size: Size,
     anchor: Option<Corner>,
-    target_input: WeakEntity<InputState>,
+    size: Size,
 }
 
 impl EmojiPicker {
-    pub fn new(target_input: WeakEntity<InputState>) -> Self {
+    pub fn new() -> Self {
         Self {
-            target_input,
             size: Size::default(),
+            target: None,
             anchor: None,
             icon: None,
         }
     }
 
+    pub fn target(mut self, target: WeakEntity<InputState>) -> Self {
+        self.target = Some(target);
+        self
+    }
+
     pub fn icon(mut self, icon: impl Into<Icon>) -> Self {
         self.icon = Some(icon.into());
         self
     }
 
+    #[allow(dead_code)]
     pub fn anchor(mut self, corner: Corner) -> Self {
         self.anchor = Some(corner);
         self
@@ -67,7 +72,7 @@ impl Sizable for EmojiPicker {
 
 impl RenderOnce for EmojiPicker {
     fn render(self, _window: &mut Window, _cx: &mut App) -> impl IntoElement {
-        Popover::new("emoji-picker")
+        Popover::new("emojis")
             .map(|this| {
                 if let Some(corner) = self.anchor {
                     this.anchor(corner)
@@ -76,13 +81,13 @@ impl RenderOnce for EmojiPicker {
                 }
             })
             .trigger(
-                Button::new("emoji-trigger")
+                Button::new("emojis-trigger")
                     .when_some(self.icon, |this, icon| this.icon(icon))
                     .ghost()
                     .with_size(self.size),
             )
             .content(move |window, cx| {
-                let input = self.target_input.clone();
+                let input = self.target.clone();
 
                 cx.new(|cx| {
                     PopoverContent::new(window, cx, move |_window, cx| {
@@ -104,18 +109,18 @@ impl RenderOnce for EmojiPicker {
                                     .hover(|this| this.bg(cx.theme().ghost_element_hover))
                                     .on_click({
                                         let item = e.clone();
-                                        let input = input.upgrade();
+                                        let input = input.clone();
 
                                         move |_, window, cx| {
                                             if let Some(input) = input.as_ref() {
-                                                input.update(cx, |this, cx| {
-                                                    let current = this.value();
-                                                    let new_text = if current.is_empty() {
+                                                _ = input.update(cx, |this, cx| {
+                                                    let value = this.value();
+                                                    let new_text = if value.is_empty() {
                                                         format!("{item}")
-                                                    } else if current.ends_with(" ") {
-                                                        format!("{current}{item}")
+                                                    } else if value.ends_with(" ") {
+                                                        format!("{value}{item}")
                                                     } else {
-                                                        format!("{current} {item}")
+                                                        format!("{value} {item}")
                                                     };
                                                     this.set_value(new_text, window, cx);
                                                 });

crates/chat_ui/src/subject.rs

@@ -0,0 +1,60 @@
+use gpui::{
+    div, App, AppContext, Context, Entity, IntoElement, ParentElement, Render, SharedString,
+    Styled, Window,
+};
+use theme::ActiveTheme;
+use ui::input::{InputState, TextInput};
+use ui::{v_flex, Sizable};
+
+pub fn init(subject: Option<String>, window: &mut Window, cx: &mut App) -> Entity<Subject> {
+    cx.new(|cx| Subject::new(subject, window, cx))
+}
+
+pub struct Subject {
+    input: Entity<InputState>,
+}
+
+impl Subject {
+    pub fn new(subject: Option<String>, window: &mut Window, cx: &mut Context<Self>) -> Self {
+        let input = cx.new(|cx| InputState::new(window, cx).placeholder("Plan for holiday"));
+
+        if let Some(value) = subject {
+            input.update(cx, |this, cx| {
+                this.set_value(value, window, cx);
+            });
+        };
+
+        Self { input }
+    }
+
+    pub fn new_subject(&self, cx: &App) -> SharedString {
+        self.input.read(cx).value()
+    }
+}
+
+impl Render for Subject {
+    fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
+        v_flex()
+            .gap_2()
+            .child(
+                v_flex()
+                    .gap_1()
+                    .child(
+                        div()
+                            .text_sm()
+                            .text_color(cx.theme().text_muted)
+                            .child(SharedString::from("Subject:")),
+                    )
+                    .child(TextInput::new(&self.input).small()),
+            )
+            .child(
+                div()
+                    .text_xs()
+                    .italic()
+                    .text_color(cx.theme().text_placeholder)
+                    .child(SharedString::from(
+                        "Subject will be updated when you send a new message.",
+                    )),
+            )
+    }
+}

crates/chat_ui/src/text.rs

@@ -1,22 +1,20 @@
 use std::ops::Range;
 use std::sync::Arc;
 
-use common::display::RenderedProfile;
 use gpui::{
-    AnyElement, AnyView, App, ElementId, HighlightStyle, InteractiveText, IntoElement,
-    SharedString, StyledText, UnderlineStyle, Window,
+    AnyElement, App, ElementId, HighlightStyle, InteractiveText, IntoElement, SharedString,
+    StyledText, UnderlineStyle, Window,
 };
-use linkify::{LinkFinder, LinkKind};
 use nostr_sdk::prelude::*;
 use once_cell::sync::Lazy;
+use person::PersonRegistry;
 use regex::Regex;
-use registry::Registry;
 use theme::ActiveTheme;
 
 use crate::actions::OpenPublicKey;
 
 static URL_REGEX: Lazy<Regex> = Lazy::new(|| {
-    Regex::new(r"^(?:[a-zA-Z]+://)?([a-zA-Z0-9-]+\.)+[a-zA-Z]{2,}(:\d+)?(/.*)?$").unwrap()
+    Regex::new(r"(?i)(?:^|\s)(?:https?://)?(?:[a-z0-9](?:[a-z0-9-]{0,61}[a-z0-9])?\.)+[a-z]{2,}(?::\d+)?(?:/[^\s]*)?(?:\s|$)").unwrap()
 });
 
 static NOSTR_URI_REGEX: Lazy<Regex> =
@@ -24,43 +22,16 @@ static NOSTR_URI_REGEX: Lazy<Regex> =
 
 #[derive(Debug, Clone, PartialEq, Eq)]
 pub enum Highlight {
-    Link(HighlightStyle),
+    Link,
     Nostr,
 }
 
-impl Highlight {
-    fn link() -> Self {
-        Self::Link(HighlightStyle {
-            underline: Some(UnderlineStyle {
-                thickness: 1.0.into(),
-                ..Default::default()
-            }),
-            ..Default::default()
-        })
-    }
-
-    fn nostr() -> Self {
-        Self::Nostr
-    }
-}
-
-impl From<HighlightStyle> for Highlight {
-    fn from(style: HighlightStyle) -> Self {
-        Self::Link(style)
-    }
-}
-
-type CustomRangeTooltipFn =
-    Option<Arc<dyn Fn(usize, Range<usize>, &mut Window, &mut App) -> Option<AnyView>>>;
-
 #[derive(Default)]
 pub struct RenderedText {
     pub text: SharedString,
     pub highlights: Vec<(Range<usize>, Highlight)>,
     pub link_ranges: Vec<Range<usize>>,
     pub link_urls: Arc<[String]>,
-    pub custom_ranges: Vec<Range<usize>>,
-    custom_ranges_tooltip_fn: CustomRangeTooltipFn,
 }
 
 impl RenderedText {
@@ -86,18 +57,9 @@ impl RenderedText {
             link_urls: link_urls.into(),
             link_ranges,
             highlights,
-            custom_ranges: Vec::new(),
-            custom_ranges_tooltip_fn: None,
         }
     }
 
-    pub fn set_tooltip_builder_for_custom_ranges<F>(&mut self, f: F)
-    where
-        F: Fn(usize, Range<usize>, &mut Window, &mut App) -> Option<AnyView> + 'static,
-    {
-        self.custom_ranges_tooltip_fn = Some(Arc::new(f));
-    }
-
     pub fn element(&self, id: ElementId, window: &Window, cx: &App) -> AnyElement {
         let link_color = cx.theme().text_accent;
 
@@ -109,17 +71,11 @@ impl RenderedText {
                     (
                         range.clone(),
                         match highlight {
-                            Highlight::Link(highlight) => {
-                                // Check if this is a link highlight by seeing if it has an underline
-                                if highlight.underline.is_some() {
-                                    // It's a link, so apply the link color
-                                    let mut link_style = *highlight;
-                                    link_style.color = Some(link_color);
-                                    link_style
-                                } else {
-                                    *highlight
-                                }
-                            }
+                            Highlight::Link => HighlightStyle {
+                                color: Some(link_color),
+                                underline: Some(UnderlineStyle::default()),
+                                ..Default::default()
+                            },
                             Highlight::Nostr => HighlightStyle {
                                 color: Some(link_color),
                                 ..Default::default()
@@ -134,49 +90,22 @@ impl RenderedText {
             move |ix, window, cx| {
                 let token = link_urls[ix].as_str();
 
-                if token.starts_with("nostr:") {
-                    let clean_url = token.replace("nostr:", "");
-                    let Ok(public_key) = PublicKey::parse(&clean_url) else {
-                        log::error!("Failed to parse public key from: {clean_url}");
-                        return;
-                    };
-                    window.dispatch_action(Box::new(OpenPublicKey(public_key)), cx);
-                } else if is_url(token) {
-                    if !token.starts_with("http") {
-                        cx.open_url(&format!("https://{token}"));
-                    } else {
-                        cx.open_url(token);
+                if let Some(clean_url) = token.strip_prefix("nostr:") {
+                    if let Ok(public_key) = PublicKey::parse(clean_url) {
+                        window.dispatch_action(Box::new(OpenPublicKey(public_key)), cx);
                     }
+                } else if is_url(token) {
+                    let url = if token.starts_with("http") {
+                        token.to_string()
+                    } else {
+                        format!("https://{token}")
+                    };
+                    cx.open_url(&url);
                 } else {
                     log::warn!("Unrecognized token {token}")
                 }
             }
         })
-        .tooltip({
-            let link_ranges = self.link_ranges.clone();
-            let link_urls = self.link_urls.clone();
-            let custom_tooltip_ranges = self.custom_ranges.clone();
-            let custom_tooltip_fn = self.custom_ranges_tooltip_fn.clone();
-            move |idx, window, cx| {
-                for (ix, range) in link_ranges.iter().enumerate() {
-                    if range.contains(&idx) {
-                        let url = &link_urls[ix];
-                        if url.starts_with("http") {
-                            // return Some(LinkPreview::new(url, cx));
-                        }
-                        // You can add custom tooltip handling for mentions here
-                    }
-                }
-                for range in &custom_tooltip_ranges {
-                    if range.contains(&idx) {
-                        if let Some(f) = &custom_tooltip_fn {
-                            return f(idx, range.clone(), window, cx);
-                        }
-                    }
-                }
-                None
-            }
-        })
         .into_any_element()
     }
 }
@@ -192,18 +121,11 @@ fn render_plain_text_mut(
     // Copy the content directly
     text.push_str(content);
 
-    // Initialize the link finder
-    let mut finder = LinkFinder::new();
-    finder.url_must_have_scheme(false);
-    finder.kinds(&[LinkKind::Url]);
-
     // Collect all URLs
     let mut url_matches: Vec<(Range<usize>, String)> = Vec::new();
 
-    for link in finder.links(content) {
-        let start = link.start();
-        let end = link.end();
-        let range = start..end;
+    for link in URL_REGEX.find_iter(content) {
+        let range = link.start()..link.end();
         let url = link.as_str().to_string();
 
         url_matches.push((range, url));
@@ -213,9 +135,7 @@ fn render_plain_text_mut(
     let mut nostr_matches: Vec<(Range<usize>, String)> = Vec::new();
 
     for nostr_match in NOSTR_URI_REGEX.find_iter(content) {
-        let start = nostr_match.start();
-        let end = nostr_match.end();
-        let range = start..end;
+        let range = nostr_match.start()..nostr_match.end();
         let nostr_uri = nostr_match.as_str().to_string();
 
         // Check if this nostr URI overlaps with any already processed URL
@@ -239,12 +159,9 @@ fn render_plain_text_mut(
     for (range, entity) in all_matches {
         // Handle URL token
         if is_url(&entity) {
-            // Add underline highlight
-            highlights.push((range.clone(), Highlight::link()));
-            // Make it clickable
+            highlights.push((range.clone(), Highlight::Link));
             link_ranges.push(range);
             link_urls.push(entity);
-
             continue;
         };
 
@@ -305,75 +222,6 @@ fn render_plain_text_mut(
             }
         }
     }
-
-    fn render_pubkey(
-        public_key: PublicKey,
-        text: &mut String,
-        range: &Range<usize>,
-        highlights: &mut Vec<(Range<usize>, Highlight)>,
-        link_ranges: &mut Vec<Range<usize>>,
-        link_urls: &mut Vec<String>,
-        cx: &App,
-    ) {
-        let registry = Registry::read_global(cx);
-        let profile = registry.get_person(&public_key, cx);
-        let display_name = format!("@{}", profile.display_name());
-
-        // Replace token with display name
-        text.replace_range(range.clone(), &display_name);
-
-        // Adjust ranges
-        let new_length = display_name.len();
-        let length_diff = new_length as isize - (range.end - range.start) as isize;
-        // New range for the replacement
-        let new_range = range.start..(range.start + new_length);
-
-        // Add highlight for the profile name
-        highlights.push((new_range.clone(), Highlight::nostr()));
-        // Make it clickable
-        link_ranges.push(new_range);
-        link_urls.push(format!("nostr:{}", profile.public_key().to_hex()));
-
-        // Adjust subsequent ranges if needed
-        if length_diff != 0 {
-            adjust_ranges(highlights, link_ranges, range.end, length_diff);
-        }
-    }
-
-    fn render_bech32(
-        bech32: String,
-        text: &mut String,
-        range: &Range<usize>,
-        highlights: &mut Vec<(Range<usize>, Highlight)>,
-        link_ranges: &mut Vec<Range<usize>>,
-        link_urls: &mut Vec<String>,
-    ) {
-        let njump_url = format!("https://njump.me/{bech32}");
-
-        // Create a shortened display format for the URL
-        let shortened_entity = format_shortened_entity(&bech32);
-        let display_text = format!("https://njump.me/{shortened_entity}");
-
-        // Replace the original entity with the shortened display version
-        text.replace_range(range.clone(), &display_text);
-
-        // Adjust the ranges
-        let new_length = display_text.len();
-        let length_diff = new_length as isize - (range.end - range.start) as isize;
-        // New range for the replacement
-        let new_range = range.start..(range.start + new_length);
-
-        // Add underline highlight
-        highlights.push((new_range.clone(), Highlight::link()));
-        // Make it clickable
-        link_ranges.push(new_range);
-        link_urls.push(njump_url);
-
-        // Adjust subsequent ranges if needed
-        if length_diff != 0 {
-            adjust_ranges(highlights, link_ranges, range.end, length_diff);
-        }
-    }
 }
 
 /// Check if a string is a URL
@@ -395,6 +243,61 @@ fn format_shortened_entity(entity: &str) -> String {
     }
 }
 
+fn render_pubkey(
+    public_key: PublicKey,
+    text: &mut String,
+    range: &Range<usize>,
+    highlights: &mut Vec<(Range<usize>, Highlight)>,
+    link_ranges: &mut Vec<Range<usize>>,
+    link_urls: &mut Vec<String>,
+    cx: &App,
+) {
+    let persons = PersonRegistry::global(cx);
+    let profile = persons.read(cx).get(&public_key, cx);
+    let display_name = format!("@{}", profile.name());
+
+    text.replace_range(range.clone(), &display_name);
+
+    let new_length = display_name.len();
+    let length_diff = new_length as isize - (range.end - range.start) as isize;
+    let new_range = range.start..(range.start + new_length);
+
+    highlights.push((new_range.clone(), Highlight::Nostr));
+    link_ranges.push(new_range);
+    link_urls.push(format!("nostr:{}", profile.public_key().to_hex()));
+
+    if length_diff != 0 {
+        adjust_ranges(highlights, link_ranges, range.end, length_diff);
+    }
+}
+
+fn render_bech32(
+    bech32: String,
+    text: &mut String,
+    range: &Range<usize>,
+    highlights: &mut Vec<(Range<usize>, Highlight)>,
+    link_ranges: &mut Vec<Range<usize>>,
+    link_urls: &mut Vec<String>,
+) {
+    let njump_url = format!("https://njump.me/{bech32}");
+    let shortened_entity = format_shortened_entity(&bech32);
+    let display_text = format!("https://njump.me/{shortened_entity}");
+
+    text.replace_range(range.clone(), &display_text);
+
+    let new_length = display_text.len();
+    let length_diff = new_length as isize - (range.end - range.start) as isize;
+    let new_range = range.start..(range.start + new_length);
+
+    highlights.push((new_range.clone(), Highlight::Link));
+    link_ranges.push(new_range);
+    link_urls.push(njump_url);
+
+    if length_diff != 0 {
+        adjust_ranges(highlights, link_ranges, range.end, length_diff);
+    }
+}
+
 // Helper function to adjust ranges when text length changes
 fn adjust_ranges(
     highlights: &mut [(Range<usize>, Highlight)],

crates/client_keys/src/lib.rs

@@ -1,142 +0,0 @@
-use std::sync::atomic::Ordering;
-
-use global::app_state;
-use global::constants::KEYRING_URL;
-use gpui::{App, AppContext, Context, Entity, Global, Subscription, Window};
-use nostr_sdk::prelude::*;
-use smallvec::{smallvec, SmallVec};
-
-pub fn init(cx: &mut App) {
-    ClientKeys::set_global(cx.new(ClientKeys::new), cx);
-}
-
-struct GlobalClientKeys(Entity<ClientKeys>);
-
-impl Global for GlobalClientKeys {}
-
-pub struct ClientKeys {
-    keys: Option<Keys>,
-    #[allow(dead_code)]
-    subscriptions: SmallVec<[Subscription; 1]>,
-}
-
-impl ClientKeys {
-    /// Retrieve the Global Client Keys instance
-    pub fn global(cx: &App) -> Entity<Self> {
-        cx.global::<GlobalClientKeys>().0.clone()
-    }
-
-    /// Retrieve the Client Keys instance
-    pub fn read_global(cx: &App) -> &Self {
-        cx.global::<GlobalClientKeys>().0.read(cx)
-    }
-
-    /// Set the Global Client Keys instance
-    pub(crate) fn set_global(state: Entity<Self>, cx: &mut App) {
-        cx.set_global(GlobalClientKeys(state));
-    }
-
-    pub(crate) fn new(cx: &mut Context<Self>) -> Self {
-        let mut subscriptions = smallvec![];
-
-        subscriptions.push(cx.observe_new::<Self>(|this, window, cx| {
-            if let Some(window) = window {
-                this.load(window, cx);
-            }
-        }));
-
-        Self {
-            keys: None,
-            subscriptions,
-        }
-    }
-
-    pub fn load(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        // Prevent macOS from asking for password every time
-        // Only for debug builds
-        if cfg!(debug_assertions) && cfg!(target_os = "macos") {
-            log::warn!("Running debug build on macOS");
-            log::warn!("Skipping keychain access, generating new client keys");
-            self.new_keys(cx);
-            return;
-        }
-
-        let app_state = app_state();
-        let read_client_keys = cx.read_credentials(KEYRING_URL);
-
-        cx.spawn_in(window, async move |this, cx| {
-            if let Ok(Some((_, secret))) = read_client_keys.await {
-                // Update the client keys with the stored secret key from the keychain
-                this.update(cx, |this, cx| {
-                    let Ok(secret_key) = SecretKey::from_slice(&secret) else {
-                        this.set_keys(None, false, true, cx);
-                        return;
-                    };
-                    let keys = Keys::new(secret_key);
-                    this.set_keys(Some(keys), false, true, cx);
-                })
-                .ok();
-            } else if app_state.is_first_run.load(Ordering::Acquire) {
-                // 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);
-                })
-                .ok();
-            } else {
-                this.update(cx, |this, cx| {
-                    this.set_keys(None, false, true, cx);
-                })
-                .ok();
-            }
-        })
-        .detach();
-    }
-
-    pub(crate) fn set_keys(
-        &mut self,
-        keys: Option<Keys>,
-        persist: bool,
-        notify: bool,
-        cx: &mut Context<Self>,
-    ) {
-        if persist {
-            if let Some(keys) = keys.as_ref() {
-                let username = keys.public_key().to_hex();
-                let password = keys.secret_key().secret_bytes();
-                let write_keys = cx.write_credentials(KEYRING_URL, &username, &password);
-
-                cx.background_spawn(async move {
-                    if let Err(e) = write_keys.await {
-                        log::error!("Failed to save the client keys: {e}")
-                    }
-                })
-                .detach();
-            }
-        }
-
-        self.keys = keys;
-
-        // Notify GPUI to reload UI
-        if notify {
-            cx.notify();
-        }
-    }
-
-    pub fn new_keys(&mut self, cx: &mut Context<Self>) {
-        self.set_keys(Some(Keys::generate()), true, true, cx);
-    }
-
-    pub fn force_new_keys(&mut self, cx: &mut Context<Self>) {
-        self.set_keys(Some(Keys::generate()), true, false, cx);
-    }
-
-    pub fn keys(&self) -> Keys {
-        self.keys
-            .clone()
-            .expect("Keys should always be initialized")
-    }
-
-    pub fn has_keys(&self) -> bool {
-        self.keys.is_some()
-    }
-}

crates/common/Cargo.toml

@@ -5,12 +5,9 @@ edition.workspace = true
 publish.workspace = true
 
 [dependencies]
-global = { path = "../global" }
-
 gpui.workspace = true
-nostr-connect.workspace = true
 nostr-sdk.workspace = true
-nostr.workspace = true
+
 anyhow.workspace = true
 itertools.workspace = true
 chrono.workspace = true
@@ -19,6 +16,8 @@ smol.workspace = true
 futures.workspace = true
 reqwest.workspace = true
 log.workspace = true
-webbrowser.workspace = true
 
+dirs = "5.0"
 qrcode = "0.14.1"
+whoami = "1.6.1"
+nostr = { git = "https://github.com/rust-nostr/nostr" }

crates/common/src/constants.rs

@@ -0,0 +1,31 @@
+pub const CLIENT_NAME: &str = "Coop";
+pub const APP_ID: &str = "su.reya.coop";
+
+/// Bootstrap Relays.
+pub const BOOTSTRAP_RELAYS: [&str; 4] = [
+    "wss://relay.damus.io",
+    "wss://relay.primal.net",
+    "wss://relay.nos.social",
+    "wss://user.kindpag.es",
+];
+
+/// Search Relays.
+pub const SEARCH_RELAYS: [&str; 2] = ["wss://search.nos.today", "wss://relay.noswhere.com"];
+
+/// Default relay for Nostr Connect
+pub const NOSTR_CONNECT_RELAY: &str = "wss://relay.nsec.app";
+
+/// Default retry count for fetching NIP-17 relays
+pub const RELAY_RETRY: u64 = 2;
+
+/// Default retry count for sending messages
+pub const SEND_RETRY: u64 = 10;
+
+/// Default timeout (in seconds) for Nostr Connect
+pub const NOSTR_CONNECT_TIMEOUT: u64 = 200;
+
+/// Default timeout (in seconds) for Nostr Connect (Bunker)
+pub const BUNKER_TIMEOUT: u64 = 30;
+
+/// Default width of the sidebar.
+pub const DEFAULT_SIDEBAR_WIDTH: f32 = 240.;

crates/common/src/display.rs

@@ -2,8 +2,7 @@ use std::sync::Arc;
 
 use anyhow::{anyhow, Error};
 use chrono::{Local, TimeZone};
-use global::constants::IMAGE_RESIZE_SERVICE;
-use gpui::{Image, ImageFormat, SharedString, SharedUri};
+use gpui::{Image, ImageFormat, SharedString};
 use nostr_sdk::prelude::*;
 use qrcode::render::svg;
 use qrcode::QrCode;
@@ -14,14 +13,15 @@ const MINUTES_IN_HOUR: i64 = 60;
 const HOURS_IN_DAY: i64 = 24;
 const DAYS_IN_MONTH: i64 = 30;
 const FALLBACK_IMG: &str = "https://image.nostr.build/c30703b48f511c293a9003be8100cdad37b8798b77a1dc3ec6eb8a20443d5dea.png";
+const IMAGE_RESIZE_SERVICE: &str = "https://wsrv.nl";
 
 pub trait RenderedProfile {
-    fn avatar(&self, proxy: bool) -> SharedUri;
+    fn avatar(&self, proxy: bool) -> SharedString;
     fn display_name(&self) -> SharedString;
 }
 
 impl RenderedProfile for Profile {
-    fn avatar(&self, proxy: bool) -> SharedUri {
+    fn avatar(&self, proxy: bool) -> SharedString {
         self.metadata()
             .picture
             .as_ref()
@@ -32,12 +32,12 @@ impl RenderedProfile for Profile {
                         "{IMAGE_RESIZE_SERVICE}/?url={picture}&w=100&h=100&fit=cover&mask=circle&default={FALLBACK_IMG}&n=-1"
                     );
 
-                    SharedUri::from(url)
+                    url.into()
                 } else {
-                    SharedUri::from(picture)
+                    picture.into()
                 }
             })
-            .unwrap_or_else(|| SharedUri::from("brand/avatar.png"))
+            .unwrap_or_else(|| "brand/avatar.png".into())
     }
 
     fn display_name(&self) -> SharedString {
@@ -64,7 +64,7 @@ pub trait RenderedTimestamp {
 
 impl RenderedTimestamp for Timestamp {
     fn to_human_time(&self) -> SharedString {
-        let input_time = match Local.timestamp_opt(self.as_u64() as i64, 0) {
+        let input_time = match Local.timestamp_opt(self.as_secs() as i64, 0) {
             chrono::LocalResult::Single(time) => time,
             _ => return SharedString::from("9999"),
         };
@@ -85,7 +85,7 @@ impl RenderedTimestamp for Timestamp {
     }
 
     fn to_ago(&self) -> SharedString {
-        let input_time = match Local.timestamp_opt(self.as_u64() as i64, 0) {
+        let input_time = match Local.timestamp_opt(self.as_secs() as i64, 0) {
             chrono::LocalResult::Single(time) => time,
             _ => return SharedString::from("1m"),
         };

crates/common/src/event.rs

@@ -1,4 +1,3 @@
-use std::collections::HashSet;
 use std::hash::{DefaultHasher, Hash, Hasher};
 
 use itertools::Itertools;
@@ -6,43 +5,23 @@ use nostr_sdk::prelude::*;
 
 pub trait EventUtils {
     fn uniq_id(&self) -> u64;
-    fn all_pubkeys(&self) -> Vec<PublicKey>;
-    fn compare_pubkeys(&self, other: &[PublicKey]) -> bool;
+    fn extract_public_keys(&self) -> Vec<PublicKey>;
 }
 
 impl EventUtils for Event {
     fn uniq_id(&self) -> u64 {
         let mut hasher = DefaultHasher::new();
-        let mut pubkeys: Vec<PublicKey> = vec![];
-
-        // Add all public keys from event
-        pubkeys.push(self.pubkey);
-        pubkeys.extend(self.tags.public_keys().collect::<Vec<_>>());
-
-        // Generate unique hash
-        pubkeys
-            .into_iter()
-            .unique()
-            .sorted()
-            .collect::<Vec<_>>()
-            .hash(&mut hasher);
-
+        let mut pubkeys: Vec<PublicKey> = self.extract_public_keys();
+        pubkeys.sort();
+        pubkeys.hash(&mut hasher);
         hasher.finish()
     }
 
-    fn all_pubkeys(&self) -> Vec<PublicKey> {
+    fn extract_public_keys(&self) -> Vec<PublicKey> {
         let mut public_keys: Vec<PublicKey> = self.tags.public_keys().copied().collect();
         public_keys.push(self.pubkey);
 
-        public_keys
-    }
-
-    fn compare_pubkeys(&self, other: &[PublicKey]) -> bool {
-        let pubkeys = self.all_pubkeys();
-        let a: HashSet<_> = pubkeys.iter().collect();
-        let b: HashSet<_> = other.iter().collect();
-
-        a == b
+        public_keys.into_iter().unique().collect()
     }
 }
 
@@ -66,18 +45,9 @@ impl EventUtils for UnsignedEvent {
         hasher.finish()
     }
 
-    fn all_pubkeys(&self) -> Vec<PublicKey> {
+    fn extract_public_keys(&self) -> Vec<PublicKey> {
         let mut public_keys: Vec<PublicKey> = self.tags.public_keys().copied().collect();
         public_keys.push(self.pubkey);
-
-        public_keys
-    }
-
-    fn compare_pubkeys(&self, other: &[PublicKey]) -> bool {
-        let pubkeys = self.all_pubkeys();
-        let a: HashSet<_> = pubkeys.iter().collect();
-        let b: HashSet<_> = other.iter().collect();
-
-        a == b
+        public_keys.into_iter().unique().sorted().collect()
     }
 }

crates/common/src/lib.rs

@@ -1,5 +1,68 @@
-pub mod debounced_delay;
-pub mod display;
-pub mod event;
-pub mod nip05;
-pub mod nip96;
+use std::sync::OnceLock;
+
+pub use constants::*;
+pub use debounced_delay::*;
+pub use display::*;
+pub use event::*;
+pub use nip05::*;
+pub use nip96::*;
+use nostr_sdk::prelude::*;
+pub use paths::*;
+
+mod constants;
+mod debounced_delay;
+mod display;
+mod event;
+mod nip05;
+mod nip96;
+mod paths;
+
+static APP_NAME: OnceLock<String> = OnceLock::new();
+static NIP65_RELAYS: OnceLock<Vec<(RelayUrl, Option<RelayMetadata>)>> = OnceLock::new();
+static NIP17_RELAYS: OnceLock<Vec<RelayUrl>> = OnceLock::new();
+
+/// Get the app name
+pub fn app_name() -> &'static String {
+    APP_NAME.get_or_init(|| {
+        let devicename = whoami::devicename();
+        let platform = whoami::platform();
+
+        format!("{CLIENT_NAME} on {platform} ({devicename})")
+    })
+}
+
+/// Default NIP-65 Relays. Used for new account
+pub fn default_nip65_relays() -> &'static Vec<(RelayUrl, Option<RelayMetadata>)> {
+    NIP65_RELAYS.get_or_init(|| {
+        vec![
+            (
+                RelayUrl::parse("wss://nostr.mom").unwrap(),
+                Some(RelayMetadata::Read),
+            ),
+            (
+                RelayUrl::parse("wss://nostr.bitcoiner.social").unwrap(),
+                Some(RelayMetadata::Read),
+            ),
+            (
+                RelayUrl::parse("wss://nos.lol").unwrap(),
+                Some(RelayMetadata::Write),
+            ),
+            (
+                RelayUrl::parse("wss://relay.snort.social").unwrap(),
+                Some(RelayMetadata::Write),
+            ),
+            (RelayUrl::parse("wss://relay.primal.net").unwrap(), None),
+            (RelayUrl::parse("wss://relay.damus.io").unwrap(), None),
+        ]
+    })
+}
+
+/// Default NIP-17 Relays. Used for new account
+pub fn default_nip17_relays() -> &'static Vec<RelayUrl> {
+    NIP17_RELAYS.get_or_init(|| {
+        vec![
+            RelayUrl::parse("wss://nip17.com").unwrap(),
+            RelayUrl::parse("wss://auth.nostr1.com").unwrap(),
+        ]
+    })
+}

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.10"
+version = "0.3.0"
 out-dir = "../../dist"
 before-packaging-command = "cargo build --release"
 resources = ["Cargo.toml", "src"]
@@ -32,34 +32,32 @@ ui = { path = "../ui" }
 title_bar = { path = "../title_bar" }
 theme = { path = "../theme" }
 common = { path = "../common" }
-global = { path = "../global" }
-registry = { path = "../registry" }
+state = { path = "../state" }
+device = { path = "../device" }
+key_store = { path = "../key_store" }
+chat = { path = "../chat" }
+chat_ui = { path = "../chat_ui" }
 settings = { path = "../settings" }
-client_keys = { path = "../client_keys" }
 auto_update = { path = "../auto_update" }
-signer_proxy = { path = "../signer_proxy" }
+person = { path = "../person" }
+relay_auth = { path = "../relay_auth" }
 
-rust-i18n.workspace = true
-i18n.workspace = true
 gpui.workspace = true
 gpui_tokio.workspace = true
 reqwest_client.workspace = true
 
 nostr-connect.workspace = true
 nostr-sdk.workspace = true
-nostr.workspace = true
 
 anyhow.workspace = true
 serde.workspace = true
 serde_json.workspace = true
 itertools.workspace = true
-dirs.workspace = true
 log.workspace = true
 smallvec.workspace = true
 smol.workspace = true
 futures.workspace = true
 oneshot.workspace = true
-flume.workspace = true
 webbrowser.workspace = true
 
 indexset = "0.12.3"

crates/coop/src/actions.rs

@@ -1,15 +1,33 @@
 use std::sync::Mutex;
 
 use gpui::{actions, App};
+use key_store::{KeyItem, KeyStore};
 use nostr_connect::prelude::*;
+use state::NostrRegistry;
 
-actions!(coop, [ReloadMetadata, DarkMode, Settings, Logout, Quit]);
+// Sidebar actions
 actions!(sidebar, [Reload, RelayStatus]);
 
+// User actions
+actions!(
+    coop,
+    [
+        KeyringPopup,
+        DarkMode,
+        ViewProfile,
+        ViewRelays,
+        Themes,
+        Settings,
+        Logout,
+        Quit
+    ]
+);
+
 #[derive(Debug, Clone)]
 pub struct CoopAuthUrlHandler;
 
 impl AuthUrlHandler for CoopAuthUrlHandler {
+    #[allow(mismatched_lifetime_syntaxes)]
     fn on_auth_url(&self, auth_url: Url) -> BoxedFuture<Result<()>> {
         Box::pin(async move {
             log::info!("Received Auth URL: {auth_url}");
@@ -43,6 +61,33 @@ pub fn load_embedded_fonts(cx: &App) {
         .unwrap();
 }
 
+pub fn reset(cx: &mut App) {
+    let backend = KeyStore::global(cx).read(cx).backend();
+    let client = NostrRegistry::global(cx).read(cx).client();
+
+    cx.spawn(async move |cx| {
+        // Remove the signer
+        client.unset_signer().await;
+
+        // Delete user's credentials
+        backend
+            .delete_credentials(&KeyItem::User.to_string(), cx)
+            .await
+            .ok();
+
+        // Remove bunker's credentials if available
+        backend
+            .delete_credentials(&KeyItem::Bunker.to_string(), cx)
+            .await
+            .ok();
+
+        cx.update(|cx| {
+            cx.restart();
+        });
+    })
+    .detach();
+}
+
 pub fn quit(_: &Quit, cx: &mut App) {
     log::info!("Gracefully quitting the application . . .");
     cx.quit();

crates/coop/src/login/mod.rs

@@ -0,0 +1,427 @@
+use std::time::Duration;
+
+use anyhow::anyhow;
+use common::BUNKER_TIMEOUT;
+use gpui::prelude::FluentBuilder;
+use gpui::{
+    div, relative, AnyElement, App, AppContext, Context, Entity, EventEmitter, FocusHandle,
+    Focusable, IntoElement, ParentElement, Render, SharedString, Styled, Subscription, Window,
+};
+use key_store::{KeyItem, KeyStore};
+use nostr_connect::prelude::*;
+use smallvec::{smallvec, SmallVec};
+use state::NostrRegistry;
+use theme::ActiveTheme;
+use ui::button::{Button, ButtonVariants};
+use ui::dock_area::panel::{Panel, PanelEvent};
+use ui::input::{InputEvent, InputState, TextInput};
+use ui::notification::Notification;
+use ui::{v_flex, ContextModal, Disableable, StyledExt};
+
+use crate::actions::CoopAuthUrlHandler;
+
+pub fn init(window: &mut Window, cx: &mut App) -> Entity<Login> {
+    cx.new(|cx| Login::new(window, cx))
+}
+
+#[derive(Debug)]
+pub struct Login {
+    key_input: Entity<InputState>,
+    pass_input: Entity<InputState>,
+    error: Entity<Option<SharedString>>,
+    countdown: Entity<Option<u64>>,
+    require_password: bool,
+    logging_in: bool,
+
+    /// Panel
+    name: SharedString,
+    focus_handle: FocusHandle,
+
+    /// Event subscriptions
+    _subscriptions: SmallVec<[Subscription; 1]>,
+}
+
+impl Login {
+    fn new(window: &mut Window, cx: &mut Context<Self>) -> Self {
+        let key_input = cx.new(|cx| InputState::new(window, cx));
+        let pass_input = cx.new(|cx| InputState::new(window, cx).masked(true));
+
+        let error = cx.new(|_| None);
+        let countdown = cx.new(|_| None);
+
+        let mut subscriptions = smallvec![];
+
+        subscriptions.push(
+            // Subscribe to key input events and process login when the user presses enter
+            cx.subscribe_in(&key_input, window, |this, input, event, window, cx| {
+                match event {
+                    InputEvent::PressEnter { .. } => {
+                        this.login(window, cx);
+                    }
+                    InputEvent::Change => {
+                        if input.read(cx).value().starts_with("ncryptsec1") {
+                            this.require_password = true;
+                            cx.notify();
+                        }
+                    }
+                    _ => {}
+                };
+            }),
+        );
+
+        Self {
+            key_input,
+            pass_input,
+            error,
+            countdown,
+            name: "Welcome Back".into(),
+            focus_handle: cx.focus_handle(),
+            logging_in: false,
+            require_password: false,
+            _subscriptions: subscriptions,
+        }
+    }
+
+    fn login(&mut self, window: &mut Window, cx: &mut Context<Self>) {
+        if self.logging_in {
+            return;
+        };
+
+        // Prevent duplicate login requests
+        self.set_logging_in(true, cx);
+
+        let value = self.key_input.read(cx).value();
+        let password = self.pass_input.read(cx).value();
+
+        if value.starts_with("bunker://") {
+            self.login_with_bunker(&value, window, cx);
+        } else if value.starts_with("ncryptsec1") {
+            self.login_with_password(&value, &password, cx);
+        } else if value.starts_with("nsec1") {
+            if let Ok(secret) = SecretKey::parse(&value) {
+                let keys = Keys::new(secret);
+                self.login_with_keys(keys, cx);
+            } else {
+                self.set_error("Invalid", cx);
+            }
+        } else {
+            self.set_error("Invalid", cx);
+        }
+    }
+
+    fn login_with_bunker(&mut self, content: &str, window: &mut Window, cx: &mut Context<Self>) {
+        let Ok(uri) = NostrConnectUri::parse(content) else {
+            self.set_error("Bunker is not valid", cx);
+            return;
+        };
+
+        let app_keys = Keys::generate();
+        let timeout = Duration::from_secs(BUNKER_TIMEOUT);
+        let mut signer = NostrConnect::new(uri, app_keys.clone(), timeout, None).unwrap();
+
+        // Handle auth url with the default browser
+        signer.auth_url_handler(CoopAuthUrlHandler);
+
+        // Start countdown
+        cx.spawn_in(window, async move |this, cx| {
+            for i in (0..=BUNKER_TIMEOUT).rev() {
+                if i == 0 {
+                    this.update(cx, |this, cx| {
+                        this.set_countdown(None, cx);
+                    })
+                    .ok();
+                } else {
+                    this.update(cx, |this, cx| {
+                        this.set_countdown(Some(i), cx);
+                    })
+                    .ok();
+                }
+                cx.background_executor().timer(Duration::from_secs(1)).await;
+            }
+        })
+        .detach();
+
+        // Handle connection
+        cx.spawn_in(window, async move |this, cx| {
+            let result = signer.bunker_uri().await;
+
+            this.update_in(cx, |this, window, cx| {
+                match result {
+                    Ok(uri) => {
+                        this.save_connection(&app_keys, &uri, window, cx);
+                        this.connect(signer, cx);
+                    }
+                    Err(e) => {
+                        window.push_notification(Notification::error(e.to_string()), cx);
+                    }
+                };
+            })
+            .ok();
+        })
+        .detach();
+    }
+
+    fn save_connection(
+        &mut self,
+        keys: &Keys,
+        uri: &NostrConnectUri,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) {
+        let keystore = KeyStore::global(cx).read(cx).backend();
+        let username = keys.public_key().to_hex();
+        let secret = keys.secret_key().to_secret_bytes();
+        let mut clean_uri = uri.to_string();
+
+        // Clear the secret parameter in the URI if it exists
+        if let Some(s) = uri.secret() {
+            clean_uri = clean_uri.replace(s, "");
+        }
+
+        cx.spawn_in(window, async move |this, cx| {
+            let user_url = KeyItem::User.to_string();
+            let bunker_url = KeyItem::Bunker.to_string();
+            let user_password = clean_uri.into_bytes();
+
+            // Write bunker uri to keyring for further connection
+            if let Err(e) = keystore
+                .write_credentials(&user_url, "bunker", &user_password, cx)
+                .await
+            {
+                this.update_in(cx, |_, window, cx| {
+                    window.push_notification(e.to_string(), cx);
+                })
+                .ok();
+            }
+
+            // Write the app keys for further connection
+            if let Err(e) = keystore
+                .write_credentials(&bunker_url, &username, &secret, cx)
+                .await
+            {
+                this.update_in(cx, |_, window, cx| {
+                    window.push_notification(e.to_string(), cx);
+                })
+                .ok();
+            }
+        })
+        .detach();
+    }
+
+    fn connect(&mut self, signer: NostrConnect, cx: &mut Context<Self>) {
+        let nostr = NostrRegistry::global(cx);
+
+        nostr.update(cx, |this, cx| {
+            this.set_signer(signer, cx);
+        });
+    }
+
+    pub fn login_with_password(&mut self, content: &str, pwd: &str, cx: &mut Context<Self>) {
+        if pwd.is_empty() {
+            self.set_error("Password is required", cx);
+            return;
+        }
+
+        let Ok(enc) = EncryptedSecretKey::from_bech32(content) else {
+            self.set_error("Secret Key is invalid", cx);
+            return;
+        };
+
+        let password = pwd.to_owned();
+
+        // Decrypt in the background to ensure it doesn't block the UI
+        let task = cx.background_spawn(async move {
+            if let Ok(content) = enc.decrypt(&password) {
+                Ok(Keys::new(content))
+            } else {
+                Err(anyhow!("Invalid password"))
+            }
+        });
+
+        cx.spawn(async move |this, cx| {
+            let result = task.await;
+
+            this.update(cx, |this, cx| {
+                match result {
+                    Ok(keys) => {
+                        this.login_with_keys(keys, cx);
+                    }
+                    Err(e) => {
+                        this.set_error(e.to_string(), cx);
+                    }
+                };
+            })
+            .ok();
+        })
+        .detach();
+    }
+
+    pub fn login_with_keys(&mut self, keys: Keys, cx: &mut Context<Self>) {
+        let keystore = KeyStore::global(cx).read(cx).backend();
+        let username = keys.public_key().to_hex();
+        let secret = keys.secret_key().to_secret_hex().into_bytes();
+
+        cx.spawn(async move |this, cx| {
+            let bunker_url = KeyItem::User.to_string();
+
+            // Write the app keys for further connection
+            if let Err(e) = keystore
+                .write_credentials(&bunker_url, &username, &secret, cx)
+                .await
+            {
+                this.update(cx, |this, cx| {
+                    this.set_error(e.to_string(), cx);
+                })
+                .ok();
+            }
+
+            this.update(cx, |_this, cx| {
+                let nostr = NostrRegistry::global(cx);
+
+                nostr.update(cx, |this, cx| {
+                    this.set_signer(keys, cx);
+                });
+            })
+            .ok();
+        })
+        .detach();
+    }
+
+    fn set_error<S>(&mut self, message: S, cx: &mut Context<Self>)
+    where
+        S: Into<SharedString>,
+    {
+        // Reset the log in state
+        self.set_logging_in(false, cx);
+
+        // Reset the countdown
+        self.set_countdown(None, cx);
+
+        // Update error message
+        self.error.update(cx, |this, cx| {
+            *this = Some(message.into());
+            cx.notify();
+        });
+
+        // Clear the error message after 3 secs
+        cx.spawn(async move |this, cx| {
+            cx.background_executor().timer(Duration::from_secs(3)).await;
+
+            this.update(cx, |this, cx| {
+                this.error.update(cx, |this, cx| {
+                    *this = None;
+                    cx.notify();
+                });
+            })
+            .ok();
+        })
+        .detach();
+    }
+
+    fn set_logging_in(&mut self, status: bool, cx: &mut Context<Self>) {
+        self.logging_in = status;
+        cx.notify();
+    }
+
+    fn set_countdown(&mut self, i: Option<u64>, cx: &mut Context<Self>) {
+        self.countdown.update(cx, |this, cx| {
+            *this = i;
+            cx.notify();
+        });
+    }
+}
+
+impl Panel for Login {
+    fn panel_id(&self) -> SharedString {
+        self.name.clone()
+    }
+
+    fn title(&self, _cx: &App) -> AnyElement {
+        self.name.clone().into_any_element()
+    }
+}
+
+impl EventEmitter<PanelEvent> for Login {}
+
+impl Focusable for Login {
+    fn focus_handle(&self, _: &App) -> gpui::FocusHandle {
+        self.focus_handle.clone()
+    }
+}
+
+impl Render for Login {
+    fn render(&mut self, _window: &mut gpui::Window, cx: &mut Context<Self>) -> impl IntoElement {
+        v_flex()
+            .relative()
+            .size_full()
+            .items_center()
+            .justify_center()
+            .child(
+                v_flex()
+                    .w_96()
+                    .gap_10()
+                    .child(
+                        div()
+                            .text_center()
+                            .text_xl()
+                            .font_semibold()
+                            .line_height(relative(1.3))
+                            .child(SharedString::from("Continue with Private Key or Bunker")),
+                    )
+                    .child(
+                        v_flex()
+                            .gap_3()
+                            .text_sm()
+                            .child(
+                                v_flex()
+                                    .gap_1()
+                                    .text_sm()
+                                    .text_color(cx.theme().text_muted)
+                                    .child("nsec or bunker://")
+                                    .child(TextInput::new(&self.key_input)),
+                            )
+                            .when(self.require_password, |this| {
+                                this.child(
+                                    v_flex()
+                                        .gap_1()
+                                        .text_sm()
+                                        .text_color(cx.theme().text_muted)
+                                        .child("Password:")
+                                        .child(TextInput::new(&self.pass_input)),
+                                )
+                            })
+                            .child(
+                                Button::new("login")
+                                    .label("Continue")
+                                    .primary()
+                                    .loading(self.logging_in)
+                                    .disabled(self.logging_in)
+                                    .on_click(cx.listener(move |this, _, window, cx| {
+                                        this.login(window, cx);
+                                    })),
+                            )
+                            .when_some(self.countdown.read(cx).as_ref(), |this, i| {
+                                this.child(
+                                    div()
+                                        .text_xs()
+                                        .text_center()
+                                        .text_color(cx.theme().text_muted)
+                                        .child(SharedString::from(format!(
+                                            "Approve connection request from your signer in {} seconds",
+                                            i
+                                        ))),
+                                )
+                            })
+                            .when_some(self.error.read(cx).as_ref(), |this, error| {
+                                this.child(
+                                    div()
+                                        .text_xs()
+                                        .text_center()
+                                        .text_color(cx.theme().danger_foreground)
+                                        .child(error.clone()),
+                                )
+                            }),
+                    ),
+            )
+    }
+}

crates/coop/src/main.rs

@@ -1,8 +1,7 @@
 use std::sync::Arc;
 
 use assets::Assets;
-use global::constants::{APP_ID, APP_NAME};
-use global::{app_state, nostr_client};
+use common::{APP_ID, CLIENT_NAME};
 use gpui::{
     point, px, size, AppContext, Application, Bounds, KeyBinding, Menu, MenuItem, SharedString,
     TitlebarOptions, WindowBackgroundAppearance, WindowBounds, WindowDecorations, WindowKind,
@@ -12,22 +11,18 @@ use ui::Root;
 
 use crate::actions::{load_embedded_fonts, quit, Quit};
 
-pub(crate) mod actions;
-pub(crate) mod chatspace;
-pub(crate) mod views;
-
-i18n::init!();
+mod actions;
+mod chatspace;
+mod login;
+mod new_identity;
+mod sidebar;
+mod user;
+mod views;
 
 fn main() {
     // Initialize logging
     tracing_subscriber::fmt::init();
 
-    // Initialize the Nostr client
-    let _client = nostr_client();
-
-    // Initialize the coop simple storage
-    let _app_state = app_state();
-
     // Initialize the Application
     let app = Application::new()
         .with_assets(Assets)
@@ -66,7 +61,7 @@ fn main() {
             kind: WindowKind::Normal,
             app_id: Some(APP_ID.to_owned()),
             titlebar: Some(TitlebarOptions {
-                title: Some(SharedString::new_static(APP_NAME)),
+                title: Some(SharedString::new_static(CLIENT_NAME)),
                 traffic_light_position: Some(point(px(9.0), px(9.0))),
                 appears_transparent: true,
             }),
@@ -78,7 +73,6 @@ fn main() {
             // Bring the app to the foreground
             cx.activate(true);
 
-            // Root Entity
             cx.new(|cx| {
                 // Initialize the tokio runtime
                 gpui_tokio::init(cx);
@@ -86,18 +80,36 @@ fn main() {
                 // Initialize components
                 ui::init(cx);
 
-                // Initialize client keys
-                client_keys::init(cx);
+                // Initialize theme registry
+                theme::init(cx);
 
-                // Initialize app registry
-                registry::init(cx);
+                // Initialize backend for keys storage
+                key_store::init(cx);
+
+                // Initialize the nostr client
+                state::init(cx);
+
+                // Initialize device signer
+                //
+                // NIP-4e: https://github.com/nostr-protocol/nips/blob/per-device-keys/4e.md
+                device::init(cx);
 
                 // Initialize settings
                 settings::init(cx);
 
+                // Initialize relay auth registry
+                relay_auth::init(window, cx);
+
+                // Initialize app registry
+                chat::init(cx);
+
+                // Initialize person registry
+                person::init(cx);
+
                 // Initialize auto update
                 auto_update::init(cx);
 
+                // Root Entity
                 Root::new(chatspace::init(window, cx).into(), window, cx)
             })
         })

crates/coop/src/new_identity/backup.rs

@@ -0,0 +1,217 @@
+use std::time::Duration;
+
+use anyhow::{anyhow, Error};
+use common::home_dir;
+use gpui::{
+    div, App, AppContext, ClipboardItem, Context, Entity, IntoElement, ParentElement, Render,
+    SharedString, Styled, Task, Window,
+};
+use nostr_sdk::prelude::*;
+use smallvec::{smallvec, SmallVec};
+use theme::ActiveTheme;
+use ui::button::{Button, ButtonVariants};
+use ui::input::{InputState, TextInput};
+use ui::{divider, h_flex, v_flex, Disableable, IconName, Sizable, StyledExt};
+
+pub fn init(keys: &Keys, window: &mut Window, cx: &mut App) -> Entity<Backup> {
+    cx.new(|cx| Backup::new(keys, window, cx))
+}
+
+#[derive(Debug)]
+pub struct Backup {
+    pubkey_input: Entity<InputState>,
+    secret_input: Entity<InputState>,
+    error: Option<SharedString>,
+    copied: bool,
+
+    // Async operations
+    _tasks: SmallVec<[Task<()>; 1]>,
+}
+
+impl Backup {
+    pub fn new(keys: &Keys, window: &mut Window, cx: &mut Context<Self>) -> Self {
+        let Ok(npub) = keys.public_key.to_bech32();
+        let Ok(nsec) = keys.secret_key().to_bech32();
+
+        let pubkey_input = cx.new(|cx| {
+            InputState::new(window, cx)
+                .disabled(true)
+                .default_value(npub)
+        });
+
+        let secret_input = cx.new(|cx| {
+            InputState::new(window, cx)
+                .disabled(true)
+                .default_value(nsec)
+        });
+
+        Self {
+            pubkey_input,
+            secret_input,
+            error: None,
+            copied: false,
+            _tasks: smallvec![],
+        }
+    }
+
+    pub fn backup(&self, window: &Window, cx: &Context<Self>) -> Task<Result<(), Error>> {
+        let dir = home_dir();
+        let path = cx.prompt_for_new_path(dir, Some("My Nostr Account"));
+        let nsec = self.secret_input.read(cx).value().to_string();
+
+        cx.spawn_in(window, async move |this, cx| {
+            match path.await {
+                Ok(Ok(Some(path))) => {
+                    if let Err(e) = smol::fs::write(&path, nsec).await {
+                        this.update_in(cx, |this, window, cx| {
+                            this.set_error(e.to_string(), window, cx);
+                        })
+                        .expect("Entity has been released");
+                    } else {
+                        return Ok(());
+                    }
+                }
+                _ => {
+                    log::error!("Failed to save backup keys");
+                }
+            };
+
+            Err(anyhow!("Failed to backup keys"))
+        })
+    }
+
+    fn copy(&mut self, value: impl Into<String>, window: &mut Window, cx: &mut Context<Self>) {
+        let item = ClipboardItem::new_string(value.into());
+        cx.write_to_clipboard(item);
+
+        self.set_copied(true, window, cx);
+    }
+
+    fn set_copied(&mut self, status: bool, window: &mut Window, cx: &mut Context<Self>) {
+        self.copied = status;
+        cx.notify();
+
+        // Reset the copied state after a delay
+        if status {
+            self._tasks.push(cx.spawn_in(window, async move |this, cx| {
+                cx.background_executor().timer(Duration::from_secs(2)).await;
+
+                this.update_in(cx, |this, window, cx| {
+                    this.set_copied(false, window, cx);
+                })
+                .ok();
+            }));
+        }
+    }
+
+    fn set_error<E>(&mut self, error: E, window: &mut Window, cx: &mut Context<Self>)
+    where
+        E: Into<SharedString>,
+    {
+        self.error = Some(error.into());
+        cx.notify();
+
+        // Clear the error message after a delay
+        self._tasks.push(cx.spawn_in(window, async move |this, cx| {
+            cx.background_executor().timer(Duration::from_secs(2)).await;
+
+            this.update(cx, |this, cx| {
+                this.error = None;
+                cx.notify();
+            })
+            .ok();
+        }));
+    }
+}
+
+impl Render for Backup {
+    fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
+        const DESCRIPTION: &str = "In Nostr, your account is defined by a KEY PAIR. These keys are used to sign your messages and identify you.";
+        const WARN: &str = "You must keep the Secret Key in a safe place. If you lose it, you will lose access to your account.";
+        const PK: &str = "Public Key is the address that others will use to find you.";
+        const SK: &str = "Secret Key provides access to your account.";
+
+        v_flex()
+            .gap_2()
+            .text_sm()
+            .child(SharedString::from(DESCRIPTION))
+            .child(
+                v_flex()
+                    .gap_1()
+                    .child(
+                        div()
+                            .font_semibold()
+                            .child(SharedString::from("Public Key:")),
+                    )
+                    .child(
+                        h_flex()
+                            .gap_1()
+                            .child(TextInput::new(&self.pubkey_input).small())
+                            .child(
+                                Button::new("copy-pubkey")
+                                    .icon({
+                                        if self.copied {
+                                            IconName::CheckCircleFill
+                                        } else {
+                                            IconName::Copy
+                                        }
+                                    })
+                                    .ghost_alt()
+                                    .disabled(self.copied)
+                                    .on_click(cx.listener(move |this, _e, window, cx| {
+                                        this.copy(this.pubkey_input.read(cx).value(), window, cx);
+                                    })),
+                            ),
+                    )
+                    .child(
+                        div()
+                            .text_xs()
+                            .text_color(cx.theme().text_muted)
+                            .child(SharedString::from(PK)),
+                    ),
+            )
+            .child(divider(cx))
+            .child(
+                v_flex()
+                    .gap_1()
+                    .child(
+                        div()
+                            .font_semibold()
+                            .child(SharedString::from("Secret Key:")),
+                    )
+                    .child(
+                        h_flex()
+                            .gap_1()
+                            .child(TextInput::new(&self.secret_input).small())
+                            .child(
+                                Button::new("copy-secret")
+                                    .icon({
+                                        if self.copied {
+                                            IconName::CheckCircleFill
+                                        } else {
+                                            IconName::Copy
+                                        }
+                                    })
+                                    .ghost_alt()
+                                    .disabled(self.copied)
+                                    .on_click(cx.listener(move |this, _e, window, cx| {
+                                        this.copy(this.secret_input.read(cx).value(), window, cx);
+                                    })),
+                            ),
+                    )
+                    .child(
+                        div()
+                            .text_xs()
+                            .text_color(cx.theme().text_muted)
+                            .child(SharedString::from(SK)),
+                    ),
+            )
+            .child(divider(cx))
+            .child(
+                div()
+                    .text_xs()
+                    .text_color(cx.theme().danger_foreground)
+                    .child(SharedString::from(WARN)),
+            )
+    }
+}

crates/coop/src/new_identity/mod.rs

@@ -0,0 +1,350 @@
+use anyhow::{anyhow, Error};
+use common::{default_nip17_relays, default_nip65_relays, nip96_upload, BOOTSTRAP_RELAYS};
+use gpui::{
+    rems, AnyElement, App, AppContext, Context, Entity, EventEmitter, FocusHandle, Focusable,
+    IntoElement, ParentElement, PathPromptOptions, Render, SharedString, Styled, Task, Window,
+};
+use gpui_tokio::Tokio;
+use key_store::{KeyItem, KeyStore};
+use nostr_sdk::prelude::*;
+use settings::AppSettings;
+use smol::fs;
+use state::NostrRegistry;
+use ui::avatar::Avatar;
+use ui::button::{Button, ButtonVariants};
+use ui::dock_area::panel::{Panel, PanelEvent};
+use ui::input::{InputState, TextInput};
+use ui::modal::ModalButtonProps;
+use ui::{divider, v_flex, ContextModal, Disableable, IconName, Sizable};
+
+mod backup;
+
+pub fn init(window: &mut Window, cx: &mut App) -> Entity<NewAccount> {
+    cx.new(|cx| NewAccount::new(window, cx))
+}
+
+#[derive(Debug)]
+pub struct NewAccount {
+    name_input: Entity<InputState>,
+    avatar_input: Entity<InputState>,
+    temp_keys: Entity<Keys>,
+    uploading: bool,
+    submitting: bool,
+    // Panel
+    name: SharedString,
+    focus_handle: FocusHandle,
+}
+
+impl NewAccount {
+    fn new(window: &mut Window, cx: &mut Context<Self>) -> Self {
+        let temp_keys = cx.new(|_| Keys::generate());
+        let name_input = cx.new(|cx| InputState::new(window, cx).placeholder("Alice"));
+        let avatar_input = cx.new(|cx| InputState::new(window, cx));
+
+        Self {
+            name_input,
+            avatar_input,
+            temp_keys,
+            uploading: false,
+            submitting: false,
+            name: "Create a new identity".into(),
+            focus_handle: cx.focus_handle(),
+        }
+    }
+
+    fn create(&mut self, window: &mut Window, cx: &mut Context<Self>) {
+        self.submitting(true, cx);
+
+        let keys = self.temp_keys.read(cx).clone();
+        let view = backup::init(&keys, window, cx);
+        let weak_view = view.downgrade();
+        let current_view = cx.entity().downgrade();
+
+        window.open_modal(cx, move |modal, _window, _cx| {
+            let weak_view = weak_view.clone();
+            let current_view = current_view.clone();
+
+            modal
+                .alert()
+                .title(SharedString::from(
+                    "Backup to avoid losing access to your account",
+                ))
+                .child(view.clone())
+                .button_props(ModalButtonProps::default().ok_text("Download"))
+                .on_ok(move |_, window, cx| {
+                    weak_view
+                        .update(cx, |this, cx| {
+                            let view = current_view.clone();
+                            let task = this.backup(window, cx);
+
+                            cx.spawn_in(window, async move |_this, cx| {
+                                let result = task.await;
+
+                                match result {
+                                    Ok(_) => {
+                                        view.update_in(cx, |this, window, cx| {
+                                            this.set_signer(window, cx);
+                                        })
+                                        .expect("Entity has been released");
+                                    }
+                                    Err(e) => {
+                                        log::error!("Failed to backup: {e}");
+                                    }
+                                }
+                            })
+                            .detach();
+                        })
+                        .ok();
+                    // true to close the modal
+                    false
+                })
+        })
+    }
+
+    pub fn set_signer(&mut self, window: &mut Window, cx: &mut Context<Self>) {
+        let keystore = KeyStore::global(cx).read(cx).backend();
+
+        let nostr = NostrRegistry::global(cx);
+        let client = nostr.read(cx).client();
+
+        let keys = self.temp_keys.read(cx).clone();
+        let username = keys.public_key().to_hex();
+        let secret = keys.secret_key().to_secret_hex().into_bytes();
+
+        let avatar = self.avatar_input.read(cx).value().to_string();
+        let name = self.name_input.read(cx).value().to_string();
+        let mut metadata = Metadata::new().display_name(name.clone()).name(name);
+
+        if let Ok(url) = Url::parse(&avatar) {
+            metadata = metadata.picture(url);
+        };
+
+        // Close all modals if available
+        window.close_all_modals(cx);
+
+        // Set the client's signer with the current keys
+        let task: Task<Result<(), Error>> = cx.background_spawn(async move {
+            let signer = keys.clone();
+            let nip65_relays = default_nip65_relays();
+            let nip17_relays = default_nip17_relays();
+
+            // Construct a NIP-65 event
+            let event = EventBuilder::new(Kind::RelayList, "")
+                .tags(
+                    nip65_relays
+                        .iter()
+                        .cloned()
+                        .map(|(url, metadata)| Tag::relay_metadata(url, metadata)),
+                )
+                .sign(&signer)
+                .await?;
+
+            // Set NIP-65 relays
+            client.send_event_to(BOOTSTRAP_RELAYS, &event).await?;
+
+            // Extract only write relays
+            let write_relays: Vec<RelayUrl> = nip65_relays
+                .iter()
+                .filter_map(|(url, metadata)| {
+                    if metadata.is_none() || metadata == &Some(RelayMetadata::Write) {
+                        Some(url.to_owned())
+                    } else {
+                        None
+                    }
+                })
+                .collect();
+
+            // Ensure relays are connected
+            for url in write_relays.iter() {
+                client.add_relay(url).await?;
+                client.connect_relay(url).await?;
+            }
+
+            // Construct a NIP-17 event
+            let event = EventBuilder::new(Kind::InboxRelays, "")
+                .tags(nip17_relays.iter().cloned().map(Tag::relay))
+                .sign(&signer)
+                .await?;
+
+            // Set NIP-17 relays
+            client.send_event_to(&write_relays, &event).await?;
+
+            // Construct a metadata event
+            let event = EventBuilder::metadata(&metadata).sign(&signer).await?;
+
+            // Send metadata event to both write relays and bootstrap relays
+            client.send_event_to(&write_relays, &event).await?;
+            client.send_event_to(BOOTSTRAP_RELAYS, &event).await?;
+
+            // Update the client's signer with the current keys
+            client.set_signer(keys).await;
+
+            Ok(())
+        });
+
+        cx.spawn_in(window, async move |this, cx| {
+            let url = KeyItem::User.to_string();
+
+            // Write the app keys for further connection
+            keystore
+                .write_credentials(&url, &username, &secret, cx)
+                .await
+                .ok();
+
+            if let Err(e) = task.await {
+                this.update_in(cx, |this, window, cx| {
+                    this.submitting(false, cx);
+                    window.push_notification(e.to_string(), cx);
+                })
+                .expect("Entity has been released");
+            }
+        })
+        .detach();
+    }
+
+    fn upload(&mut self, window: &mut Window, cx: &mut Context<Self>) {
+        self.uploading(true, cx);
+
+        let nostr = NostrRegistry::global(cx);
+        let client = nostr.read(cx).client();
+
+        // Get the user's configured NIP96 server
+        let nip96_server = AppSettings::get_media_server(cx);
+
+        // Open native file dialog
+        let paths = cx.prompt_for_paths(PathPromptOptions {
+            files: true,
+            directories: false,
+            multiple: false,
+            prompt: None,
+        });
+
+        let task = Tokio::spawn(cx, async move {
+            match paths.await {
+                Ok(Ok(Some(mut paths))) => {
+                    if let Some(path) = paths.pop() {
+                        let file = fs::read(path).await?;
+                        let url = nip96_upload(&client, &nip96_server, file).await?;
+
+                        Ok(url)
+                    } else {
+                        Err(anyhow!("Path not found"))
+                    }
+                }
+                _ => Err(anyhow!("Error")),
+            }
+        });
+
+        cx.spawn_in(window, async move |this, cx| {
+            let result = task.await;
+
+            this.update_in(cx, |this, window, cx| {
+                match result {
+                    Ok(Ok(url)) => {
+                        this.avatar_input.update(cx, |this, cx| {
+                            this.set_value(url.to_string(), window, cx);
+                        });
+                    }
+                    Ok(Err(e)) => {
+                        window.push_notification(e.to_string(), cx);
+                    }
+                    Err(e) => {
+                        log::warn!("Failed to upload avatar: {e}");
+                    }
+                };
+                this.uploading(false, cx);
+            })
+            .expect("Entity has been released");
+        })
+        .detach();
+    }
+
+    fn submitting(&mut self, status: bool, cx: &mut Context<Self>) {
+        self.submitting = status;
+        cx.notify();
+    }
+
+    fn uploading(&mut self, status: bool, cx: &mut Context<Self>) {
+        self.uploading = status;
+        cx.notify();
+    }
+}
+
+impl Panel for NewAccount {
+    fn panel_id(&self) -> SharedString {
+        self.name.clone()
+    }
+
+    fn title(&self, _cx: &App) -> AnyElement {
+        self.name.clone().into_any_element()
+    }
+}
+
+impl EventEmitter<PanelEvent> for NewAccount {}
+
+impl Focusable for NewAccount {
+    fn focus_handle(&self, _: &App) -> gpui::FocusHandle {
+        self.focus_handle.clone()
+    }
+}
+
+impl Render for NewAccount {
+    fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
+        let avatar = self.avatar_input.read(cx).value();
+
+        v_flex()
+            .size_full()
+            .relative()
+            .items_center()
+            .justify_center()
+            .child(
+                v_flex()
+                    .w_96()
+                    .gap_2()
+                    .child(
+                        v_flex()
+                            .h_40()
+                            .w_full()
+                            .items_center()
+                            .justify_center()
+                            .gap_4()
+                            .child(Avatar::new(avatar).size(rems(4.25)))
+                            .child(
+                                Button::new("upload")
+                                    .icon(IconName::PlusCircleFill)
+                                    .label("Add an avatar")
+                                    .xsmall()
+                                    .ghost()
+                                    .rounded()
+                                    .disabled(self.uploading)
+                                    //.loading(self.uploading)
+                                    .on_click(cx.listener(move |this, _, window, cx| {
+                                        this.upload(window, cx);
+                                    })),
+                            ),
+                    )
+                    .child(
+                        v_flex()
+                            .gap_1()
+                            .text_sm()
+                            .child(SharedString::from("What should people call you?"))
+                            .child(
+                                TextInput::new(&self.name_input)
+                                    .disabled(self.submitting)
+                                    .small(),
+                            ),
+                    )
+                    .child(divider(cx))
+                    .child(
+                        Button::new("submit")
+                            .label("Continue")
+                            .primary()
+                            .loading(self.submitting)
+                            .disabled(self.submitting || self.uploading)
+                            .on_click(cx.listener(move |this, _, window, cx| {
+                                this.create(window, cx);
+                            })),
+                    ),
+            )
+    }
+}

crates/coop/src/sidebar/list_item.rs

@@ -1,17 +1,15 @@
 use std::rc::Rc;
 
+use chat::{ChatRegistry, RoomKind};
+use chat_ui::{CopyPublicKey, OpenPublicKey};
 use gpui::prelude::FluentBuilder;
 use gpui::{
     div, rems, App, ClickEvent, InteractiveElement, IntoElement, ParentElement as _, RenderOnce,
-    SharedString, SharedUri, StatefulInteractiveElement, Styled, Window,
+    SharedString, StatefulInteractiveElement, Styled, Window,
 };
-use i18n::t;
 use nostr_sdk::prelude::*;
-use registry::room::RoomKind;
-use registry::Registry;
 use settings::AppSettings;
 use theme::ActiveTheme;
-use ui::actions::{CopyPublicKey, OpenPublicKey};
 use ui::avatar::Avatar;
 use ui::context_menu::ContextMenuExt;
 use ui::modal::ModalButtonProps;
@@ -26,7 +24,7 @@ pub struct RoomListItem {
     room_id: Option<u64>,
     public_key: Option<PublicKey>,
     name: Option<SharedString>,
-    avatar: Option<SharedUri>,
+    avatar: Option<SharedString>,
     created_at: Option<SharedString>,
     kind: Option<RoomKind>,
     #[allow(clippy::type_complexity)]
@@ -62,7 +60,7 @@ impl RoomListItem {
         self
     }
 
-    pub fn avatar(mut self, avatar: impl Into<SharedUri>) -> Self {
+    pub fn avatar(mut self, avatar: impl Into<SharedString>) -> Self {
         self.avatar = Some(avatar.into());
         self
     }
@@ -121,8 +119,8 @@ impl RenderOnce for RoomListItem {
                         .flex_1()
                         .flex()
                         .justify_between()
-                        .child(Skeleton::new().w_32().h_2p5().rounded_sm())
-                        .child(Skeleton::new().w_6().h_2p5().rounded_sm()),
+                        .child(Skeleton::new().w_32().h_2p5().rounded(cx.theme().radius))
+                        .child(Skeleton::new().w_6().h_2p5().rounded(cx.theme().radius)),
                 );
         };
 
@@ -169,8 +167,8 @@ impl RenderOnce for RoomListItem {
             )
             .hover(|this| this.bg(cx.theme().elevated_surface_background))
             .context_menu(move |this, _window, _cx| {
-                this.menu(t!("profile.view"), Box::new(OpenPublicKey(public_key)))
-                    .menu(t!("profile.copy"), Box::new(CopyPublicKey(public_key)))
+                this.menu("View Profile", Box::new(OpenPublicKey(public_key)))
+                    .menu("Copy Public Key", Box::new(CopyPublicKey(public_key)))
             })
             .on_click(move |event, window, cx| {
                 handler(event, window, cx);
@@ -183,11 +181,11 @@ impl RenderOnce for RoomListItem {
                             .child(screening.clone())
                             .button_props(
                                 ModalButtonProps::default()
-                                    .cancel_text(t!("screening.ignore"))
-                                    .ok_text(t!("screening.response")),
+                                    .cancel_text("Ignore")
+                                    .ok_text("Response"),
                             )
                             .on_cancel(move |_event, _window, cx| {
-                                Registry::global(cx).update(cx, |this, cx| {
+                                ChatRegistry::global(cx).update(cx, |this, cx| {
                                     this.close_room(room_id, cx);
                                 });
                                 // false to prevent closing the modal

crates/coop/src/sidebar/mod.rs

@@ -0,0 +1,791 @@
+use std::ops::Range;
+use std::time::Duration;
+
+use anyhow::{anyhow, Error};
+use chat::{ChatEvent, ChatRegistry, Room, RoomKind};
+use common::{DebouncedDelay, RenderedTimestamp, TextUtils, BOOTSTRAP_RELAYS, SEARCH_RELAYS};
+use gpui::prelude::FluentBuilder;
+use gpui::{
+    deferred, div, relative, uniform_list, App, AppContext, Context, Entity, EventEmitter,
+    FocusHandle, Focusable, InteractiveElement, IntoElement, ParentElement, Render,
+    RetainAllImageCache, SharedString, Styled, Subscription, Task, Window,
+};
+use gpui_tokio::Tokio;
+use list_item::RoomListItem;
+use nostr_sdk::prelude::*;
+use smallvec::{smallvec, SmallVec};
+use state::{NostrRegistry, GIFTWRAP_SUBSCRIPTION};
+use theme::ActiveTheme;
+use ui::button::{Button, ButtonVariants};
+use ui::dock_area::panel::{Panel, PanelEvent};
+use ui::input::{InputEvent, InputState, TextInput};
+use ui::popup_menu::PopupMenuExt;
+use ui::{h_flex, v_flex, ContextModal, Icon, IconName, Selectable, Sizable, StyledExt};
+
+use crate::actions::{RelayStatus, Reload};
+
+mod list_item;
+
+const FIND_DELAY: u64 = 600;
+const FIND_LIMIT: usize = 20;
+
+pub fn init(window: &mut Window, cx: &mut App) -> Entity<Sidebar> {
+    cx.new(|cx| Sidebar::new(window, cx))
+}
+
+/// Sidebar.
+pub struct Sidebar {
+    name: SharedString,
+
+    /// Focus handle for the sidebar
+    focus_handle: FocusHandle,
+
+    /// Image cache
+    image_cache: Entity<RetainAllImageCache>,
+
+    /// Search results
+    search_results: Entity<Option<Vec<Entity<Room>>>>,
+
+    /// Async search operation
+    search_task: Option<Task<()>>,
+
+    /// Search input state
+    find_input: Entity<InputState>,
+
+    /// Debounced delay for search input
+    find_debouncer: DebouncedDelay<Self>,
+
+    /// Whether searching is in progress
+    finding: bool,
+
+    /// New request flag
+    new_request: bool,
+
+    /// Current chat room filter
+    active_filter: Entity<RoomKind>,
+
+    /// Event subscriptions
+    _subscriptions: SmallVec<[Subscription; 2]>,
+}
+
+impl Sidebar {
+    fn new(window: &mut Window, cx: &mut Context<Self>) -> Self {
+        let active_filter = cx.new(|_| RoomKind::Ongoing);
+        let search_results = cx.new(|_| None);
+
+        // Define the find input state
+        let find_input = cx.new(|cx| {
+            InputState::new(window, cx)
+                .placeholder("Find or start a conversation")
+                .clean_on_escape()
+        });
+
+        // Get the chat registry
+        let chat = ChatRegistry::global(cx);
+
+        let mut subscriptions = smallvec![];
+
+        subscriptions.push(
+            // Subscribe for registry new events
+            cx.subscribe_in(&chat, window, move |this, _s, event, _window, cx| {
+                if event == &ChatEvent::Ping {
+                    this.new_request = true;
+                    cx.notify();
+                };
+            }),
+        );
+
+        subscriptions.push(
+            // Subscribe for find input events
+            cx.subscribe_in(&find_input, window, |this, state, event, window, cx| {
+                let delay = Duration::from_millis(FIND_DELAY);
+
+                match event {
+                    InputEvent::PressEnter { .. } => {
+                        this.search(window, cx);
+                    }
+                    InputEvent::Change => {
+                        if state.read(cx).value().is_empty() {
+                            // Clear the result when input is empty
+                            this.clear(window, cx);
+                        } else {
+                            // Run debounced search
+                            this.find_debouncer
+                                .fire_new(delay, window, cx, |this, window, cx| {
+                                    this.debounced_search(window, cx)
+                                });
+                        }
+                    }
+                    _ => {}
+                };
+            }),
+        );
+
+        Self {
+            name: "Sidebar".into(),
+            focus_handle: cx.focus_handle(),
+            image_cache: RetainAllImageCache::new(cx),
+            find_debouncer: DebouncedDelay::new(),
+            finding: false,
+            new_request: false,
+            active_filter,
+            find_input,
+            search_results,
+            search_task: None,
+            _subscriptions: subscriptions,
+        }
+    }
+
+    async fn nip50(client: &Client, query: &str) -> Result<Vec<Event>, Error> {
+        let signer = client.signer().await?;
+        let public_key = signer.get_public_key().await?;
+
+        let filter = Filter::new()
+            .kind(Kind::Metadata)
+            .search(query.to_lowercase())
+            .limit(FIND_LIMIT);
+
+        let mut stream = client
+            .stream_events_from(SEARCH_RELAYS, filter, Duration::from_secs(3))
+            .await?;
+
+        let mut results: Vec<Event> = Vec::with_capacity(FIND_LIMIT);
+
+        while let Some((_url, event)) = stream.next().await {
+            if let Ok(event) = event {
+                // Skip if author is match current user
+                if event.pubkey == public_key {
+                    continue;
+                }
+
+                // Skip if the event has already been added
+                if results.iter().any(|this| this.pubkey == event.pubkey) {
+                    continue;
+                }
+
+                results.push(event);
+            }
+        }
+
+        if results.is_empty() {
+            return Err(anyhow!("No results for query {query}"));
+        }
+
+        // Get all public keys
+        let public_keys: Vec<PublicKey> = results.iter().map(|event| event.pubkey).collect();
+
+        // Fetch metadata and contact lists if public keys is not empty
+        if !public_keys.is_empty() {
+            let opts = SubscribeAutoCloseOptions::default().exit_policy(ReqExitPolicy::ExitOnEOSE);
+            let filter = Filter::new()
+                .kinds(vec![Kind::Metadata, Kind::ContactList])
+                .limit(public_keys.len() * 2)
+                .authors(public_keys);
+
+            client
+                .subscribe_to(BOOTSTRAP_RELAYS, filter, Some(opts))
+                .await?;
+        }
+
+        Ok(results)
+    }
+
+    fn debounced_search(&self, window: &mut Window, cx: &mut Context<Self>) -> Task<()> {
+        cx.spawn_in(window, async move |this, cx| {
+            this.update_in(cx, |this, window, cx| {
+                this.search(window, cx);
+            })
+            .ok();
+        })
+    }
+
+    fn search_by_nip50(&mut self, query: &str, window: &mut Window, cx: &mut Context<Self>) {
+        let nostr = NostrRegistry::global(cx);
+        let client = nostr.read(cx).client();
+        let public_key = nostr.read(cx).identity().read(cx).public_key();
+
+        let query = query.to_owned();
+
+        self.search_task = Some(cx.spawn_in(window, async move |this, cx| {
+            let result = Self::nip50(&client, &query).await;
+
+            this.update_in(cx, |this, window, cx| {
+                match result {
+                    Ok(results) => {
+                        let rooms = results
+                            .into_iter()
+                            .map(|event| {
+                                cx.new(|_| Room::new(None, public_key, vec![event.pubkey]))
+                            })
+                            .collect();
+
+                        this.set_results(rooms, cx);
+                    }
+                    Err(e) => {
+                        window.push_notification(e.to_string(), cx);
+                    }
+                };
+                this.set_finding(false, window, cx);
+            })
+            .ok();
+        }));
+    }
+
+    fn search_by_nip05(&mut self, query: &str, window: &mut Window, cx: &mut Context<Self>) {
+        let nostr = NostrRegistry::global(cx);
+        let client = nostr.read(cx).client();
+        let address = query.to_owned();
+
+        let task = Tokio::spawn(cx, async move {
+            match common::nip05_profile(&address).await {
+                Ok(profile) => {
+                    let signer = client.signer().await?;
+                    let public_key = signer.get_public_key().await?;
+                    let receivers = vec![profile.public_key];
+                    let room = Room::new(None, public_key, receivers);
+
+                    Ok(room)
+                }
+                Err(e) => Err(anyhow!(e)),
+            }
+        });
+
+        self.search_task = Some(cx.spawn_in(window, async move |this, cx| {
+            let result = task.await;
+
+            this.update_in(cx, |this, window, cx| {
+                match result {
+                    Ok(Ok(room)) => {
+                        this.set_results(vec![cx.new(|_| room)], cx);
+                    }
+                    Ok(Err(e)) => {
+                        window.push_notification(e.to_string(), cx);
+                    }
+                    Err(e) => {
+                        window.push_notification(e.to_string(), cx);
+                    }
+                }
+                this.set_finding(false, window, cx);
+            })
+            .ok();
+        }));
+    }
+
+    fn search_by_pubkey(&mut self, query: &str, window: &mut Window, cx: &mut Context<Self>) {
+        let nostr = NostrRegistry::global(cx);
+        let client = nostr.read(cx).client();
+
+        let Ok(public_key) = query.to_public_key() else {
+            window.push_notification("Public Key is invalid", cx);
+            self.set_finding(false, window, cx);
+            return;
+        };
+
+        let task: Task<Result<Room, Error>> = cx.background_spawn(async move {
+            let signer = client.signer().await?;
+            let author = signer.get_public_key().await?;
+
+            let opts = SubscribeAutoCloseOptions::default().exit_policy(ReqExitPolicy::ExitOnEOSE);
+            let receivers = vec![public_key];
+            let room = Room::new(None, author, receivers);
+
+            let filter = Filter::new()
+                .kinds(vec![Kind::Metadata, Kind::ContactList])
+                .author(public_key)
+                .limit(2);
+
+            client
+                .subscribe_to(BOOTSTRAP_RELAYS, filter, Some(opts))
+                .await?;
+
+            Ok(room)
+        });
+
+        self.search_task = Some(cx.spawn_in(window, async move |this, cx| {
+            let result = task.await;
+
+            this.update_in(cx, |this, window, cx| {
+                match result {
+                    Ok(room) => {
+                        let chat = ChatRegistry::global(cx);
+                        let local_results = chat.read(cx).search_by_public_key(public_key, cx);
+
+                        if !local_results.is_empty() {
+                            this.set_results(local_results, cx);
+                        } else {
+                            this.set_results(vec![cx.new(|_| room)], cx);
+                        }
+                    }
+                    Err(e) => {
+                        window.push_notification(e.to_string(), cx);
+                    }
+                };
+                this.set_finding(false, window, cx);
+            })
+            .ok();
+        }));
+    }
+
+    fn search(&mut self, window: &mut Window, cx: &mut Context<Self>) {
+        // Return if the query is empty
+        if self.find_input.read(cx).value().is_empty() {
+            return;
+        }
+
+        // Return if search is in progress
+        if self.finding {
+            if self.search_task.is_none() {
+                window.push_notification("There is another search in progress", cx);
+                return;
+            } else {
+                // Cancel ongoing search request
+                self.search_task = None;
+            }
+        }
+
+        let input = self.find_input.read(cx).value();
+        let query = input.to_string();
+
+        // Block the input until the search process completes
+        self.set_finding(true, window, cx);
+
+        // Process to search by pubkey if query starts with npub or nprofile
+        if query.starts_with("npub1") || query.starts_with("nprofile1") {
+            self.search_by_pubkey(&query, window, cx);
+            return;
+        };
+
+        // Process to search by NIP05 if query is a valid NIP-05 identifier (name@domain.tld)
+        if query.split('@').count() == 2 {
+            let parts: Vec<&str> = query.split('@').collect();
+            if !parts[0].is_empty() && !parts[1].is_empty() && parts[1].contains('.') {
+                self.search_by_nip05(&query, window, cx);
+                return;
+            }
+        }
+
+        // Get all local results with current query
+        let chat = ChatRegistry::global(cx);
+        let local_results = chat.read(cx).search(&query, cx);
+
+        // Try to update with local results first
+        if !local_results.is_empty() {
+            self.set_results(local_results, cx);
+            return;
+        };
+
+        // If no local results, try global search via NIP-50
+        self.search_by_nip50(&query, window, cx);
+    }
+
+    fn set_results(&mut self, rooms: Vec<Entity<Room>>, cx: &mut Context<Self>) {
+        self.search_results.update(cx, |this, cx| {
+            *this = Some(rooms);
+            cx.notify();
+        });
+    }
+
+    fn set_finding(&mut self, status: bool, _window: &mut Window, cx: &mut Context<Self>) {
+        // Disable the input to prevent duplicate requests
+        self.find_input.update(cx, |this, cx| {
+            this.set_disabled(status, cx);
+            this.set_loading(status, cx);
+        });
+        // Set the finding status
+        self.finding = status;
+        cx.notify();
+    }
+
+    fn clear(&mut self, window: &mut Window, cx: &mut Context<Self>) {
+        // Reset the input state
+        if self.finding {
+            self.set_finding(false, window, cx);
+        }
+
+        // Clear all local results
+        self.search_results.update(cx, |this, cx| {
+            *this = None;
+            cx.notify();
+        });
+    }
+
+    fn filter(&self, kind: &RoomKind, cx: &Context<Self>) -> bool {
+        self.active_filter.read(cx) == kind
+    }
+
+    fn set_filter(&mut self, kind: RoomKind, cx: &mut Context<Self>) {
+        self.active_filter.update(cx, |this, cx| {
+            *this = kind;
+            cx.notify();
+        });
+        self.new_request = false;
+        cx.notify();
+    }
+
+    fn open(&mut self, id: u64, window: &mut Window, cx: &mut Context<Self>) {
+        let chat = ChatRegistry::global(cx);
+
+        match chat.read(cx).room(&id, cx) {
+            Some(room) => {
+                chat.update(cx, |this, cx| {
+                    this.emit_room(room, cx);
+                });
+            }
+            None => {
+                if let Some(room) = self
+                    .search_results
+                    .read(cx)
+                    .as_ref()
+                    .and_then(|results| results.iter().find(|this| this.read(cx).id == id))
+                    .map(|this| this.downgrade())
+                {
+                    chat.update(cx, |this, cx| {
+                        this.emit_room(room, cx);
+                    });
+                    // Clear all search results
+                    self.clear(window, cx);
+                }
+            }
+        }
+    }
+
+    fn on_reload(&mut self, _ev: &Reload, window: &mut Window, cx: &mut Context<Self>) {
+        ChatRegistry::global(cx).update(cx, |this, cx| {
+            this.get_rooms(cx);
+        });
+        window.push_notification("Reload", cx);
+    }
+
+    fn on_manage(&mut self, _ev: &RelayStatus, window: &mut Window, cx: &mut Context<Self>) {
+        let nostr = NostrRegistry::global(cx);
+        let client = nostr.read(cx).client();
+
+        let task: Task<Result<Vec<Relay>, Error>> = cx.background_spawn(async move {
+            let id = SubscriptionId::new(GIFTWRAP_SUBSCRIPTION);
+            let subscription = client.subscription(&id).await;
+
+            let mut relays: Vec<Relay> = vec![];
+
+            for (url, _filter) in subscription.into_iter() {
+                relays.push(client.pool().relay(url).await?);
+            }
+
+            Ok(relays)
+        });
+
+        cx.spawn_in(window, async move |this, cx| {
+            if let Ok(relays) = task.await {
+                this.update_in(cx, |this, window, cx| {
+                    this.manage_relays(relays, window, cx);
+                })
+                .ok();
+            }
+        })
+        .detach();
+    }
+
+    fn manage_relays(&mut self, relays: Vec<Relay>, window: &mut Window, cx: &mut Context<Self>) {
+        window.open_modal(cx, move |this, _window, cx| {
+            this.show_close(true)
+                .overlay_closable(true)
+                .keyboard(true)
+                .title(SharedString::from("Messaging Relay Status"))
+                .child(v_flex().pb_4().gap_2().children({
+                    let mut items = Vec::with_capacity(relays.len());
+
+                    for relay in relays.clone().into_iter() {
+                        let url = relay.url().to_string();
+                        let time = relay.stats().connected_at().to_ago();
+                        let connected = relay.is_connected();
+
+                        items.push(
+                            h_flex()
+                                .h_8()
+                                .px_2()
+                                .justify_between()
+                                .text_xs()
+                                .bg(cx.theme().elevated_surface_background)
+                                .rounded(cx.theme().radius)
+                                .child(
+                                    h_flex()
+                                        .gap_1()
+                                        .font_semibold()
+                                        .child(
+                                            Icon::new(IconName::Signal)
+                                                .small()
+                                                .text_color(cx.theme().danger_active)
+                                                .when(connected, |this| {
+                                                    this.text_color(gpui::green().alpha(0.75))
+                                                }),
+                                        )
+                                        .child(url),
+                                )
+                                .child(
+                                    div().text_right().text_color(cx.theme().text_muted).child(
+                                        SharedString::from(format!("Last activity: {}", time)),
+                                    ),
+                                ),
+                        );
+                    }
+
+                    items
+                }))
+        });
+    }
+
+    fn list_items(
+        &self,
+        rooms: &[Entity<Room>],
+        range: Range<usize>,
+        cx: &Context<Self>,
+    ) -> Vec<impl IntoElement> {
+        let mut items = Vec::with_capacity(range.end - range.start);
+
+        for ix in range {
+            let Some(room) = rooms.get(ix) else {
+                items.push(RoomListItem::new(ix));
+                continue;
+            };
+
+            let this = room.read(cx);
+            let room_id = this.id;
+            let member = this.display_member(cx);
+
+            let handler = cx.listener({
+                move |this, _, window, cx| {
+                    this.open(room_id, window, cx);
+                }
+            });
+
+            items.push(
+                RoomListItem::new(ix)
+                    .room_id(room_id)
+                    .name(this.display_name(cx))
+                    .avatar(this.display_image(cx))
+                    .public_key(member.public_key())
+                    .kind(this.kind)
+                    .created_at(this.created_at.to_ago())
+                    .on_click(handler),
+            )
+        }
+
+        items
+    }
+}
+
+impl Panel for Sidebar {
+    fn panel_id(&self) -> SharedString {
+        self.name.clone()
+    }
+}
+
+impl EventEmitter<PanelEvent> for Sidebar {}
+
+impl Focusable for Sidebar {
+    fn focus_handle(&self, _: &App) -> gpui::FocusHandle {
+        self.focus_handle.clone()
+    }
+}
+
+impl Render for Sidebar {
+    fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
+        let chat = ChatRegistry::global(cx);
+        let loading = chat.read(cx).loading();
+
+        // Get rooms from either search results or the chat registry
+        let rooms = if let Some(results) = self.search_results.read(cx).as_ref() {
+            results.to_owned()
+        } else {
+            // Filter rooms based on the active filter
+            if self.active_filter.read(cx) == &RoomKind::Ongoing {
+                chat.read(cx).ongoing_rooms(cx)
+            } else {
+                chat.read(cx).request_rooms(cx)
+            }
+        };
+
+        // Get total rooms count
+        let mut total_rooms = rooms.len();
+
+        // Add 3 dummy rooms to display as skeletons
+        if loading {
+            total_rooms += 3
+        }
+
+        v_flex()
+            .on_action(cx.listener(Self::on_reload))
+            .on_action(cx.listener(Self::on_manage))
+            .image_cache(self.image_cache.clone())
+            .size_full()
+            .relative()
+            .gap_3()
+            // Search Input
+            .child(
+                div()
+                    .relative()
+                    .mt_3()
+                    .px_2p5()
+                    .w_full()
+                    .h_7()
+                    .flex_none()
+                    .flex()
+                    .child(
+                        TextInput::new(&self.find_input)
+                            .small()
+                            .cleanable()
+                            .appearance(true)
+                            .text_xs()
+                            .map(|this| {
+                                if !self.find_input.read(cx).loading {
+                                    this.suffix(
+                                        Button::new("find")
+                                            .icon(IconName::Search)
+                                            .tooltip("Press Enter to search")
+                                            .transparent()
+                                            .small(),
+                                    )
+                                } else {
+                                    this
+                                }
+                            }),
+                    ),
+            )
+            // Chat Rooms
+            .child(
+                v_flex()
+                    .gap_1()
+                    .flex_1()
+                    .px_1p5()
+                    .w_full()
+                    .overflow_y_hidden()
+                    .child(
+                        div()
+                            .px_1()
+                            .h_flex()
+                            .gap_2()
+                            .flex_none()
+                            .child(
+                                Button::new("all")
+                                    .label("All")
+                                    .tooltip("All ongoing conversations")
+                                    .small()
+                                    .cta()
+                                    .bold()
+                                    .secondary()
+                                    .rounded()
+                                    .selected(self.filter(&RoomKind::Ongoing, cx))
+                                    .on_click(cx.listener(|this, _, _, cx| {
+                                        this.set_filter(RoomKind::Ongoing, cx);
+                                    })),
+                            )
+                            .child(
+                                Button::new("requests")
+                                    .label("Requests")
+                                    .tooltip("Incoming new conversations")
+                                    .when(self.new_request, |this| {
+                                        this.child(
+                                            div().size_1().rounded_full().bg(cx.theme().cursor),
+                                        )
+                                    })
+                                    .small()
+                                    .cta()
+                                    .bold()
+                                    .secondary()
+                                    .rounded()
+                                    .selected(!self.filter(&RoomKind::Ongoing, cx))
+                                    .on_click(cx.listener(|this, _, _, cx| {
+                                        this.set_filter(RoomKind::default(), cx);
+                                    })),
+                            )
+                            .child(
+                                h_flex()
+                                    .flex_1()
+                                    .w_full()
+                                    .justify_end()
+                                    .items_center()
+                                    .text_xs()
+                                    .child(
+                                        Button::new("option")
+                                            .icon(IconName::Ellipsis)
+                                            .xsmall()
+                                            .ghost()
+                                            .rounded()
+                                            .popup_menu(move |this, _window, _cx| {
+                                                this.menu(
+                                                    "Reload",
+                                                    Box::new(Reload),
+                                                )
+                                                .menu(
+                                                    "Relay Status",
+                                                    Box::new(RelayStatus),
+                                                )
+                                            }),
+                                    ),
+                            ),
+                    )
+                    .when(!loading && total_rooms == 0, |this| {
+                        this.map(|this| {
+                            if self.filter(&RoomKind::Ongoing, cx) {
+                                this.child(deferred(
+                                    v_flex()
+                                        .py_2()
+                                        .px_1p5()
+                                        .gap_1p5()
+                                        .items_center()
+                                        .justify_center()
+                                        .text_center()
+                                        .child(
+                                            div()
+                                                .text_sm()
+                                                .font_semibold()
+                                                .line_height(relative(1.25))
+                                                .child(SharedString::from("No conversations")),
+                                        )
+                                        .child(
+                                            div()
+                                                .text_xs()
+                                                .text_color(cx.theme().text_muted)
+                                                .line_height(relative(1.25))
+                                                .child(SharedString::from("Start a conversation with someone to get started.")),
+                                        ),
+                                ))
+                            } else {
+                                this.child(deferred(
+                                    v_flex()
+                                        .py_2()
+                                        .px_1p5()
+                                        .gap_1p5()
+                                        .items_center()
+                                        .justify_center()
+                                        .text_center()
+                                        .child(
+                                            div()
+                                                .text_sm()
+                                                .font_semibold()
+                                                .line_height(relative(1.25))
+                                                .child(SharedString::from("No message requests")),
+                                        )
+                                        .child(
+                                            div()
+                                                .text_xs()
+                                                .text_color(cx.theme().text_muted)
+                                                .line_height(relative(1.25))
+                                                .child(SharedString::from("New message requests from people you don't know will appear here.")),
+                                        ),
+                                ))
+                            }
+                        })
+                    })
+                    .child(
+                        uniform_list(
+                            "rooms",
+                            total_rooms,
+                            cx.processor(move |this, range, _window, cx| {
+                                this.list_items(&rooms, range, cx)
+                            }),
+                        )
+                        .h_full(),
+                    ),
+            )
+    }
+}

crates/coop/src/user/mod.rs

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

crates/coop/src/user/viewer.rs

@@ -1,249 +1,257 @@
-use std::time::Duration;
-
-use common::display::RenderedProfile;
-use common::nip05::nip05_verify;
-use global::nostr_client;
-use gpui::prelude::FluentBuilder;
-use gpui::{
-    div, relative, rems, App, AppContext, ClipboardItem, Context, Entity, IntoElement,
-    ParentElement, Render, SharedString, Styled, Task, Window,
-};
-use gpui_tokio::Tokio;
-use i18n::{shared_t, t};
-use nostr_sdk::prelude::*;
-use registry::Registry;
-use settings::AppSettings;
-use smallvec::{smallvec, SmallVec};
-use theme::ActiveTheme;
-use ui::avatar::Avatar;
-use ui::button::{Button, ButtonVariants};
-use ui::{h_flex, v_flex, Icon, IconName, Sizable, StyledExt};
-
-pub fn init(public_key: PublicKey, window: &mut Window, cx: &mut App) -> Entity<UserProfile> {
-    cx.new(|cx| UserProfile::new(public_key, window, cx))
-}
-
-pub struct UserProfile {
-    profile: Profile,
-    followed: bool,
-    verified: bool,
-    copied: bool,
-    _tasks: SmallVec<[Task<()>; 1]>,
-}
-
-impl UserProfile {
-    pub fn new(target: PublicKey, window: &mut Window, cx: &mut Context<Self>) -> Self {
-        let registry = Registry::read_global(cx);
-        let profile = registry.get_person(&target, cx);
-
-        let mut tasks = smallvec![];
-
-        let check_follow: Task<Result<bool, Error>> = cx.background_spawn(async move {
-            let client = nostr_client();
-            let signer = client.signer().await?;
-            let public_key = signer.get_public_key().await?;
-            let contact_list = client.database().contacts_public_keys(public_key).await?;
-
-            Ok(contact_list.contains(&target))
-        });
-
-        let verify_nip05 = if let Some(address) = profile.metadata().nip05 {
-            Some(Tokio::spawn(cx, async move {
-                nip05_verify(target, &address).await.unwrap_or(false)
-            }))
-        } else {
-            None
-        };
-
-        tasks.push(
-            // Load user profile data
-            cx.spawn_in(window, async move |this, cx| {
-                let followed = check_follow.await.unwrap_or(false);
-
-                // Update the followed status
-                this.update(cx, |this, cx| {
-                    this.followed = followed;
-                    cx.notify();
-                })
-                .ok();
-
-                // Update the NIP05 verification status if user has NIP05 address
-                if let Some(task) = verify_nip05 {
-                    if let Ok(verified) = task.await {
-                        this.update(cx, |this, cx| {
-                            this.verified = verified;
-                            cx.notify();
-                        })
-                        .ok();
-                    }
-                }
-            }),
-        );
-
-        Self {
-            profile,
-            followed: false,
-            verified: false,
-            copied: false,
-            _tasks: tasks,
-        }
-    }
-
-    fn address(&self, _cx: &Context<Self>) -> Option<String> {
-        self.profile.metadata().nip05
-    }
-
-    fn copy_pubkey(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        let Ok(bech32) = self.profile.public_key().to_bech32();
-        let item = ClipboardItem::new_string(bech32);
-        cx.write_to_clipboard(item);
-
-        self.set_copied(true, window, cx);
-    }
-
-    fn set_copied(&mut self, status: bool, window: &mut Window, cx: &mut Context<Self>) {
-        self.copied = status;
-        cx.notify();
-
-        // Reset the copied state after a delay
-        if status {
-            cx.spawn_in(window, async move |this, cx| {
-                cx.background_executor().timer(Duration::from_secs(2)).await;
-                cx.update(|window, cx| {
-                    this.update(cx, |this, cx| {
-                        this.set_copied(false, window, cx);
-                    })
-                    .ok();
-                })
-                .ok();
-            })
-            .detach();
-        }
-    }
-}
-
-impl Render for UserProfile {
-    fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        let proxy = AppSettings::get_proxy_user_avatars(cx);
-        let bech32 = self.profile.public_key().to_bech32().unwrap();
-        let shared_bech32 = SharedString::from(bech32);
-
-        v_flex()
-            .gap_4()
-            .text_sm()
-            .child(
-                v_flex()
-                    .gap_3()
-                    .items_center()
-                    .justify_center()
-                    .text_center()
-                    .child(Avatar::new(self.profile.avatar(proxy)).size(rems(4.)))
-                    .child(
-                        v_flex()
-                            .child(
-                                div()
-                                    .font_semibold()
-                                    .line_height(relative(1.25))
-                                    .child(self.profile.display_name()),
-                            )
-                            .when_some(self.address(cx), |this, address| {
-                                this.child(
-                                    h_flex()
-                                        .justify_center()
-                                        .gap_1()
-                                        .text_xs()
-                                        .text_color(cx.theme().text_muted)
-                                        .child(address)
-                                        .when(self.verified, |this| {
-                                            this.child(
-                                                div()
-                                                    .relative()
-                                                    .text_color(cx.theme().text_accent)
-                                                    .child(
-                                                        Icon::new(IconName::CheckCircleFill)
-                                                            .small()
-                                                            .block(),
-                                                    ),
-                                            )
-                                        }),
-                                )
-                            }),
-                    )
-                    .when(!self.followed, |this| {
-                        this.child(
-                            div()
-                                .flex_none()
-                                .w_32()
-                                .p_1()
-                                .rounded_full()
-                                .bg(cx.theme().elevated_surface_background)
-                                .text_xs()
-                                .font_semibold()
-                                .child(shared_t!("profile.unknown")),
-                        )
-                    }),
-            )
-            .child(
-                v_flex()
-                    .gap_1()
-                    .child(
-                        div()
-                            .text_color(cx.theme().text_muted)
-                            .child(SharedString::from("Public Key:")),
-                    )
-                    .child(
-                        h_flex()
-                            .gap_1()
-                            .child(
-                                div()
-                                    .p_2()
-                                    .h_7()
-                                    .rounded_md()
-                                    .bg(cx.theme().elevated_surface_background)
-                                    .truncate()
-                                    .text_ellipsis()
-                                    .line_clamp(1)
-                                    .line_height(relative(1.))
-                                    .child(shared_bech32),
-                            )
-                            .child(
-                                Button::new("copy")
-                                    .icon({
-                                        if self.copied {
-                                            IconName::CheckCircleFill
-                                        } else {
-                                            IconName::Copy
-                                        }
-                                    })
-                                    .cta()
-                                    .ghost_alt()
-                                    .on_click(cx.listener(move |this, _e, window, cx| {
-                                        this.copy_pubkey(window, cx);
-                                    })),
-                            ),
-                    ),
-            )
-            .child(
-                v_flex()
-                    .gap_1()
-                    .child(
-                        div()
-                            .text_color(cx.theme().text_muted)
-                            .child(shared_t!("profile.label_bio")),
-                    )
-                    .child(
-                        div()
-                            .p_2()
-                            .rounded_md()
-                            .bg(cx.theme().elevated_surface_background)
-                            .child(
-                                self.profile
-                                    .metadata()
-                                    .about
-                                    .map(SharedString::from)
-                                    .unwrap_or(shared_t!("profile.no_bio")),
-                            ),
-                    ),
-            )
-    }
-}
+use std::time::Duration;
+
+use common::{nip05_verify, shorten_pubkey};
+use gpui::prelude::FluentBuilder;
+use gpui::{
+    div, relative, rems, App, AppContext, ClipboardItem, Context, Entity, IntoElement,
+    ParentElement, Render, SharedString, Styled, Task, Window,
+};
+use gpui_tokio::Tokio;
+use nostr_sdk::prelude::*;
+use person::{Person, PersonRegistry};
+use smallvec::{smallvec, SmallVec};
+use state::NostrRegistry;
+use theme::ActiveTheme;
+use ui::avatar::Avatar;
+use ui::button::{Button, ButtonVariants};
+use ui::{h_flex, v_flex, Icon, IconName, Sizable, StyledExt};
+
+pub fn init(public_key: PublicKey, window: &mut Window, cx: &mut App) -> Entity<ProfileViewer> {
+    cx.new(|cx| ProfileViewer::new(public_key, window, cx))
+}
+
+#[derive(Debug)]
+pub struct ProfileViewer {
+    profile: Person,
+
+    /// Follow status
+    followed: bool,
+
+    /// Verification status
+    verified: bool,
+
+    /// Copy status
+    copied: bool,
+
+    /// Async operations
+    _tasks: SmallVec<[Task<()>; 1]>,
+}
+
+impl ProfileViewer {
+    pub fn new(target: PublicKey, window: &mut Window, cx: &mut Context<Self>) -> Self {
+        let nostr = NostrRegistry::global(cx);
+        let client = nostr.read(cx).client();
+
+        let persons = PersonRegistry::global(cx);
+        let profile = persons.read(cx).get(&target, cx);
+
+        let mut tasks = smallvec![];
+
+        let check_follow: Task<Result<bool, Error>> = cx.background_spawn(async move {
+            let signer = client.signer().await?;
+            let public_key = signer.get_public_key().await?;
+            let contact_list = client.database().contacts_public_keys(public_key).await?;
+
+            Ok(contact_list.contains(&target))
+        });
+
+        let verify_nip05 = if let Some(address) = profile.metadata().nip05 {
+            Some(Tokio::spawn(cx, async move {
+                nip05_verify(target, &address).await.unwrap_or(false)
+            }))
+        } else {
+            None
+        };
+
+        tasks.push(
+            // Load user profile data
+            cx.spawn_in(window, async move |this, cx| {
+                let followed = check_follow.await.unwrap_or(false);
+
+                // Update the followed status
+                this.update(cx, |this, cx| {
+                    this.followed = followed;
+                    cx.notify();
+                })
+                .ok();
+
+                // Update the NIP05 verification status if user has NIP05 address
+                if let Some(task) = verify_nip05 {
+                    if let Ok(verified) = task.await {
+                        this.update(cx, |this, cx| {
+                            this.verified = verified;
+                            cx.notify();
+                        })
+                        .ok();
+                    }
+                }
+            }),
+        );
+
+        Self {
+            profile,
+            followed: false,
+            verified: false,
+            copied: false,
+            _tasks: tasks,
+        }
+    }
+
+    fn address(&self, _cx: &Context<Self>) -> Option<String> {
+        self.profile.metadata().nip05
+    }
+
+    fn copy_pubkey(&mut self, window: &mut Window, cx: &mut Context<Self>) {
+        let Ok(bech32) = self.profile.public_key().to_bech32();
+        let item = ClipboardItem::new_string(bech32);
+        cx.write_to_clipboard(item);
+
+        self.set_copied(true, window, cx);
+    }
+
+    fn set_copied(&mut self, status: bool, window: &mut Window, cx: &mut Context<Self>) {
+        self.copied = status;
+        cx.notify();
+
+        if status {
+            self._tasks.push(
+                // Reset the copied state after a delay
+                cx.spawn_in(window, async move |this, cx| {
+                    cx.background_executor().timer(Duration::from_secs(2)).await;
+                    cx.update(|window, cx| {
+                        this.update(cx, |this, cx| {
+                            this.set_copied(false, window, cx);
+                        })
+                        .ok();
+                    })
+                    .ok();
+                }),
+            );
+        }
+    }
+}
+
+impl Render for ProfileViewer {
+    fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
+        let bech32 = shorten_pubkey(self.profile.public_key(), 16);
+        let shared_bech32 = SharedString::from(bech32);
+
+        v_flex()
+            .gap_4()
+            .text_sm()
+            .child(
+                v_flex()
+                    .gap_3()
+                    .items_center()
+                    .justify_center()
+                    .text_center()
+                    .child(Avatar::new(self.profile.avatar()).size(rems(4.)))
+                    .child(
+                        v_flex()
+                            .child(
+                                div()
+                                    .font_semibold()
+                                    .line_height(relative(1.25))
+                                    .child(self.profile.name()),
+                            )
+                            .when_some(self.address(cx), |this, address| {
+                                this.child(
+                                    h_flex()
+                                        .justify_center()
+                                        .gap_1()
+                                        .text_xs()
+                                        .text_color(cx.theme().text_muted)
+                                        .child(address)
+                                        .when(self.verified, |this| {
+                                            this.child(
+                                                div()
+                                                    .relative()
+                                                    .text_color(cx.theme().text_accent)
+                                                    .child(
+                                                        Icon::new(IconName::CheckCircleFill)
+                                                            .small()
+                                                            .block(),
+                                                    ),
+                                            )
+                                        }),
+                                )
+                            }),
+                    )
+                    .when(!self.followed, |this| {
+                        this.child(
+                            div()
+                                .flex_none()
+                                .w_32()
+                                .p_1()
+                                .rounded_full()
+                                .bg(cx.theme().elevated_surface_background)
+                                .text_xs()
+                                .font_semibold()
+                                .child(SharedString::from("Unknown contact")),
+                        )
+                    }),
+            )
+            .child(
+                v_flex()
+                    .gap_1()
+                    .text_sm()
+                    .child(
+                        div()
+                            .text_color(cx.theme().text_muted)
+                            .child(SharedString::from("Bio:")),
+                    )
+                    .child(
+                        div()
+                            .p_2()
+                            .min_h_16()
+                            .rounded(cx.theme().radius)
+                            .bg(cx.theme().elevated_surface_background)
+                            .child(
+                                self.profile
+                                    .metadata()
+                                    .about
+                                    .map(SharedString::from)
+                                    .unwrap_or(SharedString::from("No bio.")),
+                            ),
+                    ),
+            )
+            .child(div().my_1().h_px().w_full().bg(cx.theme().border))
+            .child(
+                v_flex()
+                    .gap_1()
+                    .child(
+                        div()
+                            .text_xs()
+                            .text_color(cx.theme().text_placeholder)
+                            .font_semibold()
+                            .child(SharedString::from("Public Key:")),
+                    )
+                    .child(
+                        h_flex()
+                            .gap_2()
+                            .w_full()
+                            .h_12()
+                            .justify_center()
+                            .bg(cx.theme().surface_background)
+                            .rounded(cx.theme().radius)
+                            .text_sm()
+                            .child(shared_bech32)
+                            .child(
+                                Button::new("copy")
+                                    .icon({
+                                        if self.copied {
+                                            IconName::CheckCircleFill
+                                        } else {
+                                            IconName::Copy
+                                        }
+                                    })
+                                    .xsmall()
+                                    .ghost()
+                                    .on_click(cx.listener(move |this, _e, window, cx| {
+                                        this.copy_pubkey(window, cx);
+                                    })),
+                            ),
+                    ),
+            )
+    }
+}

crates/coop/src/views/account.rs

@@ -1,447 +0,0 @@
-use std::time::Duration;
-
-use anyhow::Error;
-use client_keys::ClientKeys;
-use common::display::RenderedProfile;
-use global::constants::{ACCOUNT_IDENTIFIER, BUNKER_TIMEOUT};
-use global::{app_state, nostr_client, SignalKind};
-use gpui::prelude::FluentBuilder;
-use gpui::{
-    div, relative, rems, svg, AnyElement, App, AppContext, Context, Entity, EventEmitter,
-    FocusHandle, Focusable, InteractiveElement, IntoElement, ParentElement, Render,
-    RetainAllImageCache, SharedString, StatefulInteractiveElement, Styled, Subscription, Task,
-    WeakEntity, Window,
-};
-use i18n::{shared_t, t};
-use nostr_connect::prelude::*;
-use nostr_sdk::prelude::*;
-use smallvec::{smallvec, SmallVec};
-use theme::ActiveTheme;
-use ui::avatar::Avatar;
-use ui::button::{Button, ButtonVariants};
-use ui::dock_area::panel::{Panel, PanelEvent};
-use ui::indicator::Indicator;
-use ui::input::{InputState, TextInput};
-use ui::notification::Notification;
-use ui::popup_menu::PopupMenu;
-use ui::{h_flex, v_flex, ContextModal, Sizable, StyledExt};
-
-use crate::actions::CoopAuthUrlHandler;
-use crate::chatspace::ChatSpace;
-
-pub fn init(
-    profile: Profile,
-    secret: String,
-    window: &mut Window,
-    cx: &mut App,
-) -> Entity<Account> {
-    cx.new(|cx| Account::new(secret, profile, window, cx))
-}
-
-pub struct Account {
-    profile: Profile,
-    stored_secret: String,
-    is_bunker: bool,
-    is_extension: bool,
-    loading: bool,
-
-    name: SharedString,
-    focus_handle: FocusHandle,
-    image_cache: Entity<RetainAllImageCache>,
-
-    _subscriptions: SmallVec<[Subscription; 1]>,
-    _tasks: SmallVec<[Task<()>; 1]>,
-}
-
-impl Account {
-    fn new(secret: String, profile: Profile, window: &mut Window, cx: &mut Context<Self>) -> Self {
-        let is_bunker = secret.starts_with("bunker://");
-        let is_extension = secret.starts_with("extension");
-
-        let mut subscriptions = smallvec![];
-
-        subscriptions.push(
-            // Clear the local state when user closes the account panel
-            cx.on_release_in(window, move |this, window, cx| {
-                this.stored_secret.clear();
-                this.image_cache.update(cx, |this, cx| {
-                    this.clear(window, cx);
-                });
-            }),
-        );
-
-        Self {
-            profile,
-            is_bunker,
-            is_extension,
-            stored_secret: secret,
-            loading: false,
-            name: "Account".into(),
-            focus_handle: cx.focus_handle(),
-            image_cache: RetainAllImageCache::new(cx),
-            _subscriptions: subscriptions,
-            _tasks: smallvec![],
-        }
-    }
-
-    fn login(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        self.set_loading(true, cx);
-
-        if self.is_bunker {
-            if let Ok(uri) = NostrConnectURI::parse(&self.stored_secret) {
-                self.nostr_connect(uri, window, cx);
-            }
-        } else if self.is_extension {
-            self.set_proxy(window, cx);
-        } else if let Ok(enc) = EncryptedSecretKey::from_bech32(&self.stored_secret) {
-            self.keys(enc, window, cx);
-        } else {
-            window.push_notification("Cannot continue with current account", cx);
-            self.set_loading(false, cx);
-        }
-    }
-
-    fn nostr_connect(&mut self, uri: NostrConnectURI, window: &mut Window, cx: &mut Context<Self>) {
-        let client_keys = ClientKeys::global(cx);
-        let app_keys = client_keys.read(cx).keys();
-
-        let timeout = Duration::from_secs(BUNKER_TIMEOUT);
-        let mut signer = NostrConnect::new(uri, app_keys, timeout, None).unwrap();
-
-        // Handle auth url with the default browser
-        signer.auth_url_handler(CoopAuthUrlHandler);
-
-        self._tasks.push(
-            // Handle connection in the background
-            cx.spawn_in(window, async move |this, cx| {
-                let client = nostr_client();
-
-                match signer.bunker_uri().await {
-                    Ok(_) => {
-                        // Set the client's signer with the current nostr connect instance
-                        client.set_signer(signer).await;
-                    }
-                    Err(e) => {
-                        this.update_in(cx, |this, window, cx| {
-                            this.set_loading(false, cx);
-                            window.push_notification(Notification::error(e.to_string()), cx);
-                        })
-                        .ok();
-                    }
-                }
-            }),
-        );
-    }
-
-    fn set_proxy(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        ChatSpace::proxy_signer(window, cx);
-    }
-
-    fn keys(&mut self, enc: EncryptedSecretKey, window: &mut Window, cx: &mut Context<Self>) {
-        let pwd_input: Entity<InputState> = cx.new(|cx| InputState::new(window, cx).masked(true));
-        let weak_input = pwd_input.downgrade();
-
-        let error: Entity<Option<SharedString>> = cx.new(|_| None);
-        let weak_error = error.downgrade();
-
-        let entity = cx.weak_entity();
-
-        window.open_modal(cx, move |this, _window, cx| {
-            let entity = entity.clone();
-            let entity_clone = entity.clone();
-            let weak_input = weak_input.clone();
-            let weak_error = weak_error.clone();
-
-            this.overlay_closable(false)
-                .show_close(false)
-                .keyboard(false)
-                .confirm()
-                .on_cancel(move |_, _window, cx| {
-                    entity
-                        .update(cx, |this, cx| {
-                            this.set_loading(false, cx);
-                        })
-                        .ok();
-
-                    // true to close the modal
-                    true
-                })
-                .on_ok(move |_, window, cx| {
-                    let weak_error = weak_error.clone();
-                    let password = weak_input
-                        .read_with(cx, |state, _cx| state.value().to_owned())
-                        .ok();
-
-                    entity_clone
-                        .update(cx, |this, cx| {
-                            this.verify_keys(enc, password, weak_error, window, cx);
-                        })
-                        .ok();
-
-                    // false to keep the modal open
-                    false
-                })
-                .child(
-                    div()
-                        .w_full()
-                        .flex()
-                        .flex_col()
-                        .gap_1()
-                        .text_sm()
-                        .child(shared_t!("login.password_to_decrypt"))
-                        .child(TextInput::new(&pwd_input).small())
-                        .when_some(error.read(cx).as_ref(), |this, error| {
-                            this.child(
-                                div()
-                                    .text_xs()
-                                    .italic()
-                                    .text_color(cx.theme().danger_foreground)
-                                    .child(error.clone()),
-                            )
-                        }),
-                )
-        });
-    }
-
-    fn verify_keys(
-        &mut self,
-        enc: EncryptedSecretKey,
-        password: Option<SharedString>,
-        error: WeakEntity<Option<SharedString>>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let Some(password) = password else {
-            error
-                .update(cx, |this, cx| {
-                    *this = Some("Password is required".into());
-                    cx.notify();
-                })
-                .ok();
-            return;
-        };
-
-        if password.is_empty() {
-            error
-                .update(cx, |this, cx| {
-                    *this = Some("Password cannot be empty".into());
-                    cx.notify();
-                })
-                .ok();
-            return;
-        }
-
-        let task: Task<Result<SecretKey, Error>> = cx.background_spawn(async move {
-            let secret = enc.decrypt(&password)?;
-            Ok(secret)
-        });
-
-        cx.spawn_in(window, async move |_this, cx| {
-            match task.await {
-                Ok(secret) => {
-                    cx.update(|window, cx| {
-                        window.close_all_modals(cx);
-                    })
-                    .ok();
-
-                    let client = nostr_client();
-                    let keys = Keys::new(secret);
-
-                    // Set the client's signer with the current keys
-                    client.set_signer(keys).await
-                }
-                Err(e) => {
-                    error
-                        .update(cx, |this, cx| {
-                            *this = Some(e.to_string().into());
-                            cx.notify();
-                        })
-                        .ok();
-                }
-            };
-        })
-        .detach();
-    }
-
-    fn logout(&mut self, _window: &mut Window, cx: &mut Context<Self>) {
-        self._tasks.push(
-            // Reset the nostr client in the background
-            cx.background_spawn(async move {
-                let client = nostr_client();
-                let app_state = app_state();
-
-                let filter = Filter::new()
-                    .kind(Kind::ApplicationSpecificData)
-                    .identifier(ACCOUNT_IDENTIFIER);
-
-                // Delete account
-                client.database().delete(filter).await.ok();
-
-                // Unset the client's signer
-                client.unset_signer().await;
-
-                // Notify the channel about the signer being unset
-                app_state.signal.send(SignalKind::SignerUnset).await;
-            }),
-        );
-    }
-
-    fn set_loading(&mut self, status: bool, cx: &mut Context<Self>) {
-        self.loading = status;
-        cx.notify();
-    }
-}
-
-impl Panel for Account {
-    fn panel_id(&self) -> SharedString {
-        self.name.clone()
-    }
-
-    fn title(&self, _cx: &App) -> AnyElement {
-        self.name.clone().into_any_element()
-    }
-
-    fn popup_menu(&self, menu: PopupMenu, _cx: &App) -> PopupMenu {
-        menu.track_focus(&self.focus_handle)
-    }
-
-    fn toolbar_buttons(&self, _window: &Window, _cx: &App) -> Vec<Button> {
-        vec![]
-    }
-}
-
-impl EventEmitter<PanelEvent> for Account {}
-
-impl Focusable for Account {
-    fn focus_handle(&self, _: &App) -> gpui::FocusHandle {
-        self.focus_handle.clone()
-    }
-}
-
-impl Render for Account {
-    fn render(&mut self, _window: &mut gpui::Window, cx: &mut Context<Self>) -> impl IntoElement {
-        v_flex()
-            .image_cache(self.image_cache.clone())
-            .relative()
-            .size_full()
-            .gap_10()
-            .items_center()
-            .justify_center()
-            .child(
-                v_flex()
-                    .items_center()
-                    .justify_center()
-                    .gap_4()
-                    .child(
-                        svg()
-                            .path("brand/coop.svg")
-                            .size_16()
-                            .text_color(cx.theme().elevated_surface_background),
-                    )
-                    .child(
-                        div()
-                            .text_center()
-                            .child(
-                                div()
-                                    .text_xl()
-                                    .font_semibold()
-                                    .line_height(relative(1.3))
-                                    .child(shared_t!("welcome.title")),
-                            )
-                            .child(
-                                div()
-                                    .text_color(cx.theme().text_muted)
-                                    .child(shared_t!("welcome.subtitle")),
-                            ),
-                    ),
-            )
-            .child(
-                v_flex()
-                    .gap_2()
-                    .child(
-                        div()
-                            .id("account")
-                            .h_10()
-                            .w_72()
-                            .bg(cx.theme().elevated_surface_background)
-                            .rounded_lg()
-                            .text_sm()
-                            .when(self.loading, |this| {
-                                this.child(
-                                    div()
-                                        .size_full()
-                                        .flex()
-                                        .items_center()
-                                        .justify_center()
-                                        .child(Indicator::new().small()),
-                                )
-                            })
-                            .when(!self.loading, |this| {
-                                let avatar = self.profile.avatar(true);
-                                let name = self.profile.display_name();
-
-                                this.child(
-                                    h_flex()
-                                        .h_full()
-                                        .justify_center()
-                                        .gap_2()
-                                        .child(
-                                            h_flex()
-                                                .gap_1()
-                                                .child(Avatar::new(avatar).size(rems(1.5)))
-                                                .child(div().pb_px().font_semibold().child(name)),
-                                        )
-                                        .child(
-                                            div()
-                                                .when(self.is_bunker, |this| {
-                                                    let label = SharedString::from("Nostr Connect");
-
-                                                    this.child(
-                                                        div()
-                                                            .py_0p5()
-                                                            .px_2()
-                                                            .text_xs()
-                                                            .bg(cx.theme().secondary_active)
-                                                            .text_color(
-                                                                cx.theme().secondary_foreground,
-                                                            )
-                                                            .rounded_full()
-                                                            .child(label),
-                                                    )
-                                                })
-                                                .when(self.is_extension, |this| {
-                                                    let label = SharedString::from("Extension");
-
-                                                    this.child(
-                                                        div()
-                                                            .py_0p5()
-                                                            .px_2()
-                                                            .text_xs()
-                                                            .bg(cx.theme().secondary_active)
-                                                            .text_color(
-                                                                cx.theme().secondary_foreground,
-                                                            )
-                                                            .rounded_full()
-                                                            .child(label),
-                                                    )
-                                                }),
-                                        ),
-                                )
-                            })
-                            .active(|this| this.bg(cx.theme().element_active))
-                            .hover(|this| this.bg(cx.theme().element_hover))
-                            .on_click(cx.listener(move |this, _e, window, cx| {
-                                this.login(window, cx);
-                            })),
-                    )
-                    .child(
-                        Button::new("logout")
-                            .label(t!("user.sign_out"))
-                            .ghost()
-                            .on_click(cx.listener(move |this, _e, window, cx| {
-                                this.logout(window, cx);
-                            })),
-                    ),
-            )
-    }
-}

crates/coop/src/views/backup_keys.rs

@@ -1,210 +0,0 @@
-use std::fs;
-use std::time::Duration;
-
-use dirs::document_dir;
-use gpui::prelude::FluentBuilder;
-use gpui::{
-    div, AppContext, ClipboardItem, Context, Entity, Flatten, IntoElement, ParentElement, Render,
-    SharedString, Styled, Task, Window,
-};
-use i18n::{shared_t, t};
-use nostr_sdk::prelude::*;
-use theme::ActiveTheme;
-use ui::button::{Button, ButtonVariants};
-use ui::input::{InputState, TextInput};
-use ui::{divider, h_flex, v_flex, Disableable, IconName, Sizable};
-
-pub struct BackupKeys {
-    password: Entity<InputState>,
-    pubkey_input: Entity<InputState>,
-    secret_input: Entity<InputState>,
-    error: Option<SharedString>,
-    copied: bool,
-}
-
-impl BackupKeys {
-    pub fn new(keys: &Keys, window: &mut Window, cx: &mut Context<'_, Self>) -> Self {
-        let Ok(npub) = keys.public_key.to_bech32();
-        let Ok(nsec) = keys.secret_key().to_bech32();
-
-        let password = cx.new(|cx| InputState::new(window, cx).masked(true));
-
-        let pubkey_input = cx.new(|cx| {
-            InputState::new(window, cx)
-                .disabled(true)
-                .default_value(npub)
-        });
-
-        let secret_input = cx.new(|cx| {
-            InputState::new(window, cx)
-                .disabled(true)
-                .default_value(nsec)
-        });
-
-        Self {
-            password,
-            pubkey_input,
-            secret_input,
-            error: None,
-            copied: false,
-        }
-    }
-
-    pub fn password(&self, cx: &Context<Self>) -> String {
-        self.password.read(cx).value().to_string()
-    }
-
-    pub fn backup(&mut self, window: &mut Window, cx: &mut Context<Self>) -> Option<Task<()>> {
-        let document_dir = document_dir().expect("Failed to get document directory");
-        let password = self.password.read(cx).value().to_string();
-
-        if password.is_empty() {
-            self.set_error(t!("login.password_is_required"), window, cx);
-            return None;
-        };
-
-        let path = cx.prompt_for_new_path(&document_dir, Some("My Nostr Account"));
-        let nsec = self.secret_input.read(cx).value().to_string();
-
-        Some(cx.spawn_in(window, async move |this, cx| {
-            match Flatten::flatten(path.await.map_err(|e| e.into())) {
-                Ok(Ok(Some(path))) => {
-                    cx.update(|window, cx| {
-                        if let Err(e) = fs::write(&path, nsec) {
-                            this.update(cx, |this, cx| {
-                                this.set_error(e.to_string(), window, cx);
-                            })
-                            .ok();
-                        }
-                    })
-                    .ok();
-                }
-                _ => {
-                    log::error!("Failed to save backup keys");
-                }
-            };
-        }))
-    }
-
-    fn copy_secret(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        let item = ClipboardItem::new_string(self.secret_input.read(cx).value().to_string());
-        cx.write_to_clipboard(item);
-
-        self.set_copied(true, window, cx);
-    }
-
-    fn set_copied(&mut self, status: bool, window: &mut Window, cx: &mut Context<Self>) {
-        self.copied = status;
-        cx.notify();
-
-        // Reset the copied state after a delay
-        if status {
-            cx.spawn_in(window, async move |this, cx| {
-                cx.background_executor().timer(Duration::from_secs(2)).await;
-                cx.update(|window, cx| {
-                    this.update(cx, |this, cx| {
-                        this.set_copied(false, window, cx);
-                    })
-                    .ok();
-                })
-                .ok();
-            })
-            .detach();
-        }
-    }
-
-    fn set_error<E>(&mut self, error: E, window: &mut Window, cx: &mut Context<Self>)
-    where
-        E: Into<SharedString>,
-    {
-        self.error = Some(error.into());
-        cx.notify();
-
-        // Clear the error message after a delay
-        cx.spawn_in(window, async move |this, cx| {
-            cx.background_executor().timer(Duration::from_secs(2)).await;
-            cx.update(|_, cx| {
-                this.update(cx, |this, cx| {
-                    this.error = None;
-                    cx.notify();
-                })
-                .ok();
-            })
-            .ok();
-        })
-        .detach();
-    }
-}
-
-impl Render for BackupKeys {
-    fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        v_flex()
-            .gap_3()
-            .text_sm()
-            .child(
-                div()
-                    .text_color(cx.theme().text_muted)
-                    .child(shared_t!("new_account.backup_description")),
-            )
-            .child(
-                v_flex()
-                    .gap_1()
-                    .child(shared_t!("common.pubkey"))
-                    .child(TextInput::new(&self.pubkey_input).small())
-                    .child(
-                        div()
-                            .text_xs()
-                            .text_color(cx.theme().text_muted)
-                            .child(shared_t!("new_account.backup_pubkey_note")),
-                    ),
-            )
-            .child(divider(cx))
-            .child(
-                v_flex()
-                    .gap_1()
-                    .child(shared_t!("common.secret"))
-                    .child(
-                        h_flex()
-                            .gap_1()
-                            .child(TextInput::new(&self.secret_input).small())
-                            .child(
-                                Button::new("copy")
-                                    .icon({
-                                        if self.copied {
-                                            IconName::CheckCircleFill
-                                        } else {
-                                            IconName::Copy
-                                        }
-                                    })
-                                    .ghost()
-                                    .disabled(self.copied)
-                                    .on_click(cx.listener(move |this, _e, window, cx| {
-                                        this.copy_secret(window, cx);
-                                    })),
-                            ),
-                    )
-                    .child(
-                        div()
-                            .text_xs()
-                            .text_color(cx.theme().text_muted)
-                            .child(shared_t!("new_account.backup_secret_note")),
-                    ),
-            )
-            .child(divider(cx))
-            .child(
-                v_flex()
-                    .gap_1()
-                    .child(shared_t!("login.set_password"))
-                    .child(TextInput::new(&self.password).small())
-                    .when_some(self.error.as_ref(), |this, error| {
-                        this.child(
-                            div()
-                                .italic()
-                                .text_xs()
-                                .text_color(cx.theme().danger_foreground)
-                                .child(error.clone()),
-                        )
-                    }),
-            )
-    }
-}

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

@@ -1,55 +0,0 @@
-use gpui::{
-    div, App, AppContext, Context, Entity, IntoElement, ParentElement, Render, SharedString,
-    Styled, Window,
-};
-use i18n::{shared_t, t};
-use theme::ActiveTheme;
-use ui::input::{InputState, TextInput};
-use ui::{v_flex, Sizable};
-
-pub fn init(subject: Option<String>, window: &mut Window, cx: &mut App) -> Entity<Subject> {
-    Subject::new(subject, window, cx)
-}
-
-pub struct Subject {
-    input: Entity<InputState>,
-}
-
-impl Subject {
-    pub fn new(subject: Option<String>, window: &mut Window, cx: &mut App) -> Entity<Self> {
-        let input = cx.new(|cx| {
-            let mut this = InputState::new(window, cx).placeholder(t!("subject.placeholder"));
-            if let Some(text) = subject.as_ref() {
-                this.set_value(text, window, cx);
-            }
-            this
-        });
-
-        cx.new(|_| Self { input })
-    }
-
-    pub fn new_subject(&self, cx: &App) -> String {
-        self.input.read(cx).value().to_string()
-    }
-}
-
-impl Render for Subject {
-    fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        v_flex()
-            .gap_1()
-            .child(
-                div()
-                    .text_sm()
-                    .text_color(cx.theme().text_muted)
-                    .child(shared_t!("subject.title")),
-            )
-            .child(TextInput::new(&self.input).small())
-            .child(
-                div()
-                    .text_xs()
-                    .italic()
-                    .text_color(cx.theme().text_placeholder)
-                    .child(shared_t!("subject.help_text")),
-            )
-    }
-}

crates/coop/src/views/compose.rs

@@ -2,10 +2,8 @@ use std::ops::Range;
 use std::time::Duration;
 
 use anyhow::{anyhow, Error};
-use common::display::{RenderedProfile, TextUtils};
-use common::nip05::nip05_profile;
-use global::constants::BOOTSTRAP_RELAYS;
-use global::{app_state, nostr_client};
+use chat::{ChatRegistry, Room};
+use common::{nip05_profile, TextUtils, BOOTSTRAP_RELAYS};
 use gpui::prelude::FluentBuilder;
 use gpui::{
     div, px, relative, rems, uniform_list, App, AppContext, Context, Entity, InteractiveElement,
@@ -13,13 +11,10 @@ use gpui::{
     StatefulInteractiveElement, Styled, Subscription, Task, Window,
 };
 use gpui_tokio::Tokio;
-use i18n::{shared_t, t};
 use nostr_sdk::prelude::*;
-use registry::room::Room;
-use registry::Registry;
-use settings::AppSettings;
+use person::PersonRegistry;
 use smallvec::{smallvec, SmallVec};
-use smol::Timer;
+use state::NostrRegistry;
 use theme::ActiveTheme;
 use ui::avatar::Avatar;
 use ui::button::{Button, ButtonVariants};
@@ -43,9 +38,9 @@ pub fn compose_button() -> impl IntoElement {
                 window.open_modal(cx, move |modal, _window, cx| {
                     let weak_view = weak_view.clone();
                     let label = if compose.read(cx).selected(cx).len() > 1 {
-                        shared_t!("compose.create_group_dm_button")
+                        SharedString::from("Create Group DM")
                     } else {
-                        shared_t!("compose.create_dm_button")
+                        SharedString::from("Create DM")
                     };
 
                     modal
@@ -54,7 +49,7 @@ pub fn compose_button() -> impl IntoElement {
                         .keyboard(true)
                         .show_close(true)
                         .button_props(ModalButtonProps::default().ok_text(label))
-                        .title(shared_t!("sidebar.direct_messages"))
+                        .title(SharedString::from("Direct Messages"))
                         .child(compose.clone())
                         .on_ok(move |_, window, cx| {
                             weak_view
@@ -116,7 +111,10 @@ pub struct Compose {
 }
 
 impl Compose {
-    pub fn new(window: &mut Window, cx: &mut Context<'_, Self>) -> Self {
+    pub fn new(window: &mut Window, cx: &mut Context<Self>) -> Self {
+        let nostr = NostrRegistry::global(cx);
+        let client = nostr.read(cx).client();
+
         let contacts = cx.new(|_| vec![]);
         let error_message = cx.new(|_| None);
 
@@ -130,7 +128,6 @@ impl Compose {
         let mut tasks = smallvec![];
 
         let get_contacts: Task<Result<Vec<Contact>, Error>> = cx.background_spawn(async move {
-            let client = nostr_client();
             let signer = client.signer().await?;
             let public_key = signer.get_public_key().await?;
             let profiles = client.database().contacts(public_key).await?;
@@ -195,14 +192,13 @@ impl Compose {
         }
     }
 
-    async fn request_metadata(public_key: PublicKey) -> Result<(), Error> {
-        let client = nostr_client();
-        let app_state = app_state();
-        let kinds = vec![Kind::Metadata, Kind::ContactList, Kind::RelayList];
+    async fn request_metadata(client: &Client, public_key: PublicKey) -> Result<(), Error> {
+        let opts = SubscribeAutoCloseOptions::default().exit_policy(ReqExitPolicy::ExitOnEOSE);
+        let kinds = vec![Kind::Metadata, Kind::ContactList];
         let filter = Filter::new().author(public_key).kinds(kinds).limit(10);
 
         client
-            .subscribe_to(BOOTSTRAP_RELAYS, filter, app_state.auto_close_opts)
+            .subscribe_to(BOOTSTRAP_RELAYS, filter, Some(opts))
             .await?;
 
         Ok(())
@@ -219,11 +215,13 @@ impl Compose {
     }
 
     fn push_contact(&mut self, contact: Contact, window: &mut Window, cx: &mut Context<Self>) {
+        let nostr = NostrRegistry::global(cx);
+        let client = nostr.read(cx).client();
         let pk = contact.public_key;
 
         if !self.contacts.read(cx).iter().any(|c| c.public_key == pk) {
             self._tasks.push(cx.background_spawn(async move {
-                Self::request_metadata(pk).await.ok();
+                Self::request_metadata(&client, pk).await.ok();
             }));
 
             cx.defer_in(window, |this, window, cx| {
@@ -237,7 +235,7 @@ impl Compose {
                 });
             });
         } else {
-            self.set_error(Some(t!("compose.contact_existed").into()), cx);
+            self.set_error("Contact already added", cx);
         }
     }
 
@@ -283,7 +281,7 @@ impl Compose {
                     }
                     Ok(Err(e)) => {
                         this.update(cx, |this, cx| {
-                            this.set_error(Some(e.to_string().into()), cx);
+                            this.set_error(e.to_string(), cx);
                         })
                         .ok();
                     }
@@ -311,48 +309,28 @@ impl Compose {
     }
 
     fn submit(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        let registry = Registry::global(cx);
-        let public_keys: Vec<PublicKey> = self.selected(cx);
+        let chat = ChatRegistry::global(cx);
+        let nostr = NostrRegistry::global(cx);
+        let public_key = nostr.read(cx).identity().read(cx).public_key();
+
+        let receivers: Vec<PublicKey> = self.selected(cx);
+        let subject_input = self.title_input.read(cx).value();
+        let subject = (!subject_input.is_empty()).then(|| subject_input.to_string());
 
         if !self.user_input.read(cx).value().is_empty() {
             self.add_and_select_contact(window, cx);
             return;
         };
 
-        if public_keys.is_empty() {
-            self.set_error(Some(t!("compose.receiver_required").into()), cx);
-            return;
-        };
-
-        // Convert selected pubkeys into Nostr tags
-        let mut tags: Tags = Tags::from_list(
-            public_keys
-                .iter()
-                .map(|pubkey| Tag::public_key(pubkey.to_owned()))
-                .collect(),
-        );
-
-        // Add subject if it is present
-        if !self.title_input.read(cx).value().is_empty() {
-            tags.push(Tag::custom(
-                TagKind::Subject,
-                vec![self.title_input.read(cx).value().to_string()],
-            ));
-        }
-
-        // Create a new room
-        let room = Room::new(public_keys[0], tags, cx);
-
-        // Insert the new room into the registry
-        registry.update(cx, |this, cx| {
-            this.push_room(cx.new(|_| room), cx);
+        chat.update(cx, |this, cx| {
+            let room = cx.new(|_| Room::new(subject, public_key, receivers));
+            this.emit_room(room.downgrade(), cx);
         });
 
-        // Close the current modal
         window.close_modal(cx);
     }
 
-    fn set_error(&mut self, error: impl Into<Option<SharedString>>, cx: &mut Context<Self>) {
+    fn set_error(&mut self, error: impl Into<SharedString>, cx: &mut Context<Self>) {
         // Unlock the user input
         self.user_input.update(cx, |this, cx| {
             this.set_loading(false, cx);
@@ -360,15 +338,19 @@ impl Compose {
 
         // Update error message
         self.error_message.update(cx, |this, cx| {
-            *this = error.into();
+            *this = Some(error.into());
             cx.notify();
         });
 
         // Dismiss error after 2 seconds
         cx.spawn(async move |this, cx| {
-            Timer::after(Duration::from_secs(2)).await;
+            cx.background_executor().timer(Duration::from_secs(2)).await;
+
             this.update(cx, |this, cx| {
-                this.set_error(None, cx);
+                this.error_message.update(cx, |this, cx| {
+                    *this = None;
+                    cx.notify();
+                });
             })
             .ok();
         })
@@ -376,8 +358,7 @@ impl Compose {
     }
 
     fn list_items(&self, range: Range<usize>, cx: &Context<Self>) -> Vec<impl IntoElement> {
-        let proxy = AppSettings::get_proxy_user_avatars(cx);
-        let registry = Registry::read_global(cx);
+        let persons = PersonRegistry::global(cx);
         let mut items = Vec::with_capacity(self.contacts.read(cx).len());
 
         for ix in range {
@@ -386,7 +367,7 @@ impl Compose {
             };
 
             let public_key = contact.public_key;
-            let profile = registry.get_person(&public_key, cx);
+            let profile = persons.read(cx).get(&public_key, cx);
 
             items.push(
                 h_flex()
@@ -400,8 +381,8 @@ impl Compose {
                         h_flex()
                             .gap_1p5()
                             .text_sm()
-                            .child(Avatar::new(profile.avatar(proxy)).size(rems(1.75)))
-                            .child(profile.display_name()),
+                            .child(Avatar::new(profile.avatar()).size(rems(1.75)))
+                            .child(profile.name()),
                     )
                     .when(contact.selected, |this| {
                         this.child(
@@ -434,7 +415,7 @@ impl Render for Compose {
                 div()
                     .text_sm()
                     .text_color(cx.theme().text_muted)
-                    .child(shared_t!("compose.description")),
+                    .child(SharedString::from("Start a conversation with someone using their npub or NIP-05 (like foo@bar.com).")),
             )
             .when_some(error, |this, msg| {
                 this.child(
@@ -455,7 +436,7 @@ impl Render for Compose {
                         div()
                             .text_sm()
                             .font_semibold()
-                            .child(shared_t!("compose.subject_label")),
+                            .child(SharedString::from("Subject:")),
                     )
                     .child(TextInput::new(&self.title_input).small().appearance(false)),
             )
@@ -470,7 +451,7 @@ impl Render for Compose {
                                 div()
                                     .text_sm()
                                     .font_semibold()
-                                    .child(shared_t!("compose.to_label")),
+                                    .child(SharedString::from("To:")),
                             )
                             .child(
                                 TextInput::new(&self.user_input)
@@ -502,12 +483,12 @@ impl Render for Compose {
                                         div()
                                             .font_semibold()
                                             .line_height(relative(1.2))
-                                            .child(shared_t!("compose.no_contacts_message")),
+                                            .child(SharedString::from("No contacts")),
                                     )
                                     .child(
                                         div()
                                             .text_color(cx.theme().text_muted)
-                                            .child(shared_t!("compose.no_contacts_description")),
+                                            .child(SharedString::from("Your recently contacts will appear here.")),
                                     ),
                             )
                         } else {

crates/coop/src/views/edit_profile.rs

@@ -1,285 +0,0 @@
-use std::str::FromStr;
-use std::time::Duration;
-
-use common::nip96::nip96_upload;
-use global::nostr_client;
-use gpui::prelude::FluentBuilder;
-use gpui::{
-    div, img, App, AppContext, Context, Entity, Flatten, IntoElement, ParentElement,
-    PathPromptOptions, Render, SharedString, Styled, Task, Window,
-};
-use i18n::{shared_t, t};
-use nostr_sdk::prelude::*;
-use settings::AppSettings;
-use smol::fs;
-use theme::ActiveTheme;
-use ui::button::{Button, ButtonVariants};
-use ui::input::{InputState, TextInput};
-use ui::{v_flex, Disableable, IconName, Sizable};
-
-pub fn init(window: &mut Window, cx: &mut App) -> Entity<EditProfile> {
-    EditProfile::new(window, cx)
-}
-
-pub struct EditProfile {
-    profile: Option<Metadata>,
-    name_input: Entity<InputState>,
-    avatar_input: Entity<InputState>,
-    bio_input: Entity<InputState>,
-    website_input: Entity<InputState>,
-    is_loading: bool,
-    is_submitting: bool,
-}
-
-impl EditProfile {
-    pub fn new(window: &mut Window, cx: &mut App) -> Entity<Self> {
-        let name_input =
-            cx.new(|cx| InputState::new(window, cx).placeholder(t!("profile.placeholder_name")));
-        let avatar_input =
-            cx.new(|cx| InputState::new(window, cx).placeholder("https://example.com/avatar.jpg"));
-        let website_input =
-            cx.new(|cx| InputState::new(window, cx).placeholder("https://your-website.com"));
-        let bio_input = cx.new(|cx| {
-            InputState::new(window, cx)
-                .multi_line()
-                .placeholder(t!("profile.placeholder_bio"))
-        });
-
-        cx.new(|cx| {
-            let this = Self {
-                name_input,
-                avatar_input,
-                bio_input,
-                website_input,
-                profile: None,
-                is_loading: false,
-                is_submitting: false,
-            };
-
-            let task: Task<Result<Option<Metadata>, Error>> = cx.background_spawn(async move {
-                let client = nostr_client();
-                let signer = client.signer().await?;
-                let public_key = signer.get_public_key().await?;
-                let metadata = client
-                    .fetch_metadata(public_key, Duration::from_secs(2))
-                    .await?;
-
-                Ok(metadata)
-            });
-
-            cx.spawn_in(window, async move |this, cx| {
-                if let Ok(Some(metadata)) = task.await {
-                    this.update_in(cx, |this: &mut EditProfile, window, cx| {
-                        this.avatar_input.update(cx, |this, cx| {
-                            if let Some(avatar) = metadata.picture.as_ref() {
-                                this.set_value(avatar, window, cx);
-                            }
-                        });
-                        this.bio_input.update(cx, |this, cx| {
-                            if let Some(bio) = metadata.about.as_ref() {
-                                this.set_value(bio, window, cx);
-                            }
-                        });
-                        this.name_input.update(cx, |this, cx| {
-                            if let Some(display_name) = metadata.display_name.as_ref() {
-                                this.set_value(display_name, window, cx);
-                            }
-                        });
-                        this.website_input.update(cx, |this, cx| {
-                            if let Some(website) = metadata.website.as_ref() {
-                                this.set_value(website, window, cx);
-                            }
-                        });
-                        this.profile = Some(metadata);
-                        cx.notify();
-                    })
-                    .ok();
-                }
-            })
-            .detach();
-
-            this
-        })
-    }
-
-    fn upload(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        let nip96 = AppSettings::get_media_server(cx);
-        let avatar_input = self.avatar_input.downgrade();
-        let paths = cx.prompt_for_paths(PathPromptOptions {
-            files: true,
-            directories: false,
-            multiple: false,
-            prompt: None,
-        });
-
-        // Show loading spinner
-        self.set_loading(true, cx);
-
-        cx.spawn_in(window, async move |this, cx| {
-            match Flatten::flatten(paths.await.map_err(|e| e.into())) {
-                Ok(Some(mut paths)) => {
-                    let path = paths.pop().unwrap();
-
-                    if let Ok(file_data) = fs::read(path).await {
-                        let (tx, rx) = oneshot::channel::<Url>();
-
-                        nostr_sdk::async_utility::task::spawn(async move {
-                            if let Ok(url) = nip96_upload(nostr_client(), &nip96, file_data).await {
-                                _ = tx.send(url);
-                            }
-                        });
-
-                        if let Ok(url) = rx.await {
-                            cx.update(|window, cx| {
-                                // Stop loading spinner
-                                this.update(cx, |this, cx| {
-                                    this.set_loading(false, cx);
-                                })
-                                .ok();
-
-                                // Set avatar input
-                                avatar_input
-                                    .update(cx, |this, cx| {
-                                        this.set_value(url.to_string(), window, cx);
-                                    })
-                                    .ok();
-                            })
-                            .ok();
-                        }
-                    }
-                }
-                Ok(None) => {
-                    cx.update(|_, cx| {
-                        // Stop loading spinner
-                        this.update(cx, |this, cx| {
-                            this.set_loading(false, cx);
-                        })
-                        .ok();
-                    })
-                    .ok();
-                }
-                Err(_) => {}
-            }
-        })
-        .detach();
-    }
-
-    pub fn set_metadata(&mut self, cx: &mut Context<Self>) -> Task<Result<Option<Profile>, Error>> {
-        let avatar = self.avatar_input.read(cx).value().to_string();
-        let name = self.name_input.read(cx).value().to_string();
-        let bio = self.bio_input.read(cx).value().to_string();
-        let website = self.website_input.read(cx).value().to_string();
-
-        let old_metadata = if let Some(metadata) = self.profile.as_ref() {
-            metadata.clone()
-        } else {
-            Metadata::default()
-        };
-
-        let mut new_metadata = old_metadata.display_name(name).about(bio);
-
-        if let Ok(url) = Url::from_str(&avatar) {
-            new_metadata = new_metadata.picture(url);
-        };
-
-        if let Ok(url) = Url::from_str(&website) {
-            new_metadata = new_metadata.website(url);
-        }
-
-        cx.background_spawn(async move {
-            let client = nostr_client();
-            let output = client.set_metadata(&new_metadata).await?;
-            let event = client
-                .database()
-                .event_by_id(&output.val)
-                .await?
-                .map(|event| {
-                    let metadata = Metadata::from_json(&event.content).unwrap_or_default();
-                    Profile::new(event.pubkey, metadata)
-                });
-
-            Ok(event)
-        })
-    }
-
-    fn set_loading(&mut self, status: bool, cx: &mut Context<Self>) {
-        self.is_loading = status;
-        cx.notify();
-    }
-}
-
-impl Render for EditProfile {
-    fn render(&mut self, _window: &mut gpui::Window, cx: &mut Context<Self>) -> impl IntoElement {
-        v_flex()
-            .gap_3()
-            .child(
-                div()
-                    .w_full()
-                    .h_32()
-                    .bg(cx.theme().surface_background)
-                    .rounded(cx.theme().radius)
-                    .flex()
-                    .flex_col()
-                    .items_center()
-                    .justify_center()
-                    .gap_2()
-                    .map(|this| {
-                        let picture = self.avatar_input.read(cx).value();
-                        if picture.is_empty() {
-                            this.child(
-                                img("brand/avatar.png")
-                                    .rounded_full()
-                                    .size_10()
-                                    .flex_shrink_0(),
-                            )
-                        } else {
-                            this.child(
-                                img(picture.clone())
-                                    .rounded_full()
-                                    .size_10()
-                                    .flex_shrink_0(),
-                            )
-                        }
-                    })
-                    .child(
-                        Button::new("upload")
-                            .icon(IconName::Upload)
-                            .label(t!("common.change"))
-                            .ghost()
-                            .small()
-                            .disabled(self.is_loading || self.is_submitting)
-                            .loading(self.is_loading)
-                            .on_click(cx.listener(move |this, _, window, cx| {
-                                this.upload(window, cx);
-                            })),
-                    ),
-            )
-            .child(
-                div()
-                    .flex()
-                    .flex_col()
-                    .gap_1()
-                    .text_sm()
-                    .child(shared_t!("profile.label_name"))
-                    .child(TextInput::new(&self.name_input).small()),
-            )
-            .child(
-                div()
-                    .flex()
-                    .flex_col()
-                    .gap_1()
-                    .text_sm()
-                    .child(shared_t!("profile.label_website"))
-                    .child(TextInput::new(&self.website_input).small()),
-            )
-            .child(
-                div()
-                    .flex()
-                    .flex_col()
-                    .gap_1()
-                    .text_sm()
-                    .child(shared_t!("profile.label_bio"))
-                    .child(TextInput::new(&self.bio_input).small()),
-            )
-    }
-}

crates/coop/src/views/login.rs

@@ -1,528 +0,0 @@
-use std::time::Duration;
-
-use client_keys::ClientKeys;
-use global::constants::{ACCOUNT_IDENTIFIER, BUNKER_TIMEOUT};
-use global::nostr_client;
-use gpui::prelude::FluentBuilder;
-use gpui::{
-    div, relative, AnyElement, App, AppContext, Context, Entity, EventEmitter, FocusHandle,
-    Focusable, IntoElement, ParentElement, Render, SharedString, Styled, Subscription, Task,
-    Window,
-};
-use i18n::{shared_t, t};
-use nostr_connect::prelude::*;
-use smallvec::{smallvec, SmallVec};
-use theme::ActiveTheme;
-use ui::button::{Button, ButtonVariants};
-use ui::dock_area::panel::{Panel, PanelEvent};
-use ui::input::{InputEvent, InputState, TextInput};
-use ui::popup_menu::PopupMenu;
-use ui::{v_flex, ContextModal, Disableable, Sizable, StyledExt};
-
-use crate::actions::CoopAuthUrlHandler;
-
-pub fn init(window: &mut Window, cx: &mut App) -> Entity<Login> {
-    Login::new(window, cx)
-}
-
-pub struct Login {
-    input: Entity<InputState>,
-    error: Entity<Option<SharedString>>,
-    countdown: Entity<Option<u64>>,
-    logging_in: bool,
-    // Panel
-    name: SharedString,
-    focus_handle: FocusHandle,
-    #[allow(unused)]
-    subscriptions: SmallVec<[Subscription; 1]>,
-}
-
-impl Login {
-    pub fn new(window: &mut Window, cx: &mut App) -> Entity<Self> {
-        cx.new(|cx| Self::view(window, cx))
-    }
-
-    fn view(window: &mut Window, cx: &mut Context<Self>) -> Self {
-        let input = cx.new(|cx| InputState::new(window, cx).placeholder("nsec... or bunker://..."));
-        let error = cx.new(|_| None);
-        let countdown = cx.new(|_| None);
-
-        let mut subscriptions = smallvec![];
-
-        // Subscribe to key input events and process login when the user presses enter
-        subscriptions.push(
-            cx.subscribe_in(&input, window, |this, _e, event, window, cx| {
-                if let InputEvent::PressEnter { .. } = event {
-                    this.login(window, cx);
-                }
-            }),
-        );
-
-        Self {
-            input,
-            error,
-            countdown,
-            subscriptions,
-            name: "Login".into(),
-            focus_handle: cx.focus_handle(),
-            logging_in: false,
-        }
-    }
-
-    fn login(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        if self.logging_in {
-            return;
-        };
-
-        // Prevent duplicate login requests
-        self.set_logging_in(true, cx);
-
-        // Disable the input
-        self.input.update(cx, |this, cx| {
-            this.set_loading(true, cx);
-            this.set_disabled(true, cx);
-        });
-
-        // Content can be secret key or bunker://
-        match self.input.read(cx).value().to_string() {
-            s if s.starts_with("nsec1") => self.ask_for_password(s, window, cx),
-            s if s.starts_with("ncryptsec1") => self.ask_for_password(s, window, cx),
-            s if s.starts_with("bunker://") => self.login_with_bunker(s, window, cx),
-            _ => self.set_error(t!("login.invalid_key"), window, cx),
-        };
-    }
-
-    fn ask_for_password(&mut self, content: String, window: &mut Window, cx: &mut Context<Self>) {
-        let current_view = cx.entity().downgrade();
-        let is_ncryptsec = content.starts_with("ncryptsec1");
-
-        let pwd_input = cx.new(|cx| InputState::new(window, cx).masked(true));
-        let weak_pwd_input = pwd_input.downgrade();
-
-        let confirm_input = cx.new(|cx| InputState::new(window, cx).masked(true));
-        let weak_confirm_input = confirm_input.downgrade();
-
-        window.open_modal(cx, move |this, _window, cx| {
-            let weak_pwd_input = weak_pwd_input.clone();
-            let weak_confirm_input = weak_confirm_input.clone();
-
-            let view_cancel = current_view.clone();
-            let view_ok = current_view.clone();
-
-            let label: SharedString = if !is_ncryptsec {
-                t!("login.set_password").into()
-            } else {
-                t!("login.password_to_decrypt").into()
-            };
-
-            let description: SharedString = if is_ncryptsec {
-                t!("login.password_description").into()
-            } else {
-                t!("login.password_description_full").into()
-            };
-
-            this.overlay_closable(false)
-                .show_close(false)
-                .keyboard(false)
-                .confirm()
-                .on_cancel(move |_, window, cx| {
-                    view_cancel
-                        .update(cx, |this, cx| {
-                            this.set_error(t!("login.password_is_required"), window, cx);
-                        })
-                        .ok();
-                    true
-                })
-                .on_ok(move |_, window, cx| {
-                    let value = weak_pwd_input
-                        .read_with(cx, |state, _cx| state.value().to_owned())
-                        .ok();
-
-                    let confirm = weak_confirm_input
-                        .read_with(cx, |state, _cx| state.value().to_owned())
-                        .ok();
-
-                    view_ok
-                        .update(cx, |this, cx| {
-                            this.verify_password(value, confirm, is_ncryptsec, window, cx);
-                        })
-                        .ok();
-                    true
-                })
-                .child(
-                    div()
-                        .w_full()
-                        .flex()
-                        .flex_col()
-                        .gap_2()
-                        .text_sm()
-                        .child(
-                            div()
-                                .flex()
-                                .flex_col()
-                                .gap_1()
-                                .child(label)
-                                .child(TextInput::new(&pwd_input).small()),
-                        )
-                        .when(content.starts_with("nsec1"), |this| {
-                            this.child(
-                                div()
-                                    .flex()
-                                    .flex_col()
-                                    .gap_1()
-                                    .child(SharedString::new(t!("login.confirm_password")))
-                                    .child(TextInput::new(&confirm_input).small()),
-                            )
-                        })
-                        .child(
-                            div()
-                                .text_xs()
-                                .italic()
-                                .text_color(cx.theme().text_placeholder)
-                                .child(description),
-                        ),
-                )
-        });
-    }
-
-    fn verify_password(
-        &mut self,
-        password: Option<SharedString>,
-        confirm: Option<SharedString>,
-        is_ncryptsec: bool,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let Some(password) = password else {
-            self.set_error(t!("login.password_is_required"), window, cx);
-            return;
-        };
-
-        if password.is_empty() {
-            self.set_error(t!("login.password_is_required"), window, cx);
-            return;
-        }
-
-        // Skip verification if key is ncryptsec
-        if is_ncryptsec {
-            self.login_with_keys(password.to_string(), window, cx);
-            return;
-        }
-
-        let Some(confirm) = confirm else {
-            self.set_error(t!("login.must_confirm_password"), window, cx);
-            return;
-        };
-
-        if confirm.is_empty() {
-            self.set_error(t!("login.must_confirm_password"), window, cx);
-            return;
-        }
-
-        if password != confirm {
-            self.set_error(t!("login.password_not_match"), window, cx);
-            return;
-        }
-
-        self.login_with_keys(password.to_string(), window, cx);
-    }
-
-    fn login_with_keys(&mut self, password: String, window: &mut Window, cx: &mut Context<Self>) {
-        let value = self.input.read(cx).value().to_string();
-
-        let secret_key = if value.starts_with("nsec1") {
-            SecretKey::parse(&value).ok()
-        } else if value.starts_with("ncryptsec1") {
-            EncryptedSecretKey::from_bech32(&value)
-                .map(|enc| enc.decrypt(&password).ok())
-                .unwrap_or_default()
-        } else {
-            None
-        };
-
-        if let Some(secret_key) = secret_key {
-            let keys = Keys::new(secret_key);
-
-            // Encrypt and save user secret key to disk
-            self.write_keys_to_disk(&keys, password, cx);
-
-            // Set the client's signer with the current keys
-            cx.background_spawn(async move {
-                let client = nostr_client();
-                client.set_signer(keys).await;
-            })
-            .detach();
-        } else {
-            self.set_error(t!("login.key_invalid"), window, cx);
-        }
-    }
-
-    fn login_with_bunker(&mut self, content: String, window: &mut Window, cx: &mut Context<Self>) {
-        let Ok(uri) = NostrConnectURI::parse(content) else {
-            self.set_error(t!("login.bunker_invalid"), window, cx);
-            return;
-        };
-
-        let client_keys = ClientKeys::global(cx);
-        let app_keys = client_keys.read(cx).keys();
-
-        let timeout = Duration::from_secs(BUNKER_TIMEOUT);
-        let mut signer = NostrConnect::new(uri, app_keys, timeout, None).unwrap();
-
-        // Handle auth url with the default browser
-        signer.auth_url_handler(CoopAuthUrlHandler);
-
-        // Start countdown
-        cx.spawn_in(window, async move |this, cx| {
-            for i in (0..=BUNKER_TIMEOUT).rev() {
-                if i == 0 {
-                    this.update(cx, |this, cx| {
-                        this.set_countdown(None, cx);
-                    })
-                    .ok();
-                } else {
-                    this.update(cx, |this, cx| {
-                        this.set_countdown(Some(i), cx);
-                    })
-                    .ok();
-                }
-                cx.background_executor().timer(Duration::from_secs(1)).await;
-            }
-        })
-        .detach();
-
-        // Handle connection
-        cx.spawn_in(window, async move |this, cx| {
-            match signer.bunker_uri().await {
-                Ok(uri) => {
-                    this.update(cx, |this, cx| {
-                        this.write_uri_to_disk(signer, uri, cx);
-                    })
-                    .ok();
-                }
-                Err(error) => {
-                    this.update_in(cx, |this, window, cx| {
-                        this.set_error(error.to_string(), window, cx);
-                        // Force reset the client keys
-                        //
-                        // This step is necessary to ensure that user can retry the connection
-                        client_keys.update(cx, |this, cx| {
-                            this.force_new_keys(cx);
-                        });
-                    })
-                    .ok();
-                }
-            }
-        })
-        .detach();
-    }
-
-    fn write_uri_to_disk(
-        &mut self,
-        signer: NostrConnect,
-        uri: NostrConnectURI,
-        cx: &mut Context<Self>,
-    ) {
-        let mut uri_without_secret = uri.to_string();
-
-        // Clear the secret parameter in the URI if it exists
-        if let Some(secret) = uri.secret() {
-            uri_without_secret = uri_without_secret.replace(secret, "");
-        }
-
-        let task: Task<Result<(), anyhow::Error>> = cx.background_spawn(async move {
-            let client = nostr_client();
-
-            // Update the client's signer
-            client.set_signer(signer).await;
-
-            let signer = client.signer().await?;
-            let public_key = signer.get_public_key().await?;
-
-            let event = EventBuilder::new(Kind::ApplicationSpecificData, uri_without_secret)
-                .tags(vec![Tag::identifier(ACCOUNT_IDENTIFIER)])
-                .build(public_key)
-                .sign(&Keys::generate())
-                .await?;
-
-            // Save the event to the database
-            client.database().save_event(&event).await?;
-
-            Ok(())
-        });
-
-        task.detach();
-    }
-
-    pub fn write_keys_to_disk(&self, keys: &Keys, password: String, cx: &mut Context<Self>) {
-        let keys = keys.to_owned();
-        let public_key = keys.public_key();
-
-        cx.background_spawn(async move {
-            if let Ok(enc_key) =
-                EncryptedSecretKey::new(keys.secret_key(), &password, 8, KeySecurity::Unknown)
-            {
-                let client = nostr_client();
-                let value = enc_key.to_bech32().unwrap();
-                let keys = Keys::generate();
-                let tags = vec![Tag::identifier(ACCOUNT_IDENTIFIER)];
-                let kind = Kind::ApplicationSpecificData;
-
-                let builder = EventBuilder::new(kind, value)
-                    .tags(tags)
-                    .build(public_key)
-                    .sign(&keys)
-                    .await;
-
-                if let Ok(event) = builder {
-                    if let Err(e) = client.database().save_event(&event).await {
-                        log::error!("Failed to save event: {e}");
-                    };
-                }
-            }
-        })
-        .detach();
-    }
-
-    fn set_error(
-        &mut self,
-        message: impl Into<SharedString>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        // Reset the log in state
-        self.set_logging_in(false, cx);
-
-        // Reset the countdown
-        self.set_countdown(None, cx);
-
-        // Update error message
-        self.error.update(cx, |this, cx| {
-            *this = Some(message.into());
-            cx.notify();
-        });
-
-        // Re enable the input
-        self.input.update(cx, |this, cx| {
-            this.set_value("", window, cx);
-            this.set_loading(false, cx);
-            this.set_disabled(false, cx);
-        });
-
-        // Clear the error message after 3 secs
-        cx.spawn(async move |this, cx| {
-            cx.background_executor().timer(Duration::from_secs(3)).await;
-
-            this.update(cx, |this, cx| {
-                this.error.update(cx, |this, cx| {
-                    *this = None;
-                    cx.notify();
-                });
-            })
-            .ok();
-        })
-        .detach();
-    }
-
-    fn set_logging_in(&mut self, status: bool, cx: &mut Context<Self>) {
-        self.logging_in = status;
-        cx.notify();
-    }
-
-    fn set_countdown(&mut self, i: Option<u64>, cx: &mut Context<Self>) {
-        self.countdown.update(cx, |this, cx| {
-            *this = i;
-            cx.notify();
-        });
-    }
-}
-
-impl Panel for Login {
-    fn panel_id(&self) -> SharedString {
-        self.name.clone()
-    }
-
-    fn title(&self, _cx: &App) -> AnyElement {
-        self.name.clone().into_any_element()
-    }
-
-    fn popup_menu(&self, menu: PopupMenu, _cx: &App) -> PopupMenu {
-        menu.track_focus(&self.focus_handle)
-    }
-
-    fn toolbar_buttons(&self, _window: &Window, _cx: &App) -> Vec<Button> {
-        vec![]
-    }
-}
-
-impl EventEmitter<PanelEvent> for Login {}
-
-impl Focusable for Login {
-    fn focus_handle(&self, _: &App) -> gpui::FocusHandle {
-        self.focus_handle.clone()
-    }
-}
-
-impl Render for Login {
-    fn render(&mut self, _window: &mut gpui::Window, cx: &mut Context<Self>) -> impl IntoElement {
-        v_flex()
-            .relative()
-            .size_full()
-            .items_center()
-            .justify_center()
-            .child(
-                v_flex()
-                    .w_96()
-                    .gap_10()
-                    .child(
-                        div()
-                            .text_center()
-                            .child(
-                                div()
-                                    .text_xl()
-                                    .font_semibold()
-                                    .line_height(relative(1.3))
-                                    .child(shared_t!("login.title")),
-                            )
-                            .child(
-                                div()
-                                    .text_color(cx.theme().text_muted)
-                                    .child(shared_t!("login.key_description")),
-                            ),
-                    )
-                    .child(
-                        v_flex()
-                            .gap_3()
-                            .child(TextInput::new(&self.input))
-                            .child(
-                                Button::new("login")
-                                    .label(t!("common.continue"))
-                                    .primary()
-                                    .loading(self.logging_in)
-                                    .disabled(self.logging_in)
-                                    .on_click(cx.listener(move |this, _, window, cx| {
-                                        this.login(window, cx);
-                                    })),
-                            )
-                            .when_some(self.countdown.read(cx).as_ref(), |this, i| {
-                                this.child(
-                                    div()
-                                        .text_xs()
-                                        .text_center()
-                                        .text_color(cx.theme().text_muted)
-                                        .child(shared_t!("login.approve_message", i = i)),
-                                )
-                            })
-                            .when_some(self.error.read(cx).clone(), |this, error| {
-                                this.child(
-                                    div()
-                                        .text_xs()
-                                        .text_center()
-                                        .text_color(cx.theme().danger_foreground)
-                                        .child(error),
-                                )
-                            }),
-                    ),
-            )
-    }
-}

crates/coop/src/views/mod.rs

@@ -1,14 +1,7 @@
-pub mod account;
-pub mod backup_keys;
-pub mod chat;
 pub mod compose;
-pub mod edit_profile;
-pub mod login;
-pub mod new_account;
 pub mod onboarding;
 pub mod preferences;
 pub mod screening;
 pub mod setup_relay;
-pub mod sidebar;
-pub mod user_profile;
+pub mod startup;
 pub mod welcome;

crates/coop/src/views/new_account.rs

@@ -1,377 +0,0 @@
-use anyhow::anyhow;
-use common::nip96::nip96_upload;
-use global::constants::{ACCOUNT_IDENTIFIER, NIP17_RELAYS, NIP65_RELAYS};
-use global::nostr_client;
-use gpui::{
-    div, relative, rems, AnyElement, App, AppContext, AsyncWindowContext, Context, Entity,
-    EventEmitter, Flatten, FocusHandle, Focusable, IntoElement, ParentElement, PathPromptOptions,
-    Render, SharedString, Styled, WeakEntity, Window,
-};
-use gpui_tokio::Tokio;
-use i18n::{shared_t, t};
-use nostr_sdk::prelude::*;
-use settings::AppSettings;
-use smol::fs;
-use theme::ActiveTheme;
-use ui::avatar::Avatar;
-use ui::button::{Button, ButtonVariants};
-use ui::dock_area::panel::{Panel, PanelEvent};
-use ui::input::{InputState, TextInput};
-use ui::modal::ModalButtonProps;
-use ui::popup_menu::PopupMenu;
-use ui::{divider, v_flex, ContextModal, Disableable, IconName, Sizable, StyledExt};
-
-use crate::views::backup_keys::BackupKeys;
-
-pub fn init(window: &mut Window, cx: &mut App) -> Entity<NewAccount> {
-    NewAccount::new(window, cx)
-}
-
-pub struct NewAccount {
-    name_input: Entity<InputState>,
-    avatar_input: Entity<InputState>,
-    temp_keys: Entity<Keys>,
-    uploading: bool,
-    submitting: bool,
-    // Panel
-    name: SharedString,
-    focus_handle: FocusHandle,
-}
-
-impl NewAccount {
-    pub fn new(window: &mut Window, cx: &mut App) -> Entity<Self> {
-        cx.new(|cx| Self::view(window, cx))
-    }
-
-    fn view(window: &mut Window, cx: &mut Context<Self>) -> Self {
-        let temp_keys = cx.new(|_| Keys::generate());
-        let name_input = cx.new(|cx| InputState::new(window, cx).placeholder("Alice"));
-        let avatar_input = cx.new(|cx| InputState::new(window, cx));
-
-        Self {
-            name_input,
-            avatar_input,
-            temp_keys,
-            uploading: false,
-            submitting: false,
-            name: "New Account".into(),
-            focus_handle: cx.focus_handle(),
-        }
-    }
-
-    fn create(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        self.submitting(true, cx);
-
-        let keys = self.temp_keys.read(cx).clone();
-        let view = cx.new(|cx| BackupKeys::new(&keys, window, cx));
-        let weak_view = view.downgrade();
-        let current_view = cx.entity().downgrade();
-
-        window.open_modal(cx, move |modal, _window, _cx| {
-            let weak_view = weak_view.clone();
-            let current_view = current_view.clone();
-
-            modal
-                .alert()
-                .title(shared_t!("new_account.backup_label"))
-                .child(view.clone())
-                .button_props(
-                    ModalButtonProps::default().ok_text(t!("new_account.backup_download")),
-                )
-                .on_ok(move |_, window, cx| {
-                    weak_view
-                        .update(cx, |this, cx| {
-                            let password = this.password(cx);
-                            let current_view = current_view.clone();
-
-                            if let Some(task) = this.backup(window, cx) {
-                                cx.spawn_in(window, async move |_, cx| {
-                                    task.await;
-
-                                    cx.update(|window, cx| {
-                                        current_view
-                                            .update(cx, |this, cx| {
-                                                this.set_signer(password, window, cx);
-                                            })
-                                            .ok();
-                                    })
-                                    .ok()
-                                })
-                                .detach();
-                            }
-                        })
-                        .ok();
-                    // true to close the modal
-                    false
-                })
-        })
-    }
-
-    fn set_signer(&mut self, password: String, window: &mut Window, cx: &mut Context<Self>) {
-        window.close_modal(cx);
-
-        let keys = self.temp_keys.read(cx).clone();
-        let avatar = self.avatar_input.read(cx).value().to_string();
-        let name = self.name_input.read(cx).value().to_string();
-        let mut metadata = Metadata::new().display_name(name.clone()).name(name);
-
-        if let Ok(url) = Url::parse(&avatar) {
-            metadata = metadata.picture(url);
-        };
-
-        // Encrypt and save user secret key to disk
-        self.write_keys_to_disk(&keys, password, cx);
-
-        // Set the client's signer with the current keys
-        cx.background_spawn(async move {
-            let client = nostr_client();
-
-            // Set the client's signer with the current keys
-            client.set_signer(keys).await;
-
-            // Set metadata
-            if let Err(e) = client.set_metadata(&metadata).await {
-                log::error!("Failed to set metadata: {e}");
-            }
-
-            // Set NIP-65 relays
-            let builder = EventBuilder::new(Kind::RelayList, "").tags(
-                NIP65_RELAYS.into_iter().filter_map(|url| {
-                    if let Ok(url) = RelayUrl::parse(url) {
-                        Some(Tag::relay_metadata(url, None))
-                    } else {
-                        None
-                    }
-                }),
-            );
-
-            if let Err(e) = client.send_event_builder(builder).await {
-                log::error!("Failed to send NIP-65 relay list event: {e}");
-            }
-
-            // Set NIP-17 relays
-            let builder = EventBuilder::new(Kind::InboxRelays, "").tags(
-                NIP17_RELAYS.into_iter().filter_map(|url| {
-                    if let Ok(url) = RelayUrl::parse(url) {
-                        Some(Tag::relay(url))
-                    } else {
-                        None
-                    }
-                }),
-            );
-
-            if let Err(e) = client.send_event_builder(builder).await {
-                log::error!("Failed to send messaging relay list event: {e}");
-            };
-        })
-        .detach();
-    }
-
-    fn write_keys_to_disk(&self, keys: &Keys, password: String, cx: &mut Context<Self>) {
-        let keys = keys.to_owned();
-        let public_key = keys.public_key();
-
-        cx.background_spawn(async move {
-            if let Ok(enc_key) =
-                EncryptedSecretKey::new(keys.secret_key(), &password, 8, KeySecurity::Unknown)
-            {
-                let client = nostr_client();
-                let value = enc_key.to_bech32().unwrap();
-                let keys = Keys::generate();
-                let tags = vec![Tag::identifier(ACCOUNT_IDENTIFIER)];
-                let kind = Kind::ApplicationSpecificData;
-
-                let builder = EventBuilder::new(kind, value)
-                    .tags(tags)
-                    .build(public_key)
-                    .sign(&keys)
-                    .await;
-
-                if let Ok(event) = builder {
-                    if let Err(e) = client.database().save_event(&event).await {
-                        log::error!("Failed to save event: {e}");
-                    };
-                }
-            }
-        })
-        .detach();
-    }
-
-    fn upload(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        self.uploading(true, cx);
-
-        // Get the user's configured NIP96 server
-        let nip96_server = AppSettings::get_media_server(cx);
-
-        // Open native file dialog
-        let paths = cx.prompt_for_paths(PathPromptOptions {
-            files: true,
-            directories: false,
-            multiple: false,
-            prompt: None,
-        });
-
-        let task = Tokio::spawn(cx, async move {
-            match Flatten::flatten(paths.await.map_err(|e| e.into())) {
-                Ok(Some(mut paths)) => {
-                    if let Some(path) = paths.pop() {
-                        let file = fs::read(path).await?;
-                        let url = nip96_upload(nostr_client(), &nip96_server, file).await?;
-
-                        Ok(url)
-                    } else {
-                        Err(anyhow!("Path not found"))
-                    }
-                }
-                Ok(None) => Err(anyhow!("User cancelled")),
-                Err(e) => Err(anyhow!("File dialog error: {e}")),
-            }
-        });
-
-        cx.spawn_in(window, async move |this, cx| {
-            match Flatten::flatten(task.await.map_err(|e| e.into())) {
-                Ok(Ok(url)) => {
-                    this.update_in(cx, |this, window, cx| {
-                        this.uploading(false, cx);
-                        this.avatar_input.update(cx, |this, cx| {
-                            this.set_value(url.to_string(), window, cx);
-                        });
-                    })
-                    .ok();
-                }
-                Ok(Err(e)) => {
-                    Self::notify_error(cx, this, e.to_string());
-                }
-                Err(e) => {
-                    Self::notify_error(cx, this, e.to_string());
-                }
-            }
-        })
-        .detach();
-    }
-
-    fn notify_error(cx: &mut AsyncWindowContext, entity: WeakEntity<NewAccount>, e: String) {
-        cx.update(|window, cx| {
-            entity
-                .update(cx, |this, cx| {
-                    window.push_notification(e, cx);
-                    this.uploading(false, cx);
-                })
-                .ok();
-        })
-        .ok();
-    }
-
-    fn submitting(&mut self, status: bool, cx: &mut Context<Self>) {
-        self.submitting = status;
-        cx.notify();
-    }
-
-    fn uploading(&mut self, status: bool, cx: &mut Context<Self>) {
-        self.uploading = status;
-        cx.notify();
-    }
-}
-
-impl Panel for NewAccount {
-    fn panel_id(&self) -> SharedString {
-        self.name.clone()
-    }
-
-    fn title(&self, _cx: &App) -> AnyElement {
-        self.name.clone().into_any_element()
-    }
-
-    fn popup_menu(&self, menu: PopupMenu, _cx: &App) -> PopupMenu {
-        menu.track_focus(&self.focus_handle)
-    }
-
-    fn toolbar_buttons(&self, _window: &Window, _cx: &App) -> Vec<Button> {
-        vec![]
-    }
-}
-
-impl EventEmitter<PanelEvent> for NewAccount {}
-
-impl Focusable for NewAccount {
-    fn focus_handle(&self, _: &App) -> gpui::FocusHandle {
-        self.focus_handle.clone()
-    }
-}
-
-impl Render for NewAccount {
-    fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        v_flex()
-            .size_full()
-            .relative()
-            .items_center()
-            .justify_center()
-            .gap_10()
-            .child(
-                div()
-                    .text_lg()
-                    .text_center()
-                    .font_semibold()
-                    .line_height(relative(1.3))
-                    .child(shared_t!("new_account.title")),
-            )
-            .child(
-                v_flex()
-                    .w_96()
-                    .gap_4()
-                    .child(
-                        v_flex()
-                            .gap_1()
-                            .text_sm()
-                            .child(shared_t!("new_account.name"))
-                            .child(TextInput::new(&self.name_input).small()),
-                    )
-                    .child(
-                        v_flex()
-                            .gap_1()
-                            .child(div().text_sm().child(shared_t!("new_account.avatar")))
-                            .child(
-                                v_flex()
-                                    .p_1()
-                                    .h_32()
-                                    .w_full()
-                                    .items_center()
-                                    .justify_center()
-                                    .gap_2()
-                                    .rounded(cx.theme().radius)
-                                    .border_1()
-                                    .border_dashed()
-                                    .border_color(cx.theme().border)
-                                    .child(
-                                        Avatar::new(self.avatar_input.read(cx).value().to_string())
-                                            .size(rems(2.25)),
-                                    )
-                                    .child(
-                                        Button::new("upload")
-                                            .icon(IconName::Plus)
-                                            .label(t!("common.upload"))
-                                            .ghost()
-                                            .small()
-                                            .rounded()
-                                            .disabled(self.submitting || self.uploading)
-                                            .loading(self.uploading)
-                                            .on_click(cx.listener(move |this, _, window, cx| {
-                                                this.upload(window, cx);
-                                            })),
-                                    ),
-                            ),
-                    )
-                    .child(divider(cx))
-                    .child(
-                        Button::new("submit")
-                            .label(t!("common.continue"))
-                            .primary()
-                            .loading(self.submitting)
-                            .disabled(self.submitting || self.uploading)
-                            .on_click(cx.listener(move |this, _, window, cx| {
-                                this.create(window, cx);
-                            })),
-                    ),
-            )
-    }
-}

crates/coop/src/views/onboarding.rs

@@ -1,27 +1,24 @@
 use std::sync::Arc;
 use std::time::Duration;
 
-use client_keys::ClientKeys;
-use common::display::TextUtils;
-use global::constants::{ACCOUNT_IDENTIFIER, APP_NAME, NOSTR_CONNECT_RELAY, NOSTR_CONNECT_TIMEOUT};
-use global::nostr_client;
+use common::{TextUtils, CLIENT_NAME, NOSTR_CONNECT_RELAY, NOSTR_CONNECT_TIMEOUT};
 use gpui::prelude::FluentBuilder;
 use gpui::{
-    div, img, px, relative, svg, AnyElement, App, AppContext, ClipboardItem, Context, Entity,
-    EventEmitter, FocusHandle, Focusable, Image, InteractiveElement, IntoElement, ParentElement,
-    Render, SharedString, StatefulInteractiveElement, Styled, Subscription, Task, Window,
+    div, img, px, relative, svg, AnyElement, App, AppContext, Context, Entity, EventEmitter,
+    FocusHandle, Focusable, Image, InteractiveElement, IntoElement, ParentElement, Render,
+    SharedString, StatefulInteractiveElement, Styled, Task, Window,
 };
-use i18n::{shared_t, t};
+use key_store::{KeyItem, KeyStore};
 use nostr_connect::prelude::*;
 use smallvec::{smallvec, SmallVec};
+use state::NostrRegistry;
 use theme::ActiveTheme;
 use ui::button::{Button, ButtonVariants};
 use ui::dock_area::panel::{Panel, PanelEvent};
 use ui::notification::Notification;
-use ui::popup_menu::PopupMenu;
 use ui::{divider, h_flex, v_flex, ContextModal, Icon, IconName, Sizable, StyledExt};
 
-use crate::chatspace::{self, ChatSpace};
+use crate::chatspace::{self};
 
 pub fn init(window: &mut Window, cx: &mut App) -> Entity<Onboarding> {
     Onboarding::new(window, cx)
@@ -59,14 +56,14 @@ impl NostrConnectApp {
 }
 
 pub struct Onboarding {
-    nostr_connect_uri: Entity<NostrConnectURI>,
-    nostr_connect: Entity<Option<NostrConnect>>,
-    qr_code: Entity<Option<Arc<Image>>>,
-    connecting: bool,
-    // Panel
+    app_keys: Keys,
+    qr_code: Option<Arc<Image>>,
+
+    /// Panel
     name: SharedString,
     focus_handle: FocusHandle,
-    _subscriptions: SmallVec<[Subscription; 2]>,
+
+    /// Background tasks
     _tasks: SmallVec<[Task<()>; 1]>,
 }
 
@@ -76,149 +73,103 @@ impl Onboarding {
     }
 
     fn view(window: &mut Window, cx: &mut Context<Self>) -> Self {
-        let nostr_connect = cx.new(|_| None);
-        let qr_code = cx.new(|_| None);
+        let app_keys = Keys::generate();
+        let timeout = Duration::from_secs(NOSTR_CONNECT_TIMEOUT);
+
+        let relay = RelayUrl::parse(NOSTR_CONNECT_RELAY).unwrap();
+        let uri = NostrConnectUri::client(app_keys.public_key(), vec![relay], CLIENT_NAME);
+        let qr_code = uri.to_string().to_qr();
 
         // NIP46: https://github.com/nostr-protocol/nips/blob/master/46.md
         //
         // Direct connection initiated by the client
-        let nostr_connect_uri = cx.new(|cx| {
-            let relay = RelayUrl::parse(NOSTR_CONNECT_RELAY).unwrap();
-            let app_keys = ClientKeys::read_global(cx).keys();
-            NostrConnectURI::client(app_keys.public_key(), vec![relay], APP_NAME)
-        });
+        let signer = NostrConnect::new(uri, app_keys.clone(), timeout, None).unwrap();
 
-        let mut subscriptions = smallvec![];
+        let mut tasks = smallvec![];
 
-        // Clean up when the current view is released
-        subscriptions.push(cx.on_release_in(window, |this, window, cx| {
-            this.shutdown_nostr_connect(window, cx);
-        }));
-
-        // Set Nostr Connect after the view is initialized
-        cx.defer_in(window, |this, window, cx| {
-            this.set_connect(window, cx);
-        });
-
-        Self {
-            nostr_connect,
-            nostr_connect_uri,
-            qr_code,
-            connecting: false,
-            name: "Onboarding".into(),
-            focus_handle: cx.focus_handle(),
-            _subscriptions: subscriptions,
-            _tasks: smallvec![],
-        }
-    }
-
-    fn set_connecting(&mut self, cx: &mut Context<Self>) {
-        self.connecting = true;
-        cx.notify();
-    }
-
-    fn set_connect(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        let uri = self.nostr_connect_uri.read(cx).clone();
-        let app_keys = ClientKeys::read_global(cx).keys();
-        let timeout = Duration::from_secs(NOSTR_CONNECT_TIMEOUT);
-
-        self.qr_code.update(cx, |this, cx| {
-            *this = uri.to_string().to_qr();
-            cx.notify();
-        });
-
-        self.nostr_connect.update(cx, |this, cx| {
-            *this = NostrConnect::new(uri, app_keys, timeout, None).ok();
-            cx.notify();
-        });
-
-        self._tasks.push(
-            // Wait for Nostr Connect approval
+        tasks.push(
+            // Wait for nostr connect
             cx.spawn_in(window, async move |this, cx| {
-                let connect = this.read_with(cx, |this, cx| this.nostr_connect.read(cx).clone());
+                let result = signer.bunker_uri().await;
 
-                if let Ok(Some(signer)) = connect {
-                    match signer.bunker_uri().await {
+                this.update_in(cx, |this, window, cx| {
+                    match result {
                         Ok(uri) => {
-                            this.update(cx, |this, cx| {
-                                this.set_connecting(cx);
-                                this.write_uri_to_disk(signer, uri, cx);
-                            })
-                            .ok();
+                            this.save_connection(&uri, window, cx);
+                            this.connect(signer, cx);
                         }
                         Err(e) => {
-                            this.update_in(cx, |_, window, cx| {
-                                window.push_notification(
-                                    Notification::error(e.to_string()).title("Nostr Connect"),
-                                    cx,
-                                );
-                            })
-                            .ok();
+                            window.push_notification(Notification::error(e.to_string()), cx);
                         }
                     };
-                }
+                })
+                .ok();
             }),
-        )
+        );
+
+        Self {
+            qr_code,
+            app_keys,
+            name: "Onboarding".into(),
+            focus_handle: cx.focus_handle(),
+            _tasks: tasks,
+        }
     }
 
-    fn set_proxy(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        ChatSpace::proxy_signer(window, cx);
-    }
-
-    fn write_uri_to_disk(
+    fn save_connection(
         &mut self,
-        signer: NostrConnect,
-        uri: NostrConnectURI,
+        uri: &NostrConnectUri,
+        window: &mut Window,
         cx: &mut Context<Self>,
     ) {
-        let mut uri_without_secret = uri.to_string();
+        let keystore = KeyStore::global(cx).read(cx).backend();
+        let username = self.app_keys.public_key().to_hex();
+        let secret = self.app_keys.secret_key().to_secret_bytes();
+        let mut clean_uri = uri.to_string();
 
         // Clear the secret parameter in the URI if it exists
-        if let Some(secret) = uri.secret() {
-            uri_without_secret = uri_without_secret.replace(secret, "");
+        if let Some(s) = uri.secret() {
+            clean_uri = clean_uri.replace(s, "");
         }
 
-        let task: Task<Result<(), anyhow::Error>> = cx.background_spawn(async move {
-            let client = nostr_client();
+        cx.spawn_in(window, async move |this, cx| {
+            let user_url = KeyItem::User.to_string();
+            let bunker_url = KeyItem::Bunker.to_string();
+            let user_password = clean_uri.into_bytes();
 
-            // Update the client's signer
-            client.set_signer(signer).await;
-
-            let signer = client.signer().await?;
-            let public_key = signer.get_public_key().await?;
-
-            let event = EventBuilder::new(Kind::ApplicationSpecificData, uri_without_secret)
-                .tags(vec![Tag::identifier(ACCOUNT_IDENTIFIER)])
-                .build(public_key)
-                .sign(&Keys::generate())
-                .await?;
-
-            // Save the event to the database
-            client.database().save_event(&event).await?;
-
-            Ok(())
-        });
-
-        task.detach();
-    }
-
-    fn copy_uri(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        cx.write_to_clipboard(ClipboardItem::new_string(
-            self.nostr_connect_uri.read(cx).to_string(),
-        ));
-        window.push_notification(t!("common.copied"), cx);
-    }
-
-    fn shutdown_nostr_connect(&mut self, _window: &mut Window, cx: &mut App) {
-        if !self.connecting {
-            if let Some(signer) = self.nostr_connect.read(cx).clone() {
-                cx.background_spawn(async move {
-                    log::info!("Shutting down Nostr Connect");
-                    signer.shutdown().await;
+            // Write bunker uri to keyring for further connection
+            if let Err(e) = keystore
+                .write_credentials(&user_url, "bunker", &user_password, cx)
+                .await
+            {
+                this.update_in(cx, |_, window, cx| {
+                    window.push_notification(e.to_string(), cx);
                 })
-                .detach();
+                .ok();
             }
-        }
+
+            // Write the app keys for further connection
+            if let Err(e) = keystore
+                .write_credentials(&bunker_url, &username, &secret, cx)
+                .await
+            {
+                this.update_in(cx, |_, window, cx| {
+                    window.push_notification(e.to_string(), cx);
+                })
+                .ok();
+            }
+        })
+        .detach();
+    }
+
+    fn connect(&mut self, signer: NostrConnect, cx: &mut Context<Self>) {
+        let nostr = NostrRegistry::global(cx);
+        let client = nostr.read(cx).client();
+
+        cx.background_spawn(async move {
+            client.set_signer(signer).await;
+        })
+        .detach();
     }
 
     fn render_apps(&self, cx: &Context<Self>) -> impl IntoIterator<Item = impl IntoElement> {
@@ -239,7 +190,7 @@ impl Onboarding {
         div()
             .id(ix)
             .flex_1()
-            .rounded_md()
+            .rounded(cx.theme().radius)
             .py_0p5()
             .px_2()
             .bg(cx.theme().ghost_element_background_alt)
@@ -261,10 +212,6 @@ impl Panel for Onboarding {
     fn title(&self, _cx: &App) -> AnyElement {
         self.name.clone().into_any_element()
     }
-
-    fn popup_menu(&self, menu: PopupMenu, _cx: &App) -> PopupMenu {
-        menu.track_focus(&self.focus_handle)
-    }
 }
 
 impl EventEmitter<PanelEvent> for Onboarding {}
@@ -276,7 +223,7 @@ impl Focusable for Onboarding {
 }
 
 impl Render for Onboarding {
-    fn render(&mut self, _window: &mut gpui::Window, cx: &mut Context<Self>) -> impl IntoElement {
+    fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
         h_flex()
             .size_full()
             .child(
@@ -305,13 +252,11 @@ impl Render for Onboarding {
                                             .text_xl()
                                             .font_semibold()
                                             .line_height(relative(1.3))
-                                            .child(shared_t!("welcome.title")),
+                                            .child(SharedString::from("Welcome to Coop")),
                                     )
-                                    .child(
-                                        div()
-                                            .text_color(cx.theme().text_muted)
-                                            .child(shared_t!("welcome.subtitle")),
-                                    ),
+                                    .child(div().text_color(cx.theme().text_muted).child(
+                                        SharedString::from("Chat Freely, Stay Private on Nostr."),
+                                    )),
                             ),
                     )
                     .child(
@@ -321,7 +266,7 @@ impl Render for Onboarding {
                             .child(
                                 Button::new("continue_btn")
                                     .icon(Icon::new(IconName::ArrowRight))
-                                    .label(shared_t!("onboarding.start_messaging"))
+                                    .label(SharedString::from("Start Messaging on Nostr"))
                                     .primary()
                                     .large()
                                     .bold()
@@ -335,41 +280,21 @@ impl Render for Onboarding {
                                     .my_1()
                                     .gap_1()
                                     .child(divider(cx))
-                                    .child(
-                                        div()
-                                            .text_sm()
-                                            .text_color(cx.theme().text_muted)
-                                            .child(shared_t!("onboarding.divider")),
-                                    )
+                                    .child(div().text_sm().text_color(cx.theme().text_muted).child(
+                                        SharedString::from(
+                                            "Already have an account? Continue with",
+                                        ),
+                                    ))
                                     .child(divider(cx)),
                             )
                             .child(
                                 Button::new("key")
-                                    .label(t!("onboarding.key_login"))
+                                    .label("Secret Key or Bunker")
+                                    .large()
                                     .ghost_alt()
                                     .on_click(cx.listener(move |_, _, window, cx| {
                                         chatspace::login(window, cx);
                                     })),
-                            )
-                            .child(
-                                v_flex()
-                                    .gap_1()
-                                    .child(
-                                        Button::new("ext")
-                                            .label(t!("onboarding.ext_login"))
-                                            .ghost_alt()
-                                            .on_click(cx.listener(move |this, _, window, cx| {
-                                                this.set_proxy(window, cx);
-                                            })),
-                                    )
-                                    .child(
-                                        div()
-                                            .italic()
-                                            .text_xs()
-                                            .text_center()
-                                            .text_color(cx.theme().text_muted)
-                                            .child(shared_t!("onboarding.ext_login_note")),
-                                    ),
                             ),
                     ),
             )
@@ -379,35 +304,26 @@ impl Render for Onboarding {
                     .p_2()
                     .flex_1()
                     .h_full()
-                    .rounded_2xl()
+                    .rounded(cx.theme().radius_lg)
                     .child(
                         v_flex()
                             .size_full()
                             .justify_center()
                             .bg(cx.theme().surface_background)
-                            .rounded_2xl()
+                            .rounded(cx.theme().radius_lg)
                             .child(
                                 v_flex()
                                     .gap_5()
                                     .items_center()
                                     .justify_center()
-                                    .when_some(self.qr_code.read(cx).as_ref(), |this, qr| {
+                                    .when_some(self.qr_code.as_ref(), |this, qr| {
                                         this.child(
-                                            div()
-                                                .id("")
-                                                .child(
-                                                    img(qr.clone())
-                                                        .size(px(256.))
-                                                        .rounded_xl()
-                                                        .shadow_lg()
-                                                        .border_1()
-                                                        .border_color(cx.theme().element_active),
-                                                )
-                                                .on_click(cx.listener(
-                                                    move |this, _e, window, cx| {
-                                                        this.copy_uri(window, cx)
-                                                    },
-                                                )),
+                                            img(qr.clone())
+                                                .size(px(256.))
+                                                .rounded(cx.theme().radius_lg)
+                                                .when(cx.theme().shadow, |this| this.shadow_lg())
+                                                .border_1()
+                                                .border_color(cx.theme().element_active),
                                         )
                                     })
                                     .child(
@@ -419,13 +335,17 @@ impl Render for Onboarding {
                                                 div()
                                                     .font_semibold()
                                                     .line_height(relative(1.3))
-                                                    .child(shared_t!("onboarding.nostr_connect")),
+                                                    .child(SharedString::from(
+                                                        "Continue with Nostr Connect",
+                                                    )),
                                             )
                                             .child(
                                                 div()
                                                     .text_sm()
                                                     .text_color(cx.theme().text_muted)
-                                                    .child(shared_t!("onboarding.scan_qr")),
+                                                    .child(SharedString::from(
+                                                        "Use Nostr Connect apps to scan the code",
+                                                    )),
                                             )
                                             .child(
                                                 h_flex()

crates/coop/src/views/preferences.rs

@@ -1,22 +1,14 @@
-use common::display::RenderedProfile;
 use gpui::http_client::Url;
 use gpui::{
-    div, px, relative, rems, App, AppContext, Context, Entity, InteractiveElement, IntoElement,
-    ParentElement, Render, SharedString, StatefulInteractiveElement, Styled, Window,
+    div, px, App, AppContext, Context, Entity, IntoElement, ParentElement, Render, SharedString,
+    Styled, Window,
 };
-use i18n::{shared_t, t};
-use nostr_sdk::prelude::*;
-use registry::Registry;
 use settings::AppSettings;
 use theme::ActiveTheme;
-use ui::avatar::Avatar;
 use ui::button::{Button, ButtonVariants};
 use ui::input::{InputState, TextInput};
-use ui::modal::ModalButtonProps;
 use ui::switch::Switch;
-use ui::{h_flex, v_flex, ContextModal, IconName, Sizable, Size, StyledExt};
-
-use crate::views::{edit_profile, setup_relay};
+use ui::{h_flex, v_flex, IconName, Sizable, Size, StyledExt};
 
 pub fn init(window: &mut Window, cx: &mut App) -> Entity<Preferences> {
     cx.new(|cx| Preferences::new(window, cx))
@@ -37,83 +29,10 @@ impl Preferences {
 
         Self { media_input }
     }
-
-    fn open_edit_profile(&self, window: &mut Window, cx: &mut Context<Self>) {
-        let view = edit_profile::init(window, cx);
-        let weak_view = view.downgrade();
-
-        window.open_modal(cx, move |modal, _window, _cx| {
-            let weak_view = weak_view.clone();
-
-            modal
-                .confirm()
-                .title(shared_t!("profile.title"))
-                .child(view.clone())
-                .button_props(ModalButtonProps::default().ok_text(t!("common.update")))
-                .on_ok(move |_, window, cx| {
-                    weak_view
-                        .update(cx, |this, cx| {
-                            let set_metadata = this.set_metadata(cx);
-                            let registry = Registry::global(cx);
-
-                            cx.spawn_in(window, async move |_, cx| {
-                                match set_metadata.await {
-                                    Ok(profile) => {
-                                        if let Some(profile) = profile {
-                                            cx.update(|_, cx| {
-                                                registry.update(cx, |this, cx| {
-                                                    this.insert_or_update_person(profile, cx);
-                                                });
-                                            })
-                                            .ok();
-                                        }
-                                    }
-                                    Err(e) => {
-                                        cx.update(|window, cx| {
-                                            window.push_notification(e.to_string(), cx);
-                                        })
-                                        .ok();
-                                    }
-                                };
-                            })
-                            .detach();
-                        })
-                        .ok();
-                    // true to close the modal
-                    true
-                })
-        });
-    }
-
-    fn open_relays(&self, window: &mut Window, cx: &mut Context<Self>) {
-        let view = setup_relay::init(Kind::InboxRelays, window, cx);
-        let weak_view = view.downgrade();
-
-        window.open_modal(cx, move |this, _window, _cx| {
-            let weak_view = weak_view.clone();
-
-            this.confirm()
-                .title(shared_t!("relays.modal"))
-                .child(view.clone())
-                .button_props(ModalButtonProps::default().ok_text(t!("common.update")))
-                .on_ok(move |_, window, cx| {
-                    weak_view
-                        .update(cx, |this, cx| {
-                            this.set_relays(window, cx);
-                        })
-                        .ok();
-                    // true to close the modal
-                    false
-                })
-        });
-    }
 }
 
 impl Render for Preferences {
     fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        let input_state = self.media_input.downgrade();
-        let profile = Registry::read_global(cx).identity(cx);
-
         let auto_auth = AppSettings::get_auto_auth(cx);
         let backup = AppSettings::get_backup_messages(cx);
         let screening = AppSettings::get_screening(cx);
@@ -121,61 +40,9 @@ impl Render for Preferences {
         let proxy = AppSettings::get_proxy_user_avatars(cx);
         let hide = AppSettings::get_hide_user_avatars(cx);
 
+        let input_state = self.media_input.downgrade();
+
         v_flex()
-            .child(
-                v_flex()
-                    .pb_2()
-                    .gap_2()
-                    .child(
-                        div()
-                            .text_sm()
-                            .text_color(cx.theme().text_placeholder)
-                            .font_semibold()
-                            .child(shared_t!("preferences.account_header")),
-                    )
-                    .child(
-                        h_flex()
-                            .w_full()
-                            .justify_between()
-                            .child(
-                                h_flex()
-                                    .id("user")
-                                    .gap_2()
-                                    .child(Avatar::new(profile.avatar(proxy)).size(rems(2.4)))
-                                    .child(
-                                        div()
-                                            .flex_1()
-                                            .text_sm()
-                                            .child(
-                                                div()
-                                                    .font_semibold()
-                                                    .line_height(relative(1.3))
-                                                    .child(profile.display_name()),
-                                            )
-                                            .child(
-                                                div()
-                                                    .text_xs()
-                                                    .text_color(cx.theme().text_muted)
-                                                    .line_height(relative(1.3))
-                                                    .child(shared_t!("preferences.account_btn")),
-                                            ),
-                                    )
-                                    .on_click(cx.listener(move |this, _e, window, cx| {
-                                        this.open_edit_profile(window, cx);
-                                    })),
-                            )
-                            .child(
-                                Button::new("relays")
-                                    .label("Messaging Relays")
-                                    .xsmall()
-                                    .ghost_alt()
-                                    .rounded()
-                                    .on_click(cx.listener(move |this, _e, window, cx| {
-                                        this.open_relays(window, cx);
-                                    })),
-                            ),
-                    ),
-            )
             .child(
                 v_flex()
                     .py_2()
@@ -186,7 +53,7 @@ impl Render for Preferences {
                             .text_sm()
                             .text_color(cx.theme().text_placeholder)
                             .font_semibold()
-                            .child(shared_t!("preferences.relay_and_media")),
+                            .child(SharedString::from("Relay and Media")),
                     )
                     .child(
                         v_flex()
@@ -217,13 +84,13 @@ impl Render for Preferences {
                                 div()
                                     .text_xs()
                                     .text_color(cx.theme().text_muted)
-                                    .child(shared_t!("preferences.media_description")),
+                                    .child(SharedString::from("Coop currently only supports NIP-96 media servers.")),
                             ),
                     )
                     .child(
                         Switch::new("auth")
-                            .label(t!("preferences.auto_auth"))
-                            .description(t!("preferences.auto_auth_description"))
+                            .label("Automatically authenticate for known relays")
+                            .description("After you approve the authentication request, Coop will automatically complete this step next time.")
                             .checked(auto_auth)
                             .on_click(move |_, _window, cx| {
                                 AppSettings::update_auto_auth(!auto_auth, cx);
@@ -241,15 +108,15 @@ impl Render for Preferences {
                             .text_sm()
                             .text_color(cx.theme().text_placeholder)
                             .font_semibold()
-                            .child(shared_t!("preferences.messages_header")),
+                            .child(SharedString::from("Messages")),
                     )
                     .child(
                         v_flex()
                             .gap_2()
                             .child(
                                 Switch::new("screening")
-                                    .label(t!("preferences.screening_label"))
-                                    .description(t!("preferences.screening_description"))
+                                    .label("Screening")
+                                    .description("When opening a chat request, Coop will show a popup to help you verify the sender.")
                                     .checked(screening)
                                     .on_click(move |_, _window, cx| {
                                         AppSettings::update_screening(!screening, cx);
@@ -257,8 +124,8 @@ impl Render for Preferences {
                             )
                             .child(
                                 Switch::new("bypass")
-                                    .label(t!("preferences.bypass_label"))
-                                    .description(t!("preferences.bypass_description"))
+                                    .label("Skip screening for contacts")
+                                    .description("Requests from your contacts will automatically go to inbox.")
                                     .checked(bypass)
                                     .on_click(move |_, _window, cx| {
                                         AppSettings::update_contact_bypass(!bypass, cx);
@@ -266,8 +133,8 @@ impl Render for Preferences {
                             )
                             .child(
                                 Switch::new("backup")
-                                    .label(t!("preferences.backup_label"))
-                                    .description(t!("preferences.backup_description"))
+                                    .label("Backup messages")
+                                    .description("When you send a message, Coop will also forward it to your configured Messaging Relays. Disabling this will cause all messages sent during the current session to disappear when the app is closed.")
                                     .checked(backup)
                                     .on_click(move |_, _window, cx| {
                                         AppSettings::update_backup_messages(!backup, cx);
@@ -286,15 +153,15 @@ impl Render for Preferences {
                             .text_sm()
                             .text_color(cx.theme().text_placeholder)
                             .font_semibold()
-                            .child(shared_t!("preferences.display_header")),
+                            .child(SharedString::from("Display")),
                     )
                     .child(
                         v_flex()
                             .gap_2()
                             .child(
                                 Switch::new("hide_avatar")
-                                    .label(t!("preferences.hide_avatars_label"))
-                                    .description(t!("preferences.hide_avatar_description"))
+                                    .label("Hide user avatars")
+                                    .description("Unload all avatar pictures to improve performance and reduce memory usage.")
                                     .checked(hide)
                                     .on_click(move |_, _window, cx| {
                                         AppSettings::update_hide_user_avatars(!hide, cx);
@@ -302,8 +169,8 @@ impl Render for Preferences {
                             )
                             .child(
                                 Switch::new("proxy_avatar")
-                                    .label(t!("preferences.proxy_avatars_label"))
-                                    .description(t!("preferences.proxy_description"))
+                                    .label("Proxy user avatars")
+                                    .description("Use wsrv.nl to resize and downscale avatar pictures (saves ~50MB of data).")
                                     .checked(proxy)
                                     .on_click(move |_, _window, cx| {
                                         AppSettings::update_proxy_user_avatars(!proxy, cx);

crates/coop/src/views/screening.rs

@@ -1,20 +1,16 @@
 use std::time::Duration;
 
-use common::display::{shorten_pubkey, RenderedProfile, RenderedTimestamp};
-use common::nip05::nip05_verify;
-use global::constants::BOOTSTRAP_RELAYS;
-use global::nostr_client;
+use common::{nip05_verify, shorten_pubkey, RenderedProfile, RenderedTimestamp, BOOTSTRAP_RELAYS};
 use gpui::prelude::FluentBuilder;
 use gpui::{
     div, px, relative, rems, uniform_list, App, AppContext, Context, Div, Entity,
     InteractiveElement, IntoElement, ParentElement, Render, SharedString, Styled, Task, Window,
 };
 use gpui_tokio::Tokio;
-use i18n::{shared_t, t};
 use nostr_sdk::prelude::*;
-use registry::Registry;
-use settings::AppSettings;
+use person::{Person, PersonRegistry};
 use smallvec::{smallvec, SmallVec};
+use state::NostrRegistry;
 use theme::ActiveTheme;
 use ui::avatar::Avatar;
 use ui::button::{Button, ButtonVariants};
@@ -26,7 +22,7 @@ pub fn init(public_key: PublicKey, window: &mut Window, cx: &mut App) -> Entity<
 }
 
 pub struct Screening {
-    profile: Profile,
+    profile: Person,
     verified: bool,
     followed: bool,
     last_active: Option<Timestamp>,
@@ -36,37 +32,42 @@ pub struct Screening {
 
 impl Screening {
     pub fn new(public_key: PublicKey, window: &mut Window, cx: &mut Context<Self>) -> Self {
-        let registry = Registry::read_global(cx);
-        let identity = registry.identity(cx).public_key();
-        let profile = registry.get_person(&public_key, cx);
+        let nostr = NostrRegistry::global(cx);
+        let client = nostr.read(cx).client();
+
+        let persons = PersonRegistry::global(cx);
+        let profile = persons.read(cx).get(&public_key, cx);
 
         let mut tasks = smallvec![];
 
-        let contact_check: Task<(bool, Vec<Profile>)> = cx.background_spawn(async move {
-            let client = nostr_client();
+        let contact_check: Task<Result<(bool, Vec<Profile>), Error>> = cx.background_spawn({
+            let client = nostr.read(cx).client();
+            async move {
+                let signer = client.signer().await?;
+                let signer_pubkey = signer.get_public_key().await?;
 
-            // Check if user is in contact list
-            let contacts = client.database().contacts_public_keys(identity).await;
-            let followed = contacts.unwrap_or_default().contains(&public_key);
+                // Check if user is in contact list
+                let contacts = client.database().contacts_public_keys(signer_pubkey).await;
+                let followed = contacts.unwrap_or_default().contains(&public_key);
 
-            // Check mutual contacts
-            let contact_list = Filter::new().kind(Kind::ContactList).pubkey(public_key);
-            let mut mutual_contacts = vec![];
+                // Check mutual contacts
+                let contact_list = Filter::new().kind(Kind::ContactList).pubkey(public_key);
+                let mut mutual_contacts = vec![];
 
-            if let Ok(events) = client.database().query(contact_list).await {
-                for event in events.into_iter().filter(|ev| ev.pubkey != identity) {
-                    if let Ok(metadata) = client.database().metadata(event.pubkey).await {
-                        let profile = Profile::new(event.pubkey, metadata.unwrap_or_default());
-                        mutual_contacts.push(profile);
+                if let Ok(events) = client.database().query(contact_list).await {
+                    for event in events.into_iter().filter(|ev| ev.pubkey != signer_pubkey) {
+                        if let Ok(metadata) = client.database().metadata(event.pubkey).await {
+                            let profile = Profile::new(event.pubkey, metadata.unwrap_or_default());
+                            mutual_contacts.push(profile);
+                        }
                     }
                 }
-            }
 
-            (followed, mutual_contacts)
+                Ok((followed, mutual_contacts))
+            }
         });
 
         let activity_check = cx.background_spawn(async move {
-            let client = nostr_client();
             let filter = Filter::new().author(public_key).limit(1);
             let mut activity: Option<Timestamp> = None;
 
@@ -74,8 +75,10 @@ impl Screening {
                 .stream_events_from(BOOTSTRAP_RELAYS, filter, Duration::from_secs(2))
                 .await
             {
-                while let Some(event) = stream.next().await {
-                    activity = Some(event.created_at);
+                while let Some((_url, event)) = stream.next().await {
+                    if let Ok(event) = event {
+                        activity = Some(event.created_at);
+                    }
                 }
             }
 
@@ -93,14 +96,14 @@ impl Screening {
         tasks.push(
             // Run the contact check in the background
             cx.spawn_in(window, async move |this, cx| {
-                let (followed, mutual_contacts) = contact_check.await;
-
-                this.update(cx, |this, cx| {
-                    this.followed = followed;
-                    this.mutual_contacts = mutual_contacts;
-                    cx.notify();
-                })
-                .ok();
+                if let Ok((followed, mutual_contacts)) = contact_check.await {
+                    this.update(cx, |this, cx| {
+                        this.followed = followed;
+                        this.mutual_contacts = mutual_contacts;
+                        cx.notify();
+                    })
+                    .ok();
+                }
             }),
         );
 
@@ -152,15 +155,17 @@ impl Screening {
     }
 
     fn report(&mut self, window: &mut Window, cx: &mut Context<Self>) {
+        let nostr = NostrRegistry::global(cx);
+        let client = nostr.read(cx).client();
         let public_key = self.profile.public_key();
 
         let task: Task<Result<(), Error>> = cx.background_spawn(async move {
-            let client = nostr_client();
-            let builder = EventBuilder::report(
-                vec![Tag::public_key_report(public_key, Report::Impersonation)],
-                "scam/impersonation",
-            );
-            let _ = client.send_event_builder(builder).await?;
+            let signer = client.signer().await?;
+            let tag = Tag::public_key_report(public_key, Report::Impersonation);
+            let event = EventBuilder::report(vec![tag], "").sign(&signer).await?;
+
+            // Send the report to the public relays
+            client.send_event_to(BOOTSTRAP_RELAYS, &event).await?;
 
             Ok(())
         });
@@ -169,7 +174,7 @@ impl Screening {
             if task.await.is_ok() {
                 cx.update(|window, cx| {
                     window.close_modal(cx);
-                    window.push_notification(t!("screening.report_msg"), cx);
+                    window.push_notification("Report submitted successfully", cx);
                 })
                 .ok();
             }
@@ -184,7 +189,7 @@ impl Screening {
             let contacts = contacts.clone();
             let total = contacts.len();
 
-            this.title(shared_t!("screening.mutual_label")).child(
+            this.title(SharedString::from("Mutual contacts")).child(
                 v_flex().gap_1().pb_4().child(
                     uniform_list("contacts", total, move |range, _window, cx| {
                         let mut items = Vec::with_capacity(total);
@@ -219,7 +224,6 @@ impl Screening {
 
 impl Render for Screening {
     fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        let proxy = AppSettings::get_proxy_user_avatars(cx);
         let shorten_pubkey = shorten_pubkey(self.profile.public_key(), 8);
         let total_mutuals = self.mutual_contacts.len();
         let last_active = self.last_active.map(|_| true);
@@ -232,12 +236,12 @@ impl Render for Screening {
                     .items_center()
                     .justify_center()
                     .text_center()
-                    .child(Avatar::new(self.profile.avatar(proxy)).size(rems(4.)))
+                    .child(Avatar::new(self.profile.avatar()).size(rems(4.)))
                     .child(
                         div()
                             .font_semibold()
                             .line_height(relative(1.25))
-                            .child(self.profile.display_name()),
+                            .child(self.profile.name()),
                     ),
             )
             .child(
@@ -263,7 +267,7 @@ impl Render for Screening {
                             .gap_1()
                             .child(
                                 Button::new("njump")
-                                    .label(t!("profile.njump"))
+                                    .label("View on njump.me")
                                     .secondary()
                                     .small()
                                     .rounded()
@@ -273,7 +277,7 @@ impl Render for Screening {
                             )
                             .child(
                                 Button::new("report")
-                                    .tooltip(t!("screening.report"))
+                                    .tooltip("Report as a scam or impostor")
                                     .icon(IconName::Report)
                                     .danger()
                                     .rounded()
@@ -295,16 +299,16 @@ impl Render for Screening {
                             .child(
                                 v_flex()
                                     .text_sm()
-                                    .child(shared_t!("screening.contact_label"))
+                                    .child(SharedString::from("Contact"))
                                     .child(
                                         div()
                                             .line_clamp(1)
                                             .text_color(cx.theme().text_muted)
                                             .child({
                                                 if self.followed {
-                                                    shared_t!("screening.contact")
+                                                    SharedString::from("This person is one of your contacts.")
                                                 } else {
-                                                    shared_t!("screening.not_contact")
+                                                    SharedString::from("This person is not one of your contacts.")
                                                 }
                                             }),
                                     ),
@@ -322,14 +326,14 @@ impl Render for Screening {
                                     .child(
                                         h_flex()
                                             .gap_0p5()
-                                            .child(shared_t!("screening.active_label"))
+                                            .child(SharedString::from("Activity on Public Relays"))
                                             .child(
                                                 Button::new("active")
                                                     .icon(IconName::Info)
                                                     .xsmall()
                                                     .ghost()
                                                     .rounded()
-                                                    .tooltip(t!("screening.active_tooltip")),
+                                                    .tooltip("This may be inaccurate if the user only publishes to their private relays."),
                                             ),
                                     )
                                     .child(
@@ -339,12 +343,12 @@ impl Render for Screening {
                                             .text_color(cx.theme().text_muted)
                                             .map(|this| {
                                                 if let Some(date) = self.last_active {
-                                                    this.child(shared_t!(
-                                                        "screening.active_at",
-                                                        d = date.to_human_time()
-                                                    ))
+                                                    this.child(SharedString::from(format!(
+                                                        "Last active: {}.",
+                                                        date.to_human_time()
+                                                    )))
                                                 } else {
-                                                    this.child(shared_t!("screening.no_active"))
+                                                    this.child(SharedString::from("This person hasn't had any activity."))
                                                 }
                                             }),
                                     ),
@@ -360,9 +364,9 @@ impl Render for Screening {
                                     .text_sm()
                                     .child({
                                         if let Some(addr) = self.address(cx) {
-                                            shared_t!("screening.nip05_addr", addr = addr)
+                                            SharedString::from(format!("{} validation", addr))
                                         } else {
-                                            shared_t!("screening.nip05_label")
+                                            SharedString::from("Friendly Address (NIP-05) validation")
                                         }
                                     })
                                     .child(
@@ -372,12 +376,12 @@ impl Render for Screening {
                                             .child({
                                                 if self.address(cx).is_some() {
                                                     if self.verified {
-                                                        shared_t!("screening.nip05_ok")
+                                                        SharedString::from("The address matches the user's public key.")
                                                     } else {
-                                                        shared_t!("screening.nip05_failed")
+                                                        SharedString::from("The address does not match the user's public key.")
                                                     }
                                                 } else {
-                                                    shared_t!("screening.nip05_empty")
+                                                    SharedString::from("This person has not set up their friendly address")
                                                 }
                                             }),
                                     ),
@@ -394,7 +398,7 @@ impl Render for Screening {
                                     .child(
                                         h_flex()
                                             .gap_0p5()
-                                            .child(shared_t!("screening.mutual_label"))
+                                            .child(SharedString::from("Mutual contacts"))
                                             .child(
                                                 Button::new("mutuals")
                                                     .icon(IconName::Info)
@@ -414,9 +418,12 @@ impl Render for Screening {
                                             .text_color(cx.theme().text_muted)
                                             .child({
                                                 if total_mutuals > 0 {
-                                                    shared_t!("screening.mutual", u = total_mutuals)
+                                                    SharedString::from(format!(
+                                                        "You have {} mutual contacts with this person.",
+                                                        total_mutuals
+                                                    ))
                                                 } else {
-                                                    shared_t!("screening.no_mutual")
+                                                    SharedString::from("You don't have any mutual contacts with this person.")
                                                 }
                                             }),
                                     ),

crates/coop/src/views/setup_relay.rs

@@ -1,113 +1,60 @@
+use std::collections::HashSet;
 use std::time::Duration;
 
 use anyhow::{anyhow, Error};
-use global::constants::NIP17_RELAYS;
-use global::{app_state, nostr_client};
 use gpui::prelude::FluentBuilder;
 use gpui::{
     div, px, uniform_list, App, AppContext, Context, Entity, InteractiveElement, IntoElement,
-    ParentElement, Render, SharedString, StatefulInteractiveElement, Styled, Subscription, Task,
-    TextAlign, UniformList, Window,
+    ParentElement, Render, SharedString, Styled, Subscription, Task, TextAlign, UniformList,
+    Window,
 };
-use i18n::{shared_t, t};
 use nostr_sdk::prelude::*;
-use registry::Registry;
 use smallvec::{smallvec, SmallVec};
+use state::NostrRegistry;
 use theme::ActiveTheme;
 use ui::button::{Button, ButtonVariants};
 use ui::input::{InputEvent, InputState, TextInput};
-use ui::modal::ModalButtonProps;
-use ui::{h_flex, v_flex, ContextModal, IconName, Sizable, StyledExt};
+use ui::{h_flex, v_flex, ContextModal, IconName, Sizable};
 
-pub fn init(kind: Kind, window: &mut Window, cx: &mut App) -> Entity<SetupRelay> {
-    cx.new(|cx| SetupRelay::new(kind, window, cx))
-}
-
-pub fn setup_nip17_relay<T>(label: T) -> impl IntoElement
-where
-    T: Into<SharedString>,
-{
-    div().child(
-        Button::new("setup-relays")
-            .icon(IconName::Info)
-            .label(label)
-            .warning()
-            .xsmall()
-            .rounded()
-            .on_click(move |_, window, cx| {
-                let view = cx.new(|cx| SetupRelay::new(Kind::InboxRelays, window, cx));
-                let weak_view = view.downgrade();
-
-                window.open_modal(cx, move |modal, _window, _cx| {
-                    let weak_view = weak_view.clone();
-
-                    modal
-                        .confirm()
-                        .title(shared_t!("relays.modal"))
-                        .child(view.clone())
-                        .button_props(ModalButtonProps::default().ok_text(t!("common.update")))
-                        .on_ok(move |_, window, cx| {
-                            weak_view
-                                .update(cx, |this, cx| {
-                                    this.set_relays(window, cx);
-                                })
-                                .ok();
-                            // true to close the modal
-                            false
-                        })
-                })
-            }),
-    )
+pub fn init(window: &mut Window, cx: &mut App) -> Entity<SetupRelay> {
+    cx.new(|cx| SetupRelay::new(window, cx))
 }
 
+#[derive(Debug)]
 pub struct SetupRelay {
     input: Entity<InputState>,
-    relays: Vec<RelayUrl>,
     error: Option<SharedString>,
+
+    // All relays
+    relays: HashSet<RelayUrl>,
+
+    // Event subscriptions
     _subscriptions: SmallVec<[Subscription; 1]>,
+
+    // Background tasks
     _tasks: SmallVec<[Task<()>; 1]>,
 }
 
 impl SetupRelay {
-    pub fn new(kind: Kind, window: &mut Window, cx: &mut Context<Self>) -> Self {
-        let identity = Registry::read_global(cx).identity(cx).public_key();
+    pub fn new(window: &mut Window, cx: &mut Context<Self>) -> Self {
+        let nostr = NostrRegistry::global(cx);
+        let client = nostr.read(cx).client();
+
         let input = cx.new(|cx| InputState::new(window, cx).placeholder("wss://example.com"));
 
         let mut subscriptions = smallvec![];
         let mut tasks = smallvec![];
 
-        let load_relay = cx.background_spawn(async move {
-            let client = nostr_client();
-            let filter = Filter::new().kind(kind).author(identity).limit(1);
-
-            if let Some(event) = client.database().query(filter).await?.first() {
-                let relays: Vec<RelayUrl> = event
-                    .tags
-                    .iter()
-                    .filter_map(|tag| tag.as_standardized())
-                    .filter_map(|tag| {
-                        if let TagStandard::RelayMetadata { relay_url, .. } = tag {
-                            Some(relay_url.to_owned())
-                        } else if let TagStandard::Relay(url) = tag {
-                            Some(url.to_owned())
-                        } else {
-                            None
-                        }
-                    })
-                    .collect();
-
-                Ok(relays)
-            } else {
-                Err(anyhow!("Not found."))
-            }
-        });
-
         tasks.push(
             // Load user's relays in the local database
             cx.spawn_in(window, async move |this, cx| {
-                if let Ok(relays) = load_relay.await {
+                let result = cx
+                    .background_spawn(async move { Self::load(&client).await })
+                    .await;
+
+                if let Ok(relays) = result {
                     this.update(cx, |this, cx| {
-                        this.relays = relays;
+                        this.relays.extend(relays);
                         cx.notify();
                     })
                     .ok();
@@ -130,35 +77,52 @@ impl SetupRelay {
 
         Self {
             input,
-            relays: vec![],
+            relays: HashSet::new(),
             error: None,
             _subscriptions: subscriptions,
             _tasks: tasks,
         }
     }
 
+    async fn load(client: &Client) -> Result<Vec<RelayUrl>, Error> {
+        let signer = client.signer().await?;
+        let public_key = signer.get_public_key().await?;
+
+        let filter = Filter::new()
+            .kind(Kind::InboxRelays)
+            .author(public_key)
+            .limit(1);
+
+        if let Some(event) = client.database().query(filter).await?.first_owned() {
+            let urls = nip17::extract_owned_relay_list(event).collect();
+            Ok(urls)
+        } else {
+            Err(anyhow!("Not found."))
+        }
+    }
+
     fn add(&mut self, window: &mut Window, cx: &mut Context<Self>) {
         let value = self.input.read(cx).value().to_string();
 
         if !value.starts_with("ws") {
+            self.set_error("Relay URl is invalid", window, cx);
             return;
         }
 
         if let Ok(url) = RelayUrl::parse(&value) {
-            if !self.relays.contains(&url) {
-                self.relays.push(url);
+            if !self.relays.insert(url) {
+                self.input.update(cx, |this, cx| {
+                    this.set_value("", window, cx);
+                });
+                cx.notify();
             }
-
-            self.input.update(cx, |this, cx| {
-                this.set_value("", window, cx);
-            });
-
-            cx.notify();
+        } else {
+            self.set_error("Relay URl is invalid", window, cx);
         }
     }
 
-    fn remove(&mut self, ix: usize, _window: &mut Window, cx: &mut Context<Self>) {
-        self.relays.remove(ix);
+    fn remove(&mut self, url: &RelayUrl, cx: &mut Context<Self>) {
+        self.relays.remove(url);
         cx.notify();
     }
 
@@ -172,12 +136,10 @@ impl SetupRelay {
         // Clear the error message after a delay
         cx.spawn_in(window, async move |this, cx| {
             cx.background_executor().timer(Duration::from_secs(2)).await;
-            cx.update(|_, cx| {
-                this.update(cx, |this, cx| {
-                    this.error = None;
-                    cx.notify();
-                })
-                .ok();
+
+            this.update(cx, |this, cx| {
+                this.error = None;
+                cx.notify();
             })
             .ok();
         })
@@ -186,16 +148,24 @@ impl SetupRelay {
 
     pub fn set_relays(&mut self, window: &mut Window, cx: &mut Context<Self>) {
         if self.relays.is_empty() {
-            self.set_error(t!("relays.empty"), window, cx);
+            self.set_error(
+                "You need to add at least 1 relay to receive messages from others.",
+                window,
+                cx,
+            );
             return;
         };
 
+        let nostr = NostrRegistry::global(cx);
+        let client = nostr.read(cx).client();
+        let public_key = nostr.read(cx).identity().read(cx).public_key();
+        let write_relays = nostr.read(cx).write_relays(&public_key, cx);
+
         let relays = self.relays.clone();
 
         let task: Task<Result<(), Error>> = cx.background_spawn(async move {
-            let client = nostr_client();
+            let urls = write_relays.await;
             let signer = client.signer().await?;
-            let public_key = signer.get_public_key().await?;
 
             let tags: Vec<Tag> = relays
                 .iter()
@@ -204,31 +174,18 @@ impl SetupRelay {
 
             let event = EventBuilder::new(Kind::InboxRelays, "")
                 .tags(tags)
-                .build(public_key)
                 .sign(&signer)
                 .await?;
 
             // Set messaging relays
-            client.send_event(&event).await?;
+            client.send_event_to(urls, &event).await?;
 
             // Connect to messaging relays
             for relay in relays.iter() {
-                _ = client.add_relay(relay).await;
-                _ = client.connect_relay(relay).await;
+                client.add_relay(relay).await.ok();
+                client.connect_relay(relay).await.ok();
             }
 
-            // Fetch gift wrap events
-            let sub_id = app_state().gift_wrap_sub_id.clone();
-            let filter = Filter::new().kind(Kind::GiftWrap).pubkey(public_key);
-
-            if client
-                .subscribe_with_id_to(relays.clone(), sub_id, filter, None)
-                .await
-                .is_ok()
-            {
-                log::info!("Subscribed to messages in: {relays:?}");
-            };
-
             Ok(())
         });
 
@@ -258,38 +215,47 @@ impl SetupRelay {
         uniform_list(
             "relays",
             total,
-            cx.processor(move |_, range, _window, cx| {
+            cx.processor(move |_v, range, _window, cx| {
                 let mut items = Vec::new();
 
                 for ix in range {
-                    let item = relays.get(ix).map(|i: &RelayUrl| i.to_string()).unwrap();
-
-                    items.push(
-                        div().group("").w_full().h_9().py_0p5().child(
+                    if let Some(url) = relays.iter().nth(ix) {
+                        items.push(
                             div()
-                                .px_2()
-                                .h_full()
+                                .id(SharedString::from(url.to_string()))
+                                .group("")
                                 .w_full()
-                                .flex()
-                                .items_center()
-                                .justify_between()
-                                .rounded(cx.theme().radius)
-                                .bg(cx.theme().elevated_surface_background)
-                                .text_xs()
-                                .child(item)
+                                .h_9()
+                                .py_0p5()
                                 .child(
-                                    Button::new("remove_{ix}")
-                                        .icon(IconName::Close)
-                                        .xsmall()
-                                        .ghost()
-                                        .invisible()
-                                        .group_hover("", |this| this.visible())
-                                        .on_click(cx.listener(move |this, _, window, cx| {
-                                            this.remove(ix, window, cx)
-                                        })),
+                                    div()
+                                        .px_2()
+                                        .h_full()
+                                        .w_full()
+                                        .flex()
+                                        .items_center()
+                                        .justify_between()
+                                        .rounded(cx.theme().radius)
+                                        .bg(cx.theme().elevated_surface_background)
+                                        .text_xs()
+                                        .child(SharedString::from(url.to_string()))
+                                        .child(
+                                            Button::new("remove_{ix}")
+                                                .icon(IconName::Close)
+                                                .xsmall()
+                                                .ghost()
+                                                .invisible()
+                                                .group_hover("", |this| this.visible())
+                                                .on_click({
+                                                    let url = url.to_owned();
+                                                    cx.listener(move |this, _ev, _window, cx| {
+                                                        this.remove(&url, cx);
+                                                    })
+                                                }),
+                                        ),
                                 ),
-                        ),
-                    )
+                        )
+                    }
                 }
 
                 items
@@ -306,7 +272,7 @@ impl SetupRelay {
             .justify_center()
             .text_sm()
             .text_align(TextAlign::Center)
-            .child(shared_t!("relays.help_text"))
+            .child(SharedString::from("Please add some relays."))
     }
 }
 
@@ -318,7 +284,7 @@ impl Render for SetupRelay {
             .child(
                 div()
                     .text_color(cx.theme().text_muted)
-                    .child(shared_t!("relays.description")),
+                    .child(SharedString::from("In order to receive messages from others, you need to set up at least one Messaging Relay.")),
             )
             .child(
                 v_flex()
@@ -331,46 +297,13 @@ impl Render for SetupRelay {
                             .child(
                                 Button::new("add")
                                     .icon(IconName::PlusFill)
-                                    .label(t!("common.add"))
+                                    .label("Add")
                                     .ghost()
                                     .on_click(cx.listener(move |this, _, window, cx| {
                                         this.add(window, cx);
                                     })),
                             ),
                     )
-                    .child(
-                        h_flex()
-                            .gap_2()
-                            .child(
-                                div()
-                                    .text_xs()
-                                    .font_semibold()
-                                    .text_color(cx.theme().text_muted)
-                                    .child(shared_t!("common.recommended")),
-                            )
-                            .child(h_flex().gap_1().children({
-                                NIP17_RELAYS.iter().map(|&relay| {
-                                    div()
-                                        .id(relay)
-                                        .group("")
-                                        .py_0p5()
-                                        .px_1p5()
-                                        .text_xs()
-                                        .text_center()
-                                        .bg(cx.theme().secondary_background)
-                                        .hover(|this| this.bg(cx.theme().secondary_hover))
-                                        .active(|this| this.bg(cx.theme().secondary_active))
-                                        .rounded_full()
-                                        .child(relay)
-                                        .on_click(cx.listener(move |this, _, window, cx| {
-                                            this.input.update(cx, |this, cx| {
-                                                this.set_value(relay, window, cx);
-                                            });
-                                            this.add(window, cx);
-                                        }))
-                                })
-                            })),
-                    )
                     .when_some(self.error.as_ref(), |this, error| {
                         this.child(
                             div()

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

@@ -1,880 +0,0 @@
-use std::collections::BTreeSet;
-use std::ops::Range;
-use std::time::Duration;
-
-use anyhow::{anyhow, Error};
-use common::debounced_delay::DebouncedDelay;
-use common::display::{RenderedTimestamp, TextUtils};
-use global::constants::{BOOTSTRAP_RELAYS, SEARCH_RELAYS};
-use global::{app_state, nostr_client, UnwrappingStatus};
-use gpui::prelude::FluentBuilder;
-use gpui::{
-    deferred, div, relative, uniform_list, AnyElement, App, AppContext, Context, Entity,
-    EventEmitter, FocusHandle, Focusable, InteractiveElement, IntoElement, ParentElement, Render,
-    RetainAllImageCache, SharedString, Styled, Subscription, Task, Window,
-};
-use gpui_tokio::Tokio;
-use i18n::{shared_t, t};
-use itertools::Itertools;
-use list_item::RoomListItem;
-use nostr_sdk::prelude::*;
-use registry::room::{Room, RoomKind};
-use registry::{Registry, RegistryEvent};
-use settings::AppSettings;
-use smallvec::{smallvec, SmallVec};
-use theme::ActiveTheme;
-use ui::button::{Button, ButtonVariants};
-use ui::dock_area::panel::{Panel, PanelEvent};
-use ui::input::{InputEvent, InputState, TextInput};
-use ui::popup_menu::{PopupMenu, PopupMenuExt};
-use ui::{h_flex, v_flex, ContextModal, Icon, IconName, Selectable, Sizable, StyledExt};
-
-use crate::actions::{RelayStatus, Reload};
-
-mod list_item;
-
-const FIND_DELAY: u64 = 600;
-const FIND_LIMIT: usize = 10;
-
-pub fn init(window: &mut Window, cx: &mut App) -> Entity<Sidebar> {
-    Sidebar::new(window, cx)
-}
-
-pub struct Sidebar {
-    name: SharedString,
-    // Search
-    find_input: Entity<InputState>,
-    find_debouncer: DebouncedDelay<Self>,
-    finding: bool,
-    cancel_handle: Entity<Option<smol::channel::Sender<()>>>,
-    local_result: Entity<Option<Vec<Entity<Room>>>>,
-    global_result: Entity<Option<Vec<Entity<Room>>>>,
-    // Rooms
-    indicator: Entity<Option<RoomKind>>,
-    active_filter: Entity<RoomKind>,
-    // GPUI
-    focus_handle: FocusHandle,
-    image_cache: Entity<RetainAllImageCache>,
-    #[allow(dead_code)]
-    subscriptions: SmallVec<[Subscription; 3]>,
-}
-
-impl Sidebar {
-    pub fn new(window: &mut Window, cx: &mut App) -> Entity<Self> {
-        cx.new(|cx| Self::view(window, cx))
-    }
-
-    fn view(window: &mut Window, cx: &mut Context<Self>) -> Self {
-        let active_filter = cx.new(|_| RoomKind::Ongoing);
-        let indicator = cx.new(|_| None);
-        let local_result = cx.new(|_| None);
-        let global_result = cx.new(|_| None);
-        let cancel_handle = cx.new(|_| None);
-
-        let find_input =
-            cx.new(|cx| InputState::new(window, cx).placeholder(t!("sidebar.search_label")));
-
-        let registry = Registry::global(cx);
-        let mut subscriptions = smallvec![];
-
-        subscriptions.push(
-            // Clear the image cache when sidebar is closed
-            cx.on_release_in(window, move |this, window, cx| {
-                this.image_cache.update(cx, |this, cx| {
-                    this.clear(window, cx);
-                })
-            }),
-        );
-
-        subscriptions.push(
-            // Subscribe for registry new events
-            cx.subscribe_in(&registry, window, move |this, _, event, _window, cx| {
-                if let RegistryEvent::NewRequest(kind) = event {
-                    this.indicator.update(cx, |this, cx| {
-                        *this = Some(kind.to_owned());
-                        cx.notify();
-                    });
-                }
-            }),
-        );
-
-        subscriptions.push(
-            // Subscribe for find input events
-            cx.subscribe_in(&find_input, window, |this, state, event, window, cx| {
-                match event {
-                    InputEvent::PressEnter { .. } => this.search(window, cx),
-                    InputEvent::Change => {
-                        // Clear the result when input is empty
-                        if state.read(cx).value().is_empty() {
-                            this.clear_search_results(window, cx);
-                        } else {
-                            // Run debounced search
-                            this.find_debouncer.fire_new(
-                                Duration::from_millis(FIND_DELAY),
-                                window,
-                                cx,
-                                |this, window, cx| this.debounced_search(window, cx),
-                            );
-                        }
-                    }
-                    _ => {}
-                }
-            }),
-        );
-
-        Self {
-            name: "Sidebar".into(),
-            focus_handle: cx.focus_handle(),
-            image_cache: RetainAllImageCache::new(cx),
-            find_debouncer: DebouncedDelay::new(),
-            finding: false,
-            cancel_handle,
-            indicator,
-            active_filter,
-            find_input,
-            local_result,
-            global_result,
-            subscriptions,
-        }
-    }
-
-    async fn request_metadata(client: &Client, public_key: PublicKey) -> Result<(), Error> {
-        let opts = SubscribeAutoCloseOptions::default().exit_policy(ReqExitPolicy::ExitOnEOSE);
-        let kinds = vec![Kind::Metadata, Kind::ContactList, Kind::RelayList];
-        let filter = Filter::new().author(public_key).kinds(kinds).limit(10);
-
-        client
-            .subscribe_to(BOOTSTRAP_RELAYS, filter, Some(opts))
-            .await?;
-
-        log::info!("Subscribe to get metadata for: {public_key}");
-
-        Ok(())
-    }
-
-    async fn create_temp_room(identity: PublicKey, public_key: PublicKey) -> Result<Room, Error> {
-        let client = nostr_client();
-        let keys = Keys::generate();
-        let builder = EventBuilder::private_msg_rumor(public_key, "");
-        let event = builder.build(identity).sign(&keys).await?;
-
-        // Request to get user's metadata
-        Self::request_metadata(client, public_key).await?;
-
-        // Create a temporary room
-        let room = Room::from(&event).current_user(identity);
-
-        Ok(room)
-    }
-
-    async fn nip50(identity: PublicKey, query: &str) -> BTreeSet<Room> {
-        let client = nostr_client();
-        let timeout = Duration::from_secs(2);
-        let mut rooms: BTreeSet<Room> = BTreeSet::new();
-
-        let filter = Filter::new()
-            .kind(Kind::Metadata)
-            .search(query.to_lowercase())
-            .limit(FIND_LIMIT);
-
-        if let Ok(events) = client
-            .fetch_events_from(SEARCH_RELAYS, filter, timeout)
-            .await
-        {
-            // Process to verify the search results
-            for event in events.into_iter().unique_by(|event| event.pubkey) {
-                // Skip if author is match current user
-                if event.pubkey == identity {
-                    continue;
-                }
-
-                // Return a temporary room
-                if let Ok(room) = Self::create_temp_room(identity, event.pubkey).await {
-                    rooms.insert(room);
-                }
-            }
-        }
-
-        rooms
-    }
-
-    fn debounced_search(&self, window: &mut Window, cx: &mut Context<Self>) -> Task<()> {
-        cx.spawn_in(window, async move |this, cx| {
-            this.update_in(cx, |this, window, cx| {
-                this.search(window, cx);
-            })
-            .ok();
-        })
-    }
-
-    fn search_by_nip50(
-        &mut self,
-        query: &str,
-        rx: smol::channel::Receiver<()>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let identity = Registry::read_global(cx).identity(cx).public_key();
-        let query = query.to_owned();
-        let query_cloned = query.clone();
-
-        let task = smol::future::or(
-            Tokio::spawn(cx, async move {
-                let rooms = Self::nip50(identity, &query).await;
-                Some(rooms)
-            }),
-            Tokio::spawn(cx, async move {
-                let _ = rx.recv().await.is_ok();
-                None
-            }),
-        );
-
-        cx.spawn_in(window, async move |this, cx| {
-            match task.await {
-                Ok(Some(results)) => {
-                    this.update_in(cx, |this, window, cx| {
-                        let msg = t!("sidebar.empty", query = query_cloned);
-                        let rooms = results.into_iter().map(|r| cx.new(|_| r)).collect_vec();
-
-                        if rooms.is_empty() {
-                            window.push_notification(msg, cx);
-                        }
-
-                        this.results(rooms, true, window, cx);
-                    })
-                    .ok();
-                }
-                // User cancelled the search
-                Ok(None) => {
-                    cx.update(|window, cx| {
-                        this.update(cx, |this, cx| {
-                            this.set_finding(false, window, cx);
-                            this.set_cancel_handle(None, cx);
-                        })
-                    })
-                    .ok();
-                }
-                // Async task failed
-                Err(e) => {
-                    this.update_in(cx, |this, window, cx| {
-                        window.push_notification(e.to_string(), cx);
-                        this.set_finding(false, window, cx);
-                        this.set_cancel_handle(None, cx);
-                    })
-                    .ok();
-                }
-            };
-        })
-        .detach();
-    }
-
-    fn search_by_nip05(&mut self, query: &str, window: &mut Window, cx: &mut Context<Self>) {
-        let identity = Registry::read_global(cx).identity(cx).public_key();
-        let address = query.to_owned();
-
-        let task = Tokio::spawn(cx, async move {
-            if let Ok(profile) = common::nip05::nip05_profile(&address).await {
-                Self::create_temp_room(identity, profile.public_key).await
-            } else {
-                Err(anyhow!(t!("sidebar.addr_error")))
-            }
-        });
-
-        cx.spawn_in(window, async move |this, cx| {
-            match task.await {
-                Ok(Ok(room)) => {
-                    cx.update(|window, cx| {
-                        this.update(cx, |this, cx| {
-                            this.results(vec![cx.new(|_| room)], true, window, cx);
-                        })
-                        .ok();
-                    })
-                    .ok();
-                }
-                Ok(Err(e)) => {
-                    cx.update(|window, cx| {
-                        this.update(cx, |this, cx| {
-                            window.push_notification(e.to_string(), cx);
-                            this.set_cancel_handle(None, cx);
-                            this.set_finding(false, window, cx);
-                        })
-                    })
-                    .ok();
-                }
-                Err(e) => {
-                    cx.update(|window, cx| {
-                        this.update(cx, |this, cx| {
-                            window.push_notification(e.to_string(), cx);
-                            this.set_cancel_handle(None, cx);
-                            this.set_finding(false, window, cx);
-                        })
-                    })
-                    .ok();
-                }
-            };
-        })
-        .detach();
-    }
-
-    fn search_by_pubkey(&mut self, query: &str, window: &mut Window, cx: &mut Context<Self>) {
-        let Ok(public_key) = query.to_public_key() else {
-            window.push_notification(t!("common.pubkey_invalid"), cx);
-            self.set_finding(false, window, cx);
-            return;
-        };
-
-        let identity = Registry::read_global(cx).identity(cx).public_key();
-        let task: Task<Result<Room, Error>> = cx.background_spawn(async move {
-            // Create a gift wrap event to represent as room
-            Self::create_temp_room(identity, public_key).await
-        });
-
-        cx.spawn_in(window, async move |this, cx| {
-            match task.await {
-                Ok(room) => {
-                    cx.update(|window, cx| {
-                        this.update(cx, |this, cx| {
-                            let registry = Registry::read_global(cx);
-                            let result = registry.search_by_public_key(public_key, cx);
-
-                            if !result.is_empty() {
-                                this.results(result, false, window, cx);
-                            } else {
-                                this.results(vec![cx.new(|_| room)], true, window, cx);
-                            }
-                        })
-                        .ok();
-                    })
-                    .ok();
-                }
-                Err(e) => {
-                    cx.update(|window, cx| {
-                        window.push_notification(e.to_string(), cx);
-                    })
-                    .ok();
-                }
-            };
-        })
-        .detach();
-    }
-
-    fn search(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        let (tx, rx) = smol::channel::bounded::<()>(1);
-        let tx_clone = tx.clone();
-
-        // Return if the query is empty
-        if self.find_input.read(cx).value().is_empty() {
-            return;
-        }
-
-        // Return if search is in progress
-        if self.finding {
-            if self.cancel_handle.read(cx).is_none() {
-                window.push_notification(t!("sidebar.search_in_progress"), cx);
-                return;
-            } else {
-                // This is a hack to cancel ongoing search request
-                cx.background_spawn(async move {
-                    tx.send(()).await.ok();
-                })
-                .detach();
-            }
-        }
-
-        let input = self.find_input.read(cx).value();
-        let query = input.to_string();
-
-        // Block the input until the search process completes
-        self.set_finding(true, window, cx);
-
-        // Process to search by pubkey if query starts with npub or nprofile
-        if query.starts_with("npub1") || query.starts_with("nprofile1") {
-            self.search_by_pubkey(&query, window, cx);
-            return;
-        };
-
-        // Process to search by NIP05 if query is a valid NIP-05 identifier (name@domain.tld)
-        if query.split('@').count() == 2 {
-            let parts: Vec<&str> = query.split('@').collect();
-            if !parts[0].is_empty() && !parts[1].is_empty() && parts[1].contains('.') {
-                self.search_by_nip05(&query, window, cx);
-                return;
-            }
-        }
-
-        let chats = Registry::read_global(cx);
-        // Get all local results with current query
-        let local_results = chats.search(&query, cx);
-
-        if !local_results.is_empty() {
-            // Try to update with local results first
-            self.results(local_results, false, window, cx);
-        } else {
-            // If no local results, try global search via NIP-50
-            self.set_cancel_handle(Some(tx_clone), cx);
-            self.search_by_nip50(&query, rx, window, cx);
-        }
-    }
-
-    fn results(
-        &mut self,
-        rooms: Vec<Entity<Room>>,
-        global: bool,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if self.finding {
-            self.set_finding(false, window, cx);
-        }
-
-        if self.cancel_handle.read(cx).is_some() {
-            self.set_cancel_handle(None, cx);
-        }
-
-        if !rooms.is_empty() {
-            if global {
-                self.global_result.update(cx, |this, cx| {
-                    *this = Some(rooms);
-                    cx.notify();
-                });
-            } else {
-                self.local_result.update(cx, |this, cx| {
-                    *this = Some(rooms);
-                    cx.notify();
-                });
-            }
-        }
-    }
-
-    fn set_finding(&mut self, status: bool, _window: &mut Window, cx: &mut Context<Self>) {
-        self.finding = status;
-        // Disable the input to prevent duplicate requests
-        self.find_input.update(cx, |this, cx| {
-            this.set_disabled(status, cx);
-            this.set_loading(status, cx);
-        });
-
-        cx.notify();
-    }
-
-    fn set_cancel_handle(
-        &mut self,
-        handle: Option<smol::channel::Sender<()>>,
-        cx: &mut Context<Self>,
-    ) {
-        self.cancel_handle.update(cx, |this, cx| {
-            *this = handle;
-            cx.notify();
-        });
-    }
-
-    fn clear_search_results(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        // Reset the input state
-        if self.finding {
-            self.set_finding(false, window, cx);
-        }
-
-        // Clear all local results
-        self.local_result.update(cx, |this, cx| {
-            *this = None;
-            cx.notify();
-        });
-
-        // Clear all global results
-        self.global_result.update(cx, |this, cx| {
-            *this = None;
-            cx.notify();
-        });
-    }
-
-    fn filter(&self, kind: &RoomKind, cx: &Context<Self>) -> bool {
-        self.active_filter.read(cx) == kind
-    }
-
-    fn set_filter(&mut self, kind: RoomKind, cx: &mut Context<Self>) {
-        self.indicator.update(cx, |this, cx| {
-            *this = None;
-            cx.notify();
-        });
-        self.active_filter.update(cx, |this, cx| {
-            *this = kind;
-            cx.notify();
-        });
-    }
-
-    fn open_room(&mut self, id: u64, window: &mut Window, cx: &mut Context<Self>) {
-        let room = if let Some(room) = Registry::read_global(cx).room(&id, cx) {
-            room
-        } else {
-            let Some(result) = self.global_result.read(cx).as_ref() else {
-                window.push_notification(t!("common.room_error"), cx);
-                return;
-            };
-
-            let Some(room) = result.iter().find(|this| this.read(cx).id == id).cloned() else {
-                window.push_notification(t!("common.room_error"), cx);
-                return;
-            };
-
-            // Clear all search results
-            self.clear_search_results(window, cx);
-
-            room
-        };
-
-        Registry::global(cx).update(cx, |this, cx| {
-            this.push_room(room, cx);
-        });
-    }
-
-    fn on_reload(&mut self, _ev: &Reload, window: &mut Window, cx: &mut Context<Self>) {
-        Registry::global(cx).update(cx, |this, cx| {
-            this.load_rooms(window, cx);
-        });
-        window.push_notification(t!("common.refreshed"), cx);
-    }
-
-    fn on_manage(&mut self, _ev: &RelayStatus, window: &mut Window, cx: &mut Context<Self>) {
-        let task: Task<Result<Vec<Relay>, Error>> = cx.background_spawn(async move {
-            let client = nostr_client();
-            let app_state = app_state();
-            let subscription = client.subscription(&app_state.gift_wrap_sub_id).await;
-            let mut relays: Vec<Relay> = vec![];
-
-            for (url, _filter) in subscription.into_iter() {
-                relays.push(client.pool().relay(url).await?);
-            }
-
-            Ok(relays)
-        });
-
-        cx.spawn_in(window, async move |this, cx| {
-            if let Ok(relays) = task.await {
-                this.update_in(cx, |this, window, cx| {
-                    this.manage_relays(relays, window, cx);
-                })
-                .ok();
-            }
-        })
-        .detach();
-    }
-
-    fn manage_relays(&mut self, relays: Vec<Relay>, window: &mut Window, cx: &mut Context<Self>) {
-        window.open_modal(cx, move |this, _window, cx| {
-            this.show_close(true)
-                .overlay_closable(true)
-                .keyboard(true)
-                .title(shared_t!("manage_relays.modal"))
-                .child(v_flex().pb_4().gap_2().children({
-                    let mut items = Vec::with_capacity(relays.len());
-
-                    for relay in relays.clone().into_iter() {
-                        let url = relay.url().to_string();
-                        let time = relay.stats().connected_at().to_ago();
-                        let connected = relay.is_connected();
-
-                        items.push(
-                            h_flex()
-                                .h_8()
-                                .px_2()
-                                .justify_between()
-                                .text_xs()
-                                .bg(cx.theme().elevated_surface_background)
-                                .rounded(cx.theme().radius)
-                                .child(
-                                    h_flex()
-                                        .gap_1()
-                                        .font_semibold()
-                                        .child(
-                                            Icon::new(IconName::Signal)
-                                                .small()
-                                                .text_color(cx.theme().danger_active)
-                                                .when(connected, |this| {
-                                                    this.text_color(gpui::green().alpha(0.75))
-                                                }),
-                                        )
-                                        .child(url),
-                                )
-                                .child(
-                                    div()
-                                        .text_right()
-                                        .text_color(cx.theme().text_muted)
-                                        .child(shared_t!("manage_relays.time", t = time)),
-                                ),
-                        );
-                    }
-
-                    items
-                }))
-        });
-    }
-
-    fn list_items(
-        &self,
-        rooms: &[Entity<Room>],
-        range: Range<usize>,
-        cx: &Context<Self>,
-    ) -> Vec<impl IntoElement> {
-        let proxy = AppSettings::get_proxy_user_avatars(cx);
-        let mut items = Vec::with_capacity(range.end - range.start);
-
-        for ix in range {
-            if let Some(room) = rooms.get(ix) {
-                let this = room.read(cx);
-                let room_id = this.id;
-                let handler = cx.listener({
-                    move |this, _, window, cx| {
-                        this.open_room(room_id, window, cx);
-                    }
-                });
-
-                items.push(
-                    RoomListItem::new(ix)
-                        .room_id(room_id)
-                        .name(this.display_name(cx))
-                        .avatar(this.display_image(proxy, cx))
-                        .created_at(this.created_at.to_ago())
-                        .public_key(this.members[0])
-                        .kind(this.kind)
-                        .on_click(handler),
-                )
-            } else {
-                items.push(RoomListItem::new(ix));
-            }
-        }
-
-        items
-    }
-}
-
-impl Panel for Sidebar {
-    fn panel_id(&self) -> SharedString {
-        self.name.clone()
-    }
-
-    fn title(&self, _cx: &App) -> AnyElement {
-        self.name.clone().into_any_element()
-    }
-
-    fn popup_menu(&self, menu: PopupMenu, _cx: &App) -> PopupMenu {
-        menu.track_focus(&self.focus_handle)
-    }
-
-    fn toolbar_buttons(&self, _window: &Window, _cx: &App) -> Vec<Button> {
-        vec![]
-    }
-}
-
-impl EventEmitter<PanelEvent> for Sidebar {}
-
-impl Focusable for Sidebar {
-    fn focus_handle(&self, _: &App) -> gpui::FocusHandle {
-        self.focus_handle.clone()
-    }
-}
-
-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() {
-            results.to_owned()
-        } else if let Some(results) = self.global_result.read(cx).as_ref() {
-            results.to_owned()
-        } else {
-            #[allow(clippy::collapsible_else_if)]
-            if self.active_filter.read(cx) == &RoomKind::Ongoing {
-                registry.ongoing_rooms(cx)
-            } else {
-                registry.request_rooms(cx)
-            }
-        };
-
-        // Get total rooms count
-        let mut total_rooms = rooms.len();
-
-        // Add 3 dummy rooms to display as skeletons
-        if loading {
-            total_rooms += 3
-        }
-
-        v_flex()
-            .on_action(cx.listener(Self::on_reload))
-            .on_action(cx.listener(Self::on_manage))
-            .image_cache(self.image_cache.clone())
-            .size_full()
-            .relative()
-            .gap_3()
-            // Search Input
-            .child(
-                div()
-                    .relative()
-                    .mt_3()
-                    .px_2p5()
-                    .w_full()
-                    .h_7()
-                    .flex_none()
-                    .flex()
-                    .child(
-                        TextInput::new(&self.find_input)
-                            .small()
-                            .cleanable()
-                            .appearance(true)
-                            .text_xs()
-                            .suffix(
-                                Button::new("find")
-                                    .icon(IconName::Search)
-                                    .tooltip(t!("sidebar.search_tooltip"))
-                                    .transparent()
-                                    .small(),
-                            ),
-                    ),
-            )
-            // Chat Rooms
-            .child(
-                v_flex()
-                    .gap_1()
-                    .flex_1()
-                    .px_1p5()
-                    .w_full()
-                    .overflow_y_hidden()
-                    .child(
-                        div()
-                            .px_1()
-                            .h_flex()
-                            .gap_2()
-                            .flex_none()
-                            .child(
-                                Button::new("all")
-                                    .label(t!("sidebar.all_button"))
-                                    .tooltip(t!("sidebar.all_conversations_tooltip"))
-                                    .when_some(self.indicator.read(cx).as_ref(), |this, kind| {
-                                        this.when(kind == &RoomKind::Ongoing, |this| {
-                                            this.child(deferred(
-                                                div().size_1().rounded_full().bg(cx.theme().cursor),
-                                            ))
-                                        })
-                                    })
-                                    .small()
-                                    .cta()
-                                    .bold()
-                                    .secondary()
-                                    .rounded()
-                                    .selected(self.filter(&RoomKind::Ongoing, cx))
-                                    .on_click(cx.listener(|this, _, _, cx| {
-                                        this.set_filter(RoomKind::Ongoing, cx);
-                                    })),
-                            )
-                            .child(
-                                Button::new("requests")
-                                    .label(t!("sidebar.requests_button"))
-                                    .tooltip(t!("sidebar.requests_tooltip"))
-                                    .when_some(self.indicator.read(cx).as_ref(), |this, kind| {
-                                        this.when(kind != &RoomKind::Ongoing, |this| {
-                                            this.child(deferred(
-                                                div().size_1().rounded_full().bg(cx.theme().cursor),
-                                            ))
-                                        })
-                                    })
-                                    .small()
-                                    .cta()
-                                    .bold()
-                                    .secondary()
-                                    .rounded()
-                                    .selected(!self.filter(&RoomKind::Ongoing, cx))
-                                    .on_click(cx.listener(|this, _, _, cx| {
-                                        this.set_filter(RoomKind::default(), cx);
-                                    })),
-                            )
-                            .child(
-                                h_flex()
-                                    .flex_1()
-                                    .w_full()
-                                    .justify_end()
-                                    .items_center()
-                                    .text_xs()
-                                    .child(
-                                        Button::new("option")
-                                            .icon(IconName::Ellipsis)
-                                            .xsmall()
-                                            .ghost()
-                                            .rounded()
-                                            .popup_menu(move |this, _window, _cx| {
-                                                this.menu(
-                                                    t!("sidebar.reload_menu"),
-                                                    Box::new(Reload),
-                                                )
-                                                .menu(
-                                                    t!("sidebar.status_menu"),
-                                                    Box::new(RelayStatus),
-                                                )
-                                            }),
-                                    ),
-                            ),
-                    )
-                    .when(!loading && total_rooms == 0, |this| {
-                        this.map(|this| {
-                            if self.filter(&RoomKind::Ongoing, cx) {
-                                this.child(deferred(
-                                    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(deferred(
-                                    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",
-                            total_rooms,
-                            cx.processor(move |this, range, _window, cx| {
-                                this.list_items(&rooms, range, cx)
-                            }),
-                        )
-                        .h_full(),
-                    ),
-            )
-    }
-}

crates/coop/src/views/startup.rs

@@ -0,0 +1,319 @@
+use std::time::Duration;
+
+use common::BUNKER_TIMEOUT;
+use gpui::prelude::FluentBuilder;
+use gpui::{
+    div, relative, rems, svg, AnyElement, App, AppContext, Context, Entity, EventEmitter,
+    FocusHandle, Focusable, InteractiveElement, IntoElement, ParentElement, Render,
+    RetainAllImageCache, SharedString, StatefulInteractiveElement, Styled, Subscription, Task,
+    Window,
+};
+use key_store::{Credential, KeyItem, KeyStore};
+use nostr_connect::prelude::*;
+use person::PersonRegistry;
+use smallvec::{smallvec, SmallVec};
+use state::NostrRegistry;
+use theme::ActiveTheme;
+use ui::avatar::Avatar;
+use ui::button::{Button, ButtonVariants};
+use ui::dock_area::panel::{Panel, PanelEvent};
+use ui::indicator::Indicator;
+use ui::{h_flex, v_flex, ContextModal, Sizable, StyledExt};
+
+use crate::actions::{reset, CoopAuthUrlHandler};
+
+pub fn init(cre: Credential, window: &mut Window, cx: &mut App) -> Entity<Startup> {
+    cx.new(|cx| Startup::new(cre, window, cx))
+}
+
+/// Startup
+#[derive(Debug)]
+pub struct Startup {
+    name: SharedString,
+    focus_handle: FocusHandle,
+
+    /// Local user credentials
+    credential: Credential,
+
+    /// Whether the loadng is in progress
+    loading: bool,
+
+    /// Image cache
+    image_cache: Entity<RetainAllImageCache>,
+
+    /// Event subscriptions
+    _subscriptions: SmallVec<[Subscription; 1]>,
+
+    /// Background tasks
+    _tasks: SmallVec<[Task<()>; 1]>,
+}
+
+impl Startup {
+    fn new(credential: Credential, window: &mut Window, cx: &mut Context<Self>) -> Self {
+        let tasks = smallvec![];
+        let mut subscriptions = smallvec![];
+
+        subscriptions.push(
+            // Clear the local state when user closes the account panel
+            cx.on_release_in(window, move |this, window, cx| {
+                this.image_cache.update(cx, |this, cx| {
+                    this.clear(window, cx);
+                });
+            }),
+        );
+
+        Self {
+            credential,
+            loading: false,
+            name: "Onboarding".into(),
+            focus_handle: cx.focus_handle(),
+            image_cache: RetainAllImageCache::new(cx),
+            _subscriptions: subscriptions,
+            _tasks: tasks,
+        }
+    }
+
+    fn login(&mut self, window: &mut Window, cx: &mut Context<Self>) {
+        self.set_loading(true, cx);
+
+        let secret = self.credential.secret();
+
+        // Try to login with bunker
+        if secret.starts_with("bunker://") {
+            match NostrConnectUri::parse(secret) {
+                Ok(uri) => {
+                    self.login_with_bunker(uri, window, cx);
+                }
+                Err(e) => {
+                    window.push_notification(e.to_string(), cx);
+                    self.set_loading(false, cx);
+                }
+            }
+            return;
+        };
+
+        // Fall back to login with keys
+        match SecretKey::parse(secret) {
+            Ok(secret) => {
+                self.login_with_keys(secret, cx);
+            }
+            Err(e) => {
+                window.push_notification(e.to_string(), cx);
+                self.set_loading(false, cx);
+            }
+        }
+    }
+
+    fn login_with_bunker(
+        &mut self,
+        uri: NostrConnectUri,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) {
+        let nostr = NostrRegistry::global(cx);
+        let client = nostr.read(cx).client();
+        let keystore = KeyStore::global(cx).read(cx).backend();
+
+        // Handle connection in the background
+        cx.spawn_in(window, async move |this, cx| {
+            let result = keystore
+                .read_credentials(&KeyItem::Bunker.to_string(), cx)
+                .await;
+
+            this.update_in(cx, |this, window, cx| {
+                match result {
+                    Ok(Some((_, content))) => {
+                        let secret = SecretKey::from_slice(&content).unwrap();
+                        let keys = Keys::new(secret);
+                        let timeout = Duration::from_secs(BUNKER_TIMEOUT);
+                        let mut signer = NostrConnect::new(uri, keys, timeout, None).unwrap();
+
+                        // Handle auth url with the default browser
+                        signer.auth_url_handler(CoopAuthUrlHandler);
+
+                        // Connect to the remote signer
+                        this._tasks.push(
+                            // Handle connection in the background
+                            cx.spawn_in(window, async move |this, cx| {
+                                match signer.bunker_uri().await {
+                                    Ok(_) => {
+                                        client.set_signer(signer).await;
+                                    }
+                                    Err(e) => {
+                                        this.update_in(cx, |this, window, cx| {
+                                            window.push_notification(e.to_string(), cx);
+                                            this.set_loading(false, cx);
+                                        })
+                                        .ok();
+                                    }
+                                }
+                            }),
+                        )
+                    }
+                    Ok(None) => {
+                        window.push_notification(
+                            "You must allow Coop access to the keyring to continue.",
+                            cx,
+                        );
+                        this.set_loading(false, cx);
+                    }
+                    Err(e) => {
+                        window.push_notification(e.to_string(), cx);
+                        this.set_loading(false, cx);
+                    }
+                };
+            })
+            .ok();
+        })
+        .detach();
+    }
+
+    fn login_with_keys(&mut self, secret: SecretKey, cx: &mut Context<Self>) {
+        let keys = Keys::new(secret);
+        let nostr = NostrRegistry::global(cx);
+
+        nostr.update(cx, |this, cx| {
+            this.set_signer(keys, cx);
+        })
+    }
+
+    fn set_loading(&mut self, status: bool, cx: &mut Context<Self>) {
+        self.loading = status;
+        cx.notify();
+    }
+}
+
+impl Panel for Startup {
+    fn panel_id(&self) -> SharedString {
+        self.name.clone()
+    }
+
+    fn title(&self, _cx: &App) -> AnyElement {
+        self.name.clone().into_any_element()
+    }
+}
+
+impl EventEmitter<PanelEvent> for Startup {}
+
+impl Focusable for Startup {
+    fn focus_handle(&self, _: &App) -> gpui::FocusHandle {
+        self.focus_handle.clone()
+    }
+}
+
+impl Render for Startup {
+    fn render(&mut self, _window: &mut gpui::Window, cx: &mut Context<Self>) -> impl IntoElement {
+        let persons = PersonRegistry::global(cx);
+        let bunker = self.credential.secret().starts_with("bunker://");
+        let profile = persons.read(cx).get(&self.credential.public_key(), cx);
+
+        v_flex()
+            .image_cache(self.image_cache.clone())
+            .relative()
+            .size_full()
+            .gap_10()
+            .items_center()
+            .justify_center()
+            .child(
+                v_flex()
+                    .items_center()
+                    .justify_center()
+                    .gap_4()
+                    .child(
+                        svg()
+                            .path("brand/coop.svg")
+                            .size_16()
+                            .text_color(cx.theme().elevated_surface_background),
+                    )
+                    .child(
+                        div()
+                            .text_center()
+                            .child(
+                                div()
+                                    .text_xl()
+                                    .font_semibold()
+                                    .line_height(relative(1.3))
+                                    .child(SharedString::from("Welcome to Coop")),
+                            )
+                            .child(
+                                div()
+                                    .text_color(cx.theme().text_muted)
+                                    .child(SharedString::from(
+                                        "Chat Freely, Stay Private on Nostr.",
+                                    )),
+                            ),
+                    ),
+            )
+            .child(
+                v_flex()
+                    .gap_2()
+                    .child(
+                        div()
+                            .id("account")
+                            .h_10()
+                            .w_72()
+                            .bg(cx.theme().elevated_surface_background)
+                            .rounded(cx.theme().radius_lg)
+                            .text_sm()
+                            .when(self.loading, |this| {
+                                this.child(
+                                    div()
+                                        .size_full()
+                                        .flex()
+                                        .items_center()
+                                        .justify_center()
+                                        .child(Indicator::new().small()),
+                                )
+                            })
+                            .when(!self.loading, |this| {
+                                let avatar = profile.avatar();
+                                let name = profile.name();
+
+                                this.child(
+                                    h_flex()
+                                        .h_full()
+                                        .justify_center()
+                                        .gap_2()
+                                        .child(
+                                            h_flex()
+                                                .gap_1()
+                                                .child(Avatar::new(avatar).size(rems(1.5)))
+                                                .child(div().pb_px().font_semibold().child(name)),
+                                        )
+                                        .child(div().when(bunker, |this| {
+                                            let label = SharedString::from("Nostr Connect");
+
+                                            this.child(
+                                                div()
+                                                    .py_0p5()
+                                                    .px_2()
+                                                    .text_xs()
+                                                    .bg(cx.theme().secondary_active)
+                                                    .text_color(cx.theme().secondary_foreground)
+                                                    .rounded_full()
+                                                    .child(label),
+                                            )
+                                        })),
+                                )
+                            })
+                            .text_color(cx.theme().text)
+                            .active(|this| {
+                                this.text_color(cx.theme().element_foreground)
+                                    .bg(cx.theme().element_active)
+                            })
+                            .hover(|this| {
+                                this.text_color(cx.theme().element_foreground)
+                                    .bg(cx.theme().element_hover)
+                            })
+                            .on_click(cx.listener(move |this, _e, window, cx| {
+                                this.login(window, cx);
+                            })),
+                    )
+                    .child(Button::new("logout").label("Sign out").ghost().on_click(
+                        |_, _window, cx| {
+                            reset(cx);
+                        },
+                    )),
+            )
+    }
+}

crates/coop/src/views/welcome.rs

@@ -4,9 +4,7 @@ use gpui::{
     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};
 
 pub fn init(window: &mut Window, cx: &mut App) -> Entity<Welcome> {
@@ -50,14 +48,6 @@ impl Panel for Welcome {
             )
             .into_any_element()
     }
-
-    fn popup_menu(&self, menu: PopupMenu, _cx: &App) -> PopupMenu {
-        menu.track_focus(&self.focus_handle)
-    }
-
-    fn toolbar_buttons(&self, _window: &Window, _cx: &App) -> Vec<Button> {
-        vec![]
-    }
 }
 
 impl EventEmitter<PanelEvent> for Welcome {}
@@ -69,7 +59,7 @@ impl Focusable for Welcome {
 }
 
 impl Render for Welcome {
-    fn render(&mut self, _window: &mut gpui::Window, cx: &mut Context<Self>) -> impl IntoElement {
+    fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
         div()
             .size_full()
             .flex()

crates/device/Cargo.toml

@@ -0,0 +1,21 @@
+[package]
+name = "device"
+version.workspace = true
+edition.workspace = true
+publish.workspace = true
+
+[dependencies]
+common = { path = "../common" }
+state = { path = "../state" }
+
+gpui.workspace = true
+nostr-sdk.workspace = true
+
+anyhow.workspace = true
+itertools.workspace = true
+smallvec.workspace = true
+smol.workspace = true
+log.workspace = true
+flume.workspace = true
+serde.workspace = true
+serde_json.workspace = true

crates/device/src/device.rs

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

crates/device/src/lib.rs

@@ -0,0 +1,632 @@
+use std::collections::HashSet;
+use std::sync::Arc;
+use std::time::Duration;
+
+use anyhow::{anyhow, Context as AnyhowContext, Error};
+use common::app_name;
+pub use device::*;
+use gpui::{App, AppContext, Context, Entity, Global, Subscription, Task};
+use nostr_sdk::prelude::*;
+use smallvec::{smallvec, SmallVec};
+use state::{NostrRegistry, RelayState, GIFTWRAP_SUBSCRIPTION, TIMEOUT};
+
+mod device;
+
+const IDENTIFIER: &str = "coop:device";
+
+pub fn init(cx: &mut App) {
+    DeviceRegistry::set_global(cx.new(DeviceRegistry::new), cx);
+}
+
+struct GlobalDeviceRegistry(Entity<DeviceRegistry>);
+
+impl Global for GlobalDeviceRegistry {}
+
+/// Device Registry
+///
+/// NIP-4e: https://github.com/nostr-protocol/nips/blob/per-device-keys/4e.md
+#[derive(Debug)]
+pub struct DeviceRegistry {
+    /// Device signer
+    pub device_signer: Entity<Option<Arc<dyn NostrSigner>>>,
+
+    /// Device requests
+    requests: Entity<HashSet<Event>>,
+
+    /// Device state
+    state: DeviceState,
+
+    /// Async tasks
+    tasks: Vec<Task<Result<(), Error>>>,
+
+    /// Subscriptions
+    _subscriptions: SmallVec<[Subscription; 1]>,
+}
+
+impl DeviceRegistry {
+    /// Retrieve the global device registry state
+    pub fn global(cx: &App) -> Entity<Self> {
+        cx.global::<GlobalDeviceRegistry>().0.clone()
+    }
+
+    /// Set the global device registry instance
+    fn set_global(state: Entity<Self>, cx: &mut App) {
+        cx.set_global(GlobalDeviceRegistry(state));
+    }
+
+    /// Create a new device registry instance
+    fn new(cx: &mut Context<Self>) -> Self {
+        let nostr = NostrRegistry::global(cx);
+        let client = nostr.read(cx).client();
+        let identity = nostr.read(cx).identity();
+
+        let device_signer = cx.new(|_| None);
+        let requests = cx.new(|_| HashSet::default());
+
+        // Channel for communication between nostr and gpui
+        let (tx, rx) = flume::bounded::<Event>(100);
+
+        let mut subscriptions = smallvec![];
+        let mut tasks = vec![];
+
+        subscriptions.push(
+            // Observe the identity entity
+            cx.observe(&identity, |this, state, cx| {
+                if state.read(cx).has_public_key() {
+                    if state.read(cx).relay_list_state() == RelayState::Set {
+                        this.get_announcement(cx);
+                    }
+                    if state.read(cx).messaging_relays_state() == RelayState::Set {
+                        this.get_messages(cx);
+                    }
+                }
+            }),
+        );
+
+        tasks.push(
+            // Handle nostr notifications
+            cx.background_spawn(async move { Self::handle_notifications(&client, &tx).await }),
+        );
+
+        tasks.push(
+            // Update GPUI states
+            cx.spawn(async move |this, cx| {
+                while let Ok(event) = rx.recv_async().await {
+                    match event.kind {
+                        Kind::Custom(4454) => {
+                            this.update(cx, |this, cx| {
+                                this.add_request(event, cx);
+                            })?;
+                        }
+                        Kind::Custom(4455) => {
+                            this.update(cx, |this, cx| {
+                                this.parse_response(event, cx);
+                            })?;
+                        }
+                        _ => {}
+                    }
+                }
+
+                Ok(())
+            }),
+        );
+
+        Self {
+            device_signer,
+            requests,
+            state: DeviceState::default(),
+            tasks,
+            _subscriptions: subscriptions,
+        }
+    }
+
+    /// Handle nostr notifications
+    async fn handle_notifications(client: &Client, tx: &flume::Sender<Event>) -> Result<(), Error> {
+        let mut notifications = client.notifications();
+        let mut processed_events = HashSet::new();
+
+        while let Ok(notification) = notifications.recv().await {
+            if let RelayPoolNotification::Message {
+                message: RelayMessage::Event { event, .. },
+                ..
+            } = notification
+            {
+                if !processed_events.insert(event.id) {
+                    // Skip if the event has already been processed
+                    continue;
+                }
+
+                match event.kind {
+                    Kind::Custom(4454) => {
+                        if Self::verify_author(client, event.as_ref()).await {
+                            tx.send_async(event.into_owned()).await.ok();
+                        }
+                    }
+                    Kind::Custom(4455) => {
+                        if Self::verify_author(client, event.as_ref()).await {
+                            tx.send_async(event.into_owned()).await.ok();
+                        }
+                    }
+                    _ => {}
+                }
+            }
+        }
+
+        Ok(())
+    }
+
+    /// Verify the author of an event
+    async fn verify_author(client: &Client, event: &Event) -> bool {
+        if let Ok(signer) = client.signer().await {
+            if let Ok(public_key) = signer.get_public_key().await {
+                return public_key == event.pubkey;
+            }
+        }
+        false
+    }
+
+    /// Encrypt and store device keys in the local database.
+    async fn set_keys(client: &Client, secret: &str) -> Result<(), Error> {
+        let signer = client.signer().await?;
+        let public_key = signer.get_public_key().await?;
+
+        // Encrypt the value
+        let content = signer.nip44_encrypt(&public_key, secret).await?;
+
+        // Construct the application data event
+        let event = EventBuilder::new(Kind::ApplicationSpecificData, content)
+            .tag(Tag::identifier(IDENTIFIER))
+            .build(public_key)
+            .sign(&Keys::generate())
+            .await?;
+
+        // Save the event to the database
+        client.database().save_event(&event).await?;
+
+        Ok(())
+    }
+
+    /// Get device keys from the local database.
+    async fn get_keys(client: &Client) -> Result<Keys, Error> {
+        let signer = client.signer().await?;
+        let public_key = signer.get_public_key().await?;
+
+        let filter = Filter::new()
+            .kind(Kind::ApplicationSpecificData)
+            .identifier(IDENTIFIER);
+
+        if let Some(event) = client.database().query(filter).await?.first() {
+            let content = signer.nip44_decrypt(&public_key, &event.content).await?;
+            let secret = SecretKey::parse(&content)?;
+            let keys = Keys::new(secret);
+
+            Ok(keys)
+        } else {
+            Err(anyhow!("Key not found"))
+        }
+    }
+
+    /// Returns the device signer entity
+    pub fn signer(&self, cx: &App) -> Option<Arc<dyn NostrSigner>> {
+        self.device_signer.read(cx).clone()
+    }
+
+    /// Set the decoupled encryption key for the current user
+    fn set_device_signer<S>(&mut self, signer: S, cx: &mut Context<Self>)
+    where
+        S: NostrSigner + 'static,
+    {
+        self.set_state(DeviceState::Set, cx);
+        self.device_signer.update(cx, |this, cx| {
+            *this = Some(Arc::new(signer));
+            cx.notify();
+        });
+    }
+
+    /// Set the device state
+    fn set_state(&mut self, state: DeviceState, cx: &mut Context<Self>) {
+        self.state = state;
+        cx.notify();
+    }
+
+    /// Add a request for device keys
+    fn add_request(&mut self, request: Event, cx: &mut Context<Self>) {
+        self.requests.update(cx, |this, cx| {
+            this.insert(request);
+            cx.notify();
+        });
+    }
+
+    /// Continuously get gift wrap events for the current user in their messaging relays
+    fn get_messages(&mut self, cx: &mut Context<Self>) {
+        let nostr = NostrRegistry::global(cx);
+        let client = nostr.read(cx).client();
+        let device_signer = self.device_signer.read(cx).clone();
+
+        let public_key = nostr.read(cx).identity().read(cx).public_key();
+        let messaging_relays = nostr.read(cx).messaging_relays(&public_key, cx);
+
+        cx.background_spawn(async move {
+            let urls = messaging_relays.await;
+            let id = SubscriptionId::new(GIFTWRAP_SUBSCRIPTION);
+            let mut filters = vec![];
+
+            // Construct a filter to get user messages
+            filters.push(Filter::new().kind(Kind::GiftWrap).pubkey(public_key));
+
+            // Construct a filter to get dekey messages if available
+            if let Some(signer) = device_signer.as_ref() {
+                if let Ok(pubkey) = signer.get_public_key().await {
+                    filters.push(Filter::new().kind(Kind::GiftWrap).pubkey(pubkey));
+                }
+            }
+
+            if let Err(e) = client.subscribe_with_id_to(urls, id, filters, None).await {
+                log::error!("Failed to subscribe to gift wrap events: {e}");
+            }
+        })
+        .detach();
+    }
+
+    /// Get device announcement for current user
+    fn get_announcement(&mut self, cx: &mut Context<Self>) {
+        let nostr = NostrRegistry::global(cx);
+        let client = nostr.read(cx).client();
+
+        let public_key = nostr.read(cx).identity().read(cx).public_key();
+        let write_relays = nostr.read(cx).write_relays(&public_key, cx);
+
+        let task: Task<Result<Event, Error>> = cx.background_spawn(async move {
+            let urls = write_relays.await;
+
+            // Construct the filter for the device announcement event
+            let filter = Filter::new()
+                .kind(Kind::Custom(10044))
+                .author(public_key)
+                .limit(1);
+
+            let mut stream = client
+                .stream_events_from(&urls, vec![filter], Duration::from_secs(TIMEOUT))
+                .await?;
+
+            while let Some((_url, res)) = stream.next().await {
+                match res {
+                    Ok(event) => {
+                        log::info!("Received device announcement event: {event:?}");
+                        return Ok(event);
+                    }
+                    Err(e) => {
+                        log::error!("Failed to receive device announcement event: {e}");
+                    }
+                }
+            }
+
+            Err(anyhow!("Device announcement not found"))
+        });
+
+        self.tasks.push(cx.spawn(async move |this, cx| {
+            match task.await {
+                Ok(event) => {
+                    this.update(cx, |this, cx| {
+                        this.init_device_signer(&event, cx);
+                    })?;
+                }
+                Err(_) => {
+                    this.update(cx, |this, cx| {
+                        this.announce_device(cx);
+                    })?;
+                }
+            }
+
+            Ok(())
+        }));
+    }
+
+    /// Create a new device signer and announce it
+    fn announce_device(&mut self, cx: &mut Context<Self>) {
+        let nostr = NostrRegistry::global(cx);
+        let client = nostr.read(cx).client();
+
+        let public_key = nostr.read(cx).identity().read(cx).public_key();
+        let write_relays = nostr.read(cx).write_relays(&public_key, cx);
+
+        let keys = Keys::generate();
+        let secret = keys.secret_key().to_secret_hex();
+        let n = keys.public_key();
+
+        let task: Task<Result<(), Error>> = cx.background_spawn(async move {
+            let signer = client.signer().await?;
+            let urls = write_relays.await;
+
+            // Construct an announcement event
+            let event = EventBuilder::new(Kind::Custom(10044), "")
+                .tags(vec![
+                    Tag::custom(TagKind::custom("n"), vec![n]),
+                    Tag::client(app_name()),
+                ])
+                .sign(&signer)
+                .await?;
+
+            // Publish announcement
+            client.send_event_to(&urls, &event).await?;
+
+            // Save device keys to the database
+            Self::set_keys(&client, &secret).await?;
+
+            Ok(())
+        });
+
+        cx.spawn(async move |this, cx| {
+            if task.await.is_ok() {
+                this.update(cx, |this, cx| {
+                    this.set_device_signer(keys, cx);
+                    this.listen_device_request(cx);
+                })
+                .ok();
+            }
+        })
+        .detach();
+    }
+
+    /// Initialize device signer (decoupled encryption key) for the current user
+    fn init_device_signer(&mut self, event: &Event, cx: &mut Context<Self>) {
+        let nostr = NostrRegistry::global(cx);
+        let client = nostr.read(cx).client();
+
+        let announcement = Announcement::from(event);
+        let device_pubkey = announcement.public_key();
+
+        let task: Task<Result<Keys, Error>> = cx.background_spawn(async move {
+            if let Ok(keys) = Self::get_keys(&client).await {
+                if keys.public_key() != device_pubkey {
+                    return Err(anyhow!("Key mismatch"));
+                };
+
+                Ok(keys)
+            } else {
+                Err(anyhow!("Key not found"))
+            }
+        });
+
+        cx.spawn(async move |this, cx| {
+            match task.await {
+                Ok(keys) => {
+                    this.update(cx, |this, cx| {
+                        this.set_device_signer(keys, cx);
+                        this.listen_device_request(cx);
+                    })
+                    .ok();
+                }
+                Err(e) => {
+                    this.update(cx, |this, cx| {
+                        this.request_device_keys(cx);
+                        this.listen_device_approval(cx);
+                    })
+                    .ok();
+
+                    log::warn!("Failed to initialize device signer: {e}");
+                }
+            };
+        })
+        .detach();
+    }
+
+    /// Listen for device key requests on user's write relays
+    fn listen_device_request(&mut self, cx: &mut Context<Self>) {
+        let nostr = NostrRegistry::global(cx);
+        let client = nostr.read(cx).client();
+
+        let public_key = nostr.read(cx).identity().read(cx).public_key();
+        let write_relays = nostr.read(cx).write_relays(&public_key, cx);
+
+        let task: Task<Result<(), Error>> = cx.background_spawn(async move {
+            let urls = write_relays.await;
+
+            // Construct a filter for device key requests
+            let filter = Filter::new()
+                .kind(Kind::Custom(4454))
+                .author(public_key)
+                .since(Timestamp::now());
+
+            // Subscribe to the device key requests on user's write relays
+            client.subscribe_to(&urls, vec![filter], None).await?;
+
+            Ok(())
+        });
+
+        task.detach();
+    }
+
+    /// Listen for device key approvals on user's write relays
+    fn listen_device_approval(&mut self, cx: &mut Context<Self>) {
+        let nostr = NostrRegistry::global(cx);
+        let client = nostr.read(cx).client();
+
+        let public_key = nostr.read(cx).identity().read(cx).public_key();
+        let write_relays = nostr.read(cx).write_relays(&public_key, cx);
+
+        let task: Task<Result<(), Error>> = cx.background_spawn(async move {
+            let urls = write_relays.await;
+
+            // Construct a filter for device key requests
+            let filter = Filter::new()
+                .kind(Kind::Custom(4455))
+                .author(public_key)
+                .since(Timestamp::now());
+
+            // Subscribe to the device key requests on user's write relays
+            client.subscribe_to(&urls, vec![filter], None).await?;
+
+            Ok(())
+        });
+
+        task.detach();
+    }
+
+    /// Request encryption keys from other device
+    fn request_device_keys(&mut self, cx: &mut Context<Self>) {
+        let nostr = NostrRegistry::global(cx);
+        let client = nostr.read(cx).client();
+
+        let public_key = nostr.read(cx).identity().read(cx).public_key();
+        let write_relays = nostr.read(cx).write_relays(&public_key, cx);
+
+        let app_keys = nostr.read(cx).app_keys().clone();
+        let app_pubkey = app_keys.public_key();
+
+        let task: Task<Result<Option<Keys>, Error>> = cx.background_spawn(async move {
+            let signer = client.signer().await?;
+            let public_key = signer.get_public_key().await?;
+
+            let filter = Filter::new()
+                .kind(Kind::Custom(4455))
+                .author(public_key)
+                .pubkey(app_pubkey)
+                .limit(1);
+
+            match client.database().query(filter).await?.first_owned() {
+                Some(event) => {
+                    let root_device = event
+                        .tags
+                        .find(TagKind::custom("P"))
+                        .and_then(|tag| tag.content())
+                        .and_then(|content| PublicKey::parse(content).ok())
+                        .context("Invalid event's tags")?;
+
+                    let payload = event.content.as_str();
+                    let decrypted = app_keys.nip44_decrypt(&root_device, payload).await?;
+
+                    let secret = SecretKey::from_hex(&decrypted)?;
+                    let keys = Keys::new(secret);
+
+                    Ok(Some(keys))
+                }
+                None => {
+                    let urls = write_relays.await;
+
+                    // Construct an event for device key request
+                    let event = EventBuilder::new(Kind::Custom(4454), "")
+                        .tags(vec![
+                            Tag::client(app_name()),
+                            Tag::custom(TagKind::custom("P"), vec![app_pubkey]),
+                        ])
+                        .sign(&signer)
+                        .await?;
+
+                    // Send the event to write relays
+                    client.send_event_to(&urls, &event).await?;
+
+                    Ok(None)
+                }
+            }
+        });
+
+        cx.spawn(async move |this, cx| {
+            match task.await {
+                Ok(Some(keys)) => {
+                    this.update(cx, |this, cx| {
+                        this.set_device_signer(keys, cx);
+                    })
+                    .ok();
+                }
+                Ok(None) => {
+                    this.update(cx, |this, cx| {
+                        this.set_state(DeviceState::Requesting, cx);
+                    })
+                    .ok();
+                }
+                Err(e) => {
+                    log::error!("Failed to request the encryption key: {e}");
+                }
+            };
+        })
+        .detach();
+    }
+
+    /// Parse the response event for device keys from other devices
+    fn parse_response(&mut self, event: Event, cx: &mut Context<Self>) {
+        let nostr = NostrRegistry::global(cx);
+        let app_keys = nostr.read(cx).app_keys().clone();
+
+        let task: Task<Result<Keys, Error>> = cx.background_spawn(async move {
+            let root_device = event
+                .tags
+                .find(TagKind::custom("P"))
+                .and_then(|tag| tag.content())
+                .and_then(|content| PublicKey::parse(content).ok())
+                .context("Invalid event's tags")?;
+
+            let payload = event.content.as_str();
+            let decrypted = app_keys.nip44_decrypt(&root_device, payload).await?;
+
+            let secret = SecretKey::from_hex(&decrypted)?;
+            let keys = Keys::new(secret);
+
+            Ok(keys)
+        });
+
+        cx.spawn(async move |this, cx| {
+            match task.await {
+                Ok(keys) => {
+                    this.update(cx, |this, cx| {
+                        this.set_device_signer(keys, cx);
+                    })
+                    .ok();
+                }
+                Err(e) => {
+                    log::error!("Error: {e}")
+                }
+            };
+        })
+        .detach();
+    }
+
+    /// Approve requests for device keys from other devices
+    #[allow(dead_code)]
+    fn approve(&mut self, event: Event, cx: &mut Context<Self>) {
+        let nostr = NostrRegistry::global(cx);
+        let client = nostr.read(cx).client();
+
+        let public_key = nostr.read(cx).identity().read(cx).public_key();
+        let write_relays = nostr.read(cx).write_relays(&public_key, cx);
+
+        let task: Task<Result<(), Error>> = cx.background_spawn(async move {
+            let urls = write_relays.await;
+            let signer = client.signer().await?;
+
+            // Get device keys
+            let keys = Self::get_keys(&client).await?;
+            let secret = keys.secret_key().to_secret_hex();
+
+            // Extract the target public key from the event tags
+            let target = event
+                .tags
+                .find(TagKind::custom("P"))
+                .and_then(|tag| tag.content())
+                .and_then(|content| PublicKey::parse(content).ok())
+                .context("Target is not a valid public key")?;
+
+            // Encrypt the device keys with the user's signer
+            let payload = signer.nip44_encrypt(&target, &secret).await?;
+
+            // Construct the response event
+            //
+            // P tag: the current device's public key
+            // p tag: the requester's public key
+            let event = EventBuilder::new(Kind::Custom(4455), payload)
+                .tags(vec![
+                    Tag::custom(TagKind::custom("P"), vec![keys.public_key()]),
+                    Tag::public_key(target),
+                ])
+                .sign(&signer)
+                .await?;
+
+            // Send the response event to the user's relay list
+            client.send_event_to(&urls, &event).await?;
+
+            Ok(())
+        });
+
+        task.detach();
+    }
+}

crates/global/src/constants.rs

@@ -1,61 +0,0 @@
-pub const APP_NAME: &str = "Coop";
-pub const APP_ID: &str = "su.reya.coop";
-pub const APP_PUBKEY: &str = "dW50cnVzdGVkIGNvbW1lbnQ6IG1pbmlzaWduIHB1YmxpYyBrZXk6IDc4MkNFRkQ2RkVGQURGNzUKUldSMTMvcisxdThzZUZraHc4Vno3NVNJek81VkJFUEV3MkJweGFxQXhpekdSU1JIekpqMG4yemMK";
-pub const APP_UPDATER_ENDPOINT: &str = "https://coop-updater.reya.su/";
-pub const KEYRING_URL: &str = "Coop Safe Storage";
-
-pub const ACCOUNT_IDENTIFIER: &str = "coop:user";
-pub const SETTINGS_IDENTIFIER: &str = "coop:settings";
-
-/// Bootstrap Relays.
-pub const BOOTSTRAP_RELAYS: [&str; 5] = [
-    "wss://relay.damus.io",
-    "wss://relay.primal.net",
-    "wss://relay.nos.social",
-    "wss://user.kindpag.es",
-    "wss://purplepag.es",
-];
-
-/// Search Relays.
-pub const SEARCH_RELAYS: [&str; 1] = ["wss://relay.nostr.band"];
-
-/// NIP65 Relays. Used for new account
-pub const NIP65_RELAYS: [&str; 4] = [
-    "wss://relay.damus.io",
-    "wss://relay.primal.net",
-    "wss://relay.nostr.net",
-    "wss://nos.lol",
-];
-
-/// Messaging Relays. Used for new account
-pub const NIP17_RELAYS: [&str; 2] = ["wss://nip17.com", "wss://auth.nostr1.com"];
-
-/// Default relay for Nostr Connect
-pub const NOSTR_CONNECT_RELAY: &str = "wss://relay.nsec.app";
-
-/// Default retry count for fetching NIP-17 relays
-pub const RELAY_RETRY: u64 = 2;
-
-/// Default retry count for sending messages
-pub const SEND_RETRY: u64 = 10;
-
-/// Default timeout (in seconds) for Nostr Connect
-pub const NOSTR_CONNECT_TIMEOUT: u64 = 200;
-
-/// Default timeout (in seconds) for Nostr Connect (Bunker)
-pub const BUNKER_TIMEOUT: u64 = 30;
-
-/// Total metadata requests will be grouped.
-pub const METADATA_BATCH_LIMIT: usize = 100;
-
-/// Maximum timeout for grouping metadata requests. (milliseconds)
-pub const METADATA_BATCH_TIMEOUT: u64 = 300;
-
-/// Default width of the sidebar.
-pub const DEFAULT_SIDEBAR_WIDTH: f32 = 240.;
-
-/// Image Resize Service
-pub const IMAGE_RESIZE_SERVICE: &str = "https://wsrv.nl";
-
-/// Default NIP96 Media Server.
-pub const NIP96_SERVER: &str = "https://nostrmedia.com";

crates/global/src/lib.rs

@@ -1,248 +0,0 @@
-use std::collections::{HashMap, HashSet};
-use std::sync::atomic::AtomicBool;
-use std::sync::OnceLock;
-use std::time::Duration;
-
-use flume::{Receiver, Sender};
-use nostr_sdk::prelude::*;
-use paths::nostr_file;
-use smol::lock::RwLock;
-
-use crate::paths::support_dir;
-
-pub mod constants;
-pub mod paths;
-
-#[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord)]
-pub struct AuthRequest {
-    pub url: RelayUrl,
-    pub challenge: String,
-    pub sending: bool,
-}
-
-impl AuthRequest {
-    pub fn new(challenge: impl Into<String>, url: RelayUrl) -> Self {
-        Self {
-            challenge: challenge.into(),
-            sending: false,
-            url,
-        }
-    }
-}
-
-#[derive(Debug, Clone)]
-pub enum Notice {
-    RelayFailed(RelayUrl),
-    AuthFailed(RelayUrl),
-    Custom(String),
-}
-
-impl Notice {
-    pub fn as_str(&self) -> String {
-        match self {
-            Notice::AuthFailed(url) => format!("Authenticate failed for relay {url}"),
-            Notice::RelayFailed(url) => format!("Failed to connect the relay {url}"),
-            Notice::Custom(msg) => msg.into(),
-        }
-    }
-}
-
-#[derive(Debug, Clone, Default, PartialEq, Eq, PartialOrd, Ord)]
-pub enum UnwrappingStatus {
-    #[default]
-    Initialized,
-    Processing,
-    Complete,
-}
-
-/// Signals sent through the global event channel to notify UI
-#[derive(Debug)]
-pub enum SignalKind {
-    /// A signal to notify UI that the client's signer has been set
-    SignerSet(PublicKey),
-
-    /// A signal to notify UI that the client's signer has been unset
-    SignerUnset,
-
-    /// A signal to notify UI that the relay requires authentication
-    Auth(AuthRequest),
-
-    /// A signal to notify UI that the browser proxy service is down
-    ProxyDown,
-
-    /// A signal to notify UI that a new profile has been received
-    NewProfile(Profile),
-
-    /// A signal to notify UI that a new gift wrap event has been received
-    NewMessage((EventId, Event)),
-
-    /// A signal to notify UI that no DM relays for current user was found
-    RelaysNotFound,
-
-    /// A signal to notify UI that gift wrap status has changed
-    GiftWrapStatus(UnwrappingStatus),
-
-    /// 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>,
-    tx: Sender<PublicKey>,
-}
-
-impl Default for Ingester {
-    fn default() -> Self {
-        Self::new()
-    }
-}
-
-impl Ingester {
-    pub fn new() -> Self {
-        let (tx, rx) = flume::bounded::<PublicKey>(1024);
-        Self { rx, tx }
-    }
-
-    pub fn receiver(&self) -> &Receiver<PublicKey> {
-        &self.rx
-    }
-
-    pub async fn send(&self, public_key: PublicKey) {
-        if let Err(e) = self.tx.send_async(public_key).await {
-            log::error!("Failed to send public key: {e}");
-        }
-    }
-}
-
-/// A simple storage to store all states that using across the application.
-#[derive(Debug)]
-pub struct AppState {
-    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 sent_ids: RwLock<HashSet<EventId>>,
-
-    pub seen_on_relays: RwLock<HashMap<EventId, HashSet<RelayUrl>>>,
-
-    pub resent_ids: RwLock<Vec<Output<EventId>>>,
-
-    pub resend_queue: RwLock<HashMap<EventId, RelayUrl>>,
-
-    pub signal: Signal,
-
-    pub ingester: Ingester,
-}
-
-impl Default for AppState {
-    fn default() -> Self {
-        Self::new()
-    }
-}
-
-impl AppState {
-    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,
-            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),
-            sent_ids: RwLock::new(HashSet::new()),
-            seen_on_relays: RwLock::new(HashMap::new()),
-            resent_ids: RwLock::new(Vec::new()),
-            resend_queue: RwLock::new(HashMap::new()),
-        }
-    }
-}
-
-static NOSTR_CLIENT: OnceLock<Client> = OnceLock::new();
-static APP_STATE: OnceLock<AppState> = OnceLock::new();
-
-pub fn nostr_client() -> &'static Client {
-    NOSTR_CLIENT.get_or_init(|| {
-        // rustls uses the `aws_lc_rs` provider by default
-        // This only errors if the default provider has already
-        // been installed. We can ignore this `Result`.
-        rustls::crypto::aws_lc_rs::default_provider()
-            .install_default()
-            .ok();
-
-        let lmdb = NostrLMDB::open(nostr_file()).expect("Database is NOT initialized");
-
-        let opts = ClientOptions::new()
-            .gossip(true)
-            .automatic_authentication(false)
-            .verify_subscriptions(false)
-            .sleep_when_idle(SleepWhenIdle::Enabled {
-                timeout: Duration::from_secs(300),
-            });
-
-        ClientBuilder::default().database(lmdb).opts(opts).build()
-    })
-}
-
-pub fn app_state() -> &'static AppState {
-    APP_STATE.get_or_init(AppState::new)
-}
-
-fn first_run() -> bool {
-    let flag = support_dir().join(format!(".{}-first_run", env!("CARGO_PKG_VERSION")));
-
-    if !flag.exists() {
-        if std::fs::write(&flag, "").is_err() {
-            return false;
-        }
-        true // First run
-    } else {
-        false // Not first run
-    }
-}

crates/i18n/Cargo.toml

@@ -1,8 +0,0 @@
-[package]
-name = "i18n"
-version.workspace = true
-edition.workspace = true
-publish.workspace = true
-
-[dependencies]
-rust-i18n.workspace = true

crates/i18n/src/lib.rs

@@ -1,39 +0,0 @@
-use rust_i18n::Backend;
-
-rust_i18n::i18n!("../../locales");
-
-pub struct I18nBackend;
-
-impl Backend for I18nBackend {
-    fn available_locales(&self) -> Vec<&str> {
-        _RUST_I18N_BACKEND.available_locales()
-    }
-
-    fn translate(&self, locale: &str, key: &str) -> Option<&str> {
-        let val = _RUST_I18N_BACKEND.translate(locale, key);
-        if val.is_none() {
-            _RUST_I18N_BACKEND.translate("en", key)
-        } else {
-            val
-        }
-    }
-}
-
-#[macro_export]
-macro_rules! init {
-    () => {
-        rust_i18n::i18n!(backend = i18n::I18nBackend);
-    };
-}
-
-#[macro_export]
-macro_rules! shared_t {
-    ($key:expr) => {
-        SharedString::from(t!($key))
-    };
-    ($key:expr, $($param:ident = $value:expr),+) => {
-        SharedString::from(t!($key, $($param = $value),+))
-    };
-}
-
-pub use rust_i18n::{set_locale, t};

crates/key_store/Cargo.toml

@@ -0,0 +1,19 @@
+[package]
+name = "key_store"
+version.workspace = true
+edition.workspace = true
+publish.workspace = true
+
+[dependencies]
+common = { path = "../common" }
+
+gpui.workspace = true
+nostr-sdk.workspace = true
+
+anyhow.workspace = true
+smallvec.workspace = true
+smol.workspace = true
+log.workspace = true
+futures.workspace = true
+serde.workspace = true
+serde_json.workspace = true

crates/key_store/src/backend.rs

@@ -0,0 +1,211 @@
+use std::any::Any;
+use std::collections::HashMap;
+use std::fmt::Display;
+use std::future::Future;
+use std::path::PathBuf;
+use std::pin::Pin;
+
+use anyhow::Result;
+use common::config_dir;
+use futures::FutureExt as _;
+use gpui::AsyncApp;
+use nostr_sdk::prelude::*;
+
+#[derive(Debug, Clone, PartialEq, Eq, Hash)]
+pub struct Credential {
+    public_key: PublicKey,
+    secret: String,
+}
+
+impl Credential {
+    pub fn new(user: String, secret: Vec<u8>) -> Self {
+        Self {
+            public_key: PublicKey::parse(&user).unwrap(),
+            secret: String::from_utf8(secret).unwrap(),
+        }
+    }
+
+    pub fn public_key(&self) -> PublicKey {
+        self.public_key
+    }
+
+    pub fn secret(&self) -> &str {
+        &self.secret
+    }
+}
+
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
+pub enum KeyItem {
+    User,
+    Bunker,
+}
+
+impl Display for KeyItem {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        match self {
+            Self::User => write!(f, "coop-user"),
+            Self::Bunker => write!(f, "coop-bunker"),
+        }
+    }
+}
+
+impl From<KeyItem> for String {
+    fn from(item: KeyItem) -> Self {
+        item.to_string()
+    }
+}
+
+pub trait KeyBackend: Any + Send + Sync {
+    fn name(&self) -> &str;
+
+    /// Reads the credentials from the provider.
+    #[allow(clippy::type_complexity)]
+    fn read_credentials<'a>(
+        &'a self,
+        url: &'a str,
+        cx: &'a AsyncApp,
+    ) -> Pin<Box<dyn Future<Output = Result<Option<(String, Vec<u8>)>>> + 'a>>;
+
+    /// Writes the credentials to the provider.
+    fn write_credentials<'a>(
+        &'a self,
+        url: &'a str,
+        username: &'a str,
+        password: &'a [u8],
+        cx: &'a AsyncApp,
+    ) -> Pin<Box<dyn Future<Output = Result<()>> + 'a>>;
+
+    /// Deletes the credentials from the provider.
+    fn delete_credentials<'a>(
+        &'a self,
+        url: &'a str,
+        cx: &'a AsyncApp,
+    ) -> Pin<Box<dyn Future<Output = Result<()>> + 'a>>;
+}
+
+/// A credentials provider that stores credentials in the system keychain.
+pub struct KeyringProvider;
+
+impl KeyBackend for KeyringProvider {
+    fn name(&self) -> &str {
+        "keyring"
+    }
+
+    fn read_credentials<'a>(
+        &'a self,
+        url: &'a str,
+        cx: &'a AsyncApp,
+    ) -> Pin<Box<dyn Future<Output = Result<Option<(String, Vec<u8>)>>> + 'a>> {
+        async move { cx.update(|cx| cx.read_credentials(url)).await }.boxed_local()
+    }
+
+    fn write_credentials<'a>(
+        &'a self,
+        url: &'a str,
+        username: &'a str,
+        password: &'a [u8],
+        cx: &'a AsyncApp,
+    ) -> Pin<Box<dyn Future<Output = Result<()>> + 'a>> {
+        async move {
+            cx.update(move |cx| cx.write_credentials(url, username, password))
+                .await
+        }
+        .boxed_local()
+    }
+
+    fn delete_credentials<'a>(
+        &'a self,
+        url: &'a str,
+        cx: &'a AsyncApp,
+    ) -> Pin<Box<dyn Future<Output = Result<()>> + 'a>> {
+        async move { cx.update(move |cx| cx.delete_credentials(url)).await }.boxed_local()
+    }
+}
+
+/// A credentials provider that stores credentials in a local file.
+pub struct FileProvider {
+    path: PathBuf,
+}
+
+impl FileProvider {
+    pub fn new() -> Self {
+        let path = config_dir().join(".keys");
+
+        if let Some(parent) = path.parent() {
+            let _ = std::fs::create_dir_all(parent);
+        }
+
+        Self { path }
+    }
+
+    pub fn load_credentials(&self) -> Result<HashMap<String, (String, Vec<u8>)>> {
+        let json = std::fs::read(&self.path)?;
+        let credentials: HashMap<String, (String, Vec<u8>)> = serde_json::from_slice(&json)?;
+
+        Ok(credentials)
+    }
+
+    pub fn save_credentials(&self, credentials: &HashMap<String, (String, Vec<u8>)>) -> Result<()> {
+        let json = serde_json::to_string(credentials)?;
+        std::fs::write(&self.path, json)?;
+
+        Ok(())
+    }
+}
+
+impl Default for FileProvider {
+    fn default() -> Self {
+        Self::new()
+    }
+}
+
+impl KeyBackend for FileProvider {
+    fn name(&self) -> &str {
+        "file"
+    }
+
+    fn read_credentials<'a>(
+        &'a self,
+        url: &'a str,
+        _cx: &'a AsyncApp,
+    ) -> Pin<Box<dyn Future<Output = Result<Option<(String, Vec<u8>)>>> + 'a>> {
+        async move {
+            Ok(self
+                .load_credentials()
+                .unwrap_or_default()
+                .get(url)
+                .cloned())
+        }
+        .boxed_local()
+    }
+
+    fn write_credentials<'a>(
+        &'a self,
+        url: &'a str,
+        username: &'a str,
+        password: &'a [u8],
+        _cx: &'a AsyncApp,
+    ) -> Pin<Box<dyn Future<Output = Result<()>> + 'a>> {
+        async move {
+            let mut credentials = self.load_credentials().unwrap_or_default();
+            credentials.insert(url.to_string(), (username.to_string(), password.to_vec()));
+
+            self.save_credentials(&credentials)
+        }
+        .boxed_local()
+    }
+
+    fn delete_credentials<'a>(
+        &'a self,
+        url: &'a str,
+        _cx: &'a AsyncApp,
+    ) -> Pin<Box<dyn Future<Output = Result<()>> + 'a>> {
+        async move {
+            let mut credentials = self.load_credentials()?;
+            credentials.remove(url);
+
+            self.save_credentials(&credentials)
+        }
+        .boxed_local()
+    }
+}

crates/key_store/src/lib.rs

@@ -0,0 +1,94 @@
+use std::sync::{Arc, LazyLock};
+
+pub use backend::*;
+use gpui::{App, AppContext, Context, Entity, Global, Task};
+use smallvec::{smallvec, SmallVec};
+
+mod backend;
+
+static DISABLE_KEYRING: LazyLock<bool> =
+    LazyLock::new(|| std::env::var("DISABLE_KEYRING").is_ok_and(|value| !value.is_empty()));
+
+pub fn init(cx: &mut App) {
+    KeyStore::set_global(cx.new(KeyStore::new), cx);
+}
+
+struct GlobalKeyStore(Entity<KeyStore>);
+
+impl Global for GlobalKeyStore {}
+
+pub struct KeyStore {
+    /// Key Store for storing credentials
+    pub backend: Arc<dyn KeyBackend>,
+
+    /// Whether the keystore has been initialized
+    pub initialized: bool,
+
+    /// Tasks for asynchronous operations
+    _tasks: SmallVec<[Task<()>; 1]>,
+}
+
+impl KeyStore {
+    /// Retrieve the global keys state
+    pub fn global(cx: &App) -> Entity<Self> {
+        cx.global::<GlobalKeyStore>().0.clone()
+    }
+
+    /// Set the global keys instance
+    pub(crate) fn set_global(state: Entity<Self>, cx: &mut App) {
+        cx.set_global(GlobalKeyStore(state));
+    }
+
+    /// Create a new keys instance
+    pub(crate) fn new(cx: &mut Context<Self>) -> Self {
+        // Use the file system for keystore in development or when the user specifies it
+        let use_file_keystore = cfg!(debug_assertions) || *DISABLE_KEYRING;
+
+        // Construct the key backend
+        let backend: Arc<dyn KeyBackend> = if use_file_keystore {
+            Arc::new(FileProvider::default())
+        } else {
+            Arc::new(KeyringProvider)
+        };
+
+        // Only used for testing keyring availability on the user's system
+        let read_credential = cx.read_credentials("Coop");
+        let mut tasks = smallvec![];
+
+        tasks.push(
+            // Verify the keyring availability
+            cx.spawn(async move |this, cx| {
+                let result = read_credential.await;
+
+                this.update(cx, |this, cx| {
+                    if let Err(e) = result {
+                        log::error!("Keyring error: {e}");
+                        // For Linux:
+                        // The user has not installed secret service on their system
+                        // Fall back to the file provider
+                        this.backend = Arc::new(FileProvider::default());
+                    }
+                    this.initialized = true;
+                    cx.notify();
+                })
+                .ok();
+            }),
+        );
+
+        Self {
+            backend,
+            initialized: false,
+            _tasks: tasks,
+        }
+    }
+
+    /// Returns the key backend.
+    pub fn backend(&self) -> Arc<dyn KeyBackend> {
+        Arc::clone(&self.backend)
+    }
+
+    /// Returns true if the keystore is a file key backend.
+    pub fn is_using_file_keystore(&self) -> bool {
+        self.backend.name() == "file"
+    }
+}

crates/person/Cargo.toml

@@ -1,14 +1,17 @@
-[package]
-name = "client_keys"
-version.workspace = true
-edition.workspace = true
-publish.workspace = true
-
-[dependencies]
-global = { path = "../global" }
-
-nostr-sdk.workspace = true
-gpui.workspace = true
-anyhow.workspace = true
-log.workspace = true
-smallvec.workspace = true
+[package]
+name = "person"
+version.workspace = true
+edition.workspace = true
+publish.workspace = true
+
+[dependencies]
+common = { path = "../common" }
+state = { path = "../state" }
+
+gpui.workspace = true
+nostr-sdk.workspace = true
+anyhow.workspace = true
+smallvec.workspace = true
+smol.workspace = true
+flume.workspace = true
+log.workspace = true

crates/person/src/lib.rs

@@ -0,0 +1,318 @@
+use std::cell::RefCell;
+use std::collections::{HashMap, HashSet};
+use std::rc::Rc;
+use std::time::Duration;
+
+use anyhow::{anyhow, Error};
+use common::{EventUtils, BOOTSTRAP_RELAYS};
+use gpui::{App, AppContext, Context, Entity, Global, Task};
+use nostr_sdk::prelude::*;
+pub use person::*;
+use smallvec::{smallvec, SmallVec};
+use state::{Announcement, NostrRegistry, TIMEOUT};
+
+mod person;
+
+pub fn init(cx: &mut App) {
+    PersonRegistry::set_global(cx.new(PersonRegistry::new), cx);
+}
+
+struct GlobalPersonRegistry(Entity<PersonRegistry>);
+
+impl Global for GlobalPersonRegistry {}
+
+#[derive(Debug, Clone)]
+enum Dispatch {
+    Person(Box<Person>),
+    Announcement(Box<Event>),
+}
+
+/// Person Registry
+#[derive(Debug)]
+pub struct PersonRegistry {
+    /// Collection of all persons (user profiles)
+    persons: HashMap<PublicKey, Entity<Person>>,
+
+    /// Set of public keys that have been seen
+    seen: Rc<RefCell<HashSet<PublicKey>>>,
+
+    /// Sender for requesting metadata
+    sender: flume::Sender<PublicKey>,
+
+    /// Tasks for asynchronous operations
+    _tasks: SmallVec<[Task<()>; 4]>,
+}
+
+impl PersonRegistry {
+    /// Retrieve the global person registry
+    pub fn global(cx: &App) -> Entity<Self> {
+        cx.global::<GlobalPersonRegistry>().0.clone()
+    }
+
+    /// Set the global person registry instance
+    fn set_global(state: Entity<Self>, cx: &mut App) {
+        cx.set_global(GlobalPersonRegistry(state));
+    }
+
+    /// Create a new person registry instance
+    fn new(cx: &mut Context<Self>) -> Self {
+        let nostr = NostrRegistry::global(cx);
+        let client = nostr.read(cx).client();
+
+        // Channel for communication between nostr and gpui
+        let (tx, rx) = flume::bounded::<Dispatch>(100);
+        let (mta_tx, mta_rx) = flume::bounded::<PublicKey>(100);
+
+        let mut tasks = smallvec![];
+
+        tasks.push(
+            // Handle nostr notifications
+            cx.background_spawn({
+                let client = client.clone();
+
+                async move {
+                    Self::handle_notifications(&client, &tx).await;
+                }
+            }),
+        );
+
+        tasks.push(
+            // Handle metadata requests
+            cx.background_spawn({
+                let client = client.clone();
+
+                async move {
+                    Self::handle_requests(&client, &mta_rx).await;
+                }
+            }),
+        );
+
+        tasks.push(
+            // Update GPUI state
+            cx.spawn(async move |this, cx| {
+                while let Ok(event) = rx.recv_async().await {
+                    this.update(cx, |this, cx| {
+                        match event {
+                            Dispatch::Person(person) => {
+                                this.insert(*person, cx);
+                            }
+                            Dispatch::Announcement(event) => {
+                                this.set_announcement(&event, cx);
+                            }
+                        };
+                    })
+                    .ok();
+                }
+            }),
+        );
+
+        tasks.push(
+            // Load all user profiles from the database
+            cx.spawn(async move |this, cx| {
+                let result = cx
+                    .background_executor()
+                    .await_on_background(async move { Self::load_persons(&client).await })
+                    .await;
+
+                match result {
+                    Ok(persons) => {
+                        this.update(cx, |this, cx| {
+                            this.bulk_inserts(persons, cx);
+                        })
+                        .ok();
+                    }
+                    Err(e) => {
+                        log::error!("Failed to load all persons from the database: {e}");
+                    }
+                };
+            }),
+        );
+
+        Self {
+            persons: HashMap::new(),
+            seen: Rc::new(RefCell::new(HashSet::new())),
+            sender: mta_tx,
+            _tasks: tasks,
+        }
+    }
+
+    /// Handle nostr notifications
+    async fn handle_notifications(client: &Client, tx: &flume::Sender<Dispatch>) {
+        let mut notifications = client.notifications();
+        let mut processed_events = HashSet::new();
+
+        while let Ok(notification) = notifications.recv().await {
+            let RelayPoolNotification::Message { message, .. } = notification else {
+                // Skip if the notification is not a message
+                continue;
+            };
+
+            if let RelayMessage::Event { event, .. } = message {
+                if !processed_events.insert(event.id) {
+                    // Skip if the event has already been processed
+                    continue;
+                }
+
+                match event.kind {
+                    Kind::Metadata => {
+                        let metadata = Metadata::from_json(&event.content).unwrap_or_default();
+                        let person = Person::new(event.pubkey, metadata);
+                        let val = Box::new(person);
+
+                        // Send
+                        tx.send_async(Dispatch::Person(val)).await.ok();
+                    }
+                    Kind::Custom(10044) => {
+                        let val = Box::new(event.into_owned());
+
+                        // Send
+                        tx.send_async(Dispatch::Announcement(val)).await.ok();
+                    }
+                    Kind::ContactList => {
+                        let public_keys = event.extract_public_keys();
+
+                        // Get metadata for all public keys
+                        Self::get_metadata(client, public_keys).await.ok();
+                    }
+                    _ => {}
+                }
+            }
+        }
+    }
+
+    /// Handle request for metadata
+    async fn handle_requests(client: &Client, rx: &flume::Receiver<PublicKey>) {
+        let mut batch: HashSet<PublicKey> = HashSet::new();
+
+        loop {
+            match flume::Selector::new()
+                .recv(rx, |result| result.ok())
+                .wait_timeout(Duration::from_secs(2))
+            {
+                Ok(Some(public_key)) => {
+                    log::info!("Received public key: {}", public_key);
+                    batch.insert(public_key);
+                    // Process the batch if it's full
+                    if batch.len() >= 20 {
+                        Self::get_metadata(client, std::mem::take(&mut batch))
+                            .await
+                            .ok();
+                    }
+                }
+                _ => {
+                    Self::get_metadata(client, std::mem::take(&mut batch))
+                        .await
+                        .ok();
+                }
+            }
+        }
+    }
+
+    /// Get metadata for all public keys in a event
+    async fn get_metadata<I>(client: &Client, public_keys: I) -> Result<(), Error>
+    where
+        I: IntoIterator<Item = PublicKey>,
+    {
+        let authors: Vec<PublicKey> = public_keys.into_iter().collect();
+        let limit = authors.len();
+
+        if authors.is_empty() {
+            return Err(anyhow!("You need at least one public key"));
+        }
+
+        // Construct the subscription option
+        let opts = SubscribeAutoCloseOptions::default()
+            .exit_policy(ReqExitPolicy::ExitOnEOSE)
+            .timeout(Some(Duration::from_secs(TIMEOUT)));
+
+        // Construct the filter for metadata
+        let filter = Filter::new()
+            .kind(Kind::Metadata)
+            .authors(authors)
+            .limit(limit);
+
+        client
+            .subscribe_to(BOOTSTRAP_RELAYS, filter, Some(opts))
+            .await?;
+
+        Ok(())
+    }
+
+    /// Load all user profiles from the database
+    async fn load_persons(client: &Client) -> Result<Vec<Person>, Error> {
+        let filter = Filter::new().kind(Kind::Metadata).limit(200);
+        let events = client.database().query(filter).await?;
+
+        let mut persons = vec![];
+
+        for event in events.into_iter() {
+            let metadata = Metadata::from_json(event.content).unwrap_or_default();
+            let person = Person::new(event.pubkey, metadata);
+            persons.push(person);
+        }
+
+        Ok(persons)
+    }
+
+    /// Set profile encryption keys announcement
+    fn set_announcement(&mut self, event: &Event, cx: &mut App) {
+        if let Some(person) = self.persons.get(&event.pubkey) {
+            let announcement = Announcement::from(event);
+
+            person.update(cx, |person, cx| {
+                person.set_announcement(announcement);
+                cx.notify();
+            });
+        }
+    }
+
+    /// Insert batch of persons
+    fn bulk_inserts(&mut self, persons: Vec<Person>, cx: &mut Context<Self>) {
+        for person in persons.into_iter() {
+            self.persons.insert(person.public_key(), cx.new(|_| person));
+        }
+        cx.notify();
+    }
+
+    /// Insert or update a person
+    pub fn insert(&mut self, person: Person, cx: &mut App) {
+        let public_key = person.public_key();
+
+        match self.persons.get(&public_key) {
+            Some(this) => {
+                this.update(cx, |this, cx| {
+                    *this = person;
+                    cx.notify();
+                });
+            }
+            None => {
+                self.persons.insert(public_key, cx.new(|_| person));
+            }
+        }
+    }
+
+    /// Get single person by public key
+    pub fn get(&self, public_key: &PublicKey, cx: &App) -> Person {
+        if let Some(person) = self.persons.get(public_key) {
+            return person.read(cx).clone();
+        }
+
+        let public_key = *public_key;
+        let mut seen = self.seen.borrow_mut();
+
+        if seen.insert(public_key) {
+            let sender = self.sender.clone();
+
+            // Spawn background task to request metadata
+            cx.background_spawn(async move {
+                if let Err(e) = sender.send_async(public_key).await {
+                    log::warn!("Failed to send public key for metadata request: {}", e);
+                }
+            })
+            .detach();
+        }
+
+        // Return a temporary profile with default metadata
+        Person::new(public_key, Metadata::default())
+    }
+}

crates/person/src/person.rs

@@ -0,0 +1,122 @@
+use std::cmp::Ordering;
+use std::hash::{Hash, Hasher};
+
+use gpui::SharedString;
+use nostr_sdk::prelude::*;
+use state::Announcement;
+
+/// Person
+#[derive(Debug, Clone)]
+pub struct Person {
+    /// Public Key
+    public_key: PublicKey,
+
+    /// Metadata (profile)
+    metadata: Metadata,
+
+    /// Dekey (NIP-4e) announcement
+    announcement: Option<Announcement>,
+}
+
+impl PartialEq for Person {
+    fn eq(&self, other: &Self) -> bool {
+        self.public_key == other.public_key
+    }
+}
+
+impl Eq for Person {}
+
+impl PartialOrd for Person {
+    fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
+        Some(self.cmp(other))
+    }
+}
+
+impl Ord for Person {
+    fn cmp(&self, other: &Self) -> Ordering {
+        self.name().cmp(&other.name())
+    }
+}
+
+impl Hash for Person {
+    fn hash<H: Hasher>(&self, state: &mut H) {
+        self.public_key.hash(state)
+    }
+}
+
+impl From<PublicKey> for Person {
+    fn from(public_key: PublicKey) -> Self {
+        Self::new(public_key, Metadata::default())
+    }
+}
+
+impl Person {
+    pub fn new(public_key: PublicKey, metadata: Metadata) -> Self {
+        Self {
+            public_key,
+            metadata,
+            announcement: None,
+        }
+    }
+
+    /// Get profile public key
+    pub fn public_key(&self) -> PublicKey {
+        self.public_key
+    }
+
+    /// Get profile metadata
+    pub fn metadata(&self) -> Metadata {
+        self.metadata.clone()
+    }
+
+    /// Get profile encryption keys announcement
+    pub fn announcement(&self) -> Option<Announcement> {
+        self.announcement.clone()
+    }
+
+    /// Set profile encryption keys announcement
+    pub fn set_announcement(&mut self, announcement: Announcement) {
+        self.announcement = Some(announcement);
+        log::info!("Updated announcement for: {}", self.public_key());
+    }
+
+    /// Get profile avatar
+    pub fn avatar(&self) -> SharedString {
+        self.metadata()
+            .picture
+            .as_ref()
+            .filter(|picture| !picture.is_empty())
+            .map(|picture| picture.into())
+            .unwrap_or_else(|| "brand/avatar.png".into())
+    }
+
+    /// Get profile name
+    pub fn name(&self) -> SharedString {
+        if let Some(display_name) = self.metadata().display_name.as_ref() {
+            if !display_name.is_empty() {
+                return SharedString::from(display_name);
+            }
+        }
+
+        if let Some(name) = self.metadata().name.as_ref() {
+            if !name.is_empty() {
+                return SharedString::from(name);
+            }
+        }
+
+        SharedString::from(shorten_pubkey(self.public_key(), 4))
+    }
+}
+
+/// Shorten a [`PublicKey`] to a string with the first and last `len` characters
+///
+/// Ex. `00000000:00000002`
+pub fn shorten_pubkey(public_key: PublicKey, len: usize) -> String {
+    let Ok(pubkey) = public_key.to_bech32();
+
+    format!(
+        "{}:{}",
+        &pubkey[0..(len + 1)],
+        &pubkey[pubkey.len() - len..]
+    )
+}

crates/registry/src/lib.rs

@@ -1,472 +0,0 @@
-use std::cmp::Reverse;
-use std::collections::{HashMap, HashSet};
-
-use anyhow::Error;
-use common::event::EventUtils;
-use fuzzy_matcher::skim::SkimMatcherV2;
-use fuzzy_matcher::FuzzyMatcher;
-use global::{nostr_client, UnwrappingStatus};
-use gpui::{App, AppContext, Context, Entity, EventEmitter, Global, Task, WeakEntity, Window};
-use itertools::Itertools;
-use nostr_sdk::prelude::*;
-use room::RoomKind;
-use settings::AppSettings;
-use smallvec::{smallvec, SmallVec};
-
-use crate::room::Room;
-
-pub mod message;
-pub mod room;
-
-pub fn init(cx: &mut App) {
-    Registry::set_global(cx.new(Registry::new), cx);
-}
-
-struct GlobalRegistry(Entity<Registry>);
-
-impl Global for GlobalRegistry {}
-
-#[derive(Debug)]
-pub enum RegistryEvent {
-    Open(WeakEntity<Room>),
-    Close(u64),
-    NewRequest(RoomKind),
-}
-
-/// Main registry for managing chat rooms and user profiles
-pub struct Registry {
-    /// Collection of all chat rooms
-    pub rooms: Vec<Entity<Room>>,
-
-    /// Collection of all persons (user profiles)
-    pub persons: HashMap<PublicKey, Entity<Profile>>,
-
-    /// Status of the unwrapping process
-    pub unwrapping_status: Entity<UnwrappingStatus>,
-
-    /// Public Key of the current user
-    pub identity: Option<PublicKey>,
-
-    /// Tasks for asynchronous operations
-    _tasks: SmallVec<[Task<()>; 1]>,
-}
-
-impl EventEmitter<RegistryEvent> for Registry {}
-
-impl Registry {
-    /// Retrieve the Global Registry state
-    pub fn global(cx: &App) -> Entity<Self> {
-        cx.global::<GlobalRegistry>().0.clone()
-    }
-
-    /// Retrieve the Registry instance
-    pub fn read_global(cx: &App) -> &Self {
-        cx.global::<GlobalRegistry>().0.read(cx)
-    }
-
-    /// Set the global Registry instance
-    pub(crate) fn set_global(state: Entity<Self>, cx: &mut App) {
-        cx.set_global(GlobalRegistry(state));
-    }
-
-    /// Create a new Registry instance
-    pub(crate) fn new(cx: &mut Context<Self>) -> Self {
-        let unwrapping_status = cx.new(|_| UnwrappingStatus::default());
-        let mut tasks = smallvec![];
-
-        let load_local_persons: Task<Result<Vec<Profile>, Error>> =
-            cx.background_spawn(async move {
-                let client = nostr_client();
-                let filter = Filter::new().kind(Kind::Metadata).limit(200);
-                let events = client.database().query(filter).await?;
-                let mut profiles = vec![];
-
-                for event in events.into_iter() {
-                    let metadata = Metadata::from_json(event.content).unwrap_or_default();
-                    let profile = Profile::new(event.pubkey, metadata);
-                    profiles.push(profile);
-                }
-
-                Ok(profiles)
-            });
-
-        tasks.push(
-            // Load all user profiles from the database when the Registry is created
-            cx.spawn(async move |this, cx| {
-                if let Ok(profiles) = load_local_persons.await {
-                    this.update(cx, |this, cx| {
-                        this.set_persons(profiles, cx);
-                    })
-                    .ok();
-                }
-            }),
-        );
-
-        Self {
-            unwrapping_status,
-            rooms: vec![],
-            persons: HashMap::new(),
-            identity: None,
-            _tasks: tasks,
-        }
-    }
-
-    /// Returns the identity of the user.
-    ///
-    /// WARNING: This method will panic if user is not logged in.
-    pub fn identity(&self, cx: &App) -> Profile {
-        self.get_person(&self.identity.unwrap(), cx)
-    }
-
-    /// Sets the identity of the user.
-    pub fn set_identity(&mut self, identity: PublicKey, cx: &mut Context<Self>) {
-        self.identity = Some(identity);
-        cx.notify();
-    }
-
-    /// Insert batch of persons
-    pub fn set_persons(&mut self, profiles: Vec<Profile>, cx: &mut Context<Self>) {
-        for profile in profiles.into_iter() {
-            self.persons
-                .insert(profile.public_key(), cx.new(|_| profile));
-        }
-        cx.notify();
-    }
-
-    /// Get single person
-    pub fn get_person(&self, public_key: &PublicKey, cx: &App) -> Profile {
-        self.persons
-            .get(public_key)
-            .map(|e| e.read(cx))
-            .cloned()
-            .unwrap_or(Profile::new(public_key.to_owned(), Metadata::default()))
-    }
-
-    /// Get group of persons
-    pub fn get_group_person(&self, public_keys: &[PublicKey], cx: &App) -> Vec<Profile> {
-        let mut profiles = vec![];
-
-        for public_key in public_keys.iter() {
-            let profile = self.get_person(public_key, cx);
-            profiles.push(profile);
-        }
-
-        profiles
-    }
-
-    /// Insert or update a person
-    pub fn insert_or_update_person(&mut self, profile: Profile, cx: &mut App) {
-        let public_key = profile.public_key();
-
-        match self.persons.get(&public_key) {
-            Some(person) => {
-                person.update(cx, |this, cx| {
-                    *this = profile;
-                    cx.notify();
-                });
-            }
-            None => {
-                self.persons.insert(public_key, cx.new(|_| profile));
-            }
-        }
-    }
-
-    /// Get a room by its ID.
-    pub fn room(&self, id: &u64, cx: &App) -> Option<Entity<Room>> {
-        self.rooms
-            .iter()
-            .find(|model| model.read(cx).id == *id)
-            .cloned()
-    }
-
-    /// Get all ongoing rooms.
-    pub fn ongoing_rooms(&self, cx: &App) -> Vec<Entity<Room>> {
-        self.rooms
-            .iter()
-            .filter(|room| room.read(cx).kind == RoomKind::Ongoing)
-            .cloned()
-            .collect()
-    }
-
-    /// Get all request rooms.
-    pub fn request_rooms(&self, cx: &App) -> Vec<Entity<Room>> {
-        self.rooms
-            .iter()
-            .filter(|room| room.read(cx).kind != RoomKind::Ongoing)
-            .cloned()
-            .collect()
-    }
-
-    /// Add a new room to the start of list.
-    pub fn add_room(&mut self, room: Entity<Room>, cx: &mut Context<Self>) {
-        self.rooms.insert(0, room);
-        cx.notify();
-    }
-
-    /// Close a room.
-    pub fn close_room(&mut self, id: u64, cx: &mut Context<Self>) {
-        if self.rooms.iter().any(|r| r.read(cx).id == id) {
-            cx.emit(RegistryEvent::Close(id));
-        }
-    }
-
-    /// Sort rooms by their created at.
-    pub fn sort(&mut self, cx: &mut Context<Self>) {
-        self.rooms.sort_by_key(|ev| Reverse(ev.read(cx).created_at));
-        cx.notify();
-    }
-
-    /// Search rooms by their name.
-    pub fn search(&self, query: &str, cx: &App) -> Vec<Entity<Room>> {
-        let matcher = SkimMatcherV2::default();
-
-        self.rooms
-            .iter()
-            .filter(|room| {
-                matcher
-                    .fuzzy_match(room.read(cx).display_name(cx).as_ref(), query)
-                    .is_some()
-            })
-            .cloned()
-            .collect()
-    }
-
-    /// Search rooms by public keys.
-    pub fn search_by_public_key(&self, public_key: PublicKey, cx: &App) -> Vec<Entity<Room>> {
-        self.rooms
-            .iter()
-            .filter(|room| room.read(cx).members.contains(&public_key))
-            .cloned()
-            .collect()
-    }
-
-    /// Set the loading status of the registry.
-    pub fn set_unwrapping_status(&mut self, status: UnwrappingStatus, cx: &mut Context<Self>) {
-        self.unwrapping_status.update(cx, |this, cx| {
-            *this = status;
-            cx.notify();
-        });
-    }
-
-    /// Reset the registry.
-    pub fn reset(&mut self, cx: &mut Context<Self>) {
-        // Reset the unwrapping status
-        self.set_unwrapping_status(UnwrappingStatus::default(), cx);
-
-        // Clear the current identity
-        self.identity = None;
-
-        // Clear all current rooms
-        self.rooms.clear();
-
-        cx.notify();
-    }
-
-    /// Load all rooms from the database.
-    pub fn load_rooms(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        log::info!("Starting to load chat rooms...");
-
-        // Get the contact bypass setting
-        let bypass_setting = AppSettings::get_contact_bypass(cx);
-
-        let task: Task<Result<HashSet<Room>, Error>> = cx.background_spawn(async move {
-            let client = nostr_client();
-            let signer = client.signer().await?;
-            let public_key = signer.get_public_key().await?;
-            let contacts = client.database().contacts_public_keys(public_key).await?;
-
-            // Get messages sent by the user
-            let send = Filter::new()
-                .kind(Kind::PrivateDirectMessage)
-                .author(public_key);
-
-            // Get messages received by the user
-            let recv = Filter::new()
-                .kind(Kind::PrivateDirectMessage)
-                .pubkey(public_key);
-
-            let send_events = client.database().query(send).await?;
-            let recv_events = client.database().query(recv).await?;
-            let events = send_events.merge(recv_events);
-
-            let mut rooms: HashSet<Room> = HashSet::new();
-
-            // Process each event and group by room hash
-            for event in events
-                .into_iter()
-                .sorted_by_key(|event| Reverse(event.created_at))
-                .filter(|ev| ev.tags.public_keys().peekable().peek().is_some())
-            {
-                if rooms.iter().any(|room| room.id == event.uniq_id()) {
-                    continue;
-                }
-
-                // Get all public keys from the event's tags
-                let mut public_keys = event.all_pubkeys();
-                public_keys.retain(|pk| pk != &public_key);
-
-                // Bypass screening flag
-                let mut bypassed = false;
-
-                // If the user has enabled bypass screening in settings,
-                // check if any of the room's members are contacts of the current user
-                if bypass_setting {
-                    bypassed = public_keys.iter().any(|k| contacts.contains(k));
-                }
-
-                // Check if the current user has sent at least one message to this room
-                let filter = Filter::new()
-                    .kind(Kind::PrivateDirectMessage)
-                    .author(public_key)
-                    .pubkeys(public_keys);
-
-                // If current user has sent a message at least once, mark as ongoing
-                let is_ongoing = client.database().count(filter).await.unwrap_or(1) >= 1;
-
-                // Create a new room
-                let room = Room::from(&event).current_user(public_key);
-
-                if is_ongoing || bypassed {
-                    rooms.insert(room.kind(RoomKind::Ongoing));
-                } else {
-                    rooms.insert(room);
-                }
-            }
-
-            Ok(rooms)
-        });
-
-        cx.spawn_in(window, async move |this, cx| {
-            match task.await {
-                Ok(rooms) => {
-                    this.update_in(cx, move |_, window, cx| {
-                        cx.defer_in(window, move |this, _window, cx| {
-                            this.extend_rooms(rooms, cx);
-                            this.sort(cx);
-                        });
-                    })
-                    .ok();
-                }
-                Err(e) => {
-                    log::error!("Failed to load rooms: {e}")
-                }
-            };
-        })
-        .detach();
-    }
-
-    pub(crate) fn extend_rooms(&mut self, rooms: HashSet<Room>, cx: &mut Context<Self>) {
-        let mut room_map: HashMap<u64, usize> = self
-            .rooms
-            .iter()
-            .enumerate()
-            .map(|(idx, room)| (room.read(cx).id, idx))
-            .collect();
-
-        for new_room in rooms.into_iter() {
-            // Check if we already have a room with this ID
-            if let Some(&index) = room_map.get(&new_room.id) {
-                self.rooms[index].update(cx, |this, cx| {
-                    if new_room.created_at > this.created_at {
-                        *this = new_room;
-                        cx.notify();
-                    }
-                });
-            } else {
-                let new_room_id = new_room.id;
-                self.rooms.push(cx.new(|_| new_room));
-
-                let new_index = self.rooms.len();
-                room_map.insert(new_room_id, new_index);
-            }
-        }
-    }
-
-    /// Push a new Room to the global registry
-    pub fn push_room(&mut self, room: Entity<Room>, cx: &mut Context<Self>) {
-        let other_id = room.read(cx).id;
-        let find_room = self.rooms.iter().find(|this| this.read(cx).id == other_id);
-
-        let weak_room = if let Some(room) = find_room {
-            room.downgrade()
-        } else {
-            let weak_room = room.downgrade();
-            // Add this room to the registry
-            self.add_room(room, cx);
-
-            weak_room
-        };
-
-        cx.emit(RegistryEvent::Open(weak_room));
-    }
-
-    /// Refresh messages for a room in the global registry
-    pub fn refresh_rooms(&mut self, ids: Option<Vec<u64>>, cx: &mut Context<Self>) {
-        if let Some(ids) = ids {
-            for room in self.rooms.iter() {
-                if ids.contains(&room.read(cx).id) {
-                    room.update(cx, |this, cx| {
-                        this.emit_refresh(cx);
-                    });
-                }
-            }
-        }
-    }
-
-    /// Parse a Nostr event into a Coop Message and push it to the belonging room
-    ///
-    /// If the room doesn't exist, it will be created.
-    /// Updates room ordering based on the most recent messages.
-    pub fn event_to_message(
-        &mut self,
-        gift_wrap_id: EventId,
-        event: Event,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let id = event.uniq_id();
-        let author = event.pubkey;
-
-        let Some(identity) = self.identity else {
-            return;
-        };
-
-        if let Some(room) = self.rooms.iter().find(|room| room.read(cx).id == id) {
-            let is_new_event = event.created_at > room.read(cx).created_at;
-
-            // Update room
-            room.update(cx, |this, cx| {
-                if is_new_event {
-                    this.created_at(event.created_at, cx);
-                }
-
-                // Set this room is ongoing if the new message is from current user
-                if author == identity {
-                    this.set_ongoing(cx);
-                }
-
-                // Emit the new message to the room
-                cx.defer_in(window, move |this, _window, cx| {
-                    this.emit_message(gift_wrap_id, event, cx);
-                });
-            });
-
-            // Resort all rooms in the registry by their created at (after updated)
-            if is_new_event {
-                cx.defer_in(window, |this, _window, cx| {
-                    this.sort(cx);
-                });
-            }
-        } else {
-            let room = Room::from(&event).current_user(identity);
-
-            // Push the new room to the front of the list
-            self.add_room(cx.new(|_| room), cx);
-
-            // Notify the UI about the new room
-            cx.defer_in(window, move |_this, _window, cx| {
-                cx.emit(RegistryEvent::NewRequest(RoomKind::default()));
-            });
-        }
-    }
-}

crates/registry/src/room.rs

@@ -1,642 +0,0 @@
-use std::cmp::Ordering;
-use std::collections::{HashMap, HashSet};
-use std::hash::{Hash, Hasher};
-use std::time::Duration;
-
-use anyhow::Error;
-use common::display::RenderedProfile;
-use common::event::EventUtils;
-use global::constants::SEND_RETRY;
-use global::{app_state, nostr_client};
-use gpui::{App, AppContext, Context, EventEmitter, SharedString, SharedUri, Task};
-use itertools::Itertools;
-use nostr_sdk::prelude::*;
-
-use crate::Registry;
-
-#[derive(Debug, Clone)]
-pub struct SendReport {
-    pub receiver: PublicKey,
-    pub tags: Option<Vec<Tag>>,
-    pub status: Option<Output<EventId>>,
-    pub error: Option<SharedString>,
-    pub relays_not_found: bool,
-}
-
-impl SendReport {
-    pub fn new(receiver: PublicKey) -> Self {
-        Self {
-            receiver,
-            status: None,
-            error: None,
-            tags: None,
-            relays_not_found: false,
-        }
-    }
-
-    pub fn not_found(mut self) -> Self {
-        self.relays_not_found = true;
-        self
-    }
-
-    pub fn error(mut self, error: impl Into<SharedString>) -> Self {
-        self.error = Some(error.into());
-        self.relays_not_found = false;
-        self
-    }
-
-    pub fn status(mut self, output: Output<EventId>) -> Self {
-        self.status = Some(output);
-        self.relays_not_found = false;
-        self
-    }
-
-    pub fn tags(mut self, tags: &Vec<Tag>) -> Self {
-        self.tags = Some(tags.to_owned());
-        self
-    }
-
-    pub fn is_relay_error(&self) -> bool {
-        self.error.is_some() || self.relays_not_found
-    }
-
-    pub fn is_sent_success(&self) -> bool {
-        if let Some(output) = self.status.as_ref() {
-            !output.success.is_empty()
-        } else {
-            false
-        }
-    }
-}
-
-#[derive(Debug, Clone)]
-pub enum RoomSignal {
-    NewMessage((EventId, Box<Event>)),
-    Refresh,
-}
-
-#[derive(Clone, Copy, Hash, Debug, PartialEq, Eq, PartialOrd, Ord, Default)]
-pub enum RoomKind {
-    Ongoing,
-    #[default]
-    Request,
-}
-
-#[derive(Debug)]
-pub struct Room {
-    pub id: u64,
-    pub created_at: Timestamp,
-    /// Subject of the room
-    pub subject: Option<String>,
-    /// Picture of the room
-    pub picture: Option<String>,
-    /// All members of the room
-    pub members: Vec<PublicKey>,
-    /// Kind
-    pub kind: RoomKind,
-}
-
-impl Ord for Room {
-    fn cmp(&self, other: &Self) -> Ordering {
-        self.created_at.cmp(&other.created_at)
-    }
-}
-
-impl PartialOrd for Room {
-    fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
-        Some(self.cmp(other))
-    }
-}
-
-impl PartialEq for Room {
-    fn eq(&self, other: &Self) -> bool {
-        self.id == other.id
-    }
-}
-
-impl Hash for Room {
-    fn hash<H: Hasher>(&self, state: &mut H) {
-        self.id.hash(state);
-    }
-}
-
-impl Eq for Room {}
-
-impl EventEmitter<RoomSignal> for Room {}
-
-impl From<&Event> for Room {
-    fn from(val: &Event) -> Self {
-        let id = val.uniq_id();
-        let created_at = val.created_at;
-
-        // Get the members from the event's tags and event's pubkey
-        let members = val
-            .all_pubkeys()
-            .into_iter()
-            .unique()
-            .sorted()
-            .collect_vec();
-
-        // Get the subject from the event's tags
-        let subject = if let Some(tag) = val.tags.find(TagKind::Subject) {
-            tag.content().map(|s| s.to_owned())
-        } else {
-            None
-        };
-
-        // Get the picture from the event's tags
-        let picture = if let Some(tag) = val.tags.find(TagKind::custom("picture")) {
-            tag.content().map(|s| s.to_owned())
-        } else {
-            None
-        };
-
-        Room {
-            id,
-            created_at,
-            subject,
-            picture,
-            members,
-            kind: RoomKind::default(),
-        }
-    }
-}
-
-impl From<&UnsignedEvent> for Room {
-    fn from(val: &UnsignedEvent) -> Self {
-        let id = val.uniq_id();
-        let created_at = val.created_at;
-
-        // Get the members from the event's tags and event's pubkey
-        let members = val
-            .all_pubkeys()
-            .into_iter()
-            .unique()
-            .sorted()
-            .collect_vec();
-
-        // Get the subject from the event's tags
-        let subject = if let Some(tag) = val.tags.find(TagKind::Subject) {
-            tag.content().map(|s| s.to_owned())
-        } else {
-            None
-        };
-
-        // Get the picture from the event's tags
-        let picture = if let Some(tag) = val.tags.find(TagKind::custom("picture")) {
-            tag.content().map(|s| s.to_owned())
-        } else {
-            None
-        };
-
-        Room {
-            id,
-            created_at,
-            subject,
-            picture,
-            members,
-            kind: RoomKind::default(),
-        }
-    }
-}
-
-impl Room {
-    /// Constructs a new room instance with a given receiver.
-    pub fn new(receiver: PublicKey, tags: Tags, cx: &App) -> Self {
-        let identity = Registry::read_global(cx).identity(cx);
-
-        let mut event = EventBuilder::private_msg_rumor(receiver, "")
-            .tags(tags)
-            .build(identity.public_key());
-
-        // Ensure event ID is generated
-        event.ensure_id();
-
-        Room::from(&event).current_user(identity.public_key())
-    }
-
-    /// Constructs a new room instance from an nostr event.
-    pub fn from(event: impl Into<Room>) -> Self {
-        event.into()
-    }
-
-    /// Call this function to ensure the current user is always at the bottom of the members list
-    pub fn current_user(mut self, public_key: PublicKey) -> Self {
-        let (not_match, matches): (Vec<PublicKey>, Vec<PublicKey>) =
-            self.members.iter().partition(|&key| key != &public_key);
-        self.members = not_match;
-        self.members.extend(matches);
-        self
-    }
-
-    /// Sets the kind of the room and returns the modified room
-    pub fn kind(mut self, kind: RoomKind) -> Self {
-        self.kind = kind;
-        self
-    }
-
-    /// Set the room kind to ongoing
-    pub fn set_ongoing(&mut self, cx: &mut Context<Self>) {
-        if self.kind != RoomKind::Ongoing {
-            self.kind = RoomKind::Ongoing;
-            cx.notify();
-        }
-    }
-
-    /// Checks if the room is a group chat
-    pub fn is_group(&self) -> bool {
-        self.members.len() > 2
-    }
-
-    /// Updates the creation timestamp of the room
-    pub fn created_at(&mut self, created_at: impl Into<Timestamp>, cx: &mut Context<Self>) {
-        self.created_at = created_at.into();
-        cx.notify();
-    }
-
-    /// Updates the subject of the room
-    pub fn subject(&mut self, subject: String, cx: &mut Context<Self>) {
-        self.subject = Some(subject);
-        cx.notify();
-    }
-
-    /// Updates the picture of the room
-    pub fn picture(&mut self, picture: String, cx: &mut Context<Self>) {
-        self.picture = Some(picture);
-        cx.notify();
-    }
-
-    /// Gets the display name for the room
-    pub fn display_name(&self, cx: &App) -> SharedString {
-        if let Some(subject) = self.subject.clone() {
-            SharedString::from(subject)
-        } else {
-            self.merged_name(cx)
-        }
-    }
-
-    /// Gets the display image for the room
-    pub fn display_image(&self, proxy: bool, cx: &App) -> SharedUri {
-        if let Some(picture) = self.picture.as_ref() {
-            SharedUri::from(picture)
-        } else if !self.is_group() {
-            self.first_member(cx).avatar(proxy)
-        } else {
-            SharedUri::from("brand/group.png")
-        }
-    }
-
-    /// Get the first member of the room.
-    ///
-    /// First member is always different from the current user.
-    pub(crate) fn first_member(&self, cx: &App) -> Profile {
-        let registry = Registry::read_global(cx);
-        registry.get_person(&self.members[0], cx)
-    }
-
-    /// Merge the names of the first two members of the room.
-    pub(crate) fn merged_name(&self, cx: &App) -> SharedString {
-        let registry = Registry::read_global(cx);
-
-        if self.is_group() {
-            let profiles = self
-                .members
-                .iter()
-                .map(|pk| registry.get_person(pk, cx))
-                .collect::<Vec<_>>();
-
-            let mut name = profiles
-                .iter()
-                .take(2)
-                .map(|p| p.name())
-                .collect::<Vec<_>>()
-                .join(", ");
-
-            if profiles.len() > 2 {
-                name = format!("{}, +{}", name, profiles.len() - 2);
-            }
-
-            SharedString::from(name)
-        } else {
-            self.first_member(cx).display_name()
-        }
-    }
-
-    /// 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
-    pub fn load_messages(&self, cx: &App) -> Task<Result<Vec<Event>, Error>> {
-        let members = self.members.clone();
-
-        cx.background_spawn(async move {
-            let client = nostr_client();
-            let signer = client.signer().await?;
-            let public_key = signer.get_public_key().await?;
-            let sent_ids = app_state()
-                .sent_ids
-                .read()
-                .await
-                .iter()
-                .copied()
-                .collect_vec();
-
-            // Get seen events from database
-            let filter = Filter::new()
-                .kind(Kind::ApplicationSpecificData)
-                .identifiers(sent_ids);
-
-            let seen_events = client.database().query(filter).await?;
-
-            // Extract seen event IDs
-            let seen_ids: Vec<EventId> = seen_events
-                .into_iter()
-                .filter_map(|event| event.tags.event_ids().next().copied())
-                .collect();
-
-            // Get events that sent by current user
-            let filter = Filter::new()
-                .kind(Kind::PrivateDirectMessage)
-                .author(public_key)
-                .pubkeys(members.clone());
-
-            let sent_events = client.database().query(filter).await?;
-
-            // Get events that received by current user
-            let filter = Filter::new()
-                .kind(Kind::PrivateDirectMessage)
-                .authors(members)
-                .pubkey(public_key);
-
-            let recv_events = client.database().query(filter).await?;
-
-            // Merge events
-            let events: Vec<Event> = sent_events
-                .merge(recv_events)
-                .into_iter()
-                .filter(|event| !seen_ids.contains(&event.id))
-                .collect();
-
-            Ok(events)
-        })
-    }
-
-    /// Creates a temporary message for optimistic updates
-    ///
-    /// The event must not been published to relays.
-    pub fn create_temp_message(
-        &self,
-        receiver: PublicKey,
-        content: &str,
-        replies: &[EventId],
-    ) -> UnsignedEvent {
-        let builder = EventBuilder::private_msg_rumor(receiver, content);
-        let mut tags = vec![];
-
-        // Add event reference if it's present (replying to another event)
-        if replies.len() == 1 {
-            tags.push(Tag::event(replies[0]))
-        } else {
-            for id in replies.iter() {
-                tags.push(Tag::from_standardized(TagStandard::Quote {
-                    event_id: id.to_owned(),
-                    relay_url: None,
-                    public_key: None,
-                }))
-            }
-        }
-
-        let mut event = builder.tags(tags).build(receiver);
-
-        // Ensure event ID is set
-        event.ensure_id();
-
-        event
-    }
-
-    /// Create a task to sends a message to all members in the background
-    pub fn send_in_background(
-        &self,
-        content: &str,
-        replies: Vec<EventId>,
-        backup: bool,
-        cx: &App,
-    ) -> Task<Result<Vec<SendReport>, Error>> {
-        let content = content.to_owned();
-        let subject = self.subject.clone();
-        let picture = self.picture.clone();
-        let mut public_keys = self.members.clone();
-
-        cx.background_spawn(async move {
-            let app_state = app_state();
-            let client = nostr_client();
-            let signer = client.signer().await?;
-            let public_key = signer.get_public_key().await?;
-
-            let mut tags: Vec<Tag> = public_keys
-                .iter()
-                .filter_map(|&this| {
-                    if this != public_key {
-                        Some(Tag::public_key(this))
-                    } else {
-                        None
-                    }
-                })
-                .collect();
-
-            // Add event reference if it's present (replying to another event)
-            if replies.len() == 1 {
-                tags.push(Tag::event(replies[0]))
-            } else {
-                for id in replies.iter() {
-                    tags.push(Tag::from_standardized(TagStandard::Quote {
-                        event_id: id.to_owned(),
-                        relay_url: None,
-                        public_key: None,
-                    }))
-                }
-            }
-
-            // Add subject tag if it's present
-            if let Some(subject) = subject {
-                tags.push(Tag::from_standardized(TagStandard::Subject(
-                    subject.to_string(),
-                )));
-            }
-
-            // Add picture tag if it's present
-            if let Some(picture) = picture {
-                tags.push(Tag::custom(TagKind::custom("picture"), vec![picture]));
-            }
-
-            // Remove the current public key from the list of receivers
-            public_keys.retain(|&pk| pk != public_key);
-
-            // Stored all send errors
-            let mut reports = vec![];
-
-            for pubkey in public_keys.into_iter() {
-                match client
-                    .send_private_msg(pubkey, &content, tags.clone())
-                    .await
-                {
-                    Ok(output) => {
-                        let id = output.id().to_owned();
-                        let auth_required = output.failed.iter().any(|m| m.1.starts_with("auth-"));
-                        let report = SendReport::new(pubkey).status(output).tags(&tags);
-
-                        if auth_required {
-                            // Wait for authenticated and resent event successfully
-                            for attempt in 0..=SEND_RETRY {
-                                let ids = app_state.resent_ids.read().await;
-
-                                // Check if event was successfully resent
-                                if let Some(output) = ids.iter().find(|e| e.id() == &id).cloned() {
-                                    let output = SendReport::new(pubkey).status(output).tags(&tags);
-                                    reports.push(output);
-                                    break;
-                                }
-
-                                // Check if retry limit exceeded
-                                if attempt == SEND_RETRY {
-                                    reports.push(report);
-                                    break;
-                                }
-
-                                smol::Timer::after(Duration::from_millis(1200)).await;
-                            }
-                        } else {
-                            reports.push(report);
-                        }
-                    }
-                    Err(e) => {
-                        if let nostr_sdk::client::Error::PrivateMsgRelaysNotFound = e {
-                            reports.push(SendReport::new(pubkey).not_found().tags(&tags));
-                        } else {
-                            reports.push(SendReport::new(pubkey).error(e.to_string()).tags(&tags));
-                        }
-                    }
-                }
-            }
-
-            // Only send a backup message to current user if sent successfully to others
-            if reports.iter().all(|r| r.is_sent_success()) && backup {
-                match client
-                    .send_private_msg(public_key, &content, tags.clone())
-                    .await
-                {
-                    Ok(output) => {
-                        reports.push(SendReport::new(public_key).status(output).tags(&tags));
-                    }
-                    Err(e) => {
-                        if let nostr_sdk::client::Error::PrivateMsgRelaysNotFound = e {
-                            reports.push(SendReport::new(public_key).not_found());
-                        } else {
-                            reports
-                                .push(SendReport::new(public_key).error(e.to_string()).tags(&tags));
-                        }
-                    }
-                }
-            }
-
-            Ok(reports)
-        })
-    }
-
-    /// Create a task to resend a failed message
-    pub fn resend(
-        &self,
-        reports: Vec<SendReport>,
-        message: String,
-        backup: bool,
-        cx: &App,
-    ) -> Task<Result<Vec<SendReport>, Error>> {
-        cx.background_spawn(async move {
-            let client = nostr_client();
-            let mut resend_reports = vec![];
-            let mut resend_tag = vec![];
-
-            for report in reports.into_iter() {
-                if let Some(output) = report.status {
-                    let id = output.id();
-                    let urls: Vec<&RelayUrl> = output.failed.keys().collect();
-
-                    if let Some(event) = client.database().event_by_id(id).await? {
-                        for url in urls.into_iter() {
-                            let relay = client.pool().relay(url).await?;
-                            let id = relay.send_event(&event).await?;
-                            let resent: Output<EventId> = Output {
-                                val: id,
-                                success: HashSet::from([url.to_owned()]),
-                                failed: HashMap::new(),
-                            };
-
-                            resend_reports.push(SendReport::new(report.receiver).status(resent));
-                        }
-
-                        if let Some(tags) = report.tags {
-                            resend_tag.extend(tags);
-                        }
-                    }
-                }
-            }
-
-            // Only send a backup message to current user if sent successfully to others
-            if backup && !resend_reports.is_empty() {
-                let signer = client.signer().await?;
-                let public_key = signer.get_public_key().await?;
-                let output = client
-                    .send_private_msg(public_key, message, resend_tag)
-                    .await?;
-
-                resend_reports.push(SendReport::new(public_key).status(output));
-            }
-
-            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/relay_auth/Cargo.toml

@@ -1,21 +1,21 @@
-[package]
-name = "registry"
-version.workspace = true
-edition.workspace = true
-publish.workspace = true
-
-[dependencies]
-common = { path = "../common" }
-global = { path = "../global" }
-settings = { path = "../settings" }
-
-gpui.workspace = true
-nostr.workspace = true
-nostr-sdk.workspace = true
-anyhow.workspace = true
-itertools.workspace = true
-smallvec.workspace = true
-smol.workspace = true
-log.workspace = true
-
-fuzzy-matcher = "0.3.7"
+[package]
+name = "relay_auth"
+version.workspace = true
+edition.workspace = true
+publish.workspace = true
+
+[dependencies]
+state = { path = "../state" }
+settings = { path = "../settings" }
+common = { path = "../common" }
+theme = { path = "../theme" }
+ui = { path = "../ui" }
+
+gpui.workspace = true
+nostr-sdk.workspace = true
+
+anyhow.workspace = true
+smallvec.workspace = true
+smol.workspace = true
+flume.workspace = true
+log.workspace = true

crates/relay_auth/src/lib.rs

@@ -0,0 +1,333 @@
+use std::borrow::Cow;
+use std::cell::Cell;
+use std::collections::HashSet;
+use std::hash::{Hash, Hasher};
+use std::rc::Rc;
+
+use anyhow::{anyhow, Error};
+use gpui::{
+    App, AppContext, Context, Entity, Global, IntoElement, ParentElement, SharedString, Styled,
+    Subscription, Task, Window,
+};
+use nostr_sdk::prelude::*;
+use settings::AppSettings;
+use smallvec::{smallvec, SmallVec};
+use state::{tracker, NostrRegistry};
+use theme::ActiveTheme;
+use ui::button::{Button, ButtonVariants};
+use ui::notification::Notification;
+use ui::{v_flex, ContextModal, Disableable, IconName, Sizable};
+
+const AUTH_MESSAGE: &str =
+    "Approve the authentication request to allow Coop to continue sending or receiving events.";
+
+pub fn init(window: &mut Window, cx: &mut App) {
+    RelayAuth::set_global(cx.new(|cx| RelayAuth::new(window, cx)), cx);
+}
+
+/// Authentication request
+#[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord)]
+pub struct AuthRequest {
+    pub url: RelayUrl,
+    pub challenge: String,
+}
+
+impl Hash for AuthRequest {
+    fn hash<H: Hasher>(&self, state: &mut H) {
+        self.challenge.hash(state);
+    }
+}
+
+impl AuthRequest {
+    pub fn new(challenge: impl Into<String>, url: RelayUrl) -> Self {
+        Self {
+            challenge: challenge.into(),
+            url,
+        }
+    }
+}
+
+struct GlobalRelayAuth(Entity<RelayAuth>);
+
+impl Global for GlobalRelayAuth {}
+
+// Relay authentication
+#[derive(Debug)]
+pub struct RelayAuth {
+    /// Entity for managing auth requests
+    requests: HashSet<AuthRequest>,
+
+    /// Event subscriptions
+    _subscriptions: SmallVec<[Subscription; 1]>,
+
+    /// Tasks for asynchronous operations
+    _tasks: SmallVec<[Task<()>; 1]>,
+}
+
+impl RelayAuth {
+    /// Retrieve the global relay auth state
+    pub fn global(cx: &App) -> Entity<Self> {
+        cx.global::<GlobalRelayAuth>().0.clone()
+    }
+
+    /// Set the global relay auth instance
+    fn set_global(state: Entity<Self>, cx: &mut App) {
+        cx.set_global(GlobalRelayAuth(state));
+    }
+
+    /// Create a new relay auth instance
+    fn new(window: &mut Window, cx: &mut Context<Self>) -> Self {
+        let nostr = NostrRegistry::global(cx);
+        let client = nostr.read(cx).client();
+
+        // Get the current entity
+        let entity = cx.entity();
+
+        // Channel for communication between nostr and gpui
+        let (tx, rx) = flume::bounded::<AuthRequest>(100);
+
+        let mut subscriptions = smallvec![];
+        let mut tasks = smallvec![];
+
+        subscriptions.push(
+            // Observe the current state
+            cx.observe_in(&entity, window, |this, _, window, cx| {
+                let settings = AppSettings::global(cx);
+                let auto_auth = AppSettings::get_auto_auth(cx);
+
+                for req in this.requests.clone().into_iter() {
+                    let is_authenticated = settings.read(cx).is_authenticated(&req.url);
+
+                    if auto_auth && is_authenticated {
+                        // Automatically authenticate if the relay is authenticated before
+                        this.response(req, window, cx);
+                    } else {
+                        // Otherwise open the auth request popup
+                        this.ask_for_approval(req, window, cx);
+                    }
+                }
+            }),
+        );
+
+        tasks.push(
+            // Handle nostr notifications
+            cx.background_spawn(async move { Self::handle_notifications(&client, &tx).await }),
+        );
+
+        tasks.push(
+            // Update GPUI states
+            cx.spawn(async move |this, cx| {
+                while let Ok(request) = rx.recv_async().await {
+                    this.update(cx, |this, cx| {
+                        this.add_request(request, cx);
+                    })
+                    .ok();
+                }
+            }),
+        );
+
+        Self {
+            requests: HashSet::new(),
+            _subscriptions: subscriptions,
+            _tasks: tasks,
+        }
+    }
+
+    // Handle nostr notifications
+    async fn handle_notifications(client: &Client, tx: &flume::Sender<AuthRequest>) {
+        let mut notifications = client.notifications();
+
+        while let Ok(notification) = notifications.recv().await {
+            if let RelayPoolNotification::Message {
+                message: RelayMessage::Auth { challenge },
+                relay_url,
+            } = notification
+            {
+                let request = AuthRequest::new(challenge, relay_url);
+
+                if let Err(e) = tx.send_async(request).await {
+                    log::error!("Failed to send auth request: {}", e);
+                }
+            }
+        }
+    }
+
+    /// Add a new authentication request.
+    fn add_request(&mut self, request: AuthRequest, cx: &mut Context<Self>) {
+        self.requests.insert(request);
+        cx.notify();
+    }
+
+    /// Get the number of pending requests.
+    pub fn pending_requests(&self, _cx: &App) -> usize {
+        self.requests.len()
+    }
+
+    /// Reask for approval for all pending requests.
+    pub fn re_ask(&mut self, window: &mut Window, cx: &mut Context<Self>) {
+        for request in self.requests.clone().into_iter() {
+            self.ask_for_approval(request, window, cx);
+        }
+    }
+
+    /// Respond to an authentication request.
+    fn response(&mut self, req: AuthRequest, window: &mut Window, cx: &mut Context<Self>) {
+        let settings = AppSettings::global(cx);
+
+        let nostr = NostrRegistry::global(cx);
+        let client = nostr.read(cx).client();
+
+        let challenge = req.challenge.to_owned();
+        let url = req.url.to_owned();
+
+        let challenge_clone = challenge.clone();
+        let url_clone = url.clone();
+
+        let task: Task<Result<(), Error>> = cx.background_spawn(async move {
+            let signer = client.signer().await?;
+
+            // Construct event
+            let event: Event = EventBuilder::auth(challenge_clone, url_clone.clone())
+                .sign(&signer)
+                .await?;
+
+            // Get the event ID
+            let id = event.id;
+
+            // Get the relay
+            let relay = client.pool().relay(url_clone).await?;
+            let relay_url = relay.url();
+
+            // Subscribe to notifications
+            let mut notifications = relay.notifications();
+
+            // Send the AUTH message
+            relay.send_msg(ClientMessage::Auth(Cow::Borrowed(&event)))?;
+
+            while let Ok(notification) = notifications.recv().await {
+                match notification {
+                    RelayNotification::Message {
+                        message: RelayMessage::Ok { event_id, .. },
+                    } => {
+                        if id == event_id {
+                            // Re-subscribe to previous subscription
+                            relay.resubscribe().await?;
+
+                            // Get all pending events that need to be resent
+                            let mut tracker = tracker().write().await;
+                            let ids: Vec<EventId> = tracker.pending_resend(relay_url);
+
+                            for id in ids.into_iter() {
+                                if let Some(event) = client.database().event_by_id(&id).await? {
+                                    let event_id = relay.send_event(&event).await?;
+                                    tracker.sent(event_id);
+                                }
+                            }
+
+                            return Ok(());
+                        }
+                    }
+                    RelayNotification::AuthenticationFailed => break,
+                    RelayNotification::Shutdown => break,
+                    _ => {}
+                }
+            }
+
+            Err(anyhow!("Authentication failed"))
+        });
+
+        self._tasks.push(
+            // Handle response in the background
+            cx.spawn_in(window, async move |this, cx| {
+                match task.await {
+                    Ok(_) => {
+                        this.update_in(cx, |this, window, cx| {
+                            // Clear the current notification
+                            window.clear_notification_by_id(SharedString::from(&challenge), cx);
+
+                            // Push a new notification
+                            window.push_notification(format!("{url} has been authenticated"), cx);
+
+                            // Save the authenticated relay to automatically authenticate future requests
+                            settings.update(cx, |this, cx| {
+                                this.push_relay(&url, cx);
+                            });
+
+                            // Remove the challenge from the list of pending authentications
+                            this.requests.remove(&req);
+                            cx.notify();
+                        })
+                        .expect("Entity has been released");
+                    }
+                    Err(e) => {
+                        this.update_in(cx, |_, window, cx| {
+                            window.push_notification(Notification::error(e.to_string()), cx);
+                        })
+                        .expect("Entity has been released");
+                    }
+                };
+            }),
+        );
+    }
+
+    /// Push a popup to approve the authentication request.
+    fn ask_for_approval(&mut self, req: AuthRequest, window: &mut Window, cx: &mut Context<Self>) {
+        let url = SharedString::from(req.url.clone().to_string());
+        let entity = cx.entity().downgrade();
+        let loading = Rc::new(Cell::new(false));
+
+        let note = Notification::new()
+            .custom_id(SharedString::from(&req.challenge))
+            .autohide(false)
+            .icon(IconName::Info)
+            .title(SharedString::from("Authentication Required"))
+            .content(move |_window, cx| {
+                v_flex()
+                    .gap_2()
+                    .text_sm()
+                    .child(SharedString::from(AUTH_MESSAGE))
+                    .child(
+                        v_flex()
+                            .py_1()
+                            .px_1p5()
+                            .rounded_sm()
+                            .text_xs()
+                            .bg(cx.theme().warning_background)
+                            .text_color(cx.theme().warning_foreground)
+                            .child(url.clone()),
+                    )
+                    .into_any_element()
+            })
+            .action(move |_window, _cx| {
+                let entity = entity.clone();
+                let req = req.clone();
+
+                Button::new("approve")
+                    .label("Approve")
+                    .small()
+                    .primary()
+                    .loading(loading.get())
+                    .disabled(loading.get())
+                    .on_click({
+                        let loading = Rc::clone(&loading);
+                        move |_ev, window, cx| {
+                            // Set loading state to true
+                            loading.set(true);
+
+                            // Process to approve the request
+                            entity
+                                .update(cx, |this, cx| {
+                                    this.response(req.clone(), window, cx);
+                                })
+                                .ok();
+                        }
+                    })
+            });
+
+        // Push the notification to the current window
+        window.push_notification(note, cx);
+
+        // Bring the window to the front
+        cx.activate(true);
+    }
+}

crates/settings/Cargo.toml

@@ -5,7 +5,7 @@ edition.workspace = true
 publish.workspace = true
 
 [dependencies]
-global = { path = "../global" }
+state = { path = "../state" }
 
 nostr-sdk.workspace = true
 gpui.workspace = true

crates/settings/src/lib.rs

@@ -1,23 +1,14 @@
-use anyhow::anyhow;
-use global::constants::SETTINGS_IDENTIFIER;
-use global::nostr_client;
+use anyhow::{anyhow, Error};
 use gpui::{App, AppContext, Context, Entity, Global, Subscription, Task};
 use nostr_sdk::prelude::*;
 use serde::{Deserialize, Serialize};
 use smallvec::{smallvec, SmallVec};
+use state::NostrRegistry;
+
+const SETTINGS_IDENTIFIER: &str = "coop:settings";
 
 pub fn init(cx: &mut App) {
-    let state = cx.new(AppSettings::new);
-
-    // Observe for state changes and save settings to database
-    state.update(cx, |this, cx| {
-        this._subscriptions
-            .push(cx.observe(&state, |this, _state, cx| {
-                this.set_settings(cx);
-            }));
-    });
-
-    AppSettings::set_global(state, cx);
+    AppSettings::set_global(cx.new(AppSettings::new), cx)
 }
 
 macro_rules! setting_accessors {
@@ -26,7 +17,7 @@ macro_rules! setting_accessors {
             $(
                 paste::paste! {
                     pub fn [<get_ $field>](cx: &App) -> $type {
-                        Self::read_global(cx).setting_values.$field.clone()
+                        Self::global(cx).read(cx).setting_values.$field.clone()
                     }
 
                     pub fn [<update_ $field>](value: $type, cx: &mut App) {
@@ -52,7 +43,7 @@ setting_accessors! {
     pub auto_auth: bool,
 }
 
-#[derive(Serialize, Deserialize)]
+#[derive(Debug, Clone, Serialize, Deserialize)]
 pub struct Settings {
     pub media_server: Url,
     pub proxy_user_avatars: bool,
@@ -93,7 +84,12 @@ impl Global for GlobalAppSettings {}
 
 pub struct AppSettings {
     setting_values: Settings,
+
+    // Event subscriptions
     _subscriptions: SmallVec<[Subscription; 1]>,
+
+    // Background tasks
+    _tasks: SmallVec<[Task<()>; 1]>,
 }
 
 impl AppSettings {
@@ -102,58 +98,91 @@ impl AppSettings {
         cx.global::<GlobalAppSettings>().0.clone()
     }
 
-    /// Retrieve the Settings instance
-    pub fn read_global(cx: &App) -> &Self {
-        cx.global::<GlobalAppSettings>().0.read(cx)
-    }
-
     /// Set the Global Settings instance
     pub(crate) fn set_global(state: Entity<Self>, cx: &mut App) {
         cx.set_global(GlobalAppSettings(state));
     }
 
-    fn new(_cx: &mut Context<Self>) -> Self {
+    fn new(cx: &mut Context<Self>) -> Self {
+        let load_settings = Self::_load_settings(false, cx);
+
+        let mut tasks = smallvec![];
+        let mut subscriptions = smallvec![];
+
+        subscriptions.push(
+            // Observe and automatically save settings on changes
+            cx.observe_self(|this, cx| {
+                this.set_settings(cx);
+            }),
+        );
+
+        tasks.push(
+            // Load the initial settings
+            cx.spawn(async move |this, cx| {
+                if let Ok(settings) = load_settings.await {
+                    this.update(cx, |this, cx| {
+                        this.setting_values = settings;
+                        cx.notify();
+                    })
+                    .ok();
+                }
+            }),
+        );
+
         Self {
             setting_values: Settings::default(),
-            _subscriptions: smallvec![],
+            _subscriptions: subscriptions,
+            _tasks: tasks,
         }
     }
 
-    pub fn load_settings(&self, cx: &mut Context<Self>) {
-        let task: Task<Result<Settings, anyhow::Error>> = cx.background_spawn(async move {
-            let client = nostr_client();
-            let signer = client.signer().await?;
-            let public_key = signer.get_public_key().await?;
+    pub fn load_settings(&mut self, cx: &mut Context<Self>) {
+        let task = Self::_load_settings(true, cx);
 
-            let filter = Filter::new()
+        self._tasks.push(
+            // Run task in the background
+            cx.spawn(async move |this, cx| {
+                if let Ok(settings) = task.await {
+                    this.update(cx, |this, cx| {
+                        this.setting_values = settings;
+                        cx.notify();
+                    })
+                    .ok();
+                }
+            }),
+        );
+    }
+
+    fn _load_settings(user: bool, cx: &App) -> Task<Result<Settings, Error>> {
+        let nostr = NostrRegistry::global(cx);
+        let client = nostr.read(cx).client();
+
+        cx.background_spawn(async move {
+            let mut filter = Filter::new()
                 .kind(Kind::ApplicationSpecificData)
                 .identifier(SETTINGS_IDENTIFIER)
-                .author(public_key)
                 .limit(1);
 
+            if user {
+                let signer = client.signer().await?;
+                let public_key = signer.get_public_key().await?;
+                filter = filter.author(public_key);
+            }
+
             if let Some(event) = client.database().query(filter).await?.first_owned() {
                 Ok(serde_json::from_str(&event.content).unwrap_or(Settings::default()))
             } else {
                 Err(anyhow!("Not found"))
             }
-        });
-
-        cx.spawn(async move |this, cx| {
-            if let Ok(settings) = task.await {
-                this.update(cx, |this, cx| {
-                    this.setting_values = settings;
-                    cx.notify();
-                })
-                .ok();
-            }
         })
-        .detach();
     }
 
-    pub fn set_settings(&self, cx: &mut Context<Self>) {
+    pub fn set_settings(&mut self, cx: &mut Context<Self>) {
+        let nostr = NostrRegistry::global(cx);
+        let client = nostr.read(cx).client();
+
         if let Ok(content) = serde_json::to_string(&self.setting_values) {
-            let task: Task<Result<(), anyhow::Error>> = cx.background_spawn(async move {
-                let client = nostr_client();
+            let task: Task<Result<(), Error>> = cx.background_spawn(async move {
                 let signer = client.signer().await?;
                 let public_key = signer.get_public_key().await?;
 
@@ -172,14 +201,17 @@ impl AppSettings {
         }
     }
 
+    /// Check if auto authentication is enabled
     pub fn is_auto_auth(&self) -> bool {
         !self.setting_values.authenticated_relays.is_empty() && self.setting_values.auto_auth
     }
 
+    /// Check if a relay is authenticated
     pub fn is_authenticated(&self, url: &RelayUrl) -> bool {
         self.setting_values.authenticated_relays.contains(url)
     }
 
+    /// Push a relay to the authenticated relays list
     pub fn push_relay(&mut self, relay_url: &RelayUrl, cx: &mut Context<Self>) {
         if !self.is_authenticated(relay_url) {
             self.setting_values

crates/signer_proxy/Cargo.toml

@@ -1,25 +0,0 @@
-[package]
-name = "signer_proxy"
-version.workspace = true
-edition.workspace = true
-publish.workspace = true
-
-[dependencies]
-global = { path = "../global" }
-
-nostr.workspace = true
-smol.workspace = true
-oneshot.workspace = true
-anyhow.workspace = true
-log.workspace = true
-futures.workspace = true
-smallvec.workspace = true
-serde.workspace = true
-serde_json.workspace = true
-
-atomic-destructor = "0.3.0"
-uuid = { version = "1.17", features = ["serde", "v4"] }
-hyper = { version = "1.6", features = ["server", "http1"] }
-hyper-util = { version = "0.1", features = ["server"] }
-bytes = "1.10"
-http-body-util = "0.1"

crates/signer_proxy/index.html

@@ -1,35 +0,0 @@
-<!doctype html>
-<html lang="en">
-    <head>
-        <title>NIP-07 Proxy</title>
-        <link rel="stylesheet" href="style.css" />
-    </head>
-    <body>
-        <div class="container">
-            <h1>NIP-07 Proxy</h1>
-            <p>
-                This page acts as a proxy between your native application and
-                the NIP-07 browser extension.
-            </p>
-            <div class="status-box">
-                <strong>Status:</strong> <span id="status">Checking...</span>
-            </div>
-            <p>
-                <small
-                    >Keep this tab open while using your application. The page
-                    will automatically poll for requests from your native
-                    app.</small
-                >
-            </p>
-
-            <h3>Debug Info</h3>
-            <p>
-                <small
-                    >Check the browser console (F12) for detailed logs.</small
-                >
-            </p>
-        </div>
-
-        <script src="proxy.js"></script>
-    </body>
-</html>

crates/signer_proxy/proxy.js

@@ -1,151 +0,0 @@
-let isPolling = false;
-
-async function pollForRequests() {
-  if (isPolling) return;
-  isPolling = true;
-
-  try {
-    const response = await fetch("/api/pending");
-    const data = await response.json();
-
-    console.log("Polled for requests, got:", data);
-
-    // Process any new requests
-    if (data.requests && data.requests.length > 0) {
-      console.log(`Processing ${data.requests.length} requests`);
-      for (const request of data.requests) {
-        await handleNip07Request(request);
-      }
-    }
-  } catch (error) {
-    console.error("Polling error:", error);
-    updateStatus("Error: " + error.message, "error");
-  }
-
-  isPolling = false;
-}
-
-async function handleNip07Request(request) {
-  console.log("Handling request:", request);
-
-  try {
-    let result;
-
-    if (!window.nostr) {
-      throw new Error("NIP-07 extension not available");
-    }
-
-    switch (request.method) {
-      case "get_public_key":
-        console.log("Calling nostr.getPublicKey()");
-        result = await window.nostr.getPublicKey();
-        console.log("Got public key:", result);
-        break;
-
-      case "sign_event":
-        console.log("Calling nostr.signEvent() with:", request.params);
-        result = await window.nostr.signEvent(request.params);
-        console.log("Got signed event:", result);
-        break;
-
-      case "nip04_encrypt":
-        console.log("Calling nostr.nip04.encrypt()");
-        result = await window.nostr.nip04.encrypt(
-          request.params.public_key,
-          request.params.content,
-        );
-        break;
-
-      case "nip04_decrypt":
-        console.log("Calling nostr.nip04.decrypt()");
-        result = await window.nostr.nip04.decrypt(
-          request.params.public_key,
-          request.params.content,
-        );
-        break;
-
-      case "nip44_encrypt":
-        console.log("Calling nostr.nip44.encrypt()");
-        result = await window.nostr.nip44.encrypt(
-          request.params.public_key,
-          request.params.content,
-        );
-        break;
-
-      case "nip44_decrypt":
-        console.log("Calling nostr.nip44.decrypt()");
-        result = await window.nostr.nip44.decrypt(
-          request.params.public_key,
-          request.params.content,
-        );
-        break;
-
-      default:
-        throw new Error(`Unknown method: ${request.method}`);
-    }
-
-    // Send response back to server
-    const responsePayload = {
-      id: request.id,
-      result: result,
-      error: null,
-    };
-
-    console.log("Sending response:", responsePayload);
-
-    await fetch("/api/response", {
-      method: "POST",
-      headers: {
-        "Content-Type": "application/json",
-      },
-      body: JSON.stringify(responsePayload),
-    });
-
-    console.log("Response sent successfully");
-    updateStatus("Request processed successfully", "connected");
-  } catch (error) {
-    console.error("Error handling request:", error);
-
-    // Send error response back to server
-    const errorPayload = {
-      id: request.id,
-      result: null,
-      error: error.message,
-    };
-
-    console.log("Sending error response:", errorPayload);
-
-    await fetch("/api/response", {
-      method: "POST",
-      headers: {
-        "Content-Type": "application/json",
-      },
-      body: JSON.stringify(errorPayload),
-    });
-
-    updateStatus("Error: " + error.message, "error");
-  }
-}
-
-function updateStatus(message, className) {
-  const statusEl = document.getElementById("status");
-  statusEl.textContent = message;
-  statusEl.className = className;
-}
-
-// Start polling when page loads
-window.addEventListener("load", () => {
-  console.log("NIP-07 Proxy loaded");
-
-  // Check if NIP-07 extension is available
-  if (window.nostr) {
-    console.log("NIP-07 extension detected");
-    updateStatus("Connected to NIP-07 extension - Ready", "connected");
-  } else {
-    console.log("NIP-07 extension not found");
-    updateStatus("NIP-07 extension not found", "error");
-  }
-
-  // Start polling every 500 ms
-  setInterval(pollForRequests, 500);
-});

crates/signer_proxy/src/error.rs

@@ -1,73 +0,0 @@
-use std::{fmt, io};
-
-use hyper::http;
-use nostr::event;
-use oneshot::RecvError;
-
-/// Error
-#[derive(Debug)]
-pub enum Error {
-    /// I/O error
-    Io(io::Error),
-    /// HTTP error
-    Http(http::Error),
-    /// Json error
-    Json(serde_json::Error),
-    /// Event error
-    Event(event::Error),
-    /// Oneshot channel receive error
-    OneShotRecv(RecvError),
-    /// Generic error
-    Generic(String),
-    /// Timeout
-    Timeout,
-    /// The server is shutdown
-    Shutdown,
-}
-
-impl std::error::Error for Error {}
-
-impl fmt::Display for Error {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        match self {
-            Self::Io(e) => write!(f, "{e}"),
-            Self::Http(e) => write!(f, "{e}"),
-            Self::Json(e) => write!(f, "{e}"),
-            Self::Event(e) => write!(f, "{e}"),
-            Self::OneShotRecv(e) => write!(f, "{e}"),
-            Self::Generic(e) => write!(f, "{e}"),
-            Self::Timeout => write!(f, "timeout"),
-            Self::Shutdown => write!(f, "server is shutdown"),
-        }
-    }
-}
-
-impl From<io::Error> for Error {
-    fn from(e: io::Error) -> Self {
-        Self::Io(e)
-    }
-}
-
-impl From<http::Error> for Error {
-    fn from(e: http::Error) -> Self {
-        Self::Http(e)
-    }
-}
-
-impl From<serde_json::Error> for Error {
-    fn from(e: serde_json::Error) -> Self {
-        Self::Json(e)
-    }
-}
-
-impl From<event::Error> for Error {
-    fn from(e: event::Error) -> Self {
-        Self::Event(e)
-    }
-}
-
-impl From<RecvError> for Error {
-    fn from(e: RecvError) -> Self {
-        Self::OneShotRecv(e)
-    }
-}

crates/signer_proxy/src/lib.rs

@@ -1,678 +0,0 @@
-use std::collections::HashMap;
-use std::net::{IpAddr, Ipv4Addr, SocketAddr, SocketAddrV4, TcpListener};
-use std::pin::Pin;
-use std::sync::atomic::{AtomicBool, AtomicU64, Ordering};
-use std::sync::Arc;
-use std::task::{Context, Poll};
-use std::time::{Duration, SystemTime, UNIX_EPOCH};
-
-use atomic_destructor::{AtomicDestroyer, AtomicDestructor};
-use bytes::Bytes;
-use futures::FutureExt;
-use http_body_util::combinators::BoxBody;
-use http_body_util::{BodyExt, Full};
-use hyper::body::Incoming;
-use hyper::server::conn::http1;
-use hyper::service::service_fn;
-use hyper::{Method, Request, Response, StatusCode};
-use nostr::prelude::{BoxedFuture, SignerBackend};
-use nostr::{Event, NostrSigner, PublicKey, SignerError, UnsignedEvent};
-use serde::de::DeserializeOwned;
-use serde::{Deserialize, Serialize, Serializer};
-use serde_json::{json, Value};
-use smol::io::{AsyncRead, AsyncWrite};
-use smol::lock::Mutex;
-use uuid::Uuid;
-
-use crate::error::Error;
-
-mod error;
-
-const HTML: &str = include_str!("../index.html");
-const JS: &str = include_str!("../proxy.js");
-const CSS: &str = include_str!("../style.css");
-
-/// Wrapper to make smol::Async<TcpStream> compatible with hyper
-struct HyperIo<T> {
-    inner: T,
-}
-
-impl<T> HyperIo<T> {
-    fn new(inner: T) -> Self {
-        Self { inner }
-    }
-}
-
-impl<T: AsyncRead + Unpin> hyper::rt::Read for HyperIo<T> {
-    fn poll_read(
-        mut self: Pin<&mut Self>,
-        cx: &mut Context<'_>,
-        mut buf: hyper::rt::ReadBufCursor<'_>,
-    ) -> Poll<Result<(), std::io::Error>> {
-        let mut tbuf = vec![0; buf.remaining()];
-        match Pin::new(&mut self.inner).poll_read(cx, &mut tbuf) {
-            Poll::Ready(Ok(n)) => {
-                buf.put_slice(&tbuf[..n]);
-                Poll::Ready(Ok(()))
-            }
-            Poll::Ready(Err(e)) => Poll::Ready(Err(e)),
-            Poll::Pending => Poll::Pending,
-        }
-    }
-}
-
-impl<T: AsyncWrite + Unpin> hyper::rt::Write for HyperIo<T> {
-    fn poll_write(
-        mut self: Pin<&mut Self>,
-        cx: &mut Context<'_>,
-        buf: &[u8],
-    ) -> Poll<Result<usize, std::io::Error>> {
-        Pin::new(&mut self.inner).poll_write(cx, buf)
-    }
-
-    fn poll_flush(
-        mut self: Pin<&mut Self>,
-        cx: &mut Context<'_>,
-    ) -> Poll<Result<(), std::io::Error>> {
-        Pin::new(&mut self.inner).poll_flush(cx)
-    }
-
-    fn poll_shutdown(
-        mut self: Pin<&mut Self>,
-        cx: &mut Context<'_>,
-    ) -> Poll<Result<(), std::io::Error>> {
-        Pin::new(&mut self.inner).poll_close(cx)
-    }
-}
-
-type PendingResponseMap = HashMap<Uuid, oneshot::Sender<Result<Value, String>>>;
-
-#[derive(Debug, Deserialize)]
-struct Message {
-    id: Uuid,
-    error: Option<String>,
-    result: Option<Value>,
-}
-
-impl Message {
-    fn into_result(self) -> Result<Value, String> {
-        if let Some(error) = self.error {
-            Err(error)
-        } else {
-            Ok(self.result.unwrap_or(Value::Null))
-        }
-    }
-}
-
-#[derive(Debug, Clone, Copy)]
-enum RequestMethod {
-    GetPublicKey,
-    SignEvent,
-    Nip04Encrypt,
-    Nip04Decrypt,
-    Nip44Encrypt,
-    Nip44Decrypt,
-}
-
-impl RequestMethod {
-    fn as_str(&self) -> &str {
-        match self {
-            Self::GetPublicKey => "get_public_key",
-            Self::SignEvent => "sign_event",
-            Self::Nip04Encrypt => "nip04_encrypt",
-            Self::Nip04Decrypt => "nip04_decrypt",
-            Self::Nip44Encrypt => "nip44_encrypt",
-            Self::Nip44Decrypt => "nip44_decrypt",
-        }
-    }
-}
-
-impl Serialize for RequestMethod {
-    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
-    where
-        S: Serializer,
-    {
-        serializer.serialize_str(self.as_str())
-    }
-}
-
-#[derive(Debug, Clone, Serialize)]
-struct RequestData {
-    id: Uuid,
-    method: RequestMethod,
-    params: Value,
-}
-
-impl RequestData {
-    #[inline]
-    fn new(method: RequestMethod, params: Value) -> Self {
-        Self {
-            id: Uuid::new_v4(),
-            method,
-            params,
-        }
-    }
-}
-
-#[derive(Serialize)]
-struct Requests<'a> {
-    requests: &'a [RequestData],
-}
-
-impl<'a> Requests<'a> {
-    #[inline]
-    fn new(requests: &'a [RequestData]) -> Self {
-        Self { requests }
-    }
-
-    #[inline]
-    fn len(&self) -> usize {
-        self.requests.len()
-    }
-}
-
-/// Params for NIP-04 and NIP-44 encryption/decryption
-#[derive(Serialize)]
-struct CryptoParams<'a> {
-    public_key: &'a PublicKey,
-    content: &'a str,
-}
-
-impl<'a> CryptoParams<'a> {
-    #[inline]
-    fn new(public_key: &'a PublicKey, content: &'a str) -> Self {
-        Self {
-            public_key,
-            content,
-        }
-    }
-}
-
-#[derive(Debug)]
-struct ProxyState {
-    /// Requests waiting to be picked up by browser
-    pub outgoing_requests: Mutex<Vec<RequestData>>,
-    /// Map of request ID to response sender
-    pub pending_responses: Mutex<PendingResponseMap>,
-    /// Last time the client ask for the pending requests
-    pub last_pending_request: Arc<AtomicU64>,
-    /// Notification for shutdown
-    pub shutdown_notify: smol::channel::Receiver<()>,
-    pub shutdown_sender: smol::channel::Sender<()>,
-}
-
-/// Configuration options for [`BrowserSignerProxy`].
-#[derive(Debug, Clone, Serialize, Deserialize)]
-pub struct BrowserSignerProxyOptions {
-    /// Request timeout for the signer extension. Default is 30 seconds.
-    pub timeout: Duration,
-    /// Proxy server IP address and port. Default is `127.0.0.1:7400`.
-    pub addr: SocketAddr,
-}
-
-#[derive(Debug, Clone)]
-struct InnerBrowserSignerProxy {
-    /// Configuration options for the proxy
-    options: BrowserSignerProxyOptions,
-    /// Internal state of the proxy including request queues
-    state: Arc<ProxyState>,
-    /// Flag to indicate if the server is shutdown
-    is_shutdown: Arc<AtomicBool>,
-    /// Flat indicating if the server is started
-    is_started: Arc<AtomicBool>,
-}
-
-impl AtomicDestroyer for InnerBrowserSignerProxy {
-    fn on_destroy(&self) {
-        self.shutdown();
-    }
-}
-
-impl InnerBrowserSignerProxy {
-    #[inline]
-    fn is_shutdown(&self) -> bool {
-        self.is_shutdown.load(Ordering::SeqCst)
-    }
-
-    fn shutdown(&self) {
-        // Mark the server as shutdown
-        self.is_shutdown.store(true, Ordering::SeqCst);
-
-        // Notify all waiters that the proxy is shutting down
-        let _ = self.state.shutdown_sender.try_send(());
-    }
-}
-
-/// Nostr Browser Signer Proxy
-///
-/// Proxy to use Nostr Browser signer (NIP-07) in native applications.
-#[derive(Debug, Clone)]
-pub struct BrowserSignerProxy {
-    inner: AtomicDestructor<InnerBrowserSignerProxy>,
-}
-
-impl Default for BrowserSignerProxyOptions {
-    fn default() -> Self {
-        Self {
-            timeout: Duration::from_secs(30),
-            // 7 for NIP-07 and 400 because the NIP title is 40 bytes :)
-            addr: SocketAddr::V4(SocketAddrV4::new(Ipv4Addr::LOCALHOST, 7400)),
-        }
-    }
-}
-
-impl BrowserSignerProxyOptions {
-    /// Sets the timeout duration.
-    pub const fn timeout(mut self, timeout: Duration) -> Self {
-        self.timeout = timeout;
-        self
-    }
-
-    /// Sets the IP address.
-    pub const fn ip_addr(mut self, new_ip: IpAddr) -> Self {
-        self.addr = SocketAddr::new(new_ip, self.addr.port());
-        self
-    }
-
-    /// Sets the port number.
-    pub const fn port(mut self, new_port: u16) -> Self {
-        self.addr = SocketAddr::new(self.addr.ip(), new_port);
-        self
-    }
-}
-
-impl BrowserSignerProxy {
-    /// Construct a new browser signer proxy
-    pub fn new(options: BrowserSignerProxyOptions) -> Self {
-        let (shutdown_sender, shutdown_notify) = smol::channel::unbounded();
-        let state = ProxyState {
-            outgoing_requests: Mutex::new(Vec::new()),
-            pending_responses: Mutex::new(HashMap::new()),
-            last_pending_request: Arc::new(AtomicU64::new(0)),
-            shutdown_notify,
-            shutdown_sender,
-        };
-
-        Self {
-            inner: AtomicDestructor::new(InnerBrowserSignerProxy {
-                options,
-                state: Arc::new(state),
-                is_shutdown: Arc::new(AtomicBool::new(false)),
-                is_started: Arc::new(AtomicBool::new(false)),
-            }),
-        }
-    }
-
-    /// Indicates whether the server is currently running.
-    #[inline]
-    pub fn is_started(&self) -> bool {
-        self.inner.is_started.load(Ordering::SeqCst)
-    }
-
-    /// Checks if there is an open browser tap ready to respond to requests by
-    /// verifying the time since the last pending request.
-    #[inline]
-    pub fn is_session_active(&self) -> bool {
-        current_time() - self.inner.state.last_pending_request.load(Ordering::SeqCst) < 2
-    }
-
-    /// Get the signer proxy webpage URL
-    #[inline]
-    pub fn url(&self) -> String {
-        format!("http://{}", self.inner.options.addr)
-    }
-
-    /// Start the proxy
-    ///
-    /// If this is not called, will be automatically started on the first interaction with the signer.
-    pub async fn start(&self) -> Result<(), Error> {
-        // Ensure is not shutdown
-        if self.inner.is_shutdown() {
-            return Err(Error::Shutdown);
-        }
-
-        // Mark the proxy as started and check if was already started
-        let is_started: bool = self.inner.is_started.swap(true, Ordering::SeqCst);
-
-        // Immediately return if already started
-        if is_started {
-            return Ok(());
-        }
-
-        let listener = match smol::Async::<TcpListener>::bind(self.inner.options.addr) {
-            Ok(listener) => listener,
-            Err(e) => {
-                // Undo the started flag if binding fails
-                self.inner.is_started.store(false, Ordering::SeqCst);
-
-                // Propagate error
-                return Err(Error::from(e));
-            }
-        };
-
-        let addr: SocketAddr = self.inner.options.addr;
-        let state: Arc<ProxyState> = self.inner.state.clone();
-
-        smol::spawn(async move {
-            log::info!("Starting proxy server on {addr}");
-
-            loop {
-                futures::select! {
-                    accept_result = listener.accept().fuse() => {
-                        let (stream, _) = match accept_result {
-                            Ok(conn) => conn,
-                            Err(e) => {
-                                log::error!("Failed to accept connection: {e}");
-                                continue;
-                            }
-                        };
-
-                        let io = HyperIo::new(stream);
-                        let state: Arc<ProxyState> = state.clone();
-                        let shutdown_notify = state.shutdown_notify.clone();
-
-                        smol::spawn(async move {
-                            let service = service_fn(move |req| {
-                                handle_request(req, state.clone())
-                            });
-
-                            futures::select! {
-                                res = http1::Builder::new().serve_connection(io, service).fuse() => {
-                                    if let Err(e) = res {
-                                        log::error!("Error serving connection: {e}");
-                                    }
-                                }
-                                _ = shutdown_notify.recv().fuse() => {
-                                    log::debug!("Closing connection, proxy server is shutting down.");
-                                }
-                            }
-                        }).detach();
-                    },
-                    _ = state.shutdown_notify.recv().fuse() => {
-                        break;
-                    }
-                }
-            }
-
-            log::info!("Shutting down proxy server.");
-        }).detach();
-
-        Ok(())
-    }
-
-    #[inline]
-    async fn store_pending_response(&self, id: Uuid, tx: oneshot::Sender<Result<Value, String>>) {
-        let mut pending_responses = self.inner.state.pending_responses.lock().await;
-        pending_responses.insert(id, tx);
-    }
-
-    #[inline]
-    async fn store_outgoing_request(&self, request: RequestData) {
-        let mut outgoing_requests = self.inner.state.outgoing_requests.lock().await;
-        outgoing_requests.push(request);
-    }
-
-    async fn request<T>(&self, method: RequestMethod, params: Value) -> Result<T, Error>
-    where
-        T: DeserializeOwned,
-    {
-        // Start the proxy if not already started
-        self.start().await?;
-
-        // Construct the request
-        let request: RequestData = RequestData::new(method, params);
-
-        // Create a oneshot channel
-        let (tx, rx) = oneshot::channel();
-
-        // Store the response sender
-        self.store_pending_response(request.id, tx).await;
-
-        // Add to outgoing requests queue
-        self.store_outgoing_request(request).await;
-
-        // Wait for response
-        let timeout_fut = smol::Timer::after(self.inner.options.timeout);
-        let recv_fut = rx;
-
-        match futures::future::select(timeout_fut, recv_fut).await {
-            futures::future::Either::Left(_) => Err(Error::Timeout),
-            futures::future::Either::Right((recv_result, _)) => {
-                match recv_result.map_err(|_| Error::Generic("Channel closed".to_string()))? {
-                    Ok(res) => Ok(serde_json::from_value(res)?),
-                    Err(error) => Err(Error::Generic(error)),
-                }
-            }
-        }
-    }
-
-    #[inline]
-    async fn _get_public_key(&self) -> Result<PublicKey, Error> {
-        self.request(RequestMethod::GetPublicKey, json!({})).await
-    }
-
-    #[inline]
-    async fn _sign_event(&self, event: UnsignedEvent) -> Result<Event, Error> {
-        let event: Event = self
-            .request(RequestMethod::SignEvent, serde_json::to_value(event)?)
-            .await?;
-        event.verify()?;
-        Ok(event)
-    }
-
-    #[inline]
-    async fn _nip04_encrypt(&self, public_key: &PublicKey, content: &str) -> Result<String, Error> {
-        let params = CryptoParams::new(public_key, content);
-        self.request(RequestMethod::Nip04Encrypt, serde_json::to_value(params)?)
-            .await
-    }
-
-    #[inline]
-    async fn _nip04_decrypt(&self, public_key: &PublicKey, content: &str) -> Result<String, Error> {
-        let params = CryptoParams::new(public_key, content);
-        self.request(RequestMethod::Nip04Decrypt, serde_json::to_value(params)?)
-            .await
-    }
-
-    #[inline]
-    async fn _nip44_encrypt(&self, public_key: &PublicKey, content: &str) -> Result<String, Error> {
-        let params = CryptoParams::new(public_key, content);
-        self.request(RequestMethod::Nip44Encrypt, serde_json::to_value(params)?)
-            .await
-    }
-
-    #[inline]
-    async fn _nip44_decrypt(&self, public_key: &PublicKey, content: &str) -> Result<String, Error> {
-        let params = CryptoParams::new(public_key, content);
-        self.request(RequestMethod::Nip44Decrypt, serde_json::to_value(params)?)
-            .await
-    }
-}
-
-impl NostrSigner for BrowserSignerProxy {
-    fn backend(&self) -> SignerBackend {
-        SignerBackend::BrowserExtension
-    }
-
-    #[inline]
-    fn get_public_key(&self) -> BoxedFuture<Result<PublicKey, SignerError>> {
-        Box::pin(async move { self._get_public_key().await.map_err(SignerError::backend) })
-    }
-
-    #[inline]
-    fn sign_event(&self, unsigned: UnsignedEvent) -> BoxedFuture<Result<Event, SignerError>> {
-        Box::pin(async move {
-            self._sign_event(unsigned)
-                .await
-                .map_err(SignerError::backend)
-        })
-    }
-
-    #[inline]
-    fn nip04_encrypt<'a>(
-        &'a self,
-        public_key: &'a PublicKey,
-        content: &'a str,
-    ) -> BoxedFuture<'a, Result<String, SignerError>> {
-        Box::pin(async move {
-            self._nip04_encrypt(public_key, content)
-                .await
-                .map_err(SignerError::backend)
-        })
-    }
-
-    #[inline]
-    fn nip04_decrypt<'a>(
-        &'a self,
-        public_key: &'a PublicKey,
-        encrypted_content: &'a str,
-    ) -> BoxedFuture<'a, Result<String, SignerError>> {
-        Box::pin(async move {
-            self._nip04_decrypt(public_key, encrypted_content)
-                .await
-                .map_err(SignerError::backend)
-        })
-    }
-
-    #[inline]
-    fn nip44_encrypt<'a>(
-        &'a self,
-        public_key: &'a PublicKey,
-        content: &'a str,
-    ) -> BoxedFuture<'a, Result<String, SignerError>> {
-        Box::pin(async move {
-            self._nip44_encrypt(public_key, content)
-                .await
-                .map_err(SignerError::backend)
-        })
-    }
-
-    #[inline]
-    fn nip44_decrypt<'a>(
-        &'a self,
-        public_key: &'a PublicKey,
-        payload: &'a str,
-    ) -> BoxedFuture<'a, Result<String, SignerError>> {
-        Box::pin(async move {
-            self._nip44_decrypt(public_key, payload)
-                .await
-                .map_err(SignerError::backend)
-        })
-    }
-}
-
-async fn handle_request(
-    req: Request<Incoming>,
-    state: Arc<ProxyState>,
-) -> Result<Response<BoxBody<Bytes, Error>>, Error> {
-    match (req.method(), req.uri().path()) {
-        // Serve the HTML proxy page
-        (&Method::GET, "/") => Ok(Response::builder()
-            .header("Content-Type", "text/html")
-            .body(full(HTML))?),
-        // Serve the CSS page style
-        (&Method::GET, "/style.css") => Ok(Response::builder()
-            .header("Content-Type", "text/css")
-            .body(full(CSS))?),
-        // Serve the JS proxy script
-        (&Method::GET, "/proxy.js") => Ok(Response::builder()
-            .header("Content-Type", "application/javascript")
-            .body(full(JS))?),
-        // Browser polls this endpoint to get pending requests
-        (&Method::GET, "/api/pending") => {
-            state
-                .last_pending_request
-                .store(current_time(), Ordering::SeqCst);
-
-            let mut outgoing = state.outgoing_requests.lock().await;
-
-            let requests: Requests<'_> = Requests::new(&outgoing);
-            let json: String = serde_json::to_string(&requests)?;
-
-            log::debug!("Sending {} pending requests to browser", requests.len());
-
-            // Clear the outgoing requests after sending them
-            outgoing.clear();
-
-            Ok(Response::builder()
-                .header("Content-Type", "application/json")
-                .header("Access-Control-Allow-Origin", "*")
-                .body(full(json))?)
-        }
-        // Get response
-        (&Method::POST, "/api/response") => {
-            // Correctly collect the body bytes from the stream
-            let body_bytes: Bytes = match req.into_body().collect().await {
-                Ok(collected) => collected.to_bytes(),
-                Err(e) => {
-                    log::error!("Failed to read body: {e}");
-                    let response = Response::builder()
-                        .status(StatusCode::BAD_REQUEST)
-                        .body(full("Failed to read body"))?;
-                    return Ok(response);
-                }
-            };
-
-            // Handle responses from the browser extension
-            let message: Message = match serde_json::from_slice(&body_bytes) {
-                Ok(json) => json,
-                Err(_) => {
-                    let response = Response::builder()
-                        .status(StatusCode::BAD_REQUEST)
-                        .body(full("Invalid JSON"))?;
-                    return Ok(response);
-                }
-            };
-
-            log::debug!("Received response from browser: {message:?}");
-
-            let id: Uuid = message.id;
-            let mut pending = state.pending_responses.lock().await;
-
-            match pending.remove(&id) {
-                Some(sender) => {
-                    let _ = sender.send(message.into_result());
-                }
-                None => log::warn!("No pending request found for {id}"),
-            }
-
-            let response = Response::builder()
-                .header("Access-Control-Allow-Origin", "*")
-                .body(full("OK"))?;
-            Ok(response)
-        }
-        (&Method::OPTIONS, _) => {
-            // Handle CORS preflight requests
-            let response = Response::builder()
-                .header("Access-Control-Allow-Origin", "*")
-                .header("Access-Control-Allow-Methods", "GET, POST, OPTIONS")
-                .header("Access-Control-Allow-Headers", "Content-Type")
-                .body(full(""))?;
-            Ok(response)
-        }
-        // 404 - not found
-        _ => {
-            let response = Response::builder()
-                .status(StatusCode::NOT_FOUND)
-                .body(full("Not Found"))?;
-            Ok(response)
-        }
-    }
-}
-
-#[inline]
-fn full<T: Into<Bytes>>(chunk: T) -> BoxBody<Bytes, Error> {
-    Full::new(chunk.into())
-        .map_err(|never| match never {})
-        .boxed()
-}
-
-/// Gets the current time in seconds since the Unix epoch (1970-01-01). If the
-/// time is before the epoch, returns 0.
-#[inline]
-fn current_time() -> u64 {
-    SystemTime::now()
-        .duration_since(UNIX_EPOCH)
-        .map(|d| d.as_secs())
-        .unwrap_or_default()
-}

crates/signer_proxy/style.css

@@ -1,30 +0,0 @@
-body {
-    font-family:
-        -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans,
-        Ubuntu, Cantarell, "Helvetica Neue", sans-serif;
-    padding: 20px;
-    background-color: #f0f0f0;
-}
-.container {
-    max-width: 600px;
-    margin: 0 auto;
-    background: white;
-    padding: 20px;
-    border-radius: 8px;
-    box-shadow: 0 2px 10px rgba(0, 0, 0, 0.1);
-}
-.connected {
-    color: green;
-    font-weight: bold;
-}
-.error {
-    color: red;
-    font-weight: bold;
-}
-.status-box {
-    background: #f9f9f9;
-    padding: 10px;
-    border-radius: 4px;
-    margin: 10px 0;
-    border-left: 4px solid #ccc;
-}

crates/state/Cargo.toml

@@ -1,16 +1,19 @@
 [package]
-name = "global"
+name = "state"
 version.workspace = true
 edition.workspace = true
 publish.workspace = true
 
 [dependencies]
+common = { path = "../common" }
+
 nostr-sdk.workspace = true
-dirs.workspace = true
+nostr-lmdb.workspace = true
+
+gpui.workspace = true
 smol.workspace = true
 flume.workspace = true
 log.workspace = true
 anyhow.workspace = true
 
-whoami = "1.5.2"
-rustls = "0.23.23"
+rustls = "0.23"

crates/state/src/device.rs

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

crates/state/src/event.rs

@@ -0,0 +1,46 @@
+use std::collections::HashSet;
+use std::sync::{Arc, OnceLock};
+
+use nostr_sdk::prelude::*;
+use smol::lock::RwLock;
+
+static TRACKER: OnceLock<Arc<RwLock<EventTracker>>> = OnceLock::new();
+
+pub fn tracker() -> &'static Arc<RwLock<EventTracker>> {
+    TRACKER.get_or_init(|| Arc::new(RwLock::new(EventTracker::default())))
+}
+
+/// Event tracker
+#[derive(Debug, Clone, Default)]
+pub struct EventTracker {
+    /// Tracking events sent by Coop in the current session
+    sent_ids: HashSet<EventId>,
+
+    /// Events that need to be resent later
+    pending_resend: HashSet<(EventId, RelayUrl)>,
+}
+
+impl EventTracker {
+    /// Check if an event was sent by Coop in the current session.
+    pub fn is_sent_by_coop(&self, id: &EventId) -> bool {
+        self.sent_ids.contains(id)
+    }
+
+    /// Mark an event as sent by Coop.
+    pub fn sent(&mut self, id: EventId) {
+        self.sent_ids.insert(id);
+    }
+
+    /// Get all events that need to be resent later for a specific relay.
+    pub fn pending_resend(&mut self, relay: &RelayUrl) -> Vec<EventId> {
+        self.pending_resend
+            .extract_if(|(_id, url)| url == relay)
+            .map(|(id, _url)| id)
+            .collect()
+    }
+
+    /// Add an event (id and relay url) to the pending resend set.
+    pub fn add_to_pending(&mut self, id: EventId, url: RelayUrl) {
+        self.pending_resend.insert((id, url));
+    }
+}

crates/state/src/gossip.rs

@@ -0,0 +1,107 @@
+use std::collections::{HashMap, HashSet};
+
+use nostr_sdk::prelude::*;
+
+/// Gossip
+#[derive(Debug, Clone, Default)]
+pub struct Gossip {
+    /// Gossip relays for each public key
+    relays: HashMap<PublicKey, HashSet<(RelayUrl, Option<RelayMetadata>)>>,
+    /// Messaging relays for each public key
+    messaging_relays: HashMap<PublicKey, HashSet<RelayUrl>>,
+}
+
+impl Gossip {
+    /// Get read relays for a given public key
+    pub fn read_relays(&self, public_key: &PublicKey) -> Vec<RelayUrl> {
+        self.relays
+            .get(public_key)
+            .map(|relays| {
+                relays
+                    .iter()
+                    .filter_map(|(url, metadata)| {
+                        if metadata.is_none() || metadata == &Some(RelayMetadata::Read) {
+                            Some(url.to_owned())
+                        } else {
+                            None
+                        }
+                    })
+                    .collect()
+            })
+            .unwrap_or_default()
+    }
+
+    /// Get write relays for a given public key
+    pub fn write_relays(&self, public_key: &PublicKey) -> Vec<RelayUrl> {
+        self.relays
+            .get(public_key)
+            .map(|relays| {
+                relays
+                    .iter()
+                    .filter_map(|(url, metadata)| {
+                        if metadata.is_none() || metadata == &Some(RelayMetadata::Write) {
+                            Some(url.to_owned())
+                        } else {
+                            None
+                        }
+                    })
+                    .collect()
+            })
+            .unwrap_or_default()
+    }
+
+    /// Insert gossip relays for a public key
+    pub fn insert_relays(&mut self, event: &Event) {
+        self.relays.entry(event.pubkey).or_default().extend(
+            event
+                .tags
+                .iter()
+                .filter_map(|tag| {
+                    if let Some(TagStandard::RelayMetadata {
+                        relay_url,
+                        metadata,
+                    }) = tag.clone().to_standardized()
+                    {
+                        Some((relay_url, metadata))
+                    } else {
+                        None
+                    }
+                })
+                .take(3),
+        );
+
+        log::info!("Updating gossip relays for: {}", event.pubkey);
+    }
+
+    /// Get messaging relays for a given public key
+    pub fn messaging_relays(&self, public_key: &PublicKey) -> Vec<RelayUrl> {
+        self.messaging_relays
+            .get(public_key)
+            .cloned()
+            .unwrap_or_default()
+            .into_iter()
+            .collect()
+    }
+
+    /// Insert messaging relays for a public key
+    pub fn insert_messaging_relays(&mut self, event: &Event) {
+        self.messaging_relays
+            .entry(event.pubkey)
+            .or_default()
+            .extend(
+                event
+                    .tags
+                    .iter()
+                    .filter_map(|tag| {
+                        if let Some(TagStandard::Relay(url)) = tag.as_standardized() {
+                            Some(url.to_owned())
+                        } else {
+                            None
+                        }
+                    })
+                    .take(3),
+            );
+
+        log::info!("Updating messaging relays for: {}", event.pubkey);
+    }
+}

crates/state/src/identity.rs

@@ -0,0 +1,86 @@
+use nostr_sdk::prelude::*;
+
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Default)]
+pub enum RelayState {
+    #[default]
+    Initial,
+    NotSet,
+    Set,
+}
+
+impl RelayState {
+    pub fn is_initial(&self) -> bool {
+        matches!(self, RelayState::Initial)
+    }
+}
+
+/// Identity
+#[derive(Debug, Clone, Default)]
+pub struct Identity {
+    /// The public key of the account
+    pub public_key: Option<PublicKey>,
+
+    /// Status of the current user NIP-65 relays
+    relay_list: RelayState,
+
+    /// Status of the current user NIP-17 relays
+    messaging_relays: RelayState,
+}
+
+impl AsRef<Identity> for Identity {
+    fn as_ref(&self) -> &Identity {
+        self
+    }
+}
+
+impl Identity {
+    pub fn new() -> Self {
+        Self {
+            public_key: None,
+            relay_list: RelayState::default(),
+            messaging_relays: RelayState::default(),
+        }
+    }
+
+    /// Sets the state of the NIP-65 relays.
+    pub fn set_relay_list_state(&mut self, state: RelayState) {
+        self.relay_list = state;
+    }
+
+    /// Returns the state of the NIP-65 relays.
+    pub fn relay_list_state(&self) -> RelayState {
+        self.relay_list
+    }
+
+    /// Sets the state of the NIP-17 relays.
+    pub fn set_messaging_relays_state(&mut self, state: RelayState) {
+        self.messaging_relays = state;
+    }
+
+    /// Returns the state of the NIP-17 relays.
+    pub fn messaging_relays_state(&self) -> RelayState {
+        self.messaging_relays
+    }
+
+    /// Force getting the public key of the identity.
+    ///
+    /// Panics if the public key is not set.
+    pub fn public_key(&self) -> PublicKey {
+        self.public_key.unwrap()
+    }
+
+    /// Returns true if the identity has a public key.
+    pub fn has_public_key(&self) -> bool {
+        self.public_key.is_some()
+    }
+
+    /// Sets the public key of the identity.
+    pub fn set_public_key(&mut self, public_key: PublicKey) {
+        self.public_key = Some(public_key);
+    }
+
+    /// Unsets the public key of the identity.
+    pub fn unset_public_key(&mut self) {
+        self.public_key = None;
+    }
+}

crates/state/src/lib.rs

@@ -0,0 +1,596 @@
+use std::collections::HashSet;
+use std::time::Duration;
+
+use anyhow::Error;
+use common::{config_dir, BOOTSTRAP_RELAYS, SEARCH_RELAYS};
+use gpui::{App, AppContext, Context, Entity, Global, Subscription, Task};
+use nostr_lmdb::NostrLmdb;
+use nostr_sdk::prelude::*;
+
+mod device;
+mod event;
+mod gossip;
+mod identity;
+
+pub use device::*;
+pub use event::*;
+pub use gossip::*;
+pub use identity::*;
+
+use crate::identity::Identity;
+
+pub fn init(cx: &mut App) {
+    NostrRegistry::set_global(cx.new(NostrRegistry::new), cx);
+}
+
+/// Default timeout for subscription
+pub const TIMEOUT: u64 = 3;
+
+/// Default subscription id for gift wrap events
+pub const GIFTWRAP_SUBSCRIPTION: &str = "giftwrap-events";
+
+struct GlobalNostrRegistry(Entity<NostrRegistry>);
+
+impl Global for GlobalNostrRegistry {}
+
+/// Nostr Registry
+#[derive(Debug)]
+pub struct NostrRegistry {
+    /// Nostr client
+    client: Client,
+
+    /// App keys
+    ///
+    /// Used for Nostr Connect and NIP-4e operations
+    app_keys: Keys,
+
+    /// Current identity (user's public key)
+    ///
+    /// Set by the current Nostr signer
+    identity: Entity<Identity>,
+
+    /// Gossip implementation
+    gossip: Entity<Gossip>,
+
+    /// Tasks for asynchronous operations
+    tasks: Vec<Task<Result<(), Error>>>,
+
+    /// Subscriptions
+    _subscriptions: Vec<Subscription>,
+}
+
+impl NostrRegistry {
+    /// Retrieve the global nostr state
+    pub fn global(cx: &App) -> Entity<Self> {
+        cx.global::<GlobalNostrRegistry>().0.clone()
+    }
+
+    /// Set the global nostr instance
+    fn set_global(state: Entity<Self>, cx: &mut App) {
+        cx.set_global(GlobalNostrRegistry(state));
+    }
+
+    /// Create a new nostr instance
+    fn new(cx: &mut Context<Self>) -> Self {
+        // rustls uses the `aws_lc_rs` provider by default
+        // This only errors if the default provider has already
+        // been installed. We can ignore this `Result`.
+        rustls::crypto::aws_lc_rs::default_provider()
+            .install_default()
+            .ok();
+
+        // Construct the nostr client options
+        let opts = ClientOptions::new()
+            .automatic_authentication(false)
+            .verify_subscriptions(false)
+            .sleep_when_idle(SleepWhenIdle::Enabled {
+                timeout: Duration::from_secs(600),
+            });
+
+        // Construct the lmdb
+        let lmdb = cx.background_executor().block(async move {
+            let path = config_dir().join("nostr");
+            NostrLmdb::open(path)
+                .await
+                .expect("Failed to initialize database")
+        });
+
+        // Construct the nostr client
+        let client = ClientBuilder::default().database(lmdb).opts(opts).build();
+        let _ = tracker();
+
+        // Get the app keys
+        let app_keys = Self::create_or_init_app_keys().unwrap();
+
+        // Construct the gossip entity
+        let gossip = cx.new(|_| Gossip::default());
+        let async_gossip = gossip.downgrade();
+
+        // Construct the identity entity
+        let identity = cx.new(|_| Identity::default());
+
+        // Channel for communication between nostr and gpui
+        let (tx, rx) = flume::bounded::<Event>(2048);
+
+        let mut subscriptions = vec![];
+        let mut tasks = vec![];
+
+        subscriptions.push(
+            // Observe the identity entity
+            cx.observe(&identity, |this, state, cx| {
+                if state.read(cx).has_public_key() {
+                    match state.read(cx).relay_list_state() {
+                        RelayState::Initial => {
+                            this.get_relay_list(cx);
+                        }
+                        RelayState::Set => {
+                            if state.read(cx).messaging_relays_state() == RelayState::Initial {
+                                this.get_profile(cx);
+                                this.get_messaging_relays(cx);
+                            };
+                        }
+                        _ => {}
+                    }
+                }
+            }),
+        );
+
+        tasks.push(
+            // Handle nostr notifications
+            cx.background_spawn({
+                let client = client.clone();
+
+                async move { Self::handle_notifications(&client, &tx).await }
+            }),
+        );
+
+        tasks.push(
+            // Update GPUI states
+            cx.spawn(async move |_this, cx| {
+                while let Ok(event) = rx.recv_async().await {
+                    match event.kind {
+                        Kind::RelayList => {
+                            async_gossip.update(cx, |this, cx| {
+                                this.insert_relays(&event);
+                                cx.notify();
+                            })?;
+                        }
+                        Kind::InboxRelays => {
+                            async_gossip.update(cx, |this, cx| {
+                                this.insert_messaging_relays(&event);
+                                cx.notify();
+                            })?;
+                        }
+                        _ => {}
+                    }
+                }
+
+                Ok(())
+            }),
+        );
+
+        Self {
+            client,
+            app_keys,
+            identity,
+            gossip,
+            _subscriptions: subscriptions,
+            tasks,
+        }
+    }
+
+    /// Handle nostr notifications
+    async fn handle_notifications(client: &Client, tx: &flume::Sender<Event>) -> Result<(), Error> {
+        // Add bootstrap relay to the relay pool
+        for url in BOOTSTRAP_RELAYS.into_iter() {
+            client.add_relay(url).await?;
+        }
+
+        // Add search relay to the relay pool
+        for url in SEARCH_RELAYS.into_iter() {
+            client.add_relay(url).await?;
+        }
+
+        // Connect to all added relays
+        client.connect().await;
+
+        // Handle nostr notifications
+        let mut notifications = client.notifications();
+        let mut processed_events = HashSet::new();
+
+        while let Ok(notification) = notifications.recv().await {
+            if let RelayPoolNotification::Message { message, relay_url } = notification {
+                match message {
+                    RelayMessage::Event {
+                        event,
+                        subscription_id,
+                    } => {
+                        if !processed_events.insert(event.id) {
+                            // Skip if the event has already been processed
+                            continue;
+                        }
+
+                        match event.kind {
+                            Kind::RelayList => {
+                                // Automatically get messaging relays for each member when the user opens a room
+                                if subscription_id.as_str().starts_with("room-") {
+                                    Self::get_adv_events_by(client, event.as_ref()).await?;
+                                }
+
+                                tx.send_async(event.into_owned()).await?;
+                            }
+                            Kind::InboxRelays => {
+                                tx.send_async(event.into_owned()).await?;
+                            }
+                            _ => {}
+                        }
+                    }
+                    RelayMessage::Ok {
+                        event_id, message, ..
+                    } => {
+                        let msg = MachineReadablePrefix::parse(&message);
+                        let mut tracker = tracker().write().await;
+
+                        // Handle authentication messages
+                        if let Some(MachineReadablePrefix::AuthRequired) = msg {
+                            // Keep track of events that need to be resent after authentication
+                            tracker.add_to_pending(event_id, relay_url);
+                        } else {
+                            // Keep track of events sent by Coop
+                            tracker.sent(event_id)
+                        }
+                    }
+                    _ => {}
+                }
+            }
+        }
+
+        Ok(())
+    }
+
+    /// Automatically get messaging relays and encryption announcement from a received relay list
+    async fn get_adv_events_by(client: &Client, event: &Event) -> Result<(), Error> {
+        // Subscription options
+        let opts = SubscribeAutoCloseOptions::default()
+            .timeout(Some(Duration::from_secs(TIMEOUT)))
+            .exit_policy(ReqExitPolicy::ExitOnEOSE);
+
+        // Extract write relays from event
+        let write_relays: Vec<&RelayUrl> = nip65::extract_relay_list(event)
+            .filter_map(|(url, metadata)| {
+                if metadata.is_none() || metadata == &Some(RelayMetadata::Write) {
+                    Some(url)
+                } else {
+                    None
+                }
+            })
+            .collect();
+
+        // Ensure relay connections
+        for relay in write_relays.iter() {
+            client.add_relay(*relay).await?;
+            client.connect_relay(*relay).await?;
+        }
+
+        // Construct filter for inbox relays
+        let inbox = Filter::new()
+            .kind(Kind::InboxRelays)
+            .author(event.pubkey)
+            .limit(1);
+
+        // Construct filter for encryption announcement
+        let announcement = Filter::new()
+            .kind(Kind::Custom(10044))
+            .author(event.pubkey)
+            .limit(1);
+
+        client
+            .subscribe_to(write_relays, vec![inbox, announcement], Some(opts))
+            .await?;
+
+        Ok(())
+    }
+
+    /// Get or create a new app keys
+    fn create_or_init_app_keys() -> Result<Keys, Error> {
+        let dir = config_dir().join(".app_keys");
+        let content = match std::fs::read(&dir) {
+            Ok(content) => content,
+            Err(_) => {
+                // Generate new keys if file doesn't exist
+                let keys = Keys::generate();
+                let secret_key = keys.secret_key();
+
+                std::fs::create_dir_all(dir.parent().unwrap())?;
+                std::fs::write(&dir, secret_key.to_secret_bytes())?;
+
+                return Ok(keys);
+            }
+        };
+        let secret_key = SecretKey::from_slice(&content)?;
+        let keys = Keys::new(secret_key);
+
+        Ok(keys)
+    }
+
+    /// Get the nostr client
+    pub fn client(&self) -> Client {
+        self.client.clone()
+    }
+
+    /// Get the app keys
+    pub fn app_keys(&self) -> &Keys {
+        &self.app_keys
+    }
+
+    /// Get current identity
+    pub fn identity(&self) -> Entity<Identity> {
+        self.identity.clone()
+    }
+
+    /// Get a relay hint (messaging relay) for a given public key
+    pub fn relay_hint(&self, public_key: &PublicKey, cx: &App) -> Option<RelayUrl> {
+        self.gossip
+            .read(cx)
+            .messaging_relays(public_key)
+            .first()
+            .cloned()
+    }
+
+    /// Get a list of write relays for a given public key
+    pub fn write_relays(&self, public_key: &PublicKey, cx: &App) -> Task<Vec<RelayUrl>> {
+        let client = self.client();
+        let relays = self.gossip.read(cx).write_relays(public_key);
+
+        cx.background_spawn(async move {
+            // Ensure relay connections
+            for url in relays.iter() {
+                client.add_relay(url).await.ok();
+                client.connect_relay(url).await.ok();
+            }
+
+            relays
+        })
+    }
+
+    /// Get a list of read relays for a given public key
+    pub fn read_relays(&self, public_key: &PublicKey, cx: &App) -> Task<Vec<RelayUrl>> {
+        let client = self.client();
+        let relays = self.gossip.read(cx).read_relays(public_key);
+
+        cx.background_spawn(async move {
+            // Ensure relay connections
+            for url in relays.iter() {
+                client.add_relay(url).await.ok();
+                client.connect_relay(url).await.ok();
+            }
+
+            relays
+        })
+    }
+
+    /// Get a list of messaging relays for a given public key
+    pub fn messaging_relays(&self, public_key: &PublicKey, cx: &App) -> Task<Vec<RelayUrl>> {
+        let client = self.client();
+        let relays = self.gossip.read(cx).messaging_relays(public_key);
+
+        cx.background_spawn(async move {
+            // Ensure relay connections
+            for url in relays.iter() {
+                client.add_relay(url).await.ok();
+                client.connect_relay(url).await.ok();
+            }
+
+            relays
+        })
+    }
+
+    /// Set the signer for the nostr client and verify the public key
+    pub fn set_signer<T>(&mut self, signer: T, cx: &mut Context<Self>)
+    where
+        T: NostrSigner + 'static,
+    {
+        let client = self.client();
+        let identity = self.identity.downgrade();
+
+        // Create a task to update the signer and verify the public key
+        let task: Task<Result<PublicKey, Error>> = cx.background_spawn(async move {
+            // Update signer
+            client.set_signer(signer).await;
+
+            // Verify signer
+            let signer = client.signer().await?;
+            let public_key = signer.get_public_key().await?;
+
+            Ok(public_key)
+        });
+
+        self.tasks.push(cx.spawn(async move |_this, cx| {
+            match task.await {
+                Ok(public_key) => {
+                    identity.update(cx, |this, cx| {
+                        this.set_public_key(public_key);
+                        cx.notify();
+                    })?;
+                }
+                Err(e) => {
+                    log::error!("Failed to set signer: {e}");
+                }
+            };
+
+            Ok(())
+        }));
+    }
+
+    /// Unset the current signer
+    pub fn unset_signer(&mut self, cx: &mut Context<Self>) {
+        let client = self.client();
+        let async_identity = self.identity.downgrade();
+
+        self.tasks.push(cx.spawn(async move |_this, cx| {
+            // Unset the signer from nostr client
+            cx.background_executor()
+                .await_on_background(async move {
+                    client.unset_signer().await;
+                })
+                .await;
+
+            // Unset the current identity
+            async_identity
+                .update(cx, |this, cx| {
+                    this.unset_public_key();
+                    cx.notify();
+                })
+                .ok();
+
+            Ok(())
+        }));
+    }
+
+    // Get relay list for current user
+    fn get_relay_list(&mut self, cx: &mut Context<Self>) {
+        let client = self.client();
+        let async_identity = self.identity.downgrade();
+        let public_key = self.identity().read(cx).public_key();
+
+        let task: Task<Result<RelayState, Error>> = cx.background_spawn(async move {
+            let filter = Filter::new()
+                .kind(Kind::RelayList)
+                .author(public_key)
+                .limit(1);
+
+            let mut stream = client
+                .stream_events_from(BOOTSTRAP_RELAYS, vec![filter], Duration::from_secs(TIMEOUT))
+                .await?;
+
+            while let Some((_url, res)) = stream.next().await {
+                match res {
+                    Ok(event) => {
+                        log::info!("Received relay list event: {event:?}");
+                        return Ok(RelayState::Set);
+                    }
+                    Err(e) => {
+                        log::error!("Failed to receive relay list event: {e}");
+                    }
+                }
+            }
+
+            Ok(RelayState::NotSet)
+        });
+
+        self.tasks.push(cx.spawn(async move |_this, cx| {
+            match task.await {
+                Ok(state) => {
+                    async_identity
+                        .update(cx, |this, cx| {
+                            this.set_relay_list_state(state);
+                            cx.notify();
+                        })
+                        .ok();
+                }
+                Err(e) => {
+                    log::error!("Failed to get relay list: {e}");
+                }
+            }
+
+            Ok(())
+        }));
+    }
+
+    /// Get profile and contact list for current user
+    fn get_profile(&mut self, cx: &mut Context<Self>) {
+        let client = self.client();
+        let public_key = self.identity().read(cx).public_key();
+        let write_relays = self.write_relays(&public_key, cx);
+
+        let task: Task<Result<(), Error>> = cx.background_spawn(async move {
+            let mut urls = vec![];
+            urls.extend(write_relays.await);
+            urls.extend(
+                BOOTSTRAP_RELAYS
+                    .iter()
+                    .filter_map(|url| RelayUrl::parse(url).ok()),
+            );
+
+            // Construct subscription options
+            let opts = SubscribeAutoCloseOptions::default()
+                .exit_policy(ReqExitPolicy::ExitOnEOSE)
+                .timeout(Some(Duration::from_secs(TIMEOUT)));
+
+            // Filter for metadata
+            let metadata = Filter::new()
+                .kind(Kind::Metadata)
+                .limit(1)
+                .author(public_key);
+
+            // Filter for contact list
+            let contact_list = Filter::new()
+                .kind(Kind::ContactList)
+                .limit(1)
+                .author(public_key);
+
+            client
+                .subscribe_to(urls, vec![metadata, contact_list], Some(opts))
+                .await?;
+
+            Ok(())
+        });
+
+        task.detach();
+    }
+
+    /// Get messaging relays for current user
+    fn get_messaging_relays(&mut self, cx: &mut Context<Self>) {
+        let client = self.client();
+        let async_identity = self.identity.downgrade();
+        let public_key = self.identity().read(cx).public_key();
+        let write_relays = self.write_relays(&public_key, cx);
+
+        let task: Task<Result<RelayState, Error>> = cx.background_spawn(async move {
+            let urls = write_relays.await;
+
+            // Construct the filter for inbox relays
+            let filter = Filter::new()
+                .kind(Kind::InboxRelays)
+                .author(public_key)
+                .limit(1);
+
+            // Stream events from the write relays
+            let mut stream = client
+                .stream_events_from(urls, vec![filter], Duration::from_secs(TIMEOUT))
+                .await?;
+
+            while let Some((_url, res)) = stream.next().await {
+                match res {
+                    Ok(event) => {
+                        log::info!("Received messaging relays event: {event:?}");
+                        return Ok(RelayState::Set);
+                    }
+                    Err(e) => {
+                        log::error!("Failed to get messaging relays: {e}");
+                    }
+                }
+            }
+
+            Ok(RelayState::NotSet)
+        });
+
+        self.tasks.push(cx.spawn(async move |_this, cx| {
+            match task.await {
+                Ok(state) => {
+                    async_identity
+                        .update(cx, |this, cx| {
+                            this.set_messaging_relays_state(state);
+                            cx.notify();
+                        })
+                        .ok();
+                }
+                Err(e) => {
+                    log::error!("Failed to get messaging relays: {e}");
+                }
+            }
+
+            Ok(())
+        }));
+    }
+}

crates/theme/Cargo.toml

@@ -8,3 +8,10 @@ publish.workspace = true
 gpui.workspace = true
 anyhow.workspace = true
 log.workspace = true
+serde.workspace = true
+serde_json.workspace = true
+schemars.workspace = true
+smallvec.workspace = true
+
+[dev-dependencies]
+tempfile = "3.10"

crates/theme/src/lib.rs

@@ -1,284 +1,31 @@
 use std::ops::{Deref, DerefMut};
+use std::rc::Rc;
 
-use colors::{brand, hsl, neutral};
-use gpui::{px, App, Global, Hsla, Pixels, SharedString, Window, WindowAppearance};
-
-use crate::colors::{danger, warning};
-use crate::platform_kind::PlatformKind;
-use crate::scrollbar_mode::ScrollBarMode;
+use gpui::{px, App, Global, Pixels, SharedString, Window};
 
 mod colors;
+mod registry;
 mod scale;
+mod scrollbar_mode;
+mod theme;
 
-pub mod platform_kind;
-pub mod scrollbar_mode;
+pub use colors::*;
+pub use registry::*;
+pub use scale::*;
+pub use scrollbar_mode::*;
+pub use theme::*;
 
 /// Defines window border radius for platforms that use client side decorations.
 pub const CLIENT_SIDE_DECORATION_ROUNDING: Pixels = px(10.0);
+
 /// Defines window shadow size for platforms that use client side decorations.
 pub const CLIENT_SIDE_DECORATION_SHADOW: Pixels = px(10.0);
 
 pub fn init(cx: &mut App) {
+    registry::init(cx);
+
     Theme::sync_system_appearance(None, cx);
-}
-
-#[derive(Debug, Clone, Copy, Default)]
-pub struct ThemeColor {
-    // Surface colors
-    pub background: Hsla,
-    pub surface_background: Hsla,
-    pub elevated_surface_background: Hsla,
-    pub panel_background: Hsla,
-    pub overlay: Hsla,
-    pub title_bar: Hsla,
-    pub title_bar_inactive: Hsla,
-    pub window_border: Hsla,
-
-    // Border colors
-    pub border: Hsla,
-    pub border_variant: Hsla,
-    pub border_focused: Hsla,
-    pub border_selected: Hsla,
-    pub border_transparent: Hsla,
-    pub border_disabled: Hsla,
-    pub ring: Hsla,
-
-    // Text colors
-    pub text: Hsla,
-    pub text_muted: Hsla,
-    pub text_placeholder: Hsla,
-    pub text_accent: Hsla,
-
-    // Icon colors
-    pub icon: Hsla,
-    pub icon_muted: Hsla,
-    pub icon_accent: Hsla,
-
-    // Element colors
-    pub element_foreground: Hsla,
-    pub element_background: Hsla,
-    pub element_hover: Hsla,
-    pub element_active: Hsla,
-    pub element_selected: Hsla,
-    pub element_disabled: Hsla,
-
-    // Secondary element colors
-    pub secondary_foreground: Hsla,
-    pub secondary_background: Hsla,
-    pub secondary_hover: Hsla,
-    pub secondary_active: Hsla,
-    pub secondary_selected: Hsla,
-    pub secondary_disabled: Hsla,
-
-    // Danger element colors
-    pub danger_foreground: Hsla,
-    pub danger_background: Hsla,
-    pub danger_hover: Hsla,
-    pub danger_active: Hsla,
-    pub danger_selected: Hsla,
-    pub danger_disabled: Hsla,
-
-    // Warning element colors
-    pub warning_foreground: Hsla,
-    pub warning_background: Hsla,
-    pub warning_hover: Hsla,
-    pub warning_active: Hsla,
-    pub warning_selected: Hsla,
-    pub warning_disabled: Hsla,
-
-    // Ghost element colors
-    pub ghost_element_background: Hsla,
-    pub ghost_element_background_alt: Hsla,
-    pub ghost_element_hover: Hsla,
-    pub ghost_element_active: Hsla,
-    pub ghost_element_selected: Hsla,
-    pub ghost_element_disabled: Hsla,
-
-    // Tab colors
-    pub tab_inactive_background: Hsla,
-    pub tab_hover_background: Hsla,
-    pub tab_active_background: Hsla,
-
-    // Scrollbar colors
-    pub scrollbar_thumb_background: Hsla,
-    pub scrollbar_thumb_hover_background: Hsla,
-    pub scrollbar_thumb_border: Hsla,
-    pub scrollbar_track_background: Hsla,
-    pub scrollbar_track_border: Hsla,
-
-    // Interactive colors
-    pub drop_target_background: Hsla,
-    pub cursor: Hsla,
-    pub selection: Hsla,
-}
-
-/// The default colors for the theme.
-///
-/// Themes that do not specify all colors are refined off of these defaults.
-impl ThemeColor {
-    /// Returns the default colors for light themes.
-    ///
-    /// Themes that do not specify all colors are refined off of these defaults.
-    pub fn light() -> Self {
-        Self {
-            background: neutral().light().step_1(),
-            surface_background: neutral().light().step_2(),
-            elevated_surface_background: neutral().light().step_3(),
-            panel_background: gpui::white(),
-            overlay: neutral().light_alpha().step_3(),
-            title_bar: gpui::transparent_black(),
-            title_bar_inactive: neutral().light().step_1(),
-            window_border: hsl(240.0, 5.9, 78.0),
-
-            border: neutral().light().step_6(),
-            border_variant: neutral().light().step_5(),
-            border_focused: brand().light().step_7(),
-            border_selected: brand().light().step_7(),
-            border_transparent: gpui::transparent_black(),
-            border_disabled: neutral().light().step_3(),
-            ring: brand().light().step_8(),
-
-            text: neutral().light().step_12(),
-            text_muted: neutral().light().step_11(),
-            text_placeholder: neutral().light().step_10(),
-            text_accent: brand().light().step_11(),
-
-            icon: neutral().light().step_11(),
-            icon_muted: neutral().light().step_10(),
-            icon_accent: brand().light().step_11(),
-
-            element_foreground: brand().light().step_12(),
-            element_background: brand().light().step_9(),
-            element_hover: brand().light_alpha().step_10(),
-            element_active: brand().light().step_10(),
-            element_selected: brand().light().step_11(),
-            element_disabled: brand().light_alpha().step_3(),
-
-            secondary_foreground: brand().light().step_11(),
-            secondary_background: brand().light().step_3(),
-            secondary_hover: brand().light_alpha().step_4(),
-            secondary_active: brand().light().step_5(),
-            secondary_selected: brand().light().step_5(),
-            secondary_disabled: brand().light_alpha().step_3(),
-
-            danger_foreground: danger().light().step_12(),
-            danger_background: danger().light().step_3(),
-            danger_hover: danger().light_alpha().step_4(),
-            danger_active: danger().light().step_5(),
-            danger_selected: danger().light().step_5(),
-            danger_disabled: danger().light_alpha().step_3(),
-
-            warning_foreground: warning().light().step_12(),
-            warning_background: warning().light().step_3(),
-            warning_hover: warning().light_alpha().step_4(),
-            warning_active: warning().light().step_5(),
-            warning_selected: warning().light().step_5(),
-            warning_disabled: warning().light_alpha().step_3(),
-
-            ghost_element_background: gpui::transparent_black(),
-            ghost_element_background_alt: neutral().light().step_3(),
-            ghost_element_hover: neutral().light_alpha().step_4(),
-            ghost_element_active: neutral().light().step_5(),
-            ghost_element_selected: neutral().light().step_5(),
-            ghost_element_disabled: neutral().light_alpha().step_2(),
-
-            tab_inactive_background: neutral().light().step_3(),
-            tab_hover_background: neutral().light().step_4(),
-            tab_active_background: neutral().light().step_5(),
-
-            scrollbar_thumb_background: neutral().light_alpha().step_3(),
-            scrollbar_thumb_hover_background: neutral().light_alpha().step_4(),
-            scrollbar_thumb_border: gpui::transparent_black(),
-            scrollbar_track_background: gpui::transparent_black(),
-            scrollbar_track_border: neutral().light().step_5(),
-
-            drop_target_background: brand().light_alpha().step_2(),
-            cursor: hsl(200., 100., 50.),
-            selection: hsl(200., 100., 50.).alpha(0.25),
-        }
-    }
-
-    /// Returns the default colors for dark themes.
-    ///
-    /// Themes that do not specify all colors are refined off of these defaults.
-    pub fn dark() -> Self {
-        Self {
-            background: neutral().dark().step_1(),
-            surface_background: neutral().dark().step_2(),
-            elevated_surface_background: neutral().dark().step_3(),
-            panel_background: gpui::black(),
-            overlay: neutral().dark_alpha().step_3(),
-            title_bar: gpui::transparent_black(),
-            title_bar_inactive: neutral().dark().step_1(),
-            window_border: hsl(240.0, 3.7, 28.0),
-
-            border: neutral().dark().step_6(),
-            border_variant: neutral().dark().step_5(),
-            border_focused: brand().dark().step_7(),
-            border_selected: brand().dark().step_7(),
-            border_transparent: gpui::transparent_black(),
-            border_disabled: neutral().dark().step_3(),
-            ring: brand().dark().step_8(),
-
-            text: neutral().dark().step_12(),
-            text_muted: neutral().dark().step_11(),
-            text_placeholder: neutral().dark().step_10(),
-            text_accent: brand().dark().step_11(),
-
-            icon: neutral().dark().step_11(),
-            icon_muted: neutral().dark().step_10(),
-            icon_accent: brand().dark().step_11(),
-
-            element_foreground: brand().dark().step_1(),
-            element_background: brand().dark().step_9(),
-            element_hover: brand().dark_alpha().step_10(),
-            element_active: brand().dark().step_10(),
-            element_selected: brand().dark().step_11(),
-            element_disabled: brand().dark_alpha().step_3(),
-
-            secondary_foreground: brand().dark().step_12(),
-            secondary_background: brand().dark().step_3(),
-            secondary_hover: brand().dark_alpha().step_4(),
-            secondary_active: brand().dark().step_5(),
-            secondary_selected: brand().dark().step_5(),
-            secondary_disabled: brand().dark_alpha().step_3(),
-
-            danger_foreground: danger().dark().step_12(),
-            danger_background: danger().dark().step_3(),
-            danger_hover: danger().dark_alpha().step_4(),
-            danger_active: danger().dark().step_5(),
-            danger_selected: danger().dark().step_5(),
-            danger_disabled: danger().dark_alpha().step_3(),
-
-            warning_foreground: warning().dark().step_12(),
-            warning_background: warning().dark().step_3(),
-            warning_hover: warning().dark_alpha().step_4(),
-            warning_active: warning().dark().step_5(),
-            warning_selected: warning().dark().step_5(),
-            warning_disabled: warning().dark_alpha().step_3(),
-
-            ghost_element_background: gpui::transparent_black(),
-            ghost_element_background_alt: neutral().dark().step_3(),
-            ghost_element_hover: neutral().dark_alpha().step_4(),
-            ghost_element_active: neutral().dark().step_5(),
-            ghost_element_selected: neutral().dark().step_5(),
-            ghost_element_disabled: neutral().dark_alpha().step_2(),
-
-            tab_inactive_background: neutral().dark().step_3(),
-            tab_hover_background: neutral().dark().step_4(),
-            tab_active_background: neutral().dark().step_5(),
-
-            scrollbar_thumb_background: neutral().dark_alpha().step_3(),
-            scrollbar_thumb_hover_background: neutral().dark_alpha().step_4(),
-            scrollbar_thumb_border: gpui::transparent_black(),
-            scrollbar_track_background: gpui::transparent_black(),
-            scrollbar_track_border: neutral().dark().step_5(),
-
-            drop_target_background: brand().dark_alpha().step_2(),
-            cursor: hsl(200., 100., 50.),
-            selection: hsl(200., 100., 50.).alpha(0.25),
-        }
-    }
+    Theme::sync_scrollbar_appearance(cx);
 }
 
 pub trait ActiveTheme {
@@ -292,49 +39,38 @@ impl ActiveTheme for App {
     }
 }
 
-#[derive(Debug, Clone, Copy, Default, PartialEq, PartialOrd, Eq, Hash)]
-pub enum ThemeMode {
-    Light,
-    #[default]
-    Dark,
-}
-
-impl ThemeMode {
-    pub fn is_dark(&self) -> bool {
-        matches!(self, Self::Dark)
-    }
-
-    /// Return lower_case theme name: `light`, `dark`.
-    pub fn name(&self) -> &'static str {
-        match self {
-            ThemeMode::Light => "light",
-            ThemeMode::Dark => "dark",
-        }
-    }
-}
-
-impl From<WindowAppearance> for ThemeMode {
-    fn from(appearance: WindowAppearance) -> Self {
-        match appearance {
-            WindowAppearance::Dark | WindowAppearance::VibrantDark => Self::Dark,
-            WindowAppearance::Light | WindowAppearance::VibrantLight => Self::Light,
-        }
-    }
-}
-
 #[derive(Debug, Clone)]
 pub struct Theme {
-    pub colors: ThemeColor,
+    /// Theme colors
+    pub colors: ThemeColors,
+
+    /// Theme family
+    pub theme: Rc<ThemeFamily>,
+
+    /// The appearance of the theme (light or dark).
     pub mode: ThemeMode,
+
+    /// The font family for the application.
     pub font_family: SharedString,
+
+    /// The root font size for the application, default is 15px.
     pub font_size: Pixels,
+
+    /// Radius for the general elements.
     pub radius: Pixels,
-    pub scrollbar_mode: ScrollBarMode,
-    pub platform_kind: PlatformKind,
+
+    /// Radius for the large elements, e.g.: modal, notification.
+    pub radius_lg: Pixels,
+
+    /// Enable shadow for the general elements. default is true
+    pub shadow: bool,
+
+    /// Show the scrollbar mode, default: scrolling
+    pub scrollbar_mode: ScrollbarMode,
 }
 
 impl Deref for Theme {
-    type Target = ThemeColor;
+    type Target = ThemeColors;
 
     fn deref(&self) -> &Self::Target {
         &self.colors
@@ -375,42 +111,76 @@ impl Theme {
         Self::change(appearance, window, cx);
     }
 
-    /// Change the app's appearance
-    pub fn change(mode: impl Into<ThemeMode>, window: Option<&mut Window>, cx: &mut App) {
-        let mode = mode.into();
-        let colors = match mode {
-            ThemeMode::Light => ThemeColor::light(),
-            ThemeMode::Dark => ThemeColor::dark(),
+    /// Sync the Scrollbar showing behavior with the system
+    pub fn sync_scrollbar_appearance(cx: &mut App) {
+        Theme::global_mut(cx).scrollbar_mode = if cx.should_auto_hide_scrollbars() {
+            ScrollbarMode::Scrolling
+        } else {
+            ScrollbarMode::Hover
         };
+    }
 
+    /// Apply a new theme to the application.
+    pub fn apply_theme(new_theme: Rc<ThemeFamily>, window: Option<&mut Window>, cx: &mut App) {
+        let theme = cx.global_mut::<Theme>();
+        let mode = theme.mode;
+        // Update the theme
+        theme.theme = new_theme;
+        // Emit a theme change event
+        Self::change(mode, window, cx);
+    }
+
+    /// Change the app's appearance
+    pub fn change<M>(mode: M, window: Option<&mut Window>, cx: &mut App)
+    where
+        M: Into<ThemeMode>,
+    {
         if !cx.has_global::<Theme>() {
-            let theme = Theme::from(colors);
+            let default_theme = ThemeFamily::default();
+            let theme = Theme::from(default_theme);
+
             cx.set_global(theme);
         }
 
+        let mode = mode.into();
         let theme = cx.global_mut::<Theme>();
 
+        // Set the theme mode
         theme.mode = mode;
-        theme.colors = colors;
 
+        // Set the theme colors
+        if mode.is_dark() {
+            theme.colors = *theme.theme.dark();
+        } else {
+            theme.colors = *theme.theme.light();
+        }
+
+        // Refresh the window if available
         if let Some(window) = window {
             window.refresh();
         }
     }
 }
 
-impl From<ThemeColor> for Theme {
-    fn from(colors: ThemeColor) -> Self {
+impl From<ThemeFamily> for Theme {
+    fn from(family: ThemeFamily) -> Self {
         let mode = ThemeMode::default();
+        // Define the theme colors based on the appearance
+        let colors = match mode {
+            ThemeMode::Light => family.light(),
+            ThemeMode::Dark => family.dark(),
+        };
 
         Theme {
             font_size: px(15.),
             font_family: ".SystemUIFont".into(),
             radius: px(5.),
-            scrollbar_mode: ScrollBarMode::default(),
-            platform_kind: PlatformKind::platform(),
+            radius_lg: px(10.),
+            shadow: true,
+            scrollbar_mode: ScrollbarMode::default(),
             mode,
-            colors,
+            colors: *colors,
+            theme: Rc::new(family),
         }
     }
 }

crates/theme/src/registry.rs

@@ -0,0 +1,70 @@
+use std::collections::HashMap;
+use std::rc::Rc;
+use std::sync::Arc;
+
+use anyhow::{Context as AnyhowContext, Error};
+use gpui::{App, AppContext, AssetSource, Context, Entity, Global, SharedString};
+
+use crate::ThemeFamily;
+
+pub fn init(cx: &mut App) {
+    ThemeRegistry::set_global(cx.new(ThemeRegistry::new), cx);
+}
+
+struct GlobalThemeRegistry(Entity<ThemeRegistry>);
+
+impl Global for GlobalThemeRegistry {}
+
+pub struct ThemeRegistry {
+    /// Map of theme names to theme families
+    themes: HashMap<SharedString, Rc<ThemeFamily>>,
+}
+
+impl ThemeRegistry {
+    /// Retrieve the global theme registry state
+    pub fn global(cx: &App) -> Entity<Self> {
+        cx.global::<GlobalThemeRegistry>().0.clone()
+    }
+
+    /// Set the global theme registry instance
+    pub(crate) fn set_global(state: Entity<Self>, cx: &mut App) {
+        cx.set_global(GlobalThemeRegistry(state));
+    }
+
+    /// Create a new theme registry instance
+    pub(crate) fn new(cx: &mut Context<Self>) -> Self {
+        let mut themes = HashMap::new();
+        let asset = cx.asset_source();
+
+        if let Ok(paths) = asset.list("themes") {
+            for path in paths.into_iter() {
+                match Self::load(&path, asset) {
+                    Ok(theme) => {
+                        themes.insert(path, Rc::new(theme));
+                    }
+                    Err(e) => {
+                        log::error!("Failed to load theme: {path}. Error: {e}");
+                    }
+                }
+            }
+        }
+
+        Self { themes }
+    }
+
+    /// Load a theme from the asset source.
+    fn load(path: &str, asset: &Arc<dyn AssetSource>) -> Result<ThemeFamily, Error> {
+        // Load the theme file from the assets
+        let content = asset.load(path)?.context("Theme not found")?;
+
+        // Parse the JSON content into a Theme Family struct
+        let theme: ThemeFamily = serde_json::from_slice(&content)?;
+
+        Ok(theme)
+    }
+
+    /// Returns a reference to the map of themes.
+    pub fn themes(&self) -> &HashMap<SharedString, Rc<ThemeFamily>> {
+        &self.themes
+    }
+}

crates/theme/src/scrollbar_mode.rs

@@ -1,12 +1,15 @@
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, Default)]
-pub enum ScrollBarMode {
+use schemars::JsonSchema;
+use serde::{Deserialize, Serialize};
+
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, Default, Serialize, Deserialize, JsonSchema)]
+pub enum ScrollbarMode {
     #[default]
     Scrolling,
     Hover,
     Always,
 }
 
-impl ScrollBarMode {
+impl ScrollbarMode {
     pub fn is_scrolling(&self) -> bool {
         matches!(self, Self::Scrolling)
     }

crates/theme/src/theme.rs

@@ -0,0 +1,359 @@
+use std::path::Path;
+
+use gpui::{SharedString, WindowAppearance};
+use schemars::JsonSchema;
+use serde::{Deserialize, Serialize};
+
+use crate::ThemeColors;
+
+#[derive(Debug, Clone, Copy, Default, PartialEq, PartialOrd, Eq, Hash)]
+pub enum ThemeMode {
+    #[default]
+    Light,
+    Dark,
+}
+
+impl ThemeMode {
+    pub fn is_dark(&self) -> bool {
+        matches!(self, Self::Dark)
+    }
+
+    /// Return lower_case theme name: `light`, `dark`.
+    pub fn name(&self) -> &'static str {
+        match self {
+            ThemeMode::Light => "light",
+            ThemeMode::Dark => "dark",
+        }
+    }
+}
+
+impl From<WindowAppearance> for ThemeMode {
+    fn from(appearance: WindowAppearance) -> Self {
+        match appearance {
+            WindowAppearance::Dark | WindowAppearance::VibrantDark => Self::Dark,
+            WindowAppearance::Light | WindowAppearance::VibrantLight => Self::Light,
+        }
+    }
+}
+
+/// Theme family
+#[derive(Clone, Debug, PartialEq, Deserialize, Serialize, JsonSchema)]
+pub struct ThemeFamily {
+    /// The unique identifier for the theme.
+    pub id: String,
+
+    /// The name of the theme.
+    pub name: SharedString,
+
+    /// The author of the theme.
+    pub author: SharedString,
+
+    /// The URL of the theme.
+    pub url: String,
+
+    /// The light colors for the theme.
+    pub light: ThemeColors,
+
+    /// The dark colors for the theme.
+    pub dark: ThemeColors,
+}
+
+impl Default for ThemeFamily {
+    fn default() -> Self {
+        ThemeFamily {
+            id: "coop".into(),
+            name: "Coop Default Theme".into(),
+            author: "Coop".into(),
+            url: "https://github.com/lumehq/coop".into(),
+            light: ThemeColors::light(),
+            dark: ThemeColors::dark(),
+        }
+    }
+}
+
+impl ThemeFamily {
+    /// Returns the light colors for the theme.
+    #[inline(always)]
+    pub fn light(&self) -> &ThemeColors {
+        &self.light
+    }
+
+    /// Returns the dark colors for the theme.
+    #[inline(always)]
+    pub fn dark(&self) -> &ThemeColors {
+        &self.dark
+    }
+
+    /// Load a theme family from a JSON file.
+    ///
+    /// # Arguments
+    ///
+    /// * `path` - Path to the JSON file containing the theme family. This can be
+    ///   an absolute path or a path relative to the current working directory.
+    ///
+    /// # Returns
+    ///
+    /// Returns `Ok(ThemeFamily)` if the file was successfully loaded and parsed,
+    /// or `Err(anyhow::Error)` if there was an error reading or parsing the file.
+    ///
+    /// # Errors
+    ///
+    /// This function will return an error if:
+    /// - The file cannot be read (permission issues, file doesn't exist, etc.)
+    /// - The file contains invalid JSON
+    /// - The JSON structure doesn't match the `ThemeFamily` schema
+    ///
+    /// # Example
+    ///
+    /// ```no_run
+    /// use theme::ThemeFamily;
+    ///
+    /// # fn main() -> anyhow::Result<()> {
+    /// // Load from a relative path
+    /// let theme = ThemeFamily::from_file("assets/themes/my-theme.json")?;
+    ///
+    /// // Load from an absolute path
+    /// let theme = ThemeFamily::from_file("/path/to/themes/my-theme.json")?;
+    /// # Ok(())
+    /// # }
+    /// ```
+    pub fn from_file<P: AsRef<Path>>(path: P) -> anyhow::Result<Self> {
+        let json_data = std::fs::read(path)?;
+        let theme_family = serde_json::from_slice(&json_data)?;
+
+        Ok(theme_family)
+    }
+
+    /// Load a theme family from a JSON file in the assets/themes directory.
+    ///
+    /// This function looks for the file at `assets/themes/{name}.json` relative
+    /// to the current working directory. This is useful for loading themes
+    /// from the standard theme directory in the project structure.
+    ///
+    /// # Arguments
+    ///
+    /// * `name` - Name of the theme file (without the .json extension)
+    ///
+    /// # Returns
+    ///
+    /// Returns `Ok(ThemeFamily)` if the file was successfully loaded and parsed,
+    /// or `Err(anyhow::Error)` if there was an error reading or parsing the file.
+    ///
+    /// # Errors
+    ///
+    /// This function will return an error if:
+    /// - The file cannot be read (permission issues, file doesn't exist, etc.)
+    /// - The file contains invalid JSON
+    /// - The JSON structure doesn't match the `ThemeFamily` schema
+    ///
+    /// # Example
+    ///
+    /// ```no_run
+    /// use theme::ThemeFamily;
+    ///
+    /// # fn main() -> anyhow::Result<()> {
+    /// // Assuming the file exists at `assets/themes/my-theme.json`
+    /// let theme = ThemeFamily::from_assets("my-theme")?;
+    ///
+    /// println!("Loaded theme: {}", theme.name);
+    /// # Ok(())
+    /// # }
+    /// ```
+    pub fn from_assets(name: &str) -> anyhow::Result<Self> {
+        let path = format!("assets/themes/{}.json", name);
+        Self::from_file(path)
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use std::fs;
+
+    use tempfile::tempdir;
+
+    use super::*;
+
+    #[test]
+    fn test_from_file() {
+        // Create a temporary directory for our test
+        let dir = tempdir().unwrap();
+        let file_path = dir.path().join("test-theme.json");
+
+        // Create a minimal valid theme JSON with hex colors
+        // Using simple hex colors that Hsla can parse
+        // Note: We need to escape the # characters in the raw string
+        let json_data = r##"{
+            "id": "test-theme",
+            "name": "Test Theme",
+            "author": "Coop",
+            "url": "https://github.com/lumehq/coop",
+            "light": {
+                "background": "#ffffff",
+                "surface_background": "#fafafa",
+                "elevated_surface_background": "#f5f5f5",
+                "panel_background": "#ffffff",
+                "overlay": "#0000001a",
+                "title_bar": "#00000000",
+                "title_bar_inactive": "#ffffff",
+                "window_border": "#c7c7cf",
+                "border": "#dbdbdb",
+                "border_variant": "#d1d1d1",
+                "border_focused": "#3366cc",
+                "border_selected": "#3366cc",
+                "border_transparent": "#00000000",
+                "border_disabled": "#e6e6e6",
+                "ring": "#4d79d6",
+                "text": "#1a1a1a",
+                "text_muted": "#4d4d4d",
+                "text_placeholder": "#808080",
+                "text_accent": "#3366cc",
+                "icon": "#4d4d4d",
+                "icon_muted": "#808080",
+                "icon_accent": "#3366cc",
+                "element_foreground": "#ffffff",
+                "element_background": "#3366cc",
+                "element_hover": "#3366cce6",
+                "element_active": "#2e5cb8",
+                "element_selected": "#2952a3",
+                "element_disabled": "#3366cc4d",
+                "secondary_foreground": "#2952a3",
+                "secondary_background": "#e6ecf5",
+                "secondary_hover": "#3366cc1a",
+                "secondary_active": "#d9e2f0",
+                "secondary_selected": "#d9e2f0",
+                "secondary_disabled": "#3366cc4d",
+                "danger_foreground": "#ffffff",
+                "danger_background": "#f5e6e6",
+                "danger_hover": "#cc33331a",
+                "danger_active": "#f0d9d9",
+                "danger_selected": "#f0d9d9",
+                "danger_disabled": "#cc33334d",
+                "warning_foreground": "#1a1a1a",
+                "warning_background": "#f5f0e6",
+                "warning_hover": "#cc99331a",
+                "warning_active": "#f0ead9",
+                "warning_selected": "#f0ead9",
+                "warning_disabled": "#cc99334d",
+                "ghost_element_background": "#00000000",
+                "ghost_element_background_alt": "#e6e6e6",
+                "ghost_element_hover": "#0000001a",
+                "ghost_element_active": "#d9d9d9",
+                "ghost_element_selected": "#d9d9d9",
+                "ghost_element_disabled": "#0000000d",
+                "tab_inactive_background": "#e6e6e6",
+                "tab_hover_background": "#e0e0e0",
+                "tab_active_background": "#d9d9d9",
+                "scrollbar_thumb_background": "#00000033",
+                "scrollbar_thumb_hover_background": "#0000004d",
+                "scrollbar_thumb_border": "#00000000",
+                "scrollbar_track_background": "#00000000",
+                "scrollbar_track_border": "#d9d9d9",
+                "drop_target_background": "#3366cc1a",
+                "cursor": "#3399ff",
+                "selection": "#3399ff40"
+            },
+            "dark": {
+                "background": "#1a1a1a",
+                "surface_background": "#1f1f1f",
+                "elevated_surface_background": "#242424",
+                "panel_background": "#262626",
+                "overlay": "#ffffff1a",
+                "title_bar": "#00000000",
+                "title_bar_inactive": "#1a1a1a",
+                "window_border": "#404046",
+                "border": "#404040",
+                "border_variant": "#383838",
+                "border_focused": "#4d79d6",
+                "border_selected": "#4d79d6",
+                "border_transparent": "#00000000",
+                "border_disabled": "#2e2e2e",
+                "ring": "#668cdf",
+                "text": "#f2f2f2",
+                "text_muted": "#b3b3b3",
+                "text_placeholder": "#808080",
+                "text_accent": "#668cdf",
+                "icon": "#b3b3b3",
+                "icon_muted": "#808080",
+                "icon_accent": "#668cdf",
+                "element_foreground": "#ffffff",
+                "element_background": "#4d79d6",
+                "element_hover": "#4d79d6e6",
+                "element_active": "#456dc1",
+                "element_selected": "#3e62ac",
+                "element_disabled": "#4d79d64d",
+                "secondary_foreground": "#3e62ac",
+                "secondary_background": "#2a3652",
+                "secondary_hover": "#4d79d61a",
+                "secondary_active": "#303d5c",
+                "secondary_selected": "#303d5c",
+                "secondary_disabled": "#4d79d64d",
+                "danger_foreground": "#ffffff",
+                "danger_background": "#522a2a",
+                "danger_hover": "#d64d4d1a",
+                "danger_active": "#5c3030",
+                "danger_selected": "#5c3030",
+                "danger_disabled": "#d64d4d4d",
+                "warning_foreground": "#f2f2f2",
+                "warning_background": "#52482a",
+                "warning_hover": "#d6b34d1a",
+                "warning_active": "#5c5430",
+                "warning_selected": "#5c5430",
+                "warning_disabled": "#d6b34d4d",
+                "ghost_element_background": "#00000000",
+                "ghost_element_background_alt": "#2e2e2e",
+                "ghost_element_hover": "#ffffff1a",
+                "ghost_element_active": "#383838",
+                "ghost_element_selected": "#383838",
+                "ghost_element_disabled": "#ffffff0d",
+                "tab_inactive_background": "#2e2e2e",
+                "tab_hover_background": "#333333",
+                "tab_active_background": "#383838",
+                "scrollbar_thumb_background": "#ffffff33",
+                "scrollbar_thumb_hover_background": "#ffffff4d",
+                "scrollbar_thumb_border": "#00000000",
+                "scrollbar_track_background": "#00000000",
+                "scrollbar_track_border": "#383838",
+                "drop_target_background": "#4d79d61a",
+                "cursor": "#4db3ff",
+                "selection": "#4db3ff40"
+            }
+        }"##;
+
+        // Write the JSON to the file
+        fs::write(&file_path, json_data).unwrap();
+
+        // Test loading the theme from file
+        let theme = ThemeFamily::from_file(&file_path).unwrap();
+
+        // Verify the loaded theme
+        assert_eq!(theme.id, "test-theme");
+        assert_eq!(theme.name, "Test Theme");
+
+        // Clean up
+        dir.close().unwrap();
+    }
+
+    #[test]
+    fn test_from_file_nonexistent() {
+        // Test that loading a non-existent file returns an error
+        let result = ThemeFamily::from_file("non-existent-file.json");
+        assert!(result.is_err());
+    }
+
+    #[test]
+    fn test_from_file_invalid_json() {
+        // Create a temporary directory for our test
+        let dir = tempdir().unwrap();
+        let file_path = dir.path().join("invalid-theme.json");
+
+        // Write invalid JSON
+        fs::write(&file_path, "invalid json").unwrap();
+
+        // Test that loading invalid JSON returns an error
+        let result = ThemeFamily::from_file(&file_path);
+        assert!(result.is_err());
+
+        // Clean up
+        dir.close().unwrap();
+    }
+}

crates/title_bar/Cargo.toml

@@ -9,8 +9,6 @@ common = { path = "../common" }
 theme = { path = "../theme" }
 ui = { path = "../ui" }
 
-rust-i18n.workspace = true
-i18n.workspace = true
 nostr-sdk.workspace = true
 gpui.workspace = true
 smol.workspace = true

crates/title_bar/src/lib.rs

@@ -9,18 +9,20 @@ use gpui::{
     WindowControlArea,
 };
 use smallvec::{smallvec, SmallVec};
-use theme::platform_kind::PlatformKind;
 use theme::{ActiveTheme, CLIENT_SIDE_DECORATION_ROUNDING};
 use ui::h_flex;
 
+use crate::platform_kind::PlatformKind;
 #[cfg(target_os = "linux")]
 use crate::platforms::linux::LinuxWindowControls;
 use crate::platforms::windows::WindowsWindowControls;
 
+mod platform_kind;
 mod platforms;
 
 pub struct TitleBar {
     children: SmallVec<[AnyElement; 2]>,
+    platform_kind: PlatformKind,
     should_move: bool,
 }
 
@@ -34,6 +36,7 @@ impl TitleBar {
     pub fn new() -> Self {
         Self {
             children: smallvec![],
+            platform_kind: PlatformKind::platform(),
             should_move: false,
         }
     }
@@ -89,11 +92,15 @@ impl Render for TitleBar {
             .h(height)
             .map(|this| {
                 if window.is_fullscreen() {
-                    this.pl_2()
-                } else if cx.theme().platform_kind.is_mac() {
+                    this.px_2()
+                } else if self.platform_kind.is_mac() {
                     this.pl(px(platforms::mac::TRAFFIC_LIGHT_PADDING))
+                        .pr_2()
+                        .when(children.len() <= 1, |this| {
+                            this.pr(px(platforms::mac::TRAFFIC_LIGHT_PADDING))
+                        })
                 } else {
-                    this.pl_2()
+                    this.px_2()
                 }
             })
             .map(|this| match decorations {
@@ -116,14 +123,14 @@ impl Render for TitleBar {
                     .items_center()
                     .justify_between()
                     .w_full()
-                    .when(cx.theme().platform_kind.is_mac(), |this| {
+                    .when(self.platform_kind.is_mac(), |this| {
                         this.on_click(|event, window, _| {
                             if event.click_count() == 2 {
                                 window.titlebar_double_click();
                             }
                         })
                     })
-                    .when(cx.theme().platform_kind.is_linux(), |this| {
+                    .when(self.platform_kind.is_linux(), |this| {
                         this.on_click(|event, window, _| {
                             if event.click_count() == 2 {
                                 window.zoom_window();
@@ -132,47 +139,45 @@ impl Render for TitleBar {
                     })
                     .children(children),
             )
-            .when(!window.is_fullscreen(), |this| {
-                match cx.theme().platform_kind {
-                    PlatformKind::Linux => {
-                        #[cfg(target_os = "linux")]
-                        if matches!(decorations, Decorations::Client { .. }) {
-                            this.child(LinuxWindowControls::new(None))
-                                .when(supported_controls.window_menu, |this| {
-                                    this.on_mouse_down(MouseButton::Right, move |ev, window, _| {
-                                        window.show_window_menu(ev.position)
-                                    })
+            .when(!window.is_fullscreen(), |this| match self.platform_kind {
+                PlatformKind::Linux => {
+                    #[cfg(target_os = "linux")]
+                    if matches!(decorations, Decorations::Client { .. }) {
+                        this.child(LinuxWindowControls::new(None))
+                            .when(supported_controls.window_menu, |this| {
+                                this.on_mouse_down(MouseButton::Right, move |ev, window, _| {
+                                    window.show_window_menu(ev.position)
                                 })
-                                .on_mouse_move(cx.listener(move |this, _ev, window, _| {
-                                    if this.should_move {
-                                        this.should_move = false;
-                                        window.start_window_move();
-                                    }
-                                }))
-                                .on_mouse_down_out(cx.listener(move |this, _ev, _window, _cx| {
+                            })
+                            .on_mouse_move(cx.listener(move |this, _ev, window, _| {
+                                if this.should_move {
                                     this.should_move = false;
-                                }))
-                                .on_mouse_up(
-                                    MouseButton::Left,
-                                    cx.listener(move |this, _ev, _window, _cx| {
-                                        this.should_move = false;
-                                    }),
-                                )
-                                .on_mouse_down(
-                                    MouseButton::Left,
-                                    cx.listener(move |this, _ev, _window, _cx| {
-                                        this.should_move = true;
-                                    }),
-                                )
-                        } else {
-                            this
-                        }
-                        #[cfg(not(target_os = "linux"))]
+                                    window.start_window_move();
+                                }
+                            }))
+                            .on_mouse_down_out(cx.listener(move |this, _ev, _window, _cx| {
+                                this.should_move = false;
+                            }))
+                            .on_mouse_up(
+                                MouseButton::Left,
+                                cx.listener(move |this, _ev, _window, _cx| {
+                                    this.should_move = false;
+                                }),
+                            )
+                            .on_mouse_down(
+                                MouseButton::Left,
+                                cx.listener(move |this, _ev, _window, _cx| {
+                                    this.should_move = true;
+                                }),
+                            )
+                    } else {
                         this
                     }
-                    PlatformKind::Windows => this.child(WindowsWindowControls::new(height)),
-                    PlatformKind::Mac => this,
+                    #[cfg(not(target_os = "linux"))]
+                    this
                 }
+                PlatformKind::Windows => this.child(WindowsWindowControls::new(height)),
+                PlatformKind::Mac => this,
             })
     }
 }

crates/title_bar/src/platform_kind.rs

@@ -16,14 +16,17 @@ impl PlatformKind {
         }
     }
 
+    #[allow(dead_code)]
     pub fn is_linux(&self) -> bool {
         matches!(self, Self::Linux)
     }
 
+    #[allow(dead_code)]
     pub fn is_windows(&self) -> bool {
         matches!(self, Self::Windows)
     }
 
+    #[allow(dead_code)]
     pub fn is_mac(&self) -> bool {
         matches!(self, Self::Mac)
     }

crates/ui/Cargo.toml

@@ -7,11 +7,7 @@ publish.workspace = true
 [dependencies]
 common = { path = "../common" }
 theme = { path = "../theme" }
-registry = { path = "../registry" }
 
-rust-i18n.workspace = true
-i18n.workspace = true
-nostr-sdk.workspace = true
 gpui.workspace = true
 smol.workspace = true
 serde.workspace = true
@@ -20,14 +16,11 @@ smallvec.workspace = true
 anyhow.workspace = true
 itertools.workspace = true
 log.workspace = true
-emojis.workspace = true
 
-regex = "1"
 unicode-segmentation = "1.12.0"
 uuid = "1.10"
-once_cell = "1.19.0"
+regex = "1"
 image = "0.25.1"
-linkify = "0.10.0"
 lsp-types = "0.97.0"
-rope = { git = "https://github.com/zed-industries/zed.git" }
-sum_tree = { git = "https://github.com/zed-industries/zed.git" }
+rope = { git = "https://github.com/zed-industries/zed" }
+sum_tree = { git = "https://github.com/zed-industries/zed" }

crates/ui/src/actions.rs

@@ -1,17 +1,6 @@
 use gpui::{actions, Action};
-use nostr_sdk::prelude::PublicKey;
 use serde::Deserialize;
 
-/// Define a open public key action
-#[derive(Action, Clone, PartialEq, Eq, Deserialize, Debug)]
-#[action(namespace = pubkey, no_json)]
-pub struct OpenPublicKey(pub PublicKey);
-
-/// Define a copy inline public key action
-#[derive(Action, Clone, PartialEq, Eq, Deserialize, Debug)]
-#[action(namespace = pubkey, no_json)]
-pub struct CopyPublicKey(pub PublicKey);
-
 /// Define a custom confirm action
 #[derive(Clone, Action, PartialEq, Eq, Deserialize)]
 #[action(namespace = list, no_json)]
@@ -20,14 +9,4 @@ pub struct Confirm {
     pub secondary: bool,
 }
 
-actions!(
-    list,
-    [
-        /// Close current list
-        Cancel,
-        /// Select the next item in lists
-        SelectPrev,
-        /// Select the previous item in list
-        SelectNext
-    ]
-);
+actions!(ui, [Cancel, SelectUp, SelectDown, SelectLeft, SelectRight]);