.

.github/workflows/release.yml

@@ -152,23 +152,11 @@ jobs:
           echo "Artifacts structure:"
           find artifacts -type f -exec ls -la {} \;
 
-      - name: Generate SHA256SUMS
-        run: |
-          # One `<sha256>  <path>` line per artifact. The in-app updater reads
-          # this to verify a download before installing it, so it must be
-          # published alongside every release. Written outside the directory
-          # being hashed so the checksums file never includes itself.
-          find artifacts -type f ! -name SHA256SUMS -print0 \
-            | sort -z \
-            | xargs -0 sha256sum > SHA256SUMS.raw
-          mv SHA256SUMS.raw artifacts/SHA256SUMS
-          cat artifacts/SHA256SUMS
-
       - name: Create draft release
         id: create_release
         uses: akkuman/gitea-release-action@v1
         with:
-          server_url: "https://git.reya.info/"
+          server_url: "https://git.reya.su/"
           repository: "reya/coop"
           token: ${{ secrets.GITEA_TOKEN }}
           draft: true

.gitignore

@@ -19,8 +19,8 @@ dist/
 
 # Useless stuffs
 .DS_Store
+# Added by goreleaser init:
+.intentionally-empty-file.o
 
 .cargo/
 vendor/
-wasm/
-node_modules/

AGENTS.md

@@ -1,150 +0,0 @@
-# Rust coding guidelines
-
-* Prioritize code correctness and clarity. Speed and efficiency are secondary priorities unless otherwise specified.
-* Do not write organizational or comments that summarize the code. Comments should only be written in order to explain "why" the code is written in some way in the case there is a reason that is tricky / non-obvious.
-* Prefer implementing functionality in existing files unless it is a new logical component. Avoid creating many small files.
-* Avoid using functions that panic like `unwrap()`, instead use mechanisms like `?` to propagate errors.
-* Be careful with operations like indexing which may panic if the indexes are out of bounds.
-* Never silently discard errors with `let _ =` on fallible operations. Always handle errors appropriately:
-  - Propagate errors with `?` when the calling function should handle them
-  - Use `.log_err()` or similar when you need to ignore errors but want visibility
-  - Use explicit error handling with `match` or `if let Err(...)` when you need custom logic
-  - Example: avoid `let _ = client.request(...).await?;` - use `client.request(...).await?;` instead
-* When implementing async operations that may fail, ensure errors propagate to the UI layer so users get meaningful feedback.
-* Avoid creative additions unless explicitly requested
-* Use full words for variable names (no abbreviations like "q" for "queue")
-* Use variable shadowing to scope clones in async contexts for clarity, minimizing the lifetime of borrowed references.
-  Example:
-  ```rust
-  executor.spawn({
-      let task_ran = task_ran.clone();
-      async move {
-          *task_ran.borrow_mut() = true;
-      }
-  });
-  ```
-
-# Timers in tests
-
-* In GPUI tests, prefer GPUI executor timers over `smol::Timer::after(...)` when you need timeouts, delays, or to drive `run_until_parked()`:
-  - Use `cx.background_executor().timer(duration).await` (or `cx.background_executor.timer(duration).await` in `TestAppContext`) so the work is scheduled on GPUI's dispatcher.
-  - Avoid `smol::Timer::after(...)` for test timeouts when you rely on `run_until_parked()`, because it may not be tracked by GPUI's scheduler and can lead to "nothing left to run" when pumping.
-
-# GPUI
-
-GPUI is a UI framework which also provides primitives for state and concurrency management.
-
-## Context
-
-Context types allow interaction with global state, windows, entities, and system services. They are typically passed to functions as the argument named `cx`. When a function takes callbacks they come after the `cx` parameter.
-
-* `App` is the root context type, providing access to global state and read and update of entities.
-* `Context<T>` is provided when updating an `Entity<T>`. This context dereferences into `App`, so functions which take `&App` can also take `&Context<T>`.
-* `AsyncApp` and `AsyncWindowContext` are provided by `cx.spawn` and `cx.spawn_in`. These can be held across await points.
-
-## `Window`
-
-`Window` provides access to the state of an application window. It is passed to functions as an argument named `window` and comes before `cx` when present. It is used for managing focus, dispatching actions, directly drawing, getting user input state, etc.
-
-## Entities
-
-An `Entity<T>` is a handle to state of type `T`. With `thing: Entity<T>`:
-
-* `thing.entity_id()` returns `EntityId`
-* `thing.downgrade()` returns `WeakEntity<T>`
-* `thing.read(cx: &App)` returns `&T`.
-* `thing.read_with(cx, |thing: &T, cx: &App| ...)` returns the closure's return value.
-* `thing.update(cx, |thing: &mut T, cx: &mut Context<T>| ...)` allows the closure to mutate the state, and provides a `Context<T>` for interacting with the entity. It returns the closure's return value.
-* `thing.update_in(cx, |thing: &mut T, window: &mut Window, cx: &mut Context<T>| ...)` takes a `AsyncWindowContext` or `VisualTestContext`. It's the same as `update` while also providing the `Window`.
-
-Within the closures, the inner `cx` provided to the closure must be used instead of the outer `cx` to avoid issues with multiple borrows.
-
-Trying to update an entity while it's already being updated must be avoided as this will cause a panic.
-
-`WeakEntity<T>` is a weak handle. It has `read_with`, `update`, and `update_in` methods that work the same, but always return an `anyhow::Result` so that they can fail if the entity no longer exists. This can be useful to avoid memory leaks - if entities have mutually recursive handles to each other they will never be dropped.
-
-## Concurrency
-
-All use of entities and UI rendering occurs on a single foreground thread.
-
-`cx.spawn(async move |cx| ...)` runs an async closure on the foreground thread. Within the closure, `cx` is `&mut AsyncApp`.
-
-When the outer cx is a `Context<T>`, the use of `spawn` instead looks like `cx.spawn(async move |this, cx| ...)`, where `this: WeakEntity<T>` and `cx: &mut AsyncApp`.
-
-To do work on other threads, `cx.background_spawn(async move { ... })` is used. Often this background task is awaited on by a foreground task which uses the results to update state.
-
-Both `cx.spawn` and `cx.background_spawn` return a `Task<R>`, which is a future that can be awaited upon. If this task is dropped, then its work is cancelled. To prevent this one of the following must be done:
-
-* Awaiting the task in some other async context.
-* Detaching the task via `task.detach()` or `task.detach_and_log_err(cx)`, allowing it to run indefinitely.
-* Storing the task in a field, if the work should be halted when the struct is dropped.
-
-A task which doesn't do anything but provide a value can be created with `Task::ready(value)`.
-
-## Elements
-
-The `Render` trait is used to render some state into an element tree that is laid out using flexbox layout. An `Entity<T>` where `T` implements `Render` is sometimes called a "view".
-
-Example:
-
-```
-struct TextWithBorder(SharedString);
-
-impl Render for TextWithBorder {
-    fn render(&mut self, _window: &mut Window, _cx: &mut Context<Self>) -> impl IntoElement {
-        div().border_1().child(self.0.clone())
-    }
-}
-```
-
-Since `impl IntoElement for SharedString` exists, it can be used as an argument to `child`. `SharedString` is used to avoid copying strings, and is either an `&'static str` or `Arc<str>`.
-
-UI components that are constructed just to be turned into elements can instead implement the `RenderOnce` trait, which is similar to `Render`, but its `render` method takes ownership of `self` and receives `&mut App` instead of `&mut Context<Self>`. Types that implement this trait can use `#[derive(IntoElement)]` to use them directly as children.
-
-The style methods on elements are similar to those used by Tailwind CSS.
-
-If some attributes or children of an element tree are conditional, `.when(condition, |this| ...)` can be used to run the closure only when `condition` is true. Similarly, `.when_some(option, |this, value| ...)` runs the closure when the `Option` has a value.
-
-## Input events
-
-Input event handlers can be registered on an element via methods like `.on_click(|event, window, cx: &mut App| ...)`.
-
-Often event handlers will want to update the entity that's in the current `Context<T>`. The `cx.listener` method provides this - its use looks like `.on_click(cx.listener(|this: &mut T, event, window, cx: &mut Context<T>| ...)`.
-
-## Actions
-
-Actions are dispatched via user keyboard interaction or in code via `window.dispatch_action(SomeAction.boxed_clone(), cx)` or `focus_handle.dispatch_action(&SomeAction, window, cx)`.
-
-Actions with no data are defined with the `actions!(some_namespace, [SomeAction, AnotherAction])` macro call. Otherwise the `Action` derive macro is used. Doc comments on actions are displayed to the user.
-
-Action handlers can be registered on an element via the event handler `.on_action(|action, window, cx| ...)`. Like other event handlers, this is often used with `cx.listener`.
-
-## Notify
-
-When a view's state has changed in a way that may affect its rendering, it should call `cx.notify()`. This will cause the view to be rerendered. It will also cause any observe callbacks registered for the entity with `cx.observe` to be called.
-
-## Entity events
-
-While updating an entity (`cx: Context<T>`), it can emit an event using `cx.emit(event)`. Entities register which events they can emit by declaring `impl EventEmitter<EventType> for EntityType {}`.
-
-Other entities can then register a callback to handle these events by doing `cx.subscribe(other_entity, |this, other_entity, event, cx| ...)`. This will return a `Subscription` which deregisters the callback when dropped.  Typically `cx.subscribe` happens when creating a new entity and the subscriptions are stored in a `_subscriptions: Vec<Subscription>` field.
-
-# Pull request hygiene
-
-When an agent opens or updates a pull request, it must:
-
-- Use a clear, correctly capitalized, imperative PR title (for example, `fix crash in project panel`).
-- Avoid conventional commit prefixes in PR titles (`fix:`, `feat:`, `docs:`, etc.).
-- Avoid trailing punctuation in PR titles.
-- Optionally prefix the title with a crate name when one crate is the clear scope (for example, `workspace: add history view`).
-- Include a `Release Notes:` section as the final section in the PR body.
-- Use one bullet under `Release Notes:`:
-  - `- Added ...`, `- Fixed ...`, or `- Improved ...` for user-facing changes, or
-  - `- N/A` for docs-only and other non-user-facing changes.
-- Format release notes exactly with a blank line after the heading, for example:
-
-```
-Release Notes:
-
-- N/A
-```

Cargo.toml

@@ -4,7 +4,7 @@ members = ["crates/*", "desktop", "web"]
 default-members = ["desktop"]
 
 [workspace.package]
-version = "1.0.2"
+version = "1.0.0-beta5"
 edition = "2024"
 publish = false
 
@@ -19,28 +19,17 @@ gpui_tokio = { git = "https://github.com/zed-industries/zed" }
 reqwest_client = { git = "https://github.com/zed-industries/zed" }
 
 # Nostr
-nostr-lmdb = { git = "https://github.com/rust-nostr/nostr" }
-nostr-memory = { git = "https://github.com/rust-nostr/nostr" }
-nostr-blossom = { git = "https://github.com/rust-nostr/nostr" }
-nostr-gossip-memory = { 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" }
-nostr = { git = "https://github.com/rust-nostr/nostr", features = [ "nip59", "nip49", "nip44" ] }
-
-# Crypto (NIP-17 encrypted file messages)
-aes-gcm = "0.10"
-sha2 = "0.10"
-data-encoding = "2"
-hkdf = "0.12"
-# Pinned to the instances `nostr` already builds: the NIP-44 message-key disclosure
-chacha20 = "0.9"
-hmac = "0.12"
-# Pinned to the instance `nostr-sdk` already builds, so NIP-44 nonces share it
-rand = { version = "0.10", default-features = false, features = [ "std", "sys_rng" ] }
+nostr-lmdb = { git = "https://github.com/rust-nostr/nostr", branch = "send-bound" }
+nostr-memory = { git = "https://github.com/rust-nostr/nostr", branch = "send-bound" }
+nostr-blossom = { git = "https://github.com/rust-nostr/nostr", branch = "send-bound" }
+nostr-gossip-memory = { git = "https://github.com/rust-nostr/nostr", branch = "send-bound" }
+nostr-connect = { git = "https://github.com/rust-nostr/nostr", branch = "send-bound" }
+nostr-sdk = { git = "https://github.com/rust-nostr/nostr", branch = "send-bound" }
+nostr = { git = "https://github.com/rust-nostr/nostr", features = [ "nip59", "nip49", "nip44" ], branch = "send-bound" }
 
 # Others
 anyhow = "1.0.44"
-chrono = { version = "0.4.38", features = ["wasmbind"] }
+chrono = "0.4.38"
 futures = "0.3"
 itertools = "0.13.0"
 log = "0.4"
@@ -53,10 +42,8 @@ schemars = "1"
 smallvec = "1.14.0"
 smol = "2"
 webbrowser = "1.0.4"
-tracing-subscriber = { version = "0.3.18", features = ["fmt"] }
+tracing-subscriber = { version = "0.3.18", features = ["fmt", "env-filter"] }
 errno = { version = "0.3.14", default-features = false }
-instant = "0.1"
-ureq = { version = "3", default-features = false, features = ["rustls", "platform-verifier", "json"] }
 
 [patch.crates-io]
 # Use stacker's psm version which may have better WASM support

README.md

@@ -1,5 +1,125 @@
+![Coop](/docs/coop.png)
+
+<p>
+    <a href="https://github.com/reyakov/coop/actions/workflows/rust.yml">
+      <img alt="Actions" src="https://github.com/reyakov/coop/actions/workflows/rust.yml/badge.svg">
+    </a>
+    <img alt="GitHub repo size" src="https://img.shields.io/github/repo-size/reyakov/coop">
+    <img alt="GitHub issues" src="https://img.shields.io/github/issues-raw/reyakov/coop">
+    <img alt="GitHub pull requests" src="https://img.shields.io/github/issues-pr/reyakov/coop">
+</p>
+
 Coop is a simple, fast, and reliable nostr client for secure messaging across all platforms.
 
+### Screenshots
+
+<p float="left">
+  <img src="/docs/mac_01.png" width="250" />
+  <img src="/docs/mac_02.png" width="250" />
+  <img src="/docs/mac_03.png" width="250" />
+  <img src="/docs/mac_04.png" width="250" />
+  <img src="/docs/mac_05.png" width="250" />
+  <img src="/docs/mac_06.png" width="250" />
+  <img src="/docs/mac_07.png" width="250" />
+  <img src="/docs/mac_08.png" width="250" />
+  <img src="/docs/mac_09.png" width="250" />
+  <img src="/docs/linux_01.png" width="250" />
+  <img src="/docs/linux_02.png" width="250" />
+  <img src="/docs/linux_03.png" width="250" />
+  <img src="/docs/linux_04.png" width="250" />
+  <img src="/docs/linux_05.png" width="250" />
+</p>
+
+### Installation
+
+To install Coop, follow these steps:
+
+1. **Download the Latest Release**:
+
+   - Visit the [Coop Releases page on GitHub](https://github.com/reyakov/coop/releases).
+   - Download the package that matches your operating system (Windows, macOS, or Linux).
+
+2. **Install**:
+
+   - **Windows**: Run the downloaded `.exe` installer and follow the on-screen instructions.
+   - **macOS**: Open the downloaded `.dmg` file and drag Coop to your Applications folder.
+   - **Linux**: Run the downloaded `.flatpak` or `.snap` installer and follow the on-screen instructions.
+
+3. **Run Coop**:
+   - Launch Coop from your Applications folder (macOS) or by double-clicking the executable (Windows/Linux).
+
+For more detailed instructions, refer to the [Release Notes](#) on GitHub.
+
+### Developing Coop
+
+Coop is built using Rust and GPUI. All Nostr related stuffs handled by [Rust Nostr SDK](https://github.com/rust-nostr/nostr)
+
+#### Prerequisites
+
+- **Rust Toolchain**: Ensure you have Rust installed. If not, you can install it using [rustup](https://rustup.rs/).
+- **Cargo**: Rust's package manager, which comes bundled with the Rust installation.
+- **Git**: To clone the repository and manage version control.
+
+#### Setting Up the Development Environment
+
+1. Clone the repository:
+
+   ```bash
+   git clone https://github.com/reyakov/coop.git
+   cd coop
+   ```
+
+2.1 Install Linux dependencies:
+
+   ```bash
+   ./script/linux
+   ```
+
+2.2 Install FreeBSD dependencies:
+
+   ```bash
+   ./script/freebsd
+   ```
+
+3. Install Rust dependencies:
+
+   ```bash
+   cargo build
+   ```
+
+4. Run the app:
+   ```bash
+   cargo run
+   ```
+
+#### Building for Production
+
+To build Coop for production, use the following command:
+
+```bash
+cargo build --release
+```
+
+This will generate an optimized binary in the `target/release` directory.
+
+#### Contributing Code
+
+If you'd like to contribute to Coop, please follow these steps:
+
+1. Fork the repository.
+2. Create a new branch for your feature or bugfix.
+3. Make your changes and ensure all tests pass.
+4. Submit a pull request with a detailed description of your changes.
+
+For more information, see the [Contributing](#contributing) section.
+
+#### Additional Resources
+
+- [Rust Nostr](https://github.com/rust-nostr/nostr/)
+- [GPUI](https://www.gpui.rs/)
+- [GPUI Components](https://github.com/longbridge/gpui-component/)
+- [Coop Issue Tracker](https://github.com/reyakov/coop/issues/)
+
 ### License
 
 Copyright (C) 2025 Ren Amamiya & other Coop contributors

assets/icons/lock.svg

@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none">
-<path d="M12 8.75003C11.1716 8.75003 10.5 9.4216 10.5 10.25C10.5 11.0785 11.1716 11.75 12 11.75C12.8284 11.75 13.5 11.0785 13.5 10.25C13.5 9.4216 12.8284 8.75003 12 8.75003ZM12 8.75003V14.75M20.25 11.9124V6.94155C20.25 6.08069 19.6991 5.31641 18.8825 5.04418L12.6325 2.96085C12.2219 2.824 11.7781 2.824 11.3675 2.96085L5.11754 5.04418C4.30086 5.31641 3.75 6.08069 3.75 6.94155V11.9124C3.75 16.8848 8 19.25 12 21.4079C16 19.25 20.25 16.8848 20.25 11.9124Z" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>

assets/themes/aurora.json

@@ -2,7 +2,7 @@
   "id": "aurora",
   "name": "Aurora",
   "author": "Coop",
-  "url": "https://coopchat.xyz",
+  "url": "https://github.com/lumehq/coop",
   "light": {
     "background": "#fdfcfeff",
     "surface_background": "#f8f8ffff",

assets/themes/forest.json

@@ -2,7 +2,7 @@
   "id": "forest",
   "name": "Forest",
   "author": "Coop",
-  "url": "https://coopchat.xyz",
+  "url": "https://github.com/lumehq/coop",
   "light": {
     "background": "#fbfefcff",
     "surface_background": "#f4fbf6ff",

assets/themes/ocean.json

@@ -2,7 +2,7 @@
   "id": "ocean",
   "name": "Ocean",
   "author": "Coop",
-  "url": "https://coopchat.xyz",
+  "url": "https://github.com/lumehq/coop",
   "light": {
     "background": "#fafefeff",
     "surface_background": "#f2fbfaff",

crates/auto_update/Cargo.toml

@@ -5,11 +5,17 @@ edition.workspace = true
 publish.workspace = true
 
 [dependencies]
-gpui.workspace = true
-instant.workspace = true
-log.workspace = true
-serde.workspace = true
-serde_json.workspace = true
-ureq.workspace = true
+common = { path = "../common" }
 
-gpui-updater-core = { git = "https://github.com/AprilNEA/gpui-updater" }
+gpui.workspace = true
+anyhow.workspace = true
+log.workspace = true
+smallvec.workspace = true
+serde = { workspace = true, features = ["derive"] }
+serde_json.workspace = true
+
+semver = "1.0.27"
+tempfile = "3.23.0"
+
+[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
+smol.workspace = true

crates/auto_update/src/lib.rs

@@ -1,326 +1,563 @@
 #![cfg(not(target_arch = "wasm32"))]
 
+use std::ffi::OsString;
+use std::path::{Path, PathBuf};
 use std::sync::Arc;
-use std::sync::atomic::{AtomicBool, AtomicU64, Ordering};
+use std::time::Duration;
 
-use gpui::{App, AppContext, Context, Entity, Global, SharedString, Task, Window};
-use gpui_updater_core::{EngineConfig, Release, UpdateEngine, UpdateStatus, Verification, Version};
-use instant::Duration;
-
-use crate::source::{AssetFilter, GiteaSource, asset_filter_for};
-
-mod source;
-
-pub use gpui_updater_core::UpdateStatus as AutoUpdateStatus;
-
-const GITEA_API_BASE: &str = "https://git.reya.info/api/v1";
-const GITEA_REPO_OWNER: &str = "reya";
-const GITEA_REPO_NAME: &str = "coop";
-
-/// Delay before the automatic check that runs on startup.
-const AUTO_CHECK_DELAY: Duration = Duration::from_secs(120);
-/// How long a failure stays visible before the status reverts to "Up to date".
-const ERROR_DISPLAY_DURATION: Duration = Duration::from_secs(5);
+use anyhow::{Context as AnyhowContext, Error, anyhow};
+use gpui::http_client::{AsyncBody, HttpClient};
+use gpui::{
+    App, AppContext, AsyncApp, BackgroundExecutor, Context, Entity, Global, Subscription, Task,
+    Window,
+};
+use semver::Version;
+use serde::Deserialize;
+use smallvec::{SmallVec, smallvec};
+use smol::fs::File;
+use smol::io::AsyncReadExt;
+use smol::process::Command;
 
+const GITHUB_API_URL: &str = "https://api.github.com";
 const COOP_UPDATE_EXPLANATION: &str = "COOP_UPDATE_EXPLANATION";
-const COOP_BUNDLE_TYPE: &str = "COOP_BUNDLE_TYPE";
 
-fn uses_managed_updates() -> bool {
-    // The Flatpak runtime exports `FLATPAK_ID` inside the sandbox.
-    std::env::var("FLATPAK_ID").is_ok()
-        // Allow opting out of in-app updates via an explicit environment variable.
-        || std::env::var(COOP_UPDATE_EXPLANATION).is_ok()
-        // The Snap package sets `COOP_BUNDLE_TYPE=snap` (see snapcraft.yaml.in).
-        || std::env::var(COOP_BUNDLE_TYPE).is_ok_and(|value| value == "snap")
+fn get_github_repo_owner() -> String {
+    std::env::var("COOP_GITHUB_REPO_OWNER").unwrap_or_else(|_| "reyakov".to_string())
+}
+
+fn get_github_repo_name() -> String {
+    std::env::var("COOP_GITHUB_REPO_NAME").unwrap_or_else(|_| "coop".to_string())
+}
+
+fn is_flatpak_installation() -> bool {
+    // Check if app is installed via Flatpak
+    std::env::var("FLATPAK_ID").is_ok() || std::env::var(COOP_UPDATE_EXPLANATION).is_ok()
 }
 
-/// Initialize the auto-update system.
 pub fn init(window: &mut Window, cx: &mut App) {
-    if uses_managed_updates() {
-        log::info!(
-            "Skipping auto-update initialization: updates are managed by the installed distribution channel (Flatpak/Snap)"
-        );
+    // Skip auto-update initialization if installed via Flatpak
+    if is_flatpak_installation() {
+        log::info!("Skipping auto-update initialization: App is installed via Flatpak");
         return;
     }
 
-    let (os, arch) = (std::env::consts::OS, std::env::consts::ARCH);
-
-    let Some(filter) = asset_filter_for(os, arch) else {
-        log::info!(
-            "Skipping auto-update initialization: no installable release artifact is published for {os}/{arch}"
-        );
-        return;
-    };
-
-    let Ok(version) = Version::parse(env!("CARGO_PKG_VERSION")) else {
-        log::error!(
-            "Skipping auto-update initialization: crate version {:?} is not valid semver",
-            env!("CARGO_PKG_VERSION")
-        );
-        return;
-    };
-
-    AutoUpdater::set_global(
-        cx.new(|cx| AutoUpdater::new(window, version, filter, cx)),
-        cx,
-    );
+    AutoUpdater::set_global(cx.new(|cx| AutoUpdater::new(window, cx)), cx);
 }
 
 struct GlobalAutoUpdater(Entity<AutoUpdater>);
 
 impl Global for GlobalAutoUpdater {}
 
+#[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 { download_url: String },
+    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)
+    }
+
+    pub fn is_updated(&self) -> bool {
+        matches!(self, Self::Updated)
+    }
+
+    pub fn checked(download_url: String) -> Self {
+        Self::Checked { download_url }
+    }
+
+    pub fn error(e: String) -> Self {
+        Self::Errored { msg: Box::new(e) }
+    }
+}
+
+#[derive(Debug, Deserialize)]
+pub struct GitHubRelease {
+    pub tag_name: String,
+    pub assets: Vec<GitHubAsset>,
+}
+
+#[derive(Debug, Deserialize)]
+pub struct GitHubAsset {
+    pub name: String,
+    pub browser_download_url: String,
+}
+
+#[derive(Debug)]
 pub struct AutoUpdater {
-    /// The blocking engine, driven on the background executor.
-    engine: Arc<UpdateEngine<GiteaSource>>,
-    status: UpdateStatus,
-    /// The newer release found by the last successful check, if any.
-    available: Option<Release>,
-    /// Currently running app version.
+    /// Current status of the auto updater
+    pub status: AutoUpdateStatus,
+
+    /// Current version of the application
     pub version: Version,
-    /// The in-flight check or download, if any.
-    task: Option<Task<()>>,
+
+    /// Event subscriptions
+    _subscriptions: SmallVec<[Subscription; 1]>,
+
+    /// Background tasks
+    tasks: Vec<Task<Result<(), Error>>>,
 }
 
 impl AutoUpdater {
-    /// Whether auto-update is available for this installation.
-    pub fn is_available(cx: &App) -> bool {
-        cx.try_global::<GlobalAutoUpdater>().is_some()
-    }
-
-    /// Retrieve the global auto updater instance, if one was initialized.
-    pub fn try_global(cx: &App) -> Option<Entity<Self>> {
-        cx.try_global::<GlobalAutoUpdater>()
-            .map(|global| global.0.clone())
-    }
-
-    /// Retrieve the global auto updater instance.
+    /// Retrieve the global auto updater instance
     pub fn global(cx: &App) -> Entity<Self> {
         cx.global::<GlobalAutoUpdater>().0.clone()
     }
 
+    /// Set the global auto updater instance
     fn set_global(state: Entity<Self>, cx: &mut App) {
         cx.set_global(GlobalAutoUpdater(state));
     }
 
-    fn new(
-        window: &mut Window,
-        version: Version,
-        filter: AssetFilter,
-        cx: &mut Context<Self>,
-    ) -> Self {
-        let source = GiteaSource::new(GITEA_API_BASE, GITEA_REPO_OWNER, GITEA_REPO_NAME, filter);
-        let config = EngineConfig::new(version.clone()).verification(Verification::Checksum);
-        let engine = Arc::new(UpdateEngine::new(source, config));
+    fn new(window: &mut Window, cx: &mut Context<Self>) -> Self {
+        let version = Version::parse(env!("CARGO_PKG_VERSION")).unwrap();
+        let mut subscriptions = smallvec![];
 
-        // Schedule an auto-check after a 2-minute delay
-        cx.defer_in(window, |_this, _window, cx| {
-            cx.spawn(async move |this, cx| {
-                cx.background_executor().timer(AUTO_CHECK_DELAY).await;
-                this.update(cx, |this, cx| this.check(cx)).ok();
-            })
-            .detach();
+        subscriptions.push(
+            // Observe the status
+            cx.observe_self(|this, cx| {
+                if let AutoUpdateStatus::Checked { download_url } = this.status.clone() {
+                    this.download_and_install(&download_url, cx);
+                }
+            }),
+        );
+
+        // Run at the end of current cycle
+        cx.defer_in(window, |this, _window, cx| {
+            this.check(cx);
         });
 
         Self {
-            engine,
-            status: UpdateStatus::Idle,
-            available: None,
+            status: AutoUpdateStatus::Idle,
             version,
-            task: None,
+            tasks: vec![],
+            _subscriptions: subscriptions,
         }
     }
 
-    /// Whether nothing is happening, so the UI can hide the status line.
-    pub fn idle(&self) -> bool {
-        matches!(self.status, UpdateStatus::Idle)
-    }
-
-    /// Whether a verified update is installed and waiting for a restart.
-    pub fn staged(&self) -> bool {
-        matches!(self.status, UpdateStatus::Staged(_))
-    }
-
-    /// A short, human-readable description of the current status.
-    pub fn status(&self) -> SharedString {
-        match &self.status {
-            UpdateStatus::Idle | UpdateStatus::UpToDate => "Up to date".into(),
-            UpdateStatus::Checking => "Checking for updates…".into(),
-            UpdateStatus::Available(version) => format!("Version {version} available").into(),
-            UpdateStatus::Downloading { downloaded, total } => {
-                let total_mb = total.map(|t| t as f64 / 1_048_576.0);
-                let downloaded_mb = *downloaded as f64 / 1_048_576.0;
-                match total_mb {
-                    Some(t) => format!("Downloading {downloaded_mb:.1} / {t:.1} MB").into(),
-                    None => format!("Downloading {downloaded_mb:.1} MB").into(),
-                }
-            }
-            UpdateStatus::Installing => "Installing update…".into(),
-            UpdateStatus::Staged(version) => {
-                format!("Version {version} ready — restart to apply").into()
-            }
-            UpdateStatus::Errored(message) => format!("Update failed: {message}").into(),
-        }
-    }
-
-    /// Check the release host for a newer version, then download and install it.
-    pub fn check(&mut self, cx: &mut Context<Self>) {
-        if self.status.is_busy() {
-            return;
-        }
-        self.set_status(UpdateStatus::Checking, cx);
-
-        let engine = self.engine.clone();
-
-        self.task = Some(cx.spawn(async move |this, cx| {
-            let result = cx
-                .background_executor()
-                .spawn(async move { engine.check() })
-                .await;
-
-            this.update(cx, |this, cx| {
-                this.task = None;
-                match result {
-                    Ok(Some(release)) => {
-                        log::info!("Update {} is available", release.version);
-                        let version = release.version.clone();
-                        this.available = Some(release);
-                        this.set_status(UpdateStatus::Available(version), cx);
-                        this.download_and_install(cx);
-                    }
-                    Ok(None) => this.set_status(UpdateStatus::UpToDate, cx),
-                    Err(error) => {
-                        log::warn!("Update check failed: {error}");
-                        this.set_status(UpdateStatus::Errored(error.to_string()), cx);
-                    }
-                }
-            })
-            .ok();
-        }));
-    }
-
-    /// Download the available update, verify it, and swap it into place.
-    fn download_and_install(&mut self, cx: &mut Context<Self>) {
-        if self.status.is_busy() {
-            return;
-        }
-        let Some(release) = self.available.clone() else {
-            return;
-        };
-
-        let engine = self.engine.clone();
-        self.set_status(
-            UpdateStatus::Downloading {
-                downloaded: 0,
-                total: None,
-            },
-            cx,
-        );
-
-        self.task = Some(cx.spawn(async move |this, cx| {
-            let downloaded = Arc::new(AtomicU64::new(0));
-            let total = Arc::new(AtomicU64::new(0)); // 0 = unknown
-            let done = Arc::new(AtomicBool::new(false));
-
-            let download_task = {
-                let (engine, release) = (engine.clone(), release.clone());
-                let (downloaded, total, done) = (downloaded.clone(), total.clone(), done.clone());
-                cx.background_executor().spawn(async move {
-                    let result = engine.download(&release, |got, expected| {
-                        downloaded.store(got, Ordering::Relaxed);
-                        total.store(expected.unwrap_or(0), Ordering::Relaxed);
-                    });
-                    done.store(true, Ordering::Relaxed);
-                    result
-                })
-            };
-
-            loop {
-                let got = downloaded.load(Ordering::Relaxed);
-                let total = total.load(Ordering::Relaxed);
-                this.update(cx, |this, cx| {
-                    this.set_status(
-                        UpdateStatus::Downloading {
-                            downloaded: got,
-                            total: (total != 0).then_some(total),
-                        },
-                        cx,
-                    );
-                })
-                .ok();
-                if done.load(Ordering::Relaxed) {
-                    break;
-                }
-                cx.background_executor()
-                    .timer(Duration::from_millis(120))
-                    .await;
-            }
-
-            let artifact = match download_task.await {
-                Ok(artifact) => artifact,
-                Err(error) => {
-                    log::warn!("Update download failed: {error}");
-                    this.update(cx, |this, cx| {
-                        this.task = None;
-                        this.set_status(UpdateStatus::Errored(error.to_string()), cx);
-                    })
-                    .ok();
-                    return;
-                }
-            };
-
-            let _ = this.update(cx, |this, cx| this.set_status(UpdateStatus::Installing, cx));
-
-            let installed = {
-                let engine = engine.clone();
-                cx.background_executor()
-                    .spawn(async move { engine.install(&artifact) })
-                    .await
-            };
-
-            this.update(cx, |this, cx| {
-                this.task = None;
-                match installed {
-                    Ok(installed) => {
-                        if let Some(path) = installed.restart_path {
-                            cx.set_restart_path(path);
-                        }
-                        let version = release.version.clone();
-                        this.set_status(UpdateStatus::Staged(version), cx);
-                    }
-                    Err(error) => {
-                        this.set_status(UpdateStatus::Errored(error.to_string()), cx);
-                    }
-                }
-            })
-            .ok();
-        }));
-    }
-
-    /// Relaunch into the staged update.
-    pub fn restart(&mut self, cx: &mut Context<Self>) {
-        if !self.staged() {
-            log::warn!("Ignoring restart request: no update is staged");
-            return;
-        }
-        cx.restart();
-    }
-
-    fn set_status(&mut self, status: UpdateStatus, cx: &mut Context<Self>) {
-        let errored = matches!(status, UpdateStatus::Errored(_));
+    fn set_status(&mut self, status: AutoUpdateStatus, cx: &mut Context<Self>) {
         self.status = status;
-
-        if errored {
-            cx.spawn(async move |this, cx| {
-                cx.background_executor().timer(ERROR_DISPLAY_DURATION).await;
-                this.update(cx, |this, cx| {
-                    this.set_status(UpdateStatus::Idle, cx);
-                })
-                .ok();
-            })
-            .detach();
-        }
-
         cx.notify();
     }
+
+    fn check(&mut self, cx: &mut Context<Self>) {
+        let version = self.version.clone();
+        let duration = Duration::from_secs(120);
+        let task = self.check_for_updates(version, cx);
+
+        // Check for updates after 2 minutes
+        self.tasks.push(cx.spawn(async move |this, cx| {
+            cx.background_executor().timer(duration).await;
+
+            // Update the status to checking
+            this.update(cx, |this, cx| {
+                this.set_status(AutoUpdateStatus::Checking, cx);
+            })?;
+
+            match task.await {
+                Ok(download_url) => {
+                    // Update the status to checked with download URL
+                    this.update(cx, |this, cx| {
+                        this.set_status(AutoUpdateStatus::checked(download_url), cx);
+                    })?;
+                }
+                Err(e) => {
+                    log::warn!("Failed to check for updates: {e}");
+                    this.update(cx, |this, cx| {
+                        this.set_status(AutoUpdateStatus::Idle, cx);
+                    })?;
+                }
+            }
+
+            Ok(())
+        }));
+    }
+
+    fn check_for_updates(&self, version: Version, cx: &App) -> Task<Result<String, Error>> {
+        let http_client = cx.http_client();
+        let repo_owner = get_github_repo_owner();
+        let repo_name = get_github_repo_name();
+
+        cx.background_spawn(async move {
+            let url = format!(
+                "{}/repos/{}/{}/releases/latest",
+                GITHUB_API_URL, repo_owner, repo_name
+            );
+
+            let async_body = AsyncBody::default();
+            let mut body = Vec::new();
+            let mut response = http_client.get(&url, async_body, false).await?;
+
+            // Read the response body into a vector
+            response.body_mut().read_to_end(&mut body).await?;
+
+            if !response.status().is_success() {
+                return Err(anyhow!("GitHub API returned error: {}", response.status()));
+            }
+
+            // Parse the response body as JSON
+            let release: GitHubRelease = serde_json::from_slice(&body)?;
+
+            // Parse version from tag (remove 'v' prefix if present)
+            let tag_version = release.tag_name.trim_start_matches('v');
+            let new_version = Version::parse(tag_version).context(format!(
+                "Failed to parse version from tag: {}",
+                release.tag_name
+            ))?;
+
+            if new_version > version {
+                // Find the appropriate asset for the current platform
+                let current_os = std::env::consts::OS;
+                let asset_name = match current_os {
+                    "macos" => "Coop.dmg",
+                    "linux" => "coop.tar.gz",
+                    "windows" => "Coop.exe",
+                    _ => return Err(anyhow!("Unsupported OS: {}", current_os)),
+                };
+
+                let download_url = release
+                    .assets
+                    .iter()
+                    .find(|asset| asset.name == asset_name)
+                    .map(|asset| asset.browser_download_url.clone())
+                    .context(format!(
+                        "No {} asset found in release {}",
+                        asset_name, release.tag_name
+                    ))?;
+
+                Ok(download_url)
+            } else {
+                Err(anyhow!(
+                    "No update available. Current: {}, Latest: {}",
+                    version,
+                    new_version
+                ))
+            }
+        })
+    }
+
+    fn download_and_install(&mut self, download_url: &str, cx: &mut Context<Self>) {
+        let http_client = cx.http_client();
+        let download_url = download_url.to_string();
+
+        let task: Task<Result<(InstallerDir, PathBuf), Error>> = cx.background_spawn(async move {
+            let installer_dir = InstallerDir::new().await?;
+            let target_path = Self::target_path(&installer_dir).await?;
+
+            // Download the release
+            download(&download_url, &target_path, http_client).await?;
+
+            Ok((installer_dir, target_path))
+        });
+
+        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);
+                        })?;
+                    }
+                }
+
+                Ok(())
+            }),
+        );
+    }
+
+    async fn target_path(installer_dir: &InstallerDir) -> Result<PathBuf, Error> {
+        let filename = match std::env::consts::OS {
+            "macos" => anyhow::Ok("Coop.dmg"),
+            "linux" => Ok("coop.tar.gz"),
+            "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,
+            "linux" => install_release_linux(&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_linux(
+    temp_dir: &InstallerDir,
+    downloaded_tar_gz: PathBuf,
+    cx: &AsyncApp,
+) -> Result<(), Error> {
+    let running_app_path = cx.update(|cx| cx.app_path())?;
+
+    // Extract the tar.gz file
+    let extracted = temp_dir.path().join("coop");
+    smol::fs::create_dir_all(&extracted)
+        .await
+        .context("failed to create directory to extract update")?;
+
+    let output = Command::new("tar")
+        .arg("-xzf")
+        .arg(&downloaded_tar_gz)
+        .arg("-C")
+        .arg(&extracted)
+        .output()
+        .await?;
+
+    anyhow::ensure!(
+        output.status.success(),
+        "failed to extract {:?} to {:?}: {:?}",
+        downloaded_tar_gz,
+        extracted,
+        String::from_utf8_lossy(&output.stderr)
+    );
+
+    // Find the extracted app directory
+    let mut entries = smol::fs::read_dir(&extracted).await?;
+    let mut app_dir = None;
+
+    use smol::stream::StreamExt;
+
+    while let Some(entry) = entries.next().await {
+        let entry = entry?;
+        let path = entry.path();
+        if path.is_dir() {
+            app_dir = Some(path);
+            break;
+        }
+    }
+
+    let from = app_dir.context("No app directory found in archive")?;
+
+    // Copy to the current installation directory
+    let output = Command::new("rsync")
+        .args(["-av", "--delete"])
+        .arg(&from)
+        .arg(
+            running_app_path
+                .parent()
+                .context("No parent directory for app")?,
+        )
+        .output()
+        .await?;
+
+    anyhow::ensure!(
+        output.status.success(),
+        "failed to copy app from {:?} to {:?}: {:?}",
+        from,
+        running_app_path.parent(),
+        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/auto_update/src/source.rs

@@ -1,369 +0,0 @@
-use gpui_updater_core::{Asset, Error, Release, Result, UpdateSource, parse_tag};
-use serde::Deserialize;
-
-const CHECKSUMS_ASSET: &str = "SHA256SUMS";
-const RELEASE_PAGE_SIZE: usize = 20;
-
-/// Which published artifact belongs to a target platform.
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
-pub struct AssetFilter {
-    extension: &'static str,
-    arch: &'static str,
-}
-
-impl AssetFilter {
-    /// Whether `name` is the installable artifact for this target.
-    fn matches(&self, name: &str) -> bool {
-        let name = name.to_ascii_lowercase();
-        name.ends_with(self.extension) && name.contains(self.arch)
-    }
-}
-
-pub fn asset_filter_for(os: &str, arch: &str) -> Option<AssetFilter> {
-    let extension = match os {
-        "macos" => ".dmg",
-        "linux" => ".tar.gz",
-        _ => return None,
-    };
-
-    let arch = match (os, arch) {
-        // cargo-packager names the disk images `aarch64`/`x64`.
-        ("macos", "aarch64") => "aarch64",
-        ("macos", "x86_64") => "x64",
-        // `script/bundle-linux` names the tarballs `aarch64`/`x86_64`.
-        ("linux", "aarch64") => "aarch64",
-        ("linux", "x86_64") => "x86_64",
-        _ => return None,
-    };
-
-    Some(AssetFilter { extension, arch })
-}
-
-/// Reads releases from a Gitea repository's Releases.
-pub struct GiteaSource {
-    api_base: String,
-    owner: String,
-    repo: String,
-    filter: AssetFilter,
-}
-
-impl GiteaSource {
-    /// Build a source for `owner/repo` on the Gitea instance at `api_base`
-    /// (e.g. `https://git.reya.info/api/v1`).
-    pub fn new(
-        api_base: impl Into<String>,
-        owner: impl Into<String>,
-        repo: impl Into<String>,
-        filter: AssetFilter,
-    ) -> Self {
-        Self {
-            api_base: api_base.into().trim_end_matches('/').to_string(),
-            owner: owner.into(),
-            repo: repo.into(),
-            filter,
-        }
-    }
-
-    fn releases_url(&self) -> String {
-        format!(
-            "{}/repos/{}/{}/releases?limit={RELEASE_PAGE_SIZE}",
-            self.api_base, self.owner, self.repo
-        )
-    }
-}
-
-impl UpdateSource for GiteaSource {
-    fn fetch_latest(&self) -> Result<Release> {
-        let releases: Vec<GiteaRelease> = http::get_json(&self.releases_url())?;
-        let release = newest_published(&releases)
-            .ok_or_else(|| Error::Parse("repository has no published releases".to_string()))?;
-
-        let asset = release
-            .assets
-            .iter()
-            .find(|asset| self.filter.matches(&asset.name))
-            .ok_or(Error::NoMatchingAsset {
-                target_os: std::env::consts::OS,
-                target_arch: std::env::consts::ARCH,
-            })?;
-
-        // Resolve the published checksum so the engine can reject a truncated or substituted download.
-        let sha256 = release
-            .assets
-            .iter()
-            .find(|candidate| candidate.name.eq_ignore_ascii_case(CHECKSUMS_ASSET))
-            .map(|sums| http::get_string(&sums.browser_download_url))
-            .transpose()?
-            .and_then(|sums| sha256_for(&sums, &asset.name));
-
-        Ok(Release {
-            version: parse_tag(&release.tag_name)?,
-            notes: release
-                .body
-                .clone()
-                .filter(|body| !body.trim().is_empty())
-                .or_else(|| release.name.clone()),
-            asset: Asset {
-                name: asset.name.clone(),
-                url: asset.browser_download_url.clone(),
-                size: asset.size,
-            },
-            signature: None,
-            signature_url: None,
-            sha256,
-        })
-    }
-}
-
-fn newest_published(releases: &[GiteaRelease]) -> Option<&GiteaRelease> {
-    releases
-        .iter()
-        .filter(|release| !release.draft && !release.prerelease)
-        .filter_map(|release| {
-            parse_tag(&release.tag_name)
-                .ok()
-                .map(|version| (version, release))
-        })
-        .max_by(|(left, _), (right, _)| left.cmp(right))
-        .map(|(_, release)| release)
-}
-
-/// The SHA-256 recorded for `asset_name` in a `shasum`-style checksums file.
-fn sha256_for(sums: &str, asset_name: &str) -> Option<String> {
-    sums.lines().find_map(|line| {
-        let mut parts = line.split_whitespace();
-        let (hash, path) = (parts.next()?, parts.next()?);
-        let path = path.strip_prefix('*').unwrap_or(path);
-        let base = path.rsplit(['/', '\\']).next().unwrap_or(path);
-        (base == asset_name).then(|| hash.to_ascii_lowercase())
-    })
-}
-
-/// A release as returned by the Gitea API.
-#[derive(Debug, Deserialize)]
-struct GiteaRelease {
-    tag_name: String,
-    #[serde(default)]
-    name: Option<String>,
-    #[serde(default)]
-    body: Option<String>,
-    #[serde(default)]
-    draft: bool,
-    #[serde(default)]
-    prerelease: bool,
-    #[serde(default)]
-    assets: Vec<GiteaAsset>,
-}
-
-/// A release asset as returned by the Gitea API.
-#[derive(Debug, Deserialize)]
-struct GiteaAsset {
-    name: String,
-    browser_download_url: String,
-    #[serde(default)]
-    size: u64,
-}
-
-/// Blocking HTTP helpers for release metadata.
-mod http {
-    use std::time::Duration;
-
-    use gpui_updater_core::{Error, Result};
-    use serde::de::DeserializeOwned;
-    use ureq::Agent;
-    use ureq::tls::{RootCerts, TlsConfig};
-
-    const USER_AGENT: &str = concat!("coop-updater/", env!("CARGO_PKG_VERSION"));
-    const CONNECT_TIMEOUT: Duration = Duration::from_secs(15);
-    const RESPONSE_TIMEOUT: Duration = Duration::from_secs(30);
-
-    fn agent() -> Agent {
-        Agent::config_builder()
-            .user_agent(USER_AGENT)
-            .tls_config(
-                TlsConfig::builder()
-                    .root_certs(RootCerts::PlatformVerifier)
-                    .build(),
-            )
-            .timeout_resolve(Some(CONNECT_TIMEOUT))
-            .timeout_connect(Some(CONNECT_TIMEOUT))
-            .timeout_recv_response(Some(RESPONSE_TIMEOUT))
-            .build()
-            .into()
-    }
-
-    fn get_bytes(url: &str) -> Result<Vec<u8>> {
-        let mut response = agent().get(url).call().map_err(|error| match error {
-            ureq::Error::StatusCode(code) => Error::Http(format!("GET {url} -> {code}")),
-            other => Error::Http(other.to_string()),
-        })?;
-
-        response
-            .body_mut()
-            .read_to_vec()
-            .map_err(|error| Error::Http(format!("GET {url} -> {error}")))
-    }
-
-    pub(super) fn get_json<T: DeserializeOwned>(url: &str) -> Result<T> {
-        serde_json::from_slice(&get_bytes(url)?).map_err(|error| Error::Parse(error.to_string()))
-    }
-
-    pub(super) fn get_string(url: &str) -> Result<String> {
-        String::from_utf8(get_bytes(url)?).map_err(|error| Error::Parse(error.to_string()))
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use gpui_updater_core::Version;
-
-    use super::*;
-
-    const PUBLISHED: &[&str] = &[
-        "Coop_1.0.1_aarch64.dmg",
-        "Coop_1.0.1_x64.dmg",
-        "coop-linux-aarch64.tar.gz",
-        "coop-linux-x86_64.tar.gz",
-        "coop_1.0.1_aarch64.snap",
-        "coop_1.0.1_arm64-setup.exe",
-        "coop_1.0.1_x64-setup.exe",
-        "coop_1.0.1_x86_64.snap",
-        "su.reya.coop_aarch64.flatpak",
-        "su.reya.coop_x86_64.flatpak",
-    ];
-
-    fn selected(os: &str, arch: &str) -> Option<&'static str> {
-        let filter = asset_filter_for(os, arch)?;
-        PUBLISHED.iter().copied().find(|name| filter.matches(name))
-    }
-
-    #[test]
-    fn picks_the_artifact_matching_os_and_architecture() {
-        assert_eq!(selected("macos", "aarch64"), Some("Coop_1.0.1_aarch64.dmg"));
-        assert_eq!(selected("macos", "x86_64"), Some("Coop_1.0.1_x64.dmg"));
-        assert_eq!(
-            selected("linux", "aarch64"),
-            Some("coop-linux-aarch64.tar.gz")
-        );
-        assert_eq!(
-            selected("linux", "x86_64"),
-            Some("coop-linux-x86_64.tar.gz")
-        );
-    }
-
-    #[test]
-    fn has_no_target_for_windows_or_unknown_platforms() {
-        assert_eq!(asset_filter_for("windows", "x86_64"), None);
-        assert_eq!(asset_filter_for("freebsd", "x86_64"), None);
-        assert_eq!(asset_filter_for("macos", "riscv64"), None);
-    }
-
-    #[test]
-    fn ignores_package_formats_and_sidecars_that_are_not_the_artifact() {
-        let macos = asset_filter_for("macos", "aarch64").unwrap();
-        assert!(!macos.matches("coop_1.0.1_aarch64.snap"));
-        assert!(!macos.matches("su.reya.coop_aarch64.flatpak"));
-        assert!(!macos.matches("Coop_1.0.1_aarch64.dmg.minisig"));
-
-        let linux = asset_filter_for("linux", "x86_64").unwrap();
-        assert!(!linux.matches("coop_1.0.1_x64-setup.exe"));
-        assert!(!linux.matches("coop_1.0.1_x86_64.snap"));
-    }
-
-    #[test]
-    fn reads_checksums_by_basename_ignoring_directory_prefix() {
-        let sums = "\
-abcdef  macos-arm64-artifacts/Coop_1.0.1_aarch64.dmg
-123456  *linux-x64-artifacts/coop-linux-x86_64.tar.gz
-789abc  SHA256SUMS
-";
-        assert_eq!(
-            sha256_for(sums, "Coop_1.0.1_aarch64.dmg").as_deref(),
-            Some("abcdef")
-        );
-        assert_eq!(
-            sha256_for(sums, "coop-linux-x86_64.tar.gz").as_deref(),
-            Some("123456")
-        );
-        assert_eq!(sha256_for(sums, "coop_1.0.1_x64-setup.exe"), None);
-    }
-
-    #[test]
-    fn newest_published_skips_drafts_prereleases_and_bad_tags() {
-        let releases: Vec<GiteaRelease> = serde_json::from_str(
-            r#"[
-                {
-                    "tag_name": "v1.0.2",
-                    "draft": true,
-                    "assets": []
-                },
-                {
-                    "tag_name": "v2.0.0-rc.1",
-                    "prerelease": true,
-                    "assets": []
-                },
-                {
-                    "tag_name": "nightly",
-                    "assets": []
-                },
-                {
-                    "tag_name": "v1.0.0",
-                    "assets": [
-                        {
-                            "name": "coop-linux-x86_64.tar.gz",
-                            "browser_download_url": "https://git.reya.info/reya/coop/releases/download/v1.0.0/coop-linux-x86_64.tar.gz",
-                            "size": 26160329
-                        }
-                    ]
-                },
-                {
-                    "tag_name": "v1.0.1",
-                    "name": "v1.0.1",
-                    "body": "Fixed app panic on flatpak installations",
-                    "assets": [
-                        {
-                            "name": "coop-linux-x86_64.tar.gz",
-                            "browser_download_url": "https://git.reya.info/reya/coop/releases/download/v1.0.1/coop-linux-x86_64.tar.gz",
-                            "size": 26160329
-                        }
-                    ]
-                }
-            ]"#,
-        )
-        .unwrap();
-
-        let newest = newest_published(&releases).unwrap();
-        assert_eq!(newest.tag_name, "v1.0.1");
-        assert_eq!(parse_tag(&newest.tag_name).unwrap().to_string(), "1.0.1");
-        assert_eq!(newest.assets.len(), 1);
-        assert_eq!(newest.assets[0].size, 26160329);
-    }
-
-    #[test]
-    #[ignore = "requires network access to the release host"]
-    fn live_release_source_resolves_the_running_platform() {
-        let filter = asset_filter_for(std::env::consts::OS, std::env::consts::ARCH)
-            .expect("this platform should be supported");
-        let source = GiteaSource::new("https://git.reya.info/api/v1", "reya", "coop", filter);
-
-        let release = source
-            .fetch_latest()
-            .expect("release lookup should succeed");
-
-        assert!(
-            release.version >= Version::new(1, 0, 0),
-            "unexpected version {}",
-            release.version
-        );
-        assert!(
-            source.filter.matches(&release.asset.name),
-            "unexpected artifact {}",
-            release.asset.name
-        );
-        assert!(
-            release.asset.url.starts_with("https://"),
-            "{} ",
-            release.asset.url
-        );
-    }
-}

crates/browser-signer-proxy/Cargo.toml

@@ -1,19 +0,0 @@
-[package]
-name = "browser-signer-proxy"
-version = "0.1.0"
-edition.workspace = true
-description = "Nostr browser signer (NIP-07) proxy using smol async runtime"
-license = "MIT"
-repository = "https://github.com/nostrdevkit/nostr"
-publish = false
-
-[dependencies]
-atomic-destructor = "0.2"
-event-listener = "5"
-nostr.workspace = true
-opaquerr = { version = "0.1", features = ["alloc"] }
-serde.workspace = true
-serde_json.workspace = true
-smol.workspace = true
-tracing = { version = "0.1", features = ["std"] }
-uuid = { version = "1.23", features = ["serde", "v4"] }

crates/browser-signer-proxy/README.md

@@ -1,55 +0,0 @@
-# browser-signer-proxy
-
-Proxy to use Nostr Browser signer ([NIP-07](https://github.com/nostr-protocol/nips/blob/master/07.md)) in native applications.
-
-This is a re-implementation of [`nostr-browser-signer-proxy`](https://github.com/nostrdevkit/nostr/tree/master/signer/nostr-browser-signer-proxy)
-using the [`smol`](https://github.com/smol-rs/smol) async runtime instead of tokio.
-
-## Description
-
-This crate provides a local HTTP proxy that communicates with a NIP-07 browser extension
-(e.g., Alby, nos2x) running in a browser tab. Native applications can use this proxy to
-request public keys, sign events, and perform NIP-04/NIP-44 encryption/decryption through
-the browser extension.
-
-The HTTP server is implemented with a minimal, dependency-free approach using `smol::net::TcpListener`
-and manual HTTP/1.1 parsing — avoiding heavy HTTP framework dependencies entirely.
-
-## Usage
-
-```rust
-use browser_signer_proxy::prelude::*;
-
-async fn example() -> Result<(), Error> {
-    // Create the proxy with default options (localhost:7400)
-    let proxy = BrowserSignerProxy::new(BrowserSignerProxyOptions::default());
-
-    // Open the proxy URL in a browser
-    webbrowser::open(&proxy.url())?;
-
-    // Start the proxy server
-    proxy.start().await?;
-
-    // Use it as an async Nostr signer
-    let public_key = proxy.get_public_key_async().await?;
-    println!("Connected with public key: {public_key}");
-
-    Ok(())
-}
-```
-
-## Differences from the tokio-based version
-
-| Feature | tokio (original) | smol (this crate) |
-|---|---|---|
-| Async runtime | `tokio` | `smol` |
-| HTTP server | `hyper` | `smol::net::TcpListener` + manual HTTP/1.1 |
-| Mutex | `tokio::sync::Mutex` | `smol::lock::Mutex` |
-| Shutdown signal | `tokio::sync::Notify` | `event_listener::Event` |
-| Request-response channel | `tokio::sync::oneshot` | `smol::channel::bounded(1)` |
-| Timeout | `tokio::time::timeout` | `smol::future::or` + `smol::Timer` |
-| Task spawning | `tokio::spawn` | `smol::spawn` |
-
-## License
-
-This project is distributed under the MIT software license.

crates/browser-signer-proxy/index.html

@@ -1,185 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>Coop — Web Signer Proxy</title>
-    <link rel="preconnect" href="https://fonts.googleapis.com">
-    <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
-    <link href="https://fonts.googleapis.com/css2?family=Nunito:wght@800;900&display=swap" rel="stylesheet">
-    <style>
-        :root {
-            --brand: #F8FF37;
-            --ink: #111111;
-            --ink-soft: #333333;
-            --muted: #666666;
-            --paper: #FFFFFF;
-            --edge: rgba(17, 17, 17, 0.14);
-            --radius-sm: 1rem;
-            --radius-md: 1.5rem;
-            --radius-lg: 2.5rem;
-            --green: #2E8B57;
-            --red: #D32F2F;
-        }
-
-        * {
-            box-sizing: border-box;
-        }
-
-        html, body {
-            margin: 0;
-            min-height: 100%;
-        }
-
-        body {
-            font-family: system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif;
-            color: var(--ink);
-            background: var(--brand);
-            -webkit-font-smoothing: antialiased;
-            display: flex;
-            align-items: center;
-            justify-content: center;
-            min-height: 100vh;
-            padding: 2rem;
-        }
-
-        .card {
-            background: var(--paper);
-            border-radius: var(--radius-md);
-            padding: 2.5rem;
-            max-width: 440px;
-            width: 100%;
-            box-shadow: 0 8px 0 rgba(17, 17, 17, 0.12), 0 2px 20px rgba(17, 17, 17, 0.06);
-        }
-
-        .logo {
-            display: flex;
-            align-items: center;
-            gap: 0.6rem;
-            margin-bottom: 1.75rem;
-        }
-
-        .logo__mark {
-            width: 2.5rem;
-            height: 2.5rem;
-            background: var(--ink);
-            border-radius: var(--radius-sm);
-            display: flex;
-            align-items: center;
-            justify-content: center;
-            font-family: "Nunito", system-ui, sans-serif;
-            font-weight: 900;
-            font-size: 1.2rem;
-            color: var(--brand);
-            letter-spacing: -0.02em;
-        }
-
-        .logo__text {
-            font-family: "Nunito", system-ui, sans-serif;
-            font-weight: 900;
-            font-size: 1.3rem;
-            letter-spacing: -0.02em;
-        }
-
-        .heading {
-            font-family: "Nunito", system-ui, sans-serif;
-            font-weight: 900;
-            font-size: 1.6rem;
-            letter-spacing: -0.03em;
-            line-height: 1.15;
-            margin: 0 0 0.6rem;
-        }
-
-        .subtitle {
-            font-size: 0.95rem;
-            color: var(--ink-soft);
-            margin: 0 0 1.75rem;
-            line-height: 1.5;
-        }
-
-        .status {
-            display: flex;
-            align-items: center;
-            gap: 0.75rem;
-            padding: 1rem 1.25rem;
-            border-radius: var(--radius-sm);
-            font-weight: 600;
-            font-size: 0.95rem;
-            transition: background 300ms ease, color 300ms ease;
-        }
-
-        .status--checking {
-            background: rgba(17, 17, 17, 0.05);
-            color: var(--muted);
-        }
-
-        .status--connected {
-            background: rgba(46, 139, 87, 0.1);
-            color: var(--green);
-        }
-
-        .status--error {
-            background: rgba(211, 47, 47, 0.08);
-            color: var(--red);
-        }
-
-        .status__dot {
-            width: 0.7rem;
-            height: 0.7rem;
-            border-radius: 50%;
-            flex-shrink: 0;
-        }
-
-        .status--checking .status__dot {
-            background: var(--muted);
-            animation: pulse 1.2s ease-in-out infinite;
-        }
-
-        .status--connected .status__dot {
-            background: var(--green);
-        }
-
-        .status--error .status__dot {
-            background: var(--red);
-        }
-
-        @keyframes pulse {
-            0%, 100% { opacity: 0.4; transform: scale(0.85); }
-            50%      { opacity: 1;   transform: scale(1); }
-        }
-
-        .hint {
-            margin-top: 1.5rem;
-            padding-top: 1.25rem;
-            border-top: 1px solid var(--edge);
-            font-size: 0.8rem;
-            color: var(--muted);
-            line-height: 1.5;
-        }
-
-        .hint strong {
-            color: var(--ink-soft);
-        }
-    </style>
-</head>
-<body>
-    <div class="card">
-        <h1 class="heading">Web Signer</h1>
-
-        <p class="subtitle">
-            This page connects the app to your Nostr Web Signer extension so you can sign in and use Coop securely.
-        </p>
-
-        <div id="nip07-status" class="status status--checking">
-            <div class="status__dot"></div>
-            <span id="nip07-status-text">Checking extension…</span>
-        </div>
-
-        <div class="hint">
-            <strong>Keep this tab open</strong> while using the app — it automatically handles sign-in requests in the background.
-        </div>
-    </div>
-
-    <script src="proxy.js"></script>
-</body>
-</html>

crates/browser-signer-proxy/proxy.js

@@ -1,156 +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, state) {
-    const container = document.getElementById('nip07-status');
-    const textEl = document.getElementById('nip07-status-text');
-    if (container && textEl) {
-        container.className = 'status status--' + state;
-        textEl.textContent = message;
-    }
-}
-
-// 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 — ready', 'connected');
-    } else {
-        console.log('NIP-07 extension not found');
-        updateStatus('No NIP-07 extension found', 'error');
-    }
-
-    // Start polling every 500 ms
-    setInterval(pollForRequests, 500);
-});

crates/browser-signer-proxy/src/error.rs

@@ -1,51 +0,0 @@
-// Copyright (c) 2022-2023 Yuki Kishimoto
-// Copyright (c) 2023-2025 Rust Nostr Developers
-// Distributed under the MIT software license
-
-//! Error types for the browser signer proxy.
-
-opaquerr::define_kind! {
-    /// Nostr browser signer proxy error kind.
-    pub ErrorKind {
-        /// Nostr protocol error.
-        Protocol => "nostr protocol error",
-        /// I/O error.
-        IO => "I/O error",
-        /// JSON error.
-        Json => "JSON error",
-        /// The operation timed out.
-        Timeout => "timeout",
-        /// The operation cannot be completed in the current state.
-        State => "invalid state",
-        /// Anything not covered by the stable categories above.
-        Other => "other error",
-    }
-}
-
-opaquerr::define_error! {
-    /// Nostr browser signer proxy error.
-    pub Error(ErrorKind)
-
-    from {
-        nostr::error::Error => ErrorKind::Protocol,
-        std::io::Error => ErrorKind::IO,
-        serde_json::Error => ErrorKind::Json,
-    }
-}
-
-impl Error {
-    pub(crate) fn generic<S>(message: S) -> Self
-    where
-        S: Into<String>,
-    {
-        Self::new(ErrorKind::Other, message.into())
-    }
-
-    pub(crate) fn timeout() -> Self {
-        Self::simple(ErrorKind::Timeout)
-    }
-
-    pub(crate) fn shutdown() -> Self {
-        Self::with_static_message(ErrorKind::State, "server is shutdown")
-    }
-}

crates/browser-signer-proxy/src/lib.rs

@@ -1,764 +0,0 @@
-use std::collections::HashMap;
-use std::future::Future;
-use std::net::{IpAddr, Ipv4Addr, SocketAddr, SocketAddrV4};
-use std::pin::Pin;
-use std::sync::Arc;
-use std::sync::atomic::{AtomicBool, AtomicU64, Ordering};
-use std::time::{Duration, SystemTime, UNIX_EPOCH};
-
-use atomic_destructor::{AtomicDestroyer, AtomicDestructor};
-use event_listener::Event as ShutdownEvent;
-use nostr::prelude::*;
-use serde::de::DeserializeOwned;
-use serde::{Deserialize, Serialize, Serializer};
-use serde_json::{Value, json};
-use smol::channel;
-use smol::io::{AsyncBufReadExt, AsyncReadExt, AsyncWriteExt, BufReader};
-use smol::lock::Mutex;
-use smol::net::{TcpListener, TcpStream};
-use uuid::Uuid;
-
-mod error;
-pub mod prelude;
-
-pub use self::error::Error;
-
-const DEFAULT_HTML: &str = include_str!("../index.html");
-const JS: &str = include_str!("../proxy.js");
-
-type PendingResponseMap = HashMap<Uuid, channel::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 asked for the pending requests
-    pub last_pending_request: Arc<AtomicU64>,
-}
-
-/// 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,
-    /// Custom HTML page.
-    // NOTE: not `Option` to move it between threads without reference counter
-    pub custom_html: &'static str,
-}
-
-#[derive(Debug, Clone)]
-struct InnerBrowserSignerProxy {
-    /// Configuration options for the proxy
-    options: BrowserSignerProxyOptions,
-    /// Internal state of the proxy including request queues
-    state: Arc<ProxyState>,
-    /// Notification trigger for graceful shutdown
-    shutdown: Arc<ShutdownEvent>,
-    /// Flag to indicate if the server is shutdown
-    is_shutdown: Arc<AtomicBool>,
-    /// Flag 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
-        self.shutdown.notify(usize::MAX);
-    }
-}
-
-/// 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)),
-            custom_html: "",
-        }
-    }
-}
-
-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
-    }
-
-    /// Sets a custom html page.
-    ///
-    /// The page must include `/proxy.js` script (`<script src="/proxy.js"></script>`)
-    /// which will handle communication with the server and update the element
-    /// with id `nip07-proxy-status` with the status.
-    pub const fn custom_html_page(mut self, custom_html: &'static str) -> Self {
-        self.custom_html = custom_html;
-        self
-    }
-}
-
-impl BrowserSignerProxy {
-    /// Construct a new browser signer proxy
-    pub fn new(options: BrowserSignerProxyOptions) -> Self {
-        let state = ProxyState {
-            outgoing_requests: Mutex::new(Vec::new()),
-            pending_responses: Mutex::new(HashMap::new()),
-            last_pending_request: Arc::new(AtomicU64::new(0)),
-        };
-
-        Self {
-            inner: AtomicDestructor::new(InnerBrowserSignerProxy {
-                options,
-                state: Arc::new(state),
-                shutdown: Arc::new(ShutdownEvent::new()),
-                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 tab 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 server.
-    ///
-    /// If this is not called explicitly, the server 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: TcpListener = match TcpListener::bind(self.inner.options.addr).await {
-            Ok(listener) => listener,
-            Err(e) => {
-                // Undo the started flag if binding fails
-                self.inner.is_started.store(false, Ordering::SeqCst);
-                return Err(Error::from(e));
-            }
-        };
-
-        let addr: SocketAddr = self.inner.options.addr;
-        let state: Arc<ProxyState> = self.inner.state.clone();
-        let custom_html: &'static str = self.inner.options.custom_html;
-        let shutdown: Arc<ShutdownEvent> = self.inner.shutdown.clone();
-
-        smol::spawn(async move {
-            tracing::info!("Starting proxy server on {addr}");
-
-            loop {
-                // Race between accepting a new connection and shutdown signal
-                let shutdown_listener = shutdown.listen();
-
-                enum AcceptEvent {
-                    Connection(Result<(TcpStream, SocketAddr), std::io::Error>),
-                    Shutdown,
-                }
-
-                let event = smol::future::or(
-                    async { AcceptEvent::Connection(listener.accept().await) },
-                    async {
-                        shutdown_listener.await;
-                        AcceptEvent::Shutdown
-                    },
-                )
-                .await;
-
-                match event {
-                    AcceptEvent::Connection(Ok((stream, _))) => {
-                        let state: Arc<ProxyState> = state.clone();
-                        let shutdown: Arc<ShutdownEvent> = shutdown.clone();
-
-                        smol::spawn(async move {
-                            let shutdown_listener = shutdown.listen();
-
-                            smol::future::or(
-                                async {
-                                    handle_connection(stream, state, custom_html).await;
-                                },
-                                async {
-                                    shutdown_listener.await;
-                                    tracing::debug!(
-                                        "Closing connection, proxy server is shutting down."
-                                    );
-                                },
-                            )
-                            .await;
-                        })
-                        .detach();
-                    }
-                    AcceptEvent::Connection(Err(e)) => {
-                        tracing::error!("Failed to accept connection: {e}");
-                    }
-                    AcceptEvent::Shutdown => break,
-                }
-            }
-
-            tracing::info!("Proxy server shut down.");
-        })
-        .detach();
-
-        Ok(())
-    }
-
-    #[inline]
-    async fn store_pending_response(&self, id: Uuid, tx: channel::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 bounded channel of size 1 as a oneshot replacement
-        let (tx, rx) = channel::bounded::<Result<Value, String>>(1);
-
-        // 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 with timeout
-        let response = race_timeout(self.inner.options.timeout, rx.recv()).await;
-
-        match response {
-            Ok(Ok(res)) => Ok(serde_json::from_value(res)?),
-            Ok(Err(error)) => Err(Error::generic(error)),
-            Err(TimeoutError) => Err(Error::timeout()),
-        }
-    }
-
-    #[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 AsyncGetPublicKey for BrowserSignerProxy {
-    type Error = Error;
-
-    #[inline]
-    fn get_public_key_async(
-        &self,
-    ) -> Pin<Box<dyn Future<Output = Result<PublicKey, Self::Error>> + Send + '_>> {
-        Box::pin(async move { self._get_public_key().await })
-    }
-}
-
-impl AsyncSignEvent for BrowserSignerProxy {
-    type Error = Error;
-
-    #[inline]
-    fn sign_event_async(
-        &self,
-        unsigned: UnsignedEvent,
-    ) -> Pin<Box<dyn Future<Output = Result<Event, Self::Error>> + Send + '_>> {
-        Box::pin(async move { self._sign_event(unsigned).await })
-    }
-}
-
-impl AsyncNip04 for BrowserSignerProxy {
-    type Error = Error;
-
-    fn nip04_encrypt_async<'a>(
-        &'a self,
-        public_key: &'a PublicKey,
-        content: &'a str,
-    ) -> Pin<Box<dyn Future<Output = Result<String, Self::Error>> + Send + 'a>> {
-        Box::pin(async move { self._nip04_encrypt(public_key, content).await })
-    }
-
-    fn nip04_decrypt_async<'a>(
-        &'a self,
-        public_key: &'a PublicKey,
-        encrypted_content: &'a str,
-    ) -> Pin<Box<dyn Future<Output = Result<String, Self::Error>> + Send + 'a>> {
-        Box::pin(async move { self._nip04_decrypt(public_key, encrypted_content).await })
-    }
-}
-
-impl AsyncNip44 for BrowserSignerProxy {
-    type Error = Error;
-
-    fn nip44_encrypt_async<'a>(
-        &'a self,
-        public_key: &'a PublicKey,
-        content: &'a str,
-    ) -> Pin<Box<dyn Future<Output = Result<String, Self::Error>> + Send + 'a>> {
-        Box::pin(async move { self._nip44_encrypt(public_key, content).await })
-    }
-
-    fn nip44_decrypt_async<'a>(
-        &'a self,
-        public_key: &'a PublicKey,
-        payload: &'a str,
-    ) -> Pin<Box<dyn Future<Output = Result<String, Self::Error>> + Send + 'a>> {
-        Box::pin(async move { self._nip44_decrypt(public_key, payload).await })
-    }
-}
-
-// ── Minimal HTTP server ──────────────────────────────────────────────────
-
-/// Handle a single HTTP connection.
-async fn handle_connection(stream: TcpStream, state: Arc<ProxyState>, custom_html: &'static str) {
-    let mut reader = BufReader::new(stream);
-
-    // Read the request line
-    let mut request_line = String::new();
-    if reader.read_line(&mut request_line).await.is_err() {
-        return;
-    }
-    let request_line = request_line.trim_end().to_string();
-
-    // Parse method, path, and HTTP version from request line
-    let parts: Vec<&str> = request_line.split_whitespace().collect();
-    if parts.len() < 2 {
-        send_response(&mut reader, 400, "Bad Request", "", "").await;
-        return;
-    }
-    let method = parts[0].to_uppercase();
-    let path = parts[1].to_string();
-
-    // Read headers until empty line
-    let mut headers = Vec::new();
-    let mut content_length: usize = 0;
-    loop {
-        let mut line = String::new();
-        if reader.read_line(&mut line).await.is_err() {
-            return;
-        }
-        let line = line.trim_end().to_string();
-        if line.is_empty() {
-            break;
-        }
-        if let Some(value) = line.strip_prefix("content-length:") {
-            content_length = value.trim().parse().unwrap_or(0);
-        } else if let Some(value) = line.strip_prefix("Content-Length:") {
-            content_length = value.trim().parse().unwrap_or(0);
-        }
-        headers.push(line);
-    }
-
-    match (method.as_str(), path.as_str()) {
-        // Serve the HTML proxy page
-        ("GET", "/") => {
-            let html = if custom_html.is_empty() {
-                DEFAULT_HTML
-            } else {
-                custom_html
-            };
-            send_response(&mut reader, 200, "OK", "text/html", html).await;
-        }
-        // Serve the JS proxy script
-        ("GET", "/proxy.js") => {
-            send_response(&mut reader, 200, "OK", "application/javascript", JS).await;
-        }
-        // Browser polls this endpoint to get pending requests
-        ("GET", "/api/pending") => {
-            state
-                .last_pending_request
-                .store(current_time(), Ordering::SeqCst);
-
-            let mut outgoing = state.outgoing_requests.lock().await;
-
-            let requests = Requests::new(&outgoing);
-            let json = match serde_json::to_string(&requests) {
-                Ok(j) => j,
-                Err(e) => {
-                    tracing::error!("Failed to serialize pending requests: {e}");
-                    send_response(&mut reader, 500, "Internal Server Error", "", "").await;
-                    return;
-                }
-            };
-
-            tracing::debug!("Sending {} pending requests to browser", requests.len());
-
-            // Clear the outgoing requests after sending them
-            outgoing.clear();
-
-            send_response_cors_json(&mut reader, 200, "OK", &json).await;
-        }
-        // Receive response from browser extension
-        ("POST", "/api/response") => {
-            let mut body_bytes = vec![0u8; content_length];
-            if content_length > 0 && reader.read_exact(&mut body_bytes).await.is_err() {
-                send_response(&mut reader, 400, "Bad Request", "", "").await;
-                return;
-            }
-
-            let message: Message = match serde_json::from_slice(&body_bytes) {
-                Ok(json) => json,
-                Err(e) => {
-                    tracing::error!("Failed to parse response body: {e}");
-                    send_response(&mut reader, 400, "Invalid JSON", "", "").await;
-                    return;
-                }
-            };
-
-            tracing::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) => {
-                    // Use try_send since we already hold the lock
-                    let _ = sender.try_send(message.into_result());
-                    tracing::info!("Forwarded response for request {id}");
-                }
-                None => tracing::warn!("No pending request found for {id}"),
-            }
-
-            send_response_cors(&mut reader, 200, "OK", "text/plain", "OK").await;
-        }
-        // CORS preflight
-        ("OPTIONS", _) => {
-            let response = "HTTP/1.1 200 OK\r\n\
-                Access-Control-Allow-Origin: *\r\n\
-                Access-Control-Allow-Methods: GET, POST, OPTIONS\r\n\
-                Access-Control-Allow-Headers: Content-Type\r\n\
-                Content-Length: 0\r\n\
-                Connection: close\r\n\
-                \r\n";
-            let _ = reader.get_mut().write_all(response.as_bytes()).await;
-            let _ = reader.get_mut().flush().await;
-        }
-        // 404 - not found
-        _ => {
-            send_response(&mut reader, 404, "Not Found", "", "").await;
-        }
-    }
-}
-
-/// Write an HTTP response to the stream.
-async fn send_response(
-    stream: &mut (impl AsyncWriteExt + Unpin),
-    status: u16,
-    status_text: &str,
-    content_type: &str,
-    body: &str,
-) {
-    let mut response = format!("HTTP/1.1 {status} {status_text}\r\n");
-
-    if !content_type.is_empty() {
-        response.push_str(&format!("Content-Type: {content_type}\r\n"));
-    }
-
-    response.push_str(&format!("Content-Length: {}\r\n", body.len()));
-    response.push_str("Access-Control-Allow-Origin: *\r\n");
-    response.push_str("Connection: close\r\n");
-    response.push_str("\r\n");
-    response.push_str(body);
-
-    let _ = stream.write_all(response.as_bytes()).await;
-    let _ = stream.flush().await;
-}
-
-/// Write a response with CORS headers and JSON content type.
-async fn send_response_cors_json(
-    stream: &mut (impl AsyncWriteExt + Unpin),
-    status: u16,
-    status_text: &str,
-    body: &str,
-) {
-    let mut response = format!("HTTP/1.1 {status} {status_text}\r\n");
-    response.push_str("Content-Type: application/json\r\n");
-    response.push_str(&format!("Content-Length: {}\r\n", body.len()));
-    response.push_str("Access-Control-Allow-Origin: *\r\n");
-    response.push_str("Connection: close\r\n");
-    response.push_str("\r\n");
-    response.push_str(body);
-
-    let _ = stream.write_all(response.as_bytes()).await;
-    let _ = stream.flush().await;
-}
-
-/// Write a response with CORS headers.
-async fn send_response_cors(
-    stream: &mut (impl AsyncWriteExt + Unpin),
-    status: u16,
-    status_text: &str,
-    content_type: &str,
-    body: &str,
-) {
-    let mut response = format!("HTTP/1.1 {status} {status_text}\r\n");
-
-    if !content_type.is_empty() {
-        response.push_str(&format!("Content-Type: {content_type}\r\n"));
-    }
-
-    response.push_str(&format!("Content-Length: {}\r\n", body.len()));
-    response.push_str("Access-Control-Allow-Origin: *\r\n");
-    response.push_str("Connection: close\r\n");
-    response.push_str("\r\n");
-    response.push_str(body);
-
-    let _ = stream.write_all(response.as_bytes()).await;
-    let _ = stream.flush().await;
-}
-
-// ── Timeout helper ───────────────────────────────────────────────────────
-
-/// An error indicating that an operation timed out.
-#[derive(Debug)]
-struct TimeoutError;
-
-/// Races a channel receive against a duration.
-///
-/// Returns the channel value on success, or [`TimeoutError`] if the duration
-/// elapses first or the channel is closed.
-async fn race_timeout<T>(
-    duration: Duration,
-    recv: impl Future<Output = Result<T, channel::RecvError>>,
-) -> Result<T, TimeoutError> {
-    enum Event<T> {
-        Value(T),
-        ChannelClosed,
-        Timeout,
-    }
-
-    let event = smol::future::or(
-        async {
-            match recv.await {
-                Ok(value) => Event::Value(value),
-                Err(_) => Event::ChannelClosed,
-            }
-        },
-        async {
-            smol::Timer::after(duration).await;
-            Event::Timeout
-        },
-    )
-    .await;
-
-    match event {
-        Event::Value(value) => Ok(value),
-        Event::ChannelClosed | Event::Timeout => Err(TimeoutError),
-    }
-}
-
-// ── Utility ──────────────────────────────────────────────────────────────
-
-/// 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/browser-signer-proxy/src/prelude.rs

@@ -1,14 +0,0 @@
-// Copyright (c) 2022-2023 Yuki Kishimoto
-// Copyright (c) 2023-2025 Rust Nostr Developers
-// Distributed under the MIT software license
-
-//! Prelude
-
-#![allow(unknown_lints)]
-#![allow(ambiguous_glob_reexports)]
-#![doc(hidden)]
-
-pub use nostr::prelude::*;
-
-pub use crate::error::{Error, ErrorKind};
-pub use crate::*;

crates/chat/Cargo.toml

@@ -13,7 +13,6 @@ settings = { path = "../settings" }
 
 gpui.workspace = true
 nostr-sdk.workspace = true
-instant.workspace = true
 
 anyhow.workspace = true
 itertools.workspace = true
@@ -21,7 +20,6 @@ smallvec.workspace = true
 log.workspace = true
 flume.workspace = true
 
-futures.workspace = true
 fuzzy-matcher = "0.3.7"
 
 [target.'cfg(not(target_arch = "wasm32"))'.dependencies]

crates/chat/src/lib.rs

@@ -1,9 +1,11 @@
 use std::cmp::Reverse;
-use std::collections::{BTreeSet, HashMap, HashSet, hash_map};
+use std::collections::{BTreeSet, HashMap, HashSet};
+use std::hash::{DefaultHasher, Hash, Hasher};
 use std::sync::atomic::{AtomicBool, Ordering};
 use std::sync::{Arc, LazyLock, RwLock};
+use std::time::Duration;
 
-use anyhow::{Error, anyhow};
+use anyhow::{Context as AnyhowContext, Error, anyhow};
 use common::EventExt;
 use fuzzy_matcher::FuzzyMatcher;
 use fuzzy_matcher::skim::SkimMatcherV2;
@@ -11,7 +13,6 @@ use gpui::{
     App, AppContext, Context, Entity, EventEmitter, Global, SharedString, Subscription, Task,
     WeakEntity, Window,
 };
-use instant::Duration;
 use nostr_sdk::prelude::*;
 use smallvec::{SmallVec, smallvec};
 use state::{DEVICE_GIFTWRAP, NostrRegistry, USER_GIFTWRAP, UniversalSigner};
@@ -21,7 +22,6 @@ mod room;
 
 pub use message::*;
 pub use room::*;
-pub use state::FileAttachment;
 
 /// A static keypair used only for signing locally-cached rumor events.
 static LOCAL_KEYS: LazyLock<Keys> = LazyLock::new(Keys::generate);
@@ -81,19 +81,16 @@ pub struct ChatRegistry {
     /// Chat rooms
     rooms: Vec<Entity<Room>>,
 
-    /// O(1) room lookup by room ID
-    room_index: HashMap<u64, Entity<Room>>,
-
     /// Events that failed to unwrap for any reason
-    trash: Entity<BTreeSet<FailedMessage>>,
+    trashes: Entity<BTreeSet<FailedMessage>>,
 
     /// Tracking events seen on which relays in the current session
-    seen: Arc<RwLock<HashMap<EventId, HashSet<RelayUrl>>>>,
+    seens: Arc<RwLock<HashMap<EventId, HashSet<RelayUrl>>>>,
 
     /// Mapping of unwrapped event ids to their gift wrap event ids
     event_map: Arc<RwLock<HashMap<EventId, EventId>>>,
 
-    /// True while the initial event backlog is still loading
+    /// Tracking the status of unwrapping gift wrap events.
     tracking: Arc<AtomicBool>,
 
     /// Channel for sending signals to the UI.
@@ -111,31 +108,10 @@ pub struct ChatRegistry {
     /// Signal consumer task (cancelled on signer change)
     signal_consumer: Option<Task<Result<(), Error>>>,
 
-    /// Fuzzy matcher for room search (cached; intentionally excluded from Debug)
-    #[allow(dead_code)]
-    matcher: CachedMatcher,
-
     /// Subscriptions
     _subscriptions: SmallVec<[Subscription; 2]>,
 }
 
-/// Wrapper to provide Debug for SkimMatcherV2
-struct CachedMatcher(SkimMatcherV2);
-
-impl std::fmt::Debug for CachedMatcher {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        f.write_str("CachedMatcher { .. }")
-    }
-}
-
-impl std::ops::Deref for CachedMatcher {
-    type Target = SkimMatcherV2;
-
-    fn deref(&self) -> &Self::Target {
-        &self.0
-    }
-}
-
 impl EventEmitter<ChatEvent> for ChatRegistry {}
 
 impl ChatRegistry {
@@ -169,17 +145,16 @@ impl ChatRegistry {
 
         // Run at the end of the current cycle
         cx.defer_in(window, |this, _window, cx| {
+            this.tracking(cx);
             this.get_rooms(cx);
         });
 
         Self {
             rooms: vec![],
-            room_index: HashMap::new(),
-            trash: cx.new(|_| BTreeSet::default()),
-            seen: Arc::new(RwLock::new(HashMap::default())),
+            trashes: cx.new(|_| BTreeSet::default()),
+            seens: Arc::new(RwLock::new(HashMap::default())),
             event_map: Arc::new(RwLock::new(HashMap::default())),
-            tracking: Arc::new(AtomicBool::new(true)),
-            matcher: CachedMatcher(SkimMatcherV2::default()),
+            tracking: Arc::new(AtomicBool::new(false)),
             signal_rx: rx,
             signal_tx: tx,
             tasks: smallvec![],
@@ -199,10 +174,12 @@ impl ChatRegistry {
         let client = nostr.read(cx).client();
         let signer = nostr.read(cx).signer();
 
-        let seen = self.seen.clone();
+        let tracking = self.tracking.clone();
+        let seens = self.seens.clone();
         let event_map = self.event_map.clone();
-        let trash = self.trash.downgrade();
+        let trashes = self.trashes.downgrade();
 
+        let initialized_at = Timestamp::now();
         let sub_id1 = SubscriptionId::new(DEVICE_GIFTWRAP);
         let sub_id2 = SubscriptionId::new(USER_GIFTWRAP);
 
@@ -213,19 +190,16 @@ impl ChatRegistry {
         self.notification_listener = Some(cx.background_spawn(async move {
             let mut notifications = client.notifications();
             let mut processed_events = HashSet::new();
-            const MAX_PROCESSED: usize = 10_000;
 
             while let Some(notification) = notifications.next().await {
                 let ClientNotification::Message { message, relay_url } = notification else {
+                    // Skip non-message notifications
                     continue;
                 };
 
                 match *message {
                     RelayMessage::Event { event, .. } => {
-                        // Prune the dedup set before it grows unbounded
-                        if processed_events.len() >= MAX_PROCESSED {
-                            processed_events.clear();
-                        }
+                        // De-duplicate events by their ID
                         if !processed_events.insert(event.id) {
                             continue;
                         }
@@ -233,6 +207,7 @@ impl ChatRegistry {
                         // Handle msg relays event to determine when the app is ready to subscribe
                         if event.kind == Kind::InboxRelays {
                             let current_user = signer.get_public_key_async().await?;
+                            // Emit the inbox ready signal
                             if event.pubkey == current_user {
                                 tx.send_async(Signal::InboxReady).await?;
                             }
@@ -245,13 +220,14 @@ impl ChatRegistry {
 
                         // Keep track of which relays have seen this event
                         {
-                            let mut seen = seen.write().unwrap();
-                            seen.entry(event.id).or_default().insert(relay_url);
+                            let mut seens = seens.write().unwrap();
+                            seens.entry(event.id).or_default().insert(relay_url);
                         }
 
                         // Extract the rumor from the gift wrap event
                         match extract_rumor(&client, &signer, event.as_ref()).await {
                             Ok(rumor) => {
+                                // Map the rumor id to the gift wrap event id for later lookup
                                 let Some(rumor_id) = rumor.id else {
                                     log::error!("Rumor missing id after ensure_id");
                                     continue;
@@ -261,14 +237,20 @@ impl ChatRegistry {
                                     event_map.insert(rumor_id, event.id);
                                 }
 
+                                // Check if the rumor has a recipient
                                 if rumor.tags.is_empty() {
                                     let signal = Signal::error(&event, "Recipient is missing");
                                     tx.send_async(signal).await?;
                                 }
 
-                                // Emit message for both new and backlog events
-                                let signal = Signal::message(event.id, rumor);
-                                tx.send_async(signal).await?;
+                                // Check if the rumor was created after the chat was initialized (for detecting new messages)
+                                if rumor.created_at >= initialized_at {
+                                    let signal = Signal::message(event.id, rumor);
+                                    tx.send_async(signal).await?;
+                                } else {
+                                    // Mark the chat still processing new messages
+                                    tracking.store(true, Ordering::Release);
+                                }
                             }
                             Err(e) => {
                                 let reason = format!("Failed to extract rumor: {e}");
@@ -303,17 +285,13 @@ impl ChatRegistry {
                         })?;
                     }
                     Signal::Eose => {
-                        this.update(cx, |this, _cx| {
-                            this.tracking.store(false, Ordering::Release);
-                        })?;
-
                         this.update(cx, |this, cx| {
                             this.get_rooms(cx);
                         })?;
                     }
-                    Signal::Error(failed) => {
-                        trash.update(cx, |this, cx| {
-                            this.insert(failed);
+                    Signal::Error(trash) => {
+                        trashes.update(cx, |this, cx| {
+                            this.insert(trash);
                             cx.notify();
                         })?;
                     }
@@ -324,6 +302,27 @@ impl ChatRegistry {
         }));
     }
 
+    /// Check periodically whether old gift-wrap events have finished processing,
+    /// and refresh rooms once the backlog is caught up.
+    fn tracking(&mut self, cx: &mut Context<Self>) {
+        let status = self.tracking.clone();
+        let tx = self.signal_tx.clone();
+        let check_interval = Duration::from_secs(15);
+
+        self.tasks.push(cx.spawn(async move |_, cx| {
+            loop {
+                cx.background_executor().timer(check_interval).await;
+
+                // Only trigger a room refresh if old events were being tracked
+                // (i.e. the notification handler set the flag while catching up).
+                // `swap` atomically reads and clears the flag.
+                if status.swap(false, Ordering::AcqRel) {
+                    _ = tx.send_async(Signal::Eose).await;
+                }
+            }
+        }));
+    }
+
     /// Get all necessary metadata from relays for current user
     pub fn get_metadata(&mut self, cx: &mut Context<Self>) {
         let nostr = NostrRegistry::global(cx);
@@ -333,29 +332,37 @@ impl ChatRegistry {
             return;
         };
 
+        let subscribe = cx.background_spawn({
+            let client = client.clone();
+
+            async move {
+                let opts =
+                    SubscribeAutoCloseOptions::default().exit_policy(ReqExitPolicy::ExitOnEOSE);
+
+                let msg_relays = Filter::new()
+                    .kind(Kind::InboxRelays)
+                    .author(public_key)
+                    .limit(1);
+
+                let contact_list = Filter::new()
+                    .kind(Kind::ContactList)
+                    .author(public_key)
+                    .limit(1);
+
+                client
+                    .subscribe(vec![msg_relays, contact_list])
+                    .close_on(opts)
+                    .await
+            }
+        });
+
         self.tasks.push(cx.spawn(async move |this, cx| {
-            // Subscribe to metadata from relays
-            let opts = SubscribeAutoCloseOptions::default().exit_policy(ReqExitPolicy::ExitOnEOSE);
-
-            let msg_relays = Filter::new()
-                .kind(Kind::InboxRelays)
-                .author(public_key)
-                .limit(1);
-
-            let contact_list = Filter::new()
-                .kind(Kind::ContactList)
-                .author(public_key)
-                .limit(1);
-
-            _ = client
-                .subscribe(vec![msg_relays, contact_list])
-                .close_on(opts)
-                .await;
+            // Wait for subscription to complete (or fail silently)
+            _ = subscribe.await;
 
             // Give relays time to respond
             cx.background_executor().timer(Duration::from_secs(5)).await;
 
-            // Verify inbox relays were received
             let filter = Filter::new()
                 .kind(Kind::InboxRelays)
                 .author(public_key)
@@ -366,8 +373,7 @@ impl ChatRegistry {
                 .query(filter)
                 .await
                 .unwrap_or_default()
-                .into_iter()
-                .next()
+                .first_owned()
                 .is_some();
 
             if !found {
@@ -399,8 +405,7 @@ impl ChatRegistry {
                     .database()
                     .query(filter)
                     .await?
-                    .into_iter()
-                    .next()
+                    .first_owned()
                     .ok_or(anyhow::anyhow!("No inbox relays found"))?;
 
                 let relays: Vec<RelayUrl> = nip17::extract_relay_list(&event).collect();
@@ -409,7 +414,7 @@ impl ChatRegistry {
                 }
 
                 let filter = Filter::new().kind(Kind::GiftWrap).pubkey(public_key);
-                let id = SubscriptionId::new(USER_GIFTWRAP);
+                let id = SubscriptionId::new(format!("{}-msg", public_key.to_hex()));
 
                 let target: HashMap<RelayUrl, Filter> = relays
                     .into_iter()
@@ -431,8 +436,8 @@ impl ChatRegistry {
         }));
     }
 
-    /// Reload the chat registry, fetching messages and contact list from relays.
-    pub fn reload(&mut self, cx: &mut Context<Self>) {
+    /// Refresh the chat registry, fetching messages and contact list from relays.
+    pub fn refresh(&mut self, cx: &mut Context<Self>) {
         self.reset(cx);
         self.get_metadata(cx);
         self.get_rooms(cx);
@@ -443,9 +448,12 @@ impl ChatRegistry {
         self.tracking.load(Ordering::Acquire)
     }
 
-    /// Get a weak reference to a room by its ID
-    pub fn room(&self, id: &u64, _cx: &App) -> Option<WeakEntity<Room>> {
-        self.room_index.get(id).map(|room| room.downgrade())
+    /// 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 rooms based on the filter.
@@ -467,22 +475,22 @@ impl ChatRegistry {
 
     /// Count the number of messages seen by a given relay.
     pub fn count_messages(&self, relay_url: &RelayUrl) -> usize {
-        self.seen
+        self.seens
             .read()
             .unwrap()
             .values()
-            .filter(|s| s.contains(relay_url))
+            .filter(|seen| seen.contains(relay_url))
             .count()
     }
 
     /// Count the number of trash messages.
     pub fn count_trash_messages(&self, cx: &App) -> usize {
-        self.trash.read(cx).len()
+        self.trashes.read(cx).len()
     }
 
     /// Get the trash messages entity.
-    pub fn trash(&self) -> Entity<BTreeSet<FailedMessage>> {
-        self.trash.clone()
+    pub fn trashes(&self) -> Entity<BTreeSet<FailedMessage>> {
+        self.trashes.clone()
     }
 
     /// Get the relays that have seen a given rumor id.
@@ -496,7 +504,7 @@ impl ChatRegistry {
 
     /// Get the relays that have seen a given gift wrap id.
     pub fn seen_on(&self, id: &EventId) -> HashSet<RelayUrl> {
-        self.seen
+        self.seens
             .read()
             .unwrap()
             .get(id)
@@ -515,11 +523,7 @@ impl ChatRegistry {
         };
 
         let room: Room = room.into().organize(&public_key);
-        let room_id = room.id;
-        let entity = cx.new(|_| room);
-
-        self.room_index.insert(room_id, entity.clone());
-        self.rooms.insert(0, entity);
+        self.rooms.insert(0, cx.new(|_| room));
 
         cx.emit(ChatEvent::Ping);
         cx.notify();
@@ -528,46 +532,36 @@ impl ChatRegistry {
     /// Emit an open room event.
     ///
     /// If the room is new, add it to the registry.
-    pub fn emit_room(&mut self, room: &Entity<Room>, window: &mut Window, cx: &mut Context<Self>) {
+    pub fn emit_room(&mut self, room: &Entity<Room>, cx: &mut Context<Self>) {
         // Get the room's ID.
         let id = room.read(cx).id;
 
-        // If the room is new, add it to the registry and index.
-        if let hash_map::Entry::Vacant(e) = self.room_index.entry(id) {
-            let entity = room.to_owned();
-            e.insert(entity.clone());
-            self.rooms.insert(0, entity);
+        // 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.to_owned());
         }
 
-        // Emit the open room event deferred to avoid re-entrant reads
-        cx.defer_in(window, move |_this, _window, cx| {
-            cx.emit(ChatEvent::OpenRoom(id));
-        });
+        // Emit the open room event.
+        cx.emit(ChatEvent::OpenRoom(id));
     }
 
     /// Close a room.
-    pub fn close_room(&mut self, id: u64, window: &mut Window, cx: &mut Context<Self>) {
-        if self.room_index.contains_key(&id) {
-            self.room_index.remove(&id);
-            self.rooms.retain(|r| r.read(cx).id != id);
-            cx.defer_in(window, move |_this, _window, cx| {
-                cx.emit(ChatEvent::CloseRoom(id));
-            });
+    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. Only notifies if order changed.
+    /// Sort rooms by their created at.
     pub fn sort(&mut self, cx: &mut Context<Self>) {
-        let before: Vec<_> = self.rooms.iter().map(|ev| ev.read(cx).id).collect();
         self.rooms.sort_by_key(|ev| Reverse(ev.read(cx).created_at));
-        let after: Vec<_> = self.rooms.iter().map(|ev| ev.read(cx).id).collect();
-        if before != after {
-            cx.notify();
-        }
+        cx.notify();
     }
 
     /// Finding rooms based on a query.
     pub fn find(&self, query: &str, cx: &App) -> Vec<Entity<Room>> {
+        let matcher = SkimMatcherV2::default();
+
         if let Ok(public_key) = PublicKey::parse(query) {
             self.rooms
                 .iter()
@@ -578,7 +572,7 @@ impl ChatRegistry {
             self.rooms
                 .iter()
                 .filter(|room| {
-                    self.matcher
+                    matcher
                         .fuzzy_match(room.read(cx).display_name(cx).as_ref(), query)
                         .is_some()
                 })
@@ -590,8 +584,7 @@ impl ChatRegistry {
     /// Reset the registry.
     pub fn reset(&mut self, cx: &mut Context<Self>) {
         self.rooms.clear();
-        self.room_index.clear();
-        self.trash.update(cx, |this, cx| {
+        self.trashes.update(cx, |this, cx| {
             this.clear();
             cx.notify();
         });
@@ -618,9 +611,7 @@ impl ChatRegistry {
                 });
             } else {
                 let new_room_id = new_room.id;
-                let entity = cx.new(|_| new_room);
-                self.room_index.insert(new_room_id, entity.clone());
-                self.rooms.push(entity);
+                self.rooms.push(cx.new(|_| new_room));
 
                 let new_index = self.rooms.len();
                 room_map.insert(new_room_id, new_index);
@@ -630,7 +621,13 @@ impl ChatRegistry {
 
     /// Load all rooms from the database.
     pub fn get_rooms(&mut self, cx: &mut Context<Self>) {
-        let task = self.query_chat_rooms(cx);
+        let nostr = NostrRegistry::global(cx);
+
+        let Some(public_key) = nostr.read(cx).current_user() else {
+            return;
+        };
+
+        let task = self.get_rooms_from_database(public_key, cx);
 
         self.tasks.push(cx.spawn(async move |this, cx| {
             match task.await {
@@ -651,65 +648,78 @@ impl ChatRegistry {
         }));
     }
 
-    /// Query the chat rooms from the database
-    fn query_chat_rooms(&self, cx: &App) -> Task<Result<HashSet<Room>, Error>> {
+    /// Create a task to load rooms from the database
+    fn get_rooms_from_database(
+        &self,
+        public_key: PublicKey,
+        cx: &App,
+    ) -> Task<Result<HashSet<Room>, Error>> {
         let nostr = NostrRegistry::global(cx);
         let client = nostr.read(cx).client();
-        let signer = nostr.read(cx).signer();
 
         cx.background_spawn(async move {
-            let public_key = signer.get_public_key_async().await?;
-
-            // Query the latest contact list (previously `NostrDatabaseExt::contacts_public_keys`)
-            let filter = Filter::new()
-                .author(public_key)
-                .kind(Kind::ContactList)
-                .limit(1);
-
-            let contacts: HashSet<PublicKey> = client
+            // Get contacts
+            let contacts = client
                 .database()
-                .query(filter)
+                .contacts_public_keys(public_key)
                 .await
-                .unwrap_or_default()
-                .into_iter()
-                .next()
-                .map(|event| event.tags.public_keys().collect())
                 .unwrap_or_default();
 
-            let filter = Filter::new()
+            // Construct authored filter
+            let authored_filter = Filter::new()
                 .kind(Kind::ApplicationSpecificData)
-                .custom_tags(SingleLetterTag::LOWERCASE_K, ["7", "14", "15"]);
+                .custom_tag(SingleLetterTag::lowercase(Alphabet::A), public_key);
 
-            let events = client.database().query(filter).await?;
+            // Get all authored events
+            let authored = client.database().query(authored_filter).await?;
+
+            // Construct addressed filter
+            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);
+
+            // Collect results
+            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)
-                    && rumor.tags.public_keys().next().is_some()
+                    && rumor.tags.public_keys().peekable().peek().is_some()
                 {
-                    if rumor.pubkey != public_key
-                        && !rumor.tags.public_keys().any(|k| k == public_key)
-                    {
-                        continue;
-                    }
                     grouped.entry(rumor.uniq_id()).or_default().push(rumor);
                 }
             }
 
-            let mut rooms = HashSet::with_capacity(grouped.len());
+            for (_id, mut messages) in grouped.into_iter() {
+                messages.sort_by_key(|m| Reverse(m.created_at));
 
-            for (_id, messages) in grouped.into_iter() {
-                let latest = messages.iter().max_by_key(|m| m.created_at).unwrap();
-                let room = Room::from(latest).organize(&public_key);
+                // Always use the latest message
+                let Some(latest) = messages.first() else {
+                    continue;
+                };
 
+                // Construct the room from the latest message.
+                //
+                // Call `.organize` to ensure the current user is at the end of the list.
+                let mut room = Room::from(latest).organize(&public_key);
+
+                // Check if the user has responded to the room
                 let user_sent = messages.iter().any(|m| m.pubkey == public_key);
+
+                // Check if public keys are from the user's contacts
                 let is_contact = room.members.iter().any(|k| contacts.contains(k));
 
-                let room = if user_sent || is_contact {
-                    room.kind(RoomKind::Ongoing)
-                } else {
-                    room
-                };
+                // Set the room's kind based on status
+                if user_sent || is_contact {
+                    room = room.kind(RoomKind::Ongoing);
+                }
 
                 rooms.insert(room);
             }
@@ -720,8 +730,8 @@ impl ChatRegistry {
 
     /// Parse a nostr event into a 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.
+    /// 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);
 
@@ -729,7 +739,7 @@ impl ChatRegistry {
             return;
         };
 
-        match self.room_index.get(&message.room).cloned() {
+        match self.rooms.iter().find(|e| e.read(cx).id == message.room) {
             Some(room) => {
                 room.update(cx, |this, cx| {
                     if this.kind == RoomKind::Request && message.rumor.pubkey == public_key {
@@ -773,11 +783,6 @@ async fn extract_rumor(
     let unwrapped = try_unwrap_with(signer, gift_wrap).await?;
     let mut rumor = unwrapped.rumor;
 
-    // Verify rumor author matches the seal sender (as per mobile implementation)
-    if rumor.pubkey != unwrapped.sender {
-        return Err(anyhow!("Rumor author does not match seal sender"));
-    }
-
     // Generate event id for the rumor if it doesn't have one
     rumor.ensure_id();
 
@@ -801,7 +806,7 @@ async fn try_unwrap_with(
 
     // Verify the sealed event
     let seal: Event = Event::from_json(seal)?;
-    seal.verify()?;
+    seal.verify_with_ctx(&SECP256K1)?;
 
     // Get the rumor event
     let rumor = signer
@@ -818,20 +823,39 @@ async fn try_unwrap_with(
 
 /// Stores an unwrapped event in local database with reference to original
 async fn set_rumor(client: &Client, id: EventId, rumor: &UnsignedEvent) -> Result<(), Error> {
-    let room_id = rumor.uniq_id().to_string();
+    let rumor_id = rumor.id.context("Rumor is missing an event id")?;
+    let author = rumor.pubkey;
+    let conversation = conversation_id(rumor);
 
-    let tags = vec![
-        Tag::identifier(id),
-        Tag::public_key(rumor.pubkey),
-        Tag::custom("r", [room_id]),
-        Tag::custom("k", [rumor.kind.to_string()]),
-    ];
+    let mut tags = rumor.tags.clone().to_vec();
 
-    let event = EventBuilder::new(Kind::ApplicationSpecificData, rumor.as_json())
+    // Add a unique identifier
+    tags.push(Tag::identifier(id));
+
+    // Add a reference to the rumor's author
+    tags.push(Tag::custom("a", [author]));
+
+    // Add a conversation id
+    tags.push(Tag::custom("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() {
+        tags.push(Tag::custom("P", [receiver]));
+    }
+
+    // Convert rumor to json
+    let content = rumor.as_json();
+
+    // Construct the event
+    let event = EventBuilder::new(Kind::ApplicationSpecificData, content)
         .tags(tags)
         .finalize_async(&*LOCAL_KEYS)
         .await?;
 
+    // Save the event to the database
     client.database().save_event(&event).await?;
 
     Ok(())
@@ -839,11 +863,26 @@ async fn set_rumor(client: &Client, id: EventId, rumor: &UnsignedEvent) -> Resul
 
 /// Retrieves a previously unwrapped event from local database
 async fn get_rumor(client: &Client, gift_wrap: EventId) -> Result<UnsignedEvent, Error> {
-    let filter = Filter::new().identifier(gift_wrap).limit(1);
+    let filter = Filter::new()
+        .kind(Kind::ApplicationSpecificData)
+        .identifier(gift_wrap)
+        .limit(1);
 
-    if let Some(event) = client.database().query(filter).await?.into_iter().next() {
+    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().collect();
+    pubkeys.push(rumor.pubkey);
+    pubkeys.sort();
+    pubkeys.dedup();
+    pubkeys.hash(&mut hasher);
+
+    hasher.finish()
+}

crates/chat/src/message.rs

@@ -4,9 +4,6 @@ use std::ops::Range;
 use common::{EventExt, NostrParser, extract_and_remove_media_urls};
 use gpui::{SharedString, SharedUri};
 use nostr_sdk::prelude::*;
-use state::FileAttachment;
-
-pub const KIND_FILE_MESSAGE: Kind = Kind::Custom(15);
 
 /// Rendered message.
 #[derive(Debug, Clone)]
@@ -24,90 +21,61 @@ pub struct Message {
     pub mentions: Vec<Mention>,
     /// List of event of the message this message is a reply to
     pub replies_to: Vec<EventId>,
-    /// Encrypted file attachment
-    pub file: Option<FileAttachment>,
 }
 
 impl From<&Event> for Message {
     fn from(val: &Event) -> Self {
-        from_parts(
-            val.id,
-            val.pubkey,
-            val.created_at,
-            val.kind,
-            &val.content,
-            &val.tags,
-        )
+        let mentions = extract_mentions(&val.content);
+        let replies_to = extract_reply_ids(&val.tags);
+        let (media, string) = extract_and_remove_media_urls(&val.content);
+
+        Self {
+            id: val.id,
+            author: val.pubkey,
+            content: string,
+            media,
+            created_at: val.created_at,
+            mentions,
+            replies_to,
+        }
     }
 }
 
 impl From<&UnsignedEvent> for Message {
     fn from(val: &UnsignedEvent) -> Self {
-        from_parts(
+        let mentions = extract_mentions(&val.content);
+        let replies_to = extract_reply_ids(&val.tags);
+        let (media, string) = extract_and_remove_media_urls(&val.content);
+
+        Self {
             // Event ID must be known
-            val.id.unwrap(),
-            val.pubkey,
-            val.created_at,
-            val.kind,
-            &val.content,
-            &val.tags,
-        )
+            id: val.id.unwrap(),
+            author: val.pubkey,
+            content: string,
+            media,
+            created_at: val.created_at,
+            mentions,
+            replies_to,
+        }
     }
 }
 
 impl From<&NewMessage> for Message {
     fn from(val: &NewMessage) -> Self {
-        from_parts(
+        let mentions = extract_mentions(&val.rumor.content);
+        let replies_to = extract_reply_ids(&val.rumor.tags);
+        let (media, string) = extract_and_remove_media_urls(&val.rumor.content);
+
+        Self {
             // Event ID must be known
-            val.rumor.id.unwrap(),
-            val.rumor.pubkey,
-            val.rumor.created_at,
-            val.rumor.kind,
-            &val.rumor.content,
-            &val.rumor.tags,
-        )
-    }
-}
-
-fn from_parts(
-    id: EventId,
-    author: PublicKey,
-    created_at: Timestamp,
-    kind: Kind,
-    content: &str,
-    tags: &Tags,
-) -> Message {
-    let file = if kind == KIND_FILE_MESSAGE {
-        FileAttachment::from_tags(content, tags)
-    } else {
-        None
-    };
-    let has_file = file.is_some();
-
-    let replies_to = extract_reply_ids(tags);
-
-    // For file messages `.content` is the encrypted blob URL, not text or media
-    let mentions = if has_file {
-        Vec::new()
-    } else {
-        extract_mentions(content)
-    };
-
-    let (media, content) = if has_file {
-        (Vec::new(), String::new())
-    } else {
-        extract_and_remove_media_urls(content)
-    };
-
-    Message {
-        id,
-        author,
-        content,
-        media,
-        created_at,
-        mentions,
-        replies_to,
-        file,
+            id: val.rumor.id.unwrap(),
+            author: val.rumor.pubkey,
+            content: string,
+            media,
+            created_at: val.rumor.created_at,
+            mentions,
+            replies_to,
+        }
     }
 }
 
@@ -137,17 +105,6 @@ impl Hash for Message {
     }
 }
 
-impl Message {
-    /// Single-line representation for reply previews, notifications and copy.
-    pub fn preview(&self) -> SharedString {
-        if let Some(file) = &self.file {
-            return format!("[File] {}", file.display_name()).into();
-        }
-
-        self.content.clone().into()
-    }
-}
-
 /// New message.
 #[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord)]
 pub struct NewMessage {

crates/chat/src/room.rs

@@ -1,18 +1,18 @@
 use std::cmp::Ordering;
 use std::hash::{Hash, Hasher};
+use std::time::Duration;
 
 use anyhow::{Error, anyhow};
 use common::EventExt;
 use device::DeviceRegistry;
 use gpui::{App, AppContext, Context, EventEmitter, SharedString, Task};
-use instant::Duration;
 use itertools::Itertools;
 use nostr_sdk::prelude::*;
 use person::{Person, PersonRegistry};
 use settings::{RoomConfig, SignerKind};
 use state::{NostrRegistry, TIMEOUT, UniversalSigner};
 
-use crate::{FileAttachment, KIND_FILE_MESSAGE, NewMessage};
+use crate::NewMessage;
 
 const NO_DEKEY: &str = "User hasn't set up a decoupled encryption key yet.";
 const USER_NO_DEKEY: &str = "You haven't set up a decoupled encryption key or it's not available.";
@@ -271,8 +271,8 @@ impl Room {
     }
 
     /// Returns the members of the room
-    pub fn members(&self) -> &[PublicKey] {
-        &self.members
+    pub fn members(&self) -> Vec<PublicKey> {
+        self.members.clone()
     }
 
     /// Checks if the room has more than two members (group)
@@ -356,38 +356,29 @@ impl Room {
     pub fn connect(&self, cx: &App) -> Task<Result<(), Error>> {
         let nostr = NostrRegistry::global(cx);
         let client = nostr.read(cx).client();
-        let members = self.members().to_vec();
+        let members = self.members();
 
         cx.background_spawn(async move {
             let opts = SubscribeAutoCloseOptions::default()
                 .exit_policy(ReqExitPolicy::ExitOnEOSE)
                 .timeout(Some(Duration::from_secs(TIMEOUT)));
 
-            let tasks: Vec<_> = members
-                .into_iter()
-                .map(|public_key| {
-                    let client = client.clone();
-                    async move {
-                        let inbox = Filter::new()
-                            .author(public_key)
-                            .kind(Kind::InboxRelays)
-                            .limit(1);
+            for public_key in members.into_iter() {
+                let inbox = Filter::new()
+                    .author(public_key)
+                    .kind(Kind::InboxRelays)
+                    .limit(1);
 
-                        let announcement = Filter::new()
-                            .author(public_key)
-                            .kind(Kind::Custom(10044))
-                            .limit(1);
+                let announcement = Filter::new()
+                    .author(public_key)
+                    .kind(Kind::Custom(10044))
+                    .limit(1);
 
-                        client
-                            .subscribe(vec![inbox, announcement])
-                            .close_on(opts)
-                            .await
-                    }
-                })
-                .collect();
-
-            for result in futures::future::join_all(tasks).await {
-                result?;
+                // Subscribe to the target
+                client
+                    .subscribe(vec![inbox, announcement])
+                    .close_on(opts)
+                    .await?;
             }
 
             Ok(())
@@ -398,12 +389,12 @@ impl 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 room_id = self.id.to_string();
+        let conversation_id = self.id.to_string();
 
         cx.background_spawn(async move {
             let filter = Filter::new()
                 .kind(Kind::ApplicationSpecificData)
-                .custom_tag(SingleLetterTag::LOWERCASE_R, room_id);
+                .custom_tag(SingleLetterTag::lowercase(Alphabet::C), conversation_id);
 
             let messages = client
                 .database()
@@ -411,6 +402,10 @@ impl Room {
                 .await?
                 .into_iter()
                 .filter_map(|event| UnsignedEvent::from_json(&event.content).ok())
+                .filter(|event| {
+                    // Only process private direct messages and file messages
+                    event.kind == Kind::PrivateDirectMessage || event.kind == Kind::Custom(15)
+                })
                 .sorted_by_key(|message| message.created_at)
                 .collect();
 
@@ -419,71 +414,28 @@ impl Room {
     }
 
     // Construct a rumor event for direct message
-    pub fn rumor<S, I>(
-        &self,
-        content: S,
-        replies: I,
-        reaction: bool,
-        cx: &App,
-    ) -> Option<UnsignedEvent>
+    pub fn rumor<S, I>(&self, content: S, replies: I, cx: &App) -> Option<UnsignedEvent>
     where
         S: Into<String>,
         I: IntoIterator<Item = EventId>,
     {
-        let kind = if reaction {
-            Kind::Reaction
-        } else {
-            Kind::PrivateDirectMessage
-        };
-
+        let kind = Kind::PrivateDirectMessage;
         let content: String = content.into();
         let replies: Vec<EventId> = replies.into_iter().collect();
 
-        // Get current user's public key
-        let nostr = NostrRegistry::global(cx);
-        let sender = nostr.read(cx).current_user()?;
-
-        // Construct a direct message rumor event
-        // WARNING: never sign and send this event to relays
-        let mut event = EventBuilder::new(kind, content)
-            .tags(self.conversation_tags(&replies, sender, cx))
-            .finalize_unsigned(sender);
-
-        // Ensure that the ID is set
-        event.ensure_id();
-
-        Some(event)
-    }
-
-    // Construct a rumor event for an encrypted file message (NIP-17 kind 15)
-    pub fn file_rumor<I>(&self, file: FileAttachment, replies: I, cx: &App) -> Option<UnsignedEvent>
-    where
-        I: IntoIterator<Item = EventId>,
-    {
-        let replies: Vec<EventId> = replies.into_iter().collect();
-
-        // Get current user's public key
-        let nostr = NostrRegistry::global(cx);
-        let sender = nostr.read(cx).current_user()?;
-
-        let mut tags = self.conversation_tags(&replies, sender, cx);
-        tags.extend(file.tags());
-
-        // Construct a file message rumor event
-        // WARNING: never sign and send this event to relays
-        let mut event = EventBuilder::new(KIND_FILE_MESSAGE, file.url.to_string())
-            .tags(tags)
-            .finalize_unsigned(sender);
-
-        // Ensure that the ID is set
-        event.ensure_id();
-
-        Some(event)
-    }
-
-    // Build the `subject` + reply `e` tags + receiver `p` tags (excluding `sender`)
-    fn conversation_tags(&self, replies: &[EventId], sender: PublicKey, cx: &App) -> Vec<Tag> {
         let persons = PersonRegistry::global(cx);
+        let nostr = NostrRegistry::global(cx);
+
+        // Get current user's public key
+        let sender = nostr.read(cx).current_user()?;
+
+        // Get all members, excluding the sender
+        let members: Vec<Person> = self
+            .members
+            .iter()
+            .filter(|public_key| public_key != &&sender)
+            .map(|member| persons.read(cx).get(member, cx))
+            .collect();
 
         // Construct event's tags
         let mut tags = vec![];
@@ -494,44 +446,31 @@ impl Room {
         }
 
         // Add all reply tags
-        for id in replies {
-            tags.push(Tag::event(*id))
+        for id in replies.into_iter() {
+            tags.push(Tag::event(id))
         }
 
-        // Add all receiver tags (no intermediate allocation)
-        for public_key in self.members.iter().filter(|pk| *pk != &sender) {
-            let member = persons.read(cx).get(public_key, cx);
-            tags.push(Tag::from(Nip01Tag::PublicKey {
-                public_key: member.public_key(),
-                relay_hint: member.messaging_relay_hint(),
-            }));
-        }
-
-        tags
-    }
-
-    /// Select the appropriate signer based on signer kind and available keys.
-    fn select_signer(
-        signer_kind: &SignerKind,
-        has_announcement: bool,
-        encryption_signer: &Option<UniversalSigner>,
-        user_signer: &UniversalSigner,
-    ) -> UniversalSigner {
-        match signer_kind {
-            SignerKind::Auto => {
-                if has_announcement {
-                    encryption_signer
-                        .clone()
-                        .unwrap_or_else(|| user_signer.clone())
-                } else {
-                    user_signer.clone()
+        // Add all receiver tags
+        for member in members.into_iter() {
+            tags.push(
+                Nip01Tag::PublicKey {
+                    public_key: member.public_key(),
+                    relay_hint: member.messaging_relay_hint(),
                 }
-            }
-            SignerKind::Encryption => encryption_signer
-                .clone()
-                .expect("encryption signer must be set"),
-            SignerKind::User => user_signer.clone(),
+                .to_tag(),
+            );
         }
+
+        // Construct a direct message rumor event
+        // WARNING: never sign and send this event to relays
+        let mut event = EventBuilder::new(kind, content)
+            .tags(tags)
+            .finalize_unsigned(sender);
+
+        // Ensure that the ID is set
+        event.ensure_id();
+
+        Some(event)
     }
 
     /// Send rumor event to all members's messaging relays
@@ -586,12 +525,23 @@ impl Room {
                 }
 
                 // Determine the signer to use
-                let signer = Self::select_signer(
-                    signer_kind,
-                    announcement.is_some(),
-                    &encryption_signer,
-                    &user_signer,
-                );
+                let signer = match signer_kind {
+                    SignerKind::Auto => {
+                        if announcement.is_some()
+                            && let Some(encryption_signer) = encryption_signer.clone()
+                        {
+                            // Safe to unwrap due to earlier checks
+                            encryption_signer
+                        } else {
+                            user_signer.clone()
+                        }
+                    }
+                    SignerKind::Encryption => {
+                        // Safe to unwrap due to earlier checks
+                        encryption_signer.as_ref().unwrap().clone()
+                    }
+                    SignerKind::User => user_signer.clone(),
+                };
 
                 // Send the gift wrap event and collect the report
                 match send_gift_wrap(&client, &signer, &member, &rumor, signer_kind).await {
@@ -611,12 +561,23 @@ impl Room {
                 let public_key = sender.public_key();
 
                 // Determine the signer to use
-                let signer = Self::select_signer(
-                    signer_kind,
-                    sender.announcement().is_some(),
-                    &encryption_signer,
-                    &user_signer,
-                );
+                let signer = match signer_kind {
+                    SignerKind::Auto => {
+                        if sender.announcement().is_some()
+                            && let Some(encryption_signer) = encryption_signer.clone()
+                        {
+                            // Safe to unwrap due to earlier checks
+                            encryption_signer
+                        } else {
+                            user_signer.clone()
+                        }
+                    }
+                    SignerKind::Encryption => {
+                        // Safe to unwrap due to earlier checks
+                        encryption_signer.as_ref().unwrap().clone()
+                    }
+                    SignerKind::User => user_signer.clone(),
+                };
 
                 match send_gift_wrap(&client, &signer, &sender, &rumor, signer_kind).await {
                     Ok(report) => reports.push(report),
@@ -640,7 +601,7 @@ async fn send_gift_wrap(
     rumor: &UnsignedEvent,
     config: &SignerKind,
 ) -> Result<SendReport, Error> {
-    let k_tag = Tag::custom("k", [rumor.kind.to_string()]);
+    let k_tag = Tag::custom("k", vec!["14"]);
     let mut extra_tags = vec![k_tag];
 
     // Determine the receiver public key based on the config

crates/chat_ui/Cargo.toml

@@ -19,11 +19,11 @@ anyhow.workspace = true
 itertools.workspace = true
 smallvec.workspace = true
 flume.workspace = true
-futures.workspace = true
 log.workspace = true
 serde.workspace = true
 
 linkify = "0.10.0"
 pulldown-cmark = "0.13.1"
-regex = "1"
 
+[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
+smol.workspace = true

crates/chat_ui/src/file.rs

@@ -1,32 +0,0 @@
-use std::path::{Path, PathBuf};
-
-use chat::FileAttachment;
-use gpui::SharedString;
-use nostr_sdk::prelude::*;
-
-/// A file attachment that has been uploaded, but not sent yet.
-///
-/// The local `path` is kept around so the composer can preview
-/// the file without downloading and decrypting it again.
-pub(crate) struct PendingFile {
-    pub file: FileAttachment,
-    pub path: PathBuf,
-}
-
-/// State of the encrypted file attachment of a message
-pub(crate) enum DecryptedFile {
-    Loading,
-    Ready(PathBuf),
-    Failed(SharedString),
-}
-
-/// Result of an upload, either plain or encrypted
-pub(crate) enum Uploaded {
-    Url(Url),
-    File(FileAttachment, PathBuf),
-}
-
-/// A `file://` url for a decrypted file, so it can be opened by the OS
-pub(crate) fn file_url(path: &Path) -> String {
-    format!("file://{}", path.display())
-}

crates/chat_ui/src/text.rs

@@ -1,19 +1,17 @@
 use std::ops::Range;
-use std::sync::{Arc, LazyLock};
+use std::sync::Arc;
 
 use chat::Mention;
+use common::RangeExt;
 use gpui::{
     AnyElement, App, ElementId, Entity, FontStyle, FontWeight, HighlightStyle, InteractiveText,
     IntoElement, SharedString, StrikethroughStyle, StyledText, UnderlineStyle, Window,
 };
 use person::PersonRegistry;
-use regex::Regex;
 use theme::ActiveTheme;
 
-/// Matches `http://` and `https://` URLs. Only these are treated as clickable links.
-static WEB_URL: LazyLock<Regex> = LazyLock::new(|| Regex::new(r"(?i)^https?://").unwrap());
-
 #[allow(clippy::enum_variant_names)]
+#[allow(dead_code)]
 #[derive(Debug, Clone, PartialEq, Eq)]
 pub enum Highlight {
     Code,
@@ -41,61 +39,25 @@ impl RenderedText {
         content: &str,
         mentions: &[Mention],
         persons: &Entity<PersonRegistry>,
-        markdown: bool,
         cx: &App,
-    ) -> Self {
-        Self::render(content, mentions, markdown, |mention| {
-            format!("@{}", persons.read(cx).get(&mention.public_key, cx).name())
-        })
-    }
-
-    fn render(
-        content: &str,
-        mentions: &[Mention],
-        markdown: bool,
-        resolve_mention: impl Fn(&Mention) -> String,
     ) -> Self {
         let mut text = String::new();
         let mut highlights = Vec::new();
         let mut link_ranges = Vec::new();
         let mut link_urls = Vec::new();
 
-        render_text_mut(
+        render_plain_text_mut(
             content,
             mentions,
             &mut text,
             &mut highlights,
             &mut link_ranges,
             &mut link_urls,
-            markdown,
-            resolve_mention,
+            persons,
+            cx,
         );
 
-        // Trim trailing whitespace and adjust highlight and link ranges.
-        let trimmed_len = text.trim_end().len();
-
-        // Retain highlights and link ranges that are within the trimmed text.
-        if trimmed_len < text.len() {
-            highlights.retain_mut(|(range, _)| {
-                range.end = range.end.min(trimmed_len);
-                range.start < range.end
-            });
-
-            let mut ix = 0;
-
-            while ix < link_ranges.len() {
-                let range = &mut link_ranges[ix];
-                range.end = range.end.min(trimmed_len);
-                if range.start < range.end {
-                    ix += 1;
-                } else {
-                    link_ranges.remove(ix);
-                    link_urls.remove(ix);
-                }
-            }
-
-            text.truncate(trimmed_len);
-        }
+        text.truncate(text.trim_end().len());
 
         RenderedText {
             text: SharedString::from(text),
@@ -108,71 +70,55 @@ impl RenderedText {
     pub fn element(&self, id: ElementId, window: &Window, cx: &App) -> AnyElement {
         let code_background = cx.theme().elevated_surface_background;
         let color = cx.theme().text_accent;
-        let code_font = if cfg!(target_os = "macos") {
-            "Menlo"
-        } else if cfg!(target_os = "windows") {
-            "Consolas"
-        } else {
-            "monospace"
-        };
 
         InteractiveText::new(
             id,
-            StyledText::new(self.text.clone())
-                .with_default_highlights(
-                    &window.text_style(),
-                    self.highlights.iter().map(|(range, highlight)| {
-                        (
-                            range.clone(),
-                            match highlight {
-                                Highlight::Code => HighlightStyle {
-                                    background_color: Some(code_background),
-                                    ..Default::default()
-                                },
-                                Highlight::InlineCode(link) => {
-                                    if *link {
-                                        HighlightStyle {
-                                            background_color: Some(code_background),
-                                            underline: Some(UnderlineStyle {
-                                                thickness: 1.0.into(),
-                                                ..Default::default()
-                                            }),
+            StyledText::new(self.text.clone()).with_default_highlights(
+                &window.text_style(),
+                self.highlights.iter().map(|(range, highlight)| {
+                    (
+                        range.clone(),
+                        match highlight {
+                            Highlight::Code => HighlightStyle {
+                                background_color: Some(code_background),
+                                ..Default::default()
+                            },
+                            Highlight::InlineCode(link) => {
+                                if *link {
+                                    HighlightStyle {
+                                        background_color: Some(code_background),
+                                        underline: Some(UnderlineStyle {
+                                            thickness: 1.0.into(),
                                             ..Default::default()
-                                        }
-                                    } else {
-                                        HighlightStyle {
-                                            background_color: Some(code_background),
-                                            ..Default::default()
-                                        }
+                                        }),
+                                        ..Default::default()
+                                    }
+                                } else {
+                                    HighlightStyle {
+                                        background_color: Some(code_background),
+                                        ..Default::default()
                                     }
                                 }
-                                Highlight::Mention => HighlightStyle {
-                                    color: Some(color),
-                                    underline: Some(UnderlineStyle {
-                                        thickness: 1.0.into(),
-                                        ..Default::default()
-                                    }),
+                            }
+                            Highlight::Mention => HighlightStyle {
+                                color: Some(color),
+                                underline: Some(UnderlineStyle {
+                                    thickness: 1.0.into(),
                                     ..Default::default()
-                                },
-                                Highlight::Highlight(highlight) => *highlight,
+                                }),
+                                ..Default::default()
                             },
-                        )
-                    }),
-                )
-                .with_font_family_overrides(self.highlights.iter().filter_map(
-                    |(range, highlight)| match highlight {
-                        Highlight::Code | Highlight::InlineCode(_) => {
-                            Some((range.clone(), code_font.into()))
-                        }
-                        _ => None,
-                    },
-                )),
+                            Highlight::Highlight(highlight) => *highlight,
+                        },
+                    )
+                }),
+            ),
         )
         .on_click(self.link_ranges.clone(), {
             let link_urls = self.link_urls.clone();
             move |ix, _, cx| {
                 let url = &link_urls[ix];
-                if WEB_URL.is_match(url) {
+                if url.starts_with("http") {
                     cx.open_url(url);
                 }
             }
@@ -182,15 +128,15 @@ impl RenderedText {
 }
 
 #[allow(clippy::too_many_arguments)]
-fn render_text_mut(
+fn render_plain_text_mut(
     block: &str,
     mut mentions: &[Mention],
     text: &mut String,
     highlights: &mut Vec<(Range<usize>, Highlight)>,
     link_ranges: &mut Vec<Range<usize>>,
     link_urls: &mut Vec<String>,
-    markdown: bool,
-    resolve_mention: impl Fn(&Mention) -> String,
+    persons: &Entity<PersonRegistry>,
+    cx: &App,
 ) {
     use pulldown_cmark::{Event, Options, Parser, Tag, TagEnd};
 
@@ -199,58 +145,34 @@ fn render_text_mut(
     let mut strikethrough_depth = 0;
     let mut link_url = None;
     let mut list_stack = Vec::new();
-    let mut code_block = false;
 
-    // Only enable the extensions that make sense for chat messages. Notably this leaves
-    // out smart punctuation, tables, math and footnotes: they rewrite or swallow text.
-    let events: Box<dyn Iterator<Item = (Event<'_>, Range<usize>)> + '_> = if markdown {
-        Box::new(Parser::new_ext(block, Options::ENABLE_STRIKETHROUGH).into_offset_iter())
-    } else {
-        Box::new(std::iter::once((Event::Text(block.into()), 0..block.len())))
-    };
+    let mut options = Options::all();
+    options.remove(pulldown_cmark::Options::ENABLE_DEFINITION_LIST);
 
-    for (event, source_range) in events {
+    for (event, source_range) in Parser::new_ext(block, options).into_offset_iter() {
         let prev_len = text.len();
 
         match event {
             Event::Text(t) => {
-                if code_block {
-                    text.push_str(t.as_ref());
-                    highlights.push((prev_len..text.len(), Highlight::Code));
-                    continue;
-                }
-
+                // Process text with mention replacements
                 let t_str = t.as_ref();
                 let mut last_processed = 0;
 
                 while let Some(mention) = mentions.first() {
-                    if mention.range.start >= source_range.end {
+                    if !source_range.contains_inclusive(&mention.range) {
                         break;
                     }
 
-                    mentions = &mentions[1..];
-                    if mention.range.start < source_range.start
-                        || mention.range.end > source_range.end
-                    {
-                        continue;
-                    }
-
-                    let Some(token) = block.get(mention.range.clone()) else {
-                        continue;
-                    };
-
-                    let Some(offset) = t_str[last_processed..].find(token) else {
-                        continue;
-                    };
-
-                    let mention_start_in_text = last_processed + offset;
-                    let mention_end_in_text = mention_start_in_text + token.len();
+                    // Calculate positions within the current text
+                    let mention_start_in_text = mention.range.start - source_range.start;
+                    let mention_end_in_text = mention.range.end - source_range.start;
 
                     // Add text before this mention
                     if mention_start_in_text > last_processed {
                         let before_mention = &t_str[last_processed..mention_start_in_text];
                         process_text_segment(
                             before_mention,
+                            prev_len + last_processed,
                             bold_depth,
                             italic_depth,
                             strikethrough_depth,
@@ -263,7 +185,9 @@ fn render_text_mut(
                     }
 
                     // Process the mention replacement
-                    let replacement_text = resolve_mention(mention);
+                    let profile = persons.read(cx).get(&mention.public_key, cx);
+                    let replacement_text = format!("@{}", profile.name());
+
                     let replacement_start = text.len();
                     text.push_str(&replacement_text);
                     let replacement_end = text.len();
@@ -271,6 +195,7 @@ fn render_text_mut(
                     highlights.push((replacement_start..replacement_end, Highlight::Mention));
 
                     last_processed = mention_end_in_text;
+                    mentions = &mentions[1..];
                 }
 
                 // Add any remaining text after the last mention
@@ -278,6 +203,7 @@ fn render_text_mut(
                     let remaining_text = &t_str[last_processed..];
                     process_text_segment(
                         remaining_text,
+                        prev_len + last_processed,
                         bold_depth,
                         italic_depth,
                         strikethrough_depth,
@@ -308,14 +234,11 @@ fn render_text_mut(
                 }
                 Tag::CodeBlock(_kind) => {
                     new_paragraph(text, &mut list_stack);
-                    code_block = true;
                 }
                 Tag::Emphasis => italic_depth += 1,
                 Tag::Strong => bold_depth += 1,
                 Tag::Strikethrough => strikethrough_depth += 1,
-                Tag::Link { dest_url, .. } => {
-                    link_url = WEB_URL.is_match(&dest_url).then(|| dest_url.to_string());
-                }
+                Tag::Link { dest_url, .. } => link_url = Some(dest_url.to_string()),
                 Tag::List(number) => {
                     list_stack.push((number, false));
                 }
@@ -341,7 +264,6 @@ fn render_text_mut(
                 _ => {}
             },
             Event::End(tag) => match tag {
-                TagEnd::CodeBlock => code_block = false,
                 TagEnd::Heading(_) => bold_depth -= 1,
                 TagEnd::Emphasis => italic_depth -= 1,
                 TagEnd::Strong => bold_depth -= 1,
@@ -350,11 +272,6 @@ fn render_text_mut(
                 TagEnd::List(_) => drop(list_stack.pop()),
                 _ => {}
             },
-            Event::Html(t) | Event::InlineHtml(t) => text.push_str(t.as_ref()),
-            Event::Rule => {
-                new_paragraph(text, &mut list_stack);
-                text.push_str("────────\n");
-            }
             Event::HardBreak => text.push('\n'),
             Event::SoftBreak => text.push('\n'),
             _ => {}
@@ -365,6 +282,7 @@ fn render_text_mut(
 #[allow(clippy::too_many_arguments)]
 fn process_text_segment(
     segment: &str,
+    segment_start: usize,
     bold_depth: i32,
     italic_depth: i32,
     strikethrough_depth: i32,
@@ -389,8 +307,7 @@ fn process_text_segment(
         });
     }
 
-    // Ranges always refer to the rendered text, including replaced mentions.
-    let segment_start = text.len();
+    // Add the text
     text.push_str(segment);
     let text_end = text.len();
 
@@ -413,10 +330,7 @@ fn process_text_segment(
         finder.kinds(&[linkify::LinkKind::Url]);
         let mut last_link_pos = 0;
 
-        for link in finder
-            .links(segment)
-            .filter(|link| WEB_URL.is_match(link.as_str()))
-        {
+        for link in finder.links(segment) {
             let start = link.start();
             let end = link.end();
 
@@ -461,7 +375,6 @@ fn process_text_segment(
 
 fn new_paragraph(text: &mut String, list_stack: &mut [(Option<u64>, bool)]) {
     let mut is_subsequent_paragraph_of_list = false;
-
     if let Some((_, has_content)) = list_stack.last_mut() {
         if *has_content {
             is_subsequent_paragraph_of_list = true;
@@ -477,11 +390,9 @@ fn new_paragraph(text: &mut String, list_stack: &mut [(Option<u64>, bool)]) {
         }
         text.push('\n');
     }
-
     for _ in 0..list_stack.len().saturating_sub(1) {
         text.push_str("  ");
     }
-
     if is_subsequent_paragraph_of_list {
         text.push_str("  ");
     }

crates/common/Cargo.toml

@@ -7,7 +7,6 @@ publish.workspace = true
 [dependencies]
 gpui.workspace = true
 nostr.workspace = true
-instant.workspace = true
 nostr-sdk.workspace = true
 
 itertools.workspace = true

crates/common/src/caching.rs

@@ -0,0 +1,135 @@
+use std::collections::{HashMap, VecDeque};
+use std::mem::take;
+
+use futures::FutureExt;
+use gpui::{
+    App, AppContext, Asset, AssetLogger, ElementId, Entity, ImageAssetLoader, ImageCache,
+    ImageCacheItem, ImageCacheProvider, ImageSource, Resource, hash,
+};
+
+pub fn coop_cache(id: impl Into<ElementId>, max_items: usize) -> CoopImageCacheProvider {
+    CoopImageCacheProvider {
+        id: id.into(),
+        max_items,
+    }
+}
+
+pub struct CoopImageCacheProvider {
+    id: ElementId,
+    max_items: usize,
+}
+
+impl ImageCacheProvider for CoopImageCacheProvider {
+    fn provide(&mut self, window: &mut gpui::Window, cx: &mut App) -> gpui::AnyImageCache {
+        window
+            .with_global_id(self.id.clone(), |id, window| {
+                window.with_element_state(id, |cache, _| {
+                    let cache = cache.unwrap_or_else(|| CoopImageCache::new(self.max_items, cx));
+                    (cache.clone(), cache)
+                })
+            })
+            .into()
+    }
+}
+
+pub struct CoopImageCache {
+    max_items: usize,
+    usage_list: VecDeque<u64>,
+    cache: HashMap<u64, (ImageCacheItem, Resource)>,
+}
+
+impl CoopImageCache {
+    pub fn new(max_items: usize, cx: &mut App) -> Entity<Self> {
+        cx.new(|cx| {
+            log::info!("Creating CoopImageCache");
+            cx.on_release(|this: &mut Self, cx| {
+                for (ix, (mut image, resource)) in take(&mut this.cache) {
+                    if let Some(Ok(image)) = image.get() {
+                        log::info!("Dropping image {ix}");
+                        cx.drop_image(image, None);
+                    }
+                    ImageSource::Resource(resource).remove_asset(cx);
+                }
+            })
+            .detach();
+
+            CoopImageCache {
+                max_items,
+                usage_list: VecDeque::with_capacity(max_items),
+                cache: HashMap::with_capacity(max_items),
+            }
+        })
+    }
+}
+
+impl ImageCache for CoopImageCache {
+    fn load(
+        &mut self,
+        resource: &Resource,
+        window: &mut gpui::Window,
+        cx: &mut gpui::App,
+    ) -> Option<Result<std::sync::Arc<gpui::RenderImage>, gpui::ImageCacheError>> {
+        let hash = hash(resource);
+
+        if let Some(item) = self.cache.get_mut(&hash) {
+            let current_idx = self
+                .usage_list
+                .iter()
+                .position(|item| *item == hash)
+                .expect("cache has an item usage_list doesn't");
+
+            self.usage_list.remove(current_idx);
+            self.usage_list.push_front(hash);
+
+            return item.0.get();
+        }
+
+        let load_future = AssetLogger::<ImageAssetLoader>::load(resource.clone(), cx);
+        let task = cx.background_executor().spawn(load_future).shared();
+
+        if self.usage_list.len() >= self.max_items {
+            log::info!("Image cache is full, evicting oldest item");
+
+            if let Some(oldest) = self.usage_list.pop_back() {
+                let mut image = self
+                    .cache
+                    .remove(&oldest)
+                    .expect("usage_list has an item cache doesn't");
+
+                if let Some(Ok(image)) = image.0.get() {
+                    log::info!("requesting image to be dropped");
+                    cx.drop_image(image, Some(window));
+                }
+
+                ImageSource::Resource(image.1).remove_asset(cx);
+            }
+        }
+
+        self.cache.insert(
+            hash,
+            (
+                gpui::ImageCacheItem::Loading(task.clone()),
+                resource.clone(),
+            ),
+        );
+        self.usage_list.push_front(hash);
+
+        let entity = window.current_view();
+
+        window
+            .spawn(cx, async move |cx| {
+                let result = task.await;
+
+                if let Err(err) = result {
+                    log::error!("error loading image into cache: {:?}", err);
+                }
+
+                cx.on_next_frame(move |_, cx| {
+                    cx.notify(entity);
+                });
+            })
+            .detach();
+
+        None
+    }
+}

crates/common/src/debounced_delay.rs

@@ -1,5 +1,5 @@
 use std::marker::PhantomData;
-use instant::Duration;
+use std::time::Duration;
 
 use futures::channel::oneshot;
 use futures::FutureExt;

crates/common/src/lib.rs

@@ -1,3 +1,4 @@
+pub use caching::*;
 pub use debounced_delay::*;
 pub use display::*;
 pub use event::*;
@@ -6,6 +7,7 @@ pub use parser::*;
 pub use paths::*;
 pub use range::*;
 
+mod caching;
 mod debounced_delay;
 mod display;
 mod event;

crates/concord/Cargo.toml

@@ -1,23 +0,0 @@
-[package]
-name = "concord"
-version.workspace = true
-edition.workspace = true
-publish.workspace = true
-
-[dependencies]
-nostr.workspace = true
-nostr-sdk.workspace = true
-
-hkdf.workspace = true
-sha2.workspace = true
-chacha20.workspace = true
-hmac.workspace = true
-data-encoding.workspace = true
-rand.workspace = true
-serde.workspace = true
-serde_json.workspace = true
-anyhow.workspace = true
-
-[dev-dependencies]
-nostr-memory.workspace = true
-smol.workspace = true

crates/concord/src/cords/cord01.rs

@@ -1,700 +0,0 @@
-use std::fmt;
-
-use data_encoding::BASE64;
-use nostr::nips::nip44::v2::{ConversationKey, decrypt_to_bytes, encrypt_to_bytes_with_nonce};
-use nostr_sdk::prelude::{
-    Event, EventBuilder, EventId, FinalizeEvent, Keys, Kind, PublicKey, Tag, Timestamp,
-    UnsignedEvent,
-};
-
-use crate::derive::GroupKey;
-use crate::{ChannelId, Epoch};
-
-pub const KIND_WRAP: u16 = 1059;
-pub const KIND_WRAP_EPHEMERAL: u16 = 21059;
-pub const KIND_SEAL_ENCRYPTED: u16 = 20013;
-pub const KIND_SEAL_PLAINTEXT: u16 = 20014;
-pub const NIP44_MAX_PLAINTEXT: usize = 65_535;
-
-const TAG_MS: &str = "ms";
-const TAG_CHANNEL: &str = "channel";
-const TAG_EPOCH: &str = "epoch";
-
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
-pub enum SealForm {
-    Encrypted,
-    Plaintext,
-}
-
-impl SealForm {
-    pub fn kind(self) -> u16 {
-        match self {
-            SealForm::Encrypted => KIND_SEAL_ENCRYPTED,
-            SealForm::Plaintext => KIND_SEAL_PLAINTEXT,
-        }
-    }
-
-    fn from_kind(kind: u16) -> Option<Self> {
-        match kind {
-            KIND_SEAL_ENCRYPTED => Some(SealForm::Encrypted),
-            KIND_SEAL_PLAINTEXT => Some(SealForm::Plaintext),
-            _ => None,
-        }
-    }
-}
-
-#[derive(Debug)]
-pub enum StreamError {
-    Sign(String),
-    Encrypt(String),
-    Decrypt(String),
-    Parse(String),
-    Oversize(usize),
-    BadWrapKind(u16),
-    WrongStream,
-    BadWrapSignature,
-    BadSealKind(u16),
-    BadSealSignature,
-    AuthorMismatch,
-    BadRumorId,
-    BadMs,
-    ChannelMismatch,
-    EpochMismatch,
-    MissingTag(&'static str),
-    DuplicateTag(&'static str),
-    NotRewrappable,
-}
-
-impl fmt::Display for StreamError {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        match self {
-            StreamError::Sign(error) => write!(f, "sign: {error}"),
-            StreamError::Encrypt(error) => write!(f, "encrypt: {error}"),
-            StreamError::Decrypt(error) => write!(f, "decrypt: {error}"),
-            StreamError::Parse(error) => write!(f, "parse: {error}"),
-            StreamError::Oversize(len) => write!(f, "plaintext {len} bytes exceeds NIP-44 cap"),
-            StreamError::BadWrapKind(kind) => write!(f, "not a wrap kind: {kind}"),
-            StreamError::WrongStream => write!(f, "wrap author is not this stream"),
-            StreamError::BadWrapSignature => write!(f, "restricted wrap signature invalid"),
-            StreamError::BadSealKind(kind) => write!(f, "not a seal kind: {kind}"),
-            StreamError::BadSealSignature => write!(f, "seal signature invalid"),
-            StreamError::AuthorMismatch => write!(f, "rumor pubkey != seal pubkey"),
-            StreamError::BadRumorId => write!(f, "rumor id != computed hash"),
-            StreamError::BadMs => write!(f, "ms is not a canonical decimal in 0..=999"),
-            StreamError::ChannelMismatch => write!(f, "channel binding mismatch"),
-            StreamError::EpochMismatch => write!(f, "epoch binding mismatch"),
-            StreamError::MissingTag(name) => write!(f, "missing rumor tag: {name}"),
-            StreamError::DuplicateTag(name) => write!(f, "duplicate rumor tag: {name}"),
-            StreamError::NotRewrappable => write!(f, "only plaintext seals survive re-wrapping"),
-        }
-    }
-}
-
-impl std::error::Error for StreamError {}
-
-#[derive(Debug, Clone)]
-pub struct OpenedStream {
-    pub rumor_id: EventId,
-    pub author: PublicKey,
-    pub seal_form: SealForm,
-    pub seal: Event,
-    pub wrapper_id: EventId,
-    pub at_ms: u64,
-    pub rumor: UnsignedEvent,
-}
-
-pub fn split_ms(at_ms: u64) -> (u64, u16) {
-    (at_ms / 1000, (at_ms % 1000) as u16)
-}
-
-/// Build a rumor carrying a full epoch-ms time: seconds in `created_at`, the remainder as `["ms", 0..=999]`.
-pub fn build_rumor_ms(
-    kind: u16,
-    author: PublicKey,
-    content: &str,
-    mut tags: Vec<Tag>,
-    at_ms: u64,
-) -> UnsignedEvent {
-    let (seconds, offset) = split_ms(at_ms);
-    tags.push(Tag::custom(TAG_MS, [offset.to_string()]));
-    build_rumor_secs(kind, author, content, tags, seconds)
-}
-
-/// Build a rumor with a plain seconds timestamp and no `ms` tag.
-pub fn build_rumor_secs(
-    kind: u16,
-    author: PublicKey,
-    content: &str,
-    tags: Vec<Tag>,
-    at_secs: u64,
-) -> UnsignedEvent {
-    let mut rumor = UnsignedEvent::new(
-        author,
-        Timestamp::from_secs(at_secs),
-        Kind::Custom(kind),
-        tags,
-        content,
-    );
-    rumor.ensure_id();
-    rumor
-}
-
-pub fn resolve_ms_strict(rumor: &UnsignedEvent) -> Result<u64, StreamError> {
-    let seconds = rumor.created_at.as_secs().saturating_mul(1000);
-    let mut tag: Option<Option<String>> = None;
-
-    for candidate in rumor.tags.iter() {
-        let fields = candidate.as_slice();
-        if fields.first().map(String::as_str) == Some(TAG_MS) {
-            tag = Some(fields.get(1).cloned());
-            break;
-        }
-    }
-
-    let Some(raw) = tag else {
-        return Ok(seconds);
-    };
-    let raw = raw.ok_or(StreamError::BadMs)?;
-
-    if raw.is_empty() || !raw.bytes().all(|byte| byte.is_ascii_digit()) {
-        return Err(StreamError::BadMs);
-    }
-
-    let offset: u64 = raw.parse().map_err(|_| StreamError::BadMs)?;
-
-    if offset > 999 || (raw.len() > 1 && raw.starts_with('0')) {
-        return Err(StreamError::BadMs);
-    }
-
-    Ok(seconds.saturating_add(offset))
-}
-
-pub fn seal_content(
-    rumor: &UnsignedEvent,
-    form: SealForm,
-    group: &GroupKey,
-) -> Result<String, StreamError> {
-    let json = rumor.as_json();
-    check_plaintext_cap(json.len())?;
-
-    match form {
-        SealForm::Plaintext => Ok(json),
-        SealForm::Encrypted => seal_bytes(group.conversation(), json.as_bytes()),
-    }
-}
-
-pub fn seal_bytes(conversation: &ConversationKey, plaintext: &[u8]) -> Result<String, StreamError> {
-    check_plaintext_cap(plaintext.len())?;
-    Ok(BASE64.encode(&encrypt(conversation, plaintext)?))
-}
-
-pub fn open_bytes(conversation: &ConversationKey, content: &str) -> Result<Vec<u8>, StreamError> {
-    let payload = BASE64
-        .decode(content.as_bytes())
-        .map_err(|error| StreamError::Decrypt(error.to_string()))?;
-
-    decrypt_to_bytes(conversation, &payload)
-        .map_err(|error| StreamError::Decrypt(error.to_string()))
-}
-
-/// A member's own document (the Community List, the Invite List): NIP-44 to self.
-pub fn seal_to_self(keys: &Keys, plaintext: &[u8]) -> Result<String, StreamError> {
-    seal_bytes(
-        &ConversationKey::derive(keys.secret_key(), &keys.public_key())
-            .map_err(|error| StreamError::Encrypt(error.to_string()))?,
-        plaintext,
-    )
-}
-
-pub fn open_to_self(keys: &Keys, content: &str) -> Result<Vec<u8>, StreamError> {
-    open_bytes(
-        &ConversationKey::derive(keys.secret_key(), &keys.public_key())
-            .map_err(|error| StreamError::Decrypt(error.to_string()))?,
-        content,
-    )
-}
-
-pub fn build_seal(
-    rumor: &UnsignedEvent,
-    form: SealForm,
-    group: &GroupKey,
-    author: &Keys,
-) -> Result<Event, StreamError> {
-    let content = seal_content(rumor, form, group)?;
-    EventBuilder::new(Kind::Custom(form.kind()), content)
-        .custom_created_at(rumor.created_at)
-        .finalize(author)
-        .map_err(|error| StreamError::Sign(error.to_string()))
-}
-
-pub fn wrap_seal(
-    seal: &Event,
-    group: &GroupKey,
-    wrap_kind: u16,
-    at: Timestamp,
-    extra: &[Tag],
-) -> Result<(Event, Keys), StreamError> {
-    wrap_seal_with(
-        seal,
-        group.conversation(),
-        group.keys(),
-        wrap_kind,
-        at,
-        extra,
-    )
-}
-
-pub fn wrap_seal_with(
-    seal: &Event,
-    conversation: &ConversationKey,
-    signer: &Keys,
-    wrap_kind: u16,
-    at: Timestamp,
-    extra: &[Tag],
-) -> Result<(Event, Keys), StreamError> {
-    if wrap_kind != KIND_WRAP && wrap_kind != KIND_WRAP_EPHEMERAL {
-        return Err(StreamError::BadWrapKind(wrap_kind));
-    }
-
-    let json = seal.as_json();
-    check_plaintext_cap(json.len())?;
-
-    let content = BASE64.encode(&encrypt(conversation, json.as_bytes())?);
-    let ephemeral = Keys::generate();
-
-    let mut tags = vec![Tag::public_key(ephemeral.public_key())];
-    tags.extend_from_slice(extra);
-
-    let wrap = EventBuilder::new(Kind::Custom(wrap_kind), content)
-        .tags(tags)
-        .custom_created_at(at)
-        .finalize(signer)
-        .map_err(|error| StreamError::Sign(error.to_string()))?;
-
-    Ok((wrap, ephemeral))
-}
-
-pub fn rewrap_seal(
-    seal: &Event,
-    read: &GroupKey,
-    signer: &GroupKey,
-    at: Timestamp,
-) -> Result<(Event, Keys), StreamError> {
-    if seal.kind.as_u16() != KIND_SEAL_PLAINTEXT {
-        return Err(StreamError::NotRewrappable);
-    }
-
-    wrap_seal_with(seal, read.conversation(), signer.keys(), KIND_WRAP, at, &[])
-}
-
-pub fn open_wrap(wrap: &Event, group: &GroupKey) -> Result<OpenedStream, StreamError> {
-    open_wrap_at(wrap, &group.pk(), group.conversation(), false)
-}
-
-pub fn open_wrap_at(
-    wrap: &Event,
-    address: &PublicKey,
-    conversation: &ConversationKey,
-    verify_wrap_signature: bool,
-) -> Result<OpenedStream, StreamError> {
-    let wrap_kind = wrap.kind.as_u16();
-
-    if wrap_kind != KIND_WRAP && wrap_kind != KIND_WRAP_EPHEMERAL {
-        return Err(StreamError::BadWrapKind(wrap_kind));
-    }
-
-    if wrap.pubkey != *address {
-        return Err(StreamError::WrongStream);
-    }
-
-    if verify_wrap_signature && wrap.verify().is_err() {
-        return Err(StreamError::BadWrapSignature);
-    }
-
-    let seal: Event = Event::from_json(decode_content(conversation, &wrap.content)?)
-        .map_err(|error| StreamError::Parse(error.to_string()))?;
-    let seal_kind = seal.kind.as_u16();
-    let seal_form = SealForm::from_kind(seal_kind).ok_or(StreamError::BadSealKind(seal_kind))?;
-    seal.verify().map_err(|_| StreamError::BadSealSignature)?;
-
-    let rumor_json = match seal_form {
-        SealForm::Plaintext => seal.content.clone(),
-        SealForm::Encrypted => decode_content(conversation, &seal.content)?,
-    };
-
-    let mut rumor: UnsignedEvent = UnsignedEvent::from_json(rumor_json.as_bytes())
-        .map_err(|error| StreamError::Parse(error.to_string()))?;
-
-    if rumor.pubkey != seal.pubkey {
-        return Err(StreamError::AuthorMismatch);
-    }
-
-    let computed = rumor.compute_id();
-    if let Some(claimed) = rumor.id
-        && claimed != computed
-    {
-        return Err(StreamError::BadRumorId);
-    }
-    rumor.id = Some(computed);
-
-    let at_ms = resolve_ms_strict(&rumor)?;
-
-    Ok(OpenedStream {
-        rumor_id: computed,
-        author: seal.pubkey,
-        seal_form,
-        seal,
-        wrapper_id: wrap.id,
-        at_ms,
-        rumor,
-    })
-}
-
-pub fn channel_binding_tags(channel: &ChannelId, epoch: Epoch) -> Vec<Tag> {
-    vec![
-        Tag::custom(TAG_CHANNEL, [channel.to_hex()]),
-        Tag::custom(TAG_EPOCH, [epoch.0.to_string()]),
-    ]
-}
-
-pub fn check_channel_binding(
-    rumor: &UnsignedEvent,
-    channel: &ChannelId,
-    epoch: Epoch,
-) -> Result<(), StreamError> {
-    match unique_tag(rumor, TAG_CHANNEL)? {
-        Some(value) if value == channel.to_hex() => {}
-        Some(_) => return Err(StreamError::ChannelMismatch),
-        None => return Err(StreamError::MissingTag(TAG_CHANNEL)),
-    }
-
-    match unique_tag(rumor, TAG_EPOCH)? {
-        Some(value) if value == epoch.0.to_string() => {}
-        Some(_) => return Err(StreamError::EpochMismatch),
-        None => return Err(StreamError::MissingTag(TAG_EPOCH)),
-    }
-
-    Ok(())
-}
-
-fn encrypt(conversation: &ConversationKey, plaintext: &[u8]) -> Result<Vec<u8>, StreamError> {
-    let mut nonce = [0u8; 32];
-
-    crate::fill_random(&mut nonce).map_err(|error| StreamError::Encrypt(error.to_string()))?;
-
-    encrypt_to_bytes_with_nonce(conversation, plaintext, nonce)
-        .map_err(|error| StreamError::Encrypt(error.to_string()))
-}
-
-fn decode_content(conversation: &ConversationKey, content: &str) -> Result<String, StreamError> {
-    let plaintext = open_bytes(conversation, content)?;
-
-    String::from_utf8(plaintext).map_err(|error| StreamError::Parse(error.to_string()))
-}
-
-fn check_plaintext_cap(len: usize) -> Result<(), StreamError> {
-    if len > NIP44_MAX_PLAINTEXT {
-        return Err(StreamError::Oversize(len));
-    }
-
-    Ok(())
-}
-
-fn unique_tag(rumor: &UnsignedEvent, name: &'static str) -> Result<Option<String>, StreamError> {
-    let mut found: Option<String> = None;
-
-    for tag in rumor.tags.iter() {
-        let fields = tag.as_slice();
-        if fields.len() >= 2 && fields[0] == name {
-            if found.is_some() {
-                return Err(StreamError::DuplicateTag(name));
-            }
-            found = Some(fields[1].clone());
-        }
-    }
-
-    Ok(found)
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use crate::derive::channel_group_key;
-
-    const SECRET: [u8; 32] = [0x07u8; 32];
-    const OTHER_SECRET: [u8; 32] = [0x08u8; 32];
-
-    fn channel() -> ChannelId {
-        ChannelId::from_bytes([0xabu8; 32])
-    }
-
-    fn group(epoch: u64) -> GroupKey {
-        channel_group_key(&SECRET, &channel(), Epoch(epoch)).expect("derives")
-    }
-
-    fn wrapper_p_tag(wrap: &Event) -> Option<String> {
-        wrap.tags
-            .iter()
-            .find(|tag| tag.as_slice().first().map(String::as_str) == Some("p"))
-            .and_then(|tag| tag.as_slice().get(1).cloned())
-    }
-
-    fn bound_rumor(content: &str, author: PublicKey, at_ms: u64) -> UnsignedEvent {
-        build_rumor_ms(
-            9,
-            author,
-            content,
-            channel_binding_tags(&channel(), Epoch(0)),
-            at_ms,
-        )
-    }
-
-    fn sealed(rumor: &UnsignedEvent, form: SealForm, author: &Keys) -> Event {
-        build_seal(rumor, form, &group(0), author).expect("seals")
-    }
-
-    fn wrapped(seal: &Event, kind: u16, at_secs: u64) -> Event {
-        wrap_seal(seal, &group(0), kind, Timestamp::from_secs(at_secs), &[])
-            .expect("wraps")
-            .0
-    }
-
-    fn encrypted_wrap(content: &str, author: &Keys, at_ms: u64, kind: u16) -> Event {
-        let rumor = bound_rumor(content, author.public_key(), at_ms);
-        wrapped(
-            &sealed(&rumor, SealForm::Encrypted, author),
-            kind,
-            at_ms / 1000,
-        )
-    }
-
-    #[test]
-    fn both_seal_forms_round_trip() {
-        let author = Keys::generate();
-        let at_ms = 1_686_840_217_417;
-        let wrap = encrypted_wrap("Hey chat!", &author, at_ms, KIND_WRAP);
-
-        assert_eq!(wrap.kind, Kind::GiftWrap, "the durable wrap is kind 1059");
-        assert_eq!(wrap.pubkey, group(0).pk(), "the stream key signs the wrap");
-
-        let opened = open_wrap(&wrap, &group(0)).expect("opens");
-        assert_eq!(opened.author, author.public_key());
-        assert_eq!(opened.rumor.content, "Hey chat!");
-        assert_eq!(opened.rumor_id, opened.rumor.id.expect("id is set"));
-        assert_eq!(opened.wrapper_id, wrap.id);
-        assert_eq!(opened.at_ms, at_ms);
-        assert_eq!(opened.seal_form, SealForm::Encrypted);
-        check_channel_binding(&opened.rumor, &channel(), Epoch(0)).expect("binding holds");
-
-        // The wrap's `p` tag must identify neither the stream nor the author.
-        let p = wrapper_p_tag(&wrap).expect("the wrap carries a p tag");
-        assert_ne!(p, group(0).pk_hex());
-        assert_ne!(p, author.public_key().to_hex());
-
-        // Ephemeral actions ride the same structure at a kind relays must drop.
-        let typing = encrypted_wrap("typing", &author, 5_000, KIND_WRAP_EPHEMERAL);
-        assert_eq!(typing.kind.as_u16(), 21059);
-        assert_eq!(
-            open_wrap(&typing, &group(0)).expect("opens").rumor.content,
-            "typing"
-        );
-
-        // The plaintext form carries the rumor's bytes verbatim, which is what
-        // lets a compaction re-wrap the signed edition into a later epoch.
-        let edition = build_rumor_secs(
-            3308,
-            author.public_key(),
-            "an edition",
-            vec![],
-            1_700_000_000,
-        );
-        let seal = sealed(&edition, SealForm::Plaintext, &author);
-        assert_eq!(seal.content, edition.as_json(), "the rumor rides verbatim");
-
-        let opened = open_wrap(&wrapped(&seal, KIND_WRAP, 1), &group(0)).expect("opens");
-        assert_eq!(opened.seal_form, SealForm::Plaintext);
-
-        let (rewrapped, _) =
-            rewrap_seal(&opened.seal, &group(1), &group(1), Timestamp::from_secs(2))
-                .expect("rewraps");
-        let reopened = open_wrap(&rewrapped, &group(1)).expect("opens");
-        assert_eq!(reopened.rumor_id, opened.rumor_id, "the rumor id survives");
-        assert_eq!(reopened.author, author.public_key());
-        assert_eq!(
-            reopened.seal.sig, opened.seal.sig,
-            "the signature rides whole"
-        );
-        assert_ne!(reopened.wrapper_id, opened.wrapper_id);
-
-        assert!(matches!(
-            rewrap_seal(
-                &sealed(&edition, SealForm::Encrypted, &author),
-                &group(1),
-                &group(1),
-                Timestamp::from_secs(2)
-            ),
-            Err(StreamError::NotRewrappable)
-        ));
-    }
-
-    #[test]
-    fn hostile_wraps_are_dropped_in_order() {
-        let author = Keys::generate();
-        let impostor = Keys::generate();
-
-        // Kind and address are settled before any decryption is attempted.
-        let mut wrong_kind = encrypted_wrap("x", &author, 1_000, KIND_WRAP);
-        wrong_kind.kind = Kind::Custom(1058);
-        assert!(matches!(
-            open_wrap(&wrong_kind, &group(0)),
-            Err(StreamError::BadWrapKind(1058))
-        ));
-
-        let foreign = channel_group_key(&OTHER_SECRET, &channel(), Epoch(0)).expect("derives");
-        let wrap = encrypted_wrap("x", &author, 1_000, KIND_WRAP);
-        assert!(matches!(
-            open_wrap(&wrap, &foreign),
-            Err(StreamError::WrongStream)
-        ));
-
-        // A flipped ciphertext byte fails the NIP-44 MAC.
-        let mut payload = BASE64
-            .decode(wrap.content.as_bytes())
-            .expect("content is base64");
-        payload[40] ^= 0x01;
-        let mut tampered = wrap.clone();
-        tampered.content = BASE64.encode(&payload);
-        assert!(matches!(
-            open_wrap(&tampered, &group(0)),
-            Err(StreamError::Decrypt(_))
-        ));
-
-        // A seal claiming an author it holds no signature for.
-        let seal = sealed(
-            &bound_rumor("spoof", author.public_key(), 1_000),
-            SealForm::Encrypted,
-            &impostor,
-        );
-        let mut swapped: serde_json::Value = serde_json::from_str(&seal.as_json()).expect("json");
-        swapped["pubkey"] = serde_json::Value::String(author.public_key().to_hex());
-        let seal = Event::from_json(swapped.to_string()).expect("a swapped pubkey still parses");
-        assert!(matches!(
-            open_wrap(&wrapped(&seal, KIND_WRAP, 1), &group(0)),
-            Err(StreamError::BadSealSignature)
-        ));
-
-        // A seal that does not vouch for the rumor's author.
-        let seal = sealed(
-            &bound_rumor("spoof", impostor.public_key(), 1_000),
-            SealForm::Encrypted,
-            &author,
-        );
-        assert!(matches!(
-            open_wrap(&wrapped(&seal, KIND_WRAP, 1), &group(0)),
-            Err(StreamError::AuthorMismatch)
-        ));
-
-        // A claimed id the rumor's own bytes do not hash to. The plaintext seal
-        // smuggles the forgery through verbatim.
-        let rumor = bound_rumor("real", author.public_key(), 1_000);
-        let mut forged: serde_json::Value = serde_json::from_str(&rumor.as_json()).expect("json");
-        forged["id"] = serde_json::Value::String("00".repeat(32));
-        let seal = EventBuilder::new(Kind::Custom(KIND_SEAL_PLAINTEXT), forged.to_string())
-            .custom_created_at(rumor.created_at)
-            .finalize(&author)
-            .expect("seals");
-        assert!(matches!(
-            open_wrap(&wrapped(&seal, KIND_WRAP, 1), &group(0)),
-            Err(StreamError::BadRumorId)
-        ));
-
-        // Binding splices: another channel, another epoch, a duplicate or none.
-        let doubled = vec![channel_binding_tags(&channel(), Epoch(0)); 2].concat();
-        let rumor = bound_rumor("x", author.public_key(), 1_000);
-
-        assert!(matches!(
-            check_channel_binding(&rumor, &ChannelId::from_bytes([0xcdu8; 32]), Epoch(0)),
-            Err(StreamError::ChannelMismatch)
-        ));
-
-        assert!(matches!(
-            check_channel_binding(&rumor, &channel(), Epoch(1)),
-            Err(StreamError::EpochMismatch)
-        ));
-
-        let duplicate = build_rumor_ms(9, author.public_key(), "x", doubled, 1_000);
-        assert!(matches!(
-            check_channel_binding(&duplicate, &channel(), Epoch(0)),
-            Err(StreamError::DuplicateTag(_))
-        ));
-
-        let unbound = build_rumor_ms(9, author.public_key(), "x", vec![], 1_000);
-        assert!(matches!(
-            check_channel_binding(&unbound, &channel(), Epoch(0)),
-            Err(StreamError::MissingTag(_))
-        ));
-
-        let oversize = build_rumor_ms(
-            9,
-            author.public_key(),
-            &"x".repeat(NIP44_MAX_PLAINTEXT + 1),
-            vec![],
-            1_000,
-        );
-        assert!(matches!(
-            seal_content(&oversize, SealForm::Encrypted, &group(0)),
-            Err(StreamError::Oversize(_))
-        ));
-    }
-
-    #[test]
-    fn ms_is_a_drop_gate() {
-        let author = Keys::generate();
-
-        let absent = build_rumor_secs(9, author.public_key(), "x", vec![], 1_000);
-        assert_eq!(resolve_ms_strict(&absent).expect("resolves"), 1_000_000);
-
-        let highest = build_rumor_ms(9, author.public_key(), "x", vec![], 1_000_999);
-        assert_eq!(resolve_ms_strict(&highest).expect("resolves"), 1_000_999);
-
-        for malformed in ["1000", "007", "abc", "+5", ""] {
-            let rumor = build_rumor_secs(
-                9,
-                author.public_key(),
-                "x",
-                vec![Tag::custom(TAG_MS, [malformed.to_string()])],
-                1_000,
-            );
-            assert!(
-                matches!(resolve_ms_strict(&rumor), Err(StreamError::BadMs)),
-                "{malformed:?} must be malformed"
-            );
-        }
-
-        // Present but valueless is malformed, not an offset-0 default.
-        let valueless = build_rumor_secs(
-            9,
-            author.public_key(),
-            "x",
-            vec![Tag::custom(TAG_MS, Vec::<String>::new())],
-            1_000,
-        );
-        assert!(matches!(
-            resolve_ms_strict(&valueless),
-            Err(StreamError::BadMs)
-        ));
-
-        // A valued duplicate takes the first, matching Armada.
-        let repeated = build_rumor_secs(
-            9,
-            author.public_key(),
-            "x",
-            vec![
-                Tag::custom(TAG_MS, ["1".to_string()]),
-                Tag::custom(TAG_MS, ["2".to_string()]),
-            ],
-            1_000,
-        );
-        assert_eq!(resolve_ms_strict(&repeated).expect("resolves"), 1_000_001);
-    }
-}

crates/concord/src/cords/cord02/guestbook.rs

@@ -1,890 +0,0 @@
-use std::cmp::Reverse;
-use std::collections::{BTreeMap, BTreeSet};
-use std::fmt;
-
-use anyhow::Result;
-use data_encoding::HEXLOWER;
-use nostr_sdk::prelude::*;
-
-use crate::cord01::{
-    KIND_WRAP, OpenedStream, SealForm, StreamError, build_rumor_ms, build_seal, open_wrap,
-    wrap_seal,
-};
-use crate::cord04::{
-    AuthorityCitation, TAG_CITATION, canonical_decimal, citation_from, citation_tag,
-};
-use crate::{GroupKey, decode_hex_32};
-
-pub const KIND_JOIN_LEAVE: u16 = 3306;
-pub const KIND_KICK: u16 = 3309;
-pub const KIND_SNAPSHOT: u16 = 3312;
-
-pub const MAX_SNAPSHOT_CHUNK: usize = 400;
-pub const MAX_FUTURE_SKEW_MS: u64 = 60 * 60 * 1000;
-
-const TAG_INVITE: &str = "invite";
-const TAG_TARGET: &str = "p";
-const TAG_SNAP: &str = "snap";
-const TAG_CONTENT: &str = "content";
-const CONTENT_JOIN: &str = "join";
-const CONTENT_LEAVE: &str = "leave";
-
-#[derive(Debug)]
-pub enum GuestbookError {
-    Stream(StreamError),
-    NotEncryptedSealed,
-    UnknownKind(u16),
-    MissingTag(&'static str),
-    DuplicateTag(&'static str),
-    BadTag(&'static str),
-}
-
-impl fmt::Display for GuestbookError {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        match self {
-            GuestbookError::Stream(error) => write!(f, "stream: {error}"),
-            GuestbookError::NotEncryptedSealed => {
-                write!(f, "guestbook rumor must ride an encrypted seal")
-            }
-            GuestbookError::UnknownKind(kind) => {
-                write!(f, "not a guestbook rumor kind: {kind}")
-            }
-            GuestbookError::MissingTag(name) => write!(f, "missing guestbook tag: {name}"),
-            GuestbookError::DuplicateTag(name) => write!(f, "duplicate guestbook tag: {name}"),
-            GuestbookError::BadTag(name) => write!(f, "malformed guestbook tag: {name}"),
-        }
-    }
-}
-
-impl std::error::Error for GuestbookError {}
-
-impl From<StreamError> for GuestbookError {
-    fn from(error: StreamError) -> Self {
-        GuestbookError::Stream(error)
-    }
-}
-
-#[derive(Debug, Clone, PartialEq, Eq)]
-pub enum GuestbookEntry {
-    Join {
-        member: PublicKey,
-        at_ms: u64,
-        /// The `(creator, label)` an invite attributed the join to.
-        invited_by: Option<(String, String)>,
-    },
-    Leave {
-        member: PublicKey,
-        at_ms: u64,
-    },
-    Kick {
-        actor: PublicKey,
-        target: PublicKey,
-        at_ms: u64,
-        citation: Option<AuthorityCitation>,
-    },
-    Snapshot {
-        refounder: PublicKey,
-        members: Vec<PublicKey>,
-        snapshot_id: [u8; 32],
-        chunk: (u32, u32),
-        at_ms: u64,
-    },
-}
-
-#[derive(Debug, Clone, PartialEq, Eq)]
-pub struct GuestbookRumor {
-    pub id: EventId,
-    pub author: PublicKey,
-    pub kind: Kind,
-    pub at_ms: u64,
-    pub entry: GuestbookEntry,
-}
-
-#[derive(Debug, Clone, PartialEq, Eq)]
-pub enum MemberState {
-    Joined {
-        at_ms: u64,
-        invited_by: Option<(String, String)>,
-    },
-    Left {
-        at_ms: u64,
-    },
-    Kicked {
-        at_ms: u64,
-        actor: PublicKey,
-    },
-}
-
-pub fn build_join(
-    member: PublicKey,
-    invited_by: Option<(&str, &str)>,
-    at_ms: u64,
-) -> UnsignedEvent {
-    let mut tags = Vec::new();
-
-    if let Some((creator, label)) = invited_by {
-        tags.push(Tag::custom(TAG_INVITE, [creator, label]));
-    }
-
-    build_rumor_ms(KIND_JOIN_LEAVE, member, CONTENT_JOIN, tags, at_ms)
-}
-
-pub fn build_leave(member: PublicKey, at_ms: u64) -> UnsignedEvent {
-    build_rumor_ms(KIND_JOIN_LEAVE, member, CONTENT_LEAVE, Vec::new(), at_ms)
-}
-
-pub fn build_kick(
-    actor: PublicKey,
-    target: &PublicKey,
-    citation: Option<&AuthorityCitation>,
-    at_ms: u64,
-) -> UnsignedEvent {
-    let mut tags = vec![Tag::custom(TAG_TARGET, [target.to_hex()])];
-
-    if let Some(citation) = citation {
-        tags.push(citation_tag(citation));
-    }
-
-    build_rumor_ms(KIND_KICK, actor, "", tags, at_ms)
-}
-
-pub fn build_snapshot_chunks(
-    refounder: PublicKey,
-    members: &[PublicKey],
-    snapshot_id: [u8; 32],
-    at_ms: u64,
-) -> Vec<UnsignedEvent> {
-    let chunks: Vec<&[PublicKey]> = members.chunks(MAX_SNAPSHOT_CHUNK).collect();
-    let total = chunks.len() as u32;
-
-    chunks
-        .iter()
-        .enumerate()
-        .map(|(index, chunk)| {
-            let hex: Vec<String> = chunk.iter().map(PublicKey::to_hex).collect();
-            let content = format!(
-                "[{}]",
-                hex.iter()
-                    .map(|member| format!("\"{member}\""))
-                    .collect::<Vec<_>>()
-                    .join(",")
-            );
-            let tags = vec![Tag::custom(
-                TAG_SNAP,
-                [
-                    HEXLOWER.encode(&snapshot_id),
-                    (index as u32 + 1).to_string(),
-                    total.to_string(),
-                ],
-            )];
-
-            build_rumor_ms(KIND_SNAPSHOT, refounder, &content, tags, at_ms)
-        })
-        .collect()
-}
-
-pub fn seal_rumor(
-    rumor: &UnsignedEvent,
-    group: &GroupKey,
-    author: &Keys,
-) -> Result<(Event, Keys), GuestbookError> {
-    let kind = rumor.kind.as_u16();
-
-    if !is_guestbook_kind(kind) {
-        return Err(GuestbookError::UnknownKind(kind));
-    }
-
-    let seal = build_seal(rumor, SealForm::Encrypted, group, author)?;
-
-    Ok(wrap_seal(&seal, group, KIND_WRAP, rumor.created_at, &[])?)
-}
-
-pub fn open(
-    wrap: &Event,
-    group: &GroupKey,
-) -> Result<(OpenedStream, GuestbookRumor), GuestbookError> {
-    let opened = open_wrap(wrap, group)?;
-
-    if opened.seal_form != SealForm::Encrypted {
-        return Err(GuestbookError::NotEncryptedSealed);
-    }
-
-    let entry = entry_of(&opened)?;
-    let rumor = GuestbookRumor {
-        id: opened.rumor_id,
-        author: opened.author,
-        kind: opened.rumor.kind,
-        at_ms: opened.at_ms,
-        entry,
-    };
-
-    Ok((opened, rumor))
-}
-
-pub fn coalesce(
-    rumors: &[GuestbookRumor],
-    now_ms: u64,
-    snapshot_authority: Option<&PublicKey>,
-    can_kick: impl Fn(&PublicKey, &PublicKey, Option<&AuthorityCitation>) -> bool,
-) -> BTreeMap<PublicKey, MemberState> {
-    let mut states: BTreeMap<PublicKey, (u64, Reverse<EventId>, MemberState)> = BTreeMap::new();
-    let horizon = now_ms.saturating_add(MAX_FUTURE_SKEW_MS);
-
-    for rumor in rumors {
-        if rumor.at_ms > horizon {
-            continue;
-        }
-
-        match &rumor.entry {
-            GuestbookEntry::Join {
-                member,
-                at_ms,
-                invited_by,
-            } => offer(
-                &mut states,
-                *member,
-                *at_ms,
-                rumor.id,
-                MemberState::Joined {
-                    at_ms: *at_ms,
-                    invited_by: invited_by.clone(),
-                },
-            ),
-            GuestbookEntry::Leave { member, at_ms } => offer(
-                &mut states,
-                *member,
-                *at_ms,
-                rumor.id,
-                MemberState::Left { at_ms: *at_ms },
-            ),
-            GuestbookEntry::Kick {
-                actor,
-                target,
-                at_ms,
-                citation,
-            } => {
-                if !can_kick(actor, target, citation.as_ref()) {
-                    continue;
-                }
-
-                offer(
-                    &mut states,
-                    *target,
-                    *at_ms,
-                    rumor.id,
-                    MemberState::Kicked {
-                        at_ms: *at_ms,
-                        actor: *actor,
-                    },
-                );
-            }
-            GuestbookEntry::Snapshot {
-                refounder,
-                members,
-                at_ms,
-                ..
-            } => {
-                if snapshot_authority != Some(refounder) {
-                    continue;
-                }
-
-                for member in members {
-                    offer(
-                        &mut states,
-                        *member,
-                        *at_ms,
-                        rumor.id,
-                        MemberState::Joined {
-                            at_ms: *at_ms,
-                            invited_by: None,
-                        },
-                    );
-                }
-            }
-        }
-    }
-
-    states
-        .into_iter()
-        .map(|(member, (_, _, state))| (member, state))
-        .collect()
-}
-
-pub fn complete_memberlist(
-    coalesced: &BTreeMap<PublicKey, MemberState>,
-    observed: &BTreeMap<PublicKey, u64>,
-    granted: &BTreeSet<PublicKey>,
-    banned: &BTreeSet<PublicKey>,
-    banned_at: &BTreeMap<PublicKey, u64>,
-) -> BTreeSet<PublicKey> {
-    let mut candidates: BTreeSet<&PublicKey> = coalesced.keys().collect();
-    candidates.extend(observed.keys());
-    candidates.extend(granted.iter());
-
-    let mut members = BTreeSet::new();
-
-    for member in candidates {
-        let mut inclusion = observed.get(member).copied();
-
-        if let Some(state) = coalesced.get(member) {
-            match state {
-                MemberState::Joined { at_ms, .. } => {
-                    inclusion = Some(inclusion.map_or(*at_ms, |seen| seen.max(*at_ms)));
-                }
-                MemberState::Left { .. } | MemberState::Kicked { .. } => {}
-            }
-        }
-
-        if inclusion.is_none() && granted.contains(member) {
-            inclusion = Some(0);
-        }
-
-        let mut exclusion = match coalesced.get(member) {
-            Some(MemberState::Left { at_ms }) | Some(MemberState::Kicked { at_ms, .. }) => {
-                Some(*at_ms)
-            }
-            _ => None,
-        };
-
-        if banned.contains(member) {
-            exclusion = Some(match banned_at.get(member) {
-                Some(at_ms) => exclusion.map_or(*at_ms, |seen| seen.max(*at_ms)),
-                None => u64::MAX,
-            });
-        }
-
-        if let Some(inclusion) = inclusion
-            && exclusion.is_none_or(|exclusion| inclusion > exclusion)
-        {
-            members.insert(*member);
-        }
-    }
-
-    members
-}
-
-fn offer(
-    states: &mut BTreeMap<PublicKey, (u64, Reverse<EventId>, MemberState)>,
-    member: PublicKey,
-    at_ms: u64,
-    id: EventId,
-    state: MemberState,
-) {
-    let candidate = (at_ms, Reverse(id));
-
-    if let Some(existing) = states.get(&member)
-        && (existing.0, existing.1) >= candidate
-    {
-        return;
-    }
-
-    states.insert(member, (at_ms, Reverse(id), state));
-}
-
-fn is_guestbook_kind(kind: u16) -> bool {
-    matches!(kind, KIND_JOIN_LEAVE | KIND_KICK | KIND_SNAPSHOT)
-}
-
-fn entry_of(opened: &OpenedStream) -> Result<GuestbookEntry, GuestbookError> {
-    let rumor = &opened.rumor;
-    let author = opened.author;
-    let at_ms = opened.at_ms;
-
-    match rumor.kind.as_u16() {
-        KIND_JOIN_LEAVE => match rumor.content.as_str() {
-            CONTENT_JOIN => Ok(GuestbookEntry::Join {
-                member: author,
-                at_ms,
-                invited_by: invite_of(rumor),
-            }),
-            CONTENT_LEAVE => Ok(GuestbookEntry::Leave {
-                member: author,
-                at_ms,
-            }),
-            _ => Err(GuestbookError::BadTag(TAG_CONTENT)),
-        },
-        KIND_KICK => Ok(GuestbookEntry::Kick {
-            actor: author,
-            target: tagged_pubkey(rumor, TAG_TARGET)?,
-            at_ms,
-            citation: optional_citation(rumor)?,
-        }),
-        KIND_SNAPSHOT => {
-            let (snapshot_id, chunk) = snapshot_of(rumor)?;
-            let members = members_of(&rumor.content)?;
-
-            Ok(GuestbookEntry::Snapshot {
-                refounder: author,
-                members,
-                snapshot_id,
-                chunk,
-                at_ms,
-            })
-        }
-        other => Err(GuestbookError::UnknownKind(other)),
-    }
-}
-
-fn invite_of(rumor: &UnsignedEvent) -> Option<(String, String)> {
-    rumor.tags.iter().find_map(|candidate| {
-        let fields = candidate.as_slice();
-
-        (fields.len() >= 3 && fields[0] == TAG_INVITE)
-            .then(|| (fields[1].clone(), fields[2].clone()))
-    })
-}
-
-fn members_of(content: &str) -> Result<Vec<PublicKey>, GuestbookError> {
-    let entries: Vec<String> =
-        serde_json::from_str(content).map_err(|_| GuestbookError::BadTag(TAG_CONTENT))?;
-
-    if entries.len() > MAX_SNAPSHOT_CHUNK {
-        return Err(GuestbookError::BadTag(TAG_SNAP));
-    }
-
-    entries
-        .iter()
-        .map(|entry| pubkey(entry, TAG_CONTENT))
-        .collect()
-}
-
-fn snapshot_of(rumor: &UnsignedEvent) -> Result<([u8; 32], (u32, u32)), GuestbookError> {
-    let fields = required(rumor, TAG_SNAP)?;
-
-    if fields.len() != 4 {
-        return Err(GuestbookError::BadTag(TAG_SNAP));
-    }
-
-    let snapshot_id = decode_hex_32(&fields[1]).map_err(|_| GuestbookError::BadTag(TAG_SNAP))?;
-    let index = decimal(&fields[2])?;
-    let total = decimal(&fields[3])?;
-
-    if index == 0 || index > total {
-        return Err(GuestbookError::BadTag(TAG_SNAP));
-    }
-
-    Ok((snapshot_id, (index, total)))
-}
-
-fn optional_citation(rumor: &UnsignedEvent) -> Result<Option<AuthorityCitation>, GuestbookError> {
-    let Some(fields) = tag(rumor, TAG_CITATION)? else {
-        return Ok(None);
-    };
-
-    citation_from(fields)
-        .map(Some)
-        .ok_or(GuestbookError::BadTag(TAG_CITATION))
-}
-
-fn decimal(raw: &str) -> Result<u32, GuestbookError> {
-    canonical_decimal(raw)
-        .and_then(|value| u32::try_from(value).ok())
-        .ok_or(GuestbookError::BadTag(TAG_SNAP))
-}
-
-fn required<'a>(
-    rumor: &'a UnsignedEvent,
-    name: &'static str,
-) -> Result<&'a [String], GuestbookError> {
-    tag(rumor, name)?.ok_or(GuestbookError::MissingTag(name))
-}
-
-fn tagged_pubkey(rumor: &UnsignedEvent, name: &'static str) -> Result<PublicKey, GuestbookError> {
-    pubkey(value(required(rumor, name)?, name)?, name)
-}
-
-fn tag<'a>(
-    rumor: &'a UnsignedEvent,
-    name: &'static str,
-) -> Result<Option<&'a [String]>, GuestbookError> {
-    let mut found: Option<&[String]> = None;
-
-    for candidate in rumor.tags.iter() {
-        let fields = candidate.as_slice();
-
-        if fields.first().map(String::as_str) != Some(name) {
-            continue;
-        }
-
-        if found.is_some() {
-            return Err(GuestbookError::DuplicateTag(name));
-        }
-
-        found = Some(fields);
-    }
-
-    Ok(found)
-}
-
-fn value<'a>(fields: &'a [String], name: &'static str) -> Result<&'a str, GuestbookError> {
-    fields
-        .get(1)
-        .map(String::as_str)
-        .ok_or(GuestbookError::BadTag(name))
-}
-
-fn pubkey(hex: &str, name: &'static str) -> Result<PublicKey, GuestbookError> {
-    let bytes = decode_hex_32(hex).map_err(|_| GuestbookError::BadTag(name))?;
-
-    PublicKey::from_slice(&bytes).map_err(|_| GuestbookError::BadTag(name))
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use crate::cord01::build_rumor_secs;
-    use crate::derive::guestbook_group_key;
-    use crate::{CommunityId, Epoch};
-
-    const ROOT: [u8; 32] = [0x5au8; 32];
-    const AT: u64 = 1_700_000_000_000;
-
-    fn community() -> CommunityId {
-        CommunityId::from_bytes([0x11u8; 32])
-    }
-
-    fn group() -> GroupKey {
-        guestbook_group_key(&ROOT, &community(), Epoch(0)).expect("derives")
-    }
-
-    fn citation() -> AuthorityCitation {
-        AuthorityCitation {
-            entity: [0x33u8; 32],
-            version: 1,
-            hash: [0x44u8; 32],
-        }
-    }
-
-    fn publish(rumor: &UnsignedEvent, author: &Keys) -> GuestbookRumor {
-        let wrap = seal_rumor(rumor, &group(), author).expect("seals").0;
-
-        open(&wrap, &group()).expect("opens").1
-    }
-
-    #[test]
-    fn join_leave_kick_and_snapshot_converge_to_one_memberlist() {
-        let alice = Keys::generate();
-        let bob = Keys::generate();
-        let carol = Keys::generate();
-        let dave = Keys::generate();
-        let frank = Keys::generate();
-        let grace = Keys::generate();
-        let owner = Keys::generate();
-
-        let survivors: Vec<PublicKey> = (0..401).map(|_| Keys::generate().public_key()).collect();
-
-        let mut rumors = vec![
-            publish(
-                &build_join(
-                    alice.public_key(),
-                    Some((&"ab".repeat(32), "Reddit")),
-                    AT + 1_000,
-                ),
-                &alice,
-            ),
-            publish(&build_join(bob.public_key(), None, AT + 2_000), &bob),
-            publish(&build_leave(bob.public_key(), AT + 3_000), &bob),
-            publish(&build_join(dave.public_key(), None, AT + 4_000), &dave),
-            publish(
-                &build_kick(
-                    carol.public_key(),
-                    &dave.public_key(),
-                    Some(&citation()),
-                    AT + 5_000,
-                ),
-                &carol,
-            ),
-            publish(&build_join(frank.public_key(), None, AT + 7_000), &frank),
-        ];
-
-        let snapshot_id = "77".repeat(32);
-        let chunks =
-            build_snapshot_chunks(carol.public_key(), &survivors, [0x77u8; 32], AT + 6_000);
-        assert_eq!(chunks.len(), 2, "401 survivors chunk into two events");
-        for (index, chunk) in chunks.iter().enumerate() {
-            assert!(chunk.tags.iter().any(|tag| tag.as_slice()
-                == [
-                    TAG_SNAP,
-                    snapshot_id.as_str(),
-                    &(index + 1).to_string(),
-                    "2"
-                ]));
-            rumors.push(publish(chunk, &carol));
-        }
-
-        let can_kick =
-            |actor: &PublicKey, target: &PublicKey, citation: Option<&AuthorityCitation>| {
-                citation.is_some() && actor == &carol.public_key() && target != &owner.public_key()
-            };
-
-        let states = coalesce(&rumors, AT + 8_000, Some(&carol.public_key()), can_kick);
-
-        assert_eq!(
-            states.get(&alice.public_key()),
-            Some(&MemberState::Joined {
-                at_ms: AT + 1_000,
-                invited_by: Some(("ab".repeat(32), "Reddit".to_owned())),
-            })
-        );
-        assert_eq!(
-            states.get(&bob.public_key()),
-            Some(&MemberState::Left { at_ms: AT + 3_000 })
-        );
-        assert_eq!(
-            states.get(&dave.public_key()),
-            Some(&MemberState::Kicked {
-                at_ms: AT + 5_000,
-                actor: carol.public_key(),
-            })
-        );
-        assert!(
-            survivors
-                .iter()
-                .all(|member| matches!(states.get(member), Some(MemberState::Joined { .. }))),
-            "every chunk seeds its own members"
-        );
-
-        let reversed: Vec<GuestbookRumor> = rumors.iter().rev().cloned().collect();
-        assert_eq!(
-            coalesce(&reversed, AT + 8_000, Some(&carol.public_key()), can_kick),
-            states,
-            "arrival order cannot change the fold"
-        );
-
-        let observed = BTreeMap::from([
-            (bob.public_key(), AT + 9_000),
-            (carol.public_key(), AT + 5_000),
-        ]);
-        let granted = BTreeSet::from([grace.public_key()]);
-        let banned = BTreeSet::from([frank.public_key()]);
-        let banned_at = BTreeMap::from([(frank.public_key(), AT + 8_000)]);
-
-        let members = complete_memberlist(&states, &observed, &granted, &banned, &banned_at);
-
-        let mut expected = BTreeSet::from([
-            alice.public_key(),
-            bob.public_key(),
-            carol.public_key(),
-            grace.public_key(),
-        ]);
-        expected.extend(survivors.iter().copied());
-
-        assert_eq!(members, expected);
-        assert!(
-            !members.contains(&dave.public_key()),
-            "a kicked member is out"
-        );
-        assert!(
-            !members.contains(&frank.public_key()),
-            "a ban wins over a later join"
-        );
-    }
-
-    #[test]
-    fn a_kick_or_snapshot_without_authority_is_dropped() {
-        let moderator = Keys::generate();
-        let outsider = Keys::generate();
-        let owner = Keys::generate();
-        let kicked = Keys::generate();
-        let uncited = Keys::generate();
-        let unranked = Keys::generate();
-        let refounder = Keys::generate();
-        let impostor = Keys::generate();
-        let seeded = Keys::generate();
-        let smuggled = Keys::generate();
-
-        let can_kick = |actor: &PublicKey,
-                        target: &PublicKey,
-                        citation: Option<&AuthorityCitation>| {
-            citation.is_some() && actor == &moderator.public_key() && target != &owner.public_key()
-        };
-
-        let rumors = vec![
-            publish(
-                &build_kick(
-                    moderator.public_key(),
-                    &kicked.public_key(),
-                    Some(&citation()),
-                    AT,
-                ),
-                &moderator,
-            ),
-            publish(
-                &build_kick(moderator.public_key(), &uncited.public_key(), None, AT),
-                &moderator,
-            ),
-            publish(
-                &build_kick(
-                    outsider.public_key(),
-                    &unranked.public_key(),
-                    Some(&citation()),
-                    AT,
-                ),
-                &outsider,
-            ),
-            publish(
-                &build_kick(
-                    moderator.public_key(),
-                    &owner.public_key(),
-                    Some(&citation()),
-                    AT,
-                ),
-                &moderator,
-            ),
-        ];
-
-        let states = coalesce(&rumors, AT + 1_000, None, can_kick);
-
-        assert_eq!(
-            states.get(&kicked.public_key()),
-            Some(&MemberState::Kicked {
-                at_ms: AT,
-                actor: moderator.public_key(),
-            })
-        );
-        assert!(
-            !states.contains_key(&uncited.public_key()),
-            "a kick cites the Grant it acts under"
-        );
-        assert!(
-            !states.contains_key(&unranked.public_key()),
-            "a kick needs KICK"
-        );
-        assert!(
-            !states.contains_key(&owner.public_key()),
-            "nobody kicks the owner"
-        );
-
-        let by_refounder = build_snapshot_chunks(
-            refounder.public_key(),
-            &[seeded.public_key()],
-            [0x77u8; 32],
-            AT,
-        )
-        .remove(0);
-        let by_impostor = build_snapshot_chunks(
-            impostor.public_key(),
-            &[smuggled.public_key()],
-            [0x88u8; 32],
-            AT,
-        )
-        .remove(0);
-
-        for authority in [None, Some(refounder.public_key())] {
-            let states = coalesce(
-                &[
-                    publish(&by_refounder, &refounder),
-                    publish(&by_impostor, &impostor),
-                ],
-                AT + 1_000,
-                authority.as_ref(),
-                |_, _, _| true,
-            );
-
-            assert_eq!(
-                states.contains_key(&seeded.public_key()),
-                authority.is_some(),
-                "only the epoch's refounder seeds, and there is no owner fallback"
-            );
-            assert!(
-                !states.contains_key(&smuggled.public_key()),
-                "a foreign snapshot never seeds"
-            );
-        }
-    }
-
-    #[test]
-    fn a_future_entry_a_bad_ms_and_a_malformed_snapshot_are_dropped() {
-        let member = Keys::generate();
-        let moderator = Keys::generate();
-        let target = Keys::generate();
-
-        let future = publish(
-            &build_join(member.public_key(), None, AT + MAX_FUTURE_SKEW_MS + 1),
-            &member,
-        );
-        let horizon = publish(
-            &build_join(member.public_key(), None, AT + MAX_FUTURE_SKEW_MS),
-            &member,
-        );
-        assert!(
-            coalesce(&[future], AT, None, |_, _, _| true).is_empty(),
-            "an entry more than an hour ahead is dropped"
-        );
-        assert_eq!(
-            coalesce(&[horizon], AT, None, |_, _, _| true).len(),
-            1,
-            "the horizon itself is skew, not forgery"
-        );
-
-        let bad_ms = build_rumor_secs(
-            KIND_JOIN_LEAVE,
-            member.public_key(),
-            CONTENT_JOIN,
-            vec![Tag::custom("ms", ["1000"])],
-            AT / 1000,
-        );
-        assert!(matches!(
-            open(
-                &seal_rumor(&bad_ms, &group(), &member).expect("seals").0,
-                &group()
-            ),
-            Err(GuestbookError::Stream(StreamError::BadMs))
-        ));
-
-        let bad_verb = build_rumor_ms(KIND_JOIN_LEAVE, member.public_key(), "maybe", vec![], AT);
-        assert!(matches!(
-            open(
-                &seal_rumor(&bad_verb, &group(), &member).expect("seals").0,
-                &group()
-            ),
-            Err(GuestbookError::BadTag(TAG_CONTENT))
-        ));
-
-        let ambiguous = build_rumor_ms(
-            KIND_KICK,
-            moderator.public_key(),
-            "",
-            vec![
-                Tag::custom(TAG_TARGET, [target.public_key().to_hex()]),
-                citation_tag(&citation()),
-                citation_tag(&citation()),
-            ],
-            AT,
-        );
-        assert!(matches!(
-            open(
-                &seal_rumor(&ambiguous, &group(), &moderator)
-                    .expect("seals")
-                    .0,
-                &group()
-            ),
-            Err(GuestbookError::DuplicateTag(TAG_CITATION))
-        ));
-
-        for fields in [
-            vec![snapshot_id(), "0".to_owned(), "2".to_owned()],
-            vec![snapshot_id(), "3".to_owned(), "2".to_owned()],
-            vec![snapshot_id(), "1".to_owned()],
-        ] {
-            let rumor = build_rumor_ms(
-                KIND_SNAPSHOT,
-                moderator.public_key(),
-                "[]",
-                vec![Tag::custom(TAG_SNAP, fields)],
-                AT,
-            );
-            assert!(matches!(
-                open(
-                    &seal_rumor(&rumor, &group(), &moderator).expect("seals").0,
-                    &group()
-                ),
-                Err(GuestbookError::BadTag(TAG_SNAP))
-            ));
-        }
-    }
-
-    fn snapshot_id() -> String {
-        "ab".repeat(32)
-    }
-}

crates/concord/src/cords/cord02/list.rs

@@ -1,476 +0,0 @@
-use std::collections::BTreeMap;
-use std::collections::btree_map::Entry;
-use std::fmt;
-
-use nostr_sdk::prelude::*;
-use serde::{Deserialize, Serialize};
-
-use crate::cord01::{self, NIP44_MAX_PLAINTEXT};
-use crate::cord05::{ChannelGrant, CommunityInvite};
-use crate::{CommunityId, Epoch, Extra};
-
-pub const KIND_COMMUNITY_LIST: u16 = 13302;
-pub const MAX_MEMBERSHIPS: usize = 50;
-
-#[derive(Debug)]
-pub enum ListError {
-    Kind(u16),
-    Crypto(String),
-    Json(String),
-    TooManyMemberships(usize),
-    Oversize(usize),
-}
-
-impl fmt::Display for ListError {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        match self {
-            ListError::Kind(kind) => write!(f, "not a community list kind: {kind}"),
-            ListError::Crypto(error) => write!(f, "crypto: {error}"),
-            ListError::Json(error) => write!(f, "json: {error}"),
-            ListError::TooManyMemberships(count) => {
-                write!(
-                    f,
-                    "list carries {count} memberships (cap {MAX_MEMBERSHIPS})"
-                )
-            }
-            ListError::Oversize(len) => {
-                write!(f, "list is {len} bytes (cap {NIP44_MAX_PLAINTEXT})")
-            }
-        }
-    }
-}
-
-impl std::error::Error for ListError {}
-
-impl From<cord01::StreamError> for ListError {
-    fn from(error: cord01::StreamError) -> Self {
-        ListError::Crypto(error.to_string())
-    }
-}
-
-#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
-pub struct JoinMaterial {
-    pub community_id: CommunityId,
-    pub owner: PublicKey,
-    pub owner_salt: String,
-    pub community_root: String,
-    pub root_epoch: Epoch,
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub control_pk: Option<PublicKey>,
-    /// Present only when the holder is staff.
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub control_root: Option<String>,
-    #[serde(default, skip_serializing_if = "Vec::is_empty")]
-    pub channels: Vec<ChannelGrant>,
-    #[serde(default, skip_serializing_if = "Vec::is_empty")]
-    pub relays: Vec<String>,
-    pub name: String,
-    #[serde(flatten)]
-    pub extra: Extra,
-}
-
-#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
-pub struct CommunityListEntry {
-    pub community_id: CommunityId,
-    pub seed: JoinMaterial,
-    pub current: JoinMaterial,
-    pub added_at: u64,
-    #[serde(flatten)]
-    pub extra: Extra,
-}
-
-#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
-pub struct Tombstone {
-    pub community_id: CommunityId,
-    pub removed_at: u64,
-    #[serde(flatten)]
-    pub extra: Extra,
-}
-
-#[derive(Debug, Clone, Default, PartialEq, Serialize, Deserialize)]
-pub struct CommunityList {
-    #[serde(default, skip_serializing_if = "Vec::is_empty")]
-    pub entries: Vec<CommunityListEntry>,
-    #[serde(default, skip_serializing_if = "Vec::is_empty")]
-    pub tombstones: Vec<Tombstone>,
-    #[serde(flatten)]
-    pub extra: Extra,
-}
-
-impl CommunityList {
-    pub fn is_live(&self, community_id: &CommunityId) -> bool {
-        let added = self
-            .entries
-            .iter()
-            .find(|entry| entry.community_id == *community_id)
-            .map(|entry| entry.added_at);
-
-        match added {
-            None => false,
-            Some(added) => self
-                .tombstones
-                .iter()
-                .find(|tombstone| tombstone.community_id == *community_id)
-                .is_none_or(|tombstone| added > tombstone.removed_at),
-        }
-    }
-
-    pub fn fits(&self) -> Result<(), ListError> {
-        if self.entries.len() > MAX_MEMBERSHIPS {
-            return Err(ListError::TooManyMemberships(self.entries.len()));
-        }
-
-        let json = serde_json::to_string(self).map_err(json_error)?;
-
-        if json.len() > NIP44_MAX_PLAINTEXT {
-            return Err(ListError::Oversize(json.len()));
-        }
-
-        Ok(())
-    }
-}
-
-pub fn join_material(invite: &CommunityInvite, control_root: Option<&[u8; 32]>) -> JoinMaterial {
-    JoinMaterial {
-        community_id: invite.community_id,
-        owner: invite.owner,
-        owner_salt: invite.owner_salt.clone(),
-        community_root: invite.community_root.clone(),
-        root_epoch: invite.root_epoch,
-        control_pk: invite.control_pk,
-        control_root: control_root.map(|key| data_encoding::HEXLOWER.encode(key)),
-        channels: invite.channels.clone(),
-        relays: invite.relays.clone(),
-        name: invite.name.clone(),
-        extra: Extra::default(),
-    }
-}
-
-pub fn merge(held: CommunityList, incoming: CommunityList) -> CommunityList {
-    let mut entries: BTreeMap<CommunityId, CommunityListEntry> = BTreeMap::new();
-
-    for entry in held.entries.into_iter().chain(incoming.entries) {
-        match entries.entry(entry.community_id) {
-            Entry::Vacant(slot) => {
-                slot.insert(entry);
-            }
-            Entry::Occupied(mut slot) => merge_entry(slot.get_mut(), entry),
-        }
-    }
-
-    let mut tombstones: BTreeMap<CommunityId, Tombstone> = BTreeMap::new();
-
-    for tombstone in held.tombstones.into_iter().chain(incoming.tombstones) {
-        match tombstones.entry(tombstone.community_id) {
-            Entry::Vacant(slot) => {
-                slot.insert(tombstone);
-            }
-            Entry::Occupied(mut slot) => {
-                let held = slot.get_mut();
-                held.removed_at = held.removed_at.max(tombstone.removed_at);
-                union(&mut held.extra, tombstone.extra);
-            }
-        }
-    }
-
-    let mut extra = held.extra;
-    union(&mut extra, incoming.extra);
-
-    CommunityList {
-        entries: entries.into_values().collect(),
-        tombstones: tombstones.into_values().collect(),
-        extra,
-    }
-}
-
-pub fn build_list_event(keys: &Keys, list: &CommunityList) -> Result<Event, ListError> {
-    list.fits()?;
-
-    let json = serde_json::to_string(list).map_err(json_error)?;
-    let content = cord01::seal_to_self(keys, json.as_bytes())?;
-
-    EventBuilder::new(Kind::Custom(KIND_COMMUNITY_LIST), content)
-        .finalize(keys)
-        .map_err(crypto_error)
-}
-
-pub fn parse_list_event(keys: &Keys, event: &Event) -> Result<CommunityList, ListError> {
-    if event.kind.as_u16() != KIND_COMMUNITY_LIST {
-        return Err(ListError::Kind(event.kind.as_u16()));
-    }
-
-    let json = cord01::open_to_self(keys, &event.content)?;
-
-    serde_json::from_slice(&json).map_err(json_error)
-}
-
-#[derive(Clone, Copy, PartialEq, Eq)]
-enum Snapshot {
-    Seed,
-    Current,
-}
-
-fn merge_entry(held: &mut CommunityListEntry, incoming: CommunityListEntry) {
-    held.added_at = held.added_at.max(incoming.added_at);
-    held.seed = pick(&held.seed, &incoming.seed, Snapshot::Seed).clone();
-    held.current = pick(&held.current, &incoming.current, Snapshot::Current).clone();
-    union(&mut held.extra, incoming.extra);
-}
-
-fn pick<'a>(
-    held: &'a JoinMaterial,
-    incoming: &'a JoinMaterial,
-    which: Snapshot,
-) -> &'a JoinMaterial {
-    let preferred = match which {
-        Snapshot::Seed => incoming.root_epoch < held.root_epoch,
-        Snapshot::Current => incoming.root_epoch > held.root_epoch,
-    };
-
-    if preferred {
-        return incoming;
-    }
-
-    if incoming.root_epoch == held.root_epoch && canonical(incoming) < canonical(held) {
-        return incoming;
-    }
-
-    held
-}
-
-pub(crate) fn union(into: &mut Extra, other: Extra) {
-    for (key, value) in other {
-        let replace = match into.get(&key) {
-            Some(existing) => canonical(&value) < canonical(existing),
-            None => true,
-        };
-
-        if replace {
-            into.insert(key, value);
-        }
-    }
-}
-
-pub(crate) fn canonical<T: Serialize>(value: &T) -> String {
-    serde_json::to_string(value).unwrap_or_default()
-}
-
-fn json_error(error: serde_json::Error) -> ListError {
-    ListError::Json(error.to_string())
-}
-
-fn crypto_error(error: impl fmt::Display) -> ListError {
-    ListError::Crypto(error.to_string())
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    fn id(byte: u8) -> CommunityId {
-        CommunityId::from_bytes([byte; 32])
-    }
-
-    fn material(
-        community_id: CommunityId,
-        owner: PublicKey,
-        name: &str,
-        epoch: u64,
-    ) -> JoinMaterial {
-        JoinMaterial {
-            community_id,
-            owner,
-            owner_salt: "33".repeat(32),
-            community_root: "44".repeat(32),
-            root_epoch: Epoch(epoch),
-            control_pk: None,
-            control_root: None,
-            channels: vec![],
-            relays: vec!["wss://relay.example".to_owned()],
-            name: name.to_owned(),
-            extra: Extra::default(),
-        }
-    }
-
-    fn entry(
-        community_id: CommunityId,
-        seed: JoinMaterial,
-        current: JoinMaterial,
-        added_at: u64,
-    ) -> CommunityListEntry {
-        CommunityListEntry {
-            community_id,
-            seed,
-            current,
-            added_at,
-            extra: Extra::default(),
-        }
-    }
-
-    fn list(entries: Vec<CommunityListEntry>) -> CommunityList {
-        CommunityList {
-            entries,
-            ..Default::default()
-        }
-    }
-
-    fn removal(community_id: CommunityId, removed_at: u64) -> CommunityList {
-        CommunityList {
-            tombstones: vec![Tombstone {
-                community_id,
-                removed_at,
-                extra: Extra::default(),
-            }],
-            ..Default::default()
-        }
-    }
-
-    #[test]
-    fn merge_keeps_the_earlier_seed_and_the_later_current_either_way_round() {
-        let owner = Keys::generate().public_key();
-        let older = material(id(0x11), owner, "Room", 1);
-        let newer = material(id(0x11), owner, "Room", 3);
-
-        let a = list(vec![entry(id(0x11), older.clone(), newer.clone(), 5_000)]);
-        let b = list(vec![entry(id(0x11), newer, older, 5_000)]);
-
-        for merged in [merge(a.clone(), b.clone()), merge(b, a)] {
-            let merged = merged.entries.first().expect("one membership");
-            assert_eq!(
-                merged.seed.root_epoch,
-                Epoch(1),
-                "seed anchors the earliest epoch held"
-            );
-            assert_eq!(merged.current.root_epoch, Epoch(3));
-            assert_eq!(merged.added_at, 5_000);
-        }
-
-        // An epoch tie breaks on the whole snapshot's bytes, and does so for both
-        // orders, so two devices never flap competing republishes.
-        let alpha = material(id(0x11), owner, "Alpha", 2);
-        let beta = material(id(0x11), owner, "Beta", 2);
-        let a = list(vec![entry(id(0x11), alpha.clone(), alpha, 1)]);
-        let b = list(vec![entry(id(0x11), beta.clone(), beta, 1)]);
-
-        let first = merge(a.clone(), b.clone());
-        assert_eq!(first, merge(b, a));
-        assert_eq!(first.entries[0].current.name, "Alpha");
-    }
-
-    #[test]
-    fn a_tombstone_is_terminal_until_a_newer_join_outruns_it() {
-        let owner = Keys::generate().public_key();
-        let joined = entry(
-            id(0x11),
-            material(id(0x11), owner, "Room", 0),
-            material(id(0x11), owner, "Room", 0),
-            5_000,
-        );
-
-        let left = merge(list(vec![joined.clone()]), removal(id(0x11), 6_000));
-        assert!(!left.is_live(&id(0x11)));
-        assert_eq!(
-            left.entries.len(),
-            1,
-            "a retired entry stays in the document"
-        );
-
-        // A stale device re-merging the entry cannot resurrect it.
-        assert!(!merge(left.clone(), list(vec![joined.clone()])).is_live(&id(0x11)));
-
-        // A re-join genuinely newer than the removal does.
-        let rejoined = list(vec![entry(
-            id(0x11),
-            material(id(0x11), owner, "Room", 0),
-            material(id(0x11), owner, "Room", 0),
-            7_000,
-        )]);
-        let live = merge(left, rejoined);
-        assert!(live.is_live(&id(0x11)));
-
-        // And the older removal is not re-applied on top of it.
-        assert!(merge(live, removal(id(0x11), 6_000)).is_live(&id(0x11)));
-    }
-
-    #[test]
-    fn a_second_device_reconstructs_membership_from_13302() {
-        let me = Keys::generate();
-        let owner = Keys::generate().public_key();
-        let mine = CommunityList {
-            entries: vec![
-                entry(
-                    id(0x11),
-                    material(id(0x11), owner, "Room", 1),
-                    material(id(0x11), owner, "Room", 4),
-                    AT,
-                ),
-                entry(
-                    id(0x22),
-                    material(id(0x22), owner, "Other", 0),
-                    material(id(0x22), owner, "Other", 0),
-                    AT + 1,
-                ),
-            ],
-            tombstones: vec![Tombstone {
-                community_id: id(0x33),
-                removed_at: AT,
-                extra: Extra::default(),
-            }],
-            extra: Extra::default(),
-        };
-
-        let event = build_list_event(&me, &mine).expect("builds");
-        assert_eq!(event.kind, Kind::Custom(KIND_COMMUNITY_LIST));
-        assert_eq!(parse_list_event(&me, &event).expect("parses"), mine);
-        assert!(
-            !parse_list_event(&me, &event)
-                .expect("parses")
-                .is_live(&id(0x33))
-        );
-
-        // Only the member's own keys open it, and an unreadable list is "no news".
-        let stranger = Keys::generate();
-        assert!(parse_list_event(&stranger, &event).is_err());
-
-        // Unknown fields survive the round trip, so a republish cannot wipe them.
-        let mut held = mine.clone();
-        held.extra
-            .insert("future".to_owned(), serde_json::json!({"deep": [1, 2]}));
-        held.entries[0]
-            .current
-            .extra
-            .insert("held_roots".to_owned(), serde_json::json!([{"epoch": 1}]));
-        let rebuilt =
-            parse_list_event(&me, &build_list_event(&me, &held).expect("builds")).expect("parses");
-        assert_eq!(rebuilt, held);
-
-        // The write gate refuses an over-cap or oversized List before publishing.
-        let crowded = list(
-            (0..=MAX_MEMBERSHIPS)
-                .map(|index| {
-                    let community_id = CommunityId::from_bytes([index as u8; 32]);
-                    entry(
-                        community_id,
-                        material(community_id, owner, "Room", 0),
-                        material(community_id, owner, "Room", 0),
-                        AT,
-                    )
-                })
-                .collect(),
-        );
-        assert!(matches!(
-            build_list_event(&me, &crowded),
-            Err(ListError::TooManyMemberships(n)) if n == MAX_MEMBERSHIPS + 1
-        ));
-
-        let oversized = list(vec![entry(
-            id(0x11),
-            material(id(0x11), owner, &"x".repeat(NIP44_MAX_PLAINTEXT), 0),
-            material(id(0x11), owner, "Room", 0),
-            AT,
-        )]);
-        assert!(matches!(oversized.fits(), Err(ListError::Oversize(_))));
-    }
-
-    const AT: u64 = 1_719_800_000_000;
-}

crates/concord/src/cords/cord04/mod.rs

@@ -1,555 +0,0 @@
-pub mod pins;
-pub mod roles;
-
-use std::cmp::Reverse;
-use std::collections::BTreeMap;
-use std::fmt;
-
-use data_encoding::HEXLOWER;
-use nostr_sdk::prelude::{EventId, PublicKey, Tag, UnsignedEvent};
-use serde::{Deserialize, Serialize};
-use sha2::{Digest, Sha256};
-
-use crate::cord01::build_rumor_secs;
-use crate::decode_hex_32;
-
-pub const KIND_CONTROL: u16 = 3308;
-
-const EDITION_LABEL: &[u8] = b"vector-community/v1/edition";
-
-/// Entity types an edition can address.
-pub mod vsk {
-    pub const COMMUNITY_METADATA: &str = "0";
-    pub const ROLE: &str = "1";
-    pub const CHANNEL_METADATA: &str = "2";
-    pub const GRANT: &str = "3";
-    pub const BANLIST: &str = "4";
-    pub const INVITE_LIVE: &str = "6";
-    pub const INVITE_LINKS: &str = "8";
-    pub const INVITE_REVOKED: &str = "9";
-    pub const DISSOLVED: &str = "10";
-    pub const PINS: &str = "11";
-}
-
-pub const TAG_SUBKIND: &str = "vsk";
-pub const TAG_CITATION: &str = "vac";
-
-const TAG_ENTITY: &str = "eid";
-const TAG_VERSION: &str = "ev";
-const TAG_PREV: &str = "ep";
-
-#[derive(Debug)]
-pub enum EditionError {
-    BadKind(u16),
-    BadField(&'static str),
-    Duplicate(&'static str),
-    Missing(&'static str),
-}
-
-impl fmt::Display for EditionError {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        match self {
-            EditionError::BadKind(kind) => write!(f, "not an edition kind: {kind}"),
-            EditionError::BadField(name) => write!(f, "malformed edition field: {name}"),
-            EditionError::Duplicate(name) => write!(f, "duplicate edition field: {name}"),
-            EditionError::Missing(name) => write!(f, "missing edition field: {name}"),
-        }
-    }
-}
-
-impl std::error::Error for EditionError {}
-
-/// A `vac`: the Grant edition an actor claims rank under, pinned by coordinate, version and hash.
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
-pub struct AuthorityCitation {
-    pub entity: [u8; 32],
-    pub version: u64,
-    pub hash: [u8; 32],
-}
-
-#[derive(Debug, Clone)]
-pub struct ParsedEdition {
-    pub author: PublicKey,
-    pub subkind: String,
-    pub entity: [u8; 32],
-    pub version: u64,
-    pub prev: Option<[u8; 32]>,
-    pub citation: Option<AuthorityCitation>,
-    pub content: String,
-    pub self_hash: [u8; 32],
-    pub rumor_id: EventId,
-}
-
-pub struct EditionFields<'a> {
-    pub author: PublicKey,
-    pub subkind: &'a str,
-    pub entity: [u8; 32],
-    pub version: u64,
-    pub prev: Option<[u8; 32]>,
-    pub citation: Option<AuthorityCitation>,
-    pub content: &'a str,
-    pub at_secs: u64,
-}
-
-fn signing_bytes(
-    entity: &[u8; 32],
-    version: u64,
-    prev: Option<&[u8; 32]>,
-    content: &[u8],
-) -> Vec<u8> {
-    let mut bytes =
-        Vec::with_capacity(8 + EDITION_LABEL.len() + 32 + 8 + 1 + 32 + 8 + content.len());
-
-    bytes.extend_from_slice(&(EDITION_LABEL.len() as u64).to_be_bytes());
-    bytes.extend_from_slice(EDITION_LABEL);
-    bytes.extend_from_slice(entity);
-    bytes.extend_from_slice(&version.to_be_bytes());
-
-    match prev {
-        Some(prev) => {
-            bytes.push(1);
-            bytes.extend_from_slice(prev);
-        }
-        None => {
-            bytes.push(0);
-            bytes.extend_from_slice(&[0u8; 32]);
-        }
-    }
-
-    bytes.extend_from_slice(&(content.len() as u64).to_be_bytes());
-    bytes.extend_from_slice(content);
-    bytes
-}
-
-pub fn edition_hash(
-    entity: &[u8; 32],
-    version: u64,
-    prev: Option<&[u8; 32]>,
-    content: &[u8],
-) -> [u8; 32] {
-    Sha256::digest(signing_bytes(entity, version, prev, content)).into()
-}
-
-pub fn citation_tag(citation: &AuthorityCitation) -> Tag {
-    Tag::custom(
-        TAG_CITATION,
-        [
-            HEXLOWER.encode(&citation.entity),
-            citation.version.to_string(),
-            HEXLOWER.encode(&citation.hash),
-        ],
-    )
-}
-
-pub fn citation_from(fields: &[String]) -> Option<AuthorityCitation> {
-    if fields.len() != 4 {
-        return None;
-    }
-
-    Some(AuthorityCitation {
-        entity: hex32(&fields[1], TAG_CITATION).ok()?,
-        version: canonical_decimal(&fields[2])?,
-        hash: hex32(&fields[3], TAG_CITATION).ok()?,
-    })
-}
-
-pub fn build_edition(fields: EditionFields<'_>) -> UnsignedEvent {
-    let mut tags = vec![
-        Tag::custom(TAG_SUBKIND, [fields.subkind]),
-        Tag::custom(TAG_ENTITY, [HEXLOWER.encode(&fields.entity)]),
-        Tag::custom(TAG_VERSION, [fields.version.to_string()]),
-    ];
-
-    if let Some(prev) = fields.prev {
-        tags.push(Tag::custom(TAG_PREV, [HEXLOWER.encode(&prev)]));
-    }
-
-    if let Some(citation) = fields.citation {
-        tags.push(citation_tag(&citation));
-    }
-
-    build_rumor_secs(
-        KIND_CONTROL,
-        fields.author,
-        fields.content,
-        tags,
-        fields.at_secs,
-    )
-}
-
-pub fn parse_edition(rumor: &UnsignedEvent) -> Result<ParsedEdition, EditionError> {
-    let kind = rumor.kind.as_u16();
-
-    if kind != KIND_CONTROL {
-        return Err(EditionError::BadKind(kind));
-    }
-
-    let subkind = value(rumor, TAG_SUBKIND)?
-        .ok_or(EditionError::Missing(TAG_SUBKIND))?
-        .to_owned();
-
-    if canonical_decimal(&subkind).is_none() {
-        return Err(EditionError::BadField(TAG_SUBKIND));
-    }
-
-    let entity = hex32(
-        value(rumor, TAG_ENTITY)?.ok_or(EditionError::Missing(TAG_ENTITY))?,
-        TAG_ENTITY,
-    )?;
-
-    let version =
-        canonical_decimal(value(rumor, TAG_VERSION)?.ok_or(EditionError::Missing(TAG_VERSION))?)
-            .ok_or(EditionError::BadField(TAG_VERSION))?;
-
-    let prev = match value(rumor, TAG_PREV)? {
-        Some(raw) => Some(hex32(raw, TAG_PREV)?),
-        None => None,
-    };
-
-    let citation = match fields(rumor, TAG_CITATION)? {
-        Some(fields) => Some(citation_from(fields).ok_or(EditionError::BadField(TAG_CITATION))?),
-        None => None,
-    };
-
-    let self_hash = edition_hash(&entity, version, prev.as_ref(), rumor.content.as_bytes());
-
-    Ok(ParsedEdition {
-        author: rumor.pubkey,
-        subkind,
-        entity,
-        version,
-        prev,
-        citation,
-        content: rumor.content.clone(),
-        self_hash,
-        rumor_id: rumor.id.unwrap_or_else(|| rumor.compute_id()),
-    })
-}
-
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
-pub struct EditionMeta {
-    pub version: u64,
-    pub self_hash: [u8; 32],
-    pub prev: Option<[u8; 32]>,
-    pub tiebreak_id: EventId,
-}
-
-impl From<&ParsedEdition> for EditionMeta {
-    fn from(edition: &ParsedEdition) -> Self {
-        Self {
-            version: edition.version,
-            self_hash: edition.self_hash,
-            prev: edition.prev,
-            tiebreak_id: edition.rumor_id,
-        }
-    }
-}
-
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Default)]
-pub struct FoldResult {
-    pub head: Option<usize>,
-    pub gap: bool,
-    pub anchored: bool,
-}
-
-/// The highest version whose chain is intact, given a held floor.
-pub fn fold(editions: &[EditionMeta], floor: u64, floor_hash: Option<&[u8; 32]>) -> FoldResult {
-    let mut by_version: BTreeMap<u64, usize> = BTreeMap::new();
-
-    for (index, edition) in editions.iter().enumerate() {
-        if edition.version < floor {
-            continue;
-        }
-
-        match by_version.get(&edition.version) {
-            Some(&current) if editions[current].tiebreak_id <= edition.tiebreak_id => {}
-            _ => {
-                by_version.insert(edition.version, index);
-            }
-        }
-    }
-
-    let Some((&lowest_version, &lowest_index)) = by_version.first_key_value() else {
-        return FoldResult::default();
-    };
-
-    let lowest = editions[lowest_index];
-
-    let anchored = if floor == 0 {
-        lowest_version == 1 && lowest.prev.is_none()
-    } else if lowest_version == floor {
-        floor_hash == Some(&lowest.self_hash)
-    } else if lowest_version == floor + 1 {
-        floor_hash.is_some() && lowest.prev.as_ref() == floor_hash
-    } else {
-        false
-    };
-
-    let mut head = Some(lowest_index);
-    let mut gap = !anchored;
-    let mut previous_version = lowest_version;
-    let mut previous_hash = lowest.self_hash;
-
-    for (&version, &index) in by_version.range(lowest_version + 1..) {
-        let edition = editions[index];
-
-        if version == previous_version + 1 && edition.prev == Some(previous_hash) {
-            head = Some(index);
-            previous_version = version;
-            previous_hash = edition.self_hash;
-        } else {
-            gap = true;
-            break;
-        }
-    }
-
-    FoldResult {
-        head,
-        gap,
-        anchored,
-    }
-}
-
-/// The highest version overall, ignoring contiguity.
-pub fn bootstrap_head(editions: &[EditionMeta]) -> Option<usize> {
-    editions
-        .iter()
-        .enumerate()
-        .min_by_key(|(_, edition)| (Reverse(edition.version), edition.tiebreak_id))
-        .map(|(index, _)| index)
-}
-
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Default)]
-pub struct HeadSelection {
-    pub head: Option<usize>,
-    pub gap: bool,
-}
-
-/// The head to prefer for one entity, given what this client already committed to.
-pub fn fold_head(editions: &[EditionMeta], floor: Option<&EntityHead>) -> HeadSelection {
-    let Some(floor) = floor else {
-        return HeadSelection {
-            head: bootstrap_head(editions),
-            gap: false,
-        };
-    };
-
-    let anchored = fold(editions, floor.version, Some(&floor.self_hash));
-
-    if anchored.anchored {
-        return HeadSelection {
-            head: anchored.head,
-            gap: anchored.gap,
-        };
-    }
-
-    if anchored.head.is_none() && !anchored.gap {
-        return HeadSelection::default();
-    }
-
-    let fork = editions
-        .iter()
-        .enumerate()
-        .filter(|(_, edition)| edition.version == floor.version)
-        .min_by_key(|(_, edition)| edition.tiebreak_id);
-
-    let winner = match fork {
-        Some((_, edition))
-            if edition.self_hash != floor.self_hash && edition.tiebreak_id < floor.rumor_id =>
-        {
-            edition.self_hash
-        }
-        _ => {
-            return HeadSelection {
-                head: None,
-                gap: true,
-            };
-        }
-    };
-
-    let refolded = fold(editions, floor.version, Some(&winner));
-
-    if refolded.anchored {
-        HeadSelection {
-            head: refolded.head,
-            gap: refolded.gap,
-        }
-    } else {
-        HeadSelection {
-            head: None,
-            gap: true,
-        }
-    }
-}
-
-/// A committed head, and the refuse-downgrade floor a later fold is judged against.
-#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
-pub struct EntityHead {
-    pub entity: [u8; 32],
-    pub version: u64,
-    pub self_hash: [u8; 32],
-    pub rumor_id: EventId,
-}
-
-impl From<&ParsedEdition> for EntityHead {
-    fn from(edition: &ParsedEdition) -> Self {
-        Self {
-            entity: edition.entity,
-            version: edition.version,
-            self_hash: edition.self_hash,
-            rumor_id: edition.rumor_id,
-        }
-    }
-}
-
-/// Every entity's committed head, keyed by coordinate.
-pub type Floors = BTreeMap<[u8; 32], EntityHead>;
-
-pub(crate) fn canonical_decimal(raw: &str) -> Option<u64> {
-    if raw.is_empty() || !raw.bytes().all(|byte| byte.is_ascii_digit()) {
-        return None;
-    }
-
-    if raw.len() > 1 && raw.starts_with('0') {
-        return None;
-    }
-
-    raw.parse().ok()
-}
-
-fn hex32(raw: &str, name: &'static str) -> Result<[u8; 32], EditionError> {
-    decode_hex_32(raw).map_err(|_| EditionError::BadField(name))
-}
-
-fn fields<'a>(
-    rumor: &'a UnsignedEvent,
-    name: &'static str,
-) -> Result<Option<&'a [String]>, EditionError> {
-    let mut found: Option<&[String]> = None;
-
-    for tag in rumor.tags.iter() {
-        let tag_fields = tag.as_slice();
-
-        if tag_fields.first().map(String::as_str) != Some(name) {
-            continue;
-        }
-
-        if found.is_some() {
-            return Err(EditionError::Duplicate(name));
-        }
-
-        found = Some(tag_fields);
-    }
-
-    Ok(found)
-}
-
-fn value<'a>(
-    rumor: &'a UnsignedEvent,
-    name: &'static str,
-) -> Result<Option<&'a str>, EditionError> {
-    match fields(rumor, name)? {
-        Some(fields) if fields.len() == 2 => Ok(Some(fields[1].as_str())),
-        Some(_) => Err(EditionError::BadField(name)),
-        None => Ok(None),
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    fn meta(version: u64, prev: Option<[u8; 32]>, hash: u8, tiebreak: u8) -> EditionMeta {
-        EditionMeta {
-            version,
-            self_hash: [hash; 32],
-            prev,
-            tiebreak_id: EventId::from_byte_array([tiebreak; 32]),
-        }
-    }
-
-    fn head(version: u64, hash: u8, rumor: u8) -> EntityHead {
-        EntityHead {
-            entity: [0x11; 32],
-            version,
-            self_hash: [hash; 32],
-            rumor_id: EventId::from_byte_array([rumor; 32]),
-        }
-    }
-
-    #[test]
-    fn fold_picks_the_head_from_the_chain_and_the_floor() {
-        let chain = [
-            meta(1, None, 0xa1, 1),
-            meta(2, Some([0xa1; 32]), 0xa2, 2),
-            meta(3, Some([0xa2; 32]), 0xa3, 3),
-        ];
-
-        let folded = fold(&chain, 0, None);
-        assert_eq!(folded.head, Some(2));
-        assert!(!folded.gap && folded.anchored);
-
-        // A missing link stops the walk at the last contiguous edition.
-        let gapped = fold(&[chain[0], chain[2]], 0, None);
-        assert_eq!(gapped.head, Some(0));
-        assert!(gapped.gap && gapped.anchored);
-
-        // Everything below the held floor is a stale relay, not a gap.
-        let stale = fold(&chain[..2], 3, Some(&[0xa3; 32]));
-        assert_eq!(stale.head, None);
-        assert!(!stale.gap && !stale.anchored);
-
-        // A fork at a version breaks on the lower inner rumor id, and the chain resumes.
-        let fork = [meta(1, None, 0xb1, 9), meta(1, None, 0xa1, 1)];
-        assert_eq!(
-            fold(&fork, 0, None).head,
-            Some(1),
-            "the lower rumor id wins"
-        );
-        let forked = [fork[0], fork[1], chain[1], chain[2]];
-        assert_eq!(fold(&forked, 0, None).head, Some(3));
-
-        // A re-wrap onto the head we hold is the legitimate case; one whose `prev` no
-        // longer resolves is a withholding.
-        let rewrapped = meta(5, Some([0x99; 32]), 0xc5, 5);
-        assert_eq!(
-            fold_head(&[rewrapped], Some(&head(4, 0x99, 4))).head,
-            Some(0)
-        );
-        let dangling = meta(5, Some([0x88; 32]), 0xc5, 5);
-        let refused = fold_head(&[dangling], Some(&head(4, 0x99, 4)));
-        assert_eq!(refused.head, None);
-        assert!(refused.gap);
-
-        // A bootstrap takes it anyway: a compaction would leave a joiner with nothing.
-        assert_eq!(bootstrap_head(&[dangling]), Some(0));
-        assert_eq!(fold_head(&[dangling], None).head, Some(0));
-
-        // A fork at the floor's own version converges to the lower rumor id when that is
-        // genuinely earlier than what we hold, and the chain above it re-anchors.
-        let forked = [
-            meta(2, Some([0xa1; 32]), 0xb2, 3),
-            meta(3, Some([0xb2; 32]), 0xb3, 4),
-        ];
-        let converged = fold_head(&forked, Some(&head(2, 0xaa, 9)));
-        assert_eq!(converged.head, Some(1));
-        assert!(!converged.gap);
-
-        // A fork that is not earlier than the held head is refused.
-        assert_eq!(fold_head(&forked, Some(&head(2, 0xaa, 2))).head, None);
-    }
-
-    #[test]
-    fn edition_hash_matches_the_cross_client_vector() {
-        let entity = [0x11u8; 32];
-
-        assert_eq!(
-            HEXLOWER.encode(&edition_hash(&entity, 1, None, b"hello")),
-            "2daf42e65a6bc259a4c99fac6df754a5d3d92310607cf13e2a1e8c94d42f6303"
-        );
-
-        // The golden vector only exercises the absent-prev encoding, so pin the flag.
-        let bytes = signing_bytes(&entity, 1, Some(&entity), b"hello");
-        assert_eq!(bytes[8 + EDITION_LABEL.len() + 32 + 8], 1);
-    }
-}

crates/concord/src/cords/cord04/pins.rs

@@ -1,817 +0,0 @@
-use std::fmt;
-
-use chacha20::ChaCha20;
-use chacha20::cipher::{KeyIvInit, StreamCipher};
-use data_encoding::{BASE64, HEXLOWER};
-use hkdf::Hkdf;
-use hmac::{Hmac, Mac};
-use nostr_sdk::prelude::*;
-use serde::{Deserialize, Serialize};
-use sha2::Sha256;
-
-use crate::cord01::{self, OpenedStream, SealForm, resolve_ms_strict};
-use crate::cord03::{ChatAction, ChatRumor, KIND_COMMENT, KIND_EDIT, KIND_MESSAGE};
-use crate::cord04::canonical_decimal;
-use crate::{ChannelId, Epoch, Extra, GroupKey, decode_hex_lower};
-
-pub const PIN_MAX_ENTRIES: usize = 25;
-pub const PIN_MAX_CONTENT_BYTES: usize = 32_768;
-
-/// The serialized disclosure: `chacha_key[32] || chacha_nonce[12] || hmac_key[32]`.
-pub const MESSAGE_KEYS_BYTES: usize = 76;
-
-const TAG_CHANNEL: &str = "channel";
-const TAG_EPOCH: &str = "epoch";
-const TAG_TARGET: &str = "e";
-
-#[derive(Debug, Clone, PartialEq, Eq)]
-pub enum PinError {
-    NotEncryptedSeal,
-    BadPayload,
-    Unverifiable,
-    Unreadable,
-    TooManyEntries,
-    Oversize(usize),
-    Seal(String),
-    Encode(String),
-}
-
-impl fmt::Display for PinError {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        match self {
-            PinError::NotEncryptedSeal => write!(f, "pin requires an encrypted seal"),
-            PinError::BadPayload => write!(f, "the seal payload does not open"),
-            PinError::Unverifiable => write!(f, "the entry would not verify"),
-            PinError::Unreadable => {
-                write!(f, "refusing to publish a pin list this client cannot read")
-            }
-            PinError::TooManyEntries => write!(f, "pin list exceeds {PIN_MAX_ENTRIES} entries"),
-            PinError::Oversize(len) => {
-                write!(
-                    f,
-                    "pin list content is {len} bytes (cap {PIN_MAX_CONTENT_BYTES})"
-                )
-            }
-            PinError::Seal(error) => write!(f, "seal: {error}"),
-            PinError::Encode(error) => write!(f, "encode: {error}"),
-        }
-    }
-}
-
-impl std::error::Error for PinError {}
-
-#[derive(Clone, Copy, PartialEq, Eq)]
-pub struct MessageKeys {
-    chacha_key: [u8; 32],
-    chacha_nonce: [u8; 12],
-    hmac_key: [u8; 32],
-}
-
-impl MessageKeys {
-    pub fn to_hex(&self) -> String {
-        let mut packed = [0u8; MESSAGE_KEYS_BYTES];
-        packed[0..32].copy_from_slice(&self.chacha_key);
-        packed[32..44].copy_from_slice(&self.chacha_nonce);
-        packed[44..76].copy_from_slice(&self.hmac_key);
-        HEXLOWER.encode(&packed)
-    }
-
-    pub fn from_hex(value: &str) -> Option<Self> {
-        let bytes = decode_hex_lower::<MESSAGE_KEYS_BYTES>(value).ok()?;
-
-        Some(Self {
-            chacha_key: bytes[0..32].try_into().ok()?,
-            chacha_nonce: bytes[32..44].try_into().ok()?,
-            hmac_key: bytes[44..76].try_into().ok()?,
-        })
-    }
-
-    fn derive(conversation_key: &[u8; 32], nonce: &[u8]) -> Option<Self> {
-        let hkdf = Hkdf::<Sha256>::from_prk(conversation_key).ok()?;
-        let mut key_material = [0u8; MESSAGE_KEYS_BYTES];
-        hkdf.expand(nonce, &mut key_material).ok()?;
-
-        Some(Self {
-            chacha_key: key_material[0..32].try_into().ok()?,
-            chacha_nonce: key_material[32..44].try_into().ok()?,
-            hmac_key: key_material[44..76].try_into().ok()?,
-        })
-    }
-}
-
-struct Payload {
-    nonce: [u8; 32],
-    ciphertext: Vec<u8>,
-    mac: [u8; 32],
-}
-
-fn decode_payload(payload: &str) -> Option<Payload> {
-    let data = BASE64.decode(payload.as_bytes()).ok()?;
-
-    if data.len() < 99 || data[0] != 2 {
-        return None;
-    }
-
-    let mac_at = data.len() - 32;
-
-    Some(Payload {
-        nonce: data[1..33].try_into().ok()?,
-        ciphertext: data[33..mac_at].to_vec(),
-        mac: data[mac_at..].try_into().ok()?,
-    })
-}
-
-fn disclose_keys(payload: &str, conversation_key: &[u8; 32]) -> Option<MessageKeys> {
-    let decoded = decode_payload(payload)?;
-    MessageKeys::derive(conversation_key, &decoded.nonce)
-}
-
-fn open_payload(payload: &str, keys: &MessageKeys) -> Option<String> {
-    let decoded = decode_payload(payload)?;
-
-    let mut mac = Hmac::<Sha256>::new_from_slice(&keys.hmac_key).ok()?;
-    mac.update(&decoded.nonce);
-    mac.update(&decoded.ciphertext);
-    mac.verify_slice(&decoded.mac).ok()?;
-
-    let mut padded = decoded.ciphertext;
-    let mut cipher = ChaCha20::new((&keys.chacha_key).into(), (&keys.chacha_nonce).into());
-    cipher.apply_keystream(&mut padded);
-
-    unpad(&padded)
-}
-
-fn unpad(padded: &[u8]) -> Option<String> {
-    let (len, prefix) = plaintext_length(padded)?;
-    let unpadded = padded.get(prefix..prefix.checked_add(len)?)?;
-
-    if len < 1 || padded.len() != prefix.checked_add(padded_len(len)?)? {
-        return None;
-    }
-
-    String::from_utf8(unpadded.to_vec()).ok()
-}
-
-fn plaintext_length(padded: &[u8]) -> Option<(usize, usize)> {
-    let short = u16::from_be_bytes(padded.get(..2)?.try_into().ok()?);
-
-    if short != 0 {
-        return Some((short as usize, 2));
-    }
-
-    let long = u32::from_be_bytes(padded.get(2..6)?.try_into().ok()?);
-
-    if long < 65_536 {
-        return None;
-    }
-
-    Some((long as usize, 6))
-}
-
-fn padded_len(len: usize) -> Option<usize> {
-    if len < 1 {
-        return None;
-    }
-
-    if len <= 32 {
-        return Some(32);
-    }
-
-    let next_power = 1usize.checked_shl(usize::BITS - (len - 1).leading_zeros())?;
-    let chunk = if next_power <= 256 {
-        32
-    } else {
-        next_power / 8
-    };
-
-    Some(chunk * ((len - 1) / chunk + 1))
-}
-
-#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
-pub struct PinEditBundle {
-    pub seal: Event,
-    pub keys: String,
-}
-
-#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
-pub struct PinEntry {
-    pub seal: Event,
-    pub keys: String,
-    /// An unverifiable locator hint; a mismatch is expected and never fatal.
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub wrap: Option<String>,
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub edit: Option<PinEditBundle>,
-    #[serde(flatten)]
-    pub extra: Extra,
-}
-
-#[derive(Debug, Clone, PartialEq, Eq)]
-pub struct EditedContent {
-    pub content: String,
-    pub at_ms: u64,
-}
-
-#[derive(Debug, Clone)]
-pub struct VerifiedPin {
-    pub rumor_id: EventId,
-    pub author: PublicKey,
-    pub kind: u16,
-    pub content: String,
-    pub tags: Tags,
-    pub epoch: Epoch,
-    pub at_ms: u64,
-    pub created_at: u64,
-    pub wrap: Option<String>,
-    pub edited: Option<EditedContent>,
-    pub entry: PinEntry,
-}
-
-#[derive(Debug, Clone, Default)]
-pub struct ReadPinList {
-    pub entries: Vec<PinEntry>,
-    pub sealed: bool,
-}
-
-pub fn build_entry(
-    opened: &OpenedStream,
-    group: &GroupKey,
-    channel: &ChannelId,
-) -> Result<PinEntry, PinError> {
-    let keys = disclosed_keys(opened, group)?;
-
-    let entry = PinEntry {
-        seal: opened.seal.clone(),
-        keys: keys.to_hex(),
-        wrap: Some(opened.wrapper_id.to_hex()),
-        edit: None,
-        extra: Extra::default(),
-    };
-
-    if verify_entry(&entry, channel).is_none() {
-        return Err(PinError::Unverifiable);
-    }
-
-    Ok(entry)
-}
-
-pub fn build_edit_bundle(
-    edit: &OpenedStream,
-    group: &GroupKey,
-    original: &VerifiedPin,
-    channel: &ChannelId,
-) -> Result<PinEditBundle, PinError> {
-    let bundle = PinEditBundle {
-        seal: edit.seal.clone(),
-        keys: disclosed_keys(edit, group)?.to_hex(),
-    };
-
-    if verify_edit_bundle(&bundle, &original.author, &original.rumor_id, channel).is_none() {
-        return Err(PinError::Unverifiable);
-    }
-
-    Ok(bundle)
-}
-
-pub fn with_proven_edit(
-    entry: &PinEntry,
-    edit: &OpenedStream,
-    group: &GroupKey,
-    channel: &ChannelId,
-) -> PinEntry {
-    let Some(original) = verify_entry(entry, channel) else {
-        return entry.clone();
-    };
-
-    let Ok(bundle) = build_edit_bundle(edit, group, &original, channel) else {
-        return entry.clone();
-    };
-
-    let mut refreshed = entry.clone();
-    refreshed.edit = Some(bundle);
-    refreshed
-}
-
-fn disclosed_keys(opened: &OpenedStream, group: &GroupKey) -> Result<MessageKeys, PinError> {
-    if opened.seal_form != SealForm::Encrypted {
-        return Err(PinError::NotEncryptedSeal);
-    }
-
-    let conversation: [u8; 32] = group
-        .conversation()
-        .as_bytes()
-        .try_into()
-        .map_err(|_| PinError::BadPayload)?;
-
-    let keys = disclose_keys(&opened.seal.content, &conversation).ok_or(PinError::BadPayload)?;
-
-    if open_payload(&opened.seal.content, &keys).is_none() {
-        return Err(PinError::BadPayload);
-    }
-
-    Ok(keys)
-}
-
-pub fn verify_entry(entry: &PinEntry, channel: &ChannelId) -> Option<VerifiedPin> {
-    let seal = &entry.seal;
-
-    if seal.kind.as_u16() != cord01::KIND_SEAL_ENCRYPTED || seal.verify().is_err() {
-        return None;
-    }
-
-    let keys = MessageKeys::from_hex(&entry.keys)?;
-    let plaintext = open_payload(&seal.content, &keys)?;
-    let rumor = UnsignedEvent::from_json(&plaintext).ok()?;
-
-    // NIP-59's impersonation check: the renderer shows the rumor's fields.
-    if rumor.pubkey != seal.pubkey {
-        return None;
-    }
-
-    let kind = rumor.kind.as_u16();
-
-    if kind != KIND_MESSAGE && kind != KIND_COMMENT {
-        return None;
-    }
-
-    // CORD-01's binding, restated: a keyholder must not pin a message into another Channel's list.
-    if tag_value(&rumor, TAG_CHANNEL)? != channel.to_hex() {
-        return None;
-    }
-
-    let epoch = Epoch(canonical_decimal(tag_value(&rumor, TAG_EPOCH)?)?);
-
-    // Recomputed from the decrypted bytes; a claimed `id` is never trusted.
-    rumor.verify_id().ok()?;
-    let rumor_id = rumor.compute_id();
-
-    let edited = entry
-        .edit
-        .as_ref()
-        .and_then(|bundle| verify_edit_bundle(bundle, &rumor.pubkey, &rumor_id, channel));
-
-    Some(VerifiedPin {
-        author: rumor.pubkey,
-        content: edited
-            .as_ref()
-            .map_or_else(|| rumor.content.clone(), |edited| edited.content.clone()),
-        epoch,
-        at_ms: resolve_ms_strict(&rumor).ok()?,
-        created_at: rumor.created_at.as_secs(),
-        tags: rumor.tags.clone(),
-        wrap: entry.wrap.clone(),
-        edited,
-        entry: entry.clone(),
-        kind,
-        rumor_id,
-    })
-}
-
-fn verify_edit_bundle(
-    bundle: &PinEditBundle,
-    original_author: &PublicKey,
-    original_id: &EventId,
-    channel: &ChannelId,
-) -> Option<EditedContent> {
-    let seal = &bundle.seal;
-
-    // Checkable before any crypto: nobody else may revise another member's words.
-    if seal.kind.as_u16() != cord01::KIND_SEAL_ENCRYPTED || seal.pubkey != *original_author {
-        return None;
-    }
-
-    if seal.verify().is_err() {
-        return None;
-    }
-
-    let keys = MessageKeys::from_hex(&bundle.keys)?;
-    let plaintext = open_payload(&seal.content, &keys)?;
-    let rumor = UnsignedEvent::from_json(&plaintext).ok()?;
-
-    if rumor.pubkey != seal.pubkey || rumor.kind.as_u16() != KIND_EDIT {
-        return None;
-    }
-
-    if tag_value(&rumor, TAG_CHANNEL)? != channel.to_hex() {
-        return None;
-    }
-
-    if tag_value(&rumor, TAG_TARGET)? != original_id.to_hex() {
-        return None;
-    }
-
-    rumor.verify_id().ok()?;
-
-    Some(EditedContent {
-        content: rumor.content.clone(),
-        at_ms: resolve_ms_strict(&rumor).ok()?,
-    })
-}
-
-fn tag_value<'a>(rumor: &'a UnsignedEvent, name: &str) -> Option<&'a str> {
-    rumor
-        .tags
-        .iter()
-        .find(|tag| tag.as_slice().first().map(String::as_str) == Some(name))
-        .and_then(|tag| tag.as_slice().get(1))
-        .map(String::as_str)
-}
-
-#[derive(Serialize, Deserialize)]
-struct PlainForm {
-    entries: Vec<PinEntry>,
-}
-
-pub fn publishable(
-    read: &ReadPinList,
-    private: bool,
-    group: &GroupKey,
-    epoch: Epoch,
-) -> Result<String, PinError> {
-    if read.sealed {
-        return Err(PinError::Unreadable);
-    }
-
-    if private {
-        serialize_sealed(&read.entries, group, epoch)
-    } else {
-        serialize_public(&read.entries)
-    }
-}
-
-fn serialize_public(entries: &[PinEntry]) -> Result<String, PinError> {
-    let content = encode_form(entries)?;
-    check_caps(entries.len(), &content)?;
-
-    Ok(content)
-}
-
-fn serialize_sealed(
-    entries: &[PinEntry],
-    group: &GroupKey,
-    epoch: Epoch,
-) -> Result<String, PinError> {
-    if entries.len() > PIN_MAX_ENTRIES {
-        return Err(PinError::TooManyEntries);
-    }
-
-    let inner = encode_form(entries)?;
-    let sealed = cord01::seal_bytes(group.conversation(), inner.as_bytes())
-        .map_err(|error| PinError::Seal(error.to_string()))?;
-    let content = serde_json::json!({ "epoch": epoch.to_string(), "sealed": sealed }).to_string();
-
-    check_caps(entries.len(), &content)?;
-
-    Ok(content)
-}
-
-fn encode_form(entries: &[PinEntry]) -> Result<String, PinError> {
-    serde_json::to_string(&PlainForm {
-        entries: entries.to_vec(),
-    })
-    .map_err(|error| PinError::Encode(error.to_string()))
-}
-
-fn check_caps(count: usize, content: &str) -> Result<(), PinError> {
-    if count > PIN_MAX_ENTRIES {
-        return Err(PinError::TooManyEntries);
-    }
-
-    if content.len() > PIN_MAX_CONTENT_BYTES {
-        return Err(PinError::Oversize(content.len()));
-    }
-
-    Ok(())
-}
-
-pub fn read_list(content: &str, unseal: impl Fn(Epoch) -> Option<GroupKey>) -> ReadPinList {
-    const EMPTY: ReadPinList = ReadPinList {
-        entries: Vec::new(),
-        sealed: false,
-    };
-
-    if content.len() > PIN_MAX_CONTENT_BYTES {
-        return EMPTY;
-    }
-
-    let Ok(value) = serde_json::from_str::<serde_json::Value>(content) else {
-        return EMPTY;
-    };
-
-    if value.get("entries").is_some() {
-        return match serde_json::from_value::<PlainForm>(value) {
-            Ok(form) if form.entries.len() <= PIN_MAX_ENTRIES => ReadPinList {
-                entries: form.entries,
-                sealed: false,
-            },
-            _ => EMPTY,
-        };
-    }
-
-    let (Some(epoch), Some(sealed)) = (
-        value.get("epoch").and_then(serde_json::Value::as_str),
-        value.get("sealed").and_then(serde_json::Value::as_str),
-    ) else {
-        return EMPTY;
-    };
-
-    let Some(epoch) = canonical_decimal(epoch) else {
-        return EMPTY;
-    };
-
-    let Some(group) = unseal(Epoch(epoch)) else {
-        return ReadPinList {
-            sealed: true,
-            ..EMPTY
-        };
-    };
-
-    let Ok(inner) = cord01::open_bytes(group.conversation(), sealed) else {
-        return EMPTY;
-    };
-
-    let Ok(form) = serde_json::from_slice::<PlainForm>(&inner) else {
-        return EMPTY;
-    };
-
-    if form.entries.len() > PIN_MAX_ENTRIES {
-        return EMPTY;
-    }
-
-    ReadPinList {
-        entries: form.entries,
-        sealed: false,
-    }
-}
-
-pub fn killed_by(pin: &VerifiedPin, delete: &ChatRumor) -> bool {
-    delete.author == pin.author
-        && matches!(&delete.action, ChatAction::Delete { target, .. } if *target == pin.rumor_id)
-}
-
-#[cfg(test)]
-mod tests {
-    use nostr::nips::nip44::v2::{self, ConversationKey};
-
-    use super::*;
-    use crate::cord03::{ChatRumor, build_delete, build_edit, build_message, open, seal_rumor};
-    use crate::derive::channel_group_key;
-
-    const AT_MS: u64 = 1_700_000_000_000;
-    const SECRET: [u8; 32] = [0x21u8; 32];
-
-    fn channel() -> ChannelId {
-        ChannelId::from_bytes([0xabu8; 32])
-    }
-
-    fn group() -> GroupKey {
-        channel_group_key(&SECRET, &channel(), Epoch(0)).expect("derives")
-    }
-
-    fn conversation() -> ConversationKey {
-        *group().conversation()
-    }
-
-    /// A real message through the production seal/open pipeline, as a pinner sees it.
-    fn sealed_message(author: &Keys, text: &str, at_ms: u64) -> (OpenedStream, ChatRumor) {
-        let rumor = build_message(
-            author.public_key(),
-            &channel(),
-            Epoch(0),
-            text,
-            None,
-            at_ms,
-            None,
-        );
-        let (wrap, _) = seal_rumor(&rumor, &group(), author, false).expect("seals");
-
-        open(&wrap, &group(), &channel(), Epoch(0)).expect("opens")
-    }
-
-    fn entry_for(author: &Keys, text: &str) -> (PinEntry, OpenedStream) {
-        let (opened, _) = sealed_message(author, text, AT_MS);
-        let entry = build_entry(&opened, &group(), &channel()).expect("builds");
-        (entry, opened)
-    }
-
-    fn some(entries: Vec<PinEntry>) -> ReadPinList {
-        ReadPinList {
-            entries,
-            sealed: false,
-        }
-    }
-
-    /// The load-bearing primitive: the reproduction must open what nostr's own
-    /// encryption produced, through the disclosure alone.
-    #[test]
-    fn a_disclosure_opens_its_message_and_nothing_else() {
-        let nonce = [0x5au8; 32];
-        let disclosure =
-            MessageKeys::derive(conversation().as_bytes().try_into().expect("32"), &nonce)
-                .expect("derives");
-
-        for text in ["a", "hello world", &"padding boundary ".repeat(40)] {
-            let raw = v2::encrypt_to_bytes_with_nonce(&conversation(), text.as_bytes(), nonce)
-                .expect("encrypts");
-            let payload = BASE64.encode(&raw);
-
-            assert_eq!(open_payload(&payload, &disclosure).as_deref(), Some(text));
-        }
-
-        // Another nonce discloses different keys, which open nothing else.
-        let other = v2::encrypt_to_bytes_with_nonce(&conversation(), b"second", [0x99u8; 32])
-            .expect("encrypts");
-        assert!(open_payload(&BASE64.encode(&other), &disclosure).is_none());
-
-        let hex = disclosure.to_hex();
-        assert_eq!(
-            MessageKeys::from_hex(&hex).map(|keys| keys.to_hex()),
-            Some(hex.clone())
-        );
-        assert!(MessageKeys::from_hex(&hex.to_uppercase()).is_none());
-    }
-
-    #[test]
-    fn a_built_entry_proves_its_author_and_cannot_cross_channels() {
-        let author = Keys::generate();
-        let (entry, opened) = entry_for(&author, "pin me");
-        let verified = verify_entry(&entry, &channel()).expect("verifies");
-
-        assert_eq!(verified.author, author.public_key());
-        assert_eq!(verified.content, "pin me");
-        assert_eq!(verified.rumor_id, opened.rumor_id);
-        assert_eq!(verified.at_ms, AT_MS);
-        assert_eq!(verified.epoch, Epoch(0));
-
-        // A keyholder must not be able to pin channel X's message into Y's list.
-        let foreign = ChannelId::from_bytes([0xcdu8; 32]);
-        assert!(verify_entry(&entry, &foreign).is_none());
-
-        // Tampered keys and a re-signed seal both fail.
-        let mut bad_keys = entry.clone();
-        bad_keys.keys = format!("00{}", &entry.keys[2..]);
-        assert!(verify_entry(&bad_keys, &channel()).is_none());
-
-        let mut forged = entry.clone();
-        forged.seal.pubkey = Keys::generate().public_key();
-        assert!(verify_entry(&forged, &channel()).is_none());
-
-        // A rumor carrying a claimed id that is not its own is refused.
-        let plaintext = cord01::open_bytes(&conversation(), &opened.seal.content).expect("opens");
-        let mut value: serde_json::Value = serde_json::from_slice(&plaintext).expect("json");
-        value["id"] = serde_json::Value::String("00".repeat(32));
-
-        let raw = v2::encrypt_to_bytes_with_nonce(
-            &conversation(),
-            value.to_string().as_bytes(),
-            [0x11u8; 32],
-        )
-        .expect("encrypts");
-        let content = BASE64.encode(&raw);
-        let seal = EventBuilder::new(Kind::Custom(cord01::KIND_SEAL_ENCRYPTED), &content)
-            .custom_created_at(opened.seal.created_at)
-            .finalize(&author)
-            .expect("signs");
-
-        let lying = PinEntry {
-            keys: disclose_keys(&content, conversation().as_bytes().try_into().expect("32"))
-                .expect("discloses")
-                .to_hex(),
-            seal,
-            wrap: None,
-            edit: None,
-            extra: Extra::default(),
-        };
-        assert!(verify_entry(&lying, &channel()).is_none());
-    }
-
-    #[test]
-    fn a_proven_edit_replaces_the_words_and_a_stranger_cannot_revise() {
-        let author = Keys::generate();
-        let (entry, original) = entry_for(&author, "teh typo");
-
-        let edit = build_edit(
-            author.public_key(),
-            &channel(),
-            Epoch(0),
-            original.rumor_id,
-            "the typo, fixed",
-            AT_MS + 5_000,
-            None,
-        );
-        let (wrap, _) = seal_rumor(&edit, &group(), &author, false).expect("seals");
-        let (edit_opened, _) = open(&wrap, &group(), &channel(), Epoch(0)).expect("opens");
-
-        let refreshed = with_proven_edit(&entry, &edit_opened, &group(), &channel());
-        let verified = verify_entry(&refreshed, &channel()).expect("verifies");
-        assert_eq!(verified.content, "the typo, fixed");
-        assert_eq!(verified.edited.expect("edited").at_ms, AT_MS + 5_000);
-
-        // A stranger's edit of the same message never attaches.
-        let stranger = Keys::generate();
-        let hijack = build_edit(
-            stranger.public_key(),
-            &channel(),
-            Epoch(0),
-            original.rumor_id,
-            "hijacked",
-            AT_MS + 6_000,
-            None,
-        );
-        let (wrap, _) = seal_rumor(&hijack, &group(), &stranger, false).expect("seals");
-        let (hijack_opened, _) = open(&wrap, &group(), &channel(), Epoch(0)).expect("opens");
-
-        let unchanged = with_proven_edit(&entry, &hijack_opened, &group(), &channel());
-        assert!(unchanged.edit.is_none());
-    }
-
-    #[test]
-    fn both_list_forms_round_trip_and_obey_their_caps() {
-        let author = Keys::generate();
-        let (entry, _) = entry_for(&author, "hello");
-
-        let public =
-            publishable(&some(vec![entry.clone()]), false, &group(), Epoch(0)).expect("publishes");
-        let read = read_list(&public, |_| None);
-        assert!(!read.sealed);
-        assert_eq!(read.entries.len(), 1);
-        assert!(verify_entry(&read.entries[0], &channel()).is_some());
-
-        // A sealed list stays dark without its key, lights with it, and a wrong
-        // key reads empty rather than panicking.
-        let at_epoch_4 = channel_group_key(&SECRET, &channel(), Epoch(4)).expect("derives");
-        let sealed = publishable(&some(vec![entry.clone()]), true, &at_epoch_4, Epoch(4))
-            .expect("publishes");
-
-        let dark = read_list(&sealed, |_| None);
-        assert!(dark.sealed && dark.entries.is_empty());
-
-        let lit = read_list(&sealed, |epoch| {
-            (epoch == Epoch(4))
-                .then(|| channel_group_key(&SECRET, &channel(), Epoch(4)).expect("derives"))
-        });
-        assert!(!lit.sealed);
-        assert!(verify_entry(&lit.entries[0], &channel()).is_some());
-
-        assert!(read_list(&sealed, |_| Some(group())).entries.is_empty());
-
-        // 26 entries: the writer refuses, and a hand-built violating edition
-        // reads as empty rather than forking the chain.
-        let many = vec![entry; PIN_MAX_ENTRIES + 1];
-        assert_eq!(
-            publishable(&some(many.clone()), false, &group(), Epoch(0)),
-            Err(PinError::TooManyEntries)
-        );
-        let violating = serde_json::json!({ "entries": many }).to_string();
-        assert!(read_list(&violating, |_| None).entries.is_empty());
-
-        // Garbage never panics and never reads as a list.
-        for bad in [
-            "",
-            "not json",
-            "[]",
-            "42",
-            r#"{"entries": 7}"#,
-            r#"{"epoch":"04","sealed":"y"}"#,
-        ] {
-            let read = read_list(bad, |_| None);
-            assert!(read.entries.is_empty() && !read.sealed, "{bad}");
-        }
-    }
-
-    #[test]
-    fn a_dark_list_is_never_reformed_and_only_the_author_kills_a_pin() {
-        let author = Keys::generate();
-        let (entry, _) = entry_for(&author, "delete me later");
-
-        let dark = ReadPinList {
-            entries: vec![entry.clone()],
-            sealed: true,
-        };
-        assert_eq!(
-            publishable(&dark, false, &group(), Epoch(0)),
-            Err(PinError::Unreadable)
-        );
-
-        let verified = verify_entry(&entry, &channel()).expect("verifies");
-
-        for author_keys in [&author, &Keys::generate()] {
-            let delete = build_delete(
-                author_keys.public_key(),
-                &channel(),
-                Epoch(0),
-                verified.rumor_id,
-                Some(KIND_MESSAGE),
-                None,
-                AT_MS + 1_000,
-            );
-            let (wrap, _) = seal_rumor(&delete, &group(), author_keys, false).expect("seals");
-            let (_, rumor) = open(&wrap, &group(), &channel(), Epoch(0)).expect("opens");
-
-            assert_eq!(
-                killed_by(&verified, &rumor),
-                author_keys.public_key() == author.public_key()
-            );
-        }
-    }
-}

crates/concord/src/cords/cord05.rs

@@ -1,954 +0,0 @@
-use std::collections::BTreeMap;
-use std::collections::btree_map::Entry;
-use std::fmt;
-
-use data_encoding::BASE64URL_NOPAD;
-use nostr::nips::nip01::Coordinate;
-use nostr::nips::nip19::{Nip19, Nip19Coordinate};
-use nostr::nips::nip44::v2::ConversationKey;
-use nostr::nips::nip59::{GiftWrapBuilder, UnwrappedGift};
-use nostr_sdk::prelude::*;
-use serde::{Deserialize, Serialize};
-
-use crate::cord01::{self, NIP44_MAX_PLAINTEXT, StreamError};
-use crate::cord02::list::{canonical, union};
-use crate::cord02::{ImageRef, MAX_RELAYS};
-use crate::cord04::{TAG_SUBKIND, vsk};
-use crate::derive::{TOKEN_LEN, verify_community_id};
-use crate::{ChannelId, CommunityId, Epoch, Extra, decode_hex_32};
-
-pub const KIND_BUNDLE: u16 = 33301;
-pub const KIND_INVITE_LIST: u16 = 13303;
-pub const KIND_DIRECT_INVITE: u16 = 3313;
-pub const FRAGMENT_VERSION: u8 = 4;
-pub const MAX_BUNDLE_CHANNELS: usize = 256;
-pub const MAX_BOOTSTRAP_RELAYS: usize = 3;
-pub const MAX_BUNDLE_EPOCH: u64 = 1 << 40;
-pub const MAX_INVITE_ENTRIES: usize = 64;
-
-const FLAG_STOCK_SET: u8 = 0x01;
-const INVITE_PATH: &str = "/invite/";
-const TAG_IDENTIFIER: &str = "d";
-const TAG_EXPIRATION: &str = "expiration";
-
-const RELAY_DICT: [&str; 4] = [
-    "wss://jskitty.com/nostr",
-    "wss://asia.vectorapp.io/nostr",
-    "wss://relay.ditto.pub",
-    "wss://relay.dreamith.to",
-];
-
-#[derive(Debug)]
-pub enum InviteError {
-    Stream(StreamError),
-    Json(String),
-    BadHex(&'static str),
-    TooManyChannels(usize),
-    TooManyInvites(usize),
-    Oversize(usize),
-    Kind(u16),
-    EpochTooLarge(u64),
-    OwnerMismatch,
-    BadFragment(&'static str),
-    BadVersion(u8),
-    BadLink(&'static str),
-    BadEvent(&'static str),
-    Crypto(String),
-}
-
-impl fmt::Display for InviteError {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        match self {
-            InviteError::Stream(error) => write!(f, "stream: {error}"),
-            InviteError::Json(error) => write!(f, "json: {error}"),
-            InviteError::BadHex(field) => write!(f, "{field} is not 32-byte lowercase hex"),
-            InviteError::TooManyChannels(count) => {
-                write!(
-                    f,
-                    "bundle carries {count} channels (cap {MAX_BUNDLE_CHANNELS})"
-                )
-            }
-            InviteError::TooManyInvites(count) => {
-                write!(
-                    f,
-                    "invite list carries {count} entries (cap {MAX_INVITE_ENTRIES})"
-                )
-            }
-            InviteError::Oversize(len) => {
-                write!(f, "invite list is {len} bytes (cap {NIP44_MAX_PLAINTEXT})")
-            }
-            InviteError::Kind(kind) => write!(f, "not an invite list kind: {kind}"),
-            InviteError::EpochTooLarge(epoch) => write!(f, "epoch {epoch} out of range"),
-            InviteError::OwnerMismatch => {
-                write!(f, "bundle owner does not reproduce its community_id")
-            }
-            InviteError::BadFragment(why) => write!(f, "bad invite fragment: {why}"),
-            InviteError::BadVersion(version) => {
-                write!(f, "unsupported invite fragment version {version}")
-            }
-            InviteError::BadLink(why) => write!(f, "bad invite link: {why}"),
-            InviteError::BadEvent(why) => write!(f, "bad invite bundle event: {why}"),
-            InviteError::Crypto(error) => write!(f, "crypto: {error}"),
-        }
-    }
-}
-
-impl std::error::Error for InviteError {}
-
-impl From<StreamError> for InviteError {
-    fn from(error: StreamError) -> Self {
-        InviteError::Stream(error)
-    }
-}
-
-#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
-pub struct ChannelGrant {
-    pub id: ChannelId,
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub key: Option<String>,
-    pub epoch: Epoch,
-    #[serde(default)]
-    pub name: String,
-    #[serde(flatten)]
-    pub extra: Extra,
-}
-
-#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
-pub struct CommunityInvite {
-    pub community_id: CommunityId,
-    pub owner: PublicKey,
-    pub owner_salt: String,
-    pub community_root: String,
-    pub root_epoch: Epoch,
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub control_pk: Option<PublicKey>,
-    #[serde(default, skip_serializing_if = "Vec::is_empty")]
-    pub channels: Vec<ChannelGrant>,
-    #[serde(default, skip_serializing_if = "Vec::is_empty")]
-    pub relays: Vec<String>,
-    pub name: String,
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub icon: Option<ImageRef>,
-    /// Unix **ms**: past it the preview still renders, joining refuses.
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub expires_at: Option<u64>,
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub creator_npub: Option<PublicKey>,
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub label: Option<String>,
-    #[serde(flatten)]
-    pub extra: Extra,
-}
-
-impl CommunityInvite {
-    pub fn from_bundle_json(json: &str) -> Result<Self, InviteError> {
-        let mut invite: Self =
-            serde_json::from_str(json).map_err(|error| InviteError::Json(error.to_string()))?;
-
-        if invite.channels.len() > MAX_BUNDLE_CHANNELS {
-            return Err(InviteError::TooManyChannels(invite.channels.len()));
-        }
-
-        invite.relays.truncate(MAX_RELAYS);
-        invite.validate()?;
-
-        Ok(invite)
-    }
-
-    pub fn validate(&self) -> Result<(), InviteError> {
-        if self.channels.len() > MAX_BUNDLE_CHANNELS {
-            return Err(InviteError::TooManyChannels(self.channels.len()));
-        }
-
-        for epoch in std::iter::once(self.root_epoch).chain(self.channels.iter().map(|c| c.epoch)) {
-            if epoch.0 > MAX_BUNDLE_EPOCH {
-                return Err(InviteError::EpochTooLarge(epoch.0));
-            }
-        }
-
-        let owner_salt = hex32(&self.owner_salt, "owner_salt")?;
-        hex32(&self.community_root, "community_root")?;
-
-        for channel in &self.channels {
-            if let Some(key) = &channel.key {
-                hex32(key, "channel key")?;
-            }
-        }
-
-        if !verify_community_id(&self.community_id, &self.owner.to_bytes(), &owner_salt) {
-            return Err(InviteError::OwnerMismatch);
-        }
-
-        Ok(())
-    }
-
-    pub fn expired(&self, now_ms: u64) -> bool {
-        self.expires_at.is_some_and(|expires| now_ms > expires)
-    }
-}
-
-#[derive(Debug, Clone)]
-pub enum BundleState {
-    Live(Box<CommunityInvite>),
-    Revoked,
-}
-
-pub fn build_bundle_event(
-    link_signer: &Keys,
-    invite: &CommunityInvite,
-    bundle_key: &[u8; 32],
-) -> Result<Event, InviteError> {
-    invite.validate()?;
-
-    let json = serde_json::to_string(invite).map_err(json_error)?;
-    let content = seal_bundle(bundle_key, &json)?;
-
-    EventBuilder::new(Kind::Custom(KIND_BUNDLE), content)
-        .tags([empty_identifier(), subkind_tag(vsk::INVITE_LIVE)])
-        .finalize(link_signer)
-        .map_err(crypto_error)
-}
-
-pub fn build_revocation(link_signer: &Keys) -> Result<Event, InviteError> {
-    EventBuilder::new(Kind::Custom(KIND_BUNDLE), "")
-        .tags([empty_identifier(), subkind_tag(vsk::INVITE_REVOKED)])
-        .finalize(link_signer)
-        .map_err(crypto_error)
-}
-
-pub fn parse_bundle_event(
-    event: &Event,
-    expected_signer: &PublicKey,
-    bundle_key: &[u8; 32],
-) -> Result<BundleState, InviteError> {
-    if event.kind.as_u16() != KIND_BUNDLE {
-        return Err(InviteError::BadEvent("wrong kind"));
-    }
-
-    if event.pubkey != *expected_signer {
-        return Err(InviteError::BadEvent("author is not the link signer"));
-    }
-
-    if first_tag(event, TAG_IDENTIFIER).is_some_and(|identifier| !identifier.is_empty()) {
-        return Err(InviteError::BadEvent(
-            "bundle is not at the link's coordinate",
-        ));
-    }
-
-    event
-        .verify()
-        .map_err(|_| InviteError::BadEvent("signature invalid"))?;
-
-    match first_tag(event, TAG_SUBKIND).as_deref() {
-        Some(vsk::INVITE_REVOKED) => return Ok(BundleState::Revoked),
-        Some(vsk::INVITE_LIVE) => {}
-        _ => return Err(InviteError::BadEvent("unknown or missing bundle marker")),
-    }
-
-    let json = open_bundle(bundle_key, &event.content)?;
-
-    Ok(BundleState::Live(Box::new(
-        CommunityInvite::from_bundle_json(&json)?,
-    )))
-}
-
-pub fn stock_relays() -> Vec<String> {
-    RELAY_DICT.iter().map(|relay| relay.to_string()).collect()
-}
-
-pub fn encode_fragment(token: &[u8; TOKEN_LEN], relays: &[String]) -> Result<String, InviteError> {
-    let stock = relays == RELAY_DICT;
-
-    let mut bytes = Vec::with_capacity(2 + TOKEN_LEN + relays.len() * 8);
-    bytes.push(FRAGMENT_VERSION);
-
-    if stock {
-        bytes.push(FLAG_STOCK_SET);
-    } else {
-        bytes.push(0x00);
-
-        let bounded = &relays[..relays.len().min(MAX_BOOTSTRAP_RELAYS)];
-        bytes.push(bounded.len() as u8);
-
-        for relay in bounded {
-            match dict_id(relay) {
-                Some(id) => bytes.push(id),
-                None => {
-                    let (lead, literal) = match relay.strip_prefix("wss://") {
-                        Some(host) => (0x00, host),
-                        None => (0xff, relay.as_str()),
-                    };
-
-                    if literal.len() > u8::MAX as usize {
-                        return Err(InviteError::BadFragment("relay too long"));
-                    }
-
-                    bytes.extend_from_slice(&[lead, literal.len() as u8]);
-                    bytes.extend_from_slice(literal.as_bytes());
-                }
-            }
-        }
-    }
-
-    bytes.extend_from_slice(token);
-
-    Ok(BASE64URL_NOPAD.encode(&bytes))
-}
-
-pub fn decode_fragment(fragment: &str) -> Result<([u8; TOKEN_LEN], Vec<String>), InviteError> {
-    let bytes = BASE64URL_NOPAD
-        .decode(fragment.trim().as_bytes())
-        .map_err(|_| InviteError::BadFragment("not base64url"))?;
-
-    let version = *bytes.first().ok_or(InviteError::BadFragment("truncated"))?;
-
-    if version != FRAGMENT_VERSION {
-        return Err(InviteError::BadVersion(version));
-    }
-
-    let flags = *bytes.get(1).ok_or(InviteError::BadFragment("truncated"))?;
-
-    let mut offset = 2;
-    let mut relays = Vec::new();
-
-    if flags & FLAG_STOCK_SET != 0 {
-        relays = stock_relays();
-    } else {
-        let count = *bytes
-            .get(offset)
-            .ok_or(InviteError::BadFragment("truncated"))? as usize;
-        offset += 1;
-
-        if count > MAX_BOOTSTRAP_RELAYS {
-            return Err(InviteError::BadFragment("too many bootstrap relays"));
-        }
-
-        for _ in 0..count {
-            let lead = *bytes
-                .get(offset)
-                .ok_or(InviteError::BadFragment("truncated"))?;
-            offset += 1;
-
-            if (1..=254).contains(&lead) {
-                if let Some(url) = dict_url(lead) {
-                    relays.push(url.to_string());
-                }
-
-                continue;
-            }
-
-            let len = *bytes
-                .get(offset)
-                .ok_or(InviteError::BadFragment("truncated"))? as usize;
-            offset += 1;
-
-            let end = offset
-                .checked_add(len)
-                .ok_or(InviteError::BadFragment("truncated"))?;
-
-            let raw = bytes
-                .get(offset..end)
-                .ok_or(InviteError::BadFragment("truncated"))?;
-
-            let text = std::str::from_utf8(raw)
-                .map_err(|_| InviteError::BadFragment("relay is not utf8"))?;
-
-            relays.push(match lead {
-                0x00 => format!("wss://{text}"),
-                0xff => text.to_string(),
-                _ => return Err(InviteError::BadFragment("unknown relay lead byte")),
-            });
-
-            offset = end;
-        }
-    }
-
-    let end = offset
-        .checked_add(TOKEN_LEN)
-        .ok_or(InviteError::BadFragment("truncated"))?;
-
-    let raw = bytes
-        .get(offset..end)
-        .ok_or(InviteError::BadFragment("truncated"))?;
-
-    if end != bytes.len() {
-        return Err(InviteError::BadFragment("trailing bytes"));
-    }
-
-    let mut token = [0u8; TOKEN_LEN];
-    token.copy_from_slice(raw);
-
-    Ok((token, relays))
-}
-
-pub fn bundle_naddr(link_signer: &PublicKey) -> Result<String, InviteError> {
-    let coordinate = Coordinate {
-        kind: Kind::Custom(KIND_BUNDLE),
-        public_key: *link_signer,
-        identifier: String::new(),
-    };
-
-    Nip19::Coordinate(Nip19Coordinate {
-        coordinate,
-        relays: Vec::new(),
-    })
-    .to_bech32()
-    .map_err(|_| InviteError::BadLink("invalid naddr"))
-}
-
-pub fn build_invite_url(
-    base: &str,
-    link_signer: &PublicKey,
-    token: &[u8; TOKEN_LEN],
-    relays: &[String],
-) -> Result<String, InviteError> {
-    let naddr = bundle_naddr(link_signer)?;
-    let fragment = encode_fragment(token, relays)?;
-
-    Ok(format!(
-        "{}{INVITE_PATH}{naddr}#{fragment}",
-        base.trim_end_matches('/')
-    ))
-}
-
-#[derive(Debug, Clone)]
-pub struct ParsedInviteLink {
-    /// The bundle coordinate's author.
-    pub link_signer: PublicKey,
-    pub token: [u8; TOKEN_LEN],
-    pub bootstrap_relays: Vec<String>,
-    /// The bare naddr as it appeared in the link, for the fetch.
-    pub naddr: String,
-}
-
-pub fn parse_link(input: &str) -> Result<ParsedInviteLink, InviteError> {
-    let (locator, fragment) = input
-        .trim()
-        .split_once('#')
-        .ok_or(InviteError::BadLink("no fragment"))?;
-
-    if fragment.is_empty() {
-        return Err(InviteError::BadLink("empty fragment"));
-    }
-
-    let naddr = match locator.find(INVITE_PATH) {
-        Some(index) => locator[index + INVITE_PATH.len()..].trim_end_matches('/'),
-        None => locator.trim_start_matches("nostr:"),
-    };
-
-    let link_signer = signer_from_naddr(naddr)?;
-    let (token, bootstrap_relays) = decode_fragment(fragment)?;
-
-    Ok(ParsedInviteLink {
-        link_signer,
-        token,
-        bootstrap_relays,
-        naddr: naddr.to_string(),
-    })
-}
-
-pub fn build_direct_invite(
-    inviter: &Keys,
-    recipient: &PublicKey,
-    invite: &CommunityInvite,
-) -> Result<Event, InviteError> {
-    invite.validate()?;
-
-    let json = serde_json::to_string(invite).map_err(json_error)?;
-    let rumor = EventBuilder::new(Kind::Custom(KIND_DIRECT_INVITE), json)
-        .finalize_unsigned(inviter.public_key());
-
-    let mut tags = vec![Tag::custom("k", [KIND_DIRECT_INVITE.to_string()])];
-
-    if let Some(expires_at) = invite.expires_at {
-        tags.push(Tag::custom(
-            TAG_EXPIRATION,
-            [(expires_at / 1000).to_string()],
-        ));
-    }
-
-    GiftWrapBuilder::new(*recipient, rumor)
-        .extra_tags(tags)
-        .finalize(inviter)
-        .map_err(crypto_error)
-}
-
-pub fn unwrap_direct_invite(
-    wrap: &Event,
-    recipient: &Keys,
-) -> Result<(PublicKey, CommunityInvite), InviteError> {
-    let unwrapped = UnwrappedGift::from_gift_wrap(recipient, wrap).map_err(crypto_error)?;
-
-    if unwrapped.rumor.kind.as_u16() != KIND_DIRECT_INVITE {
-        return Err(InviteError::BadEvent("rumor is not a direct invite"));
-    }
-
-    Ok((
-        unwrapped.sender,
-        CommunityInvite::from_bundle_json(&unwrapped.rumor.content)?,
-    ))
-}
-
-#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
-pub struct InviteEntry {
-    /// The link's unlock secret, and its merge key.
-    pub token: String,
-    /// The `link_signer` secret: refreshing or retiring the bundle needs it.
-    pub signer_sk: String,
-    pub community_id: CommunityId,
-    pub url: String,
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub label: Option<String>,
-    pub created_at: u64,
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub expires_at: Option<u64>,
-    #[serde(flatten)]
-    pub extra: Extra,
-}
-
-#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
-pub struct InviteTombstone {
-    pub token: String,
-    pub community_id: CommunityId,
-    #[serde(flatten)]
-    pub extra: Extra,
-}
-
-/// A creator's own link bookkeeping.
-#[derive(Debug, Clone, Default, PartialEq, Serialize, Deserialize)]
-pub struct InviteList {
-    #[serde(default, skip_serializing_if = "Vec::is_empty")]
-    pub entries: Vec<InviteEntry>,
-    #[serde(default, skip_serializing_if = "Vec::is_empty")]
-    pub tombstones: Vec<InviteTombstone>,
-    #[serde(flatten)]
-    pub extra: Extra,
-}
-
-impl InviteList {
-    /// A tombstone beats an entry terminally, so a stale device can never resurrect a revoked link.
-    pub fn is_live(&self, token: &str) -> bool {
-        self.entries.iter().any(|entry| entry.token == token)
-            && !self
-                .tombstones
-                .iter()
-                .any(|tombstone| tombstone.token == token)
-    }
-
-    pub fn fits(&self) -> Result<(), InviteError> {
-        if self.entries.len() > MAX_INVITE_ENTRIES {
-            return Err(InviteError::TooManyInvites(self.entries.len()));
-        }
-
-        let json = serde_json::to_string(self).map_err(json_error)?;
-
-        if json.len() > NIP44_MAX_PLAINTEXT {
-            return Err(InviteError::Oversize(json.len()));
-        }
-
-        Ok(())
-    }
-}
-
-pub fn merge_invite_lists(held: InviteList, incoming: InviteList) -> InviteList {
-    let mut entries: BTreeMap<String, InviteEntry> = BTreeMap::new();
-
-    for entry in held.entries.into_iter().chain(incoming.entries) {
-        match entries.entry(entry.token.clone()) {
-            Entry::Vacant(slot) => {
-                slot.insert(entry);
-            }
-            Entry::Occupied(mut slot) => {
-                let merged = merge_entry(slot.get(), &entry);
-                *slot.get_mut() = merged;
-            }
-        }
-    }
-
-    let mut tombstones: BTreeMap<String, InviteTombstone> = BTreeMap::new();
-
-    for tombstone in held.tombstones.into_iter().chain(incoming.tombstones) {
-        match tombstones.entry(tombstone.token.clone()) {
-            Entry::Vacant(slot) => {
-                slot.insert(tombstone);
-            }
-            Entry::Occupied(mut slot) => {
-                if canonical(&tombstone) < canonical(slot.get()) {
-                    *slot.get_mut() = tombstone;
-                }
-            }
-        }
-    }
-
-    let mut extra = held.extra;
-    union(&mut extra, incoming.extra);
-
-    InviteList {
-        entries: entries.into_values().collect(),
-        tombstones: tombstones.into_values().collect(),
-        extra,
-    }
-}
-
-pub fn build_invite_list(keys: &Keys, list: &InviteList) -> Result<Event, InviteError> {
-    list.fits()?;
-
-    let json = serde_json::to_string(list).map_err(json_error)?;
-    let content = cord01::seal_to_self(keys, json.as_bytes())?;
-
-    EventBuilder::new(Kind::Custom(KIND_INVITE_LIST), content)
-        .finalize(keys)
-        .map_err(crypto_error)
-}
-
-pub fn parse_invite_list(keys: &Keys, event: &Event) -> Result<InviteList, InviteError> {
-    if event.kind.as_u16() != KIND_INVITE_LIST {
-        return Err(InviteError::Kind(event.kind.as_u16()));
-    }
-
-    let json = cord01::open_to_self(keys, &event.content)?;
-
-    serde_json::from_slice(&json).map_err(json_error)
-}
-
-/// An entry is immutable once minted, so two copies should agree.
-fn merge_entry(held: &InviteEntry, incoming: &InviteEntry) -> InviteEntry {
-    let (winner, loser) = if canonical(incoming) < canonical(held) {
-        (incoming, held)
-    } else {
-        (held, incoming)
-    };
-
-    let mut merged = winner.clone();
-    union(&mut merged.extra, loser.extra.clone());
-
-    merged
-}
-
-fn seal_bundle(bundle_key: &[u8; 32], json: &str) -> Result<String, InviteError> {
-    Ok(cord01::seal_bytes(
-        &ConversationKey::new(*bundle_key),
-        json.as_bytes(),
-    )?)
-}
-
-fn open_bundle(bundle_key: &[u8; 32], content: &str) -> Result<String, InviteError> {
-    let plaintext = cord01::open_bytes(&ConversationKey::new(*bundle_key), content)?;
-
-    String::from_utf8(plaintext).map_err(|_| InviteError::BadFragment("bundle is not utf8"))
-}
-
-fn signer_from_naddr(naddr: &str) -> Result<PublicKey, InviteError> {
-    match Nip19::from_bech32(naddr.trim_start_matches("nostr:")) {
-        Ok(Nip19::Coordinate(coordinate))
-            if coordinate.coordinate.kind.as_u16() == KIND_BUNDLE
-                && coordinate.coordinate.identifier.is_empty() =>
-        {
-            Ok(coordinate.coordinate.public_key)
-        }
-        _ => Err(InviteError::BadLink(
-            "naddr is not an invite-bundle coordinate",
-        )),
-    }
-}
-
-fn hex32(value: &str, field: &'static str) -> Result<[u8; 32], InviteError> {
-    decode_hex_32(value).map_err(|_| InviteError::BadHex(field))
-}
-
-fn dict_id(relay: &str) -> Option<u8> {
-    RELAY_DICT
-        .iter()
-        .position(|known| *known == relay)
-        .map(|index| index as u8 + 1)
-}
-
-fn dict_url(id: u8) -> Option<&'static str> {
-    RELAY_DICT.get(id.checked_sub(1)? as usize).copied()
-}
-
-fn empty_identifier() -> Tag {
-    Tag::identifier("")
-}
-
-fn subkind_tag(value: &str) -> Tag {
-    Tag::custom(TAG_SUBKIND, [value])
-}
-
-fn first_tag(event: &Event, name: &str) -> Option<String> {
-    event.tags.iter().find_map(|tag| {
-        let fields = tag.as_slice();
-
-        (fields.len() >= 2 && fields[0] == name).then(|| fields[1].clone())
-    })
-}
-
-fn json_error(error: serde_json::Error) -> InviteError {
-    InviteError::Json(error.to_string())
-}
-
-fn crypto_error(error: impl fmt::Display) -> InviteError {
-    InviteError::Crypto(error.to_string())
-}
-
-#[cfg(test)]
-mod tests {
-    use data_encoding::HEXLOWER;
-
-    use super::*;
-    use crate::derive::{community_id_of, invite_bundle_key};
-
-    const SALT: [u8; 32] = [0x33u8; 32];
-
-    fn bundle() -> CommunityInvite {
-        let owner = Keys::generate();
-
-        CommunityInvite {
-            community_id: community_id_of(&owner.public_key().to_bytes(), &SALT),
-            owner: owner.public_key(),
-            owner_salt: HEXLOWER.encode(&SALT),
-            community_root: "44".repeat(32),
-            root_epoch: Epoch(0),
-            control_pk: None,
-            channels: vec![ChannelGrant {
-                id: ChannelId::from_bytes([0x9cu8; 32]),
-                key: Some("55".repeat(32)),
-                epoch: Epoch(1),
-                name: "lounge".to_owned(),
-                extra: Extra::default(),
-            }],
-            relays: vec!["wss://relay.example".to_owned()],
-            name: "Test community".to_owned(),
-            icon: None,
-            expires_at: None,
-            creator_npub: None,
-            label: None,
-            extra: Extra::default(),
-        }
-    }
-
-    fn token16() -> [u8; TOKEN_LEN] {
-        std::array::from_fn(|i| i as u8)
-    }
-
-    #[test]
-    fn fragment_goldens_pin_the_wire_layout() {
-        let token = token16();
-
-        // [04 version][01 stock flag][token 00..0f]
-        let stock = encode_fragment(&token, &stock_relays()).expect("encodes");
-        assert_eq!(stock, "BAEAAQIDBAUGBwgJCgsMDQ4P");
-        assert_eq!(
-            decode_fragment(&stock).expect("decodes"),
-            (token, stock_relays())
-        );
-
-        // [04][00 flags][02 count][02 dict-id][04 dict-id][token 00..0f]
-        let mixed = vec![RELAY_DICT[1].to_owned(), RELAY_DICT[3].to_owned()];
-        let encoded = encode_fragment(&token, &mixed).expect("encodes");
-        assert_eq!(encoded, "BAACAgQAAQIDBAUGBwgJCgsMDQ4P");
-        assert_eq!(decode_fragment(&encoded).expect("decodes"), (token, mixed));
-
-        // [04][00][01 count][ff verbatim lead][06 len]["ws://h"][token 00..0f]
-        let verbatim = vec!["ws://h".to_owned()];
-        let encoded = encode_fragment(&token, &verbatim).expect("encodes");
-        assert_eq!(encoded, "BAAB_wZ3czovL2gAAQIDBAUGBwgJCgsMDQ4P");
-        assert_eq!(
-            decode_fragment(&encoded).expect("decodes"),
-            (token, verbatim)
-        );
-    }
-
-    #[test]
-    fn a_fragment_is_strict_about_framing_and_counts() {
-        let token = token16();
-
-        for version in [3u8, 5] {
-            let mut bytes = vec![version, FLAG_STOCK_SET];
-            bytes.extend_from_slice(&token);
-            let encoded = BASE64URL_NOPAD.encode(&bytes);
-            assert!(
-                matches!(decode_fragment(&encoded), Err(InviteError::BadVersion(v)) if v == version),
-                "a legacy and a future version are both refused"
-            );
-        }
-
-        let mut trailing = vec![FRAGMENT_VERSION, FLAG_STOCK_SET];
-        trailing.extend_from_slice(&token);
-        trailing.push(0xff);
-        assert!(matches!(
-            decode_fragment(&BASE64URL_NOPAD.encode(&trailing)),
-            Err(InviteError::BadFragment(_))
-        ));
-
-        let mut over = vec![FRAGMENT_VERSION, 0x00, 0x04, 1, 2, 3, 4];
-        over.extend_from_slice(&token);
-        assert!(matches!(
-            decode_fragment(&BASE64URL_NOPAD.encode(&over)),
-            Err(InviteError::BadFragment(_))
-        ));
-
-        // An unknown dictionary id is skipped, not fatal, so the dictionary can grow.
-        let mut unknown = vec![FRAGMENT_VERSION, 0x00, 0x01, 200];
-        unknown.extend_from_slice(&token);
-        let (decoded, relays) =
-            decode_fragment(&BASE64URL_NOPAD.encode(&unknown)).expect("decodes");
-        assert_eq!(decoded, token);
-        assert!(relays.is_empty());
-    }
-
-    #[test]
-    fn a_link_round_trips_and_refuses_a_non_invite() {
-        let link_signer = Keys::generate();
-        let token = token16();
-        let relays = vec!["wss://a.example".to_owned()];
-
-        let url = build_invite_url(
-            "https://vectorapp.io/",
-            &link_signer.public_key(),
-            &token,
-            &relays,
-        )
-        .expect("builds");
-
-        let parsed = parse_link(&url).expect("parses");
-        assert_eq!(parsed.link_signer, link_signer.public_key());
-        assert_eq!(parsed.token, token);
-        assert_eq!(parsed.bootstrap_relays, relays);
-
-        let fragment = url.split('#').nth(1).expect("carries a fragment");
-        let bare = format!("{}#{fragment}", parsed.naddr);
-        let reparsed = parse_link(&bare).expect("parses the domain-agnostic form");
-        assert_eq!(reparsed.link_signer, link_signer.public_key());
-        assert_eq!(reparsed.token, token);
-
-        assert!(
-            parse_link("https://x/invite/#frag").is_err(),
-            "the naddr is not optional"
-        );
-    }
-
-    #[test]
-    fn a_bundle_round_trips_while_a_revocation_reads_as_revoked() {
-        let invite = bundle();
-        let link_signer = Keys::generate();
-        let key = invite_bundle_key(&[7u8; TOKEN_LEN]);
-
-        let event = build_bundle_event(&link_signer, &invite, &key).expect("builds");
-        assert_eq!(event.pubkey, link_signer.public_key());
-
-        match parse_bundle_event(&event, &link_signer.public_key(), &key).expect("parses") {
-            BundleState::Live(opened) => {
-                assert_eq!(opened.community_id, invite.community_id);
-                assert_eq!(opened.channels.len(), 1);
-            }
-            BundleState::Revoked => panic!("expected a live bundle"),
-        }
-
-        let revocation = build_revocation(&link_signer).expect("builds");
-        assert!(matches!(
-            parse_bundle_event(&revocation, &link_signer.public_key(), &key),
-            Ok(BundleState::Revoked)
-        ));
-
-        // The token is the only way in, and a squatter is a different coordinate.
-        assert!(
-            parse_bundle_event(
-                &event,
-                &link_signer.public_key(),
-                &invite_bundle_key(&[8u8; TOKEN_LEN])
-            )
-            .is_err()
-        );
-        let squatter = Keys::generate();
-        assert!(matches!(
-            parse_bundle_event(&event, &squatter.public_key(), &key),
-            Err(InviteError::BadEvent(_))
-        ));
-    }
-
-    #[test]
-    fn a_bundle_off_its_coordinate_or_off_its_owner_is_refused() {
-        let invite = bundle();
-        let link_signer = Keys::generate();
-        let key = invite_bundle_key(&[9u8; TOKEN_LEN]);
-        let json = serde_json::to_string(&invite).expect("serializes");
-        let content = seal_bundle(&key, &json).expect("seals");
-
-        // The fetch filters on the author, so the empty `d` is pinned here: a
-        // signature-valid event of the same author at another `d` is not the bundle.
-        let elsewhere = EventBuilder::new(Kind::Custom(KIND_BUNDLE), content)
-            .tags([Tag::identifier("elsewhere"), subkind_tag(vsk::INVITE_LIVE)])
-            .finalize(&link_signer)
-            .expect("signs");
-        assert!(matches!(
-            parse_bundle_event(&elsewhere, &link_signer.public_key(), &key),
-            Err(InviteError::BadEvent(_))
-        ));
-
-        let mut forged = bundle();
-        forged.owner = Keys::generate().public_key();
-        assert!(matches!(forged.validate(), Err(InviteError::OwnerMismatch)));
-        assert!(matches!(
-            build_bundle_event(&link_signer, &forged, &key),
-            Err(InviteError::OwnerMismatch)
-        ));
-
-        let mut malformed = bundle();
-        malformed.community_root = "not hex".to_owned();
-        assert!(matches!(malformed.validate(), Err(InviteError::BadHex(_))));
-
-        let mut crowded = bundle();
-        crowded.channels = (0..=MAX_BUNDLE_CHANNELS)
-            .map(|_| ChannelGrant {
-                id: ChannelId::from_bytes([0x01; 32]),
-                key: None,
-                epoch: Epoch(0),
-                name: String::new(),
-                extra: Extra::default(),
-            })
-            .collect();
-        assert!(matches!(
-            crowded.validate(),
-            Err(InviteError::TooManyChannels(n)) if n == MAX_BUNDLE_CHANNELS + 1
-        ));
-    }
-
-    #[test]
-    fn a_direct_invite_round_trips_and_refuses_a_foreign_rumor() {
-        let inviter = Keys::generate();
-        let recipient = Keys::generate();
-        let invite = bundle();
-
-        let wrap = build_direct_invite(&inviter, &recipient.public_key(), &invite).expect("builds");
-        assert_eq!(wrap.kind, Kind::GiftWrap);
-        assert_ne!(
-            wrap.pubkey,
-            inviter.public_key(),
-            "the wrap author is ephemeral"
-        );
-        assert!(
-            wrap.tags.iter().any(|tag| tag.as_slice() == ["k", "3313"]),
-            "the k tag is what makes an invite indexable"
-        );
-
-        let (sender, opened) = unwrap_direct_invite(&wrap, &recipient).expect("unwraps");
-        assert_eq!(sender, inviter.public_key());
-        assert_eq!(opened.community_id, invite.community_id);
-
-        // Somebody else's wrap is not ours to open...
-        let stranger = Keys::generate();
-        assert!(unwrap_direct_invite(&wrap, &stranger).is_err());
-
-        // ...and a wrap that opens to some other kind is not an invite.
-        let rumor = EventBuilder::new(Kind::Custom(crate::cord03::KIND_MESSAGE), "hello")
-            .finalize_unsigned(recipient.public_key());
-        let wrap = GiftWrapBuilder::new(recipient.public_key(), rumor)
-            .finalize(&recipient)
-            .expect("wraps");
-        assert!(matches!(
-            unwrap_direct_invite(&wrap, &recipient),
-            Err(InviteError::BadEvent(_))
-        ));
-    }
-}

crates/concord/src/cords/mod.rs

@@ -1,9 +0,0 @@
-//! One module per CORD document. CORD-07 (audio/video) is unimplemented, and
-//! CORD-08's timer rides the Chat and Control planes it edits rather than owning a file.
-
-pub mod cord01;
-pub mod cord02;
-pub mod cord03;
-pub mod cord04;
-pub mod cord05;
-pub mod cord06;

crates/concord/src/lib.rs

@@ -1,12 +0,0 @@
-mod cords;
-mod types;
-mod utils;
-
-pub mod store;
-
-pub use cords::{cord01, cord02, cord03, cord04, cord05, cord06};
-pub use types::{ChannelId, CommunityId, Epoch, RoleId};
-pub use utils::derive::{self, GroupKey};
-
-pub(crate) use types::Extra;
-pub(crate) use utils::{decode_hex_32, decode_hex_lower, fill_random, random_32};

crates/concord/src/store.rs

@@ -1,648 +0,0 @@
-use std::cmp::Reverse;
-use std::collections::{BTreeMap, BTreeSet};
-use std::sync::LazyLock;
-
-use anyhow::{Result, anyhow};
-use nostr_sdk::prelude::*;
-use serde::{Deserialize, Serialize};
-
-use crate::cord01::{KIND_WRAP_EPHEMERAL, OpenedStream};
-use crate::cord02::{
-    ChannelMetadata, CommunityGenesis, CommunityMetadata, ControlFold, ROOT_EPOCH,
-};
-use crate::cord03::{self, ChatRumor, plane_keys};
-use crate::cord04::{EntityHead, Floors, ParsedEdition, vsk};
-use crate::derive::control_signer_group_key;
-use crate::{ChannelId, CommunityId, Epoch, GroupKey};
-
-static LOCAL_KEYS: LazyLock<Keys> = LazyLock::new(Keys::generate);
-
-const MAX_PAGES: usize = 8;
-const CHANNEL_TAG: SingleLetterTag = SingleLetterTag::LOWERCASE_C;
-const MARK_TAG: SingleLetterTag = SingleLetterTag::LOWERCASE_T;
-const MARK_VALUE: &str = "concord";
-const WRAP_TAG: &str = "e";
-const KIND_TAG: &str = "k";
-const STATE_PREFIX: &str = "concord/";
-
-/// An already-expired rumor is refused at ingest. Returns whether it was kept.
-pub async fn cache_rumor(
-    database: &dyn NostrDatabase,
-    channel: &ChannelId,
-    opened: &OpenedStream,
-) -> Result<bool> {
-    if cord03::expiration_of(&opened.rumor)?
-        .is_some_and(|expiration| expiration <= Timestamp::now())
-    {
-        return Ok(false);
-    }
-
-    let tags = vec![
-        Tag::identifier(opened.rumor_id),
-        Tag::custom(KIND_TAG, [opened.rumor.kind.to_string()]),
-        Tag::custom(WRAP_TAG, [opened.wrapper_id.to_string()]),
-        Tag::custom(MARK_TAG.as_str(), [MARK_VALUE]),
-        Tag::custom(CHANNEL_TAG.as_str(), [channel.to_hex()]),
-        Tag::public_key(opened.author),
-    ];
-    let at = Timestamp::from_secs(opened.at_ms / 1000);
-    let event = EventBuilder::new(Kind::ApplicationSpecificData, opened.rumor.as_json())
-        .tags(tags)
-        .custom_created_at(at)
-        .finalize_async(&*LOCAL_KEYS)
-        .await?;
-
-    database.save_event(&event).await?;
-
-    Ok(true)
-}
-
-pub async fn purge_expired(
-    database: &dyn NostrDatabase,
-    channel: &ChannelId,
-    now: Timestamp,
-) -> Result<usize> {
-    let filter = Filter::new()
-        .kind(Kind::ApplicationSpecificData)
-        .custom_tag(MARK_TAG, MARK_VALUE)
-        .custom_tag(CHANNEL_TAG, channel.to_hex());
-
-    let mut expired = Vec::new();
-
-    for event in database.query(filter).await? {
-        let Ok(rumor) = UnsignedEvent::from_json(&event.content) else {
-            continue;
-        };
-
-        let Ok(Some(expiration)) = cord03::expiration_of(&rumor) else {
-            continue;
-        };
-
-        if expiration <= now {
-            expired.push(event.id);
-        }
-    }
-
-    let purged = expired.len();
-
-    if purged > 0 {
-        database.delete(Filter::new().ids(expired)).await?;
-    }
-
-    Ok(purged)
-}
-
-pub async fn query_rumors(
-    database: &dyn NostrDatabase,
-    channel: &ChannelId,
-    until: Option<Timestamp>,
-    limit: usize,
-) -> Result<Vec<UnsignedEvent>> {
-    let mut filter = Filter::new()
-        .kind(Kind::ApplicationSpecificData)
-        .custom_tag(MARK_TAG, MARK_VALUE)
-        .custom_tag(CHANNEL_TAG, channel.to_hex());
-
-    if let Some(until) = until {
-        filter = filter.until(until);
-    }
-
-    let mut newest: BTreeMap<String, Event> = BTreeMap::new();
-    for event in database.query(filter).await? {
-        let Some(rumor_id) = event.tags.identifier() else {
-            continue;
-        };
-
-        match newest.get(&rumor_id) {
-            Some(existing) if existing.created_at >= event.created_at => {}
-            _ => {
-                newest.insert(rumor_id, event);
-            }
-        }
-    }
-
-    let mut events: Vec<Event> = newest.into_values().collect();
-    events.sort_by_key(|event| std::cmp::Reverse(event.created_at));
-    events.truncate(limit);
-
-    let mut rumors = Vec::with_capacity(events.len());
-    for event in events {
-        let rumor = UnsignedEvent::from_json(event.content)
-            .map_err(|error| anyhow!("cached rumor is not a valid event: {error}"))?;
-        rumors.push(rumor);
-    }
-
-    Ok(rumors)
-}
-
-#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
-pub struct ChannelKeyRef {
-    pub id: ChannelId,
-    pub name: String,
-    pub private: bool,
-    pub epoch: Epoch,
-}
-
-/// One local document per community, keyed by `concord/<community_id>`.
-#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
-pub struct CommunityState {
-    pub id: CommunityId,
-    pub owner: PublicKey,
-    pub owner_salt: [u8; 32],
-    pub community_root: [u8; 32],
-    pub root_epoch: Epoch,
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub control_root: Option<[u8; 32]>,
-    #[serde(default, skip_serializing_if = "BTreeMap::is_empty")]
-    pub control_pks: BTreeMap<u64, PublicKey>,
-    #[serde(default, skip_serializing_if = "Vec::is_empty")]
-    pub channels: Vec<ChannelKeyRef>,
-    pub relays: Vec<RelayUrl>,
-    #[serde(default, skip_serializing_if = "Vec::is_empty")]
-    pub heads: Vec<EntityHead>,
-    #[serde(default, skip_serializing_if = "BTreeSet::is_empty")]
-    pub banned: BTreeSet<PublicKey>,
-    #[serde(default)]
-    pub dissolved: bool,
-    pub added_at_ms: u64,
-}
-
-impl CommunityState {
-    pub fn from_genesis(
-        genesis: &CommunityGenesis,
-        editions: &[ParsedEdition],
-        added_at_ms: u64,
-    ) -> Result<Self> {
-        let mut channels = Vec::new();
-        let mut heads = Vec::with_capacity(editions.len());
-        let mut relays = Vec::new();
-
-        for edition in editions {
-            heads.push(EntityHead {
-                entity: edition.entity,
-                version: edition.version,
-                self_hash: edition.self_hash,
-                rumor_id: edition.rumor_id,
-            });
-
-            match edition.subkind.as_str() {
-                vsk::COMMUNITY_METADATA => {
-                    let metadata: CommunityMetadata = serde_json::from_str(&edition.content)?;
-                    relays.extend(
-                        metadata
-                            .relays
-                            .iter()
-                            .filter_map(|relay| RelayUrl::parse(relay).ok()),
-                    );
-                }
-                vsk::CHANNEL_METADATA => {
-                    let metadata: ChannelMetadata = serde_json::from_str(&edition.content)?;
-                    channels.push(ChannelKeyRef {
-                        id: ChannelId::from_bytes(edition.entity),
-                        name: metadata.name,
-                        private: metadata.private,
-                        epoch: ROOT_EPOCH,
-                    });
-                }
-                _ => {}
-            }
-        }
-
-        let control_pks = BTreeMap::from([(
-            ROOT_EPOCH.0,
-            control_signer_group_key(
-                &genesis.control_root,
-                &genesis.identity.community_id,
-                ROOT_EPOCH,
-            )?
-            .pk(),
-        )]);
-
-        Ok(Self {
-            id: genesis.identity.community_id,
-            owner: genesis.identity.owner,
-            owner_salt: genesis.identity.owner_salt,
-            community_root: genesis.community_root,
-            root_epoch: ROOT_EPOCH,
-            control_root: Some(genesis.control_root),
-            control_pks,
-            channels,
-            relays,
-            heads,
-            banned: BTreeSet::new(),
-            dissolved: false,
-            added_at_ms,
-        })
-    }
-
-    pub fn identifier(&self) -> String {
-        state_identifier(&self.id)
-    }
-
-    pub fn floors(&self) -> Floors {
-        self.heads
-            .iter()
-            .map(|head| (head.entity, head.clone()))
-            .collect()
-    }
-
-    pub fn apply_fold(&mut self, fold: &ControlFold) {
-        self.heads = fold.floors.values().cloned().collect();
-        self.banned = fold.banned.clone();
-
-        if let Some(community) = &fold.community {
-            self.relays = community
-                .relays
-                .iter()
-                .filter_map(|relay| RelayUrl::parse(relay).ok())
-                .collect();
-        }
-
-        for (id, metadata) in &fold.channels {
-            if metadata.deleted.unwrap_or(false) {
-                self.channels.retain(|channel| channel.id != *id);
-                continue;
-            }
-
-            match self.channels.iter_mut().find(|channel| channel.id == *id) {
-                Some(channel) => {
-                    channel.name = metadata.name.clone();
-
-                    if !metadata.private {
-                        channel.private = false;
-                    }
-                }
-                None if !metadata.private => self.channels.push(ChannelKeyRef {
-                    id: *id,
-                    name: metadata.name.clone(),
-                    private: false,
-                    epoch: self.root_epoch,
-                }),
-                None => {}
-            }
-        }
-    }
-}
-
-fn state_identifier(id: &CommunityId) -> String {
-    format!("{STATE_PREFIX}{}", id.to_hex())
-}
-
-pub async fn save_state<D>(database: &D, state: &CommunityState) -> Result<()>
-where
-    D: NostrDatabase,
-{
-    let event = EventBuilder::new(Kind::ApplicationSpecificData, serde_json::to_string(state)?)
-        .tags([Tag::identifier(state.identifier())])
-        .finalize_async(&*LOCAL_KEYS)
-        .await?;
-
-    database.save_event(&event).await?;
-
-    Ok(())
-}
-
-pub async fn load_state<D>(database: &D, id: &CommunityId) -> Result<Option<CommunityState>>
-where
-    D: NostrDatabase,
-{
-    let filter = Filter::new()
-        .kind(Kind::ApplicationSpecificData)
-        .identifier(state_identifier(id))
-        .limit(1);
-
-    match database.query(filter).await?.into_iter().next() {
-        Some(event) => Ok(Some(serde_json::from_str(&event.content)?)),
-        None => Ok(None),
-    }
-}
-
-pub async fn backfill(
-    client: &Client,
-    database: &dyn NostrDatabase,
-    channel: &ChannelId,
-    held: &[(Epoch, [u8; 32])],
-    until: Option<Timestamp>,
-    limit: usize,
-) -> Result<Vec<ChatRumor>> {
-    let planes = plane_keys(held, channel)?;
-    let authors: Vec<PublicKey> = planes.iter().map(|(_, group)| group.pk()).collect();
-
-    let mut cursor = until;
-    let mut seen: BTreeSet<EventId> = BTreeSet::new();
-    let mut found: Vec<ChatRumor> = Vec::new();
-
-    for _ in 0..MAX_PAGES {
-        let page = fetch_page(client, &authors, cursor, limit).await?;
-
-        if page.is_empty() {
-            break;
-        }
-
-        let (fresh, next) = advance(&page, &planes, channel, cursor, limit, &mut seen);
-
-        for (opened, rumor) in fresh {
-            if cache_rumor(database, channel, &opened).await? {
-                found.push(rumor);
-            }
-        }
-
-        match next {
-            Some(next) => cursor = Some(next),
-            None => break,
-        }
-    }
-
-    found.sort_by_key(|rumor| (Reverse(rumor.at_ms), rumor.id));
-    found.truncate(limit);
-
-    Ok(found)
-}
-
-fn advance(
-    page: &BTreeSet<Event>,
-    planes: &[(Epoch, GroupKey)],
-    channel: &ChannelId,
-    cursor: Option<Timestamp>,
-    limit: usize,
-    seen: &mut BTreeSet<EventId>,
-) -> (Vec<(OpenedStream, ChatRumor)>, Option<Timestamp>) {
-    let mut fresh = Vec::new();
-
-    for wrap in page {
-        let Some((epoch, group)) = planes.iter().find(|(_, group)| group.pk() == wrap.pubkey)
-        else {
-            continue;
-        };
-
-        let Ok((opened, rumor)) = cord03::open(wrap, group, channel, *epoch) else {
-            continue;
-        };
-
-        if seen.insert(rumor.id) {
-            fresh.push((opened, rumor));
-        }
-    }
-
-    if fresh.is_empty() || page.len() < limit {
-        return (fresh, None);
-    }
-
-    let oldest = page.iter().map(|event| event.created_at).min();
-
-    match oldest {
-        Some(oldest) if cursor != Some(oldest) => (fresh, Some(oldest)),
-        _ => (fresh, None),
-    }
-}
-
-async fn fetch_page(
-    client: &Client,
-    authors: &[PublicKey],
-    until: Option<Timestamp>,
-    limit: usize,
-) -> Result<BTreeSet<Event>> {
-    let mut filter = Filter::new()
-        .kinds([Kind::GiftWrap, Kind::Custom(KIND_WRAP_EPHEMERAL)])
-        .authors(authors.iter().copied())
-        .limit(limit);
-
-    if let Some(until) = until {
-        filter = filter.until(until);
-    }
-
-    Ok(client.fetch_events(filter).await?)
-}
-
-#[cfg(test)]
-mod tests {
-    use nostr_memory::MemoryDatabase;
-
-    use super::*;
-    use crate::Epoch;
-    use crate::cord01::{
-        KIND_WRAP, SealForm, build_rumor_ms, build_seal, channel_binding_tags, open_wrap, wrap_seal,
-    };
-    use crate::cord03::{build_message, seal_rumor};
-    use crate::derive::channel_group_key;
-
-    const SECRET: [u8; 32] = [0x07u8; 32];
-    const NEXT_SECRET: [u8; 32] = [0x11u8; 32];
-
-    /// What a relay does with an inclusive `until` and a `limit`.
-    fn serve_page(
-        relay: &BTreeSet<Event>,
-        cursor: Option<Timestamp>,
-        limit: usize,
-    ) -> BTreeSet<Event> {
-        let mut events: Vec<Event> = relay
-            .iter()
-            .filter(|event| cursor.is_none_or(|cursor| event.created_at <= cursor))
-            .cloned()
-            .collect();
-
-        events.sort_by_key(|event| Reverse(event.created_at));
-        events.truncate(limit);
-        events.into_iter().collect()
-    }
-
-    #[test]
-    fn history_pages_back_across_a_rekey() {
-        let channel = ChannelId::from_bytes([0x9cu8; 32]);
-        let author = Keys::generate();
-        let held = [(Epoch(0), SECRET), (Epoch(1), NEXT_SECRET)];
-        let planes = plane_keys(&held, &channel).expect("derives");
-
-        // Three messages a second apart: a page boundary falls between each.
-        let base = 1_700_000_000_000;
-        let mut relay: BTreeSet<Event> = BTreeSet::new();
-
-        for (content, secret, epoch, at_ms) in [
-            ("before the rekey", &SECRET, Epoch(0), base),
-            ("still before", &SECRET, Epoch(0), base + 1_000),
-            ("after the rekey", &NEXT_SECRET, Epoch(1), base + 2_000),
-        ] {
-            let group = channel_group_key(secret, &channel, epoch).expect("derives");
-            let rumor = build_message(
-                author.public_key(),
-                &channel,
-                epoch,
-                content,
-                None,
-                at_ms,
-                None,
-            );
-            relay.insert(seal_rumor(&rumor, &group, &author, false).expect("seals").0);
-        }
-
-        let mut seen = BTreeSet::new();
-        let mut found = Vec::new();
-        let mut cursor = None;
-
-        for _ in 0..3 {
-            let page = serve_page(&relay, cursor, 2);
-            let (fresh, next) = advance(&page, &planes, &channel, cursor, 2, &mut seen);
-
-            found.extend(fresh.into_iter().map(|(_, rumor)| rumor));
-
-            match next {
-                Some(next) => cursor = Some(next),
-                None => break,
-            }
-        }
-
-        found.sort_by_key(|rumor| (Reverse(rumor.at_ms), rumor.id));
-
-        let contents: Vec<&str> = found.iter().map(|rumor| rumor.content.as_str()).collect();
-        assert_eq!(
-            contents,
-            ["after the rekey", "still before", "before the rekey"]
-        );
-    }
-
-    #[test]
-    fn rumors_read_back_after_a_restart() {
-        let database = MemoryDatabase::unbounded();
-        let channel = ChannelId::from_bytes([0xabu8; 32]);
-        let author = Keys::generate();
-
-        smol::block_on(async {
-            let group = channel_group_key(&SECRET, &channel, Epoch(0)).expect("derives");
-
-            for (content, at_ms) in [("first", 1_000_000u64), ("second", 2_000_000)] {
-                let rumor = build_rumor_ms(
-                    9,
-                    author.public_key(),
-                    content,
-                    channel_binding_tags(&channel, Epoch(0)),
-                    at_ms,
-                );
-                let seal = build_seal(&rumor, SealForm::Encrypted, &group, &author).expect("seals");
-                let (wrap, _) = wrap_seal(
-                    &seal,
-                    &group,
-                    KIND_WRAP,
-                    Timestamp::from_secs(at_ms / 1000),
-                    &[],
-                )
-                .expect("wraps");
-
-                let opened = open_wrap(&wrap, &group).expect("opens");
-                cache_rumor(&database, &channel, &opened)
-                    .await
-                    .expect("caches");
-            }
-
-            // The group key is gone; only the local cache stands in for it.
-            let rumors = query_rumors(&database, &channel, None, 10)
-                .await
-                .expect("queries");
-            assert_eq!(rumors.len(), 2, "both messages come back");
-            assert_eq!(rumors[0].content, "second", "newest first");
-            assert_eq!(rumors[1].content, "first");
-
-            // A page boundary in message time, not in cache time.
-            let until = Timestamp::from_secs(1_500);
-            let page = query_rumors(&database, &channel, Some(until), 10)
-                .await
-                .expect("queries");
-            assert_eq!(page.len(), 1);
-            assert_eq!(page[0].content, "first");
-
-            let capped = query_rumors(&database, &channel, None, 1)
-                .await
-                .expect("queries");
-            assert_eq!(capped.len(), 1);
-            assert_eq!(capped[0].content, "second");
-        });
-    }
-
-    #[test]
-    fn an_expired_rumor_is_refused_at_ingest_and_purged_by_the_sweep() {
-        let database = MemoryDatabase::unbounded();
-        let channel = ChannelId::from_bytes([0x77u8; 32]);
-        let author = Keys::generate();
-        let group = channel_group_key(&SECRET, &channel, Epoch(0)).expect("derives");
-        let now = Timestamp::now().as_secs();
-
-        smol::block_on(async {
-            // A live timer is stored; one that already elapsed is refused at ingest.
-            assert!(
-                cache(
-                    &database,
-                    &group,
-                    &channel,
-                    &author,
-                    "live",
-                    Some(3_600),
-                    now
-                )
-                .await
-            );
-            assert!(
-                !cache(
-                    &database,
-                    &group,
-                    &channel,
-                    &author,
-                    "gone",
-                    Some(1),
-                    now - 120
-                )
-                .await
-            );
-
-            let stored = query_rumors(&database, &channel, None, 10)
-                .await
-                .expect("queries");
-            assert_eq!(stored.len(), 1);
-            assert_eq!(stored[0].content, "live");
-
-            // Hiding is not disappearing: the sweep removes the row itself,
-            // judged on the rumor's own signed tag.
-            let purged = purge_expired(&database, &channel, Timestamp::from_secs(now + 7_200))
-                .await
-                .expect("sweeps");
-            assert_eq!(purged, 1);
-            assert!(
-                query_rumors(&database, &channel, None, 10)
-                    .await
-                    .expect("queries")
-                    .is_empty()
-            );
-
-            // An untimed rumor is never swept, whatever the clock says.
-            assert!(cache(&database, &group, &channel, &author, "timeless", None, now).await);
-            let purged = purge_expired(&database, &channel, Timestamp::from_secs(now + 86_400))
-                .await
-                .expect("sweeps");
-            assert_eq!(purged, 0);
-        });
-    }
-
-    async fn cache(
-        database: &MemoryDatabase,
-        group: &GroupKey,
-        channel: &ChannelId,
-        author: &Keys,
-        content: &str,
-        timer: Option<u64>,
-        at_secs: u64,
-    ) -> bool {
-        let rumor = build_message(
-            author.public_key(),
-            channel,
-            Epoch(0),
-            content,
-            None,
-            at_secs * 1_000,
-            timer,
-        );
-        let (wrap, _) = seal_rumor(&rumor, group, author, false).expect("seals");
-        let opened = open_wrap(&wrap, group).expect("opens");
-
-        cache_rumor(database, channel, &opened)
-            .await
-            .expect("caches")
-    }
-}

crates/concord/src/types/mod.rs

@@ -1,98 +0,0 @@
-use std::fmt;
-use std::str::FromStr;
-
-use anyhow::Result;
-use data_encoding::HEXLOWER;
-use serde::{Deserialize, Deserializer, Serialize, Serializer};
-
-use crate::decode_hex_32;
-
-/// Unknown fields a content struct does not model, so a republish cannot wipe them.
-pub(crate) type Extra = serde_json::Map<String, serde_json::Value>;
-
-macro_rules! hex_id {
-    ($(#[$meta:meta])* $name:ident) => {
-        $(#[$meta])*
-        #[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)]
-        pub struct $name([u8; 32]);
-
-        impl $name {
-            pub fn from_bytes(bytes: [u8; 32]) -> Self {
-                Self(bytes)
-            }
-
-            pub fn as_bytes(&self) -> &[u8; 32] {
-                &self.0
-            }
-
-            pub fn to_hex(&self) -> String {
-                HEXLOWER.encode(&self.0)
-            }
-        }
-
-        impl From<[u8; 32]> for $name {
-            fn from(bytes: [u8; 32]) -> Self {
-                Self(bytes)
-            }
-        }
-
-        impl fmt::Display for $name {
-            fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-                f.write_str(&self.to_hex())
-            }
-        }
-
-        impl fmt::Debug for $name {
-            fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-                write!(f, "{}({})", stringify!($name), self.to_hex())
-            }
-        }
-
-        impl FromStr for $name {
-            type Err = anyhow::Error;
-
-            fn from_str(value: &str) -> Result<Self> {
-                Ok(Self(decode_hex_32(value)?))
-            }
-        }
-
-        impl Serialize for $name {
-            fn serialize<S: Serializer>(&self, serializer: S) -> Result<S::Ok, S::Error> {
-                serializer.serialize_str(&self.to_hex())
-            }
-        }
-
-        impl<'de> Deserialize<'de> for $name {
-            fn deserialize<D: Deserializer<'de>>(deserializer: D) -> Result<Self, D::Error> {
-                let value = String::deserialize(deserializer)?;
-                value.parse().map_err(serde::de::Error::custom)
-            }
-        }
-    };
-}
-
-hex_id! {
-    /// A self-certifying commitment to the owner's key, never on the wire.
-    CommunityId
-}
-
-hex_id! {
-    ChannelId
-}
-
-hex_id! {
-    /// Both a Role's entity coordinate and the field it repeats in its own content.
-    RoleId
-}
-
-/// A key-rotation counter; it bumps only on a Rekey that removes somebody.
-#[derive(
-    Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash, Debug, Default, Serialize, Deserialize,
-)]
-pub struct Epoch(pub u64);
-
-impl fmt::Display for Epoch {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        write!(f, "{}", self.0)
-    }
-}

crates/concord/src/utils/derive.rs

@@ -1,407 +0,0 @@
-use anyhow::{Result, bail};
-use hkdf::Hkdf;
-use nostr::nips::nip44::v2::ConversationKey;
-use nostr_sdk::prelude::{Keys, PublicKey, SecretKey};
-use sha2::{Digest, Sha256};
-
-use crate::{ChannelId, CommunityId, Epoch};
-
-pub const TOKEN_LEN: usize = 16;
-
-const LABEL_CHANNEL: &str = "concord/channel";
-const LABEL_CONTROL: &str = "concord/control";
-const LABEL_CONTROL_SIGNER: &str = "concord/control-signer";
-const LABEL_REKEY_PSEUDONYM: &str = "concord/rekey-pseudonym";
-const LABEL_BASE_REKEY_PSEUDONYM: &str = "concord/base-rekey-pseudonym";
-const LABEL_RECIPIENT_PSEUDONYM: &str = "concord/recipient-pseudonym";
-const LABEL_GUESTBOOK: &str = "concord/guestbook";
-const LABEL_DISSOLVED: &str = "concord/dissolved";
-const LABEL_GRANT: &str = "concord/grant";
-const LABEL_BANLIST: &str = "concord/banlist";
-const LABEL_PINS: &str = "concord/pins";
-const LABEL_INVITE_LINKS: &str = "concord/invite-links";
-const LABEL_INVITE_KEY: &str = "concord/invite-key";
-
-const LABEL_COMMUNITY: &str = "concord/community";
-const LABEL_EPOCH_COMMITMENT: &str = "concord/epoch-key-commitment";
-
-const ZERO32: [u8; 32] = [0u8; 32];
-
-fn build_info(label: &str, id32: &[u8; 32], epoch: Option<u64>) -> Vec<u8> {
-    let mut info = Vec::with_capacity(label.len() + 1 + 32 + 8);
-    info.extend_from_slice(label.as_bytes());
-    info.push(0x00);
-    info.extend_from_slice(id32);
-
-    if let Some(epoch) = epoch {
-        info.extend_from_slice(&epoch.to_be_bytes());
-    }
-
-    info
-}
-
-fn hkdf32(ikm: &[u8], info: &[u8]) -> [u8; 32] {
-    let mut okm = [0u8; 32];
-    Hkdf::<Sha256>::new(None, ikm)
-        .expand(info, &mut okm)
-        .expect("expanding HKDF to 32 bytes is below the 255*32 ceiling");
-    okm
-}
-
-fn hkdf_to_secret_key(ikm: &[u8], base_info: &[u8]) -> Result<SecretKey> {
-    if let Ok(secret_key) = SecretKey::from_slice(&hkdf32(ikm, base_info)) {
-        return Ok(secret_key);
-    }
-
-    for counter in 0u8..=u8::MAX {
-        let mut info = Vec::with_capacity(base_info.len() + 1);
-        info.extend_from_slice(base_info);
-        info.push(counter);
-
-        if let Ok(secret_key) = SecretKey::from_slice(&hkdf32(ikm, &info)) {
-            return Ok(secret_key);
-        }
-    }
-
-    bail!("seed stayed out of the secp256k1 scalar range across all 256 counters")
-}
-
-#[derive(Clone)]
-pub struct GroupKey {
-    keys: Keys,
-    conversation: ConversationKey,
-}
-
-impl GroupKey {
-    fn derive(label: &str, secret: &[u8], id32: &[u8; 32], epoch: Option<u64>) -> Result<Self> {
-        let secret_key = hkdf_to_secret_key(secret, &build_info(label, id32, epoch))?;
-        let keys = Keys::new(secret_key);
-        let conversation = ConversationKey::derive(keys.secret_key(), &keys.public_key())?;
-
-        Ok(Self { keys, conversation })
-    }
-
-    pub fn pk(&self) -> PublicKey {
-        self.keys.public_key()
-    }
-
-    pub fn pk_hex(&self) -> String {
-        self.keys.public_key().to_hex()
-    }
-
-    pub fn keys(&self) -> &Keys {
-        &self.keys
-    }
-
-    pub fn conversation(&self) -> &ConversationKey {
-        &self.conversation
-    }
-}
-
-impl std::fmt::Debug for GroupKey {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        f.debug_struct("GroupKey")
-            .field("pk", &self.pk_hex())
-            .finish()
-    }
-}
-
-/// `secret` is the `community_root` for a public channel.
-pub fn channel_group_key(secret: &[u8; 32], channel: &ChannelId, epoch: Epoch) -> Result<GroupKey> {
-    GroupKey::derive(LABEL_CHANNEL, secret, channel.as_bytes(), Some(epoch.0))
-}
-
-/// The plane's read key: its conversation key encrypts the wraps for every member.
-pub fn control_group_key(
-    community_root: &[u8; 32],
-    community_id: &CommunityId,
-    epoch: Epoch,
-) -> Result<GroupKey> {
-    GroupKey::derive(
-        LABEL_CONTROL,
-        community_root,
-        community_id.as_bytes(),
-        Some(epoch.0),
-    )
-}
-
-/// The plane's address and wrap signer, held only by staff; wraps still read under [`control_group_key`].
-pub fn control_signer_group_key(
-    control_root: &[u8; 32],
-    community_id: &CommunityId,
-    epoch: Epoch,
-) -> Result<GroupKey> {
-    GroupKey::derive(
-        LABEL_CONTROL_SIGNER,
-        control_root,
-        community_id.as_bytes(),
-        Some(epoch.0),
-    )
-}
-
-/// Member-writable, unlike the Control Plane: a join or a leave is each member's own word.
-pub fn guestbook_group_key(
-    community_root: &[u8; 32],
-    community_id: &CommunityId,
-    epoch: Epoch,
-) -> Result<GroupKey> {
-    GroupKey::derive(
-        LABEL_GUESTBOOK,
-        community_root,
-        community_id.as_bytes(),
-        Some(epoch.0),
-    )
-}
-
-/// Keyed by the prior `community_root`, so any retained member recovers any epoch's rekey.
-pub fn channel_rekey_group_key(
-    prior_root: &[u8; 32],
-    channel: &ChannelId,
-    new_epoch: Epoch,
-) -> Result<GroupKey> {
-    GroupKey::derive(
-        LABEL_REKEY_PSEUDONYM,
-        prior_root,
-        channel.as_bytes(),
-        Some(new_epoch.0),
-    )
-}
-
-pub fn base_rekey_group_key(
-    prior_root: &[u8; 32],
-    community_id: &CommunityId,
-    new_epoch: Epoch,
-) -> Result<GroupKey> {
-    GroupKey::derive(
-        LABEL_BASE_REKEY_PSEUDONYM,
-        prior_root,
-        community_id.as_bytes(),
-        Some(new_epoch.0),
-    )
-}
-
-pub fn dissolved_group_key(community_id: &CommunityId) -> Result<GroupKey> {
-    GroupKey::derive(LABEL_DISSOLVED, community_id.as_bytes(), &ZERO32, None)
-}
-
-pub fn community_id_of(owner_xonly: &[u8; 32], owner_salt: &[u8; 32]) -> CommunityId {
-    let mut hasher = Sha256::new();
-    hasher.update(LABEL_COMMUNITY.as_bytes());
-    hasher.update(owner_xonly);
-    hasher.update(owner_salt);
-    CommunityId::from_bytes(hasher.finalize().into())
-}
-
-pub fn verify_community_id(
-    community_id: &CommunityId,
-    owner_xonly: &[u8; 32],
-    owner_salt: &[u8; 32],
-) -> bool {
-    community_id_of(owner_xonly, owner_salt) == *community_id
-}
-
-/// The continuity a rekey blob must satisfy against the key currently held.
-pub fn epoch_key_commitment(previous_epoch: Epoch, previous_key: &[u8; 32]) -> [u8; 32] {
-    let mut hasher = Sha256::new();
-    hasher.update(LABEL_EPOCH_COMMITMENT.as_bytes());
-    hasher.update(previous_epoch.0.to_be_bytes());
-    hasher.update(previous_key);
-    hasher.finalize().into()
-}
-
-/// Bound to the `community_id`, so a member's Grant coordinate survives every refounding.
-pub fn grant_locator(community_id: &CommunityId, member_xonly: &[u8; 32]) -> [u8; 32] {
-    hkdf32(
-        community_id.as_bytes(),
-        &build_info(LABEL_GRANT, member_xonly, None),
-    )
-}
-
-pub fn banlist_locator(community_id: &CommunityId) -> [u8; 32] {
-    hkdf32(
-        community_id.as_bytes(),
-        &build_info(LABEL_BANLIST, &ZERO32, None),
-    )
-}
-
-pub fn pins_locator(community_id: &CommunityId, channel: &ChannelId) -> [u8; 32] {
-    hkdf32(
-        community_id.as_bytes(),
-        &build_info(LABEL_PINS, channel.as_bytes(), None),
-    )
-}
-
-/// Bound to the creator, so each creator owns exactly their own registry.
-pub fn invite_links_locator(community_id: &CommunityId, creator_xonly: &[u8; 32]) -> [u8; 32] {
-    hkdf32(
-        community_id.as_bytes(),
-        &build_info(LABEL_INVITE_LINKS, creator_xonly, None),
-    )
-}
-
-/// Built from public inputs only, so a locator match proves nothing about authenticity
-pub fn recipient_locator(
-    rotator_xonly: &[u8; 32],
-    recipient_xonly: &[u8; 32],
-    scope_id: &[u8; 32],
-    new_epoch: Epoch,
-) -> [u8; 32] {
-    let mut ikm = [0u8; 64];
-    ikm[..32].copy_from_slice(rotator_xonly);
-    ikm[32..].copy_from_slice(recipient_xonly);
-    hkdf32(
-        &ikm,
-        &build_info(LABEL_RECIPIENT_PSEUDONYM, scope_id, Some(new_epoch.0)),
-    )
-}
-
-/// The raw output is the NIP-44 conversation key (CORD-05 §2).
-pub fn invite_bundle_key(token: &[u8; TOKEN_LEN]) -> [u8; 32] {
-    hkdf32(token, &build_info(LABEL_INVITE_KEY, &ZERO32, None))
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    const CHANNEL_E0_SEED: &str =
-        "1a99a5958bf9fcc5336e6e19db42aabf36ffbfa12f38a1d5fbde2ae383ed751b";
-    const CHANNEL_E0_PK: &str = "7a5c5dff759a63f1fc2779864487432bae3d1ea72c4ffabd39f4c1fdaf62097a";
-    const CHANNEL_EMULTI_PK: &str =
-        "f20c7d192cc87615d7341e86f38f85303f4708b40232d4fea521ab8217767391";
-    const CONTROL_E0_PK: &str = "c43df20bf4d6eeaea5149619662ffe9b211f31e11bb4a59f56b6e906f702d46f";
-    const CONTROL_SIGNER_E0_SEED: &str =
-        "c4a3e8354d95137132087356412b67b53e025d127d45de45cff9ecf45b0c24f6";
-    const CONTROL_SIGNER_E0_PK: &str =
-        "718aef388257f3fd9f1bfae5cf2cbd0594a2ffc31adb5c1fe22c502c046acaee";
-    const CONTROL_SIGNER_EMULTI_PK: &str =
-        "e27235cc13be2f9ad65648e01ff2b63402846469c8638b5386c625688194ec7d";
-    const GUESTBOOK_E0_PK: &str =
-        "ad09de582026fa7a052db18bb5827fa24c15e929d59aadcc91efb8508f5368ad";
-    const CHANNEL_REKEY_E1_PK: &str =
-        "7c55cdb957e9db2b4800d687b2a07d3f7066b1a35824a1e86ba871f55e87e8b5";
-    const BASE_REKEY_E1_PK: &str =
-        "fb2fa44fba66ba15595f784255a1cb569531db8784432ac0e4fe838498dd9dea";
-    const DISSOLVED_PK: &str = "4d3d55d88fdf9d9c2089651e5cbb0dfa93b6b9b10cdcb2319b0dce1a1398096a";
-    const GRANT_LOCATOR: &str = "fd2f88cc7f1eb8d7d862c91dc22afe700c358d1845158b3f353b769ce4898e35";
-    const BANLIST_LOCATOR: &str =
-        "88089214afae6d3c412fd817ada44d6df4d485a53565646471e74476397693c9";
-    const INVITE_LINKS_LOCATOR: &str =
-        "f4ae29994165767bac23e8dce630f81b926d2c8aa150e5cbf0bdf75865e8379a";
-    const RECIPIENT_LOCATOR: &str =
-        "342deb400e191f0f52c81f27600934552550beb85aa9bf169f02d0e7f826cf74";
-    const INVITE_KEY: &str = "94bf8b0d89e579ddaeccf8d9db3f5de5c86a1259c597f2560ff0120173bc5e1f";
-    const COMMUNITY_ID: &str = "2b790bd59df98bdc52092b74ebd6933a89ef8eaeecc9030861cbdeae7c814c46";
-    const EPOCH_COMMITMENT: &str =
-        "3e6d6a3c9973c16d1ca7c5602d36979927c55c21a7e2c840f883af3f047e80a4";
-    const PINS_LOCATOR: &str = "3b4529395a35c981ed409b588af3c4cd3081992958a485347356a173c3146c52";
-    const EPOCH_MULTI: u64 = 0x0102030405060708;
-
-    /// `0x00..0x1f` / `0xff..0xe0` / `0x11` x32 — the inputs every vector uses.
-    fn secret() -> [u8; 32] {
-        let mut key = [0u8; 32];
-        for (index, byte) in key.iter_mut().enumerate() {
-            *byte = index as u8;
-        }
-        key
-    }
-
-    fn id32() -> [u8; 32] {
-        let mut id = [0u8; 32];
-        for (index, byte) in id.iter_mut().enumerate() {
-            *byte = 255 - index as u8;
-        }
-        id
-    }
-
-    fn hex(bytes: &[u8]) -> String {
-        data_encoding::HEXLOWER.encode(bytes)
-    }
-
-    #[test]
-    fn golden_vectors() {
-        let secret = secret();
-        let id = id32();
-        let alt = [0x11u8; 32];
-        let community_id = CommunityId::from_bytes(id);
-        let channel = ChannelId::from_bytes(id);
-
-        let channel_e0 = channel_group_key(&secret, &channel, Epoch(0)).expect("derives");
-        assert_eq!(
-            hex(channel_e0.keys().secret_key().as_secret_bytes()),
-            CHANNEL_E0_SEED
-        );
-        assert_eq!(channel_e0.pk_hex(), CHANNEL_E0_PK);
-        assert_eq!(
-            channel_group_key(&secret, &channel, Epoch(EPOCH_MULTI))
-                .expect("derives")
-                .pk_hex(),
-            CHANNEL_EMULTI_PK
-        );
-
-        assert_eq!(
-            control_group_key(&secret, &community_id, Epoch(0))
-                .expect("derives")
-                .pk_hex(),
-            CONTROL_E0_PK
-        );
-
-        let signer = control_signer_group_key(&secret, &community_id, Epoch(0)).expect("derives");
-        assert_eq!(
-            hex(signer.keys().secret_key().as_secret_bytes()),
-            CONTROL_SIGNER_E0_SEED
-        );
-        assert_eq!(signer.pk_hex(), CONTROL_SIGNER_E0_PK);
-        assert_eq!(
-            control_signer_group_key(&secret, &community_id, Epoch(EPOCH_MULTI))
-                .expect("derives")
-                .pk_hex(),
-            CONTROL_SIGNER_EMULTI_PK
-        );
-
-        assert_eq!(
-            guestbook_group_key(&secret, &community_id, Epoch(0))
-                .expect("derives")
-                .pk_hex(),
-            GUESTBOOK_E0_PK
-        );
-
-        assert_eq!(
-            channel_rekey_group_key(&secret, &channel, Epoch(1))
-                .expect("derives")
-                .pk_hex(),
-            CHANNEL_REKEY_E1_PK
-        );
-        assert_eq!(
-            base_rekey_group_key(&secret, &community_id, Epoch(1))
-                .expect("derives")
-                .pk_hex(),
-            BASE_REKEY_E1_PK
-        );
-        assert_eq!(
-            dissolved_group_key(&community_id)
-                .expect("derives")
-                .pk_hex(),
-            DISSOLVED_PK
-        );
-
-        assert_eq!(hex(&grant_locator(&community_id, &alt)), GRANT_LOCATOR);
-        assert_eq!(hex(&banlist_locator(&community_id)), BANLIST_LOCATOR);
-        assert_eq!(
-            hex(&invite_links_locator(&community_id, &alt)),
-            INVITE_LINKS_LOCATOR
-        );
-        assert_eq!(hex(&pins_locator(&community_id, &channel)), PINS_LOCATOR);
-        assert_eq!(
-            hex(&recipient_locator(&secret, &alt, &id, Epoch(3))),
-            RECIPIENT_LOCATOR
-        );
-        assert_eq!(hex(&invite_bundle_key(&[0x07u8; TOKEN_LEN])), INVITE_KEY);
-
-        assert_eq!(hex(community_id_of(&secret, &alt).as_bytes()), COMMUNITY_ID);
-        assert_eq!(
-            hex(&epoch_key_commitment(Epoch(2), &secret)),
-            EPOCH_COMMITMENT
-        );
-    }
-}

crates/concord/src/utils/mod.rs

@@ -1,40 +0,0 @@
-pub mod derive;
-
-use anyhow::{Result, anyhow, bail};
-use data_encoding::HEXLOWER;
-use rand::TryRng as _;
-use rand::rngs::SysRng;
-
-/// Uppercase and other non-canonical spellings are rejected.
-pub(crate) fn decode_hex_32(value: &str) -> Result<[u8; 32]> {
-    decode_hex_lower::<32>(value)
-}
-
-pub(crate) fn decode_hex_lower<const N: usize>(value: &str) -> Result<[u8; N]> {
-    let bytes = HEXLOWER
-        .decode(value.as_bytes())
-        .map_err(|error| anyhow!("invalid hex: {error}"))?;
-
-    let decoded: [u8; N] = bytes
-        .as_slice()
-        .try_into()
-        .map_err(|_| anyhow!("expected {N} bytes, got {}", bytes.len()))?;
-
-    if HEXLOWER.encode(&decoded) != value {
-        bail!("hex must be lowercase and canonical");
-    }
-
-    Ok(decoded)
-}
-
-pub(crate) fn fill_random(bytes: &mut [u8]) -> Result<()> {
-    SysRng
-        .try_fill_bytes(bytes)
-        .map_err(|error| anyhow!("os rng: {error}"))
-}
-
-pub(crate) fn random_32() -> Result<[u8; 32]> {
-    let mut bytes = [0u8; 32];
-    fill_random(&mut bytes)?;
-    Ok(bytes)
-}

crates/device/Cargo.toml

@@ -14,7 +14,6 @@ settings = { path = "../settings" }
 
 gpui.workspace = true
 nostr-sdk.workspace = true
-instant.workspace = true
 anyhow.workspace = true
 smallvec.workspace = true
 log.workspace = true

crates/device/src/lib.rs

@@ -4,13 +4,13 @@ use std::path::PathBuf;
 use std::rc::Rc;
 use std::sync::Arc;
 use std::sync::atomic::{AtomicBool, Ordering};
+use std::time::Duration;
 
 use anyhow::{Context as AnyhowContext, Error, anyhow};
 use gpui::{
     App, AppContext, Context, Entity, EventEmitter, Global, IntoElement, ParentElement,
     SharedString, Styled, Subscription, Task, Window, div, relative,
 };
-use instant::Duration;
 use nostr_sdk::prelude::*;
 use person::PersonRegistry;
 use settings::AppSettings;
@@ -92,6 +92,7 @@ impl DeviceRegistry {
     fn new(window: &mut Window, cx: &mut Context<Self>) -> Self {
         let nostr = NostrRegistry::global(cx);
         let settings = AppSettings::global(cx);
+        let nip4e_enabled = settings.read(cx).is_nip4e_enabled(cx);
 
         let signer = cx.new(|_| None);
         let mut subscriptions = smallvec![];
@@ -108,7 +109,7 @@ impl DeviceRegistry {
         subscriptions.push(
             // Observe the user signer
             cx.subscribe(&nostr, move |this, _nostr, event, cx| {
-                if event.signer_changed() && settings.read(cx).is_nip4e_enabled(cx) {
+                if event.signer_changed() && nip4e_enabled {
                     this.get_announcement(cx);
                 }
             }),
@@ -225,11 +226,6 @@ impl DeviceRegistry {
             let keys = get_keys(&client, &signer).await?;
             let content = keys.secret_key().to_bech32()?;
 
-            if cfg!(target_arch = "wasm32") {
-                return Err(anyhow!("Not supported"));
-            }
-
-            #[cfg(not(target_arch = "wasm32"))]
             smol::fs::write(path, &content).await?;
 
             Ok(())
@@ -414,7 +410,7 @@ impl DeviceRegistry {
                 .pubkey(app_pubkey)
                 .limit(1);
 
-            match client.database().query(filter).await?.into_iter().next() {
+            match client.database().query(filter).await?.first_owned() {
                 // Found an approval event
                 Some(event) => Ok(Some(event)),
                 // No approval event found, construct a request event

crates/person/Cargo.toml

@@ -10,8 +10,8 @@ state = { path = "../state" }
 
 gpui.workspace = true
 nostr-sdk.workspace = true
-instant.workspace = true
 anyhow.workspace = true
 smallvec.workspace = true
 flume.workspace = true
 log.workspace = true
+urlencoding = "2.1.3"

crates/person/src/lib.rs

@@ -1,10 +1,10 @@
+use std::cell::RefCell;
 use std::collections::{HashMap, HashSet};
-use std::sync::RwLock;
+use std::time::Duration;
 
 use anyhow::{Error, anyhow};
 use common::EventExt;
 use gpui::{App, AppContext, Context, Entity, Global, Task, Window};
-use instant::Duration;
 use nostr_sdk::prelude::*;
 use smallvec::{SmallVec, smallvec};
 use state::{Announcement, BOOTSTRAP_RELAYS, NostrRegistry, TIMEOUT};
@@ -35,7 +35,7 @@ pub struct PersonRegistry {
     persons: HashMap<PublicKey, Entity<Person>>,
 
     /// Set of public keys that have been seen
-    seen: RwLock<HashSet<PublicKey>>,
+    seens: RefCell<HashSet<PublicKey>>,
 
     /// Sender for requesting metadata
     sender: flume::Sender<PublicKey>,
@@ -62,18 +62,22 @@ impl PersonRegistry {
 
         // Channel for communication between nostr and gpui
         let (tx, rx) = flume::bounded::<Dispatch>(100);
-        let (metadata_tx, metadata_rx) = flume::unbounded::<PublicKey>();
+        let (mta_tx, mta_rx) = flume::unbounded::<PublicKey>();
 
         let mut tasks = smallvec![];
 
-        let client2 = client.clone();
-        tasks.push(cx.background_spawn(async move {
-            Self::handle_notifications(&client2, &tx).await;
+        tasks.push(cx.background_spawn({
+            let client = client.clone();
+            async move {
+                Self::handle_notifications(&client, &tx).await;
+            }
         }));
 
-        let client3 = client.clone();
-        tasks.push(cx.background_spawn(async move {
-            Self::handle_requests(&client3, &metadata_rx).await;
+        tasks.push(cx.background_spawn({
+            let client = client.clone();
+            async move {
+                Self::handle_requests(&client, &mta_rx).await;
+            }
         }));
 
         tasks.push(cx.spawn(async move |this, cx| {
@@ -102,8 +106,8 @@ impl PersonRegistry {
 
         Self {
             persons: HashMap::new(),
-            seen: RwLock::new(HashSet::new()),
-            sender: metadata_tx,
+            seens: RefCell::new(HashSet::new()),
+            sender: mta_tx,
             tasks,
         }
     }
@@ -206,7 +210,7 @@ impl PersonRegistry {
         self.tasks.push(cx.spawn(async move |this, cx| {
             if let Ok(persons) = task.await {
                 this.update(cx, |this, cx| {
-                    this.bulk_insert(persons, cx);
+                    this.bulk_inserts(persons, cx);
                 })
                 .ok();
             }
@@ -245,7 +249,7 @@ impl PersonRegistry {
     }
 
     /// Insert batch of persons
-    fn bulk_insert(&mut self, persons: Vec<Person>, cx: &mut Context<Self>) {
+    fn bulk_inserts(&mut self, persons: Vec<Person>, cx: &mut Context<Self>) {
         for person in persons.into_iter() {
             let public_key = person.public_key();
             self.persons
@@ -280,7 +284,7 @@ impl PersonRegistry {
 
         let public_key = *public_key;
 
-        if self.seen.write().unwrap().insert(public_key) {
+        if self.seens.borrow_mut().insert(public_key) {
             let sender = self.sender.clone();
 
             // Spawn background task to request metadata

crates/person/src/person.rs

@@ -5,6 +5,8 @@ use gpui::SharedString;
 use nostr_sdk::prelude::*;
 use state::Announcement;
 
+const IMAGE_RESIZER: &str = "https://wsrv.nl";
+
 /// Person
 #[derive(Debug, Clone)]
 pub struct Person {
@@ -109,7 +111,13 @@ impl Person {
             .picture
             .as_ref()
             .filter(|picture| !picture.is_empty())
-            .map(|picture| picture.into())
+            .map(|picture| {
+                let encoded_picture = urlencoding::encode(picture);
+                let url = format!(
+                    "{IMAGE_RESIZER}/?url={encoded_picture}&w=100&h=100&fit=cover&mask=circle&n=-1"
+                );
+                url.into()
+            })
             .unwrap_or_else(|| "brand/avatar.png".into())
     }
 

crates/settings/src/lib.rs

@@ -1,3 +1,4 @@
+use std::fmt::Display;
 use std::rc::Rc;
 
 use anyhow::{Error, anyhow};
@@ -12,9 +13,6 @@ pub fn init(window: &mut Window, cx: &mut App) {
     AppSettings::set_global(cx.new(|cx| AppSettings::new(window, cx)), cx)
 }
 
-const DEFAULT_FILE_SERVER: &str = "https://nostr.download/";
-const LEGACY_FILE_SERVER: &str = "blossom.band";
-
 macro_rules! setting_accessors {
     ($(pub $field:ident: $type:ty),* $(,)?) => {
         impl AppSettings {
@@ -44,10 +42,28 @@ setting_accessors! {
     pub hide_avatar: bool,
     pub screening: bool,
     pub nip4e: bool,
+    pub auth_mode: AuthMode,
     pub trusted_relays: Vec<String>,
     pub file_server: Url,
 }
 
+/// Authentication mode
+#[derive(Debug, Clone, Default, Serialize, Deserialize, PartialEq, Eq, PartialOrd, Ord)]
+pub enum AuthMode {
+    #[default]
+    Auto,
+    Manual,
+}
+
+impl Display for AuthMode {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        match self {
+            AuthMode::Auto => write!(f, "Auto"),
+            AuthMode::Manual => write!(f, "Ask every time"),
+        }
+    }
+}
+
 /// Signer kind
 #[derive(Debug, Clone, Default, Serialize, Deserialize, PartialEq, Eq, PartialOrd, Ord)]
 pub enum SignerKind {
@@ -125,6 +141,9 @@ pub struct Settings {
     /// Enable decoupling encryption key
     pub nip4e: bool,
 
+    /// Authentication mode
+    pub auth_mode: AuthMode,
+
     /// Trusted relays; Coop will automatically authenticate with these relays
     pub trusted_relays: Vec<String>,
 
@@ -140,8 +159,9 @@ impl Default for Settings {
             hide_avatar: false,
             screening: true,
             nip4e: false,
+            auth_mode: AuthMode::default(),
             trusted_relays: vec![],
-            file_server: Url::parse(DEFAULT_FILE_SERVER).unwrap(),
+            file_server: Url::parse("https://blossom.band/").unwrap(),
         }
     }
 }
@@ -220,12 +240,7 @@ impl AppSettings {
         });
 
         cx.spawn_in(window, async move |this, cx| {
-            let mut settings = task.await.unwrap_or(Settings::default());
-
-            // Move settings still pointed at the old default file server over to the new one
-            if settings.file_server.host_str() == Some(LEGACY_FILE_SERVER) {
-                settings.file_server = Url::parse(DEFAULT_FILE_SERVER).unwrap();
-            }
+            let settings = task.await.unwrap_or(Settings::default());
 
             // Update settings
             this.update_in(cx, |this, window, cx| {

crates/state/Cargo.toml

@@ -14,7 +14,6 @@ nostr-blossom.workspace = true
 nostr-connect.workspace = true
 
 gpui.workspace = true
-instant.workspace = true
 flume.workspace = true
 futures.workspace = true
 log.workspace = true
@@ -24,15 +23,10 @@ serde_json.workspace = true
 
 mime_guess = "2.0.4"
 
-aes-gcm.workspace = true
-sha2.workspace = true
-data-encoding.workspace = true
-
 [target.'cfg(target_arch = "wasm32")'.dependencies]
 nostr-memory.workspace = true
 
 [target.'cfg(not(target_arch = "wasm32"))'.dependencies]
-browser-signer-proxy = { path = "../browser-signer-proxy" }
 nostr-lmdb.workspace = true
 smol.workspace = true
 gpui_tokio.workspace = true

crates/state/src/blossom.rs

@@ -4,52 +4,30 @@ use anyhow::{Error, anyhow};
 use gpui::AsyncApp;
 #[cfg(not(target_arch = "wasm32"))]
 use gpui_tokio::Tokio;
-#[cfg(not(target_arch = "wasm32"))]
 use mime_guess::from_path;
 use nostr_blossom::prelude::*;
 use nostr_sdk::prelude::*;
 
 #[cfg(not(target_arch = "wasm32"))]
-use crate::file::sha256_hex;
-
-/// Upload a blob to a blossom server and return its URL
-#[cfg(not(target_arch = "wasm32"))]
-pub(crate) async fn upload_blob(
-    server: &Url,
-    data: Vec<u8>,
-    content_type: &str,
-    sha256: &str,
-    cx: &AsyncApp,
-) -> Result<Url, Error> {
-    let client = BlossomClient::new(server.clone());
+pub async fn upload(server: Url, path: PathBuf, cx: &AsyncApp) -> Result<Url, Error> {
+    let content_type = from_path(&path).first_or_octet_stream().to_string();
+    let data = smol::fs::read(path).await?;
     let keys = Keys::generate();
-    let content_type = content_type.to_string();
-    let base = server.clone();
-    let hash = sha256.to_string();
+
+    // Construct the blossom client
+    let client = BlossomClient::new(server);
 
     Tokio::spawn(cx, async move {
-        match client
+        let blob = client
             .upload_blob(data, Some(content_type), None, Some(&keys))
-            .await
-        {
-            Ok(blob) => Ok(blob.url),
-            Err(e) if e.to_string().contains("201 Created") => Ok::<Url, Error>(base.join(&hash)?),
-            Err(e) => Err(anyhow!(e.to_string())),
-        }
+            .await?;
+
+        Ok(blob.url)
     })
     .await
     .map_err(|e| anyhow!("Upload error: {e}"))?
 }
 
-#[cfg(not(target_arch = "wasm32"))]
-pub async fn upload(server: Url, path: PathBuf, cx: &AsyncApp) -> Result<Url, Error> {
-    let content_type = from_path(&path).first_or_octet_stream().to_string();
-    let data = smol::fs::read(&path).await?;
-    let sha256 = sha256_hex(&data);
-
-    upload_blob(&server, data, &content_type, &sha256, cx).await
-}
-
 #[cfg(target_arch = "wasm32")]
 pub async fn upload(_server: Url, _path: PathBuf, _cx: &AsyncApp) -> Result<Url, Error> {
     Err(anyhow!("File upload not supported on web"))

crates/state/src/constants.rs

@@ -14,6 +14,9 @@ pub const USER_KEYRING: &str = "Coop User Credential";
 /// Default timeout for subscription
 pub const TIMEOUT: u64 = 2;
 
+/// Default image cache size
+pub const IMAGE_CACHE_SIZE: usize = 20;
+
 /// Default delay for searching
 pub const FIND_DELAY: u64 = 600;
 
@@ -36,15 +39,14 @@ pub const NOSTR_CONNECT_RELAY: &str = "wss://relay.nip46.com";
 pub const WOT_RELAYS: [&str; 1] = ["wss://relay.vertexlab.io"];
 
 /// Default search relays
-pub const INDEXER_RELAYS: [&str; 2] = ["wss://indexer.coracle.social", "wss://user.kindpag.es"];
+pub const INDEXER_RELAYS: [&str; 1] = ["wss://indexer.coracle.social"];
 
 /// Default search relays
 pub const SEARCH_RELAYS: [&str; 2] = ["wss://antiprimal.net", "wss://search.nos.today"];
 
 /// Default bootstrap relays
-pub const BOOTSTRAP_RELAYS: [&str; 4] = [
+pub const BOOTSTRAP_RELAYS: [&str; 3] = [
     "wss://relay.ditto.pub",
     "wss://relay.primal.net",
-    "wss://relay.nostr.net",
-    "wss://profiles.nostr1.com",
+    "wss://user.kindpag.es",
 ];

crates/state/src/file.rs

@@ -1,337 +0,0 @@
-use std::path::PathBuf;
-
-use aes_gcm::aead::consts::{U12, U16, U32};
-use aes_gcm::aead::{Aead, AeadCore, KeyInit, OsRng};
-use aes_gcm::aes::Aes256;
-use aes_gcm::{Aes256Gcm, AesGcm, Nonce};
-use anyhow::{Error, anyhow, bail};
-use data_encoding::HEXLOWER;
-use futures::AsyncReadExt;
-use gpui::http_client::AsyncBody;
-use gpui::{AsyncApp, SharedString};
-#[cfg(not(target_arch = "wasm32"))]
-use mime_guess::from_path;
-use nostr::nips::nip94::Sha256Hash;
-use nostr_sdk::prelude::*;
-use sha2::{Digest, Sha256};
-
-pub const ALGORITHM: &str = "aes-gcm";
-
-pub const MAX_FILE_SIZE: usize = 25 * 1024 * 1024;
-
-const TAG_SHA256: &str = "x";
-const TAG_ORIGINAL_SHA256: &str = "ox";
-const TAG_FILE_TYPE: &str = "file-type";
-const TAG_ALGORITHM: &str = "encryption-algorithm";
-const TAG_KEY: &str = "decryption-key";
-const TAG_NONCE: &str = "decryption-nonce";
-const TAG_SIZE: &str = "size";
-const TAG_DIM: &str = "dim";
-const TAG_ALT: &str = "alt";
-
-#[derive(Debug, Clone, PartialEq, Eq)]
-pub struct EncryptedFile {
-    pub data: Vec<u8>,
-    pub key: String,
-    pub nonce: String,
-}
-
-#[derive(Debug, Clone, PartialEq, Eq)]
-pub struct FileAttachment {
-    pub url: Url,
-    pub mime: String,
-    pub key: String,
-    pub nonce: String,
-    pub sha256: Option<String>,
-    pub original_sha256: Option<String>,
-    pub size: Option<u64>,
-    pub dim: Option<(u32, u32)>,
-    pub name: Option<String>,
-}
-
-impl FileAttachment {
-    pub fn tags(&self) -> Vec<Tag> {
-        let mut tags = vec![
-            Tag::custom(TAG_FILE_TYPE, [self.mime.clone()]),
-            Tag::custom(TAG_ALGORITHM, [ALGORITHM]),
-            Tag::custom(TAG_KEY, [self.key.clone()]),
-            Tag::custom(TAG_NONCE, [self.nonce.clone()]),
-        ];
-
-        if let Some(sha256) = &self.sha256 {
-            tags.push(Tag::custom(TAG_SHA256, [sha256.clone()]));
-        }
-
-        if let Some(original_sha256) = &self.original_sha256 {
-            tags.push(Tag::custom(TAG_ORIGINAL_SHA256, [original_sha256.clone()]));
-        }
-
-        if let Some(size) = self.size {
-            tags.push(Tag::custom(TAG_SIZE, [size.to_string()]));
-        }
-
-        if let Some((width, height)) = self.dim {
-            tags.push(Tag::custom(TAG_DIM, [format!("{width}x{height}")]));
-        }
-
-        if let Some(name) = &self.name {
-            tags.push(Tag::custom(TAG_ALT, [name.clone()]));
-        }
-
-        tags
-    }
-
-    pub fn from_tags(content: &str, tags: &Tags) -> Option<Self> {
-        if tag_value(tags, TAG_ALGORITHM)? != ALGORITHM {
-            return None;
-        }
-
-        Some(Self {
-            url: Url::parse(content).ok()?,
-            mime: tag_value(tags, TAG_FILE_TYPE)?.to_string(),
-            key: tag_value(tags, TAG_KEY)?.to_string(),
-            nonce: tag_value(tags, TAG_NONCE)?.to_string(),
-            sha256: tag_value(tags, TAG_SHA256).map(str::to_string),
-            original_sha256: tag_value(tags, TAG_ORIGINAL_SHA256).map(str::to_string),
-            size: tag_value(tags, TAG_SIZE).and_then(|size| size.parse().ok()),
-            dim: tag_value(tags, TAG_DIM).and_then(parse_dim),
-            name: tag_value(tags, TAG_ALT).map(str::to_string),
-        })
-    }
-
-    pub fn is_image(&self) -> bool {
-        self.mime.starts_with("image/")
-    }
-
-    pub fn display_name(&self) -> SharedString {
-        if let Some(name) = &self.name {
-            return name.clone().into();
-        }
-
-        match self.size {
-            Some(size) => format!("{} ({size} bytes)", self.mime).into(),
-            None => self.mime.clone().into(),
-        }
-    }
-}
-
-pub fn encrypt(data: &[u8]) -> Result<EncryptedFile, Error> {
-    let key = Aes256Gcm::generate_key(OsRng);
-    let nonce = AesGcm::<Aes256, U16>::generate_nonce(OsRng);
-    let cipher = AesGcm::<Aes256, U16>::new(&key);
-
-    let data = cipher
-        .encrypt(&nonce, data)
-        .map_err(|_| anyhow!("Failed to encrypt file"))?;
-
-    Ok(EncryptedFile {
-        data,
-        key: HEXLOWER.encode(key.as_slice()),
-        nonce: HEXLOWER.encode(nonce.as_slice()),
-    })
-}
-
-pub fn decrypt(data: &[u8], key: &str, nonce: &str) -> Result<Vec<u8>, Error> {
-    let key = decode(key, "decryption key")?;
-    let nonce = decode(nonce, "decryption nonce")?;
-
-    if key.len() != 32 {
-        bail!(
-            "Invalid decryption key length: expected 32 bytes, got {}",
-            key.len()
-        );
-    }
-
-    match nonce.len() {
-        12 => Aes256Gcm::new_from_slice(&key)
-            .map_err(|_| anyhow!("Invalid decryption key"))?
-            .decrypt(Nonce::<U12>::from_slice(&nonce), data)
-            .map_err(|_| anyhow!("Failed to decrypt file")),
-        16 => AesGcm::<Aes256, U16>::new_from_slice(&key)
-            .map_err(|_| anyhow!("Invalid decryption key"))?
-            .decrypt(Nonce::<U16>::from_slice(&nonce), data)
-            .map_err(|_| anyhow!("Failed to decrypt file")),
-        32 => AesGcm::<Aes256, U32>::new_from_slice(&key)
-            .map_err(|_| anyhow!("Invalid decryption key"))?
-            .decrypt(Nonce::<U32>::from_slice(&nonce), data)
-            .map_err(|_| anyhow!("Failed to decrypt file")),
-        len => bail!("Unsupported decryption nonce length: {len} bytes"),
-    }
-}
-
-pub fn sha256_hex(data: &[u8]) -> String {
-    let hash: [u8; 32] = Sha256::digest(data).into();
-
-    Sha256Hash::from_byte_array(hash).to_hex()
-}
-
-#[cfg(not(target_arch = "wasm32"))]
-pub async fn upload_encrypted(
-    server: Url,
-    path: PathBuf,
-    cx: &AsyncApp,
-) -> Result<FileAttachment, Error> {
-    let mime = from_path(&path).first_or_octet_stream().to_string();
-    let name = path
-        .file_name()
-        .map(|name| name.to_string_lossy().into_owned());
-    let data = smol::fs::read(&path).await?;
-
-    let encrypted = encrypt(&data)?;
-    let sha256 = sha256_hex(&encrypted.data);
-    let original_sha256 = sha256_hex(&data);
-    let size = encrypted.data.len() as u64;
-    let base_url = server.to_string();
-
-    let url = crate::blossom::upload_blob(
-        &server,
-        encrypted.data,
-        "application/octet-stream",
-        &sha256,
-        cx,
-    )
-    .await
-    .map_err(|e| {
-        let message = e.to_string();
-
-        if !message.contains("415") {
-            return anyhow!(message);
-        }
-
-        anyhow!(
-            "{base_url} rejected the encrypted file. Encrypted attachments are uploaded as
-             opaque data, which this file server does not accept. Choose a different file
-             server in the settings."
-        )
-    })?;
-
-    Ok(FileAttachment {
-        url,
-        mime,
-        key: encrypted.key,
-        nonce: encrypted.nonce,
-        sha256: Some(sha256),
-        original_sha256: Some(original_sha256),
-        size: Some(size),
-        dim: None,
-        name,
-    })
-}
-
-#[cfg(target_arch = "wasm32")]
-pub async fn upload_encrypted(
-    _server: Url,
-    _path: PathBuf,
-    _cx: &AsyncApp,
-) -> Result<FileAttachment, Error> {
-    Err(anyhow!("File upload not supported on web"))
-}
-
-pub async fn download_and_decrypt(
-    url: &Url,
-    key: &str,
-    nonce: &str,
-    expected_sha256: Option<&str>,
-    cx: &AsyncApp,
-) -> Result<Vec<u8>, Error> {
-    let client = cx.update(|app| app.http_client());
-    let response = client.get(url.as_str(), AsyncBody::default(), true).await?;
-
-    if !response.status().is_success() {
-        bail!("Failed to download file: HTTP {}", response.status());
-    }
-
-    let mut data = Vec::new();
-    response
-        .into_body()
-        .take(MAX_FILE_SIZE as u64 + 1)
-        .read_to_end(&mut data)
-        .await?;
-
-    if data.len() > MAX_FILE_SIZE {
-        bail!("File is too large (max {MAX_FILE_SIZE} bytes)");
-    }
-
-    if let Some(expected) = expected_sha256
-        && !sha256_hex(&data).eq_ignore_ascii_case(expected)
-    {
-        bail!("File hash mismatch");
-    }
-
-    decrypt(&data, key, nonce)
-}
-
-/// Download and decrypt a file attachment into a temporary file.
-///
-/// The same attachment always maps to the same path, so callers can render the
-/// result directly (e.g. with `img`) without downloading it more than once.
-#[cfg(not(target_arch = "wasm32"))]
-pub async fn download_and_decrypt_to_file(
-    file: &FileAttachment,
-    cx: &AsyncApp,
-) -> Result<PathBuf, Error> {
-    let name = file
-        .sha256
-        .clone()
-        .unwrap_or_else(|| sha256_hex(file.url.as_str().as_bytes()));
-
-    let extension = mime_guess::get_mime_extensions_str(&file.mime)
-        .and_then(|extensions| extensions.first())
-        .copied()
-        .unwrap_or("bin");
-
-    let path = std::env::temp_dir()
-        .join("coop-files")
-        .join(format!("{name}.{extension}"));
-
-    if smol::fs::metadata(&path).await.is_ok() {
-        return Ok(path);
-    }
-
-    let data = download_and_decrypt(
-        &file.url,
-        &file.key,
-        &file.nonce,
-        file.sha256.as_deref(),
-        cx,
-    )
-    .await?;
-
-    let Some(parent) = path.parent() else {
-        bail!("Invalid file path");
-    };
-    smol::fs::create_dir_all(parent).await?;
-
-    // Write under a temporary name first, so an interrupted download is never reused
-    let partial = path.with_extension("download");
-    smol::fs::write(&partial, data).await?;
-    smol::fs::rename(&partial, &path).await?;
-
-    Ok(path)
-}
-
-#[cfg(target_arch = "wasm32")]
-pub async fn download_and_decrypt_to_file(
-    _file: &FileAttachment,
-    _cx: &AsyncApp,
-) -> Result<PathBuf, Error> {
-    Err(anyhow!("File download not supported on web"))
-}
-
-fn tag_value<'a>(tags: &'a Tags, name: &str) -> Option<&'a str> {
-    tags.iter()
-        .find(|tag| tag.kind() == name)
-        .and_then(|tag| tag.content())
-}
-
-fn parse_dim(value: &str) -> Option<(u32, u32)> {
-    let (width, height) = value.split_once('x')?;
-
-    Some((width.parse().ok()?, height.parse().ok()?))
-}
-
-fn decode(value: &str, label: &str) -> Result<Vec<u8>, Error> {
-    HEXLOWER
-        .decode(value.to_ascii_lowercase().as_bytes())
-        .map_err(|_| anyhow!("Invalid {label} encoding"))
-}

crates/state/src/lib.rs

@@ -1,12 +1,9 @@
 use std::collections::HashMap;
+use std::time::Duration;
 
 use anyhow::{Error, anyhow};
-#[cfg(not(target_arch = "wasm32"))]
-use browser_signer_proxy::prelude::*;
 use common::config_dir;
 use gpui::{App, AppContext, Context, Entity, EventEmitter, Global, Task, Window};
-use gpui_tokio::Tokio;
-use instant::Duration;
 use nostr_connect::prelude::*;
 use nostr_gossip_memory::prelude::*;
 #[cfg(not(target_arch = "wasm32"))]
@@ -17,19 +14,17 @@ use nostr_sdk::prelude::*;
 
 mod blossom;
 mod constants;
-mod file;
 mod nip05;
 mod nip4e;
 mod signer;
 
 pub use blossom::*;
 pub use constants::*;
-pub use file::*;
 pub use nip4e::*;
 pub use nip05::*;
 pub use signer::{CoopAuthUrlHandler, UniversalSigner};
 
-pub fn init(window: &mut Window, cx: &mut App, cli_key: Option<SecretKey>) {
+pub fn init(window: &mut Window, cx: &mut App) {
     // 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`.
@@ -42,7 +37,7 @@ pub fn init(window: &mut Window, cx: &mut App, cli_key: Option<SecretKey>) {
     #[cfg(not(target_arch = "wasm32"))]
     gpui_tokio::init(cx);
 
-    NostrRegistry::set_global(cx.new(|cx| NostrRegistry::new(window, cx, cli_key)), cx);
+    NostrRegistry::set_global(cx.new(|cx| NostrRegistry::new(window, cx)), cx);
 }
 
 struct GlobalNostrRegistry(Entity<NostrRegistry>);
@@ -63,16 +58,16 @@ pub enum StateEvent {
 }
 
 impl StateEvent {
-    pub fn signer_changed(&self) -> bool {
-        matches!(self, StateEvent::SignerChanged)
-    }
-
     pub fn error<T>(error: T) -> Self
     where
         T: Into<String>,
     {
         Self::Error(error.into())
     }
+
+    pub fn signer_changed(&self) -> bool {
+        matches!(self, StateEvent::SignerChanged)
+    }
 }
 
 /// Nostr Registry
@@ -105,7 +100,7 @@ impl NostrRegistry {
     }
 
     /// Create a new nostr instance
-    fn new(window: &mut Window, cx: &mut Context<Self>, cli_key: Option<SecretKey>) -> Self {
+    fn new(window: &mut Window, cx: &mut Context<Self>) -> Self {
         let signer = UniversalSigner::new(Keys::generate());
         let authenticator = SignerAuthenticator::new(signer.clone());
 
@@ -135,16 +130,7 @@ impl NostrRegistry {
         // Connect to bootstrap relays after the window is ready
         cx.defer_in(window, |this, _window, cx| {
             this.connect_bootstrap_relays(cx);
-
-            if cfg!(target_arch = "wasm32") {
-                cx.emit(StateEvent::NoSigner);
-            } else if let Some(secret) = cli_key {
-                // Use CLI-provided key -- same path as get_user_credential
-                let keys = Keys::new(secret);
-                this.set_signer(keys, cx);
-            } else {
-                this.get_user_credential(cx);
-            }
+            this.get_user_credential(cx);
         });
 
         Self {
@@ -267,11 +253,6 @@ impl NostrRegistry {
                             this.set_signer(signer, cx);
                             cx.notify();
                         })?;
-                    } else if content == "proxy" {
-                        #[cfg(not(target_arch = "wasm32"))]
-                        this.update(cx, |this, cx| {
-                            this.connect_proxy(cx);
-                        })?;
                     }
                 }
                 _ => {
@@ -287,10 +268,6 @@ impl NostrRegistry {
 
     /// Get the master key that used for Nostr Connect
     pub fn get_master_key(&self, cx: &App) -> Task<Keys> {
-        if cfg!(target_arch = "wasm32") {
-            return cx.background_spawn(async move { Keys::generate() });
-        }
-
         let task = cx.read_credentials(MASTER_KEYRING);
 
         cx.spawn(async move |cx| {
@@ -317,81 +294,6 @@ impl NostrRegistry {
         })
     }
 
-    /// Start the browser proxy
-    #[cfg(not(target_arch = "wasm32"))]
-    pub fn connect_proxy(&mut self, cx: &mut Context<Self>) {
-        let proxy = BrowserSignerProxy::new(BrowserSignerProxyOptions::default());
-        let (tx, rx) = flume::bounded::<String>(1);
-
-        self.tasks.push(Tokio::spawn_result(cx, {
-            let proxy = proxy.clone();
-            async move {
-                // Start the proxy and get the web url
-                proxy.start().await?;
-                // Notify GPUI
-                let url = proxy.url();
-                tx.send(url).ok();
-                Ok(())
-            }
-        }));
-
-        self.tasks.push(Tokio::spawn_result(cx, {
-            let proxy = proxy.clone();
-            async move {
-                loop {
-                    if proxy.is_session_active() {
-                        break;
-                    }
-                    smol::Timer::after(Duration::from_secs(1)).await;
-                }
-                Ok(())
-            }
-        }));
-
-        self.tasks.push(cx.spawn({
-            let proxy = proxy.clone();
-            async move |this, cx| {
-                while let Ok(url) = rx.recv_async().await {
-                    this.update(cx, |this, cx| {
-                        let save = cx.write_credentials(USER_KEYRING, "proxy", b"proxy");
-                        cx.background_spawn(async move { save.await.ok() }).detach();
-                        cx.open_url(&url);
-                        this.set_signer(proxy.clone(), cx);
-                    })?;
-                }
-                Ok(())
-            }
-        }));
-
-        // Monitor the session, if the browser disconnects, notify user to reconnect
-        self.tasks.push(cx.spawn({
-            let proxy = proxy.clone();
-            let executor = cx.background_executor().clone();
-            async move |this, cx| {
-                // Wait for the signer to be confirmed (timeout is 30s)
-                executor.timer(Duration::from_secs(30)).await;
-
-                loop {
-                    executor.timer(Duration::from_secs(5)).await;
-                    if !proxy.is_session_active() {
-                        _ = this.update(cx, |this, cx| {
-                            // Only notify if this proxy is still the active signer
-                            if this.current_user.is_some() {
-                                this.signer.swap_inner(Keys::generate());
-                                this.current_user = None;
-                                cx.emit(StateEvent::NoSigner);
-                                cx.notify();
-                            }
-                        });
-                        break;
-                    }
-                }
-
-                Ok(())
-            }
-        }));
-    }
-
     /// Get the public key of a NIP-05 address
     pub fn query_address(&self, addr: Nip05Address, cx: &App) -> Task<Result<PublicKey, Error>> {
         let client = self.client();

crates/state/src/nip05.rs

@@ -4,7 +4,6 @@ use anyhow::Error;
 use futures::io::AsyncReadExt;
 use gpui::http_client::{AsyncBody, HttpClient};
 use nostr_sdk::prelude::*;
-use serde_json::Value;
 
 #[allow(async_fn_in_trait)]
 pub trait NostrAddress {

crates/theme/src/colors.rs

@@ -112,7 +112,7 @@ impl ThemeColors {
             elevated_surface_background: neutral().light().step_3(),
             panel_background: neutral().light().step_1(),
             overlay: neutral().light_alpha().step_3(),
-            title_bar: neutral().light().step_2(),
+            title_bar: neutral().light().step_3(),
             title_bar_inactive: neutral().light().step_1(),
             window_border: hsl(240.0, 5.9, 78.0),
 
@@ -198,7 +198,7 @@ impl ThemeColors {
             elevated_surface_background: neutral().dark().step_3(),
             panel_background: neutral().dark().step_1(),
             overlay: neutral().dark_alpha().step_3(),
-            title_bar: neutral().dark().step_2(),
+            title_bar: neutral().dark().step_3(),
             title_bar_inactive: neutral().dark().step_1(),
             window_border: hsl(240.0, 3.7, 28.0),
 

crates/theme/src/lib.rs

@@ -34,7 +34,7 @@ pub const CLIENT_SIDE_DECORATION_BORDER: Pixels = px(1.0);
 pub const TITLEBAR_HEIGHT: Pixels = px(36.0);
 
 /// Defines workspace tabbar height
-pub const TABBAR_HEIGHT: Pixels = px(44.0);
+pub const TABBAR_HEIGHT: Pixels = px(28.0);
 
 /// Defines default sidebar width
 pub const SIDEBAR_WIDTH: Pixels = px(240.);

crates/theme/src/theme.rs

@@ -64,7 +64,7 @@ impl Default for ThemeFamily {
             id: "coop".into(),
             name: "Coop Default Theme".into(),
             author: "Coop".into(),
-            url: "https://github.com/reyakov/coop".into(),
+            url: "https://github.com/lumehq/coop".into(),
             light: ThemeColors::light(),
             dark: ThemeColors::dark(),
         }
@@ -186,7 +186,7 @@ mod tests {
             "id": "test-theme",
             "name": "Test Theme",
             "author": "Coop",
-            "url": "https://github.com/reyakov/coop",
+            "url": "https://github.com/lumehq/coop",
             "light": {
                 "background": "#ffffff",
                 "surface_background": "#fafafa",

crates/ui/Cargo.toml

@@ -9,7 +9,6 @@ common = { path = "../common" }
 theme = { path = "../theme" }
 
 gpui.workspace = true
-instant.workspace = true
 serde.workspace = true
 smallvec.workspace = true
 anyhow.workspace = true

crates/ui/src/avatar.rs

@@ -1,8 +1,8 @@
 use gpui::prelude::FluentBuilder;
 use gpui::{
     AbsoluteLength, App, Div, Hsla, ImageSource, Img, InteractiveElement, Interactivity,
-    IntoElement, ObjectFit, ParentElement, RenderOnce, StyleRefinement, Styled, StyledImage,
-    Window, div, img, px,
+    IntoElement, ParentElement, RenderOnce, StyleRefinement, Styled, StyledImage, Window, div, img,
+    px,
 };
 use theme::ActiveTheme;
 
@@ -26,7 +26,9 @@ pub(super) fn avatar_size(size: Size) -> AbsoluteLength {
 /// ```
 /// use ui::{Avatar};
 ///
-/// Avatar::new("path/to/image.png").grayscale(true).border_color(gpui::red());
+/// Avatar::new("path/to/image.png")
+///     .grayscale(true)
+///     .border_color(gpui::red());
 /// ```
 #[derive(IntoElement)]
 pub struct Avatar {
@@ -128,7 +130,7 @@ impl RenderOnce for Avatar {
                 self.image
                     .size(image_size)
                     .rounded_full()
-                    .object_fit(ObjectFit::Cover)
+                    .object_fit(gpui::ObjectFit::Fill)
                     .bg(cx.theme().ghost_element_background)
                     .with_fallback(move || {
                         img("brand/avatar.png")

crates/ui/src/checkbox.rs

@@ -1,5 +1,5 @@
 use std::rc::Rc;
-use instant::Duration;
+use std::time::Duration;
 
 use gpui::prelude::FluentBuilder as _;
 use gpui::{

crates/ui/src/dock/dock.rs

@@ -214,8 +214,6 @@ impl Dock {
     pub fn set_open(&mut self, open: bool, window: &mut Window, cx: &mut Context<Self>) {
         self.open = open;
         let item = self.panel.clone();
-        // Use defer_in (not window.defer) so the callback is cancelled
-        // if this Dock entity is dropped before the deferred frame runs.
         cx.defer_in(window, move |_, window, cx| {
             item.set_collapsed(!open, window, cx);
         });

crates/ui/src/dock/mod.rs

@@ -2,10 +2,11 @@ use std::sync::Arc;
 
 use gpui::prelude::FluentBuilder;
 use gpui::{
-    AnyElement, AnyView, App, AppContext, Axis, Bounds, Context, Edges, Entity, EntityId,
-    EventEmitter, Focusable, InteractiveElement as _, IntoElement, ParentElement as _, Pixels,
-    Render, SharedString, Styled, Subscription, WeakEntity, Window, actions, div, px,
+    AnyElement, AnyView, App, AppContext, Axis, Bounds, Context, Decorations, Edges, Entity,
+    EntityId, EventEmitter, Focusable, InteractiveElement as _, IntoElement, ParentElement as _,
+    Pixels, Render, SharedString, Styled, Subscription, WeakEntity, Window, actions, div, px,
 };
+use theme::CLIENT_SIDE_DECORATION_ROUNDING;
 
 use crate::ElementExt;
 
@@ -109,8 +110,15 @@ impl DockItem {
         window: &mut Window,
         cx: &mut App,
     ) -> Self {
+        let mut items = items;
+
         let stack_panel = cx.new(|cx| {
             let mut stack_panel = StackPanel::new(axis, window, cx);
+            for (i, item) in items.iter_mut().enumerate() {
+                let view = item.view();
+                let size = sizes.get(i).copied().flatten();
+                stack_panel.add_panel(view.clone(), size, dock_area.clone(), window, cx)
+            }
 
             for (i, item) in items.iter().enumerate() {
                 let view = item.view();
@@ -737,22 +745,34 @@ impl EventEmitter<DockEvent> for DockArea {}
 impl Render for DockArea {
     fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
         let view = cx.entity().clone();
+        let decorations = window.window_decorations();
 
         div()
             .id("dock-area")
             .relative()
             .size_full()
+            .overflow_hidden()
             .on_prepaint(move |bounds, _, cx| view.update(cx, |r, _| r.bounds = bounds))
             .map(|this| {
                 if let Some(zoom_view) = self.zoom_view.clone() {
-                    this.child(zoom_view)
+                    this.map(|this| match decorations {
+                        Decorations::Server => this,
+                        Decorations::Client { tiling } => this
+                            .when(!(tiling.top || tiling.right), |div| {
+                                div.rounded_br(CLIENT_SIDE_DECORATION_ROUNDING)
+                            })
+                            .when(!(tiling.top || tiling.left), |div| {
+                                div.rounded_bl(CLIENT_SIDE_DECORATION_ROUNDING)
+                            }),
+                    })
+                    .child(zoom_view)
                 } else {
                     // render dock
                     this.child(
                         div()
                             .flex()
                             .flex_row()
-                            .size_full()
+                            .h_full()
                             // Left dock
                             .when_some(self.left_dock.clone(), |this, dock| {
                                 this.child(div().flex().flex_none().child(dock))
@@ -763,8 +783,14 @@ impl Render for DockArea {
                                     .flex()
                                     .flex_1()
                                     .flex_col()
+                                    .overflow_hidden()
                                     // Top center
-                                    .child(div().flex_1().child(self.render_items(window, cx)))
+                                    .child(
+                                        div()
+                                            .flex_1()
+                                            .overflow_hidden()
+                                            .child(self.render_items(window, cx)),
+                                    )
                                     // Bottom Dock
                                     .when_some(self.bottom_dock.clone(), |this, dock| {
                                         this.child(dock)

crates/ui/src/dock/stack_panel.rs

@@ -1,12 +1,13 @@
 use std::sync::Arc;
 
+use gpui::prelude::FluentBuilder;
 use gpui::{
     App, AppContext, Axis, Context, DismissEvent, Entity, EventEmitter, FocusHandle, Focusable,
     IntoElement, ParentElement, Pixels, Render, SharedString, Styled, Subscription, WeakEntity,
     Window,
 };
 use smallvec::SmallVec;
-use theme::{AxisExt as _, Placement};
+use theme::{ActiveTheme, AxisExt as _, CLIENT_SIDE_DECORATION_ROUNDING, Placement};
 
 use super::{DockArea, PanelEvent};
 use crate::dock::panel::{Panel, PanelView};
@@ -368,20 +369,26 @@ impl Focusable for StackPanel {
 }
 
 impl EventEmitter<PanelEvent> for StackPanel {}
-
 impl EventEmitter<DismissEvent> for StackPanel {}
 
 impl Render for StackPanel {
     fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        h_flex().size_full().overflow_hidden().child(
-            ResizablePanelGroup::new("stack-panel-group")
-                .with_state(&self.state)
-                .axis(self.axis)
-                .children(self.panels.clone().into_iter().map(|panel| {
-                    resizable_panel()
-                        .child(panel.view())
-                        .visible(panel.visible(cx))
-                })),
-        )
+        h_flex()
+            .size_full()
+            .overflow_hidden()
+            .bg(cx.theme().panel_background)
+            .when(cx.theme().platform.is_linux(), |this| {
+                this.rounded_br(CLIENT_SIDE_DECORATION_ROUNDING)
+            })
+            .child(
+                ResizablePanelGroup::new("stack-panel-group")
+                    .with_state(&self.state)
+                    .axis(self.axis)
+                    .children(self.panels.clone().into_iter().map(|panel| {
+                        resizable_panel()
+                            .child(panel.view())
+                            .visible(panel.visible(cx))
+                    })),
+            )
     }
 }

crates/ui/src/dock/tab_panel.rs

@@ -7,7 +7,7 @@ use gpui::{
     ParentElement, Pixels, Render, ScrollHandle, SharedString, StatefulInteractiveElement, Styled,
     WeakEntity, Window, div, px, rems,
 };
-use theme::{ActiveTheme, AxisExt, Placement, TABBAR_HEIGHT};
+use theme::{ActiveTheme, AxisExt, CLIENT_SIDE_DECORATION_ROUNDING, Placement, TABBAR_HEIGHT};
 
 use crate::button::{Button, ButtonVariants as _};
 use crate::dock::dock::DockPlacement;
@@ -51,7 +51,7 @@ impl Render for DragPanel {
             .overflow_hidden()
             .whitespace_nowrap()
             .rounded(cx.theme().radius)
-            .text_sm()
+            .text_xs()
             .text_color(cx.theme().text)
             .text_ellipsis()
             .when(cx.theme().shadow, |this| this.shadow_xs())
@@ -312,7 +312,6 @@ impl TabPanel {
 
         cx.emit(PanelEvent::ZoomOut);
         cx.emit(PanelEvent::LayoutChanged);
-        cx.notify();
     }
 
     fn detach_panel(
@@ -322,22 +321,10 @@ impl TabPanel {
         cx: &mut Context<Self>,
     ) {
         let panel_view = panel.view();
-        let removed_ix = self.panels.iter().position(|p| p.view() == panel_view);
         self.panels.retain(|p| p.view() != panel_view);
 
         if self.active_ix >= self.panels.len() {
             self.set_active_ix(self.panels.len().saturating_sub(1), window, cx)
-        } else if let Some(removed_ix) = removed_ix {
-            if removed_ix < self.active_ix {
-                self.active_ix = self.active_ix.saturating_sub(1);
-            } else if removed_ix == self.active_ix {
-                // The active panel was removed and another panel shifted into
-                // its position. Activate the new panel at the same index.
-                if let Some(new_active) = self.panels.get(self.active_ix) {
-                    new_active.set_active(true, cx);
-                }
-                self.focus_active_panel(window, cx);
-            }
         }
     }
 
@@ -580,7 +567,6 @@ impl TabPanel {
         let left_dock_button = self.render_dock_toggle_button(DockPlacement::Left, window, cx);
         let bottom_dock_button = self.render_dock_toggle_button(DockPlacement::Bottom, window, cx);
         let right_dock_button = self.render_dock_toggle_button(DockPlacement::Right, window, cx);
-
         let has_extend_dock_button = left_dock_button.is_some() || bottom_dock_button.is_some();
         let tabs_count = self.panels.len();
         let is_bottom_dock = bottom_dock_button.is_some();
@@ -600,7 +586,6 @@ impl TabPanel {
                 .py_2()
                 .pl_3()
                 .pr_2()
-                .rounded_t(cx.theme().radius_lg)
                 .bg(cx.theme().panel_background)
                 .when(left_dock_button.is_some(), |this| this.pl_2())
                 .when(right_dock_button.is_some(), |this| this.pr_2())
@@ -626,7 +611,7 @@ impl TabPanel {
                             div()
                                 .w_full()
                                 .text_ellipsis()
-                                .text_sm()
+                                .text_xs()
                                 .child(panel.title(cx)),
                         )
                         .when(state.draggable, |this| {
@@ -656,14 +641,17 @@ impl TabPanel {
         TabBar::new("tab-bar")
             .track_scroll(&self.tab_bar_scroll_handle)
             .h(TABBAR_HEIGHT)
-            .bg(cx.theme().panel_background)
-            .rounded_t(cx.theme().radius_lg)
             .when(has_extend_dock_button, |this| {
                 this.prefix(
                     h_flex()
                         .items_center()
                         .top_0()
                         .right(-px(1.))
+                        .border_r_1()
+                        .border_b_1()
+                        .h_full()
+                        .border_color(cx.theme().border)
+                        .bg(cx.theme().tab_background)
                         .pl_0p5()
                         .pr_1()
                         .children(left_dock_button)
@@ -700,7 +688,6 @@ impl TabPanel {
                                 .on_click(cx.listener({
                                     let panel = panel.clone();
                                     move |view, _ev, window, cx| {
-                                        cx.stop_propagation();
                                         view.remove_panel(&panel, window, cx);
                                     }
                                 })),
@@ -793,8 +780,12 @@ impl TabPanel {
                         .top_0()
                         .right_0()
                         .h_full()
+                        .border_l_1()
+                        .border_b_1()
                         .px_0p5()
                         .gap_1()
+                        .border_color(cx.theme().border)
+                        .bg(cx.theme().tab_background)
                         .child(self.render_toolbar(state, window, cx))
                         .when_some(right_dock_button, |this, btn| this.child(btn)),
                 )
@@ -824,8 +815,10 @@ impl TabPanel {
             .child(
                 div()
                     .size_full()
-                    .rounded_b(cx.theme().radius_lg)
                     .bg(cx.theme().panel_background)
+                    .when(cx.theme().platform.is_linux(), |this| {
+                        this.rounded_b(CLIENT_SIDE_DECORATION_ROUNDING)
+                    })
                     .overflow_hidden()
                     .child(
                         active_panel
@@ -1147,24 +1140,17 @@ impl Render for TabPanel {
             state.closable = false;
         }
 
-        div()
+        v_flex()
             .when(!self.collapsed, |this| {
                 this.on_action(cx.listener(Self::on_action_toggle_zoom))
                     .on_action(cx.listener(Self::on_action_close_panel))
             })
             .id("tab-panel")
+            .tab_group()
             .track_focus(&focus_handle)
             .size_full()
-            .p_1()
             .overflow_hidden()
-            .child(
-                v_flex()
-                    .rounded(cx.theme().radius_lg)
-                    .when(cx.theme().shadow, |this| this.shadow_xs())
-                    .size_full()
-                    .tab_group()
-                    .child(self.render_title_bar(&state, window, cx))
-                    .child(self.render_active_panel(&state, window, cx)),
-            )
+            .child(self.render_title_bar(&state, window, cx))
+            .child(self.render_active_panel(&state, window, cx))
     }
 }

crates/ui/src/history.rs

@@ -1,5 +1,5 @@
 use std::fmt::Debug;
-use instant::{Duration, Instant};
+use std::time::{Duration, Instant};
 
 /// A HistoryItem represents a single change in the history.
 /// It must implement Clone and PartialEq to be used in the History.

crates/ui/src/icon.rs

@@ -46,7 +46,6 @@ pub enum IconName {
     InboxFill,
     Link,
     Loader,
-    Lock,
     Moon,
     Plus,
     PlusCircle,
@@ -119,7 +118,6 @@ impl IconNamed for IconName {
             Self::InboxFill => "icons/inbox-fill.svg",
             Self::Link => "icons/link.svg",
             Self::Loader => "icons/loader.svg",
-            Self::Lock => "icons/lock.svg",
             Self::Moon => "icons/moon.svg",
             Self::Plus => "icons/plus.svg",
             Self::PlusCircle => "icons/plus-circle.svg",

crates/ui/src/indicator.rs

@@ -1,4 +1,4 @@
-use instant::Duration;
+use std::time::Duration;
 
 use gpui::prelude::FluentBuilder as _;
 use gpui::{

crates/ui/src/input/blink_cursor.rs

@@ -1,4 +1,4 @@
-use instant::Duration;
+use std::time::Duration;
 
 use gpui::{Context, Pixels, Task, px};
 

crates/ui/src/input/input.rs

@@ -35,6 +35,8 @@ pub struct Input {
     cleanable: bool,
     mask_toggle: bool,
     disabled: bool,
+    bordered: bool,
+    focus_bordered: bool,
     tab_index: isize,
     selected: bool,
 }
@@ -71,6 +73,8 @@ impl Input {
             cleanable: false,
             mask_toggle: false,
             disabled: false,
+            bordered: true,
+            focus_bordered: true,
             tab_index: 0,
             selected: false,
         }
@@ -104,6 +108,18 @@ impl Input {
         self
     }
 
+    /// Set the bordered for the input, default: true
+    pub fn bordered(mut self, bordered: bool) -> Self {
+        self.bordered = bordered;
+        self
+    }
+
+    /// Set focus border for the input, default is true.
+    pub fn focus_bordered(mut self, bordered: bool) -> Self {
+        self.focus_bordered = bordered;
+        self
+    }
+
     /// Set whether to show the clear button when the input field is not empty, default is false.
     pub fn cleanable(mut self, cleanable: bool) -> Self {
         self.cleanable = cleanable;
@@ -316,6 +332,11 @@ impl RenderOnce for Input {
                 this.bg(bg)
                     .when(self.disabled, |this| this.opacity(0.5))
                     .rounded(cx.theme().radius)
+                    .when(self.bordered, |this| {
+                        this.border_color(cx.theme().border)
+                            .border_1()
+                            .when(cx.theme().shadow, |this| this.shadow_xs())
+                    })
             })
             .items_center()
             .gap(gap_x)

crates/ui/src/input/state.rs

@@ -383,7 +383,7 @@ impl InputState {
     pub fn new(window: &mut Window, cx: &mut Context<Self>) -> Self {
         let focus_handle = cx.focus_handle().tab_stop(true);
         let blink_cursor = cx.new(|_| BlinkCursor::new());
-        let history = History::new().group_interval(instant::Duration::from_secs(1));
+        let history = History::new().group_interval(std::time::Duration::from_secs(1));
 
         let _subscriptions = vec![
             // Observe the blink cursor to repaint the view when it changes.

crates/ui/src/list/list.rs

@@ -1,4 +1,5 @@
 use std::ops::Range;
+use std::time::Duration;
 
 use gpui::prelude::FluentBuilder;
 use gpui::{
@@ -8,7 +9,6 @@ use gpui::{
     SharedString, StatefulInteractiveElement, StyleRefinement, Styled, Subscription, Task,
     UniformListScrollHandle, Window, div, px, size, uniform_list,
 };
-use instant::Duration;
 use theme::ActiveTheme;
 
 use crate::actions::{Cancel, Confirm, SelectDown, SelectUp};

crates/ui/src/modal.rs

@@ -1,4 +1,5 @@
 use std::rc::Rc;
+use std::time::Duration;
 
 use gpui::prelude::FluentBuilder;
 use gpui::{
@@ -6,7 +7,6 @@ use gpui::{
     InteractiveElement, IntoElement, KeyBinding, MouseButton, ParentElement, Pixels, Point,
     RenderOnce, SharedString, StyleRefinement, Styled, Window, anchored, div, hsla, point, px,
 };
-use instant::Duration;
 use theme::ActiveTheme;
 
 use crate::actions::{Cancel, Confirm};
@@ -359,8 +359,8 @@ impl RenderOnce for Modal {
         let y = self.margin_top.unwrap_or(view_size.height / 10.) + offset_top;
         let x = bounds.center().x - self.width / 2.;
 
-        let mut padding_right = px(16.);
-        let mut padding_left = px(16.);
+        let mut padding_right = px(8.);
+        let mut padding_left = px(8.);
 
         if let Some(pl) = self.style.padding.left {
             padding_left = pl.to_pixels(self.width.into(), window.rem_size());
@@ -452,8 +452,8 @@ impl RenderOnce for Modal {
                             .when_some(self.max_width, |this, w| this.max_w(w))
                             .child(
                                 div()
-                                    .px_4()
-                                    .h_8()
+                                    .px_2()
+                                    .h_4()
                                     .w_full()
                                     .flex()
                                     .items_center()

crates/ui/src/notification.rs

@@ -1,7 +1,7 @@
 use std::any::TypeId;
 use std::collections::{HashMap, VecDeque};
 use std::rc::Rc;
-use instant::Duration;
+use std::time::Duration;
 
 use gpui::prelude::FluentBuilder;
 use gpui::{

crates/ui/src/resizable/resize_handle.rs

@@ -117,7 +117,7 @@ impl<T: 'static, E: 'static + Render> Element for ResizeHandle<T, E> {
                 cx.theme().border
             };
 
-            let mut ele = div()
+            let mut el = div()
                 .id(self.id.clone())
                 .occlude()
                 .absolute()
@@ -160,15 +160,16 @@ impl<T: 'static, E: 'static + Render> Element for ResizeHandle<T, E> {
                 })
                 .child(
                     div()
+                        .bg(bg_color)
                         .group_hover("handle", |this| this.bg(bg_color))
                         .when(axis.is_horizontal(), |this| this.h_full().w(HANDLE_SIZE))
                         .when(axis.is_vertical(), |this| this.w_full().h(HANDLE_SIZE)),
                 )
                 .into_any_element();
 
-            let layout_id = ele.request_layout(window, cx);
+            let layout_id = el.request_layout(window, cx);
 
-            ((layout_id, ele), state)
+            ((layout_id, el), state)
         })
     }
 

crates/ui/src/scroll/scrollbar.rs

@@ -2,6 +2,7 @@ use std::cell::Cell;
 use std::ops::Deref;
 use std::panic::Location;
 use std::rc::Rc;
+use std::time::{Duration, Instant};
 
 use gpui::{
     Anchor, App, Axis, BorderStyle, Bounds, ContentMask, CursorStyle, Edges, Element, ElementId,
@@ -10,7 +11,6 @@ use gpui::{
     Position, ScrollHandle, ScrollWheelEvent, Size, Style, UniformListScrollHandle, Window, fill,
     point, px, relative, size,
 };
-use instant::{Duration, Instant};
 use theme::{ActiveTheme, AxisExt, ScrollbarMode};
 
 /// The width of the scrollbar (THUMB_ACTIVE_INSET * 2 + THUMB_ACTIVE_WIDTH)
@@ -157,7 +157,7 @@ impl ScrollbarStateInner {
         let mut state = *self;
         state.hovered_axis = axis;
         if axis.is_some() {
-            state.last_scroll_time = Some(instant::Instant::now());
+            state.last_scroll_time = Some(std::time::Instant::now());
         }
         state
     }
@@ -166,7 +166,7 @@ impl ScrollbarStateInner {
         let mut state = *self;
         state.hovered_on_thumb = axis;
         if self.is_scrollbar_visible() && axis.is_some() {
-            state.last_scroll_time = Some(instant::Instant::now());
+            state.last_scroll_time = Some(std::time::Instant::now());
         }
         state
     }

crates/ui/src/skeleton.rs

@@ -1,4 +1,4 @@
-use instant::Duration;
+use std::time::Duration;
 
 use gpui::{
     bounce, div, ease_in_out, Animation, AnimationExt, IntoElement, RenderOnce, StyleRefinement,

crates/ui/src/styled.rs

@@ -14,7 +14,7 @@ pub fn v_flex() -> Div {
 
 /// Returns a `Div` as divider.
 pub fn divider(cx: &App) -> Div {
-    div().my_1().w_full().h_px().bg(cx.theme().border_variant)
+    div().my_2().w_full().h_px().bg(cx.theme().border_variant)
 }
 
 macro_rules! font_weight {
@@ -87,7 +87,7 @@ pub trait StyledExt: Styled + Sized {
             .border_1()
             .border_color(cx.theme().border)
             .shadow_md()
-            .rounded(cx.theme().radius_lg)
+            .rounded(cx.theme().radius)
     }
 }
 

crates/ui/src/switch.rs

@@ -1,6 +1,6 @@
 use std::cell::RefCell;
 use std::rc::Rc;
-use instant::Duration;
+use std::time::Duration;
 
 use gpui::prelude::FluentBuilder as _;
 use gpui::{

crates/ui/src/tab/mod.rs

@@ -2,15 +2,396 @@ use std::rc::Rc;
 
 use gpui::prelude::FluentBuilder as _;
 use gpui::{
-    AnyElement, App, ClickEvent, Div, InteractiveElement, IntoElement, MouseButton, ParentElement,
-    RenderOnce, SharedString, StatefulInteractiveElement, Styled, Window, div, px, relative,
+    AnyElement, App, ClickEvent, Div, Edges, Hsla, InteractiveElement, IntoElement, MouseButton,
+    ParentElement, Pixels, RenderOnce, SharedString, StatefulInteractiveElement, Styled, Window,
+    div, px, relative,
 };
-use theme::{ActiveTheme, TABBAR_HEIGHT};
+use theme::ActiveTheme;
 
-use crate::{Icon, IconName, Selectable, h_flex};
+use crate::{Icon, IconName, Selectable, Sizable, Size, StyledExt, h_flex};
 
 pub mod tab_bar;
 
+/// Tab variants.
+#[derive(Debug, Clone, Default, Copy, PartialEq, Eq, Hash)]
+pub enum TabVariant {
+    #[default]
+    Tab,
+    Outline,
+    Pill,
+    Segmented,
+    Underline,
+}
+
+impl TabVariant {
+    fn height(&self, size: Size) -> Pixels {
+        match size {
+            Size::XSmall => match self {
+                TabVariant::Underline => px(26.),
+                _ => px(20.),
+            },
+            Size::Small => match self {
+                TabVariant::Underline => px(30.),
+                _ => px(24.),
+            },
+            Size::Large => match self {
+                TabVariant::Underline => px(44.),
+                _ => px(36.),
+            },
+            _ => match self {
+                TabVariant::Underline => px(36.),
+                _ => px(32.),
+            },
+        }
+    }
+
+    fn inner_height(&self, size: Size) -> Pixels {
+        match size {
+            Size::XSmall => match self {
+                TabVariant::Tab | TabVariant::Outline | TabVariant::Pill => px(18.),
+                TabVariant::Segmented => px(16.),
+                TabVariant::Underline => px(20.),
+            },
+            Size::Small => match self {
+                TabVariant::Tab | TabVariant::Outline | TabVariant::Pill => px(22.),
+                TabVariant::Segmented => px(18.),
+                TabVariant::Underline => px(22.),
+            },
+            Size::Large => match self {
+                TabVariant::Tab | TabVariant::Outline | TabVariant::Pill => px(36.),
+                TabVariant::Segmented => px(28.),
+                TabVariant::Underline => px(32.),
+            },
+            _ => match self {
+                TabVariant::Tab => px(30.),
+                TabVariant::Outline | TabVariant::Pill => px(26.),
+                TabVariant::Segmented => px(24.),
+                TabVariant::Underline => px(26.),
+            },
+        }
+    }
+
+    /// Default px(12) to match panel px_3, See [`crate::dock::TabPanel`]
+    fn inner_paddings(&self, size: Size) -> Edges<Pixels> {
+        let mut padding_x = match size {
+            Size::XSmall => px(8.),
+            Size::Small => px(10.),
+            Size::Large => px(16.),
+            _ => px(12.),
+        };
+
+        if matches!(self, TabVariant::Underline) {
+            padding_x = px(0.);
+        }
+
+        Edges {
+            left: padding_x,
+            right: padding_x,
+            ..Default::default()
+        }
+    }
+
+    fn inner_margins(&self, size: Size) -> Edges<Pixels> {
+        match size {
+            Size::XSmall => match self {
+                TabVariant::Underline => Edges {
+                    top: px(1.),
+                    bottom: px(2.),
+                    ..Default::default()
+                },
+                _ => Edges::all(px(0.)),
+            },
+            Size::Small => match self {
+                TabVariant::Underline => Edges {
+                    top: px(2.),
+                    bottom: px(3.),
+                    ..Default::default()
+                },
+                _ => Edges::all(px(0.)),
+            },
+            Size::Large => match self {
+                TabVariant::Underline => Edges {
+                    top: px(5.),
+                    bottom: px(6.),
+                    ..Default::default()
+                },
+                _ => Edges::all(px(0.)),
+            },
+            _ => match self {
+                TabVariant::Underline => Edges {
+                    top: px(3.),
+                    bottom: px(4.),
+                    ..Default::default()
+                },
+                _ => Edges::all(px(0.)),
+            },
+        }
+    }
+
+    fn normal(&self, cx: &App) -> TabStyle {
+        match self {
+            TabVariant::Tab => TabStyle {
+                fg: cx.theme().tab_foreground,
+                bg: gpui::transparent_black(),
+                borders: Edges {
+                    left: px(1.),
+                    right: px(1.),
+                    ..Default::default()
+                },
+                border_color: gpui::transparent_black(),
+                ..Default::default()
+            },
+            TabVariant::Outline => TabStyle {
+                fg: cx.theme().tab_foreground,
+                bg: gpui::transparent_black(),
+                borders: Edges::all(px(1.)),
+                border_color: cx.theme().border,
+                ..Default::default()
+            },
+            TabVariant::Pill => TabStyle {
+                fg: cx.theme().text,
+                bg: gpui::transparent_black(),
+                ..Default::default()
+            },
+            TabVariant::Segmented => TabStyle {
+                fg: cx.theme().tab_foreground,
+                bg: gpui::transparent_black(),
+                ..Default::default()
+            },
+            TabVariant::Underline => TabStyle {
+                fg: cx.theme().tab_foreground,
+                bg: gpui::transparent_black(),
+                inner_bg: gpui::transparent_black(),
+                borders: Edges {
+                    bottom: px(2.),
+                    ..Default::default()
+                },
+                border_color: gpui::transparent_black(),
+                ..Default::default()
+            },
+        }
+    }
+
+    fn hovered(&self, selected: bool, cx: &App) -> TabStyle {
+        match self {
+            TabVariant::Tab => TabStyle {
+                fg: cx.theme().tab_foreground,
+                bg: gpui::transparent_black(),
+                borders: Edges {
+                    left: px(1.),
+                    right: px(1.),
+                    ..Default::default()
+                },
+                border_color: gpui::transparent_black(),
+                ..Default::default()
+            },
+            TabVariant::Outline => TabStyle {
+                fg: cx.theme().secondary_foreground,
+                bg: cx.theme().secondary_hover,
+                borders: Edges::all(px(1.)),
+                border_color: cx.theme().border,
+                ..Default::default()
+            },
+            TabVariant::Pill => TabStyle {
+                fg: cx.theme().secondary_foreground,
+                bg: cx.theme().secondary_background,
+                ..Default::default()
+            },
+            TabVariant::Segmented => TabStyle {
+                fg: cx.theme().tab_foreground,
+                bg: gpui::transparent_black(),
+                inner_bg: if selected {
+                    cx.theme().background
+                } else {
+                    gpui::transparent_black()
+                },
+                ..Default::default()
+            },
+            TabVariant::Underline => TabStyle {
+                fg: cx.theme().tab_foreground,
+                bg: gpui::transparent_black(),
+                inner_bg: gpui::transparent_black(),
+                borders: Edges {
+                    bottom: px(2.),
+                    ..Default::default()
+                },
+                border_color: gpui::transparent_black(),
+                ..Default::default()
+            },
+        }
+    }
+
+    fn selected(&self, cx: &App) -> TabStyle {
+        match self {
+            TabVariant::Tab => TabStyle {
+                fg: cx.theme().tab_active_foreground,
+                bg: cx.theme().tab_active_background,
+                borders: Edges {
+                    left: px(1.),
+                    right: px(1.),
+                    ..Default::default()
+                },
+                border_color: cx.theme().border,
+                ..Default::default()
+            },
+            TabVariant::Outline => TabStyle {
+                fg: cx.theme().text_accent,
+                bg: gpui::transparent_black(),
+                borders: Edges::all(px(1.)),
+                border_color: cx.theme().element_active,
+                ..Default::default()
+            },
+            TabVariant::Pill => TabStyle {
+                fg: cx.theme().element_foreground,
+                bg: cx.theme().element_background,
+                ..Default::default()
+            },
+            TabVariant::Segmented => TabStyle {
+                fg: cx.theme().tab_active_foreground,
+                bg: gpui::transparent_black(),
+                inner_bg: cx.theme().background,
+                shadow: true,
+                ..Default::default()
+            },
+            TabVariant::Underline => TabStyle {
+                fg: cx.theme().tab_active_foreground,
+                bg: gpui::transparent_black(),
+                borders: Edges {
+                    bottom: px(2.),
+                    ..Default::default()
+                },
+                border_color: cx.theme().element_active,
+                ..Default::default()
+            },
+        }
+    }
+
+    fn disabled(&self, selected: bool, cx: &App) -> TabStyle {
+        match self {
+            TabVariant::Tab => TabStyle {
+                fg: cx.theme().text_muted,
+                bg: gpui::transparent_black(),
+                border_color: if selected {
+                    cx.theme().border
+                } else {
+                    gpui::transparent_black()
+                },
+                borders: Edges {
+                    left: px(1.),
+                    right: px(1.),
+                    ..Default::default()
+                },
+                ..Default::default()
+            },
+            TabVariant::Outline => TabStyle {
+                fg: cx.theme().text_muted,
+                bg: gpui::transparent_black(),
+                borders: Edges::all(px(1.)),
+                border_color: if selected {
+                    cx.theme().element_active
+                } else {
+                    cx.theme().border
+                },
+                ..Default::default()
+            },
+            TabVariant::Pill => TabStyle {
+                fg: if selected {
+                    cx.theme().element_foreground.opacity(0.5)
+                } else {
+                    cx.theme().text_muted
+                },
+                bg: if selected {
+                    cx.theme().element_background.opacity(0.5)
+                } else {
+                    gpui::transparent_black()
+                },
+                ..Default::default()
+            },
+            TabVariant::Segmented => TabStyle {
+                fg: cx.theme().text_muted,
+                bg: cx.theme().tab_background,
+                inner_bg: if selected {
+                    cx.theme().background
+                } else {
+                    gpui::transparent_black()
+                },
+                ..Default::default()
+            },
+            TabVariant::Underline => TabStyle {
+                fg: cx.theme().text_muted,
+                bg: gpui::transparent_black(),
+                border_color: if selected {
+                    cx.theme().border
+                } else {
+                    gpui::transparent_black()
+                },
+                borders: Edges {
+                    bottom: px(2.),
+                    ..Default::default()
+                },
+                ..Default::default()
+            },
+        }
+    }
+
+    pub(super) fn tab_bar_radius(&self, size: Size, cx: &App) -> Pixels {
+        if *self != TabVariant::Segmented {
+            return px(0.);
+        }
+
+        match size {
+            Size::XSmall | Size::Small => cx.theme().radius,
+            Size::Large => cx.theme().radius_lg,
+            _ => cx.theme().radius_lg,
+        }
+    }
+
+    fn radius(&self, size: Size, cx: &App) -> Pixels {
+        match self {
+            TabVariant::Outline | TabVariant::Pill => px(99.),
+            TabVariant::Segmented => match size {
+                Size::XSmall | Size::Small => cx.theme().radius,
+                Size::Large => cx.theme().radius_lg,
+                _ => cx.theme().radius_lg,
+            },
+            _ => px(0.),
+        }
+    }
+
+    fn inner_radius(&self, size: Size, cx: &App) -> Pixels {
+        match self {
+            TabVariant::Segmented => match size {
+                Size::Large => self.tab_bar_radius(size, cx) - px(3.),
+                _ => self.tab_bar_radius(size, cx) - px(2.),
+            },
+            _ => px(0.),
+        }
+    }
+}
+
+#[allow(dead_code)]
+struct TabStyle {
+    borders: Edges<Pixels>,
+    border_color: Hsla,
+    bg: Hsla,
+    fg: Hsla,
+    shadow: bool,
+    inner_bg: Hsla,
+}
+
+impl Default for TabStyle {
+    fn default() -> Self {
+        TabStyle {
+            borders: Edges::all(px(0.)),
+            border_color: gpui::transparent_white(),
+            bg: gpui::transparent_white(),
+            fg: gpui::transparent_white(),
+            shadow: false,
+            inner_bg: gpui::transparent_white(),
+        }
+    }
+}
+
 #[allow(clippy::type_complexity)]
 /// A Tab element for the [`super::TabBar`].
 #[derive(IntoElement)]
@@ -23,6 +404,8 @@ pub struct Tab {
     pub(super) tab_bar_prefix: Option<bool>,
     suffix: Option<AnyElement>,
     children: Vec<AnyElement>,
+    variant: TabVariant,
+    size: Size,
     pub(super) disabled: bool,
     pub(super) selected: bool,
     on_click: Option<Rc<dyn Fn(&ClickEvent, &mut Window, &mut App) + 'static>>,
@@ -71,6 +454,8 @@ impl Default for Tab {
             selected: false,
             prefix: None,
             suffix: None,
+            variant: TabVariant::default(),
+            size: Size::default(),
             on_click: None,
         }
     }
@@ -94,6 +479,36 @@ impl Tab {
         self
     }
 
+    /// Set Tab Variant.
+    pub fn with_variant(mut self, variant: TabVariant) -> Self {
+        self.variant = variant;
+        self
+    }
+
+    /// Use Pill variant.
+    pub fn pill(mut self) -> Self {
+        self.variant = TabVariant::Pill;
+        self
+    }
+
+    /// Use outline variant.
+    pub fn outline(mut self) -> Self {
+        self.variant = TabVariant::Outline;
+        self
+    }
+
+    /// Use Segmented variant.
+    pub fn segmented(mut self) -> Self {
+        self.variant = TabVariant::Segmented;
+        self
+    }
+
+    /// Use Underline variant.
+    pub fn underline(mut self) -> Self {
+        self.variant = TabVariant::Underline;
+        self
+    }
+
     /// Set the left side of the tab
     pub fn prefix(mut self, prefix: impl IntoElement) -> Self {
         self.prefix = Some(prefix.into_any_element());
@@ -165,16 +580,42 @@ impl Styled for Tab {
     }
 }
 
+impl Sizable for Tab {
+    fn with_size(mut self, size: impl Into<Size>) -> Self {
+        self.size = size.into();
+        self
+    }
+}
+
 impl RenderOnce for Tab {
     fn render(self, _: &mut Window, cx: &mut App) -> impl IntoElement {
-        let fg = if self.disabled {
-            cx.theme().text_muted
-        } else if self.selected {
-            cx.theme().tab_active_foreground
+        let mut tab_style = if self.selected {
+            self.variant.selected(cx)
         } else {
-            cx.theme().tab_foreground
+            self.variant.normal(cx)
         };
 
+        let mut hover_style = self.variant.hovered(self.selected, cx);
+
+        if self.disabled {
+            tab_style = self.variant.disabled(self.selected, cx);
+            hover_style = self.variant.disabled(self.selected, cx);
+        }
+
+        let tab_bar_prefix = self.tab_bar_prefix.unwrap_or_default();
+
+        if !tab_bar_prefix && self.ix == 0 && self.variant == TabVariant::Tab {
+            tab_style.borders.left = px(0.);
+            hover_style.borders.left = px(0.);
+        }
+
+        let radius = self.variant.radius(self.size, cx);
+        let inner_radius = self.variant.inner_radius(self.size, cx);
+        let inner_paddings = self.variant.inner_paddings(self.size);
+        let inner_margins = self.variant.inner_margins(self.size);
+        let inner_height = self.variant.inner_height(self.size);
+        let height = self.variant.height(self.size);
+
         self.base
             .id(self.ix)
             .flex()
@@ -182,37 +623,74 @@ impl RenderOnce for Tab {
             .gap_1()
             .items_center()
             .flex_shrink_0()
-            .h(TABBAR_HEIGHT)
-            .relative()
+            .h(height)
             .overflow_hidden()
-            .text_color(fg)
-            .text_sm()
+            .text_color(tab_style.fg)
+            .map(|this| match self.size {
+                Size::XSmall => this.text_xs(),
+                Size::Large => this.text_base(),
+                _ => this.text_sm(),
+            })
+            .bg(tab_style.bg)
+            .border_l(tab_style.borders.left)
+            .border_r(tab_style.borders.right)
+            .border_t(tab_style.borders.top)
+            .border_b(tab_style.borders.bottom)
+            .border_color(tab_style.border_color)
+            .rounded(radius)
+            .when(!self.selected && !self.disabled, |this| {
+                this.hover(|this| {
+                    this.text_color(hover_style.fg)
+                        .bg(hover_style.bg)
+                        .border_l(hover_style.borders.left)
+                        .border_r(hover_style.borders.right)
+                        .border_t(hover_style.borders.top)
+                        .border_b(hover_style.borders.bottom)
+                        .border_color(hover_style.border_color)
+                        .rounded(radius)
+                })
+            })
             .when_some(self.prefix, |this, prefix| this.child(prefix))
             .child(
                 h_flex()
                     .flex_1()
-                    .h(px(30.))
+                    .h(inner_height)
                     .line_height(relative(1.))
                     .whitespace_nowrap()
                     .items_center()
                     .justify_center()
                     .overflow_hidden()
+                    .margins(inner_margins)
                     .flex_shrink_0()
-                    .px_3()
                     .map(|this| match self.icon {
-                        Some(icon) => this.w(px(38.)).child(icon.size_4()),
+                        Some(icon) => {
+                            this.w(inner_height * 1.25)
+                                .child(icon.map(|this| match self.size {
+                                    Size::XSmall => this.size_2p5(),
+                                    Size::Small => this.size_3p5(),
+                                    Size::Large => this.size_4(),
+                                    _ => this.size_4(),
+                                }))
+                        }
                         None => this
+                            .paddings(inner_paddings)
                             .map(|this| match self.label {
                                 Some(label) => this.child(label),
                                 None => this,
                             })
                             .children(self.children),
-                    }),
+                    })
+                    .bg(tab_style.inner_bg)
+                    .rounded(inner_radius)
+                    .when(tab_style.shadow, |this| this.shadow_xs())
+                    .hover(|this| this.bg(hover_style.inner_bg).rounded(inner_radius)),
             )
             .when_some(self.suffix, |this, suffix| {
                 this.child(div().pr_2().child(suffix))
             })
-            .on_mouse_down(MouseButton::Left, |_ev, _window, cx| {
+            .on_mouse_down(MouseButton::Left, |_, _, cx| {
+                // Stop propagation behavior, for works on TitleBar.
+                // https://github.com/longbridge/gpui-component/issues/1836
                 cx.stop_propagation();
             })
             .when(!self.disabled, |this| {
@@ -220,21 +698,5 @@ impl RenderOnce for Tab {
                     this.on_click(move |event, window, cx| on_click(event, window, cx))
                 })
             })
-            .child(
-                div()
-                    .absolute()
-                    .bottom_0()
-                    .left_0()
-                    .right_0()
-                    .h_0p5()
-                    .when(self.selected && !self.disabled, |this| {
-                        this.bg(cx.theme().element_active)
-                    })
-                    .when(!self.selected && !self.disabled, |this| {
-                        this.invisible().group_hover("", |this| {
-                            this.visible().bg(cx.theme().secondary_background)
-                        })
-                    }),
-            )
     }
 }

crates/ui/src/tab/tab_bar.rs

@@ -2,17 +2,19 @@ use std::rc::Rc;
 
 use gpui::prelude::FluentBuilder as _;
 use gpui::{
-    Anchor, AnyElement, App, Div, ElementId, InteractiveElement, IntoElement, ParentElement,
+    Anchor, AnyElement, App, Div, Edges, ElementId, InteractiveElement, IntoElement, ParentElement,
     RenderOnce, ScrollHandle, Stateful, StatefulInteractiveElement as _, StyleRefinement, Styled,
     Window, div, px,
 };
 use smallvec::SmallVec;
+use theme::ActiveTheme;
 
-use super::Tab;
+use super::{Tab, TabVariant};
 use crate::button::{Button, ButtonVariants as _};
 use crate::menu::{DropdownMenu as _, PopupMenuItem};
-use crate::{IconName, Selectable, Sizable, StyledExt, h_flex};
+use crate::{IconName, Selectable, Sizable, Size, StyledExt, h_flex};
 
+#[allow(clippy::type_complexity)]
 /// A TabBar element that contains multiple [`Tab`] items.
 #[derive(IntoElement)]
 pub struct TabBar {
@@ -24,8 +26,9 @@ pub struct TabBar {
     children: SmallVec<[Tab; 2]>,
     last_empty_space: AnyElement,
     selected_index: Option<usize>,
+    variant: TabVariant,
+    size: Size,
     menu: bool,
-    #[allow(clippy::type_complexity)]
     on_click: Option<Rc<dyn Fn(&usize, &mut Window, &mut App) + 'static>>,
 }
 
@@ -39,6 +42,8 @@ impl TabBar {
             scroll_handle: None,
             prefix: None,
             suffix: None,
+            variant: TabVariant::default(),
+            size: Size::default(),
             last_empty_space: div().w_3().into_any_element(),
             selected_index: None,
             on_click: None,
@@ -46,6 +51,36 @@ impl TabBar {
         }
     }
 
+    /// Set the Tab variant, all children will inherit the variant.
+    pub fn with_variant(mut self, variant: TabVariant) -> Self {
+        self.variant = variant;
+        self
+    }
+
+    /// Set the Tab variant to Pill, all children will inherit the variant.
+    pub fn pill(mut self) -> Self {
+        self.variant = TabVariant::Pill;
+        self
+    }
+
+    /// Set the Tab variant to Outline, all children will inherit the variant.
+    pub fn outline(mut self) -> Self {
+        self.variant = TabVariant::Outline;
+        self
+    }
+
+    /// Set the Tab variant to Segmented, all children will inherit the variant.
+    pub fn segmented(mut self) -> Self {
+        self.variant = TabVariant::Segmented;
+        self
+    }
+
+    /// Set the Tab variant to Underline, all children will inherit the variant.
+    pub fn underline(mut self) -> Self {
+        self.variant = TabVariant::Underline;
+        self
+    }
+
     /// Set whether to show the menu button when tabs overflow, default is false.
     pub fn menu(mut self, menu: bool) -> Self {
         self.menu = menu;
@@ -70,13 +105,13 @@ impl TabBar {
         self
     }
 
-    /// Add children of the TabBar.
+    /// Add children of the TabBar, all children will inherit the variant.
     pub fn children(mut self, children: impl IntoIterator<Item = impl Into<Tab>>) -> Self {
         self.children.extend(children.into_iter().map(Into::into));
         self
     }
 
-    /// Add child of the TabBar.
+    /// Add child of the TabBar, tab will inherit the variant.
     pub fn child(mut self, child: impl Into<Tab>) -> Self {
         self.children.push(child.into());
         self
@@ -112,8 +147,60 @@ impl Styled for TabBar {
     }
 }
 
+impl Sizable for TabBar {
+    fn with_size(mut self, size: impl Into<Size>) -> Self {
+        self.size = size.into();
+        self
+    }
+}
+
 impl RenderOnce for TabBar {
-    fn render(self, _: &mut Window, _cx: &mut App) -> impl IntoElement {
+    fn render(self, _: &mut Window, cx: &mut App) -> impl IntoElement {
+        let default_gap = match self.size {
+            Size::Small | Size::XSmall => px(8.),
+            Size::Large => px(16.),
+            _ => px(12.),
+        };
+        let (bg, paddings, gap) = match self.variant {
+            TabVariant::Tab => {
+                let padding = Edges::all(px(0.));
+                (cx.theme().tab_background, padding, px(0.))
+            }
+            TabVariant::Outline => {
+                let padding = Edges::all(px(0.));
+                (gpui::transparent_black(), padding, default_gap)
+            }
+            TabVariant::Pill => {
+                let padding = Edges::all(px(0.));
+                (gpui::transparent_black(), padding, px(4.))
+            }
+            TabVariant::Segmented => {
+                let padding_x = match self.size {
+                    Size::XSmall => px(2.),
+                    Size::Small => px(3.),
+                    _ => px(4.),
+                };
+                let padding = Edges {
+                    left: padding_x,
+                    right: padding_x,
+                    ..Default::default()
+                };
+
+                (cx.theme().tab_background, padding, px(2.))
+            }
+            TabVariant::Underline => {
+                // This gap is same as the tab inner_paddings
+                let gap = match self.size {
+                    Size::XSmall => px(10.),
+                    Size::Small => px(12.),
+                    Size::Large => px(20.),
+                    _ => px(16.),
+                };
+
+                (gpui::transparent_black(), Edges::all(px(0.)), gap)
+            }
+        };
+
         let mut item_labels = Vec::new();
         let selected_index = self.selected_index;
         let on_click = self.on_click.clone();
@@ -123,6 +210,25 @@ impl RenderOnce for TabBar {
             .relative()
             .flex()
             .items_center()
+            .bg(bg)
+            .text_color(cx.theme().tab_foreground)
+            .when(
+                self.variant == TabVariant::Underline || self.variant == TabVariant::Tab,
+                |this| {
+                    this.child(
+                        div()
+                            .id("border-b")
+                            .absolute()
+                            .left_0()
+                            .bottom_0()
+                            .size_full()
+                            .border_b_1()
+                            .border_color(cx.theme().border),
+                    )
+                },
+            )
+            .rounded(self.variant.tab_bar_radius(self.size, cx))
+            .paddings(paddings)
             .refine_style(&self.style)
             .when_some(self.prefix, |this, prefix| this.child(prefix))
             .child(
@@ -133,13 +239,15 @@ impl RenderOnce for TabBar {
                     .when_some(self.scroll_handle, |this, scroll_handle| {
                         this.track_scroll(&scroll_handle)
                     })
-                    .gap(px(0.))
+                    .gap(gap)
                     .children(self.children.into_iter().enumerate().map(|(ix, child)| {
                         item_labels.push((child.label.clone(), child.disabled));
                         let tab_bar_prefix = child.tab_bar_prefix.unwrap_or(true);
                         child
                             .ix(ix)
                             .tab_bar_prefix(tab_bar_prefix)
+                            .with_variant(self.variant)
+                            .with_size(self.size)
                             .when_some(self.selected_index, |this, selected_ix| {
                                 this.selected(selected_ix == ix)
                             })

crates/ui/src/title_bar.rs

@@ -283,6 +283,8 @@ impl RenderOnce for TitleBar {
                         this.px_2()
                     }
                 })
+                .border_b_1()
+                .border_color(cx.theme().border)
                 .bg(cx.theme().title_bar)
                 .refine_style(&self.style)
                 .when(is_linux, |this| {

crates/workspace/Cargo.toml

@@ -14,13 +14,10 @@ chat = { path = "../chat" }
 chat_ui = { path = "../chat_ui" }
 settings = { path = "../settings" }
 person = { path = "../person" }
-auto_update = { path = "../auto_update" }
 
 gpui.workspace = true
 nostr-sdk.workspace = true
-instant.workspace = true
 nostr-connect.workspace = true
-browser-signer-proxy = { path = "../browser-signer-proxy" }
 
 anyhow.workspace = true
 serde.workspace = true

crates/workspace/src/dialogs/import.rs

@@ -1,16 +1,17 @@
+use std::time::Duration;
+
 use anyhow::{Error, anyhow};
 use gpui::prelude::FluentBuilder;
 use gpui::{
     AppContext, Context, Entity, IntoElement, ParentElement, Render, SharedString, Styled,
     Subscription, Task, Window, div,
 };
-use instant::Duration;
 use nostr_connect::prelude::*;
 use state::{CoopAuthUrlHandler, NostrRegistry, USER_KEYRING};
 use theme::ActiveTheme;
 use ui::button::{Button, ButtonVariants};
 use ui::input::{Input, InputEvent, InputState};
-use ui::{Disableable, StyledExt, WindowExtension, divider, v_flex};
+use ui::{Disableable, StyledExt, WindowExtension, v_flex};
 
 #[derive(Debug)]
 pub struct ImportIdentity {
@@ -35,7 +36,7 @@ pub struct ImportIdentity {
 
 impl ImportIdentity {
     pub fn new(window: &mut Window, cx: &mut Context<Self>) -> Self {
-        let key_input = cx.new(|cx| InputState::new(window, cx).placeholder("nsec or bunker://"));
+        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);
 
@@ -134,6 +135,7 @@ impl ImportIdentity {
                     })?;
                 }
             }
+
             Ok(())
         }));
     }
@@ -164,14 +166,6 @@ impl ImportIdentity {
         }));
     }
 
-    #[cfg(not(target_arch = "wasm32"))]
-    fn proxy(&mut self, cx: &mut Context<Self>) {
-        let nostr = NostrRegistry::global(cx);
-        nostr.update(cx, |this, cx| {
-            this.connect_proxy(cx);
-        });
-    }
-
     fn set_loading(&mut self, status: bool, cx: &mut Context<Self>) {
         self.loading = status;
         cx.notify();
@@ -207,78 +201,50 @@ impl ImportIdentity {
 
 impl Render for ImportIdentity {
     fn render(&mut self, _window: &mut gpui::Window, cx: &mut Context<Self>) -> impl IntoElement {
-        const BUNKER_WARN: &str = "Nostr Connect will usually take more time to get all your messages. Please keep your session open until you see all your messages.";
-        const KEY_WARN: &str = "Coop won't store your identity key on the local device. You need to re-login again in the next session. You can use Nostr Connect for persistent login.";
+        const MSG: &str = "Coop won't store your identity key on the local device. You need to re-login again in the next session. You can use Nostr Connect for persistent login.";
 
-        let is_wasm = cfg!(target_arch = "wasm32");
         let require_password = self.key_input.read(cx).value().starts_with("ncryptsec1");
         let key_warning = self.key_input.read(cx).value().starts_with("nsec1") || require_password;
-        let bunker_warning = self.key_input.read(cx).value().starts_with("bunker://");
 
         v_flex()
             .size_full()
-            .gap_4()
-            .text_sm()
+            .gap_2()
             .child(
                 v_flex()
-                    .gap_2()
-                    .child(
-                        v_flex()
-                            .gap_1()
-                            .text_color(cx.theme().text_muted)
-                            .child("Continue with existing key or bunker connection")
-                            .child(Input::new(&self.key_input)),
-                    )
-                    .when(require_password, |this| {
-                        this.child(
-                            v_flex()
-                                .gap_1()
-                                .text_color(cx.theme().text_muted)
-                                .child("Decrypt Password:")
-                                .child(Input::new(&self.pass_input)),
-                        )
-                    })
-                    .when(bunker_warning, |this| {
-                        this.child(
-                            div()
-                                .text_xs()
-                                .text_color(cx.theme().text_warning)
-                                .child(div().child(BUNKER_WARN)),
-                        )
-                    })
-                    .when(key_warning, |this| {
-                        this.child(
-                            div()
-                                .text_xs()
-                                .text_color(cx.theme().text_warning)
-                                .child(div().child(KEY_WARN)),
-                        )
-                    }),
+                    .gap_1()
+                    .text_color(cx.theme().text_muted)
+                    .child("Continue with existing key or bunker connection")
+                    .child(Input::new(&self.key_input)),
             )
+            .when(require_password, |this| {
+                this.child(
+                    v_flex()
+                        .gap_1()
+                        .text_color(cx.theme().text_muted)
+                        .child("Decrypt Password:")
+                        .child(Input::new(&self.pass_input)),
+                )
+            })
+            .when(key_warning, |this| {
+                this.child(
+                    div()
+                        .v_flex()
+                        .text_xs()
+                        .text_color(cx.theme().text_warning)
+                        .child(div().font_semibold().child("Warning"))
+                        .child(div().child(MSG)),
+                )
+            })
             .child(
                 Button::new("login")
                     .label("Continue")
                     .primary()
-                    .font_semibold()
                     .loading(self.loading)
                     .disabled(self.loading)
-                    .on_click(cx.listener(move |this, _ev, window, cx| {
+                    .on_click(cx.listener(move |this, _, window, cx| {
                         this.login(window, cx);
                     })),
             )
-            .child(divider(cx))
-            .when(!is_wasm, |this| {
-                this.child(
-                    Button::new("proxy")
-                        .label("Connect via Web Extension (Experimental)")
-                        .ghost_alt()
-                        .loading(self.loading)
-                        .disabled(self.loading)
-                        .on_click(cx.listener(move |this, _ev, _window, cx| {
-                            this.proxy(cx);
-                        })),
-                )
-            })
             .when_some(self.error.read(cx).as_ref(), |this, error| {
                 this.child(
                     div()

crates/workspace/src/dialogs/restore.rs

@@ -1,4 +1,4 @@
-use instant::Duration;
+use std::time::Duration;
 
 use anyhow::Error;
 use device::DeviceRegistry;

crates/workspace/src/dialogs/screening.rs

@@ -1,4 +1,5 @@
 use std::collections::HashMap;
+use std::time::Duration;
 
 use anyhow::Error;
 use common::TimestampExt;
@@ -7,7 +8,6 @@ use gpui::{
     App, AppContext, Context, Div, Entity, InteractiveElement, IntoElement, ParentElement, Render,
     SharedString, Styled, Subscription, Task, Window, div, px, relative, uniform_list,
 };
-use instant::Duration;
 use nostr_sdk::prelude::*;
 use person::{Person, PersonRegistry, shorten_pubkey};
 use smallvec::{SmallVec, smallvec};
@@ -16,7 +16,7 @@ use theme::ActiveTheme;
 use ui::avatar::Avatar;
 use ui::button::{Button, ButtonVariants};
 use ui::indicator::Indicator;
-use ui::{Disableable, Icon, IconName, Sizable, StyledExt, WindowExtension, h_flex, v_flex};
+use ui::{Icon, IconName, Sizable, StyledExt, WindowExtension, h_flex, v_flex};
 
 pub fn init(public_key: PublicKey, window: &mut Window, cx: &mut App) -> Entity<Screening> {
     cx.new(|cx| Screening::new(public_key, window, cx))
@@ -55,7 +55,7 @@ impl Screening {
             window.close_all_modals(cx);
         }));
 
-        cx.defer_in(window, |this, _window, cx| {
+        cx.defer_in(window, move |this, _window, cx| {
             this.check_contact(cx);
             this.check_wot(cx);
             this.check_last_activity(cx);
@@ -84,20 +84,8 @@ impl Screening {
 
         let task: Task<Result<bool, Error>> = cx.background_spawn(async move {
             // Check if user is in contact list
-            let filter = Filter::new()
-                .author(current_user)
-                .kind(Kind::ContactList)
-                .limit(1);
-
-            let followed = client
-                .database()
-                .query(filter)
-                .await
-                .unwrap_or_default()
-                .into_iter()
-                .next()
-                .map(|event| event.tags.public_keys().any(|k| k == public_key))
-                .unwrap_or(false);
+            let contacts = client.database().contacts_public_keys(current_user).await;
+            let followed = contacts.unwrap_or_default().contains(&public_key);
 
             Ok(followed)
         });
@@ -240,13 +228,13 @@ impl Screening {
         let public_key = self.public_key;
 
         let task: Task<Result<(), Error>> = cx.background_spawn(async move {
-            let tag = Tag::from(Nip56Tag::PublicKey {
+            let tag = Nip56Tag::PublicKey {
                 public_key,
                 report: Report::Impersonation,
-            });
+            }
+            .to_tag();
 
-            let event = EventBuilder::new(Kind::Reporting, "")
-                .tag(tag)
+            let event = EventBuilder::report(vec![tag], "")
                 .finalize_async(&signer)
                 .await?;
 
@@ -274,7 +262,7 @@ impl Screening {
             let contacts = contacts.clone();
             let total = contacts.len();
 
-            this.title("Mutual contacts").child(
+            this.title(SharedString::from("Mutual contacts")).child(
                 v_flex().gap_1().pb_2().child(
                     uniform_list("contacts", total, move |range, _window, cx| {
                         let persons = PersonRegistry::global(cx);
@@ -353,7 +341,7 @@ impl Render for Screening {
                             .h_7()
                             .justify_center()
                             .rounded_full()
-                            .bg(cx.theme().elevated_surface_background)
+                            .bg(cx.theme().surface_background)
                             .text_sm()
                             .truncate()
                             .text_ellipsis()
@@ -366,8 +354,7 @@ impl Render for Screening {
                             .gap_1()
                             .child(
                                 Button::new("njump")
-                                    .icon(IconName::Link)
-                                    .label("njump.me")
+                                    .label("View on njump.me")
                                     .secondary()
                                     .small()
                                     .rounded()
@@ -398,18 +385,21 @@ impl Render for Screening {
                             .text_sm()
                             .child(status_badge(Some(self.followed), cx))
                             .child(
-                                v_flex().text_sm().child("Contact").child(
-                                    div()
-                                        .line_clamp(1)
-                                        .text_color(cx.theme().text_muted)
-                                        .child({
-                                            if self.followed {
-                                                SharedString::from(CONTACT)
-                                            } else {
-                                                SharedString::from(NOT_CONTACT)
-                                            }
-                                        }),
-                                ),
+                                v_flex()
+                                    .text_sm()
+                                    .child(SharedString::from("Contact"))
+                                    .child(
+                                        div()
+                                            .line_clamp(1)
+                                            .text_color(cx.theme().text_muted)
+                                            .child({
+                                                if self.followed {
+                                                    SharedString::from(CONTACT)
+                                                } else {
+                                                    SharedString::from(NOT_CONTACT)
+                                                }
+                                            }),
+                                    ),
                             ),
                     )
                     .child(
@@ -424,7 +414,7 @@ impl Render for Screening {
                                     .child(
                                         h_flex()
                                             .gap_0p5()
-                                            .child("Activity on Public Relays")
+                                            .child(SharedString::from("Activity on Public Relays"))
                                             .child(
                                                 Button::new("active")
                                                     .icon(IconName::Info)
@@ -493,8 +483,25 @@ impl Render for Screening {
                             .gap_2()
                             .child(status_badge(Some(mutuals > 0), cx))
                             .child(
-                                h_flex()
+                                v_flex()
                                     .text_sm()
+                                    .child(
+                                        h_flex()
+                                            .gap_0p5()
+                                            .child(SharedString::from("Mutual contacts"))
+                                            .child(
+                                                Button::new("mutuals")
+                                                    .icon(IconName::Info)
+                                                    .xsmall()
+                                                    .ghost()
+                                                    .rounded()
+                                                    .on_click(cx.listener(
+                                                        move |this, _, window, cx| {
+                                                            this.mutual_contacts(window, cx);
+                                                        },
+                                                    )),
+                                            ),
+                                    )
                                     .child(
                                         div()
                                             .line_clamp(1)
@@ -506,17 +513,6 @@ impl Render for Screening {
                                                     SharedString::from(NO_MUTUAL)
                                                 }
                                             }),
-                                    )
-                                    .child(
-                                        Button::new("mutuals")
-                                            .icon(IconName::Info)
-                                            .xsmall()
-                                            .ghost()
-                                            .rounded()
-                                            .disabled(mutuals == 0)
-                                            .on_click(cx.listener(move |this, _, window, cx| {
-                                                this.mutual_contacts(window, cx);
-                                            })),
                                     ),
                             ),
                     ),

crates/workspace/src/dialogs/settings.rs

@@ -3,7 +3,7 @@ use gpui::{
     App, AppContext, Context, Entity, IntoElement, ParentElement, Render, SharedString, Styled,
     Window, div, px,
 };
-use settings::AppSettings;
+use settings::{AppSettings, AuthMode};
 use theme::{ActiveTheme, Theme, ThemeMode};
 use ui::button::{Button, ButtonVariants};
 use ui::group_box::{GroupBox, GroupBoxVariants};
@@ -60,11 +60,13 @@ impl Render for Preferences {
         const AVATAR: &str = "Hide all avatar pictures to improve performance.";
         const MODE: &str = "Use the selected light or dark theme, or to follow the OS.";
         const NIP4E: &str = "Use a dedicated key to encrypt and decrypt messages.";
+        const AUTH: &str = "Choose the authentication behavior for relays.";
         const RESET: &str = "Reset the theme to the default one.";
 
         let screening = AppSettings::get_screening(cx);
         let hide_avatar = AppSettings::get_hide_avatar(cx);
         let nip4e = AppSettings::get_nip4e(cx);
+        let auth_mode = AppSettings::get_auth_mode(cx);
         let theme_mode = AppSettings::get_theme_mode(cx);
 
         v_flex()
@@ -91,6 +93,52 @@ impl Render for Preferences {
                             .on_click(move |_, _window, cx| {
                                 AppSettings::update_hide_avatar(!hide_avatar, cx);
                             }),
+                    )
+                    .child(
+                        h_flex()
+                            .gap_3()
+                            .justify_between()
+                            .child(
+                                v_flex()
+                                    .child(
+                                        div()
+                                            .text_sm()
+                                            .child(SharedString::from("Relay authentication")),
+                                    )
+                                    .child(
+                                        div()
+                                            .text_xs()
+                                            .text_color(cx.theme().text_muted)
+                                            .child(SharedString::from(AUTH)),
+                                    ),
+                            )
+                            .child(
+                                Button::new("auth")
+                                    .label(auth_mode.to_string())
+                                    .ghost_alt()
+                                    .small()
+                                    .dropdown_menu(|this, _window, _cx| {
+                                        this.min_w(px(256.))
+                                            .item(
+                                                PopupMenuItem::new("Auto authentication").on_click(
+                                                    |_ev, _window, cx| {
+                                                        AppSettings::update_auth_mode(
+                                                            AuthMode::Auto,
+                                                            cx,
+                                                        );
+                                                    },
+                                                ),
+                                            )
+                                            .item(PopupMenuItem::new("Ask every time").on_click(
+                                                |_ev, _window, cx| {
+                                                    AppSettings::update_auth_mode(
+                                                        AuthMode::Manual,
+                                                        cx,
+                                                    );
+                                                },
+                                            ))
+                                    }),
+                            ),
                     ),
             )
             .child(

crates/workspace/src/lib.rs

@@ -2,20 +2,20 @@ use std::sync::Arc;
 
 use ::settings::AppSettings;
 use anyhow::Error;
-use auto_update::AutoUpdater;
 use chat::{ChatEvent, ChatRegistry};
-use common::download_dir;
+use common::{CoopImageCache, download_dir};
 use device::{DeviceEvent, DeviceRegistry};
 use gpui::prelude::FluentBuilder;
 use gpui::{
     Action, App, AppContext, Axis, Context, Entity, InteractiveElement, IntoElement, ParentElement,
-    Render, SharedString, Styled, Subscription, Task, Window, div, px,
+    Render, SharedString, StatefulInteractiveElement, Styled, Subscription, Task, Window, div,
+    image_cache, px, relative,
 };
 use nostr_sdk::prelude::*;
 use person::{PersonRegistry, shorten_pubkey};
 use serde::Deserialize;
 use smallvec::{SmallVec, smallvec};
-use state::{NostrRegistry, StateEvent};
+use state::{IMAGE_CACHE_SIZE, NostrRegistry, StateEvent};
 use theme::{ActiveTheme, SIDEBAR_WIDTH, Theme, ThemeRegistry};
 use ui::avatar::Avatar;
 use ui::button::{Button, ButtonVariants};
@@ -27,8 +27,7 @@ use ui::{Icon, IconName, Root, Sizable, TitleBar, WindowExtension, h_flex, v_fle
 use crate::dialogs::import::ImportIdentity;
 use crate::dialogs::restore::RestoreEncryption;
 use crate::dialogs::settings;
-use crate::panels::{backup, contact_list, greeter, messaging_relays, profile, relay_list};
-use crate::sidebar::Sidebar;
+use crate::panels::{backup, contact_list, greeter, messaging_relays, profile, relay_list, trash};
 
 mod dialogs;
 mod panels;
@@ -45,12 +44,13 @@ struct MsgRelayNotification;
 #[action(namespace = workspace, no_json)]
 enum Command {
     ToggleTheme,
-    Update,
+
     RefreshMessagingRelays,
     BackupEncryption,
     ImportEncryption,
     RefreshEncryption,
     ResetEncryption,
+
     ShowRelayList,
     ShowMessaging,
     ShowProfile,
@@ -60,10 +60,12 @@ enum Command {
 }
 
 pub struct Workspace {
-    sidebar: Entity<Sidebar>,
     /// App's Dock Area
     dock: Entity<DockArea>,
 
+    /// App's Image Cache
+    image_cache: Entity<CoopImageCache>,
+
     /// Async tasks
     tasks: Vec<Task<Result<(), Error>>>,
 
@@ -77,11 +79,20 @@ impl Workspace {
         let device = DeviceRegistry::global(cx);
         let nostr = NostrRegistry::global(cx);
 
-        let sidebar = cx.new(|cx| Sidebar::new(window, cx));
         let dock = cx.new(|cx| DockArea::new(window, cx));
+        let image_cache = CoopImageCache::new(IMAGE_CACHE_SIZE, cx);
 
         let mut subscriptions = smallvec![];
 
+        subscriptions.push(
+            // Observe sign in state changes
+            cx.observe_in(&nostr, window, move |this, nostr, window, cx| {
+                if nostr.read(cx).current_user().is_some() {
+                    this.set_center_layout(window, cx);
+                }
+            }),
+        );
+
         subscriptions.push(
             // Observe system appearance and update theme
             cx.observe_window_appearance(window, |_this, window, cx| {
@@ -94,7 +105,11 @@ impl Workspace {
             cx.subscribe_in(&nostr, window, move |this, _state, event, window, cx| {
                 match event {
                     StateEvent::SignerChanged => {
-                        window.close_all_modals(cx);
+                        this.set_center_layout(window, cx);
+
+                        cx.defer_in(window, |_this, window, cx| {
+                            window.close_all_modals(cx);
+                        });
                     }
                     StateEvent::NoSigner => {
                         this.import_identity(window, cx);
@@ -215,20 +230,25 @@ impl Workspace {
             }),
         );
 
-        cx.defer_in(window, |this, window, cx| {
-            let dock = this.dock.downgrade();
-            let greeter = Arc::new(greeter::init(window, cx));
-            let tabs = DockItem::tabs(vec![greeter], None, &dock, window, cx);
-            let center = DockItem::split(Axis::Vertical, vec![tabs], &dock, window, cx);
+        subscriptions.push(
+            // Observe the chat registry
+            cx.observe(&chat, move |this, chat, cx| {
+                let ids = this.panel_ids(cx);
 
-            this.dock.update(cx, |this, cx| {
-                this.set_center(center, window, cx);
-            });
+                chat.update(cx, |this, cx| {
+                    this.refresh_rooms(&ids, cx);
+                });
+            }),
+        );
+
+        // Set the layout at the end of cycle
+        cx.defer_in(window, |this, window, cx| {
+            this.set_layout(window, cx);
         });
 
         Self {
-            sidebar,
             dock,
+            image_cache,
             tasks: vec![],
             _subscriptions: subscriptions,
         }
@@ -250,6 +270,40 @@ impl Workspace {
         }
     }
 
+    /// Get all panel ids
+    fn panel_ids(&self, cx: &App) -> Vec<u64> {
+        self.dock
+            .read(cx)
+            .items
+            .panel_ids(cx)
+            .into_iter()
+            .filter_map(|panel| panel.parse::<u64>().ok())
+            .collect()
+    }
+
+    /// Set the dock layout
+    fn set_layout(&mut self, window: &mut Window, cx: &mut Context<Self>) {
+        let left = DockItem::panel(Arc::new(sidebar::init(window, cx)));
+
+        // Update the dock layout with sidebar on the left
+        self.dock.update(cx, |this, cx| {
+            this.set_left_dock(left, Some(SIDEBAR_WIDTH), true, window, cx);
+        });
+    }
+
+    /// Set the center dock layout
+    fn set_center_layout(&mut self, window: &mut Window, cx: &mut Context<Self>) {
+        let dock = self.dock.downgrade();
+        let greeter = Arc::new(greeter::init(window, cx));
+        let tabs = DockItem::tabs(vec![greeter], None, &dock, window, cx);
+        let center = DockItem::split(Axis::Vertical, vec![tabs], &dock, window, cx);
+
+        // Update the layout with center dock
+        self.dock.update(cx, |this, cx| {
+            this.set_center(center, window, cx);
+        });
+    }
+
     /// Handle command events
     fn on_command(&mut self, command: &Command, window: &mut Window, cx: &mut Context<Self>) {
         match command {
@@ -271,7 +325,7 @@ impl Workspace {
                     self.dock.update(cx, |this, cx| {
                         this.add_panel(
                             Arc::new(profile::init(public_key, window, cx)),
-                            DockPlacement::Left,
+                            DockPlacement::Right,
                             window,
                             cx,
                         );
@@ -282,7 +336,7 @@ impl Workspace {
                 self.dock.update(cx, |this, cx| {
                     this.add_panel(
                         Arc::new(contact_list::init(window, cx)),
-                        DockPlacement::Left,
+                        DockPlacement::Right,
                         window,
                         cx,
                     );
@@ -292,7 +346,7 @@ impl Workspace {
                 self.dock.update(cx, |this, cx| {
                     this.add_panel(
                         Arc::new(backup::init(window, cx)),
-                        DockPlacement::Left,
+                        DockPlacement::Right,
                         window,
                         cx,
                     );
@@ -302,7 +356,7 @@ impl Workspace {
                 self.dock.update(cx, |this, cx| {
                     this.add_panel(
                         Arc::new(messaging_relays::init(window, cx)),
-                        DockPlacement::Left,
+                        DockPlacement::Right,
                         window,
                         cx,
                     );
@@ -312,7 +366,7 @@ impl Workspace {
                 let chat = ChatRegistry::global(cx);
                 // Trigger a refresh of the chat registry
                 chat.update(cx, |this, cx| {
-                    this.reload(cx);
+                    this.refresh(cx);
                 });
             }
             Command::ShowRelayList => {
@@ -374,11 +428,6 @@ impl Workspace {
             Command::ImportEncryption => {
                 self.import_encryption(window, cx);
             }
-            Command::Update => {
-                if let Some(auto_updater) = AutoUpdater::try_global(cx) {
-                    auto_updater.update(cx, |this, cx| this.check(cx));
-                }
-            }
         }
     }
 
@@ -434,11 +483,10 @@ impl Workspace {
         let import = cx.new(|cx| ImportIdentity::new(window, cx));
 
         window.open_modal(cx, move |this, _window, _cx| {
-            this.width(px(450.))
+            this.width(px(420.))
                 .show_close(false)
                 .overlay_closable(false)
-                .keyboard(false)
-                .title("Onboarding")
+                .title("Import Identity")
                 .child(import.clone())
         });
     }
@@ -551,7 +599,7 @@ impl Workspace {
                         .caret()
                         .compact()
                         .transparent()
-                        .dropdown_menu(move |this, _window, cx| {
+                        .dropdown_menu(move |this, _window, _cx| {
                             let avatar = avatar.clone();
                             let name = name.clone();
 
@@ -585,15 +633,7 @@ impl Workspace {
                                     IconName::Sun,
                                     Box::new(Command::ToggleTheme),
                                 )
-                                // Only offer in-app updates when auto-update is
-                                // enabled (managed channels update themselves).
-                                .when(AutoUpdater::is_available(cx), |this| {
-                                    this.separator().menu_with_icon(
-                                        "Check for Updates",
-                                        IconName::Device,
-                                        Box::new(Command::Update),
-                                    )
-                                })
+                                .separator()
                                 .menu_with_icon(
                                     "Settings",
                                     IconName::Settings,
@@ -605,9 +645,10 @@ impl Workspace {
     }
 
     fn titlebar_right(&mut self, cx: &mut Context<Self>) -> impl IntoElement {
-        let auto_updater = AutoUpdater::try_global(cx);
         let chat = ChatRegistry::global(cx);
-        let nip4e_enabled = AppSettings::get_nip4e(cx);
+        let trash_messages = chat.read(cx).count_trash_messages(cx);
+
+        let is_nip4e_enabled = AppSettings::get_nip4e(cx);
         let nostr = NostrRegistry::global(cx);
 
         let Some(public_key) = nostr.read(cx).current_user() else {
@@ -618,36 +659,42 @@ impl Workspace {
         let profile = persons.read(cx).get(&public_key, cx);
         let announcement = profile.announcement();
 
-        let updater_status = auto_updater.as_ref().and_then(|updater| {
-            let updater = updater.read(cx);
-            (!updater.idle()).then(|| updater.status())
-        });
-
-        let staged_update = auto_updater
-            .as_ref()
-            .is_some_and(|updater| updater.read(cx).staged());
-
         h_flex()
             .when(!cx.theme().platform.is_mac(), |this| this.pr_2())
             .gap_2()
-            .when_some(updater_status, |this, status| {
-                this.child(div().text_xs().italic().child(status))
-            })
-            .when(staged_update, |this| {
+            .when(trash_messages > 0, |this| {
                 this.child(
-                    Button::new("restart-to-update")
-                        .label("Restart to Update")
-                        .tooltip("Quit and relaunch into the installed update")
-                        .small()
-                        .ghost()
-                        .on_click(cx.listener(|_this, _event, _window, cx| {
-                            if let Some(auto_updater) = AutoUpdater::try_global(cx) {
-                                auto_updater.update(cx, |this, cx| this.restart(cx));
-                            }
-                        })),
+                    h_flex()
+                        .id("trash-messages")
+                        .h_6()
+                        .px_1()
+                        .gap_1()
+                        .rounded(cx.theme().radius)
+                        .hover(|this| this.bg(cx.theme().ghost_element_hover))
+                        .child(
+                            Icon::new(IconName::Warning)
+                                .small()
+                                .text_color(cx.theme().text_danger),
+                        )
+                        .child(
+                            div()
+                                .text_xs()
+                                .line_height(relative(1.))
+                                .child(format!("{trash_messages}")),
+                        )
+                        .on_click(move |_ev, window, cx| {
+                            cx.stop_propagation();
+                            // Add the trash panel to the center workspace
+                            Self::add_panel(
+                                trash::init(window, cx),
+                                DockPlacement::Center,
+                                window,
+                                cx,
+                            );
+                        }),
                 )
             })
-            .when(nip4e_enabled, |this| {
+            .when(is_nip4e_enabled, |this| {
                 this.child(
                     Button::new("key")
                         .icon(IconName::UserKey)
@@ -739,7 +786,17 @@ impl Workspace {
                                     .w_full()
                                     .text_sm()
                                     .justify_between()
-                                    .child(url.clone())
+                                    .child(
+                                        h_flex()
+                                            .gap_2()
+                                            .child(
+                                                div()
+                                                    .size_1p5()
+                                                    .rounded_full()
+                                                    .bg(cx.theme().icon_accent),
+                                            )
+                                            .child(url.clone()),
+                                    )
                                     .child(
                                         div()
                                             .text_xs()
@@ -751,6 +808,11 @@ impl Workspace {
 
                         // Footer
                         menu.separator()
+                            .menu_with_icon(
+                                "Reload",
+                                IconName::Refresh,
+                                Box::new(Command::RefreshMessagingRelays),
+                            )
                             .menu_with_icon(
                                 "Manage gossip relays",
                                 IconName::Relay,
@@ -758,15 +820,9 @@ impl Workspace {
                             )
                             .menu_with_icon(
                                 "Manage messaging relays",
-                                IconName::Relay,
+                                IconName::Settings,
                                 Box::new(Command::ShowMessaging),
                             )
-                            .separator()
-                            .menu_with_icon(
-                                "Reload",
-                                IconName::Refresh,
-                                Box::new(Command::RefreshMessagingRelays),
-                            )
                     }),
             )
     }
@@ -778,30 +834,24 @@ impl Render for Workspace {
         let notification_layer = Root::render_notification_layer(window, cx);
 
         div()
-            .id("workspace")
+            .id(SharedString::from("workspace"))
             .on_action(cx.listener(Self::on_command))
             .relative()
             .size_full()
             .child(
-                v_flex()
+                image_cache(self.image_cache.clone())
+                    .relative()
                     .size_full()
-                    // Title Bar
                     .child(
-                        TitleBar::new()
-                            .child(self.titlebar_left(cx))
-                            .child(self.titlebar_right(cx)),
-                    )
-                    // Main
-                    .child(
-                        h_flex()
+                        v_flex()
                             .size_full()
+                            // Title Bar
                             .child(
-                                div()
-                                    .flex_shrink_0()
-                                    .h_full()
-                                    .w(SIDEBAR_WIDTH)
-                                    .child(self.sidebar.clone()),
+                                TitleBar::new()
+                                    .child(self.titlebar_left(cx))
+                                    .child(self.titlebar_right(cx)),
                             )
+                            // Dock
                             .child(self.dock.clone()),
                     ),
             )

crates/workspace/src/panels/backup.rs

@@ -1,9 +1,10 @@
+use std::time::Duration;
+
 use anyhow::Error;
 use gpui::{
     AnyElement, App, AppContext, ClipboardItem, Context, Entity, EventEmitter, FocusHandle,
     Focusable, IntoElement, ParentElement, Render, SharedString, Styled, Task, Window, div,
 };
-use instant::Duration;
 use nostr_sdk::prelude::*;
 use state::USER_KEYRING;
 use theme::ActiveTheme;
@@ -154,7 +155,12 @@ impl Render for BackupPanel {
                                     .text_color(cx.theme().text_muted)
                                     .child(SharedString::from("Public Key:")),
                             )
-                            .child(Input::new(&self.npub_input).small().disabled(true)),
+                            .child(
+                                Input::new(&self.npub_input)
+                                    .small()
+                                    .bordered(false)
+                                    .disabled(true),
+                            ),
                     )
                     .child(
                         v_flex()
@@ -167,7 +173,12 @@ impl Render for BackupPanel {
                                     .text_color(cx.theme().text_muted)
                                     .child(SharedString::from("Secret Key:")),
                             )
-                            .child(Input::new(&self.nsec_input).small().disabled(true)),
+                            .child(
+                                Input::new(&self.nsec_input)
+                                    .small()
+                                    .bordered(false)
+                                    .disabled(true),
+                            ),
                     )
                     .child(
                         Button::new("copy")

crates/workspace/src/panels/contact_list.rs

@@ -1,13 +1,13 @@
 use std::collections::HashSet;
+use std::time::Duration;
 
 use anyhow::Error;
 use gpui::prelude::FluentBuilder;
 use gpui::{
     AnyElement, App, AppContext, Context, Entity, EventEmitter, FocusHandle, Focusable,
     InteractiveElement, IntoElement, ParentElement, Render, SharedString, Styled, Subscription,
-    Task, TextAlign, Window, div, rems, retain_all,
+    Task, TextAlign, Window, div, rems,
 };
-use instant::Duration;
 use nostr_sdk::prelude::*;
 use person::PersonRegistry;
 use smallvec::{SmallVec, smallvec};
@@ -17,7 +17,6 @@ use ui::avatar::Avatar;
 use ui::button::{Button, ButtonVariants};
 use ui::dock::{Panel, PanelEvent};
 use ui::input::{Input, InputEvent, InputState};
-use ui::scroll::ScrollableElement;
 use ui::{Disableable, IconName, Sizable, StyledExt, WindowExtension, h_flex, v_flex};
 
 pub fn init(window: &mut Window, cx: &mut App) -> Entity<ContactListPanel> {
@@ -88,20 +87,7 @@ impl ContactListPanel {
         };
 
         let task: Task<Result<HashSet<PublicKey>, Error>> = cx.background_spawn(async move {
-            let filter = Filter::new()
-                .author(public_key)
-                .kind(Kind::ContactList)
-                .limit(1);
-
-            let contact_list: HashSet<PublicKey> = client
-                .database()
-                .query(filter)
-                .await?
-                .into_iter()
-                .next()
-                .map(|event| event.tags.public_keys().collect())
-                .unwrap_or_default();
-
+            let contact_list = client.database().contacts_public_keys(public_key).await?;
             Ok(contact_list)
         });
 
@@ -234,7 +220,8 @@ impl ContactListPanel {
                     .px_2()
                     .justify_between()
                     .rounded(cx.theme().radius)
-                    .hover(|this| this.bg(cx.theme().ghost_element_hover))
+                    .bg(cx.theme().secondary_background)
+                    .text_color(cx.theme().secondary_foreground)
                     .child(
                         h_flex()
                             .gap_2()
@@ -296,79 +283,79 @@ impl Focusable for ContactListPanel {
 
 impl Render for ContactListPanel {
     fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        v_flex()
-            .image_cache(retain_all("contact-list-panel"))
-            .p_3()
-            .gap_3()
-            .w_full()
-            .overflow_y_scrollbar()
-            .child(
-                v_flex()
-                    .gap_2()
-                    .flex_1()
-                    .w_full()
-                    .text_sm()
-                    .child(
-                        div()
-                            .text_xs()
-                            .font_semibold()
-                            .text_color(cx.theme().text_muted)
-                            .child("New contact:"),
-                    )
-                    .child(
-                        v_flex()
-                            .gap_1()
-                            .child(
-                                h_flex()
-                                    .gap_1()
-                                    .w_full()
-                                    .child(Input::new(&self.input).small().cleanable(true))
-                                    .child(
-                                        Button::new("add")
-                                            .icon(IconName::Plus)
-                                            .tooltip("Add contact")
-                                            .ghost()
-                                            .size(rems(2.))
-                                            .on_click(cx.listener(move |this, _, window, cx| {
-                                                this.add(window, cx);
-                                            })),
-                                    ),
-                            )
-                            .when_some(self.error.as_ref(), |this, error| {
-                                this.child(
-                                    div()
-                                        .italic()
-                                        .text_xs()
-                                        .text_color(cx.theme().text_danger)
-                                        .child(error.clone()),
+        v_flex().p_3().gap_3().w_full().child(
+            v_flex()
+                .gap_2()
+                .flex_1()
+                .w_full()
+                .text_sm()
+                .child(
+                    div()
+                        .text_xs()
+                        .font_semibold()
+                        .text_color(cx.theme().text_muted)
+                        .child(SharedString::from("New contact:")),
+                )
+                .child(
+                    v_flex()
+                        .gap_1()
+                        .child(
+                            h_flex()
+                                .gap_1()
+                                .w_full()
+                                .child(
+                                    Input::new(&self.input)
+                                        .small()
+                                        .bordered(false)
+                                        .cleanable(true),
                                 )
-                            }),
-                    )
-                    .map(|this| {
-                        if self.contacts.is_empty() {
-                            this.child(self.render_empty(window, cx))
-                        } else {
+                                .child(
+                                    Button::new("add")
+                                        .icon(IconName::Plus)
+                                        .tooltip("Add contact")
+                                        .ghost()
+                                        .size(rems(2.))
+                                        .on_click(cx.listener(move |this, _, window, cx| {
+                                            this.add(window, cx);
+                                        })),
+                                ),
+                        )
+                        .when_some(self.error.as_ref(), |this, error| {
                             this.child(
-                                v_flex()
-                                    .gap_1()
-                                    .flex_1()
-                                    .w_full()
-                                    .children(self.render_list_items(cx)),
+                                div()
+                                    .italic()
+                                    .text_xs()
+                                    .text_color(cx.theme().text_danger)
+                                    .child(error.clone()),
                             )
-                        }
-                    })
-                    .child(
-                        Button::new("submit")
-                            .icon(IconName::CheckCircle)
-                            .label("Update")
-                            .primary()
-                            .font_semibold()
-                            .loading(self.updating)
-                            .disabled(self.updating)
-                            .on_click(cx.listener(move |this, _ev, window, cx| {
-                                this.update(window, cx);
-                            })),
-                    ),
-            )
+                        }),
+                )
+                .map(|this| {
+                    if self.contacts.is_empty() {
+                        this.child(self.render_empty(window, cx))
+                    } else {
+                        this.child(
+                            v_flex()
+                                .gap_1()
+                                .flex_1()
+                                .w_full()
+                                .children(self.render_list_items(cx)),
+                        )
+                    }
+                })
+                .child(
+                    Button::new("submit")
+                        .icon(IconName::CheckCircle)
+                        .label("Update")
+                        .primary()
+                        .small()
+                        .font_semibold()
+                        .loading(self.updating)
+                        .disabled(self.updating)
+                        .on_click(cx.listener(move |this, _ev, window, cx| {
+                            this.update(window, cx);
+                        })),
+                ),
+        )
     }
 }

crates/workspace/src/panels/greeter.rs

@@ -9,8 +9,8 @@ use ui::button::{Button, ButtonVariants};
 use ui::dock::{DockPlacement, Panel, PanelEvent};
 use ui::{Icon, IconName, Sizable, StyledExt, h_flex, v_flex};
 
+use crate::Workspace;
 use crate::panels::profile;
-use crate::{Command, Workspace};
 
 pub fn init(window: &mut Window, cx: &mut App) -> Entity<GreeterPanel> {
     cx.new(|cx| GreeterPanel::new(window, cx))
@@ -146,20 +146,17 @@ impl Render for GreeterPanel {
                                             .ghost()
                                             .small()
                                             .justify_start()
-                                            .on_click(cx.listener(move |this, _, window, cx| {
+                                            .on_click(cx.listener(move |this, _ev, window, cx| {
                                                 this.add_profile_panel(window, cx)
                                             })),
                                     )
                                     .child(
-                                        Button::new("theme")
-                                            .icon(Icon::new(IconName::Moon))
-                                            .label("Change theme")
+                                        Button::new("invite")
+                                            .icon(Icon::new(IconName::Invite))
+                                            .label("Invite friends")
                                             .ghost()
                                             .small()
-                                            .justify_start()
-                                            .on_click(cx.listener(move |_, _, _, cx| {
-                                                cx.dispatch_action(&Command::ToggleTheme);
-                                            })),
+                                            .justify_start(),
                                     ),
                             ),
                     ),

crates/workspace/src/panels/messaging_relays.rs

@@ -1,4 +1,5 @@
 use std::collections::HashSet;
+use std::time::Duration;
 
 use anyhow::{Error, anyhow};
 use gpui::prelude::FluentBuilder;
@@ -7,7 +8,6 @@ use gpui::{
     InteractiveElement, IntoElement, ParentElement, Render, SharedString, Styled, Subscription,
     Task, TextAlign, Window, div, rems,
 };
-use instant::Duration;
 use nostr_sdk::prelude::*;
 use smallvec::{SmallVec, smallvec};
 use state::NostrRegistry;
@@ -93,7 +93,7 @@ impl MessagingRelayPanel {
                 .author(public_key)
                 .limit(1);
 
-            if let Some(event) = client.database().query(filter).await?.into_iter().next() {
+            if let Some(event) = client.database().query(filter).await?.first_owned() {
                 Ok(nip17::extract_relay_list(&event).collect())
             } else {
                 Err(anyhow!("Not found."))
@@ -177,7 +177,7 @@ impl MessagingRelayPanel {
         let tags: Vec<Tag> = self
             .relays
             .iter()
-            .map(|relay| Tag::from(Nip17Tag::Relay(relay.to_owned())))
+            .map(|relay| Nip17Tag::Relay(relay.to_owned()).to_tag())
             .collect();
 
         // Set updating state
@@ -320,7 +320,12 @@ impl Render for MessagingRelayPanel {
                                 h_flex()
                                     .gap_1()
                                     .w_full()
-                                    .child(Input::new(&self.input).small().cleanable(true))
+                                    .child(
+                                        Input::new(&self.input)
+                                            .small()
+                                            .bordered(false)
+                                            .cleanable(true),
+                                    )
                                     .child(
                                         Button::new("add")
                                             .icon(IconName::Plus)
@@ -360,6 +365,7 @@ impl Render for MessagingRelayPanel {
                             .icon(IconName::CheckCircle)
                             .label("Update")
                             .primary()
+                            .small()
                             .font_semibold()
                             .loading(self.updating)
                             .disabled(self.updating)

crates/workspace/src/panels/mod.rs

@@ -4,3 +4,4 @@ pub mod greeter;
 pub mod messaging_relays;
 pub mod profile;
 pub mod relay_list;
+pub mod trash;

crates/workspace/src/panels/profile.rs

@@ -1,12 +1,12 @@
 use std::str::FromStr;
+use std::time::Duration;
 
-use anyhow::Error;
+use anyhow::{Context as AnyhowContext, Error};
 use gpui::{
     AnyElement, App, AppContext, ClipboardItem, Context, Entity, EventEmitter, FocusHandle,
     Focusable, IntoElement, ParentElement, PathPromptOptions, Render, SharedString, Styled, Task,
-    Window, div, retain_all,
+    Window, div,
 };
-use instant::Duration;
 use nostr_sdk::prelude::*;
 use person::{Person, PersonRegistry, shorten_pubkey};
 use settings::AppSettings;
@@ -167,15 +167,13 @@ impl ProfilePanel {
         });
 
         self.tasks.push(cx.spawn_in(window, async move |this, cx| {
-            // Selecting no file means the prompt was cancelled
-            let Some(path) = path.await??.and_then(|mut paths| paths.pop()) else {
-                return Ok(());
-            };
-
             this.update(cx, |this, cx| {
                 this.set_uploading(true, cx);
             })?;
 
+            let mut paths = path.await??.context("Not found")?;
+            let path = paths.pop().context("No path")?;
+
             // Upload via blossom client
             match upload(server, path, cx).await {
                 Ok(url) => {
@@ -321,7 +319,6 @@ impl Render for ProfilePanel {
         let shorten_pkey = SharedString::from(shorten_pubkey(self.public_key, 8));
 
         v_flex()
-            .image_cache(retain_all("profile-panel"))
             .p_3()
             .gap_3()
             .w_full()
@@ -356,7 +353,7 @@ impl Render for ProfilePanel {
                             .text_color(cx.theme().text_muted)
                             .child(SharedString::from("What should people call you?")),
                     )
-                    .child(Input::new(&self.name_input).small()),
+                    .child(Input::new(&self.name_input).bordered(false).small()),
             )
             .child(
                 v_flex()
@@ -367,7 +364,7 @@ impl Render for ProfilePanel {
                             .text_color(cx.theme().text_muted)
                             .child(SharedString::from("A short introduction about you:")),
                     )
-                    .child(Input::new(&self.bio_input).small()),
+                    .child(Input::new(&self.bio_input).bordered(false).small()),
             )
             .child(
                 v_flex()
@@ -378,7 +375,7 @@ impl Render for ProfilePanel {
                             .text_color(cx.theme().text_muted)
                             .child(SharedString::from("Website:")),
                     )
-                    .child(Input::new(&self.website_input).small()),
+                    .child(Input::new(&self.website_input).bordered(false).small()),
             )
             .child(
                 v_flex()
@@ -422,6 +419,7 @@ impl Render for ProfilePanel {
                     .icon(IconName::CheckCircle)
                     .label("Update")
                     .primary()
+                    .small()
                     .font_semibold()
                     .loading(self.updating)
                     .disabled(self.updating)