.

Reviewed-on: https://git.reya.su/reya/coop/pulls/7

.github/workflows/release.yml

@@ -21,7 +21,7 @@ jobs:
             os: windows-11-arm
             target: aarch64-pc-windows-msvc
           - platform: macos-x64
-            os: macos-15-intel
+            os: macos-13
             target: x86_64-apple-darwin
           - platform: macos-arm64
             os: macos-latest
@@ -45,7 +45,7 @@ jobs:
       # Windows and macOS builds using cargo-packager
       - name: Build with cargo-packager (Windows/macOS)
         if: runner.os != 'Linux'
-        working-directory: desktop
+        working-directory: crates/coop
         run: |
           cargo install cargo-packager --locked
           cargo packager --release
@@ -130,7 +130,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4
 
       - name: Make get-crate-version executable
         run: chmod +x script/get-crate-version
@@ -152,29 +152,19 @@ 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
+        uses: softprops/action-gh-release@v2
         with:
-          server_url: "https://git.reya.info/"
-          repository: "reya/coop"
-          token: ${{ secrets.GITEA_TOKEN }}
+          tag_name: ${{ steps.version.outputs.tag }}
+          name: ${{ steps.version.outputs.tag }}
           draft: true
           prerelease: false
+          generate_release_notes: true
           files: |
             artifacts/**/*
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Output release info
         run: |

.github/workflows/rust.yml

@@ -13,7 +13,7 @@ jobs:
   build:
     strategy:
       matrix:
-        os: [ubuntu-latest, macos-latest, windows-latest]
+        os: [ubuntu-latest]
         rustup: [stable]
 
     runs-on: ${{ matrix.os }}

.gitignore

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

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

@@ -1,74 +1,44 @@
 [workspace]
 resolver = "2"
-members = ["crates/*", "desktop", "web"]
-default-members = ["desktop"]
+members = ["crates/*"]
+default-members = ["crates/coop"]
 
 [workspace.package]
-version = "1.0.2"
-edition = "2024"
+version = "0.3.0"
+edition = "2021"
 publish = false
 
 [workspace.dependencies]
-# GPUI. The `gpui-pre` family is upstream zed's gpui republished unchanged, so these
-# aliases keep every `use gpui::..` site as it is while moving off the zed git pin.
-gpui = { package = "gpui-pre", version = "0.3.5" }
-gpui_platform = { package = "gpui-pre-platform", version = "0.3.5", features = ["font-kit", "x11", "wayland"] }
-gpui_linux = { package = "gpui-pre-linux", version = "0.3.5" }
-gpui_windows = { package = "gpui-pre-windows", version = "0.3.5" }
-gpui_macos = { package = "gpui-pre-macos", version = "0.3.5" }
-gpui_web = { package = "gpui-pre-web", version = "0.3.5" }
-gpui_util = { package = "gpui-pre-util", version = "0.3.5" }
-sum_tree = { package = "gpui-pre-sum-tree", version = "0.3.5" }
-reqwest_client = { package = "gpui-pre-reqwest-client", version = "0.3.5" }
-gpui_tokio = { path = "crates/gpui_tokio" }
 
-# Unstyled behavior, state, and infrastructure from GPUI Kit
-gpui-base = "0.6.1"
+# GPUI
+gpui = { git = "https://github.com/zed-industries/zed" }
+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 = { git = "https://github.com/rust-nostr/nostr",  features = [ "nip96", "nip59", "nip49", "nip44" ] }
 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"
-base64 = "0.22"
-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" }
+nostr-connect = { git = "https://github.com/rust-nostr/nostr" }
+nostr-gossip-memory = { git = "https://github.com/rust-nostr/nostr" }
 
 # 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"
 oneshot = "0.1.10"
+reqwest = { version = "0.12", features = ["multipart", "stream", "json"] }
 flume = { version = "0.11.1", default-features = false, features = ["async", "select"] }
-rust-embed = { version = "8.5", features = ["include-exclude"] }
+rust-embed = "8.5.0"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 schemars = "1"
 smallvec = "1.14.0"
 smol = "2"
+tracing = "0.1.40"
 webbrowser = "1.0.4"
-tracing-subscriber = { version = "0.3.18", features = ["fmt"] }
-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
-psm = { git = "https://github.com/rust-lang/stacker", branch = "master" }
 
 [profile.release]
 strip = true

README.md

@@ -1,5 +1,125 @@
+![Coop](/docs/coop.png)
+
+<p>
+    <a href="https://github.com/lumehq/coop/actions/workflows/rust.yml">
+      <img alt="Actions" src="https://github.com/lumehq/coop/actions/workflows/rust.yml/badge.svg">
+    </a>
+    <img alt="GitHub repo size" src="https://img.shields.io/github/repo-size/lumehq/coop">
+    <img alt="GitHub issues" src="https://img.shields.io/github/issues-raw/lumehq/coop">
+    <img alt="GitHub pull requests" src="https://img.shields.io/github/issues-pr/lumehq/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/lumehq/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/lumehq/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/lumehq/coop/issues/)
+
 ### License
 
 Copyright (C) 2025 Ren Amamiya & other Coop contributors

assets/icons/arrow-down-circle.svg

@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none">
-<path d="M2.75 12C2.75 17.1086 6.89137 21.25 12 21.25C17.1086 21.25 21.25 17.1086 21.25 12C21.25 6.89137 17.1086 2.75 12 2.75C6.89137 2.75 2.75 6.89137 2.75 12Z" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/><path d="M15.25 13L12 16.25L8.75 13" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/><path d="M12 7.75V15.5" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>

assets/icons/book.svg

@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none">
-<path d="M4.75 20V4.75C4.75 3.64543 5.64543 2.75 6.75 2.75H19.25V18.75H6C5.30964 18.75 4.75 19.3096 4.75 20ZM4.75 20C4.75 20.6904 5.30964 21.25 6 21.25H19.25" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/><path d="M12 12.25C9.75 12.25 9.75 13.75 9.75 13.75H14.25C14.25 13.75 14.25 12.25 12 12.25Z" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/><path d="M13 9.25C13 9.80228 12.5523 10.25 12 10.25C11.4477 10.25 11 9.80228 11 9.25C11 8.69772 11.4477 8.25 12 8.25C12.5523 8.25 13 8.69772 13 9.25Z" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/><path d="M11.5 9.25H12.5" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>

assets/icons/compass.svg

@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none">
-<circle cx="12" cy="12" r="9.25" stroke="currentColor" stroke-width="1.5"/><ellipse cx="12" cy="12" rx="3.5" ry="9.25" stroke="currentColor" stroke-width="1.5"/><path d="M3.5 9.25H20.5" stroke="currentColor" stroke-width="1.5"/><path d="M3.5 14.75H20.5" stroke="currentColor" stroke-width="1.5"/>
-</svg>

assets/icons/copy.svg

@@ -1,3 +1,3 @@
 <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none">
-<path d="M8.75 8.75V4C8.75 3.30964 9.30964 2.75 10 2.75H20C20.6904 2.75 21.25 3.30964 21.25 4V14C21.25 14.6904 20.6904 15.25 20 15.25H15.25M14 8.75H4C3.30964 8.75 2.75 9.30964 2.75 10V20C2.75 20.6904 3.30964 21.25 4 21.25H14C14.6904 21.25 15.25 20.6904 15.25 20V10C15.25 9.30964 14.6904 8.75 14 8.75Z" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M7.10352 4C7.42998 2.84575 8.49122 2 9.75 2H14.25C15.5088 2 16.57 2.84575 16.8965 4H18.25C19.7688 4 21 5.23122 21 6.75V19.25C21 20.7688 19.7688 22 18.25 22H5.75C4.23122 22 3 20.7688 3 19.25V6.75C3 5.23122 4.23122 4 5.75 4H7.10352ZM8.5 4.75V6.25C8.5 6.38807 8.61193 6.5 8.75 6.5H15.25C15.3881 6.5 15.5 6.38807 15.5 6.25V4.75C15.5 4.05964 14.9404 3.5 14.25 3.5H9.75C9.05964 3.5 8.5 4.05964 8.5 4.75Z" fill="currentColor"/>
 </svg>

assets/icons/device.svg

@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none">
-<path d="M14.25 10.75C14.25 9.64543 15.1454 8.75 16.25 8.75H20.25C21.3546 8.75 22.25 9.64543 22.25 10.75V19.25C22.25 20.3546 21.3546 21.25 20.25 21.25H16.25C15.1454 21.25 14.25 20.3546 14.25 19.25V10.75Z" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/><path d="M17.25 18.25H19.5" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/><path d="M20.25 8.75V5.75C20.25 4.64543 19.3546 3.75 18.25 3.75H5.75C4.64543 3.75 3.75 4.64543 3.75 5.75V14.75C3.75 15.8546 2.85457 16.75 1.75 16.75V18.25C1.75 19.3546 2.64543 20.25 3.75 20.25H14.25" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/><path d="M3.75 16.75H14.25" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>

assets/icons/folder.svg

@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none">
-<path d="M2.75 5.75V17.25C2.75 18.3546 3.64543 19.25 4.75 19.25H19.25C20.3546 19.25 21.25 18.3546 21.25 17.25V8.75C21.25 7.64543 20.3546 6.75 19.25 6.75H13.0704C12.4017 6.75 11.7772 6.4158 11.4063 5.8594L10.5937 4.6406C10.2228 4.0842 9.59834 3.75 8.92963 3.75H4.75C3.64543 3.75 2.75 4.64543 2.75 5.75Z" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>

assets/icons/group.svg

@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none">
-<circle cx="12" cy="8.75" r="3" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/><circle cx="4" cy="9.80005" r="2" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/><circle cx="20" cy="9.80005" r="2" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/><path d="M7.25 16.625V16.5C7.25 13.8766 9.37665 11.75 12 11.75C14.6234 11.75 16.75 13.8766 16.75 16.5V16.625C16.75 17.5225 16.0225 18.25 15.125 18.25H8.875C7.97754 18.25 7.25 17.5225 7.25 16.625Z" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/><path d="M4.25 17.2602H2.75C1.64543 17.2602 0.706551 16.3538 0.919944 15.2701C1.25877 13.5493 2.15049 12.3257 4 11.8301" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/><path d="M19.75 17.2601H21.25C22.3546 17.2601 23.2935 16.3538 23.08 15.27C22.7412 13.5493 21.8495 12.3257 20 11.8301" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>

assets/icons/history.svg

@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none">
-<path d="M12 7.75V12L15.5 15.5" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/><path d="M2.75 4.75V8.75H6.75" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/><path d="M3.25 15.0833C4.52169 18.676 7.95303 21.25 11.9864 21.25C17.1026 21.25 21.25 17.1086 21.25 12C21.25 6.89137 17.1026 2.75 11.9864 2.75C8.14808 2.75 4.85497 5.08106 3.44947 8.40278" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>

assets/icons/input.svg

@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none">
-<path d="M11.75 6.75H19.25C20.3546 6.75 21.25 7.64543 21.25 8.75V15.25C21.25 16.3546 20.3546 17.25 19.25 17.25H11.75" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/><path d="M5.75 6.75H4.75C3.64543 6.75 2.75 7.64543 2.75 8.75V15.25C2.75 16.3546 3.64543 17.25 4.75 17.25H5.75" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/><path d="M8.75 3.75V20.25" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>

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/icons/message.svg

@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none">
-<path d="M21.75 12C21.75 6.84375 17.9583 3.75 12 3.75C6.04167 3.75 2.25 6.84375 2.25 12C2.25 13.3368 3.17054 15.6055 3.3145 15.9522C3.32742 15.9833 3.34021 16.0117 3.3518 16.0433C3.45089 16.3136 3.85722 17.7527 2.25 19.8828C4.41667 20.914 6.71766 19.2188 6.71766 19.2188C8.30963 20.0597 10.2038 20.25 12 20.25C17.9583 20.25 21.75 17.1562 21.75 12Z" stroke="currentColor" stroke-width="1.5" stroke-linecap="square" stroke-linejoin="round"/>
-</svg>

assets/icons/panel-left-open.svg

@@ -1,3 +1,3 @@
 <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M4.75 4C3.23122 4 2 5.23122 2 6.75V17.25C2 18.7688 3.23122 20 4.75 20H19.25C20.7688 20 22 18.7688 22 17.25V6.75C22 5.23122 20.7688 4 19.25 4H4.75ZM3.5 6.75C3.5 6.05964 4.05964 5.5 4.75 5.5H10.5V18.5H4.75C4.05964 18.5 3.5 17.9404 3.5 17.25V6.75Z" fill="currentColor"/><path fill-rule="evenodd" clip-rule="evenodd" d="M7 9.5C6.44772 9.5 6 9.05228 6 8.5C6 7.94772 6.44772 7.5 7 7.5C7.55228 7.5 8 7.94772 8 8.5C8 9.05228 7.55228 9.5 7 9.5ZM7 13C6.44772 13 6 12.5523 6 12C6 11.4477 6.44772 11 7 11C7.55228 11 8 11.4477 8 12C8 12.5523 7.55228 13 7 13ZM7 16.5C6.44772 16.5 6 16.0523 6 15.5C6 14.9477 6.44772 14.5 7 14.5C7.55228 14.5 8 14.9477 8 15.5C8 16.0523 7.55228 16.5 7 16.5Z" fill="currentColor"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M19.25 4C20.7688 4 22 5.23122 22 6.75V17.25C22 18.7688 20.7688 20 19.25 20H4.75C3.23122 20 2 18.7688 2 17.25V6.75C2 5.23122 3.23122 4 4.75 4H19.25ZM6.25 7.5C5.83579 7.5 5.5 7.83579 5.5 8.25V15.75C5.5 16.1642 5.83579 16.5 6.25 16.5C6.66421 16.5 7 16.1642 7 15.75V8.25C7 7.83579 6.66421 7.5 6.25 7.5Z" fill="currentColor"/>
 </svg>

assets/icons/panel-left.svg

@@ -1,3 +1,3 @@
 <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none">
-<path d="M11.25 4.75H4.75C3.64543 4.75 2.75 5.64543 2.75 6.75V17.25C2.75 18.3546 3.64543 19.25 4.75 19.25H11.25M11.25 4.75H19.25C20.3546 4.75 21.25 5.64543 21.25 6.75V17.25C21.25 18.3546 20.3546 19.25 19.25 19.25H11.25M11.25 4.75V19.25" stroke="currentColor" stroke-width="1.5" stroke-linecap="square" stroke-linejoin="round"/><path d="M6.25 8.5C6.25 8.91421 6.58579 9.25 7 9.25C7.41421 9.25 7.75 8.91421 7.75 8.5C7.75 8.08579 7.41421 7.75 7 7.75C6.58579 7.75 6.25 8.08579 6.25 8.5ZM6.25 12C6.25 12.4142 6.58579 12.75 7 12.75C7.41421 12.75 7.75 12.4142 7.75 12C7.75 11.5858 7.41421 11.25 7 11.25C6.58579 11.25 6.25 11.5858 6.25 12ZM6.25 15.5C6.25 15.9142 6.58579 16.25 7 16.25C7.41421 16.25 7.75 15.9142 7.75 15.5C7.75 15.0858 7.41421 14.75 7 14.75C6.58579 14.75 6.25 15.0858 6.25 15.5Z" fill="currentColor" stroke="currentColor" stroke-width="0.5"/>
+<path d="M2.75 6.75C2.75 5.64543 3.64543 4.75 4.75 4.75H19.25C20.3546 4.75 21.25 5.64543 21.25 6.75V17.25C21.25 18.3546 20.3546 19.25 19.25 19.25H4.75C3.64543 19.25 2.75 18.3546 2.75 17.25V6.75Z" stroke="currentColor" stroke-width="1.5" stroke-linejoin="round"/><path d="M6.25 8.25V15.75" stroke="currentColor" stroke-width="1.5" stroke-linecap="round"/>
 </svg>

assets/icons/panel-right-open.svg

@@ -1,3 +1,3 @@
 <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M15 5.5V18.5H4.75C4.05964 18.5 3.5 17.9404 3.5 17.25V6.75C3.5 6.05964 4.05964 5.5 4.75 5.5H15ZM22 6.75C22 5.23122 20.7688 4 19.25 4H4.75C3.23122 4 2 5.23122 2 6.75V17.25C2 18.7688 3.23122 20 4.75 20H19.25C20.7688 20 22 18.7688 22 17.25V6.75Z" fill="currentColor"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M4.75 4C3.23122 4 2 5.23122 2 6.75V17.25C2 18.7688 3.23122 20 4.75 20H19.25C20.7688 20 22 18.7688 22 17.25V6.75C22 5.23122 20.7688 4 19.25 4H4.75ZM17.75 7.5C18.1642 7.5 18.5 7.83579 18.5 8.25V15.75C18.5 16.1642 18.1642 16.5 17.75 16.5C17.3358 16.5 17 16.1642 17 15.75V8.25C17 7.83579 17.3358 7.5 17.75 7.5Z" fill="currentColor"/>
 </svg>

assets/icons/panel-right.svg

@@ -1,3 +1,3 @@
 <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none">
-<path d="M15.75 5V19" stroke="currentColor" stroke-width="1.5" stroke-linejoin="round"/><path d="M2.75 6.75C2.75 5.64543 3.64543 4.75 4.75 4.75H19.25C20.3546 4.75 21.25 5.64543 21.25 6.75V17.25C21.25 18.3546 20.3546 19.25 19.25 19.25H4.75C3.64543 19.25 2.75 18.3546 2.75 17.25V6.75Z" stroke="currentColor" stroke-width="1.5" stroke-linejoin="round"/>
+<path d="M2.75 6.75C2.75 5.64543 3.64543 4.75 4.75 4.75H19.25C20.3546 4.75 21.25 5.64543 21.25 6.75V17.25C21.25 18.3546 20.3546 19.25 19.25 19.25H4.75C3.64543 19.25 2.75 18.3546 2.75 17.25V6.75Z" stroke="currentColor" stroke-width="1.5" stroke-linejoin="round"/><path d="M17.75 8.25V15.75" stroke="currentColor" stroke-width="1.5" stroke-linecap="round"/>
 </svg>

assets/icons/refresh.svg

@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none">
-<path d="M13 21C13.5523 21 14 20.5523 14 20C14 19.4477 13.5523 19 13 19C12.4477 19 12 19.4477 12 20C12 20.5523 12.4477 21 13 21Z" fill="currentColor"/><path d="M21 11C21 10.4477 20.5523 9.99999 20 9.99999C19.4477 9.99999 19 10.4477 19 11C19 11.5523 19.4477 12 20 12C20.5523 12 21 11.5523 21 11Z" fill="currentColor"/><path d="M19.9295 14.2679C20.4078 14.5441 20.5716 15.1557 20.2955 15.634C20.0193 16.1123 19.4078 16.2761 18.9295 16C18.4512 15.7238 18.2873 15.1123 18.5634 14.634C18.8396 14.1557 19.4512 13.9918 19.9295 14.2679Z" fill="currentColor"/><path d="M17.3676 19.2942C17.8459 19.0181 18.0098 18.4065 17.7336 17.9282C17.4575 17.4499 16.8459 17.286 16.3676 17.5621C15.8893 17.8383 15.7254 18.4499 16.0016 18.9282C16.2777 19.4065 16.8893 19.5703 17.3676 19.2942Z" fill="currentColor"/><path d="M18.9269 7.99998C18.4487 8.27612 17.8371 8.11225 17.5609 7.63396C17.2848 7.15566 17.4487 6.54407 17.9269 6.26793C18.4052 5.99179 19.0168 6.15566 19.293 6.63396C19.5691 7.11225 19.4052 7.72384 18.9269 7.99998Z" fill="currentColor"/><path d="M9.25 14.75V20.25H3.75" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/><path d="M15.2493 4.41452C14.2521 3.98683 13.1537 3.75 12 3.75C7.44365 3.75 3.75 7.44365 3.75 12C3.75 15.498 5.92698 18.4875 9 19.6876" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>

assets/icons/reset.svg

@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none">
-<path d="M13 17.25C16.4518 17.25 19.25 14.4518 19.25 11V10.5C19.25 6.77208 16.2279 3.75 12.5 3.75C8.77208 3.75 5.75 6.77208 5.75 10.5V20" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/><path d="M2 16.5L5.75 20.25L9.5 16.5" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>

assets/icons/scan.svg

@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none">
-<path d="M7.25 4.75H4.75C3.64543 4.75 2.75 5.64543 2.75 6.75V9.25M16.75 4.75H19.25C20.3546 4.75 21.25 5.64543 21.25 6.75V9.25M21.25 14.75V17.25C21.25 18.3546 20.3546 19.25 19.25 19.25H16.75M7.25 19.25H4.75C3.64543 19.25 2.75 18.3546 2.75 17.25V14.75M7.75 9.75V14.25M16.25 9.75V14.25M12 9.75V12.25" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>

assets/icons/settings2.svg

@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none">
-<path d="M13 19.25H5.95C4.82989 19.25 4.26984 19.25 3.84202 19.032C3.46569 18.8403 3.15973 18.5343 2.96799 18.158C2.75 17.7302 2.75 17.1701 2.75 16.05V7.95C2.75 6.82989 2.75 6.26984 2.96799 5.84202C3.15973 5.46569 3.46569 5.15973 3.84202 4.96799C4.26984 4.75 4.8299 4.75 5.95 4.75H18.05C19.1701 4.75 19.7302 4.75 20.158 4.96799C20.5343 5.15973 20.8403 5.46569 21.032 5.84202C21.25 6.26984 21.25 6.8299 21.25 7.95V11" stroke="currentColor" stroke-width="1.5" stroke-linecap="round"/><path d="M3 5.63635L10.9761 10.3898C11.6069 10.7657 12.3931 10.7657 13.0239 10.3898L21 5.63635" stroke="currentColor" stroke-width="1.5"/><path d="M21.8148 15.375L21.1669 15.7491M16.1856 18.625L16.8335 18.2509M21.8147 18.625L21.1669 18.251M16.1855 15.375L16.8335 15.7491M19.0002 20.25L19.0002 19.4375M19.0002 13.75V14.5625M21.1669 17C21.1669 16.6053 21.0613 16.2352 20.8769 15.9165C20.5022 15.269 19.8021 14.8333 19.0002 14.8333C18.1983 14.8333 17.4981 15.269 17.1235 15.9165C16.9391 16.2352 16.8335 16.6053 16.8335 17C16.8335 17.3947 16.9391 17.7648 17.1235 18.0835C17.4982 18.731 18.1983 19.1667 19.0002 19.1667C19.8021 19.1667 20.5022 18.731 20.8769 18.0835C21.0613 17.7648 21.1669 17.3947 21.1669 17Z" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>

assets/icons/user-key.svg

@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none">
-<path d="M12.9996 12.8145C12.675 12.7719 12.3415 12.75 11.9996 12.75C8.55174 12.75 5.94978 14.981 4.9305 18.114C4.56744 19.23 5.50919 20.25 6.68275 20.25H13.9996M15.7496 6.5C15.7496 8.57107 14.0706 10.25 11.9996 10.25C9.92851 10.25 8.24958 8.57107 8.24958 6.5C8.24958 4.42893 9.92851 2.75 11.9996 2.75C14.0706 2.75 15.7496 4.42893 15.7496 6.5ZM15.7496 14C15.7496 12.7574 16.7569 11.75 17.9996 11.75C19.2422 11.75 20.2496 12.7574 20.2496 14C20.2496 14.7801 19.8526 15.4675 19.2496 15.8711V17L18.7496 17.9356L19.2496 18.9678V20L17.9996 21L16.7496 20V15.8711C16.1466 15.4675 15.7496 14.7801 15.7496 14Z" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>

assets/themes/aurora.json

@@ -1,144 +0,0 @@
-{
-  "id": "aurora",
-  "name": "Aurora",
-  "author": "Coop",
-  "url": "https://coopchat.xyz",
-  "light": {
-    "background": "#fdfcfeff",
-    "surface_background": "#f8f8ffff",
-    "elevated_surface_background": "#f0f1feff",
-    "panel_background": "#fdfcfeff",
-    "overlay": "#211f4300",
-    "title_bar": "#f0f1feff",
-    "title_bar_inactive": "#fdfcfeff",
-    "window_border": "#dadcffff",
-    "border": "#dadcffff",
-    "border_variant": "#cbcdffff",
-    "border_focused": "#5b5bd6ff",
-    "border_selected": "#5b5bd6ff",
-    "border_transparent": "#00000000",
-    "border_disabled": "#e6e7ffff",
-    "ring": "#5151cdff",
-    "text": "#1f2d5cff",
-    "text_muted": "#5753c6ff",
-    "text_placeholder": "#9b9ef0ff",
-    "text_accent": "#5b5bd6ff",
-    "text_danger": "#e54d2eff",
-    "text_warning": "#f76b15ff",
-    "icon": "#5753c6ff",
-    "icon_muted": "#9b9ef0ff",
-    "icon_accent": "#5151cdff",
-    "element_foreground": "#ffffffff",
-    "element_background": "#5b5bd6ff",
-    "element_hover": "#5151cdff",
-    "element_active": "#6e56cfff",
-    "element_selected": "#654dc4ff",
-    "element_disabled": "#5b5bd64d",
-    "secondary_foreground": "#1f2d5cff",
-    "secondary_background": "#f0f1feff",
-    "secondary_hover": "#e6e7ffff",
-    "secondary_active": "#dadcffff",
-    "secondary_selected": "#dadcffff",
-    "secondary_disabled": "#5b5bd64d",
-    "danger_foreground": "#ffffffff",
-    "danger_background": "#feebe7ff",
-    "danger_hover": "#ffcdc2ff",
-    "danger_active": "#fdbdafff",
-    "danger_selected": "#fdbdafff",
-    "danger_disabled": "#e54d2e4d",
-    "warning_foreground": "#ffffffff",
-    "warning_background": "#fff7edff",
-    "warning_hover": "#ffd19aff",
-    "warning_active": "#ffc182ff",
-    "warning_selected": "#ffc182ff",
-    "warning_disabled": "#f76b154d",
-    "ghost_element_background": "#00000000",
-    "ghost_element_background_alt": "#f0f1feff",
-    "ghost_element_hover": "#211f430d",
-    "ghost_element_active": "#211f431a",
-    "ghost_element_selected": "#211f431a",
-    "ghost_element_disabled": "#211f4305",
-    "tab_background": "#f0f1feff",
-    "tab_foreground": "#5753c6ff",
-    "tab_hover_background": "#211f430d",
-    "tab_active_background": "#fdfcfeff",
-    "tab_active_foreground": "#1f2d5cff",
-    "scrollbar_thumb_background": "#211f431a",
-    "scrollbar_thumb_hover_background": "#211f4326",
-    "scrollbar_thumb_border": "#00000000",
-    "scrollbar_track_background": "#00000000",
-    "scrollbar_track_border": "#00000000",
-    "drop_target_background": "#5b5bd61a",
-    "cursor": "#5b5bd6ff",
-    "selection": "#5b5bd640"
-  },
-  "dark": {
-    "background": "#14121fff",
-    "surface_background": "#1b1525ff",
-    "elevated_surface_background": "#291f43ff",
-    "panel_background": "#14121fff",
-    "overlay": "#baa7ff1a",
-    "title_bar": "#291f43ff",
-    "title_bar_inactive": "#14121fff",
-    "window_border": "#473876ff",
-    "border": "#473876ff",
-    "border_variant": "#3c2e69ff",
-    "border_focused": "#7d66d9ff",
-    "border_selected": "#7d66d9ff",
-    "border_transparent": "#00000000",
-    "border_disabled": "#33255bff",
-    "ring": "#6e56cfff",
-    "text": "#e2ddfeff",
-    "text_muted": "#baa7ffff",
-    "text_placeholder": "#6958adff",
-    "text_accent": "#baa7ffff",
-    "text_danger": "#ff977dff",
-    "text_warning": "#ffa057ff",
-    "icon": "#baa7ffff",
-    "icon_muted": "#6958adff",
-    "icon_accent": "#6e56cfff",
-    "element_foreground": "#14121fff",
-    "element_background": "#7d66d9ff",
-    "element_hover": "#baa7ffff",
-    "element_active": "#6e56cfff",
-    "element_selected": "#654dc4ff",
-    "element_disabled": "#7d66d94d",
-    "secondary_foreground": "#e2ddfeff",
-    "secondary_background": "#291f43ff",
-    "secondary_hover": "#33255bff",
-    "secondary_active": "#3c2e69ff",
-    "secondary_selected": "#3c2e69ff",
-    "secondary_disabled": "#7d66d94d",
-    "danger_foreground": "#181111ff",
-    "danger_background": "#391714ff",
-    "danger_hover": "#5e1c16ff",
-    "danger_active": "#6e2920ff",
-    "danger_selected": "#6e2920ff",
-    "danger_disabled": "#ff977d4d",
-    "warning_foreground": "#17120eff",
-    "warning_background": "#331e0bff",
-    "warning_hover": "#562800ff",
-    "warning_active": "#66350cff",
-    "warning_selected": "#66350cff",
-    "warning_disabled": "#ffa0574d",
-    "ghost_element_background": "#00000000",
-    "ghost_element_background_alt": "#291f43ff",
-    "ghost_element_hover": "#baa7ff0d",
-    "ghost_element_active": "#baa7ff1a",
-    "ghost_element_selected": "#baa7ff1a",
-    "ghost_element_disabled": "#baa7ff05",
-    "tab_background": "#291f43ff",
-    "tab_foreground": "#baa7ffff",
-    "tab_hover_background": "#baa7ff0d",
-    "tab_active_background": "#14121fff",
-    "tab_active_foreground": "#e2ddfeff",
-    "scrollbar_thumb_background": "#baa7ff1a",
-    "scrollbar_thumb_hover_background": "#baa7ff26",
-    "scrollbar_thumb_border": "#00000000",
-    "scrollbar_track_background": "#00000000",
-    "scrollbar_track_border": "#00000000",
-    "drop_target_background": "#baa7ff1a",
-    "cursor": "#baa7ffff",
-    "selection": "#baa7ff40"
-  }
-}

assets/themes/catppuccin-frappe.json

@@ -1,144 +0,0 @@
-{
-  "id": "catppuccin-frappe",
-  "name": "Catppuccin Frappé",
-  "author": "Catppuccin Org (ported by Coop)",
-  "url": "https://catppuccin.com",
-  "light": {
-    "background": "#303446",
-    "surface_background": "#292c3c",
-    "elevated_surface_background": "#232634",
-    "panel_background": "#303446",
-    "overlay": "#c6d0f51a",
-    "title_bar": "#232634",
-    "title_bar_inactive": "#303446",
-    "window_border": "#51576d",
-    "border": "#51576d",
-    "border_variant": "#414559",
-    "border_focused": "#8caaee",
-    "border_selected": "#8caaee",
-    "border_transparent": "#c6d0f500",
-    "border_disabled": "#292c3c",
-    "ring": "#babbf1",
-    "text": "#c6d0f5",
-    "text_muted": "#a5adce",
-    "text_placeholder": "#838ba7",
-    "text_accent": "#8caaee",
-    "text_danger": "#e78284",
-    "text_warning": "#ef9f76",
-    "icon": "#a5adce",
-    "icon_muted": "#838ba7",
-    "icon_accent": "#babbf1",
-    "element_foreground": "#303446",
-    "element_background": "#8caaee",
-    "element_hover": "#babbf1",
-    "element_active": "#99d1db",
-    "element_selected": "#85c1dc",
-    "element_disabled": "#8caaee4d",
-    "secondary_foreground": "#c6d0f5",
-    "secondary_background": "#414559",
-    "secondary_hover": "#51576d",
-    "secondary_active": "#626880",
-    "secondary_selected": "#626880",
-    "secondary_disabled": "#8caaee4d",
-    "danger_foreground": "#303446",
-    "danger_background": "#e78284",
-    "danger_hover": "#ea999c",
-    "danger_active": "#ef9f76",
-    "danger_selected": "#e5c890",
-    "danger_disabled": "#e782844d",
-    "warning_foreground": "#303446",
-    "warning_background": "#ef9f76",
-    "warning_hover": "#e5c890",
-    "warning_active": "#a6d189",
-    "warning_selected": "#81c8be",
-    "warning_disabled": "#ef9f764d",
-    "ghost_element_background": "#c6d0f500",
-    "ghost_element_background_alt": "#292c3c",
-    "ghost_element_hover": "#c6d0f50d",
-    "ghost_element_active": "#c6d0f51a",
-    "ghost_element_selected": "#c6d0f51a",
-    "ghost_element_disabled": "#c6d0f505",
-    "tab_background": "#232634",
-    "tab_foreground": "#a5adce",
-    "tab_hover_background": "#c6d0f50d",
-    "tab_active_background": "#303446",
-    "tab_active_foreground": "#c6d0f5",
-    "scrollbar_thumb_background": "#c6d0f51a",
-    "scrollbar_thumb_hover_background": "#c6d0f526",
-    "scrollbar_thumb_border": "#c6d0f500",
-    "scrollbar_track_background": "#c6d0f500",
-    "scrollbar_track_border": "#c6d0f500",
-    "drop_target_background": "#8caaee1a",
-    "cursor": "#8caaee",
-    "selection": "#8caaee40"
-  },
-  "dark": {
-    "background": "#303446",
-    "surface_background": "#292c3c",
-    "elevated_surface_background": "#232634",
-    "panel_background": "#303446",
-    "overlay": "#c6d0f51a",
-    "title_bar": "#232634",
-    "title_bar_inactive": "#303446",
-    "window_border": "#51576d",
-    "border": "#51576d",
-    "border_variant": "#414559",
-    "border_focused": "#8caaee",
-    "border_selected": "#8caaee",
-    "border_transparent": "#c6d0f500",
-    "border_disabled": "#292c3c",
-    "ring": "#babbf1",
-    "text": "#c6d0f5",
-    "text_muted": "#a5adce",
-    "text_placeholder": "#838ba7",
-    "text_accent": "#8caaee",
-    "text_danger": "#e78284",
-    "text_warning": "#ef9f76",
-    "icon": "#a5adce",
-    "icon_muted": "#838ba7",
-    "icon_accent": "#babbf1",
-    "element_foreground": "#303446",
-    "element_background": "#8caaee",
-    "element_hover": "#babbf1",
-    "element_active": "#99d1db",
-    "element_selected": "#85c1dc",
-    "element_disabled": "#8caaee4d",
-    "secondary_foreground": "#c6d0f5",
-    "secondary_background": "#414559",
-    "secondary_hover": "#51576d",
-    "secondary_active": "#626880",
-    "secondary_selected": "#626880",
-    "secondary_disabled": "#8caaee4d",
-    "danger_foreground": "#303446",
-    "danger_background": "#e78284",
-    "danger_hover": "#ea999c",
-    "danger_active": "#ef9f76",
-    "danger_selected": "#e5c890",
-    "danger_disabled": "#e782844d",
-    "warning_foreground": "#303446",
-    "warning_background": "#ef9f76",
-    "warning_hover": "#e5c890",
-    "warning_active": "#a6d189",
-    "warning_selected": "#81c8be",
-    "warning_disabled": "#ef9f764d",
-    "ghost_element_background": "#c6d0f500",
-    "ghost_element_background_alt": "#292c3c",
-    "ghost_element_hover": "#c6d0f50d",
-    "ghost_element_active": "#c6d0f51a",
-    "ghost_element_selected": "#c6d0f51a",
-    "ghost_element_disabled": "#c6d0f505",
-    "tab_background": "#232634",
-    "tab_foreground": "#a5adce",
-    "tab_hover_background": "#c6d0f50d",
-    "tab_active_background": "#303446",
-    "tab_active_foreground": "#c6d0f5",
-    "scrollbar_thumb_background": "#c6d0f51a",
-    "scrollbar_thumb_hover_background": "#c6d0f526",
-    "scrollbar_thumb_border": "#c6d0f500",
-    "scrollbar_track_background": "#c6d0f500",
-    "scrollbar_track_border": "#c6d0f500",
-    "drop_target_background": "#8caaee1a",
-    "cursor": "#8caaee",
-    "selection": "#8caaee40"
-  }
-}

assets/themes/catppuccin-latte.json

@@ -1,144 +0,0 @@
-{
-  "id": "catppuccin-latte",
-  "name": "Catppuccin Latte",
-  "author": "Catppuccin Org (ported by Coop)",
-  "url": "https://catppuccin.com",
-  "light": {
-    "background": "#eff1f5",
-    "surface_background": "#e6e9ef",
-    "elevated_surface_background": "#dce0e8",
-    "panel_background": "#eff1f5",
-    "overlay": "#4c4f691a",
-    "title_bar": "#dce0e8",
-    "title_bar_inactive": "#eff1f5",
-    "window_border": "#bcc0cc",
-    "border": "#bcc0cc",
-    "border_variant": "#ccd0da",
-    "border_focused": "#1e66f5",
-    "border_selected": "#1e66f5",
-    "border_transparent": "#4c4f6900",
-    "border_disabled": "#e6e9ef",
-    "ring": "#7287fd",
-    "text": "#4c4f69",
-    "text_muted": "#6c6f85",
-    "text_placeholder": "#8c8fa1",
-    "text_accent": "#1e66f5",
-    "text_danger": "#d20f39",
-    "text_warning": "#fe640b",
-    "icon": "#6c6f85",
-    "icon_muted": "#8c8fa1",
-    "icon_accent": "#7287fd",
-    "element_foreground": "#eff1f5",
-    "element_background": "#1e66f5",
-    "element_hover": "#7287fd",
-    "element_active": "#04a5e5",
-    "element_selected": "#209fb5",
-    "element_disabled": "#1e66f54d",
-    "secondary_foreground": "#4c4f69",
-    "secondary_background": "#ccd0da",
-    "secondary_hover": "#bcc0cc",
-    "secondary_active": "#acb0be",
-    "secondary_selected": "#acb0be",
-    "secondary_disabled": "#1e66f54d",
-    "danger_foreground": "#eff1f5",
-    "danger_background": "#d20f39",
-    "danger_hover": "#e64553",
-    "danger_active": "#fe640b",
-    "danger_selected": "#df8e1d",
-    "danger_disabled": "#d20f394d",
-    "warning_foreground": "#eff1f5",
-    "warning_background": "#fe640b",
-    "warning_hover": "#df8e1d",
-    "warning_active": "#40a02b",
-    "warning_selected": "#179299",
-    "warning_disabled": "#fe640b4d",
-    "ghost_element_background": "#4c4f6900",
-    "ghost_element_background_alt": "#e6e9ef",
-    "ghost_element_hover": "#4c4f690d",
-    "ghost_element_active": "#4c4f691a",
-    "ghost_element_selected": "#4c4f691a",
-    "ghost_element_disabled": "#4c4f6905",
-    "tab_background": "#e6e9ef",
-    "tab_foreground": "#6c6f85",
-    "tab_hover_background": "#4c4f690d",
-    "tab_active_background": "#eff1f5",
-    "tab_active_foreground": "#4c4f69",
-    "scrollbar_thumb_background": "#4c4f691a",
-    "scrollbar_thumb_hover_background": "#4c4f6926",
-    "scrollbar_thumb_border": "#4c4f6900",
-    "scrollbar_track_background": "#4c4f6900",
-    "scrollbar_track_border": "#4c4f6900",
-    "drop_target_background": "#1e66f51a",
-    "cursor": "#1e66f5",
-    "selection": "#1e66f540"
-  },
-  "dark": {
-    "background": "#eff1f5",
-    "surface_background": "#e6e9ef",
-    "elevated_surface_background": "#dce0e8",
-    "panel_background": "#eff1f5",
-    "overlay": "#4c4f691a",
-    "title_bar": "#dce0e8",
-    "title_bar_inactive": "#eff1f5",
-    "window_border": "#bcc0cc",
-    "border": "#bcc0cc",
-    "border_variant": "#ccd0da",
-    "border_focused": "#1e66f5",
-    "border_selected": "#1e66f5",
-    "border_transparent": "#4c4f6900",
-    "border_disabled": "#e6e9ef",
-    "ring": "#7287fd",
-    "text": "#4c4f69",
-    "text_muted": "#6c6f85",
-    "text_placeholder": "#8c8fa1",
-    "text_accent": "#1e66f5",
-    "text_danger": "#d20f39",
-    "text_warning": "#fe640b",
-    "icon": "#6c6f85",
-    "icon_muted": "#8c8fa1",
-    "icon_accent": "#7287fd",
-    "element_foreground": "#eff1f5",
-    "element_background": "#1e66f5",
-    "element_hover": "#7287fd",
-    "element_active": "#04a5e5",
-    "element_selected": "#209fb5",
-    "element_disabled": "#1e66f54d",
-    "secondary_foreground": "#4c4f69",
-    "secondary_background": "#ccd0da",
-    "secondary_hover": "#bcc0cc",
-    "secondary_active": "#acb0be",
-    "secondary_selected": "#acb0be",
-    "secondary_disabled": "#1e66f54d",
-    "danger_foreground": "#eff1f5",
-    "danger_background": "#d20f39",
-    "danger_hover": "#e64553",
-    "danger_active": "#fe640b",
-    "danger_selected": "#df8e1d",
-    "danger_disabled": "#d20f394d",
-    "warning_foreground": "#eff1f5",
-    "warning_background": "#fe640b",
-    "warning_hover": "#df8e1d",
-    "warning_active": "#40a02b",
-    "warning_selected": "#179299",
-    "warning_disabled": "#fe640b4d",
-    "ghost_element_background": "#4c4f6900",
-    "ghost_element_background_alt": "#e6e9ef",
-    "ghost_element_hover": "#4c4f690d",
-    "ghost_element_active": "#4c4f691a",
-    "ghost_element_selected": "#4c4f691a",
-    "ghost_element_disabled": "#4c4f6905",
-    "tab_background": "#e6e9ef",
-    "tab_foreground": "#6c6f85",
-    "tab_hover_background": "#4c4f690d",
-    "tab_active_background": "#eff1f5",
-    "tab_active_foreground": "#4c4f69",
-    "scrollbar_thumb_background": "#4c4f691a",
-    "scrollbar_thumb_hover_background": "#4c4f6926",
-    "scrollbar_thumb_border": "#4c4f6900",
-    "scrollbar_track_background": "#4c4f6900",
-    "scrollbar_track_border": "#4c4f6900",
-    "drop_target_background": "#1e66f51a",
-    "cursor": "#1e66f5",
-    "selection": "#1e66f540"
-  }
-}

assets/themes/catppuccin-macchiato.json

@@ -1,144 +0,0 @@
-{
-  "id": "catppuccin-macchiato",
-  "name": "Catppuccin Macchiato",
-  "author": "Catppuccin Org (ported by Coop)",
-  "url": "https://catppuccin.com",
-  "light": {
-    "background": "#24273a",
-    "surface_background": "#1e2030",
-    "elevated_surface_background": "#181926",
-    "panel_background": "#24273a",
-    "overlay": "#cad3f51a",
-    "title_bar": "#181926",
-    "title_bar_inactive": "#24273a",
-    "window_border": "#494d64",
-    "border": "#494d64",
-    "border_variant": "#363a4f",
-    "border_focused": "#8aadf4",
-    "border_selected": "#8aadf4",
-    "border_transparent": "#cad3f500",
-    "border_disabled": "#1e2030",
-    "ring": "#b7bdf8",
-    "text": "#cad3f5",
-    "text_muted": "#a5adcb",
-    "text_placeholder": "#8087a2",
-    "text_accent": "#8aadf4",
-    "text_danger": "#ed8796",
-    "text_warning": "#f5a97f",
-    "icon": "#a5adcb",
-    "icon_muted": "#8087a2",
-    "icon_accent": "#b7bdf8",
-    "element_foreground": "#24273a",
-    "element_background": "#8aadf4",
-    "element_hover": "#b7bdf8",
-    "element_active": "#91d7e3",
-    "element_selected": "#7dc4e4",
-    "element_disabled": "#8aadf44d",
-    "secondary_foreground": "#cad3f5",
-    "secondary_background": "#363a4f",
-    "secondary_hover": "#494d64",
-    "secondary_active": "#5b6078",
-    "secondary_selected": "#5b6078",
-    "secondary_disabled": "#8aadf44d",
-    "danger_foreground": "#24273a",
-    "danger_background": "#ed8796",
-    "danger_hover": "#ee99a0",
-    "danger_active": "#f5a97f",
-    "danger_selected": "#eed49f",
-    "danger_disabled": "#ed87964d",
-    "warning_foreground": "#24273a",
-    "warning_background": "#f5a97f",
-    "warning_hover": "#eed49f",
-    "warning_active": "#a6da95",
-    "warning_selected": "#8bd5ca",
-    "warning_disabled": "#f5a97f4d",
-    "ghost_element_background": "#cad3f500",
-    "ghost_element_background_alt": "#1e2030",
-    "ghost_element_hover": "#cad3f50d",
-    "ghost_element_active": "#cad3f51a",
-    "ghost_element_selected": "#cad3f51a",
-    "ghost_element_disabled": "#cad3f505",
-    "tab_background": "#181926",
-    "tab_foreground": "#a5adcb",
-    "tab_hover_background": "#cad3f50d",
-    "tab_active_background": "#24273a",
-    "tab_active_foreground": "#cad3f5",
-    "scrollbar_thumb_background": "#cad3f51a",
-    "scrollbar_thumb_hover_background": "#cad3f526",
-    "scrollbar_thumb_border": "#cad3f500",
-    "scrollbar_track_background": "#cad3f500",
-    "scrollbar_track_border": "#cad3f500",
-    "drop_target_background": "#8aadf41a",
-    "cursor": "#8aadf4",
-    "selection": "#8aadf440"
-  },
-  "dark": {
-    "background": "#24273a",
-    "surface_background": "#1e2030",
-    "elevated_surface_background": "#181926",
-    "panel_background": "#24273a",
-    "overlay": "#cad3f51a",
-    "title_bar": "#181926",
-    "title_bar_inactive": "#24273a",
-    "window_border": "#494d64",
-    "border": "#494d64",
-    "border_variant": "#363a4f",
-    "border_focused": "#8aadf4",
-    "border_selected": "#8aadf4",
-    "border_transparent": "#cad3f500",
-    "border_disabled": "#1e2030",
-    "ring": "#b7bdf8",
-    "text": "#cad3f5",
-    "text_muted": "#a5adcb",
-    "text_placeholder": "#8087a2",
-    "text_accent": "#8aadf4",
-    "text_danger": "#ed8796",
-    "text_warning": "#f5a97f",
-    "icon": "#a5adcb",
-    "icon_muted": "#8087a2",
-    "icon_accent": "#b7bdf8",
-    "element_foreground": "#24273a",
-    "element_background": "#8aadf4",
-    "element_hover": "#b7bdf8",
-    "element_active": "#91d7e3",
-    "element_selected": "#7dc4e4",
-    "element_disabled": "#8aadf44d",
-    "secondary_foreground": "#cad3f5",
-    "secondary_background": "#363a4f",
-    "secondary_hover": "#494d64",
-    "secondary_active": "#5b6078",
-    "secondary_selected": "#5b6078",
-    "secondary_disabled": "#8aadf44d",
-    "danger_foreground": "#24273a",
-    "danger_background": "#ed8796",
-    "danger_hover": "#ee99a0",
-    "danger_active": "#f5a97f",
-    "danger_selected": "#eed49f",
-    "danger_disabled": "#ed87964d",
-    "warning_foreground": "#24273a",
-    "warning_background": "#f5a97f",
-    "warning_hover": "#eed49f",
-    "warning_active": "#a6da95",
-    "warning_selected": "#8bd5ca",
-    "warning_disabled": "#f5a97f4d",
-    "ghost_element_background": "#cad3f500",
-    "ghost_element_background_alt": "#1e2030",
-    "ghost_element_hover": "#cad3f50d",
-    "ghost_element_active": "#cad3f51a",
-    "ghost_element_selected": "#cad3f51a",
-    "ghost_element_disabled": "#cad3f505",
-    "tab_background": "#181926",
-    "tab_foreground": "#a5adcb",
-    "tab_hover_background": "#cad3f50d",
-    "tab_active_background": "#24273a",
-    "tab_active_foreground": "#cad3f5",
-    "scrollbar_thumb_background": "#cad3f51a",
-    "scrollbar_thumb_hover_background": "#cad3f526",
-    "scrollbar_thumb_border": "#cad3f500",
-    "scrollbar_track_background": "#cad3f500",
-    "scrollbar_track_border": "#cad3f500",
-    "drop_target_background": "#8aadf41a",
-    "cursor": "#8aadf4",
-    "selection": "#8aadf440"
-  }
-}

assets/themes/catppuccin-mocha.json

@@ -1,144 +0,0 @@
-{
-  "id": "catppuccin-mocha",
-  "name": "Catppuccin Mocha",
-  "author": "Catppuccin Org (ported by Coop)",
-  "url": "https://catppuccin.com",
-  "light": {
-    "background": "#1e1e2e",
-    "surface_background": "#181825",
-    "elevated_surface_background": "#11111b",
-    "panel_background": "#1e1e2e",
-    "overlay": "#cdd6f41a",
-    "title_bar": "#11111b",
-    "title_bar_inactive": "#1e1e2e",
-    "window_border": "#45475a",
-    "border": "#45475a",
-    "border_variant": "#313244",
-    "border_focused": "#89b4fa",
-    "border_selected": "#89b4fa",
-    "border_transparent": "#cdd6f400",
-    "border_disabled": "#181825",
-    "ring": "#b4befe",
-    "text": "#cdd6f4",
-    "text_muted": "#a6adc8",
-    "text_placeholder": "#7f849c",
-    "text_accent": "#89b4fa",
-    "text_danger": "#f38ba8",
-    "text_warning": "#fab387",
-    "icon": "#a6adc8",
-    "icon_muted": "#7f849c",
-    "icon_accent": "#b4befe",
-    "element_foreground": "#1e1e2e",
-    "element_background": "#89b4fa",
-    "element_hover": "#b4befe",
-    "element_active": "#89dceb",
-    "element_selected": "#74c7ec",
-    "element_disabled": "#89b4fa4d",
-    "secondary_foreground": "#cdd6f4",
-    "secondary_background": "#313244",
-    "secondary_hover": "#45475a",
-    "secondary_active": "#585b70",
-    "secondary_selected": "#585b70",
-    "secondary_disabled": "#89b4fa4d",
-    "danger_foreground": "#1e1e2e",
-    "danger_background": "#f38ba8",
-    "danger_hover": "#eba0ac",
-    "danger_active": "#fab387",
-    "danger_selected": "#f9e2af",
-    "danger_disabled": "#f38ba84d",
-    "warning_foreground": "#1e1e2e",
-    "warning_background": "#fab387",
-    "warning_hover": "#f9e2af",
-    "warning_active": "#a6e3a1",
-    "warning_selected": "#94e2d5",
-    "warning_disabled": "#fab3874d",
-    "ghost_element_background": "#cdd6f400",
-    "ghost_element_background_alt": "#181825",
-    "ghost_element_hover": "#cdd6f40d",
-    "ghost_element_active": "#cdd6f41a",
-    "ghost_element_selected": "#cdd6f41a",
-    "ghost_element_disabled": "#cdd6f405",
-    "tab_background": "#11111b",
-    "tab_foreground": "#a6adc8",
-    "tab_hover_background": "#cdd6f40d",
-    "tab_active_background": "#1e1e2e",
-    "tab_active_foreground": "#cdd6f4",
-    "scrollbar_thumb_background": "#cdd6f41a",
-    "scrollbar_thumb_hover_background": "#cdd6f426",
-    "scrollbar_thumb_border": "#cdd6f400",
-    "scrollbar_track_background": "#cdd6f400",
-    "scrollbar_track_border": "#cdd6f400",
-    "drop_target_background": "#89b4fa1a",
-    "cursor": "#89b4fa",
-    "selection": "#89b4fa40"
-  },
-  "dark": {
-    "background": "#1e1e2e",
-    "surface_background": "#181825",
-    "elevated_surface_background": "#11111b",
-    "panel_background": "#1e1e2e",
-    "overlay": "#cdd6f41a",
-    "title_bar": "#11111b",
-    "title_bar_inactive": "#1e1e2e",
-    "window_border": "#45475a",
-    "border": "#45475a",
-    "border_variant": "#313244",
-    "border_focused": "#89b4fa",
-    "border_selected": "#89b4fa",
-    "border_transparent": "#cdd6f400",
-    "border_disabled": "#181825",
-    "ring": "#b4befe",
-    "text": "#cdd6f4",
-    "text_muted": "#a6adc8",
-    "text_placeholder": "#7f849c",
-    "text_accent": "#89b4fa",
-    "text_danger": "#f38ba8",
-    "text_warning": "#fab387",
-    "icon": "#a6adc8",
-    "icon_muted": "#7f849c",
-    "icon_accent": "#b4befe",
-    "element_foreground": "#1e1e2e",
-    "element_background": "#89b4fa",
-    "element_hover": "#b4befe",
-    "element_active": "#89dceb",
-    "element_selected": "#74c7ec",
-    "element_disabled": "#89b4fa4d",
-    "secondary_foreground": "#cdd6f4",
-    "secondary_background": "#313244",
-    "secondary_hover": "#45475a",
-    "secondary_active": "#585b70",
-    "secondary_selected": "#585b70",
-    "secondary_disabled": "#89b4fa4d",
-    "danger_foreground": "#1e1e2e",
-    "danger_background": "#f38ba8",
-    "danger_hover": "#eba0ac",
-    "danger_active": "#fab387",
-    "danger_selected": "#f9e2af",
-    "danger_disabled": "#f38ba84d",
-    "warning_foreground": "#1e1e2e",
-    "warning_background": "#fab387",
-    "warning_hover": "#f9e2af",
-    "warning_active": "#a6e3a1",
-    "warning_selected": "#94e2d5",
-    "warning_disabled": "#fab3874d",
-    "ghost_element_background": "#cdd6f400",
-    "ghost_element_background_alt": "#181825",
-    "ghost_element_hover": "#cdd6f40d",
-    "ghost_element_active": "#cdd6f41a",
-    "ghost_element_selected": "#cdd6f41a",
-    "ghost_element_disabled": "#cdd6f405",
-    "tab_background": "#11111b",
-    "tab_foreground": "#a6adc8",
-    "tab_hover_background": "#cdd6f40d",
-    "tab_active_background": "#1e1e2e",
-    "tab_active_foreground": "#cdd6f4",
-    "scrollbar_thumb_background": "#cdd6f41a",
-    "scrollbar_thumb_hover_background": "#cdd6f426",
-    "scrollbar_thumb_border": "#cdd6f400",
-    "scrollbar_track_background": "#cdd6f400",
-    "scrollbar_track_border": "#cdd6f400",
-    "drop_target_background": "#89b4fa1a",
-    "cursor": "#89b4fa",
-    "selection": "#89b4fa40"
-  }
-}

assets/themes/flexoki.json

@@ -1,144 +0,0 @@
-{
-  "id": "flexoki",
-  "name": "Flexoki",
-  "author": "Steph Ango (ported by Coop)",
-  "url": "https://stephango.com/flexoki",
-  "light": {
-    "background": "#FFFCF0",
-    "surface_background": "#F2F0E5",
-    "elevated_surface_background": "#E6E4D9",
-    "panel_background": "#FFFCF0",
-    "overlay": "#100F0F1A",
-    "title_bar": "#E6E4D9",
-    "title_bar_inactive": "#FFFCF0",
-    "window_border": "#CECDC3",
-    "border": "#CECDC3",
-    "border_variant": "#DAD8CE",
-    "border_focused": "#24837B",
-    "border_selected": "#24837B",
-    "border_transparent": "#100F0F00",
-    "border_disabled": "#E6E4D9",
-    "ring": "#3AA99F",
-    "text": "#100F0F",
-    "text_muted": "#6F6E69",
-    "text_placeholder": "#B7B5AC",
-    "text_accent": "#24837B",
-    "text_danger": "#AF3029",
-    "text_warning": "#BC5215",
-    "icon": "#6F6E69",
-    "icon_muted": "#B7B5AC",
-    "icon_accent": "#3AA99F",
-    "element_foreground": "#FFFCF0",
-    "element_background": "#24837B",
-    "element_hover": "#3AA99F",
-    "element_active": "#1C1B1A",
-    "element_selected": "#100F0F",
-    "element_disabled": "#24837B4D",
-    "secondary_foreground": "#100F0F",
-    "secondary_background": "#E6E4D9",
-    "secondary_hover": "#DAD8CE",
-    "secondary_active": "#CECDC3",
-    "secondary_selected": "#CECDC3",
-    "secondary_disabled": "#24837B4D",
-    "danger_foreground": "#FFFCF0",
-    "danger_background": "#AF3029",
-    "danger_hover": "#D14D41",
-    "danger_active": "#1C1B1A",
-    "danger_selected": "#100F0F",
-    "danger_disabled": "#AF30294D",
-    "warning_foreground": "#FFFCF0",
-    "warning_background": "#BC5215",
-    "warning_hover": "#DA702C",
-    "warning_active": "#1C1B1A",
-    "warning_selected": "#100F0F",
-    "warning_disabled": "#BC52154D",
-    "ghost_element_background": "#100F0F00",
-    "ghost_element_background_alt": "#F2F0E5",
-    "ghost_element_hover": "#100F0F0D",
-    "ghost_element_active": "#100F0F1A",
-    "ghost_element_selected": "#100F0F1A",
-    "ghost_element_disabled": "#100F0F05",
-    "tab_background": "#E6E4D9",
-    "tab_foreground": "#6F6E69",
-    "tab_hover_background": "#100F0F0D",
-    "tab_active_background": "#FFFCF0",
-    "tab_active_foreground": "#100F0F",
-    "scrollbar_thumb_background": "#100F0F1A",
-    "scrollbar_thumb_hover_background": "#100F0F26",
-    "scrollbar_thumb_border": "#100F0F00",
-    "scrollbar_track_background": "#100F0F00",
-    "scrollbar_track_border": "#100F0F00",
-    "drop_target_background": "#24837B1A",
-    "cursor": "#24837B",
-    "selection": "#24837B40"
-  },
-  "dark": {
-    "background": "#100F0F",
-    "surface_background": "#1C1B1A",
-    "elevated_surface_background": "#282726",
-    "panel_background": "#100F0F",
-    "overlay": "#FFFCF01A",
-    "title_bar": "#282726",
-    "title_bar_inactive": "#100F0F",
-    "window_border": "#403E3C",
-    "border": "#403E3C",
-    "border_variant": "#343331",
-    "border_focused": "#3AA99F",
-    "border_selected": "#3AA99F",
-    "border_transparent": "#100F0F00",
-    "border_disabled": "#282726",
-    "ring": "#24837B",
-    "text": "#CECDC3",
-    "text_muted": "#878580",
-    "text_placeholder": "#575653",
-    "text_accent": "#3AA99F",
-    "text_danger": "#D14D41",
-    "text_warning": "#DA702C",
-    "icon": "#878580",
-    "icon_muted": "#575653",
-    "icon_accent": "#24837B",
-    "element_foreground": "#100F0F",
-    "element_background": "#3AA99F",
-    "element_hover": "#24837B",
-    "element_active": "#CECDC3",
-    "element_selected": "#F2F0E5",
-    "element_disabled": "#3AA99F4D",
-    "secondary_foreground": "#CECDC3",
-    "secondary_background": "#1C1B1A",
-    "secondary_hover": "#282726",
-    "secondary_active": "#343331",
-    "secondary_selected": "#343331",
-    "secondary_disabled": "#3AA99F4D",
-    "danger_foreground": "#100F0F",
-    "danger_background": "#D14D41",
-    "danger_hover": "#AF3029",
-    "danger_active": "#CECDC3",
-    "danger_selected": "#F2F0E5",
-    "danger_disabled": "#D14D414D",
-    "warning_foreground": "#100F0F",
-    "warning_background": "#DA702C",
-    "warning_hover": "#BC5215",
-    "warning_active": "#CECDC3",
-    "warning_selected": "#F2F0E5",
-    "warning_disabled": "#DA702C4D",
-    "ghost_element_background": "#100F0F00",
-    "ghost_element_background_alt": "#1C1B1A",
-    "ghost_element_hover": "#FFFCF00D",
-    "ghost_element_active": "#FFFCF01A",
-    "ghost_element_selected": "#FFFCF01A",
-    "ghost_element_disabled": "#FFFCF005",
-    "tab_background": "#282726",
-    "tab_foreground": "#878580",
-    "tab_hover_background": "#FFFCF00D",
-    "tab_active_background": "#100F0F",
-    "tab_active_foreground": "#CECDC3",
-    "scrollbar_thumb_background": "#FFFCF01A",
-    "scrollbar_thumb_hover_background": "#FFFCF026",
-    "scrollbar_thumb_border": "#100F0F00",
-    "scrollbar_track_background": "#100F0F00",
-    "scrollbar_track_border": "#100F0F00",
-    "drop_target_background": "#3AA99F1A",
-    "cursor": "#3AA99F",
-    "selection": "#3AA99F40"
-  }
-}

assets/themes/forest.json

@@ -1,144 +0,0 @@
-{
-  "id": "forest",
-  "name": "Forest",
-  "author": "Coop",
-  "url": "https://coopchat.xyz",
-  "light": {
-    "background": "#fbfefcff",
-    "surface_background": "#f4fbf6ff",
-    "elevated_surface_background": "#e9f6e9ff",
-    "panel_background": "#fbfefcff",
-    "overlay": "#193b2d1a",
-    "title_bar": "#e9f6e9ff",
-    "title_bar_inactive": "#fbfefcff",
-    "window_border": "#c4e8d1ff",
-    "border": "#c4e8d1ff",
-    "border_variant": "#b2ddb5ff",
-    "border_focused": "#30a46cff",
-    "border_selected": "#30a46cff",
-    "border_transparent": "#00000000",
-    "border_disabled": "#e0f3e6ff",
-    "ring": "#2b9a66ff",
-    "text": "#193b2dff",
-    "text_muted": "#2f7c57ff",
-    "text_placeholder": "#8eceaaff",
-    "text_accent": "#30a46cff",
-    "text_danger": "#e54d2eff",
-    "text_warning": "#f76b15ff",
-    "icon": "#2f7c57ff",
-    "icon_muted": "#8eceaaff",
-    "icon_accent": "#2b9a66ff",
-    "element_foreground": "#ffffffff",
-    "element_background": "#30a46cff",
-    "element_hover": "#2b9a66ff",
-    "element_active": "#2a7e3bff",
-    "element_selected": "#218358ff",
-    "element_disabled": "#30a46c4d",
-    "secondary_foreground": "#193b2dff",
-    "secondary_background": "#e9f6e9ff",
-    "secondary_hover": "#daf1dbff",
-    "secondary_active": "#c4e8d1ff",
-    "secondary_selected": "#c4e8d1ff",
-    "secondary_disabled": "#30a46c4d",
-    "danger_foreground": "#ffffffff",
-    "danger_background": "#feebe7ff",
-    "danger_hover": "#ffcdc2ff",
-    "danger_active": "#fdbdafff",
-    "danger_selected": "#fdbdafff",
-    "danger_disabled": "#e54d2e4d",
-    "warning_foreground": "#ffffffff",
-    "warning_background": "#fff7edff",
-    "warning_hover": "#ffd19aff",
-    "warning_active": "#ffc182ff",
-    "warning_selected": "#ffc182ff",
-    "warning_disabled": "#f76b154d",
-    "ghost_element_background": "#00000000",
-    "ghost_element_background_alt": "#e9f6e9ff",
-    "ghost_element_hover": "#193b2d0d",
-    "ghost_element_active": "#193b2d1a",
-    "ghost_element_selected": "#193b2d1a",
-    "ghost_element_disabled": "#193b2d05",
-    "tab_background": "#e9f6e9ff",
-    "tab_foreground": "#2f7c57ff",
-    "tab_hover_background": "#193b2d0d",
-    "tab_active_background": "#fbfefcff",
-    "tab_active_foreground": "#193b2dff",
-    "scrollbar_thumb_background": "#193b2d1a",
-    "scrollbar_thumb_hover_background": "#193b2d26",
-    "scrollbar_thumb_border": "#00000000",
-    "scrollbar_track_background": "#00000000",
-    "scrollbar_track_border": "#00000000",
-    "drop_target_background": "#30a46c1a",
-    "cursor": "#30a46cff",
-    "selection": "#30a46c40"
-  },
-  "dark": {
-    "background": "#0e1512ff",
-    "surface_background": "#121b17ff",
-    "elevated_surface_background": "#132d21ff",
-    "panel_background": "#0e1512ff",
-    "overlay": "#b1f1cb1a",
-    "title_bar": "#132d21ff",
-    "title_bar_inactive": "#0e1512ff",
-    "window_border": "#20573eff",
-    "border": "#20573eff",
-    "border_variant": "#174933ff",
-    "border_focused": "#33b074ff",
-    "border_selected": "#33b074ff",
-    "border_transparent": "#00000000",
-    "border_disabled": "#113b29ff",
-    "ring": "#33b074ff",
-    "text": "#b1f1cbff",
-    "text_muted": "#71d083ff",
-    "text_placeholder": "#2f7c57ff",
-    "text_accent": "#3dd68cff",
-    "text_danger": "#ff977dff",
-    "text_warning": "#ffa057ff",
-    "icon": "#71d083ff",
-    "icon_muted": "#2f7c57ff",
-    "icon_accent": "#33b074ff",
-    "element_foreground": "#0e1512ff",
-    "element_background": "#3dd68cff",
-    "element_hover": "#71d083ff",
-    "element_active": "#33b074ff",
-    "element_selected": "#30a46cff",
-    "element_disabled": "#3dd68c4d",
-    "secondary_foreground": "#b1f1cbff",
-    "secondary_background": "#132d21ff",
-    "secondary_hover": "#113b29ff",
-    "secondary_active": "#174933ff",
-    "secondary_selected": "#174933ff",
-    "secondary_disabled": "#3dd68c4d",
-    "danger_foreground": "#181111ff",
-    "danger_background": "#391714ff",
-    "danger_hover": "#5e1c16ff",
-    "danger_active": "#6e2920ff",
-    "danger_selected": "#6e2920ff",
-    "danger_disabled": "#ff977d4d",
-    "warning_foreground": "#17120eff",
-    "warning_background": "#331e0bff",
-    "warning_hover": "#562800ff",
-    "warning_active": "#66350cff",
-    "warning_selected": "#66350cff",
-    "warning_disabled": "#ffa0574d",
-    "ghost_element_background": "#00000000",
-    "ghost_element_background_alt": "#132d21ff",
-    "ghost_element_hover": "#b1f1cb0d",
-    "ghost_element_active": "#b1f1cb1a",
-    "ghost_element_selected": "#b1f1cb1a",
-    "ghost_element_disabled": "#b1f1cb05",
-    "tab_background": "#132d21ff",
-    "tab_foreground": "#71d083ff",
-    "tab_hover_background": "#b1f1cb0d",
-    "tab_active_background": "#0e1512ff",
-    "tab_active_foreground": "#b1f1cbff",
-    "scrollbar_thumb_background": "#b1f1cb1a",
-    "scrollbar_thumb_hover_background": "#b1f1cb26",
-    "scrollbar_thumb_border": "#00000000",
-    "scrollbar_track_background": "#00000000",
-    "scrollbar_track_border": "#00000000",
-    "drop_target_background": "#3dd68c1a",
-    "cursor": "#3dd68cff",
-    "selection": "#3dd68c40"
-  }
-}

assets/themes/ocean.json

@@ -1,144 +0,0 @@
-{
-  "id": "ocean",
-  "name": "Ocean",
-  "author": "Coop",
-  "url": "https://coopchat.xyz",
-  "light": {
-    "background": "#fafefeff",
-    "surface_background": "#f2fbfaff",
-    "elevated_surface_background": "#e6f7f7ff",
-    "panel_background": "#fafefeff",
-    "overlay": "#00333f1a",
-    "title_bar": "#e6f7f7ff",
-    "title_bar_inactive": "#fafefeff",
-    "window_border": "#cce5e9ff",
-    "border": "#cce5e9ff",
-    "border_variant": "#b8dde3ff",
-    "border_focused": "#00a2c7ff",
-    "border_selected": "#00a2c7ff",
-    "border_transparent": "#00000000",
-    "border_disabled": "#e0f0f2ff",
-    "ring": "#0797b9ff",
-    "text": "#0d3c48ff",
-    "text_muted": "#107d98ff",
-    "text_placeholder": "#60b3d7ff",
-    "text_accent": "#00a2c7ff",
-    "text_danger": "#e54d2eff",
-    "text_warning": "#f76b15ff",
-    "icon": "#107d98ff",
-    "icon_muted": "#60b3d7ff",
-    "icon_accent": "#0797b9ff",
-    "element_foreground": "#ffffffff",
-    "element_background": "#00a2c7ff",
-    "element_hover": "#0797b9ff",
-    "element_active": "#12667eff",
-    "element_selected": "#0d4a5cff",
-    "element_disabled": "#00a2c74d",
-    "secondary_foreground": "#0d4a5cff",
-    "secondary_background": "#ddf9f2ff",
-    "secondary_hover": "#c8f4e9ff",
-    "secondary_active": "#b3ecdeff",
-    "secondary_selected": "#b3ecdeff",
-    "secondary_disabled": "#00a2c74d",
-    "danger_foreground": "#ffffffff",
-    "danger_background": "#feebe7ff",
-    "danger_hover": "#ffcdc2ff",
-    "danger_active": "#fdbdafff",
-    "danger_selected": "#fdbdafff",
-    "danger_disabled": "#e54d2e4d",
-    "warning_foreground": "#ffffffff",
-    "warning_background": "#fff7edff",
-    "warning_hover": "#ffd19aff",
-    "warning_active": "#ffc182ff",
-    "warning_selected": "#ffc182ff",
-    "warning_disabled": "#f76b154d",
-    "ghost_element_background": "#00000000",
-    "ghost_element_background_alt": "#e6f7f7ff",
-    "ghost_element_hover": "#00333f0d",
-    "ghost_element_active": "#00333f1a",
-    "ghost_element_selected": "#00333f1a",
-    "ghost_element_disabled": "#00333f05",
-    "tab_background": "#e6f7f7ff",
-    "tab_foreground": "#107d98ff",
-    "tab_hover_background": "#00333f0d",
-    "tab_active_background": "#fafefeff",
-    "tab_active_foreground": "#0d3c48ff",
-    "scrollbar_thumb_background": "#00333f1a",
-    "scrollbar_thumb_hover_background": "#00333f26",
-    "scrollbar_thumb_border": "#00000000",
-    "scrollbar_track_background": "#00000000",
-    "scrollbar_track_border": "#00000000",
-    "drop_target_background": "#00a2c71a",
-    "cursor": "#00a2c7ff",
-    "selection": "#00a2c740"
-  },
-  "dark": {
-    "background": "#0b161aff",
-    "surface_background": "#101b20ff",
-    "elevated_surface_background": "#082c36ff",
-    "panel_background": "#0b161aff",
-    "overlay": "#c2f3ff1a",
-    "title_bar": "#082c36ff",
-    "title_bar_inactive": "#0b161aff",
-    "window_border": "#1b537bff",
-    "border": "#1b537bff",
-    "border_variant": "#154467ff",
-    "border_focused": "#00a2c7ff",
-    "border_selected": "#00a2c7ff",
-    "border_transparent": "#00000000",
-    "border_disabled": "#112840ff",
-    "ring": "#23afd0ff",
-    "text": "#b6ecf7ff",
-    "text_muted": "#4ccce6ff",
-    "text_placeholder": "#197caeff",
-    "text_accent": "#7ce2feff",
-    "text_danger": "#ff977dff",
-    "text_warning": "#ffa057ff",
-    "icon": "#4ccce6ff",
-    "icon_muted": "#197caeff",
-    "icon_accent": "#23afd0ff",
-    "element_foreground": "#0b161aff",
-    "element_background": "#7ce2feff",
-    "element_hover": "#a8eeffff",
-    "element_active": "#23afd0ff",
-    "element_selected": "#00a2c7ff",
-    "element_disabled": "#7ce2fe4d",
-    "secondary_foreground": "#adf0ddff",
-    "secondary_background": "#0d2d2aff",
-    "secondary_hover": "#023b37ff",
-    "secondary_active": "#084843ff",
-    "secondary_selected": "#084843ff",
-    "secondary_disabled": "#7ce2fe4d",
-    "danger_foreground": "#181111ff",
-    "danger_background": "#391714ff",
-    "danger_hover": "#5e1c16ff",
-    "danger_active": "#6e2920ff",
-    "danger_selected": "#6e2920ff",
-    "danger_disabled": "#ff977d4d",
-    "warning_foreground": "#17120eff",
-    "warning_background": "#331e0bff",
-    "warning_hover": "#562800ff",
-    "warning_active": "#66350cff",
-    "warning_selected": "#66350cff",
-    "warning_disabled": "#ffa0574d",
-    "ghost_element_background": "#00000000",
-    "ghost_element_background_alt": "#082c36ff",
-    "ghost_element_hover": "#c2f3ff0d",
-    "ghost_element_active": "#c2f3ff1a",
-    "ghost_element_selected": "#c2f3ff1a",
-    "ghost_element_disabled": "#c2f3ff05",
-    "tab_background": "#082c36ff",
-    "tab_foreground": "#4ccce6ff",
-    "tab_hover_background": "#c2f3ff0d",
-    "tab_active_background": "#0b161aff",
-    "tab_active_foreground": "#b6ecf7ff",
-    "scrollbar_thumb_background": "#c2f3ff1a",
-    "scrollbar_thumb_hover_background": "#c2f3ff26",
-    "scrollbar_thumb_border": "#00000000",
-    "scrollbar_track_background": "#00000000",
-    "scrollbar_track_border": "#00000000",
-    "drop_target_background": "#7ce2fe1a",
-    "cursor": "#7ce2feff",
-    "selection": "#7ce2fe40"
-  }
-}

crates/auto_update/Cargo.toml

@@ -5,11 +5,18 @@ 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
+gpui_tokio.workspace = true
+reqwest.workspace = true
+anyhow.workspace = true
+smol.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"
+futures.workspace = true

crates/auto_update/src/lib.rs

@@ -1,324 +1,555 @@
-#![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};
-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::{anyhow, Context as AnyhowContext, Error};
+use gpui::http_client::{AsyncBody, HttpClient};
+use gpui::{
+    App, AppContext, AsyncApp, BackgroundExecutor, Context, Entity, Global, Subscription, Task,
+};
+use semver::Version;
+use serde::Deserialize;
+use smallvec::{smallvec, SmallVec};
+use smol::fs::File;
+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(|_| "your-username".to_string())
+}
+
+fn get_github_repo_name() -> String {
+    std::env::var("COOP_GITHUB_REPO_NAME").unwrap_or_else(|_| "your-repo".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(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(version, filter, cx)), cx);
+    AutoUpdater::set_global(cx.new(AutoUpdater::new), 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: SmallVec<[Task<()>; 2]>,
 }
 
 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(version: Version, filter: AssetFilter, cx: &mut Context<Self>) -> Self {
-        let entity = cx.entity().downgrade();
-        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(cx: &mut Context<Self>) -> Self {
+        let version = Version::parse(env!("CARGO_PKG_VERSION")).unwrap();
+        let async_version = version.clone();
 
-        // Schedule an auto-check after a 2-minute delay
-        cx.defer(move |cx| {
-            cx.spawn(async move |cx| {
-                cx.background_executor().timer(AUTO_CHECK_DELAY).await;
-                entity.update(cx, |this, cx| this.check(cx)).ok();
-            })
-            .detach();
-        });
+        let mut subscriptions = smallvec![];
+        let mut tasks = smallvec![];
 
-        Self {
-            engine,
-            status: UpdateStatus::Idle,
-            available: None,
-            version,
-            task: None,
-        }
-    }
+        tasks.push(
+            // Check for updates after 2 minutes
+            cx.spawn(async move |this, cx| {
+                cx.background_executor()
+                    .timer(Duration::from_secs(120))
+                    .await;
 
-    /// Whether nothing is happening, so the UI can hide the status line.
-    pub fn idle(&self) -> bool {
-        matches!(self.status, UpdateStatus::Idle)
-    }
+                // Update the status to checking
+                this.update(cx, |this, cx| {
+                    this.set_status(AutoUpdateStatus::Checking, cx);
+                })
+                .ok();
 
-    /// Whether the running version is the newest release, so the status line can be hidden.
-    pub fn up_to_date(&self) -> bool {
-        matches!(self.status, UpdateStatus::Idle | UpdateStatus::UpToDate)
-    }
-
-    /// 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);
+                match Self::check_for_updates(async_version, cx).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);
+                        })
+                        .ok();
                     }
-                    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);
+                    Err(e) => {
+                        log::warn!("Failed to check for updates: {e}");
+                        this.update(cx, |this, cx| {
+                            this.set_status(AutoUpdateStatus::Idle, cx);
+                        })
+                        .ok();
                     }
                 }
-            })
-            .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;
+        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);
                 }
-                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;
+        Self {
+            status: AutoUpdateStatus::Idle,
+            version,
+            _subscriptions: subscriptions,
+            _tasks: tasks,
         }
-        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_for_updates(version: Version, cx: &AsyncApp) -> Task<Result<String, Error>> {
+        cx.background_spawn(async move {
+            let client = reqwest::Client::new();
+            let repo_owner = get_github_repo_owner();
+            let repo_name = get_github_repo_name();
+            let url = format!(
+                "{}/repos/{}/{}/releases/latest",
+                GITHUB_API_URL, repo_owner, repo_name
+            );
+
+            let response = client
+                .get(&url)
+                .header("User-Agent", "Coop-Auto-Updater")
+                .send()
+                .await
+                .context("Failed to fetch GitHub releases")?;
+
+            if !response.status().is_success() {
+                return Err(anyhow!("GitHub API returned error: {}", response.status()));
+            }
+
+            let release: GitHubRelease = response
+                .json()
+                .await
+                .context("Failed to parse GitHub release")?;
+
+            // 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);
+                        });
+                    }
+                }
+            }),
+        );
+    }
+
+    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,16 +13,15 @@ settings = { path = "../settings" }
 
 gpui.workspace = true
 nostr-sdk.workspace = true
-instant.workspace = true
 
 anyhow.workspace = true
 itertools.workspace = true
 smallvec.workspace = true
-log.workspace = true
-flume.workspace = true
-
-futures.workspace = true
-fuzzy-matcher = "0.3.7"
-
-[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
 smol.workspace = true
+log.workspace = true
+futures.workspace = true
+flume.workspace = true
+serde.workspace = true
+serde_json.workspace = true
+
+fuzzy-matcher = "0.3.7"

crates/chat/src/message.rs

@@ -1,152 +1,7 @@
 use std::hash::Hash;
-use std::ops::Range;
 
-use common::{EventExt, NostrParser, extract_and_remove_media_urls};
-use gpui::{SharedString, SharedUri};
+use common::EventUtils;
 use nostr_sdk::prelude::*;
-use state::FileAttachment;
-
-pub const KIND_FILE_MESSAGE: Kind = Kind::Custom(15);
-
-/// Rendered message.
-#[derive(Debug, Clone)]
-pub struct Message {
-    pub id: EventId,
-    /// Author's public key
-    pub author: PublicKey,
-    /// The content/text of the message
-    pub content: String,
-    /// List of media URLs in the message
-    pub media: Vec<SharedUri>,
-    /// Message created time as unix timestamp
-    pub created_at: Timestamp,
-    /// List of mentioned public keys in the 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,
-        )
-    }
-}
-
-impl From<&UnsignedEvent> for Message {
-    fn from(val: &UnsignedEvent) -> Self {
-        from_parts(
-            // Event ID must be known
-            val.id.unwrap(),
-            val.pubkey,
-            val.created_at,
-            val.kind,
-            &val.content,
-            &val.tags,
-        )
-    }
-}
-
-impl From<&NewMessage> for Message {
-    fn from(val: &NewMessage) -> Self {
-        from_parts(
-            // 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,
-    }
-}
-
-impl Eq for Message {}
-
-impl PartialEq for Message {
-    fn eq(&self, other: &Self) -> bool {
-        self.id == other.id
-    }
-}
-
-impl Ord for Message {
-    fn cmp(&self, other: &Self) -> std::cmp::Ordering {
-        self.created_at.cmp(&other.created_at)
-    }
-}
-
-impl PartialOrd for Message {
-    fn partial_cmp(&self, other: &Self) -> Option<std::cmp::Ordering> {
-        Some(self.cmp(other))
-    }
-}
-
-impl Hash for Message {
-    fn hash<H: std::hash::Hasher>(&self, state: &mut H) {
-        self.id.hash(state);
-    }
-}
-
-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)]
@@ -168,62 +23,194 @@ impl NewMessage {
     }
 }
 
-/// Trash message.
-#[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord)]
-pub struct FailedMessage {
-    pub raw_event: SharedString,
-    pub reason: SharedString,
+/// Message.
+#[derive(Debug, Clone, Hash, PartialEq, Eq)]
+pub enum Message {
+    User(RenderedMessage),
+    Warning(String, Timestamp),
+    System(Timestamp),
 }
 
-impl FailedMessage {
-    pub fn new<T>(event: &Event, reason: T) -> Self
+impl Message {
+    pub fn user<I>(user: I) -> Self
     where
-        T: Into<SharedString>,
+        I: Into<RenderedMessage>,
     {
-        Self {
-            raw_event: SharedString::from(event.as_json()),
-            reason: reason.into(),
+        Self::User(user.into())
+    }
+
+    pub fn warning<I>(content: I) -> Self
+    where
+        I: Into<String>,
+    {
+        Self::Warning(content.into(), Timestamp::now())
+    }
+
+    pub fn system() -> Self {
+        Self::System(Timestamp::default())
+    }
+
+    fn timestamp(&self) -> &Timestamp {
+        match self {
+            Message::User(msg) => &msg.created_at,
+            Message::Warning(_, ts) => ts,
+            Message::System(ts) => ts,
         }
     }
 }
 
-#[derive(Debug, Clone)]
-pub struct Mention {
-    pub public_key: PublicKey,
-    pub range: Range<usize>,
+impl From<&NewMessage> for Message {
+    fn from(val: &NewMessage) -> Self {
+        Self::User(val.into())
+    }
 }
 
-impl Mention {
-    pub fn new(public_key: PublicKey, range: Range<usize>) -> Self {
-        Self { public_key, range }
+impl From<&UnsignedEvent> for Message {
+    fn from(val: &UnsignedEvent) -> Self {
+        Self::User(val.into())
+    }
+}
+
+impl Ord for Message {
+    fn cmp(&self, other: &Self) -> std::cmp::Ordering {
+        match (self, other) {
+            // System always comes first
+            (Message::System(_), Message::System(_)) => self.timestamp().cmp(other.timestamp()),
+            (Message::System(_), _) => std::cmp::Ordering::Less,
+            (_, Message::System(_)) => std::cmp::Ordering::Greater,
+
+            // For non-system messages, compare by timestamp
+            _ => self.timestamp().cmp(other.timestamp()),
+        }
+    }
+}
+
+impl PartialOrd for Message {
+    fn partial_cmp(&self, other: &Self) -> Option<std::cmp::Ordering> {
+        Some(self.cmp(other))
+    }
+}
+
+/// Rendered message.
+#[derive(Debug, Clone)]
+pub struct RenderedMessage {
+    pub id: EventId,
+    /// Author's public key
+    pub author: PublicKey,
+    /// The content/text of the message
+    pub content: String,
+    /// Message created time as unix timestamp
+    pub created_at: Timestamp,
+    /// List of mentioned public keys in the message
+    pub mentions: Vec<PublicKey>,
+    /// List of event of the message this message is a reply to
+    pub replies_to: Vec<EventId>,
+}
+
+impl From<&Event> for RenderedMessage {
+    fn from(val: &Event) -> Self {
+        let mentions = extract_mentions(&val.content);
+        let replies_to = extract_reply_ids(&val.tags);
+
+        Self {
+            id: val.id,
+            author: val.pubkey,
+            content: val.content.clone(),
+            created_at: val.created_at,
+            mentions,
+            replies_to,
+        }
+    }
+}
+
+impl From<&UnsignedEvent> for RenderedMessage {
+    fn from(val: &UnsignedEvent) -> Self {
+        let mentions = extract_mentions(&val.content);
+        let replies_to = extract_reply_ids(&val.tags);
+
+        Self {
+            // Event ID must be known
+            id: val.id.unwrap(),
+            author: val.pubkey,
+            content: val.content.clone(),
+            created_at: val.created_at,
+            mentions,
+            replies_to,
+        }
+    }
+}
+
+impl From<&NewMessage> for RenderedMessage {
+    fn from(val: &NewMessage) -> Self {
+        let mentions = extract_mentions(&val.rumor.content);
+        let replies_to = extract_reply_ids(&val.rumor.tags);
+
+        Self {
+            // Event ID must be known
+            id: val.rumor.id.unwrap(),
+            author: val.rumor.pubkey,
+            content: val.rumor.content.clone(),
+            created_at: val.rumor.created_at,
+            mentions,
+            replies_to,
+        }
+    }
+}
+
+impl Eq for RenderedMessage {}
+
+impl PartialEq for RenderedMessage {
+    fn eq(&self, other: &Self) -> bool {
+        self.id == other.id
+    }
+}
+
+impl Ord for RenderedMessage {
+    fn cmp(&self, other: &Self) -> std::cmp::Ordering {
+        self.created_at.cmp(&other.created_at)
+    }
+}
+
+impl PartialOrd for RenderedMessage {
+    fn partial_cmp(&self, other: &Self) -> Option<std::cmp::Ordering> {
+        Some(self.cmp(other))
+    }
+}
+
+impl Hash for RenderedMessage {
+    fn hash<H: std::hash::Hasher>(&self, state: &mut H) {
+        self.id.hash(state);
     }
 }
 
 /// Extracts all mentions (public keys) from a content string.
-fn extract_mentions(content: &str) -> Vec<Mention> {
+fn extract_mentions(content: &str) -> Vec<PublicKey> {
     let parser = NostrParser::new();
     let tokens = parser.parse(content);
 
     tokens
-        .filter_map(|token| match token.value {
-            Nip21::Pubkey(public_key) => Some(Mention::new(public_key, token.range)),
-            Nip21::Profile(profile) => Some(Mention::new(profile.public_key, token.range)),
+        .filter_map(|token| match token {
+            Token::Nostr(nip21) => match nip21 {
+                Nip21::Pubkey(pubkey) => Some(pubkey),
+                Nip21::Profile(profile) => Some(profile.public_key),
+                _ => None,
+            },
             _ => None,
         })
-        .collect()
+        .collect::<Vec<_>>()
 }
 
 /// Extracts all reply (ids) from the event tags.
 fn extract_reply_ids(inner: &Tags) -> Vec<EventId> {
     let mut replies_to = vec![];
 
-    for tag in inner.iter().filter(|tag| tag.kind() == "e") {
+    for tag in inner.filter(TagKind::e()) {
         if let Some(id) = tag.content().and_then(|id| EventId::parse(id).ok()) {
             replies_to.push(id);
         }
     }
 
-    for tag in inner.iter().filter(|tag| tag.kind() == "q") {
+    for tag in inner.filter(TagKind::q()) {
         if let Some(id) = tag.content().and_then(|id| EventId::parse(id).ok()) {
             replies_to.push(id);
         }

crates/chat/src/room.rs

@@ -1,28 +1,24 @@
 use std::cmp::Ordering;
 use std::hash::{Hash, Hasher};
+use std::time::Duration;
 
-use anyhow::{Error, anyhow};
-use common::EventExt;
-use device::DeviceRegistry;
+use anyhow::{Context as AnyhowContext, Error};
+use common::EventUtils;
 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 state::{NostrRegistry, TIMEOUT};
 
-use crate::{FileAttachment, KIND_FILE_MESSAGE, 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.";
+use crate::{ChatRegistry, NewMessage};
 
 #[derive(Debug, Clone)]
 pub struct SendReport {
     pub receiver: PublicKey,
     pub gift_wrap_id: Option<EventId>,
     pub error: Option<SharedString>,
-    pub output: Option<Output<EventId, EventSendStatus>>,
+    pub output: Option<Output<EventId>>,
 }
 
 impl SendReport {
@@ -42,7 +38,7 @@ impl SendReport {
     }
 
     /// Set the output.
-    pub fn output(mut self, output: Output<EventId, EventSendStatus>) -> Self {
+    pub fn output(mut self, output: Output<EventId>) -> Self {
         self.output = Some(output);
         self
     }
@@ -58,44 +54,16 @@ impl SendReport {
 
     /// Returns true if the send is pending.
     pub fn pending(&self) -> bool {
-        self.error.is_none()
-            && self
-                .output
-                .as_ref()
-                .is_some_and(|o| o.success.is_empty() && o.failed.is_empty())
+        self.output.is_none() && self.error.is_none()
     }
 
     /// Returns true if the send was successful.
     pub fn success(&self) -> bool {
-        self.error.is_none() && self.output.as_ref().is_some_and(|o| !o.success.is_empty())
-    }
-
-    /// Returns true if the send failed.
-    pub fn failed(&self) -> bool {
-        self.error.is_some() && self.output.as_ref().is_some_and(|o| !o.failed.is_empty())
-    }
-}
-
-#[derive(Debug, Clone)]
-pub enum SendStatus {
-    Ok {
-        id: EventId,
-        relay: RelayUrl,
-    },
-    Failed {
-        id: EventId,
-        relay: RelayUrl,
-        message: String,
-    },
-}
-
-impl SendStatus {
-    pub fn ok(id: EventId, relay: RelayUrl) -> Self {
-        Self::Ok { id, relay }
-    }
-
-    pub fn failed(id: EventId, relay: RelayUrl, message: String) -> Self {
-        Self::Failed { id, relay, message }
+        if let Some(output) = self.output.as_ref() {
+            !output.failed.is_empty()
+        } else {
+            false
+        }
     }
 }
 
@@ -172,8 +140,7 @@ impl From<&UnsignedEvent> for Room {
         let members = val.extract_public_keys();
         let subject = val
             .tags
-            .iter()
-            .find(|tag| tag.kind() == "subject")
+            .find(TagKind::Subject)
             .and_then(|tag| tag.content().map(|s| s.to_owned().into()));
 
         Room {
@@ -182,7 +149,7 @@ impl From<&UnsignedEvent> for Room {
             subject,
             members,
             kind: RoomKind::default(),
-            config: RoomConfig::new(),
+            config: RoomConfig::default(),
         }
     }
 }
@@ -207,7 +174,7 @@ impl Room {
         // WARNING: never sign this event
         let mut event = EventBuilder::new(Kind::PrivateDirectMessage, "")
             .tags(tags)
-            .finalize_unsigned(author);
+            .build(author);
 
         // Ensure that the ID is set
         event.ensure_id();
@@ -234,8 +201,10 @@ impl Room {
 
     /// Sets this room is ongoing conversation
     pub fn set_ongoing(&mut self, cx: &mut Context<Self>) {
-        self.kind = RoomKind::Ongoing;
-        cx.notify();
+        if self.kind != RoomKind::Ongoing {
+            self.kind = RoomKind::Ongoing;
+            cx.notify();
+        }
     }
 
     /// Updates the creation timestamp of the room
@@ -253,26 +222,9 @@ impl Room {
         cx.notify();
     }
 
-    /// Updates the signer kind config for the room
-    pub fn set_signer_kind(&mut self, kind: &SignerKind, cx: &mut Context<Self>) {
-        self.config.set_signer_kind(kind);
-        cx.notify();
-    }
-
-    /// Updates the backup config for the room
-    pub fn set_backup(&mut self, cx: &mut Context<Self>) {
-        self.config.toggle_backup();
-        cx.notify();
-    }
-
-    /// Returns the config of the room
-    pub fn config(&self) -> &RoomConfig {
-        &self.config
-    }
-
     /// 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)
@@ -289,21 +241,12 @@ impl Room {
         }
     }
 
-    /// Gets the display picture for the room, if it has one
-    pub fn display_image(&self, cx: &App) -> Option<SharedString> {
-        if self.is_group() {
-            None
-        } else {
+    /// Gets the display image for the room
+    pub fn display_image(&self, cx: &App) -> SharedString {
+        if !self.is_group() {
             self.display_member(cx).avatar()
-        }
-    }
-
-    /// A stable seed for the room's generated avatar
-    pub fn display_image_seed(&self, cx: &App) -> SharedString {
-        if self.is_group() {
-            SharedString::from(self.id.to_string())
         } else {
-            self.display_member(cx).avatar_seed()
+            SharedString::from("brand/group.png")
         }
     }
 
@@ -353,6 +296,10 @@ impl Room {
 
         if new_message {
             self.set_created_at(created_at, cx);
+            // Sort chats after emitting a new message
+            ChatRegistry::global(cx).update(cx, |this, cx| {
+                this.sort(cx);
+            });
         }
     }
 
@@ -362,41 +309,44 @@ impl Room {
     }
 
     /// Get gossip relays for each member
-    pub fn connect(&self, cx: &App) -> Task<Result<(), Error>> {
+    pub fn early_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();
+        let subscription_id = SubscriptionId::new(format!("room-{}", self.id));
 
         cx.background_spawn(async move {
-            let opts = SubscribeAutoCloseOptions::default()
-                .exit_policy(ReqExitPolicy::ExitOnEOSE)
-                .timeout(Some(Duration::from_secs(TIMEOUT)));
+            let signer = client.signer().context("Signer not found")?;
+            let public_key = signer.get_public_key().await?;
 
-            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 member in members.into_iter() {
+                if member == public_key {
+                    continue;
+                };
 
-                        let announcement = Filter::new()
-                            .author(public_key)
-                            .kind(Kind::Custom(10044))
-                            .limit(1);
+                // Construct a filter for messaging relays
+                let inbox = Filter::new()
+                    .kind(Kind::InboxRelays)
+                    .author(member)
+                    .limit(1);
 
-                        client
-                            .subscribe(vec![inbox, announcement])
-                            .close_on(opts)
-                            .await
-                    }
-                })
-                .collect();
+                // Construct a filter for announcement
+                let announcement = Filter::new()
+                    .kind(Kind::Custom(10044))
+                    .author(member)
+                    .limit(1);
 
-            for result in futures::future::join_all(tasks).await {
-                result?;
+                // Subscribe to get member's gossip relays
+                client
+                    .subscribe(vec![inbox, announcement])
+                    .with_id(subscription_id.clone())
+                    .close_on(
+                        SubscribeAutoCloseOptions::default()
+                            .timeout(Some(Duration::from_secs(TIMEOUT)))
+                            .exit_policy(ReqExitPolicy::ExitOnEOSE),
+                    )
+                    .await?;
             }
 
             Ok(())
@@ -407,12 +357,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()
@@ -428,210 +378,183 @@ 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).signer().public_key()?;
+
+        // Get all members
+        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![];
 
         // Add subject tag if present
         if let Some(value) = self.subject.as_ref() {
-            tags.push(Tag::custom("subject", vec![value.to_string()]));
+            tags.push(Tag::from_standardized_without_cell(TagStandard::Subject(
+                value.to_string(),
+            )));
         }
 
         // 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() {
+            // Skip current user
+            if member.public_key() == sender {
+                continue;
             }
-            SignerKind::Encryption => encryption_signer
-                .clone()
-                .expect("encryption signer must be set"),
-            SignerKind::User => user_signer.clone(),
+
+            tags.push(Tag::from_standardized_without_cell(
+                TagStandard::PublicKey {
+                    public_key: member.public_key(),
+                    relay_url: member.messaging_relay_hint(),
+                    alias: None,
+                    uppercase: false,
+                },
+            ));
         }
+
+        // Construct a direct message rumor event
+        // WARNING: never sign and send this event to relays
+        let mut event = EventBuilder::new(kind, content).tags(tags).build(sender);
+
+        // Ensure that the ID is set
+        event.ensure_id();
+
+        Some(event)
     }
 
     /// Send rumor event to all members's messaging relays
     pub fn send(&self, rumor: UnsignedEvent, cx: &App) -> Option<Task<Vec<SendReport>>> {
-        let config = self.config.clone();
-
-        let device = DeviceRegistry::global(cx);
-        let encryption_signer = device.read(cx).signer(cx);
-
+        let persons = PersonRegistry::global(cx);
         let nostr = NostrRegistry::global(cx);
         let client = nostr.read(cx).client();
-        let user_signer = nostr.read(cx).signer();
-        let current_user = nostr.read(cx).current_user()?;
+        let signer = nostr.read(cx).signer();
 
-        // Get sender's profile
-        let persons = PersonRegistry::global(cx);
-        let sender = persons.read(cx).get(&current_user, cx);
+        // Get room's config
+        let config = self.config.clone();
+
+        // Get current user's public key
+        let sender = nostr.read(cx).signer().public_key()?;
 
         // Get all members (excluding sender)
         let members: Vec<Person> = self
             .members
             .iter()
-            .filter(|public_key| public_key != &&sender.public_key())
+            .filter(|public_key| public_key != &&sender)
             .map(|member| persons.read(cx).get(member, cx))
             .collect();
 
         Some(cx.background_spawn(async move {
             let signer_kind = config.signer_kind();
-            let backup = config.backup();
+            let user_signer = signer.get().await;
+            let encryption_signer = signer.get_encryption_signer().await;
 
-            let mut sents = 0;
             let mut reports = Vec::new();
 
-            // Process each member
             for member in members {
+                let relays = member.messaging_relays();
                 let announcement = member.announcement();
-                let public_key = member.public_key();
 
-                // Handle encryption signer requirements
-                if signer_kind.encryption() {
-                    // Receiver didn't set up a decoupled encryption key
-                    if announcement.is_none() {
-                        reports.push(SendReport::new(public_key).error(NO_DEKEY));
-                        continue;
-                    }
-
-                    // Sender didn't set up a decoupled encryption key
-                    if encryption_signer.is_none() {
-                        reports.push(SendReport::new(sender.public_key()).error(USER_NO_DEKEY));
-                        continue;
-                    }
+                // Skip if member has no messaging relays
+                if relays.is_empty() {
+                    reports.push(SendReport::new(member.public_key()).error("No messaging relays"));
+                    continue;
                 }
 
-                // Determine the signer to use
-                let signer = Self::select_signer(
-                    signer_kind,
-                    announcement.is_some(),
-                    &encryption_signer,
-                    &user_signer,
-                );
-
-                // Send the gift wrap event and collect the report
-                match send_gift_wrap(&client, &signer, &member, &rumor, signer_kind).await {
-                    Ok(report) => {
-                        reports.push(report);
-                        sents += 1;
-                    }
-                    Err(error) => {
-                        let report = SendReport::new(public_key).error(error.to_string());
-                        reports.push(report);
-                    }
+                // Ensure relay connections
+                for url in relays.iter() {
+                    client
+                        .add_relay(url)
+                        .and_connect()
+                        .capabilities(RelayCapabilities::GOSSIP)
+                        .await
+                        .ok();
                 }
-            }
 
-            // Send backup to current user if needed
-            if backup && sents >= 1 {
-                let public_key = sender.public_key();
+                // When forced to use encryption signer, skip if receiver has no announcement
+                if signer_kind.encryption() && announcement.is_none() {
+                    reports
+                        .push(SendReport::new(member.public_key()).error("Encryption not found"));
+                    continue;
+                }
 
-                // Determine the signer to use
-                let signer = Self::select_signer(
-                    signer_kind,
-                    sender.announcement().is_some(),
-                    &encryption_signer,
-                    &user_signer,
-                );
+                // Determine receiver and signer based on signer kind
+                let (receiver, signer_to_use) = match signer_kind {
+                    SignerKind::Auto => {
+                        if let Some(announcement) = announcement {
+                            if let Some(enc_signer) = encryption_signer.as_ref() {
+                                (announcement.public_key(), enc_signer.clone())
+                            } else {
+                                (member.public_key(), user_signer.clone())
+                            }
+                        } else {
+                            (member.public_key(), user_signer.clone())
+                        }
+                    }
+                    SignerKind::Encryption => {
+                        let Some(encryption_signer) = encryption_signer.as_ref() else {
+                            reports.push(
+                                SendReport::new(member.public_key()).error("Encryption not found"),
+                            );
+                            continue;
+                        };
+                        let Some(announcement) = announcement else {
+                            reports.push(
+                                SendReport::new(member.public_key())
+                                    .error("Announcement not found"),
+                            );
+                            continue;
+                        };
+                        (announcement.public_key(), encryption_signer.clone())
+                    }
+                    SignerKind::User => (member.public_key(), user_signer.clone()),
+                };
 
-                match send_gift_wrap(&client, &signer, &sender, &rumor, signer_kind).await {
-                    Ok(report) => reports.push(report),
-                    Err(error) => {
-                        let report = SendReport::new(public_key).error(error.to_string());
-                        reports.push(report);
+                // Create and send gift-wrapped event
+                match EventBuilder::gift_wrap(&signer_to_use, &receiver, rumor.clone(), []).await {
+                    Ok(event) => {
+                        match client
+                            .send_event(&event)
+                            .to(relays)
+                            .ack_policy(AckPolicy::none())
+                            .await
+                        {
+                            Ok(output) => {
+                                reports.push(
+                                    SendReport::new(member.public_key())
+                                        .gift_wrap_id(event.id)
+                                        .output(output),
+                                );
+                            }
+                            Err(e) => {
+                                reports.push(
+                                    SendReport::new(member.public_key()).error(e.to_string()),
+                                );
+                            }
+                        }
+                    }
+                    Err(e) => {
+                        reports.push(SendReport::new(member.public_key()).error(e.to_string()));
                     }
                 }
             }
@@ -639,57 +562,222 @@ impl Room {
             reports
         }))
     }
-}
 
-// Helper function to send a gift-wrapped event
-async fn send_gift_wrap(
-    client: &Client,
-    signer: &UniversalSigner,
-    receiver: &Person,
-    rumor: &UnsignedEvent,
-    config: &SignerKind,
-) -> Result<SendReport, Error> {
-    let k_tag = Tag::custom("k", [rumor.kind.to_string()]);
-    let mut extra_tags = vec![k_tag];
+    /*
+    * /// Create a new unsigned message event
+    pub fn create_message(
+        &self,
+        content: &str,
+        replies: Vec<EventId>,
+        cx: &App,
+    ) -> Task<Result<UnsignedEvent, Error>> {
+        let nostr = NostrRegistry::global(cx);
+        let client = nostr.read(cx).client();
 
-    // Determine the receiver public key based on the config
-    let receiver = match config {
-        SignerKind::Auto => {
-            if let Some(announcement) = receiver.announcement().as_ref() {
-                extra_tags.push(Tag::public_key(receiver.public_key()));
-                announcement.public_key()
-            } else {
-                receiver.public_key()
-            }
+        let subject = self.subject.clone();
+        let content = content.to_string();
+
+        let mut member_and_relay_hints = HashMap::new();
+
+        // Populate the hashmap with member and relay hint tasks
+        for member in self.members.iter() {
+            let hint = nostr.read(cx).relay_hint(member, cx);
+            member_and_relay_hints.insert(member.to_owned(), hint);
         }
-        SignerKind::Encryption => {
-            if let Some(announcement) = receiver.announcement().as_ref() {
-                extra_tags.push(Tag::public_key(receiver.public_key()));
-                announcement.public_key()
-            } else {
-                return Err(anyhow!("User has no encryption announcement"));
+
+        cx.background_spawn(async move {
+            let signer = client.signer().context("Signer not found")?;
+            let public_key = signer.get_public_key().await?;
+
+            // List of event tags for each receiver
+            let mut tags = vec![];
+
+            for (member, task) in member_and_relay_hints.into_iter() {
+                // Skip current user
+                if member == public_key {
+                    continue;
+                }
+
+                // Get relay hint if available
+                let relay_url = task.await;
+
+                // Construct a public key tag with relay hint
+                let tag = TagStandard::PublicKey {
+                    public_key: member,
+                    relay_url,
+                    alias: None,
+                    uppercase: false,
+                };
+
+                tags.push(Tag::from_standardized_without_cell(tag));
             }
-        }
-        SignerKind::User => receiver.public_key(),
-    };
 
-    // Construct the gift wrap event
-    let event = nip59::GiftWrapBuilder::new(receiver, rumor.clone())
-        .extra_tags(extra_tags)
-        .finalize_async(signer)
-        .await?;
+            // Add subject tag if present
+            if let Some(value) = subject {
+                tags.push(Tag::from_standardized_without_cell(TagStandard::Subject(
+                    value.to_string(),
+                )));
+            }
 
-    // Send the gift wrap event and collect the report
-    let report = client
-        .send_event(&event)
-        .to_nip17()
-        .ack_policy(AckPolicy::none())
-        .await
-        .map(|output| {
-            SendReport::new(receiver)
-                .gift_wrap_id(event.id)
-                .output(output)
-        })?;
+            // Add all reply tags
+            for id in replies {
+                tags.push(Tag::event(id))
+            }
 
-    Ok(report)
+            // Construct a direct message event
+            //
+            // WARNING: never sign and send this event to relays
+            let mut event = EventBuilder::new(Kind::PrivateDirectMessage, content)
+                .tags(tags)
+                .build(public_key);
+
+            // Ensure the event ID has been generated
+            event.ensure_id();
+
+            Ok(event)
+        })
+    }
+
+    /// Create a task to send a message to all room members
+    pub fn send_message(
+        &self,
+        rumor: &UnsignedEvent,
+        cx: &App,
+    ) -> Task<Result<Vec<SendReport>, Error>> {
+        let nostr = NostrRegistry::global(cx);
+        let client = nostr.read(cx).client();
+
+        let mut members = self.members();
+        let rumor = rumor.to_owned();
+
+        cx.background_spawn(async move {
+            let signer = client.signer().context("Signer not found")?;
+            let current_user = signer.get_public_key().await?;
+
+            // Remove the current user's public key from the list of receivers
+            // the current user will be handled separately
+            members.retain(|this| this != &current_user);
+
+            // Collect the send reports
+            let mut reports: Vec<SendReport> = vec![];
+
+            for receiver in members.into_iter() {
+                // Construct the gift wrap event
+                let event =
+                    EventBuilder::gift_wrap(signer, &receiver, rumor.clone(), vec![]).await?;
+
+                // Send the gift wrap event to the messaging relays
+                match client.send_event(&event).to_nip17().await {
+                    Ok(output) => {
+                        let id = output.id().to_owned();
+                        let auth = output.failed.iter().any(|(_, s)| s.starts_with("auth-"));
+                        let report = SendReport::new(receiver).status(output);
+                        let tracker = tracker().read().await;
+
+                        if auth {
+                            // Wait for authenticated and resent event successfully
+                            for attempt in 0..=SEND_RETRY {
+                                // Check if event was successfully resent
+                                if tracker.is_sent_by_coop(&id) {
+                                    let output = Output::new(id);
+                                    let report = SendReport::new(receiver).status(output);
+                                    reports.push(report);
+                                    break;
+                                }
+
+                                // Check if retry limit exceeded
+                                if attempt == SEND_RETRY {
+                                    reports.push(report);
+                                    break;
+                                }
+
+                                smol::Timer::after(Duration::from_millis(1200)).await;
+                            }
+                        } else {
+                            reports.push(report);
+                        }
+                    }
+                    Err(e) => {
+                        reports.push(SendReport::new(receiver).error(e.to_string()));
+                    }
+                }
+            }
+
+            // Construct the gift-wrapped event
+            let event =
+                EventBuilder::gift_wrap(signer, &current_user, rumor.clone(), vec![]).await?;
+
+            // Only send a backup message to current user if sent successfully to others
+            if reports.iter().all(|r| r.is_sent_success()) {
+                // Send the event to the messaging relays
+                match client.send_event(&event).to_nip17().await {
+                    Ok(output) => {
+                        reports.push(SendReport::new(current_user).status(output));
+                    }
+                    Err(e) => {
+                        reports.push(SendReport::new(current_user).error(e.to_string()));
+                    }
+                }
+            } else {
+                reports.push(SendReport::new(current_user).on_hold(event));
+            }
+
+            Ok(reports)
+        })
+    }
+
+    /// Create a task to resend a failed message
+    pub fn resend_message(
+        &self,
+        reports: Vec<SendReport>,
+        cx: &App,
+    ) -> Task<Result<Vec<SendReport>, Error>> {
+        let nostr = NostrRegistry::global(cx);
+        let client = nostr.read(cx).client();
+
+        cx.background_spawn(async move {
+            let mut resend_reports = vec![];
+
+            for report in reports.into_iter() {
+                let receiver = report.receiver;
+
+                // Process failed events
+                if let Some(output) = report.status {
+                    let id = output.id();
+                    let urls: Vec<&RelayUrl> = output.failed.keys().collect();
+
+                    if let Some(event) = client.database().event_by_id(id).await? {
+                        for url in urls.into_iter() {
+                            let relay = client.relay(url).await?.context("Relay not found")?;
+                            let id = relay.send_event(&event).await?;
+
+                            let resent: Output<EventId> = Output {
+                                val: id,
+                                success: HashSet::from([url.to_owned()]),
+                                failed: HashMap::new(),
+                            };
+
+                            resend_reports.push(SendReport::new(receiver).status(resent));
+                        }
+                    }
+                }
+
+                // Process the on hold event if it exists
+                if let Some(event) = report.on_hold {
+                    // Send the event to the messaging relays
+                    match client.send_event(&event).await {
+                        Ok(output) => {
+                            resend_reports.push(SendReport::new(receiver).status(output));
+                        }
+                        Err(e) => {
+                            resend_reports.push(SendReport::new(receiver).error(e.to_string()));
+                        }
+                    }
+                }
+            }
+
+            Ok(resend_reports)
+        })
+    }
+    */
 }

crates/chat_ui/Cargo.toml

@@ -7,6 +7,7 @@ publish.workspace = true
 [dependencies]
 state = { path = "../state" }
 ui = { path = "../ui" }
+dock = { path = "../dock" }
 theme = { path = "../theme" }
 common = { path = "../common" }
 person = { path = "../person" }
@@ -14,16 +15,17 @@ chat = { path = "../chat" }
 settings = { path = "../settings" }
 
 gpui.workspace = true
+gpui_tokio.workspace = true
+
 nostr-sdk.workspace = true
 anyhow.workspace = true
 itertools.workspace = true
 smallvec.workspace = true
+smol.workspace = true
 flume.workspace = true
-futures.workspace = true
 log.workspace = true
 serde.workspace = true
+serde_json.workspace = true
 
-linkify = "0.10.0"
-pulldown-cmark = "0.13.1"
+once_cell = "1.19.0"
 regex = "1"
-

crates/chat_ui/src/actions.rs

@@ -1,17 +1,24 @@
 use gpui::Action;
 use nostr_sdk::prelude::*;
 use serde::Deserialize;
-use settings::SignerKind;
 
 #[derive(Action, Clone, PartialEq, Eq, Deserialize)]
 #[action(namespace = chat, no_json)]
 pub enum Command {
     Insert(&'static str),
-    ChangeSubject(String),
-    ChangeSigner(SignerKind),
-    ToggleBackup,
-    Copy(PublicKey),
-    Relays(PublicKey),
-    Njump(PublicKey),
-    Trace(EventId),
+    ChangeSubject(&'static str),
 }
+
+#[derive(Action, Clone, PartialEq, Eq, Deserialize)]
+#[action(namespace = chat, no_json)]
+pub struct SeenOn(pub EventId);
+
+/// Define a open public key action
+#[derive(Action, Clone, PartialEq, Eq, Deserialize, Debug)]
+#[action(namespace = pubkey, no_json)]
+pub struct OpenPublicKey(pub PublicKey);
+
+/// Define a copy inline public key action
+#[derive(Action, Clone, PartialEq, Eq, Deserialize, Debug)]
+#[action(namespace = pubkey, no_json)]
+pub struct CopyPublicKey(pub PublicKey);

crates/chat_ui/src/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/subject.rs

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

crates/chat_ui/src/text.rs

@@ -1,31 +1,29 @@
 use std::ops::Range;
-use std::sync::{Arc, LazyLock};
+use std::sync::Arc;
 
-use chat::Mention;
 use gpui::{
-    AnyElement, App, ElementId, Entity, FontStyle, FontWeight, HighlightStyle, InteractiveText,
-    IntoElement, SharedString, StrikethroughStyle, StyledText, UnderlineStyle, Window,
+    AnyElement, App, ElementId, HighlightStyle, InteractiveText, IntoElement, SharedString,
+    StyledText, UnderlineStyle, Window,
 };
+use nostr_sdk::prelude::*;
+use once_cell::sync::Lazy;
 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());
+use crate::actions::OpenPublicKey;
+
+static URL_REGEX: Lazy<Regex> = Lazy::new(|| {
+    Regex::new(r"(?i)(?:^|\s)(?:https?://)?(?:[a-z0-9](?:[a-z0-9-]{0,61}[a-z0-9])?\.)+[a-z]{2,}(?::\d+)?(?:/[^\s]*)?(?:\s|$)").unwrap()
+});
+
+static NOSTR_URI_REGEX: Lazy<Regex> =
+    Lazy::new(|| Regex::new(r"nostr:(npub|note|nprofile|nevent|naddr)[a-zA-Z0-9]+").unwrap());
 
-#[allow(clippy::enum_variant_names)]
 #[derive(Debug, Clone, PartialEq, Eq)]
 pub enum Highlight {
-    Code,
-    InlineCode(bool),
-    Highlight(HighlightStyle),
-    Mention,
-}
-
-impl From<HighlightStyle> for Highlight {
-    fn from(style: HighlightStyle) -> Self {
-        Self::Highlight(style)
-    }
+    Link,
+    Nostr,
 }
 
 #[derive(Default)]
@@ -37,65 +35,22 @@ pub struct RenderedText {
 }
 
 impl RenderedText {
-    pub fn new(
-        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 {
+    pub fn new(content: &str, cx: &App) -> 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,
+            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),
@@ -106,74 +61,48 @@ 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"
-        };
+        let link_color = cx.theme().text_accent;
 
         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()
-                                            }),
-                                            ..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()
-                                    }),
-                                    ..Default::default()
-                                },
-                                Highlight::Highlight(highlight) => *highlight,
+            StyledText::new(self.text.clone()).with_default_highlights(
+                &window.text_style(),
+                self.highlights.iter().map(|(range, highlight)| {
+                    (
+                        range.clone(),
+                        match highlight {
+                            Highlight::Link => HighlightStyle {
+                                color: Some(link_color),
+                                underline: Some(UnderlineStyle::default()),
+                                ..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::Nostr => HighlightStyle {
+                                color: Some(link_color),
+                                ..Default::default()
+                            },
+                        },
+                    )
+                }),
+            ),
         )
         .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) {
-                    cx.open_url(url);
+            move |ix, window, cx| {
+                let token = link_urls[ix].as_str();
+
+                if let Some(clean_url) = token.strip_prefix("nostr:") {
+                    if let Ok(public_key) = PublicKey::parse(clean_url) {
+                        window.dispatch_action(Box::new(OpenPublicKey(public_key)), cx);
+                    }
+                } else if is_url(token) {
+                    let url = if token.starts_with("http") {
+                        token.to_string()
+                    } else {
+                        format!("https://{token}")
+                    };
+                    cx.open_url(&url);
+                } else {
+                    log::warn!("Unrecognized token {token}")
                 }
             }
         })
@@ -181,308 +110,214 @@ impl RenderedText {
     }
 }
 
-#[allow(clippy::too_many_arguments)]
-fn render_text_mut(
-    block: &str,
-    mut mentions: &[Mention],
+fn render_plain_text_mut(
+    content: &str,
     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,
+    cx: &App,
 ) {
-    use pulldown_cmark::{Event, Options, Parser, Tag, TagEnd};
+    // Copy the content directly
+    text.push_str(content);
 
-    let mut bold_depth = 0;
-    let mut italic_depth = 0;
-    let mut strikethrough_depth = 0;
-    let mut link_url = None;
-    let mut list_stack = Vec::new();
-    let mut code_block = false;
+    // Collect all URLs
+    let mut url_matches: Vec<(Range<usize>, String)> = Vec::new();
 
-    // 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())))
-    };
+    for link in URL_REGEX.find_iter(content) {
+        let range = link.start()..link.end();
+        let url = link.as_str().to_string();
 
-    for (event, source_range) in events {
-        let prev_len = text.len();
+        url_matches.push((range, url));
+    }
 
-        match event {
-            Event::Text(t) => {
-                if code_block {
-                    text.push_str(t.as_ref());
-                    highlights.push((prev_len..text.len(), Highlight::Code));
-                    continue;
-                }
+    // Collect all nostr entities with nostr: prefix
+    let mut nostr_matches: Vec<(Range<usize>, String)> = Vec::new();
 
-                let t_str = t.as_ref();
-                let mut last_processed = 0;
+    for nostr_match in NOSTR_URI_REGEX.find_iter(content) {
+        let range = nostr_match.start()..nostr_match.end();
+        let nostr_uri = nostr_match.as_str().to_string();
 
-                while let Some(mention) = mentions.first() {
-                    if mention.range.start >= source_range.end {
-                        break;
-                    }
+        // Check if this nostr URI overlaps with any already processed URL
+        if !url_matches
+            .iter()
+            .any(|(url_range, _)| url_range.start < range.end && range.start < url_range.end)
+        {
+            nostr_matches.push((range, nostr_uri));
+        }
+    }
 
-                    mentions = &mentions[1..];
-                    if mention.range.start < source_range.start
-                        || mention.range.end > source_range.end
-                    {
-                        continue;
-                    }
+    // Combine all matches for processing from end to start
+    let mut all_matches = Vec::new();
+    all_matches.extend(url_matches);
+    all_matches.extend(nostr_matches);
 
-                    let Some(token) = block.get(mention.range.clone()) else {
-                        continue;
-                    };
+    // Sort by position (end to start) to avoid changing positions when replacing text
+    all_matches.sort_by(|(range_a, _), (range_b, _)| range_b.start.cmp(&range_a.start));
 
-                    let Some(offset) = t_str[last_processed..].find(token) else {
-                        continue;
-                    };
+    // Process all matches
+    for (range, entity) in all_matches {
+        // Handle URL token
+        if is_url(&entity) {
+            highlights.push((range.clone(), Highlight::Link));
+            link_ranges.push(range);
+            link_urls.push(entity);
+            continue;
+        };
 
-                    let mention_start_in_text = last_processed + offset;
-                    let mention_end_in_text = mention_start_in_text + token.len();
-
-                    // 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,
-                            bold_depth,
-                            italic_depth,
-                            strikethrough_depth,
-                            link_url.clone(),
-                            text,
-                            highlights,
-                            link_ranges,
-                            link_urls,
-                        );
-                    }
-
-                    // Process the mention replacement
-                    let replacement_text = resolve_mention(mention);
-                    let replacement_start = text.len();
-                    text.push_str(&replacement_text);
-                    let replacement_end = text.len();
-
-                    highlights.push((replacement_start..replacement_end, Highlight::Mention));
-
-                    last_processed = mention_end_in_text;
-                }
-
-                // Add any remaining text after the last mention
-                if last_processed < t_str.len() {
-                    let remaining_text = &t_str[last_processed..];
-                    process_text_segment(
-                        remaining_text,
-                        bold_depth,
-                        italic_depth,
-                        strikethrough_depth,
-                        link_url.clone(),
+        if let Ok(nip21) = Nip21::parse(&entity) {
+            match nip21 {
+                Nip21::Pubkey(public_key) => {
+                    render_pubkey(
+                        public_key,
                         text,
+                        &range,
+                        highlights,
+                        link_ranges,
+                        link_urls,
+                        cx,
+                    );
+                }
+                Nip21::Profile(nip19_profile) => {
+                    render_pubkey(
+                        nip19_profile.public_key,
+                        text,
+                        &range,
+                        highlights,
+                        link_ranges,
+                        link_urls,
+                        cx,
+                    );
+                }
+                Nip21::EventId(event_id) => {
+                    render_bech32(
+                        event_id.to_bech32().unwrap(),
+                        text,
+                        &range,
+                        highlights,
+                        link_ranges,
+                        link_urls,
+                    );
+                }
+                Nip21::Event(nip19_event) => {
+                    render_bech32(
+                        nip19_event.to_bech32().unwrap(),
+                        text,
+                        &range,
+                        highlights,
+                        link_ranges,
+                        link_urls,
+                    );
+                }
+                Nip21::Coordinate(nip19_coordinate) => {
+                    render_bech32(
+                        nip19_coordinate.to_bech32().unwrap(),
+                        text,
+                        &range,
                         highlights,
                         link_ranges,
                         link_urls,
                     );
                 }
             }
-            Event::Code(t) => {
-                text.push_str(t.as_ref());
-                let is_link = link_url.is_some();
-
-                if let Some(link_url) = link_url.clone() {
-                    link_ranges.push(prev_len..text.len());
-                    link_urls.push(link_url);
-                }
-
-                highlights.push((prev_len..text.len(), Highlight::InlineCode(is_link)))
-            }
-            Event::Start(tag) => match tag {
-                Tag::Paragraph => new_paragraph(text, &mut list_stack),
-                Tag::Heading { .. } => {
-                    new_paragraph(text, &mut list_stack);
-                    bold_depth += 1;
-                }
-                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::List(number) => {
-                    list_stack.push((number, false));
-                }
-                Tag::Item => {
-                    let len = list_stack.len();
-                    if let Some((list_number, has_content)) = list_stack.last_mut() {
-                        *has_content = false;
-                        if !text.is_empty() && !text.ends_with('\n') {
-                            text.push('\n');
-                        }
-                        for _ in 0..len - 1 {
-                            text.push_str("  ");
-                        }
-                        if let Some(number) = list_number {
-                            text.push_str(&format!("{}. ", number));
-                            *number += 1;
-                            *has_content = false;
-                        } else {
-                            text.push_str("- ");
-                        }
-                    }
-                }
-                _ => {}
-            },
-            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,
-                TagEnd::Strikethrough => strikethrough_depth -= 1,
-                TagEnd::Link => link_url = None,
-                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'),
-            _ => {}
         }
     }
 }
 
-#[allow(clippy::too_many_arguments)]
-fn process_text_segment(
-    segment: &str,
-    bold_depth: i32,
-    italic_depth: i32,
-    strikethrough_depth: i32,
-    link_url: Option<String>,
+/// Check if a string is a URL
+fn is_url(s: &str) -> bool {
+    URL_REGEX.is_match(s)
+}
+
+/// Format a bech32 entity with ellipsis and last 4 characters
+fn format_shortened_entity(entity: &str) -> String {
+    let prefix_end = entity.find('1').unwrap_or(0);
+
+    if prefix_end > 0 && entity.len() > prefix_end + 5 {
+        let prefix = &entity[0..=prefix_end]; // Include the '1'
+        let suffix = &entity[entity.len() - 4..]; // Last 4 chars
+
+        format!("{prefix}...{suffix}")
+    } else {
+        entity.to_string()
+    }
+}
+
+fn render_pubkey(
+    public_key: PublicKey,
     text: &mut String,
+    range: &Range<usize>,
+    highlights: &mut Vec<(Range<usize>, Highlight)>,
+    link_ranges: &mut Vec<Range<usize>>,
+    link_urls: &mut Vec<String>,
+    cx: &App,
+) {
+    let persons = PersonRegistry::global(cx);
+    let profile = persons.read(cx).get(&public_key, cx);
+    let display_name = format!("@{}", profile.name());
+
+    text.replace_range(range.clone(), &display_name);
+
+    let new_length = display_name.len();
+    let length_diff = new_length as isize - (range.end - range.start) as isize;
+    let new_range = range.start..(range.start + new_length);
+
+    highlights.push((new_range.clone(), Highlight::Nostr));
+    link_ranges.push(new_range);
+    link_urls.push(format!("nostr:{}", profile.public_key().to_hex()));
+
+    if length_diff != 0 {
+        adjust_ranges(highlights, link_ranges, range.end, length_diff);
+    }
+}
+
+fn render_bech32(
+    bech32: String,
+    text: &mut String,
+    range: &Range<usize>,
     highlights: &mut Vec<(Range<usize>, Highlight)>,
     link_ranges: &mut Vec<Range<usize>>,
     link_urls: &mut Vec<String>,
 ) {
-    // Build the style for this segment
-    let mut style = HighlightStyle::default();
-    if bold_depth > 0 {
-        style.font_weight = Some(FontWeight::BOLD);
-    }
-    if italic_depth > 0 {
-        style.font_style = Some(FontStyle::Italic);
-    }
-    if strikethrough_depth > 0 {
-        style.strikethrough = Some(StrikethroughStyle {
-            thickness: 1.0.into(),
-            ..Default::default()
-        });
-    }
+    let njump_url = format!("https://njump.me/{bech32}");
+    let shortened_entity = format_shortened_entity(&bech32);
+    let display_text = format!("https://njump.me/{shortened_entity}");
 
-    // Ranges always refer to the rendered text, including replaced mentions.
-    let segment_start = text.len();
-    text.push_str(segment);
-    let text_end = text.len();
+    text.replace_range(range.clone(), &display_text);
 
-    if let Some(link_url) = link_url {
-        // Handle as a markdown link
-        link_ranges.push(segment_start..text_end);
-        link_urls.push(link_url);
-        style.underline = Some(UnderlineStyle {
-            thickness: 1.0.into(),
-            ..Default::default()
-        });
+    let new_length = display_text.len();
+    let length_diff = new_length as isize - (range.end - range.start) as isize;
+    let new_range = range.start..(range.start + new_length);
 
-        // Add highlight for the entire linked segment
-        if style != HighlightStyle::default() {
-            highlights.push((segment_start..text_end, Highlight::Highlight(style)));
-        }
-    } else {
-        // Handle link detection within the segment
-        let mut finder = linkify::LinkFinder::new();
-        finder.kinds(&[linkify::LinkKind::Url]);
-        let mut last_link_pos = 0;
+    highlights.push((new_range.clone(), Highlight::Link));
+    link_ranges.push(new_range);
+    link_urls.push(njump_url);
 
-        for link in finder
-            .links(segment)
-            .filter(|link| WEB_URL.is_match(link.as_str()))
-        {
-            let start = link.start();
-            let end = link.end();
-
-            // Add non-link text before this link
-            if start > last_link_pos {
-                let non_link_start = segment_start + last_link_pos;
-                let non_link_end = segment_start + start;
-
-                if style != HighlightStyle::default() {
-                    highlights.push((non_link_start..non_link_end, Highlight::Highlight(style)));
-                }
-            }
-
-            // Add the link
-            let range = (segment_start + start)..(segment_start + end);
-            link_ranges.push(range.clone());
-            link_urls.push(link.as_str().to_string());
-
-            // Apply link styling (underline + existing style)
-            let mut link_style = style;
-            link_style.underline = Some(UnderlineStyle {
-                thickness: 1.0.into(),
-                ..Default::default()
-            });
-
-            highlights.push((range, Highlight::Highlight(link_style)));
-
-            last_link_pos = end;
-        }
-
-        // Add any remaining text after the last link
-        if last_link_pos < segment.len() {
-            let remaining_start = segment_start + last_link_pos;
-            let remaining_end = segment_start + segment.len();
-
-            if style != HighlightStyle::default() {
-                highlights.push((remaining_start..remaining_end, Highlight::Highlight(style)));
-            }
-        }
+    if length_diff != 0 {
+        adjust_ranges(highlights, link_ranges, range.end, length_diff);
     }
 }
 
-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;
-        } else {
-            *has_content = true;
-            return;
+// Helper function to adjust ranges when text length changes
+fn adjust_ranges(
+    highlights: &mut [(Range<usize>, Highlight)],
+    link_ranges: &mut [Range<usize>],
+    position: usize,
+    length_diff: isize,
+) {
+    // Adjust highlight ranges
+    for (range, _) in highlights.iter_mut() {
+        if range.start > position {
+            range.start = (range.start as isize + length_diff) as usize;
+            range.end = (range.end as isize + length_diff) as usize;
         }
     }
 
-    if !text.is_empty() {
-        if !text.ends_with('\n') {
-            text.push('\n');
+    // Adjust link ranges
+    for range in link_ranges.iter_mut() {
+        if range.start > position {
+            range.start = (range.start as isize + length_diff) as usize;
+            range.end = (range.end as isize + length_diff) as usize;
         }
-        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,14 +7,16 @@ publish.workspace = true
 [dependencies]
 gpui.workspace = true
 nostr.workspace = true
-instant.workspace = true
 nostr-sdk.workspace = true
 
+anyhow.workspace = true
 itertools.workspace = true
 chrono.workspace = true
+smallvec.workspace = true
+smol.workspace = true
 futures.workspace = true
+reqwest.workspace = true
 log.workspace = true
 
 dirs = "5.0"
 qrcode = "0.14.1"
-regex = "1.10"

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/display.rs

@@ -1,10 +1,11 @@
 use std::sync::Arc;
 
+use anyhow::{anyhow, Error};
 use chrono::{Local, TimeZone};
 use gpui::{Image, ImageFormat, SharedString};
 use nostr_sdk::prelude::*;
-use qrcode::QrCode;
 use qrcode::render::svg;
+use qrcode::QrCode;
 
 const NOW: &str = "now";
 const SECONDS_IN_MINUTE: i64 = 60;
@@ -12,12 +13,12 @@ const MINUTES_IN_HOUR: i64 = 60;
 const HOURS_IN_DAY: i64 = 24;
 const DAYS_IN_MONTH: i64 = 30;
 
-pub trait TimestampExt {
+pub trait RenderedTimestamp {
     fn to_human_time(&self) -> SharedString;
     fn to_ago(&self) -> SharedString;
 }
 
-impl TimestampExt for Timestamp {
+impl RenderedTimestamp for Timestamp {
     fn to_human_time(&self) -> SharedString {
         let input_time = match Local.timestamp_opt(self.as_secs() as i64, 0) {
             chrono::LocalResult::Single(time) => time,
@@ -60,11 +61,23 @@ impl TimestampExt for Timestamp {
     }
 }
 
-pub trait StringExt {
+pub trait TextUtils {
+    fn to_public_key(&self) -> Result<PublicKey, Error>;
     fn to_qr(&self) -> Option<Arc<Image>>;
 }
 
-impl<T: AsRef<str>> StringExt for T {
+impl<T: AsRef<str>> TextUtils for T {
+    fn to_public_key(&self) -> Result<PublicKey, Error> {
+        let s = self.as_ref();
+        if s.starts_with("nprofile1") {
+            Ok(Nip19Profile::from_bech32(s)?.public_key)
+        } else if s.starts_with("npub1") {
+            Ok(PublicKey::parse(s)?)
+        } else {
+            Err(anyhow!("Invalid public key"))
+        }
+    }
+
     fn to_qr(&self) -> Option<Arc<Image>> {
         let s = self.as_ref();
         let code = QrCode::new(s).unwrap();
@@ -81,3 +94,13 @@ impl<T: AsRef<str>> StringExt for T {
         )))
     }
 }
+
+pub fn shorten_pubkey(public_key: PublicKey, len: usize) -> String {
+    let Ok(pubkey) = public_key.to_bech32();
+
+    format!(
+        "{}:{}",
+        &pubkey[0..(len + 1)],
+        &pubkey[pubkey.len() - len..]
+    )
+}

crates/common/src/event.rs

@@ -3,12 +3,12 @@ use std::hash::{DefaultHasher, Hash, Hasher};
 use itertools::Itertools;
 use nostr_sdk::prelude::*;
 
-pub trait EventExt {
+pub trait EventUtils {
     fn uniq_id(&self) -> u64;
     fn extract_public_keys(&self) -> Vec<PublicKey>;
 }
 
-impl EventExt for Event {
+impl EventUtils for Event {
     fn uniq_id(&self) -> u64 {
         let mut hasher = DefaultHasher::new();
         let mut pubkeys: Vec<PublicKey> = self.extract_public_keys();
@@ -18,14 +18,14 @@ impl EventExt for Event {
     }
 
     fn extract_public_keys(&self) -> Vec<PublicKey> {
-        let mut public_keys: Vec<PublicKey> = self.tags.public_keys().collect();
+        let mut public_keys: Vec<PublicKey> = self.tags.public_keys().copied().collect();
         public_keys.push(self.pubkey);
 
         public_keys.into_iter().unique().collect()
     }
 }
 
-impl EventExt for UnsignedEvent {
+impl EventUtils for UnsignedEvent {
     fn uniq_id(&self) -> u64 {
         let mut hasher = DefaultHasher::new();
         let mut pubkeys: Vec<PublicKey> = vec![];
@@ -46,7 +46,7 @@ impl EventExt for UnsignedEvent {
     }
 
     fn extract_public_keys(&self) -> Vec<PublicKey> {
-        let mut public_keys: Vec<PublicKey> = self.tags.public_keys().collect();
+        let mut public_keys: Vec<PublicKey> = self.tags.public_keys().copied().collect();
         public_keys.push(self.pubkey);
         public_keys.into_iter().unique().sorted().collect()
     }

crates/common/src/lib.rs

@@ -1,15 +1,11 @@
 pub use debounced_delay::*;
 pub use display::*;
 pub use event::*;
-pub use media_extractor::*;
-pub use parser::*;
+pub use nip96::*;
 pub use paths::*;
-pub use range::*;
 
 mod debounced_delay;
 mod display;
 mod event;
-mod media_extractor;
-mod parser;
+mod nip96;
 mod paths;
-mod range;

crates/common/src/media_extractor.rs

@@ -1,117 +0,0 @@
-use gpui::SharedUri;
-use regex::Regex;
-
-/// Extracts media URLs from a string and returns both the extracted URLs
-/// and the string with media URLs removed
-pub struct MediaExtractor {
-    image_regex: Regex,
-    video_regex: Regex,
-}
-
-impl MediaExtractor {
-    /// Creates a new MediaExtractor with compiled regex patterns
-    pub fn new() -> Self {
-        MediaExtractor {
-            // Match common image extensions
-            image_regex: Regex::new(
-                r#"(?i)\bhttps?://[^\s<>"']+\.(?:jpg|jpeg|png|gif|bmp|webp|svg|ico)(?:\?[^\s<>"']*)?\b"#,
-            ).unwrap(),
-            // Match common video extensions
-            video_regex: Regex::new(
-                r#"(?i)\bhttps?://[^\s<>"']+\.(?:mp4|mov|avi|mkv|webm|flv|wmv|m4v|3gp)(?:\?[^\s<>"']*)?\b"#,
-            ).unwrap(),
-        }
-    }
-
-    /// Extracts all media URLs from a string
-    pub fn extract_media_urls(&self, text: &str) -> Vec<SharedUri> {
-        let mut urls = Vec::new();
-
-        // Extract image URLs
-        for capture in self.image_regex.find_iter(text) {
-            urls.push(capture.as_str().to_string().into());
-        }
-
-        // Extract video URLs
-        // for capture in self.video_regex.find_iter(text) {
-        //     urls.push(capture.as_str().to_string().into());
-        // }
-
-        urls
-    }
-
-    /// Removes all media URLs from a string and returns the cleaned text
-    pub fn remove_media_urls(&self, text: &str) -> String {
-        let mut result = text.to_string();
-
-        // Remove image URLs
-        result = self.image_regex.replace_all(&result, "").to_string();
-
-        // Remove video URLs
-        // result = self.video_regex.replace_all(&result, "").to_string();
-
-        // Clean up extra whitespace that might result from removal
-        self.cleanup_text(&result)
-    }
-
-    /// Extracts media URLs and removes them from the string, returning both
-    pub fn extract_and_remove(&self, text: &str) -> (Vec<SharedUri>, String) {
-        let urls = self.extract_media_urls(text);
-        let cleaned_text = self.remove_media_urls(text);
-        (urls, cleaned_text)
-    }
-
-    /// Helper function to clean up text after URL removal
-    fn cleanup_text(&self, text: &str) -> String {
-        let text = text.trim();
-
-        // Remove multiple consecutive spaces
-        let re = Regex::new(r"\s+").unwrap();
-        re.replace_all(text, " ").trim().to_string()
-    }
-
-    /// Validates if a URL is a valid media URL
-    pub fn is_media_url(&self, url: &str) -> bool {
-        self.image_regex.is_match(url) || self.video_regex.is_match(url)
-    }
-
-    /// Categorizes extracted URLs into images and videos
-    pub fn categorize_urls(&self, urls: &[SharedUri]) -> (Vec<SharedUri>, Vec<SharedUri>) {
-        let mut images = Vec::new();
-        let mut videos = Vec::new();
-
-        for url in urls {
-            if self.image_regex.is_match(url) {
-                images.push(url.clone());
-            } else if self.video_regex.is_match(url) {
-                videos.push(url.clone());
-            }
-        }
-
-        (images, videos)
-    }
-}
-
-impl Default for MediaExtractor {
-    fn default() -> Self {
-        Self::new()
-    }
-}
-
-/// Convenience function for one-time extraction and removal
-pub fn extract_and_remove_media_urls(text: &str) -> (Vec<SharedUri>, String) {
-    let extractor = MediaExtractor::new();
-    extractor.extract_and_remove(text)
-}
-
-/// Convenience function for just extracting media URLs
-pub fn extract_media_urls(text: &str) -> Vec<SharedUri> {
-    let extractor = MediaExtractor::new();
-    extractor.extract_media_urls(text)
-}
-
-/// Convenience function for just removing media URLs
-pub fn remove_media_urls(text: &str) -> String {
-    let extractor = MediaExtractor::new();
-    extractor.remove_media_urls(text)
-}

crates/common/src/nip96.rs

@@ -0,0 +1,83 @@
+use anyhow::anyhow;
+use nostr::hashes::sha256::Hash as Sha256Hash;
+use nostr::hashes::Hash;
+use nostr::prelude::*;
+use nostr_sdk::prelude::*;
+use reqwest::{multipart, Client as ReqClient, Response};
+
+pub(crate) fn make_multipart_form(
+    file_data: Vec<u8>,
+    mime_type: Option<&str>,
+) -> Result<multipart::Form, anyhow::Error> {
+    let form_file_part = multipart::Part::bytes(file_data).file_name("filename");
+
+    // Set the part's MIME type, or leave it as is if mime_type is None
+
+    let part = match mime_type {
+        Some(mime) => form_file_part.mime_str(mime)?,
+        None => form_file_part,
+    };
+
+    Ok(multipart::Form::new().part("file", part))
+}
+
+pub(crate) async fn upload<T>(
+    signer: &T,
+    desc: &ServerConfig,
+    file_data: Vec<u8>,
+    mime_type: Option<&str>,
+) -> Result<Url, anyhow::Error>
+where
+    T: NostrSigner,
+{
+    let payload: Sha256Hash = Sha256Hash::hash(&file_data);
+    let data: HttpData = HttpData::new(desc.api_url.clone(), HttpMethod::POST).payload(payload);
+    let nip98_auth: String = data.to_authorization(signer).await?;
+
+    // Make form
+    let form: multipart::Form = make_multipart_form(file_data, mime_type)?;
+
+    // Make req client
+    let req_client = ReqClient::new();
+
+    // Send
+    let response: Response = req_client
+        .post(desc.api_url.clone())
+        .header("Authorization", nip98_auth)
+        .multipart(form)
+        .send()
+        .await?;
+
+    // Parse response
+    let json: Value = response.json().await?;
+    let upload_response = nip96::UploadResponse::from_json(json.to_string())?;
+
+    if upload_response.status == UploadResponseStatus::Error {
+        return Err(anyhow!(upload_response.message));
+    }
+
+    Ok(upload_response.download_url()?.to_owned())
+}
+
+pub async fn nip96_upload(
+    client: &Client,
+    server: &Url,
+    file: Vec<u8>,
+) -> Result<Url, anyhow::Error> {
+    let req_client = ReqClient::new();
+    let config_url = nip96::get_server_config_url(server)?;
+
+    // Get
+    let res = req_client.get(config_url.to_string()).send().await?;
+    let json: Value = res.json().await?;
+
+    let config = nip96::ServerConfig::from_json(json.to_string())?;
+    let signer = client
+        .signer()
+        .cloned()
+        .unwrap_or(Keys::generate().into_nostr_signer());
+
+    let url = upload(&signer, &config, file, None).await?;
+
+    Ok(url)
+}

crates/common/src/parser.rs

@@ -1,210 +0,0 @@
-use std::ops::Range;
-
-use nostr::prelude::*;
-
-const BECH32_SEPARATOR: u8 = b'1';
-const SCHEME_WITH_COLON: &str = "nostr:";
-
-/// Nostr parsed token with its range in the original text
-#[derive(Debug, Clone, PartialEq, Eq)]
-pub struct Token {
-    /// The parsed NIP-21 URI
-    ///
-    /// <https://github.com/nostr-protocol/nips/blob/master/21.md>
-    pub value: Nip21,
-    /// The range of this token in the original text
-    pub range: Range<usize>,
-}
-
-#[derive(Debug, Clone, Copy)]
-struct Match {
-    start: usize,
-    end: usize,
-}
-
-/// Nostr parser
-#[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)]
-pub struct NostrParser;
-
-impl Default for NostrParser {
-    fn default() -> Self {
-        Self::new()
-    }
-}
-
-impl NostrParser {
-    /// Create new parser
-    pub const fn new() -> Self {
-        Self
-    }
-
-    /// Parse text
-    pub fn parse<'a>(&self, text: &'a str) -> NostrParserIter<'a> {
-        NostrParserIter::new(text)
-    }
-}
-
-struct FindMatches<'a> {
-    bytes: &'a [u8],
-    pos: usize,
-}
-
-impl<'a> FindMatches<'a> {
-    fn new(text: &'a str) -> Self {
-        Self {
-            bytes: text.as_bytes(),
-            pos: 0,
-        }
-    }
-
-    fn try_parse_nostr_uri(&mut self) -> Option<Match> {
-        let start = self.pos;
-        let bytes = self.bytes;
-        let len = bytes.len();
-
-        // Check if we have "nostr:" prefix
-        if len - start < SCHEME_WITH_COLON.len() {
-            return None;
-        }
-
-        // Check for "nostr:" prefix (case-insensitive)
-        let scheme_prefix = &bytes[start..start + SCHEME_WITH_COLON.len()];
-        if !scheme_prefix.eq_ignore_ascii_case(SCHEME_WITH_COLON.as_bytes()) {
-            return None;
-        }
-
-        // Skip the scheme
-        let pos = start + SCHEME_WITH_COLON.len();
-
-        // Parse bech32 entity
-        let mut has_separator = false;
-        let mut end = pos;
-
-        while end < len {
-            let byte = bytes[end];
-
-            // Check for bech32 separator
-            if byte == BECH32_SEPARATOR && !has_separator {
-                has_separator = true;
-                end += 1;
-                continue;
-            }
-
-            // Check if character is valid for bech32
-            if !byte.is_ascii_alphanumeric() {
-                break;
-            }
-
-            end += 1;
-        }
-
-        // Must have at least one character after separator
-        if !has_separator || end <= pos + 1 {
-            return None;
-        }
-
-        // Update position
-        self.pos = end;
-
-        Some(Match { start, end })
-    }
-}
-
-impl Iterator for FindMatches<'_> {
-    type Item = Match;
-
-    fn next(&mut self) -> Option<Self::Item> {
-        while self.pos < self.bytes.len() {
-            // Try to parse nostr URI
-            if let Some(mat) = self.try_parse_nostr_uri() {
-                return Some(mat);
-            }
-
-            // Skip one character if no match found
-            self.pos += 1;
-        }
-
-        None
-    }
-}
-
-enum HandleMatch {
-    Token(Token),
-    Recursion,
-}
-
-pub struct NostrParserIter<'a> {
-    /// The original text
-    text: &'a str,
-    /// Matches found
-    matches: FindMatches<'a>,
-    /// A pending match
-    pending_match: Option<Match>,
-    /// Last match end index
-    last_match_end: usize,
-}
-
-impl<'a> NostrParserIter<'a> {
-    fn new(text: &'a str) -> Self {
-        Self {
-            text,
-            matches: FindMatches::new(text),
-            pending_match: None,
-            last_match_end: 0,
-        }
-    }
-
-    fn handle_match(&mut self, mat: Match) -> HandleMatch {
-        // Update last match end
-        self.last_match_end = mat.end;
-
-        // Extract the matched string
-        let data: &str = &self.text[mat.start..mat.end];
-
-        // Parse NIP-21 URI
-        match Nip21::parse(data) {
-            Ok(uri) => HandleMatch::Token(Token {
-                value: uri,
-                range: mat.start..mat.end,
-            }),
-            // If the nostr URI parsing is invalid, skip it
-            Err(_) => HandleMatch::Recursion,
-        }
-    }
-}
-
-impl<'a> Iterator for NostrParserIter<'a> {
-    type Item = Token;
-
-    fn next(&mut self) -> Option<Self::Item> {
-        // Handle a pending match
-        if let Some(pending_match) = self.pending_match.take() {
-            return match self.handle_match(pending_match) {
-                HandleMatch::Token(token) => Some(token),
-                HandleMatch::Recursion => self.next(),
-            };
-        }
-
-        match self.matches.next() {
-            Some(mat) => {
-                // Skip any text before this match
-                if mat.start > self.last_match_end {
-                    // Update pending match
-                    // This will be handled at next iteration, in `handle_match` method.
-                    self.pending_match = Some(mat);
-
-                    // Skip the text before the match
-                    self.last_match_end = mat.start;
-                    return self.next();
-                }
-
-                // Handle match
-                match self.handle_match(mat) {
-                    HandleMatch::Token(token) => Some(token),
-                    HandleMatch::Recursion => self.next(),
-                }
-            }
-            None => None,
-        }
-    }
-}

crates/common/src/paths.rs

@@ -7,13 +7,6 @@ pub fn home_dir() -> &'static PathBuf {
     HOME_DIR.get_or_init(|| dirs::home_dir().expect("failed to determine home directory"))
 }
 
-/// Returns the path to the user's download directory.
-pub fn download_dir() -> &'static PathBuf {
-    static DOWNLOAD_DIR: OnceLock<PathBuf> = OnceLock::new();
-    DOWNLOAD_DIR
-        .get_or_init(|| dirs::download_dir().expect("failed to determine download directory"))
-}
-
 /// Returns the path to the configuration directory used by Coop.
 pub fn config_dir() -> &'static PathBuf {
     static CONFIG_DIR: OnceLock<PathBuf> = OnceLock::new();
@@ -63,3 +56,9 @@ pub fn support_dir() -> &'static PathBuf {
         config_dir().clone()
     })
 }
+
+/// Returns the path to the `nostr` file.
+pub fn nostr_file() -> &'static PathBuf {
+    static NOSTR_FILE: OnceLock<PathBuf> = OnceLock::new();
+    NOSTR_FILE.get_or_init(|| support_dir().join("nostr-db"))
+}

crates/common/src/range.rs

@@ -1,45 +0,0 @@
-use std::cmp::{self};
-use std::ops::{Range, RangeInclusive};
-
-pub trait RangeExt<T> {
-    fn sorted(&self) -> Self;
-    fn to_inclusive(&self) -> RangeInclusive<T>;
-    fn overlaps(&self, other: &Range<T>) -> bool;
-    fn contains_inclusive(&self, other: &Range<T>) -> bool;
-}
-
-impl<T: Ord + Clone> RangeExt<T> for Range<T> {
-    fn sorted(&self) -> Self {
-        cmp::min(&self.start, &self.end).clone()..cmp::max(&self.start, &self.end).clone()
-    }
-
-    fn to_inclusive(&self) -> RangeInclusive<T> {
-        self.start.clone()..=self.end.clone()
-    }
-
-    fn overlaps(&self, other: &Range<T>) -> bool {
-        self.start < other.end && other.start < self.end
-    }
-
-    fn contains_inclusive(&self, other: &Range<T>) -> bool {
-        self.start <= other.start && other.end <= self.end
-    }
-}
-
-impl<T: Ord + Clone> RangeExt<T> for RangeInclusive<T> {
-    fn sorted(&self) -> Self {
-        cmp::min(self.start(), self.end()).clone()..=cmp::max(self.start(), self.end()).clone()
-    }
-
-    fn to_inclusive(&self) -> RangeInclusive<T> {
-        self.clone()
-    }
-
-    fn overlaps(&self, other: &Range<T>) -> bool {
-        self.start() < &other.end && &other.start <= self.end()
-    }
-
-    fn contains_inclusive(&self, other: &Range<T>) -> bool {
-        self.start() <= &other.start && &other.end <= self.end()
-    }
-}

crates/community/Cargo.toml

@@ -1,23 +0,0 @@
-[package]
-name = "community"
-version.workspace = true
-edition.workspace = true
-publish.workspace = true
-
-[dependencies]
-concord = { path = "../concord" }
-state = { path = "../state" }
-
-gpui.workspace = true
-nostr-sdk.workspace = true
-
-anyhow.workspace = true
-flume.workspace = true
-futures.workspace = true
-log.workspace = true
-serde_json.workspace = true
-smallvec.workspace = true
-smol.workspace = true
-
-[dev-dependencies]
-nostr-memory.workspace = true

crates/community/src/cache.rs

@@ -1,331 +0,0 @@
-use std::collections::BTreeMap;
-use std::sync::LazyLock;
-
-use anyhow::{Result, anyhow};
-use concord::cord01::OpenedStream;
-use concord::state::{CommunityState, STATE_PREFIX, state_identifier};
-use concord::{ChannelId, CommunityId, cord03};
-use nostr_sdk::prelude::*;
-
-static LOCAL_KEYS: LazyLock<Keys> = LazyLock::new(|| {
-    Keys::new(SecretKey::from_slice(&[0x43; 32]).expect("a fixed 32-byte scalar is a valid key"))
-});
-
-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: SingleLetterTag = SingleLetterTag::LOWERCASE_K;
-
-/// An already-expired rumor is refused at ingest. Returns whether it was kept.
-pub async fn cache_rumor(
-    client: &Client,
-    channel: &ChannelId,
-    opened: &OpenedStream,
-) -> Result<bool> {
-    let at = Timestamp::from_secs(opened.at_ms / 1000);
-
-    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.as_str(), [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 event = EventBuilder::new(Kind::ApplicationSpecificData, opened.rumor.as_json())
-        .tags(tags)
-        .custom_created_at(at)
-        .finalize_async(&*LOCAL_KEYS)
-        .await?;
-
-    client.database().save_event(&event).await?;
-
-    Ok(true)
-}
-
-pub async fn purge_expired(client: &Client, 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 client.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 {
-        client.database().delete(Filter::new().ids(expired)).await?;
-    }
-
-    Ok(purged)
-}
-
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
-pub struct Observed {
-    pub author: PublicKey,
-    pub at_ms: u64,
-}
-
-/// The cached rumors of `channel`, keyed by the wrap they were opened from.
-pub async fn wrapper_index(
-    client: &Client,
-    channel: &ChannelId,
-) -> Result<BTreeMap<EventId, Observed>> {
-    let filter = Filter::new()
-        .kind(Kind::ApplicationSpecificData)
-        .custom_tag(MARK_TAG, MARK_VALUE)
-        .custom_tag(CHANNEL_TAG, channel.to_hex());
-
-    let mut index = BTreeMap::new();
-
-    for event in client.database().query(filter).await? {
-        let (Some(wrapper_id), Some(author)) = (
-            event.tags.event_ids().next(),
-            event.tags.public_keys().next(),
-        ) else {
-            continue;
-        };
-
-        index.insert(
-            wrapper_id,
-            Observed {
-                author,
-                at_ms: event.created_at.as_secs().saturating_mul(1000),
-            },
-        );
-    }
-
-    Ok(index)
-}
-
-/// Cached rumors for `channel`, newest first, deduplicated by rumor id.
-pub async fn query_rumors(
-    client: &Client,
-    channel: &ChannelId,
-    until: Option<Timestamp>,
-    limit: usize,
-    kinds: Option<&[u16]>,
-) -> 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(kinds) = kinds {
-        filter = filter.custom_tags(KIND_TAG, kinds.iter().map(u16::to_string));
-    }
-
-    if let Some(until) = until {
-        filter = filter.until(until);
-    }
-
-    let mut newest: BTreeMap<String, Event> = BTreeMap::new();
-    for event in client.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)
-}
-
-pub async fn save_state(client: &Client, state: &CommunityState) -> Result<()> {
-    let event = EventBuilder::new(Kind::ApplicationSpecificData, serde_json::to_string(state)?)
-        .tags([Tag::identifier(state.identifier())])
-        .finalize_async(&*LOCAL_KEYS)
-        .await?;
-
-    client.database().save_event(&event).await?;
-
-    Ok(())
-}
-
-pub async fn load_state(client: &Client, id: &CommunityId) -> Result<Option<CommunityState>> {
-    let filter = Filter::new()
-        .kind(Kind::ApplicationSpecificData)
-        .identifier(state_identifier(id))
-        .limit(1);
-
-    match client.database().query(filter).await?.into_iter().next() {
-        Some(event) => Ok(Some(serde_json::from_str(&event.content)?)),
-        None => Ok(None),
-    }
-}
-
-/// The newest state document per community carried in the local database.
-pub async fn load_states(client: &Client) -> Result<Vec<CommunityState>> {
-    let filter = Filter::new().kind(Kind::ApplicationSpecificData);
-    let mut newest: BTreeMap<CommunityId, Event> = BTreeMap::new();
-
-    for event in client.database().query(filter).await? {
-        let Some(id) = state_document_of(&event) else {
-            continue;
-        };
-
-        match newest.get(&id) {
-            Some(existing) if existing.created_at >= event.created_at => {}
-            _ => {
-                newest.insert(id, event);
-            }
-        }
-    }
-
-    let mut states = Vec::with_capacity(newest.len());
-
-    for event in newest.into_values() {
-        match serde_json::from_str::<CommunityState>(&event.content) {
-            Ok(state) => states.push(state),
-            Err(error) => log::warn!("ignoring malformed community state {}: {error}", event.id),
-        }
-    }
-
-    Ok(states)
-}
-
-fn state_document_of(event: &Event) -> Option<CommunityId> {
-    let identifier = event.tags.identifier()?;
-    let hex = identifier.strip_prefix(STATE_PREFIX)?;
-    hex.parse().ok()
-}
-
-#[cfg(test)]
-mod tests {
-    use std::collections::BTreeSet;
-
-    use concord::Epoch;
-    use nostr_memory::MemoryDatabase;
-
-    use super::*;
-
-    fn client() -> Client {
-        ClientBuilder::default()
-            .database(MemoryDatabase::unbounded())
-            .build()
-    }
-
-    #[test]
-    fn load_states_reads_one_document_per_community_and_ignores_other_documents() {
-        smol::block_on(async {
-            let client = client();
-
-            let state = CommunityState {
-                id: CommunityId::from_bytes([0x42; 32]),
-                name: Some("Anime and Manga".to_owned()),
-                owner: Keys::generate().public_key(),
-                owner_salt: [0x01; 32],
-                community_root: [0x02; 32],
-                root_epoch: Epoch(0),
-                control_root: None,
-                control_pks: BTreeMap::new(),
-                channels: Vec::new(),
-                relays: Vec::new(),
-                heads: Vec::new(),
-                banned: BTreeSet::new(),
-                cursors: BTreeMap::new(),
-                held_roots: Vec::new(),
-                channel_cuts: BTreeMap::new(),
-                refounders: BTreeSet::new(),
-                removed_at: None,
-                stranded: false,
-                dissolved: false,
-                added_at_ms: 7,
-            };
-
-            save_state(&client, &state).await.expect("saves");
-
-            // A cached rumor is also an application-specific document, but not a
-            // state document, so the prefix keeps it out of the state scan.
-            let other = EventBuilder::new(Kind::ApplicationSpecificData, "{}")
-                .tags([Tag::identifier("deadbeef")])
-                .finalize(&*LOCAL_KEYS)
-                .expect("builds");
-            client.database().save_event(&other).await.expect("saves");
-
-            let loaded = load_states(&client).await.expect("loads");
-
-            assert_eq!(loaded, vec![state]);
-        });
-    }
-
-    #[test]
-    fn caching_the_same_rumor_twice_leaves_one_row() {
-        smol::block_on(async {
-            let client = client();
-            let channel = ChannelId::from_bytes([0x9c; 32]);
-            let keys = Keys::generate();
-            let group = concord::derive::channel_group_key(&[0x07; 32], &channel, Epoch(0))
-                .expect("a group key");
-
-            let rumor = concord::cord03::build_message(
-                keys.public_key(),
-                &channel,
-                Epoch(0),
-                "twice",
-                None,
-                1_700_000_000_000,
-                None,
-            );
-            let (wrap, _) = concord::cord03::seal_rumor(&rumor, &group, &keys, false)
-                .await
-                .expect("seals");
-            let (opened, _) =
-                concord::cord03::open(&wrap, &group, &channel, Epoch(0)).expect("opens");
-
-            assert!(
-                cache_rumor(&client, &channel, &opened)
-                    .await
-                    .expect("caches")
-            );
-            assert!(
-                cache_rumor(&client, &channel, &opened)
-                    .await
-                    .expect("caches")
-            );
-
-            let cached = query_rumors(&client, &channel, None, 10, None)
-                .await
-                .expect("reads");
-            assert_eq!(cached.len(), 1);
-        });
-    }
-}

crates/community/src/history.rs

@@ -1,764 +0,0 @@
-use std::collections::{BTreeMap, BTreeSet, HashMap};
-use std::future::Future;
-use std::sync::atomic::{AtomicU64, Ordering};
-use std::sync::{Arc, Mutex, MutexGuard};
-use std::time::{Duration, Instant};
-
-use anyhow::{Result, bail};
-use concord::cord01::{KIND_WRAP_EPHEMERAL, OpenedStream};
-use concord::cord03::{self, ChatRumor};
-use concord::derive::channel_group_key;
-use concord::state::{ChannelCursor, HeldKey};
-use concord::{ChannelId, GroupKey};
-use futures::future::{Either, select};
-use nostr_sdk::prelude::*;
-
-use crate::cache::cache_rumor;
-use crate::sync::connect_relays;
-
-/// How long one relay is given to answer one page of history.
-const PAGE_TIMEOUT: Duration = Duration::from_secs(10);
-/// How far below a cursor a warm window reaches back.
-pub const CURSOR_OVERLAP: Duration = Duration::from_secs(60);
-
-/// The region of history to read.
-#[derive(Debug, Clone, Copy, Default, PartialEq, Eq)]
-pub struct Window {
-    pub until: Option<Timestamp>,
-    pub since: Option<Timestamp>,
-}
-
-impl Window {
-    /// The newest wraps, with no older bound.
-    pub fn newest() -> Self {
-        Self::default()
-    }
-
-    /// The wraps strictly older than `oldest`.
-    pub fn older_than(oldest: Timestamp) -> Self {
-        Self {
-            until: Some(oldest - 1u64),
-            since: None,
-        }
-    }
-
-    /// The region between `since` and `oldest`, both inclusive.
-    pub fn between(since: Timestamp, oldest: Timestamp) -> Self {
-        Self {
-            until: Some(oldest - 1u64),
-            since: Some(since),
-        }
-    }
-
-    /// The window a channel is opened with.
-    pub fn opening(cursor: ChannelCursor) -> Self {
-        match cursor.newest {
-            Some(newest) => Self {
-                since: Some(newest - CURSOR_OVERLAP),
-                until: None,
-            },
-            None => Self::default(),
-        }
-    }
-}
-
-/// What a relay said about one page subscription.
-#[derive(Debug, Clone)]
-pub enum Settled {
-    Replayed,
-    Refused(String),
-}
-
-/// One relay's verdict on one page subscription.
-#[derive(Debug, Clone)]
-pub struct PageReport {
-    pub relay: RelayUrl,
-    pub outcome: Settled,
-}
-
-/// The page subscriptions in flight, by subscription id.
-pub struct PageRegistry {
-    pages: Arc<Mutex<HashMap<SubscriptionId, flume::Sender<PageReport>>>>,
-}
-
-impl Default for PageRegistry {
-    fn default() -> Self {
-        Self {
-            pages: Arc::new(Mutex::new(HashMap::new())),
-        }
-    }
-}
-
-impl Clone for PageRegistry {
-    fn clone(&self) -> Self {
-        Self {
-            pages: Arc::clone(&self.pages),
-        }
-    }
-}
-
-impl PageRegistry {
-    pub fn register(&self, id: SubscriptionId, sender: flume::Sender<PageReport>) {
-        self.lock().insert(id, sender);
-    }
-
-    pub fn unregister(&self, id: &SubscriptionId) {
-        self.lock().remove(id);
-    }
-
-    /// Forget every page still in flight, because its round is gone.
-    pub fn clear(&self) {
-        self.lock().clear();
-    }
-
-    /// Hand a relay's verdict to the page that owns `id`, when it is still waiting.
-    pub fn deliver(&self, id: &SubscriptionId, relay: RelayUrl, outcome: Settled) {
-        let sender = self.lock().get(id).cloned();
-
-        let Some(sender) = sender else {
-            return;
-        };
-
-        if let Err(error) = sender.try_send(PageReport { relay, outcome }) {
-            log::debug!("community: a page report was not delivered: {error}");
-        }
-    }
-
-    fn lock(&self) -> MutexGuard<'_, HashMap<SubscriptionId, flume::Sender<PageReport>>> {
-        match self.pages.lock() {
-            Ok(pages) => pages,
-            Err(poisoned) => poisoned.into_inner(),
-        }
-    }
-}
-
-/// What one paged fetch saw.
-#[derive(Debug, Clone, Default)]
-pub struct WrapPage {
-    pub opened: Vec<ChatRumor>,
-    pub raw: usize,
-    /// Wraps that reached us under a held plane but that no held key could open.
-    pub unreadable: usize,
-    pub newest: Option<Timestamp>,
-    pub oldest: Option<Timestamp>,
-    pub exhausted: bool,
-    pub failed: bool,
-    pub errors: usize,
-}
-
-/// Walks a channel's history back over the community's own relays.
-#[allow(clippy::too_many_arguments)]
-pub async fn page(
-    client: &Client,
-    pages: &PageRegistry,
-    channel: &ChannelId,
-    held: &[HeldKey],
-    relays: &[RelayUrl],
-    window: Window,
-    max_pages: usize,
-    limit: usize,
-) -> Result<WrapPage> {
-    let planes: Vec<(HeldKey, GroupKey)> = held
-        .iter()
-        .map(|key| Ok((*key, channel_group_key(&key.key, channel, key.epoch)?)))
-        .collect::<Result<Vec<_>>>()?;
-    let authors: Vec<PublicKey> = planes.iter().map(|(_, group)| group.pk()).collect();
-
-    if authors.is_empty() || relays.is_empty() || limit == 0 {
-        return Ok(WrapPage {
-            failed: true,
-            ..WrapPage::default()
-        });
-    }
-
-    // A REQ can only target a relay the pool already knows about.
-    connect_relays(client, relays).await;
-
-    let mut walk = Walk::new(relays, window);
-    let mut opened = Vec::new();
-
-    for _ in 0..max_pages {
-        if walk.is_done() {
-            break;
-        }
-
-        let filter = wrap_filter(&authors, walk.region(), limit);
-        let asked: Vec<(usize, RelayUrl)> = walk
-            .live()
-            .map(|index| (index, walk.url(index).clone()))
-            .collect();
-
-        let answers = ask_page(client, pages, &asked, &filter).await;
-
-        for (index, url) in &asked {
-            match answers.get(url) {
-                Some(Settled::Replayed) => {}
-                Some(Settled::Refused(reason)) => {
-                    log::warn!("community: relay {url} refused a history page: {reason}");
-                    walk.reject(*index);
-                }
-                None => {
-                    log::warn!("community: relay {url} did not finish a history page");
-                    walk.reject(*index);
-                }
-            }
-        }
-
-        let answered = client.database().query(filter).await?;
-
-        for wrap in walk.accept(answered, limit) {
-            let Some((held, group)) = planes.iter().find(|(_, group)| group.pk() == wrap.pubkey)
-            else {
-                continue;
-            };
-
-            let Ok((stream, rumor)) = read_under(&wrap, held, group, channel) else {
-                walk.unreadable += 1;
-                continue;
-            };
-
-            if cache_rumor(client, channel, &stream).await? {
-                opened.push(rumor);
-            }
-        }
-    }
-
-    Ok(walk.finish(opened))
-}
-
-/// Opens one wrap under a held key.
-fn read_under(
-    wrap: &Event,
-    held: &HeldKey,
-    group: &GroupKey,
-    channel: &ChannelId,
-) -> Result<(OpenedStream, ChatRumor)> {
-    if held
-        .retired_at
-        .is_some_and(|retired| wrap.created_at > retired)
-    {
-        bail!("sealed after the key that reads it was retired");
-    }
-
-    Ok(cord03::open(wrap, group, channel, held.epoch)?)
-}
-
-/// The one filter a page is asked for.
-fn wrap_filter(authors: &[PublicKey], window: Window, limit: usize) -> Filter {
-    let mut filter = Filter::new()
-        .kinds([Kind::GiftWrap, Kind::Custom(KIND_WRAP_EPHEMERAL)])
-        .authors(authors.iter().copied())
-        .limit(limit);
-
-    if let Some(until) = window.until {
-        filter = filter.until(until);
-    }
-
-    if let Some(since) = window.since {
-        filter = filter.since(since);
-    }
-
-    filter
-}
-
-/// One page's verdicts, by relay.
-type PageAnswers = BTreeMap<RelayUrl, Settled>;
-
-async fn ask_page(
-    client: &Client,
-    pages: &PageRegistry,
-    asked: &[(usize, RelayUrl)],
-    filter: &Filter,
-) -> PageAnswers {
-    let mut answers = PageAnswers::new();
-    let distinct: BTreeSet<RelayUrl> = asked.iter().map(|(_, url)| url.clone()).collect();
-    let mut targets: Vec<(RelayUrl, Vec<Filter>)> = Vec::with_capacity(distinct.len());
-
-    for url in &distinct {
-        match client.relay(url).await {
-            Ok(Some(_)) => targets.push((url.clone(), vec![filter.clone()])),
-            Ok(None) => {
-                log::warn!("community: relay {url} is not in the pool for a history page");
-                answers.insert(
-                    url.clone(),
-                    Settled::Refused("not in the relay pool".to_owned()),
-                );
-            }
-            Err(error) => {
-                log::warn!("community: relay {url} could not be looked up: {error}");
-                answers.insert(url.clone(), Settled::Refused(error.to_string()));
-            }
-        }
-    }
-
-    if targets.is_empty() {
-        return answers;
-    }
-
-    let id = history_subscription();
-    let (sender, receiver) = flume::bounded(distinct.len());
-    pages.register(id.clone(), sender);
-
-    let options = SubscribeAutoCloseOptions::default()
-        .exit_policy(ReqExitPolicy::ExitOnEOSE)
-        .timeout(Some(PAGE_TIMEOUT));
-
-    match client
-        .subscribe(ReqTarget::manual(targets))
-        .with_id(id.clone())
-        .close_on(options)
-        .await
-    {
-        Ok(output) => {
-            for (url, reason) in output.failed {
-                answers.insert(url, Settled::Refused(reason));
-            }
-
-            let deadline = Instant::now() + PAGE_TIMEOUT;
-
-            while answers.len() < distinct.len() {
-                let remaining = deadline.saturating_duration_since(Instant::now());
-
-                let Some(report) = within(remaining, receiver.recv_async()).await else {
-                    break;
-                };
-
-                match report {
-                    Ok(report) => {
-                        answers.insert(report.relay, report.outcome);
-                    }
-                    Err(error) => {
-                        log::warn!("community: a history page's reports were lost: {error}");
-                        break;
-                    }
-                }
-            }
-        }
-        Err(error) => {
-            log::warn!("community: a history page REQ was refused: {error}");
-        }
-    }
-
-    pages.unregister(&id);
-
-    answers
-}
-
-pub(crate) fn auth_required(reason: &str) -> bool {
-    matches!(
-        MachineReadablePrefix::parse(reason),
-        Some(MachineReadablePrefix::AuthRequired)
-    )
-}
-
-fn history_subscription() -> SubscriptionId {
-    static NEXT: AtomicU64 = AtomicU64::new(0);
-    SubscriptionId::new(format!("history-{}", NEXT.fetch_add(1, Ordering::Relaxed)))
-}
-
-async fn within<F>(limit: Duration, future: F) -> Option<F::Output>
-where
-    F: Future,
-{
-    let future = std::pin::pin!(future);
-    let deadline = std::pin::pin!(smol::Timer::after(limit));
-
-    match select(future, deadline).await {
-        Either::Left((output, _)) => Some(output),
-        Either::Right(_) => None,
-    }
-}
-
-/// One pass over a channel's history, page by page.
-#[derive(Debug)]
-struct Walk {
-    relays: Vec<Walker>,
-    since: Option<Timestamp>,
-    /// The inclusive upper bound of the next page.
-    cursor: Option<Timestamp>,
-    seen: BTreeSet<EventId>,
-    newest: Option<Timestamp>,
-    oldest: Option<Timestamp>,
-    raw: usize,
-    errors: usize,
-    /// Wraps the caller could not read under any held key.
-    unreadable: usize,
-    /// A short page ended the walk.
-    bottom: bool,
-}
-
-/// One relay's standing in a walk.
-#[derive(Debug)]
-struct Walker {
-    url: RelayUrl,
-    dead: bool,
-}
-
-impl Walk {
-    fn new(relays: &[RelayUrl], window: Window) -> Self {
-        Self {
-            relays: relays
-                .iter()
-                .cloned()
-                .map(|url| Walker { url, dead: false })
-                .collect(),
-            since: window.since,
-            cursor: window.until,
-            seen: BTreeSet::new(),
-            newest: None,
-            oldest: None,
-            raw: 0,
-            errors: 0,
-            unreadable: 0,
-            bottom: false,
-        }
-    }
-
-    fn is_done(&self) -> bool {
-        self.bottom || self.relays.iter().all(|walker| walker.dead)
-    }
-
-    /// The region the next page asks for.
-    fn region(&self) -> Window {
-        Window {
-            until: self.cursor,
-            since: self.since,
-        }
-    }
-
-    fn live(&self) -> impl Iterator<Item = usize> + '_ {
-        (0..self.relays.len()).filter(|&index| !self.relays[index].dead)
-    }
-
-    fn url(&self, index: usize) -> &RelayUrl {
-        &self.relays[index].url
-    }
-
-    fn reject(&mut self, index: usize) {
-        self.relays[index].dead = true;
-        self.errors += 1;
-    }
-
-    fn accept(&mut self, page: BTreeSet<Event>, limit: usize) -> Vec<Event> {
-        if page.len() < limit {
-            self.bottom = true;
-        }
-
-        let mut oldest: Option<Timestamp> = None;
-        let mut events = Vec::with_capacity(page.len());
-
-        for event in page {
-            let at = event.created_at;
-            self.newest = Some(self.newest.map_or(at, |newest| newest.max(at)));
-            oldest = Some(oldest.map_or(at, |oldest| oldest.min(at)));
-
-            if self.seen.insert(event.id) {
-                self.raw += 1;
-                events.push(event);
-            }
-        }
-
-        // The walk's floor, which the round resumes the older pass from.
-        if let Some(oldest) = oldest {
-            self.oldest = Some(self.oldest.map_or(oldest, |held| held.min(oldest)));
-        }
-
-        match oldest {
-            Some(oldest) if !oldest.is_zero() => self.cursor = Some(oldest - 1u64),
-            Some(_) => self.bottom = true,
-            None => {}
-        }
-
-        events
-    }
-
-    fn finish(self, opened: Vec<ChatRumor>) -> WrapPage {
-        let swept = self.bottom && self.errors == 0;
-
-        WrapPage {
-            opened,
-            raw: self.raw,
-            unreadable: self.unreadable,
-            newest: self.newest,
-            oldest: self.oldest,
-            exhausted: swept && self.raw > 0,
-            failed: self.errors > 0 || (self.bottom && self.raw == 0),
-            errors: self.errors,
-        }
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use std::cmp::Reverse;
-
-    use concord::Epoch;
-    use concord::cord03::{build_message, seal_rumor};
-    use concord::derive::channel_group_key;
-
-    use super::*;
-
-    const SECRET: [u8; 32] = [0x07u8; 32];
-    const NEXT_SECRET: [u8; 32] = [0x11u8; 32];
-
-    fn serve_page(database: &BTreeSet<Event>, window: Window, limit: usize) -> BTreeSet<Event> {
-        let mut events: Vec<Event> = database
-            .iter()
-            .filter(|event| {
-                window.until.is_none_or(|until| event.created_at <= until)
-                    && window.since.is_none_or(|since| event.created_at >= since)
-            })
-            .cloned()
-            .collect();
-
-        events.sort_by_key(|event| Reverse(event.created_at));
-        events.truncate(limit);
-        events.into_iter().collect()
-    }
-
-    fn relay_url(host: &str) -> RelayUrl {
-        RelayUrl::parse(&format!("wss://{host}.example.com")).expect("parses")
-    }
-
-    #[test]
-    fn a_walk_pages_back_across_a_rekey() {
-        let channel = ChannelId::from_bytes([0x9cu8; 32]);
-        let author = Keys::generate();
-        let held = [
-            HeldKey {
-                epoch: Epoch(0),
-                key: SECRET,
-                retired_at: None,
-            },
-            HeldKey {
-                epoch: Epoch(1),
-                key: NEXT_SECRET,
-                retired_at: None,
-            },
-        ];
-        let planes: Vec<(HeldKey, GroupKey)> = held
-            .iter()
-            .map(|key| {
-                (
-                    *key,
-                    channel_group_key(&key.key, &channel, key.epoch).expect("derives"),
-                )
-            })
-            .collect();
-
-        // 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(
-                smol::block_on(seal_rumor(&rumor, &group, &author, false))
-                    .expect("seals")
-                    .0,
-            );
-        }
-
-        let mut walk = Walk::new(&[relay_url("history")], Window::newest());
-        let mut found = Vec::new();
-        let mut pages = 0;
-
-        while !walk.is_done() && pages < 10 {
-            pages += 1;
-            let page = serve_page(&relay, walk.region(), 2);
-
-            for wrap in walk.accept(page, 2) {
-                let Some((held, group)) =
-                    planes.iter().find(|(_, group)| group.pk() == wrap.pubkey)
-                else {
-                    continue;
-                };
-
-                let (_, rumor) = cord03::open(&wrap, group, &channel, held.epoch).expect("opens");
-                found.push(rumor);
-            }
-        }
-
-        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"]
-        );
-
-        let page = walk.finish(Vec::new());
-        assert!(page.exhausted);
-        assert!(!page.failed);
-        assert_eq!(page.raw, 3);
-        assert_eq!(page.newest, Some(Timestamp::from_secs(1_700_000_002)));
-        assert_eq!(
-            page.oldest,
-            Some(Timestamp::from_secs(1_700_000_000)),
-            "the walk reports its floor, which the older pass resumes below"
-        );
-    }
-
-    /// A wrap that reaches us and still will not open is history we cannot read,
-    /// not history that does not exist.
-    #[test]
-    fn a_wrap_no_held_key_can_open_reads_as_unreadable() {
-        let channel = ChannelId::from_bytes([0x9cu8; 32]);
-        let other = ChannelId::from_bytes([0x9du8; 32]);
-        let author = Keys::generate();
-        let group = channel_group_key(&SECRET, &channel, Epoch(0)).expect("derives");
-        let held = HeldKey {
-            epoch: Epoch(0),
-            key: SECRET,
-            retired_at: Some(Timestamp::from_secs(1_000)),
-        };
-
-        let wrap_at = |channel: &ChannelId, at_ms: u64| {
-            let rumor = build_message(
-                author.public_key(),
-                channel,
-                Epoch(0),
-                "sealed",
-                None,
-                at_ms,
-                None,
-            );
-            smol::block_on(seal_rumor(&rumor, &group, &author, false))
-                .expect("seals")
-                .0
-        };
-
-        // Sealed before the rotation superseded this key, so it still reads.
-        let before = wrap_at(&channel, 999_000);
-        assert!(read_under(&before, &held, &group, &channel).is_ok());
-
-        // Sealed after the cutoff the rotation set on that key.
-        let after = wrap_at(&channel, 1_001_000);
-        assert!(read_under(&after, &held, &group, &channel).is_err());
-
-        // Sealed to this plane but bound to another channel.
-        let misbound = wrap_at(&other, 999_000);
-        assert!(read_under(&misbound, &held, &group, &channel).is_err());
-    }
-
-    #[test]
-    fn an_empty_answer_never_seals_the_channel() {
-        let database: BTreeSet<Event> = BTreeSet::new();
-        let mut walk = Walk::new(&[relay_url("history")], Window::newest());
-
-        let page = serve_page(&database, walk.region(), 50);
-        assert!(walk.accept(page, 50).is_empty());
-
-        let page = walk.finish(Vec::new());
-        assert!(page.failed);
-        assert!(!page.exhausted);
-        assert_eq!(page.raw, 0);
-        assert_eq!(page.oldest, None);
-    }
-
-    #[test]
-    fn a_silent_relay_blocks_the_bottom() {
-        let database: BTreeSet<Event> = BTreeSet::new();
-        let mut walk = Walk::new(
-            &[relay_url("history"), relay_url("archive")],
-            Window::newest(),
-        );
-
-        // One relay answered the empty page; the other never answered at all, so
-        // its share of the region was never read and the walk must not seal.
-        walk.reject(1);
-        let page = serve_page(&database, walk.region(), 50);
-        assert!(walk.accept(page, 50).is_empty());
-
-        let page = walk.finish(Vec::new());
-        assert!(page.failed);
-        assert!(!page.exhausted);
-        assert_eq!(page.errors, 1);
-    }
-
-    #[test]
-    fn a_page_boundary_is_exclusive() {
-        let database = BTreeSet::from([
-            event_at(Timestamp::from_secs(1_700_000_000)),
-            event_at(Timestamp::from_secs(1_700_000_001)),
-        ]);
-        let mut walk = Walk::new(&[relay_url("history")], Window::newest());
-
-        let first = walk.accept(serve_page(&database, walk.region(), 1), 1);
-        let second = walk.accept(serve_page(&database, walk.region(), 1), 1);
-
-        assert_eq!(first.len(), 1);
-        assert_eq!(second.len(), 1);
-        assert_ne!(first[0].id, second[0].id);
-
-        let oldest = second
-            .iter()
-            .map(|event| event.created_at)
-            .min()
-            .expect("one wrap");
-        assert_eq!(oldest, Timestamp::from_secs(1_700_000_000));
-    }
-
-    fn event_at(at: Timestamp) -> Event {
-        let keys = Keys::generate();
-        EventBuilder::new(Kind::TextNote, "page")
-            .custom_created_at(at)
-            .finalize(&keys)
-            .expect("signs")
-    }
-
-    /// A cold channel asks wide; a warm one resumes at the overlap above its
-    /// cursor, and `older_than` never includes the boundary event itself.
-    #[test]
-    fn a_cold_window_is_open_and_a_warm_one_resumes_at_the_overlap() {
-        assert_eq!(Window::opening(ChannelCursor::default()), Window::default());
-
-        let warm = Window::opening(ChannelCursor {
-            newest: Some(Timestamp::from_secs(2_000_000)),
-            oldest: Some(Timestamp::from_secs(1_000)),
-            exhausted: false,
-        });
-        assert_eq!(
-            warm,
-            Window {
-                since: Some(Timestamp::from_secs(2_000_000) - CURSOR_OVERLAP),
-                until: None,
-            }
-        );
-
-        assert_eq!(
-            Window::older_than(Timestamp::from_secs(1_000)),
-            Window {
-                since: None,
-                until: Some(Timestamp::from_secs(999)),
-            }
-        );
-    }
-
-    /// A page whose round has moved on is simply a report nobody reads.
-    #[test]
-    fn a_page_that_moved_on_receives_nothing() {
-        let pages = PageRegistry::default();
-        let id = SubscriptionId::new("concord-history-9");
-        let (sender, receiver) = flume::bounded(1);
-
-        pages.register(id.clone(), sender);
-        pages.unregister(&id);
-        pages.deliver(&id, relay_url("history"), Settled::Replayed);
-
-        assert!(receiver.try_recv().is_err());
-    }
-}

crates/community/src/lib.rs

@@ -1,829 +0,0 @@
-use std::collections::{BTreeSet, HashMap};
-use std::time::{Duration, Instant};
-
-use anyhow::Result;
-pub use concord::cord02::CommunityMetadata;
-pub use concord::cord03::{ChatMessage, ReplyRef};
-use concord::state::CommunityState;
-pub use concord::{ChannelId, CommunityId, Epoch};
-use futures::future::{Either, select};
-use gpui::{App, AppContext, Context, Entity, EventEmitter, Global, Subscription, Task};
-use nostr_sdk::prelude::*;
-use smallvec::{SmallVec, smallvec};
-use state::NostrRegistry;
-
-use crate::history::{PageRegistry, Settled, auth_required};
-use crate::rekey::WatchRegistry;
-
-pub mod cache;
-mod community;
-pub mod history;
-mod rekey;
-mod sync;
-
-pub use community::*;
-pub use sync::*;
-
-/// How long a burst of relay notifications is collected before it is folded.
-const PUMP_WINDOW: Duration = Duration::from_millis(200);
-/// How long a community's relays may deliver nothing before
-/// its standing subscription is torn down and re-issued.
-const LIVE_ROTATE: Duration = Duration::from_secs(90);
-
-pub fn init(cx: &mut App) {
-    CommunityRegistry::set_global(cx.new(CommunityRegistry::new), cx);
-}
-
-struct GlobalCommunityRegistry(Entity<CommunityRegistry>);
-
-impl Global for GlobalCommunityRegistry {}
-
-#[derive(Debug, Clone, PartialEq, Eq)]
-enum Signal {
-    Event(CommunityId),
-    List,
-    Rekey(CommunityId),
-}
-
-/// Which standing subscription an id belongs to.
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
-enum Route {
-    List,
-    Community(CommunityId),
-}
-
-fn route_of(id: &SubscriptionId) -> Option<Route> {
-    if sync::is_list_subscription(id) {
-        return Some(Route::List);
-    }
-
-    sync::community_of(id).map(Route::Community)
-}
-
-/// What a window of relay notifications saw, waiting to be folded once.
-#[derive(Default)]
-struct Batch {
-    list: bool,
-    communities: BTreeSet<CommunityId>,
-    rekeys: BTreeSet<CommunityId>,
-}
-
-/// Whether the pump should keep listening.
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
-enum Flow {
-    Continue,
-    Stop,
-}
-
-/// Fold one notification into the window, or settle a page it belongs to.
-fn route(
-    notification: ClientNotification,
-    pages: &PageRegistry,
-    watches: &WatchRegistry,
-    batch: &mut Batch,
-) -> Flow {
-    match notification {
-        ClientNotification::Event {
-            subscription_id, ..
-        } => match route_of(&subscription_id) {
-            Some(Route::List) => batch.list = true,
-            Some(Route::Community(id)) => {
-                batch.communities.insert(id);
-            }
-            None => {
-                if let Some(id) = watches.community_of(&subscription_id) {
-                    batch.rekeys.insert(id);
-                }
-            }
-        },
-        ClientNotification::Message { relay_url, message } => match *message {
-            RelayMessage::EndOfStoredEvents(id) => {
-                pages.deliver(&id, relay_url, Settled::Replayed);
-            }
-            RelayMessage::Closed {
-                subscription_id,
-                message,
-            } if !auth_required(&message) => {
-                pages.deliver(
-                    &subscription_id,
-                    relay_url,
-                    Settled::Refused(message.into_owned()),
-                );
-            }
-            _ => {}
-        },
-        ClientNotification::Shutdown => return Flow::Stop,
-    }
-
-    Flow::Continue
-}
-
-/// Hand the window's signals to the foreground consumer, one per community.
-async fn flush(tx: &flume::Sender<Signal>, batch: &mut Batch) -> Result<()> {
-    for id in std::mem::take(&mut batch.communities) {
-        tx.send_async(Signal::Event(id)).await?;
-    }
-
-    for id in std::mem::take(&mut batch.rekeys) {
-        tx.send_async(Signal::Rekey(id)).await?;
-    }
-
-    if std::mem::take(&mut batch.list) {
-        tx.send_async(Signal::List).await?;
-    }
-
-    Ok(())
-}
-
-impl EventEmitter<CommunityEvent> for CommunityRegistry {}
-
-pub struct CommunityRegistry {
-    communities: Vec<Entity<Community>>,
-    index: HashMap<CommunityId, Entity<Community>>,
-    /// The plane set each community was last subscribed with
-    synced: HashMap<CommunityId, SubscriptionKey>,
-    /// When a relay last delivered something for a community,
-    /// which is the only evidence the standing subscription is alive.
-    last_event: HashMap<CommunityId, Instant>,
-    /// One observer per tracked community, dropped on reset
-    observers: HashMap<CommunityId, Subscription>,
-    signal_tx: flume::Sender<Signal>,
-    signal_rx: flume::Receiver<Signal>,
-    /// The page subscriptions in flight, shared with the notification pump.
-    pages: PageRegistry,
-    /// The rekey watch subscriptions, resolved to their community.
-    watches: WatchRegistry,
-    tasks: SmallVec<[Task<Result<()>>; 2]>,
-    /// Notification listener task (cancelled on signer change)
-    notification_listener: Option<Task<Result<()>>>,
-    /// Signal consumer task (cancelled on signer change)
-    signal_consumer: Option<Task<Result<()>>>,
-    /// The round scheduler (cancelled on signer change)
-    scheduler: Option<Task<Result<()>>>,
-    _subscriptions: SmallVec<[Subscription; 2]>,
-}
-
-impl CommunityRegistry {
-    pub fn global(cx: &App) -> Entity<Self> {
-        cx.global::<GlobalCommunityRegistry>().0.clone()
-    }
-
-    fn set_global(state: Entity<Self>, cx: &mut App) {
-        cx.set_global(GlobalCommunityRegistry(state));
-    }
-
-    fn new(cx: &mut Context<Self>) -> Self {
-        let entity = cx.entity().downgrade();
-        let nostr = NostrRegistry::global(cx);
-        let (tx, rx) = flume::bounded::<Signal>(256);
-        let mut subscriptions = smallvec![];
-
-        subscriptions.push(cx.subscribe(&nostr, |this, _nostr, event, cx| {
-            if event.signer_changed() {
-                this.reset(cx);
-                this.handle_notifications(cx);
-                this.subscribe_list(cx);
-                this.load(cx);
-            }
-        }));
-
-        cx.defer(move |cx| {
-            entity
-                .update(cx, |this, cx| {
-                    this.handle_notifications(cx);
-                    if nostr.read(cx).current_user().is_some() {
-                        this.subscribe_list(cx);
-                        this.load(cx);
-                    }
-                })
-                .ok();
-        });
-
-        Self {
-            communities: Vec::new(),
-            index: HashMap::new(),
-            synced: HashMap::new(),
-            last_event: HashMap::new(),
-            observers: HashMap::new(),
-            signal_tx: tx,
-            signal_rx: rx,
-            pages: PageRegistry::default(),
-            watches: WatchRegistry::default(),
-            tasks: smallvec![],
-            notification_listener: None,
-            signal_consumer: None,
-            scheduler: None,
-            _subscriptions: subscriptions,
-        }
-    }
-
-    pub fn communities(&self) -> &[Entity<Community>] {
-        &self.communities
-    }
-
-    pub fn community(&self, id: &CommunityId) -> Option<Entity<Community>> {
-        self.index.get(id).cloned()
-    }
-
-    /// Create a community owned by the current account and begin tracking it.
-    pub fn create(&mut self, metadata: CommunityMetadata, cx: &mut Context<Self>) {
-        let nostr = NostrRegistry::global(cx);
-        let current_user = nostr.read(cx).current_user();
-
-        if current_user.is_none() {
-            cx.emit(CommunityEvent::Error(
-                "cannot create a community without an account".to_owned(),
-            ));
-            return;
-        }
-
-        let signer = nostr.read(cx).signer();
-        let client = nostr.read(cx).client();
-
-        let task =
-            cx.background_spawn(async move { sync::create(&client, &signer, &metadata).await });
-
-        self.tasks.push(cx.spawn(async move |this, cx| {
-            match task.await {
-                Ok(_state) => this.update(cx, |this, cx| this.load(cx))?,
-                Err(error) => {
-                    this.update(cx, |_this, cx| {
-                        cx.emit(CommunityEvent::Error(error.to_string()));
-                    })?;
-                }
-            }
-
-            Ok(())
-        }));
-    }
-
-    /// Forget the current account and cancel everything in flight.
-    pub fn reset(&mut self, cx: &mut Context<Self>) {
-        self.notification_listener = None;
-        self.signal_consumer = None;
-        self.scheduler = None;
-        self.tasks.clear();
-        self.observers.clear();
-        self.pages.clear();
-        self.watches.clear();
-
-        let nostr = NostrRegistry::global(cx);
-        let client = nostr.read(cx).client();
-        let ids: Vec<CommunityId> = self.index.keys().copied().collect();
-
-        for id in ids {
-            let client = client.clone();
-            let subscription = sync::subscription_id(&id);
-            let rekey = rekey::subscription_id(&id);
-
-            self.tasks.push(cx.background_spawn(async move {
-                client.unsubscribe(&subscription).await?;
-                client.unsubscribe(&rekey).await?;
-                Ok(())
-            }));
-        }
-
-        self.communities.clear();
-        self.index.clear();
-        self.synced.clear();
-        self.last_event.clear();
-
-        cx.notify();
-    }
-
-    /// Subscribe to the account's community list.
-    fn subscribe_list(&mut self, cx: &mut Context<Self>) {
-        let nostr = NostrRegistry::global(cx);
-        let signer = nostr.read(cx).signer();
-        let client = nostr.read(cx).client();
-
-        self.tasks.push(cx.spawn(async move |this, cx| {
-            let self_pk = signer.get_public_key_async().await?;
-
-            if let Err(error) = sync::subscribe_list(&client, self_pk).await {
-                this.update(cx, |_this, cx| {
-                    cx.emit(CommunityEvent::Error(error.to_string()));
-                })?;
-            }
-
-            Ok(())
-        }));
-    }
-
-    /// Discover the account's communities in the local database.
-    fn load(&mut self, cx: &mut Context<Self>) {
-        let nostr = NostrRegistry::global(cx);
-        let signer = nostr.read(cx).signer();
-        let client = nostr.read(cx).client();
-
-        let task = cx.background_spawn(async move {
-            let self_pk = signer.get_public_key_async().await?;
-            sync::load(&client, &signer, self_pk).await
-        });
-
-        self.tasks.push(cx.spawn(async move |this, cx| {
-            match task.await {
-                Ok(states) => {
-                    this.update(cx, |this, cx| this.track(states, cx))?;
-                }
-                Err(error) => {
-                    this.update(cx, |_this, cx| {
-                        cx.emit(CommunityEvent::Error(error.to_string()));
-                    })?;
-                }
-            }
-
-            Ok(())
-        }));
-    }
-
-    /// Replace the tracked communities with a freshly loaded set.
-    ///
-    /// A community that survives the reload keeps its entity, so an open panel
-    /// and a browsing sidebar stay pointed at a live community.
-    fn track(&mut self, states: Vec<CommunityState>, cx: &mut Context<Self>) {
-        let mut communities = Vec::with_capacity(states.len());
-
-        for state in states {
-            let id = state.id;
-
-            let community = match self.index.remove(&id) {
-                Some(community) => {
-                    // The list can carry plane material the store does not.
-                    if community.read(cx).state() != &state {
-                        community.update(cx, |community, _cx| community.adopt(state));
-                    }
-
-                    community
-                }
-                None => {
-                    let community = cx.new(|_| Community::new(state, self.pages.clone()));
-
-                    self.observers.insert(
-                        id,
-                        cx.observe(&community, |this, _community, cx| {
-                            this.sync_subscriptions(cx);
-                            cx.notify();
-                        }),
-                    );
-
-                    community
-                }
-            };
-
-            communities.push((id, community));
-        }
-
-        // Whatever the index still holds is no longer in the list.
-        let dropped: Vec<CommunityId> = self.index.keys().copied().collect();
-
-        for id in dropped {
-            self.observers.remove(&id);
-            self.synced.remove(&id);
-            self.last_event.remove(&id);
-        }
-
-        self.communities = communities
-            .iter()
-            .map(|(_, community)| community.clone())
-            .collect();
-        self.index = communities.into_iter().collect();
-
-        self.sync_subscriptions(cx);
-
-        // A backlog already in the database produces no notification, so fold it once.
-        for community in self.communities.clone() {
-            community.update(cx, |community, cx| community.refresh(cx));
-        }
-
-        cx.notify();
-    }
-
-    fn refresh(&mut self, id: CommunityId, cx: &mut Context<Self>) {
-        let Some(community) = self.index.get(&id).cloned() else {
-            return;
-        };
-
-        community.update(cx, |community, cx| community.refresh(cx));
-    }
-
-    /// Adopt whatever a community's rekey watch has delivered.
-    fn rekey(&mut self, id: CommunityId, cx: &mut Context<Self>) {
-        let Some(community) = self.index.get(&id).cloned() else {
-            return;
-        };
-
-        community.update(cx, |community, cx| community.rekey(cx));
-    }
-
-    /// One scheduler pass: every community repairs itself if it has gone stale,
-    /// and any whose relays have gone quiet is re-subscribed.
-    fn tick(&mut self, cx: &mut Context<Self>) {
-        for community in self.communities.clone() {
-            community.update(cx, |community, cx| community.tick(cx));
-        }
-        self.rotate_quiet(cx);
-    }
-
-    /// Re-issue the standing subscription of every community that has been quiet for `LIVE_ROTATE`
-    fn rotate_quiet(&mut self, cx: &mut Context<Self>) {
-        let now = Instant::now();
-        let ids: Vec<CommunityId> = self.index.keys().copied().collect();
-        let mut rotated = false;
-
-        for id in ids {
-            let quiet = self
-                .last_event
-                .get(&id)
-                .is_none_or(|at| now.duration_since(*at) >= LIVE_ROTATE);
-
-            if !quiet {
-                continue;
-            }
-
-            self.synced.remove(&id);
-            rotated = true;
-        }
-
-        if rotated {
-            self.sync_subscriptions(cx);
-        }
-    }
-
-    /// Re-subscribe every community whose held planes moved.
-    fn sync_subscriptions(&mut self, cx: &mut Context<Self>) {
-        let nostr = NostrRegistry::global(cx);
-
-        for community in self.communities.clone() {
-            let client = nostr.read(cx).client();
-
-            let (id, key, state) = {
-                let community = community.read(cx);
-                (
-                    community.id(),
-                    community.subscription_key(),
-                    community.state().clone(),
-                )
-            };
-
-            if self.synced.get(&id) == Some(&key) {
-                continue;
-            }
-
-            let planes = match sync::planes(&state) {
-                Ok(planes) => planes,
-                Err(error) => {
-                    cx.emit(CommunityEvent::Error(error.to_string()));
-                    continue;
-                }
-            };
-
-            let subscription = sync::subscription_id(&id);
-            let filter = sync::live_filter(&planes, sync::live_window(&state, Timestamp::now()));
-            let relays = key.relays().to_vec();
-
-            // A fresh REQ counts as evidence of life for this community.
-            self.last_event.insert(id, Instant::now());
-
-            // The rekey watch is a second standing REQ over the same relays.
-            let watch = match rekey::watches(&state) {
-                Ok(watches) => rekey::watch_filter(&watches),
-                Err(error) => {
-                    cx.emit(CommunityEvent::Error(error.to_string()));
-                    continue;
-                }
-            };
-
-            let rekey_subscription = rekey::subscription_id(&id);
-            self.watches.register(rekey_subscription.clone(), id);
-
-            self.synced.insert(id, key);
-
-            self.tasks.push(cx.spawn(async move |this, cx| {
-                if let Err(error) = subscribe(&client, &subscription, &relays, filter).await {
-                    this.update(cx, |_this, cx| {
-                        cx.emit(CommunityEvent::Error(error.to_string()));
-                    })?;
-                }
-
-                if let Err(error) = subscribe(&client, &rekey_subscription, &relays, watch).await {
-                    this.update(cx, |_this, cx| {
-                        cx.emit(CommunityEvent::Error(error.to_string()));
-                    })?;
-                }
-
-                Ok(())
-            }));
-        }
-    }
-
-    fn handle_notifications(&mut self, cx: &mut Context<Self>) {
-        self.notification_listener = None;
-        self.signal_consumer = None;
-        self.scheduler = None;
-
-        let nostr = NostrRegistry::global(cx);
-        let client = nostr.read(cx).client();
-
-        let tx = self.signal_tx.clone();
-        let rx = self.signal_rx.clone();
-        let pages = self.pages.clone();
-        let watches = self.watches.clone();
-        let executor = cx.background_executor().clone();
-
-        self.notification_listener = Some(cx.background_spawn(async move {
-            let mut notifications = client.notifications();
-            let mut batch = Batch::default();
-
-            'outer: loop {
-                match notifications.next().await {
-                    Some(notification) => {
-                        if route(notification, &pages, &watches, &mut batch) == Flow::Stop {
-                            flush(&tx, &mut batch).await?;
-                            break 'outer;
-                        }
-                    }
-                    None => break 'outer,
-                }
-
-                let deadline = Instant::now() + PUMP_WINDOW;
-
-                loop {
-                    let now = Instant::now();
-
-                    if now >= deadline {
-                        break;
-                    }
-
-                    let timer = executor.timer(deadline - now);
-                    let next = notifications.next();
-                    futures::pin_mut!(timer);
-                    futures::pin_mut!(next);
-
-                    match select(next, timer).await {
-                        Either::Left((Some(notification), _)) => {
-                            if route(notification, &pages, &watches, &mut batch) == Flow::Stop {
-                                flush(&tx, &mut batch).await?;
-                                break 'outer;
-                            }
-                        }
-                        Either::Left((None, _)) => break 'outer,
-                        Either::Right(_) => break,
-                    }
-                }
-
-                flush(&tx, &mut batch).await?;
-            }
-
-            Ok(())
-        }));
-
-        self.signal_consumer = Some(cx.spawn(async move |this, cx| {
-            while let Ok(signal) = rx.recv_async().await {
-                match signal {
-                    Signal::Event(id) => this.update(cx, |this, cx| {
-                        // The only proof a community's subscription is still
-                        // delivering anything.
-                        this.last_event.insert(id, Instant::now());
-                        this.refresh(id, cx);
-                    })?,
-                    Signal::Rekey(id) => this.update(cx, |this, cx| this.rekey(id, cx))?,
-                    Signal::List => this.update(cx, |this, cx| this.load(cx))?,
-                }
-            }
-            Ok(())
-        }));
-
-        self.scheduler = Some(cx.spawn(async move |this, cx| {
-            loop {
-                cx.background_executor().timer(MIN_ROUND_INTERVAL).await;
-
-                if let Some(registry) = this.upgrade() {
-                    registry.update(cx, |this, cx| {
-                        this.tick(cx);
-                    });
-                } else {
-                    break;
-                }
-            }
-
-            Ok(())
-        }));
-    }
-}
-
-async fn subscribe(
-    client: &Client,
-    id: &SubscriptionId,
-    relays: &[RelayUrl],
-    filter: Filter,
-) -> Result<()> {
-    client.unsubscribe(id).await?;
-
-    if relays.is_empty() {
-        log::warn!("community {id}: no relay to subscribe to");
-        return Ok(());
-    }
-
-    let mut targets: Vec<(RelayUrl, Vec<Filter>)> = Vec::with_capacity(relays.len());
-
-    for url in relays {
-        if let Err(error) = client.add_relay(url).and_connect().await {
-            log::warn!("community {id}: failed to add relay {url}: {error}");
-        }
-
-        match client.relay(url).await {
-            Ok(Some(_)) => targets.push((url.clone(), vec![filter.clone()])),
-            Ok(None) => log::warn!("community {id}: relay {url} is not in the pool"),
-            Err(error) => log::warn!("community {id}: relay {url} could not be looked up: {error}"),
-        }
-    }
-
-    if targets.is_empty() {
-        log::warn!("community {id}: no relay accepted the standing subscription");
-        return Ok(());
-    }
-
-    let output = client
-        .subscribe(ReqTarget::manual(targets))
-        .with_id(id.clone())
-        .await?;
-
-    if !output.failed.is_empty() {
-        log::warn!(
-            "community {id}: {} relay(s) rejected the subscription",
-            output.failed.len()
-        );
-    }
-
-    Ok(())
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    fn relay() -> RelayUrl {
-        RelayUrl::parse("wss://relay.example").expect("a url")
-    }
-
-    fn event(subscription_id: SubscriptionId) -> ClientNotification {
-        let keys = Keys::generate();
-        let event = EventBuilder::new(Kind::TextNote, "hi")
-            .finalize(&keys)
-            .expect("signs");
-
-        ClientNotification::Event {
-            relay_url: relay(),
-            subscription_id,
-            event: Box::new(event),
-        }
-    }
-
-    fn message(message: RelayMessage<'static>) -> ClientNotification {
-        ClientNotification::Message {
-            relay_url: relay(),
-            message: Box::new(message),
-        }
-    }
-
-    /// A burst within one window folds each community once, and the list once,
-    /// however many events arrived.
-    #[test]
-    fn a_burst_collapses_to_one_signal_per_community() {
-        let pages = PageRegistry::default();
-        let watches = WatchRegistry::default();
-        let community = CommunityId::from_bytes([0x42; 32]);
-        let mut batch = Batch::default();
-
-        let plane = event(sync::subscription_id(&community));
-        for _ in 0..50 {
-            assert_eq!(
-                route(plane.clone(), &pages, &watches, &mut batch),
-                Flow::Continue
-            );
-        }
-
-        route(
-            event(sync::list_subscription_id()),
-            &pages,
-            &watches,
-            &mut batch,
-        );
-
-        // A page's event is folded from the database later, not routed here.
-        route(
-            event(SubscriptionId::new("concord-history-7")),
-            &pages,
-            &watches,
-            &mut batch,
-        );
-
-        assert!(batch.list);
-        assert_eq!(batch.communities, BTreeSet::from([community]));
-        assert!(batch.rekeys.is_empty());
-    }
-
-    /// A rekey watch's wraps put themselves in the database; the pump's only job
-    /// is to wake the adoption pass, and it resolves the community by id.
-    #[test]
-    fn a_rekey_watch_event_wakes_its_community() {
-        let pages = PageRegistry::default();
-        let watches = WatchRegistry::default();
-        let community = CommunityId::from_bytes([0x42; 32]);
-        let id = rekey::subscription_id(&community);
-        watches.register(id.clone(), community);
-
-        let mut batch = Batch::default();
-        route(event(id), &pages, &watches, &mut batch);
-
-        assert_eq!(batch.rekeys, BTreeSet::from([community]));
-        assert!(batch.communities.is_empty());
-    }
-
-    #[test]
-    fn an_eose_settles_only_the_page_that_owns_the_id() {
-        let pages = PageRegistry::default();
-        let mine = SubscriptionId::new("concord-history-1");
-        let other = SubscriptionId::new("concord-history-2");
-        let (mine_tx, mine_rx) = flume::bounded(1);
-        let (other_tx, other_rx) = flume::bounded(1);
-        pages.register(mine.clone(), mine_tx);
-        pages.register(other, other_tx);
-
-        let mut batch = Batch::default();
-        let flow = route(
-            message(RelayMessage::eose(mine)),
-            &pages,
-            &WatchRegistry::default(),
-            &mut batch,
-        );
-
-        assert_eq!(flow, Flow::Continue);
-        assert!(matches!(
-            mine_rx.try_recv().expect("a report").outcome,
-            Settled::Replayed
-        ));
-        assert!(other_rx.try_recv().is_err());
-    }
-
-    #[test]
-    fn a_refused_page_settles_its_relay_as_refused() {
-        let pages = PageRegistry::default();
-        let id = SubscriptionId::new("concord-history-1");
-        let (sender, receiver) = flume::bounded(1);
-        pages.register(id.clone(), sender);
-
-        let mut batch = Batch::default();
-        route(
-            message(RelayMessage::closed(id, "blocked: not allowed")),
-            &pages,
-            &WatchRegistry::default(),
-            &mut batch,
-        );
-
-        match receiver.try_recv().expect("a report").outcome {
-            Settled::Refused(reason) => assert!(reason.contains("blocked")),
-            other => panic!("expected a refusal, got {other:?}"),
-        }
-    }
-
-    /// The SDK re-issues an `auth-required` REQ under the same id after AUTH, so
-    /// the page keeps waiting rather than writing the relay off.
-    #[test]
-    fn an_auth_required_close_settles_nothing() {
-        let pages = PageRegistry::default();
-        let id = SubscriptionId::new("concord-history-1");
-        let (sender, receiver) = flume::bounded(1);
-        pages.register(id.clone(), sender);
-
-        let mut batch = Batch::default();
-        route(
-            message(RelayMessage::closed(
-                id,
-                "auth-required: please authenticate",
-            )),
-            &pages,
-            &WatchRegistry::default(),
-            &mut batch,
-        );
-
-        assert!(receiver.try_recv().is_err());
-    }
-
-    #[test]
-    fn a_shutdown_stops_the_pump() {
-        let pages = PageRegistry::default();
-        let mut batch = Batch::default();
-
-        assert_eq!(
-            route(
-                ClientNotification::Shutdown,
-                &pages,
-                &WatchRegistry::default(),
-                &mut batch
-            ),
-            Flow::Stop
-        );
-    }
-}

crates/community_ui/src/lib.rs

@@ -1,820 +0,0 @@
-use std::collections::HashMap;
-use std::fmt;
-
-use anyhow::Result;
-use community::{
-    ChannelId, ChatMessage, Community, CommunityEvent, Epoch, Intent, LOAD_OLDER_PAGES,
-    TIMELINE_PAGE, Timeline,
-};
-use gpui::prelude::FluentBuilder;
-use gpui::{
-    AnyElement, App, AppContext, Context, Entity, EventEmitter, FocusHandle, Focusable, FollowMode,
-    IntoElement, ListAlignment, ListScrollEvent, ListState, ParentElement, Render, SharedString,
-    Styled, Subscription, Task, WeakEntity, Window, div, list, px,
-};
-use nostr_sdk::prelude::EventId;
-use smallvec::{SmallVec, smallvec};
-use theme::ActiveTheme;
-use ui::avatar::Avatar;
-use ui::button::{Button, ButtonVariants};
-use ui::dock::{Panel, PanelEvent};
-use ui::input::{InputEvent, Textarea, TextareaState};
-use ui::message::WelcomeMessage;
-use ui::notification::Notification;
-use ui::scroll::Scrollbar;
-use ui::{Disableable, IconName, Sizable, WindowExtension, h_flex, v_flex};
-
-mod message;
-
-/// How near the top row a scroll has to come before the panel splices older history in.
-const LOAD_OLDER_THRESHOLD: usize = 20;
-/// A repeat message within this window keeps its run, so it carries no avatar or name.
-const RUN_WINDOW_MS: u64 = 300_000;
-
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
-enum Notice {
-    Stranded,
-    Removed(Epoch),
-    ChannelRemoved(Epoch),
-    MissingKey(Epoch),
-    Unreachable,
-    Unreadable(usize),
-}
-
-impl fmt::Display for Notice {
-    fn fmt(&self, formatter: &mut fmt::Formatter<'_>) -> fmt::Result {
-        match self {
-            Notice::Stranded => formatter.write_str(
-                "This invite is stale, the community has rotated past the epoch it names",
-            ),
-            Notice::Removed(epoch) => write!(
-                formatter,
-                "You were removed from this community at epoch {}. Its history stays readable",
-                epoch.0
-            ),
-            Notice::ChannelRemoved(epoch) => write!(
-                formatter,
-                "A rotation removed you from this channel at epoch {}",
-                epoch.0
-            ),
-            Notice::MissingKey(epoch) => write!(
-                formatter,
-                "Messages here can't be read yet, this channel's key for epoch {} is missing",
-                epoch.0
-            ),
-            Notice::Unreachable => formatter.write_str("Couldn't reach the community's relays"),
-            Notice::Unreadable(1) => {
-                formatter.write_str("1 message here can't be read yet, no key we hold opens it")
-            }
-            Notice::Unreadable(count) => write!(
-                formatter,
-                "{count} messages here can't be read yet, no key we hold opens them"
-            ),
-        }
-    }
-}
-
-impl Notice {
-    fn writable(self) -> bool {
-        matches!(self, Notice::Unreachable | Notice::Unreadable(_))
-    }
-}
-
-pub fn init(
-    community: Entity<Community>,
-    window: &mut Window,
-    cx: &mut App,
-) -> Entity<CommunityPanel> {
-    cx.new(|cx| CommunityPanel::new(community, window, cx))
-}
-
-/// Community Panel
-pub struct CommunityPanel {
-    id: SharedString,
-    focus_handle: FocusHandle,
-    /// Community
-    community: WeakEntity<Community>,
-    /// The selected channel
-    channel: Option<ChannelId>,
-    /// The selected channel's timeline (oldest first)
-    rows: Vec<ChatMessage>,
-    /// Whether the store holds rows older than `rows`
-    has_more: bool,
-    /// A round or a page read is in flight
-    loading: bool,
-    /// Message list state
-    list_state: ListState,
-    /// Message input state
-    input: Entity<TextareaState>,
-    /// Spawned reads and publishes, cancelled when the panel closes
-    tasks: SmallVec<[Task<Result<()>>; 4]>,
-    /// Event subscriptions
-    _subscriptions: SmallVec<[Subscription; 2]>,
-}
-
-impl CommunityPanel {
-    pub fn new(community: Entity<Community>, window: &mut Window, cx: &mut Context<Self>) -> Self {
-        let (id, name, channel) = {
-            let community = community.read(cx);
-
-            (
-                SharedString::from(format!("community-{}", community.id().to_hex())),
-                community.name(),
-                community.active_channel(),
-            )
-        };
-
-        let input = cx.new(|cx| {
-            TextareaState::new(window, cx)
-                .placeholder(format!("Message {name}"))
-                .auto_grow(1, 20)
-                .clean_on_escape()
-        });
-
-        let mut subscriptions = smallvec![];
-
-        subscriptions.push(
-            cx.subscribe_in(&input, window, |this, _input, event, window, cx| {
-                if let InputEvent::PressEnter { .. } = event {
-                    this.send(window, cx);
-                }
-            }),
-        );
-
-        subscriptions.push(cx.subscribe_in(
-            &community,
-            window,
-            |_this, _community, event, window, cx| {
-                match event {
-                    CommunityEvent::Channel(..) => {
-                        cx.defer_in(window, |this, window, cx| {
-                            this.load(window, cx);
-                        });
-                    }
-                    CommunityEvent::Error(error) => {
-                        window.push_notification(Notification::error(error.clone()), cx);
-                    }
-                    _ => {
-                        cx.defer_in(window, |this, window, cx| {
-                            this.reload(window, cx);
-                        });
-                    }
-                };
-            },
-        ));
-
-        let panel = Self {
-            id,
-            focus_handle: cx.focus_handle(),
-            community: community.downgrade(),
-            channel,
-            rows: Vec::new(),
-            has_more: false,
-            loading: false,
-            list_state: ListState::new(0, ListAlignment::Bottom, px(1024.)),
-            input,
-            tasks: smallvec![],
-            _subscriptions: subscriptions,
-        };
-
-        panel.list_state.set_follow_mode(FollowMode::Tail);
-        panel.list_state.set_scroll_handler(cx.listener(
-            |this, event: &ListScrollEvent, window, cx| {
-                if event.visible_range.start <= LOAD_OLDER_THRESHOLD {
-                    this.load_older(window, cx);
-                }
-            },
-        ));
-
-        cx.defer_in(window, |this, window, cx| {
-            this.load(window, cx);
-        });
-
-        panel
-    }
-
-    /// The channel to show, following the community's selection.
-    fn resolve_channel(&mut self, cx: &App) -> Option<ChannelId> {
-        let channel = self
-            .community
-            .read_with(cx, |community, _cx| community.active_channel())
-            .ok()
-            .flatten();
-
-        if channel != self.channel {
-            self.channel = channel;
-            self.rows.clear();
-            self.has_more = false;
-            self.loading = false;
-            self.list_state.reset(2);
-        }
-
-        channel
-    }
-
-    /// The list's item count: the welcome row, the load-older row, then every message row.
-    fn item_count(&self) -> usize {
-        self.rows.len() + 2
-    }
-
-    /// A timeline read, `before_ms` exclusive, or `None` for the newest rows.
-    fn read(
-        &self,
-        channel: ChannelId,
-        before_ms: Option<u64>,
-        cx: &App,
-    ) -> Option<Task<Result<Timeline>>> {
-        self.community
-            .read_with(cx, |community, cx| {
-                community.timeline(&channel, before_ms, TIMELINE_PAGE, cx)
-            })
-            .ok()
-    }
-
-    /// A channel round, or `None` once the community is gone.
-    fn sync(
-        &self,
-        channel: ChannelId,
-        intent: Intent,
-        cx: &mut App,
-    ) -> Option<Task<Result<community::Progress>>> {
-        self.community
-            .update(cx, |community, cx| {
-                community.sync_channel(&channel, intent, cx)
-            })
-            .ok()
-    }
-
-    /// Paint the selected channel's cache, then catch it up from the relays.
-    fn load(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        let Some(channel) = self.resolve_channel(cx) else {
-            return;
-        };
-
-        self.reload(window, cx);
-
-        // Opening a channel twice in a breath asks the relays once.
-        if self.due(channel, cx) {
-            self.round(channel, Intent::CatchUp, window, cx);
-        }
-    }
-
-    /// Whether the community would actually round `channel`, or just serve it.
-    fn due(&self, channel: ChannelId, cx: &App) -> bool {
-        self.community
-            .read_with(cx, |community, _cx| community.due(&channel))
-            .unwrap_or(true)
-    }
-
-    /// Why the room is not showing messages, when it is not simply empty.
-    fn notice(&self, cx: &App) -> Option<Notice> {
-        let channel = self.channel?;
-
-        self.community
-            .read_with(cx, |community, _cx| {
-                if community.stranded() {
-                    return Some(Notice::Stranded);
-                }
-
-                if let Some(epoch) = community.removed_at() {
-                    return Some(Notice::Removed(epoch));
-                }
-
-                if let Some(epoch) = community.channel_removed_at(&channel) {
-                    return Some(Notice::ChannelRemoved(epoch));
-                }
-
-                if let Some(epoch) = community.missing_key(&channel) {
-                    return Some(Notice::MissingKey(epoch));
-                }
-
-                if community
-                    .progress(&channel)
-                    .is_some_and(|progress| progress.failed && progress.errors > 0)
-                {
-                    return Some(Notice::Unreachable);
-                }
-
-                let unreadable = community.unreadable(&channel);
-
-                (unreadable > 0).then_some(Notice::Unreadable(unreadable))
-            })
-            .ok()
-            .flatten()
-    }
-
-    /// Run a round for `channel`, its completion re-reads the timeline.
-    fn round(
-        &mut self,
-        channel: ChannelId,
-        intent: Intent,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let Some(round) = self.sync(channel, intent, cx) else {
-            return;
-        };
-
-        self.loading = true;
-        cx.notify();
-
-        let task = cx.spawn_in::<_, Result<()>>(window, async move |this, cx| {
-            let result = round.await;
-
-            this.update_in(cx, |this, window, cx| {
-                this.loading = false;
-
-                if let Err(error) = result {
-                    window.push_notification(
-                        Notification::error(error.to_string()).autohide(false),
-                        cx,
-                    );
-                }
-            })?;
-
-            Ok(())
-        });
-
-        self.tasks.push(task);
-    }
-
-    /// Run the newest round again after a relay failure.
-    fn retry(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        let Some(channel) = self.channel else {
-            return;
-        };
-
-        self.round(channel, Intent::CatchUp, window, cx);
-    }
-
-    /// Read the newest page and fold it into what is on screen.
-    fn reload(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        let Some(channel) = self.resolve_channel(cx) else {
-            return;
-        };
-
-        let Some(timeline) = self.read(channel, None, cx) else {
-            return;
-        };
-
-        let task = cx.spawn_in::<_, Result<()>>(window, async move |this, cx| {
-            match timeline.await {
-                Ok(timeline) => this.update(cx, |this, cx| this.apply(channel, timeline, cx))?,
-                Err(error) => {
-                    this.update_in(cx, |_this, window, cx| {
-                        window.push_notification(
-                            Notification::error(error.to_string()).autohide(false),
-                            cx,
-                        );
-                    })?;
-                }
-            }
-
-            Ok(())
-        });
-
-        self.tasks.push(task);
-    }
-
-    /// Splice the page of history above the oldest row on screen.
-    fn load_older(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        if self.loading || !self.has_more {
-            return;
-        }
-
-        let Some(channel) = self.channel else {
-            return;
-        };
-
-        let Some(before_ms) = self
-            .rows
-            .first()
-            .map(|message| message.at_ms.saturating_sub(1))
-        else {
-            return;
-        };
-
-        let Some(page) = self.read(channel, Some(before_ms), cx) else {
-            return;
-        };
-
-        self.loading = true;
-
-        let task = cx.spawn_in::<_, Result<()>>(window, async move |this, cx| {
-            let timeline = match page.await {
-                Ok(timeline) => timeline,
-                Err(error) => {
-                    this.update_in(cx, |this, window, cx| {
-                        this.loading = false;
-                        window.push_notification(
-                            Notification::error(error.to_string()).autohide(false),
-                            cx,
-                        );
-                    })?;
-                    return Ok(());
-                }
-            };
-
-            let swept = this.update(cx, |this, cx| {
-                this.prepend(channel, timeline, cx);
-                !this.has_more
-            })?;
-
-            if !swept {
-                this.update(cx, |this, _cx| this.loading = false)?;
-                return Ok(());
-            }
-
-            let round = this.update(cx, |this, cx| {
-                this.sync(
-                    channel,
-                    Intent::Older {
-                        pages: LOAD_OLDER_PAGES,
-                    },
-                    cx,
-                )
-            })?;
-
-            let Some(round) = round else {
-                this.update(cx, |this, _cx| this.loading = false)?;
-                return Ok(());
-            };
-
-            match round.await {
-                Ok(_) => {
-                    let page =
-                        this.update(cx, |this, cx| this.read(channel, Some(before_ms), cx))?;
-
-                    if let Some(page) = page {
-                        match page.await {
-                            Ok(timeline) => {
-                                this.update(cx, |this, cx| this.prepend(channel, timeline, cx))?
-                            }
-                            Err(error) => this.update_in(cx, |_this, window, cx| {
-                                window.push_notification(
-                                    Notification::error(error.to_string()).autohide(false),
-                                    cx,
-                                );
-                            })?,
-                        }
-                    }
-
-                    this.update(cx, |this, _cx| this.loading = false)?;
-                }
-                Err(error) => {
-                    this.update_in(cx, |this, window, cx| {
-                        this.loading = false;
-                        window.push_notification(
-                            Notification::error(error.to_string()).autohide(false),
-                            cx,
-                        );
-                    })?;
-                }
-            }
-
-            Ok(())
-        });
-
-        self.tasks.push(task);
-    }
-
-    /// Fold a freshly read window into the rows on screen.
-    fn apply(&mut self, channel: ChannelId, timeline: Timeline, cx: &mut Context<Self>) {
-        if self.channel != Some(channel) {
-            return;
-        }
-
-        let Timeline { messages, has_more } = timeline;
-
-        let connected = self
-            .rows
-            .last()
-            .is_some_and(|last| messages.iter().any(|message| message.id == last.id));
-
-        if !connected {
-            self.rows = messages;
-            self.has_more = has_more;
-            self.list_state.reset(self.item_count());
-            cx.notify();
-            return;
-        }
-
-        self.merge(messages);
-        cx.notify();
-    }
-
-    /// Splice older rows in above what is on screen.
-    fn prepend(&mut self, channel: ChannelId, timeline: Timeline, cx: &mut Context<Self>) {
-        if self.channel != Some(channel) {
-            return;
-        }
-
-        self.has_more = timeline.has_more;
-        self.merge(timeline.messages);
-        cx.notify();
-    }
-
-    /// Fold read rows into what is on screen, keeping the list in time order.
-    fn merge(&mut self, messages: Vec<ChatMessage>) {
-        let mut shown: HashMap<EventId, usize> = self
-            .rows
-            .iter()
-            .enumerate()
-            .map(|(ix, message)| (message.id, ix))
-            .collect();
-
-        let mut fresh = Vec::new();
-
-        for message in messages {
-            match shown.get(&message.id).copied() {
-                Some(ix) => self.rows[ix] = message,
-                None => fresh.push(message),
-            }
-        }
-
-        for message in fresh {
-            if shown.contains_key(&message.id) {
-                continue;
-            }
-
-            let at = self
-                .rows
-                .partition_point(|row| (row.at_ms, row.id) <= (message.at_ms, message.id));
-
-            shown.insert(message.id, at);
-            self.rows.insert(at, message);
-            // The welcome and load-older rows sit above the messages.
-            self.list_state.splice(at + 2..at + 2, 1);
-        }
-    }
-
-    fn send(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        let content = self.input.read(cx).value().trim().to_owned();
-
-        if content.is_empty() {
-            window.push_notification("Cannot send an empty message", cx);
-            return;
-        }
-
-        let Some(channel) = self.resolve_channel(cx) else {
-            return;
-        };
-
-        if let Some(notice) = self.notice(cx).filter(|notice| !notice.writable()) {
-            window.push_notification(Notification::error(notice.to_string()).autohide(false), cx);
-            return;
-        }
-
-        let Ok(send) = self.community.read_with(cx, |community, cx| {
-            community.send(&channel, &content, None, cx)
-        }) else {
-            return;
-        };
-
-        let Some(send) = send else {
-            window.push_notification(Notification::error("Failed to send the message"), cx);
-            return;
-        };
-
-        self.input.update(cx, |input, cx| {
-            input.set_value("", window, cx);
-        });
-
-        let task = cx.spawn_in::<_, Result<()>>(window, async move |this, cx| {
-            match send.await {
-                Ok(_) => {
-                    this.update_in(cx, |this, window, cx| this.reload(window, cx))?;
-                }
-                Err(error) => {
-                    this.update_in(cx, |_this, window, cx| {
-                        window.push_notification(
-                            Notification::error(error.to_string()).autohide(false),
-                            cx,
-                        );
-                    })?;
-                }
-            }
-
-            Ok(())
-        });
-
-        self.tasks.push(task);
-    }
-
-    /// The honest reason this room has nothing to show, with a way out of it.
-    fn render_notice(&self, notice: Notice, cx: &mut Context<Self>) -> AnyElement {
-        h_flex()
-            .w_full()
-            .justify_center()
-            .items_center()
-            .gap_2()
-            .px_3()
-            .py_2()
-            .text_sm()
-            .text_color(cx.theme().text_placeholder)
-            .child(notice.to_string())
-            .when(notice == Notice::Unreachable, |this| {
-                this.child(
-                    Button::new("retry-round")
-                        .label("Retry")
-                        .ghost()
-                        .small()
-                        .loading(self.loading)
-                        .on_click(cx.listener(|this, _event, window, cx| this.retry(window, cx))),
-                )
-            })
-            .into_any_element()
-    }
-
-    /// The row at index 0: the welcome message for the channel.
-    fn render_welcome(&self, cx: &Context<Self>) -> AnyElement {
-        let (name, avatar) = self
-            .community
-            .read_with(cx, |community, _cx| {
-                let seed = community.id().to_hex();
-                let avatar = match community.icon() {
-                    Some(path) => Avatar::from_source(path).seed(seed).large(),
-                    None => Avatar::new(None).seed(seed).large(),
-                };
-
-                (community.name(), avatar)
-            })
-            .unwrap_or_else(|_| (SharedString::from("this community"), Avatar::new(None)));
-
-        WelcomeMessage::new("welcome")
-            .icon(avatar)
-            .title(format!("Welcome to {}", name))
-            .message(format!("This is the start of the {} channel.", name))
-            .into_any_element()
-    }
-
-    /// The row at index 1: the affordance that pages older history in.
-    fn render_older(&self, cx: &mut Context<Self>) -> AnyElement {
-        if !self.has_more {
-            return div().into_any_element();
-        }
-
-        h_flex()
-            .w_full()
-            .justify_center()
-            .py_2()
-            .child(
-                Button::new("load-older")
-                    .label(if self.loading {
-                        "Loading earlier messages…"
-                    } else {
-                        "Load earlier messages"
-                    })
-                    .ghost()
-                    .small()
-                    .loading(self.loading)
-                    .on_click(cx.listener(|this, _event, window, cx| this.load_older(window, cx))),
-            )
-            .into_any_element()
-    }
-
-    /// Whether the row at `index` opens a run from one author.
-    fn opens_run(&self, index: usize) -> bool {
-        let Some(current) = self.rows.get(index) else {
-            return true;
-        };
-
-        let Some(previous) = index.checked_sub(1).and_then(|index| self.rows.get(index)) else {
-            return true;
-        };
-
-        current.author != previous.author
-            || current.at_ms.saturating_sub(previous.at_ms) > RUN_WINDOW_MS
-    }
-
-    fn render_message(
-        &mut self,
-        ix: usize,
-        _window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> AnyElement {
-        if ix == 0 {
-            return self.render_welcome(cx);
-        }
-
-        if ix == 1 {
-            return self.render_older(cx);
-        }
-
-        // The welcome and load-older rows sit above the messages.
-        let Some(message) = self.rows.get(ix - 2) else {
-            return div().into_any_element();
-        };
-
-        let show_author = self.opens_run(ix - 2);
-
-        message::render(ix, message, show_author, cx)
-    }
-
-    fn render_composer(&self, cx: &mut Context<Self>) -> impl IntoElement {
-        let writable = self.notice(cx).is_none_or(|notice| notice.writable());
-
-        h_flex()
-            .flex_shrink_0()
-            .w_full()
-            .p_2()
-            .gap_1()
-            .items_end()
-            .child(Textarea::new(&self.input).appearance(false).flex_1())
-            .child(
-                Button::new("send")
-                    .icon(IconName::PaperPlaneFill)
-                    .tooltip("Send")
-                    .ghost()
-                    .large()
-                    .disabled(!writable)
-                    .on_click(cx.listener(|this, _event, window, cx| {
-                        this.send(window, cx);
-                    })),
-            )
-    }
-}
-
-impl Panel for CommunityPanel {
-    fn panel_id(&self) -> SharedString {
-        self.id.clone()
-    }
-
-    fn title(&self, cx: &App) -> AnyElement {
-        self.community
-            .read_with(cx, |community, _cx| {
-                let seed = community.id().to_hex();
-                let avatar = match community.icon() {
-                    Some(path) => Avatar::from_source(path).seed(seed).xsmall(),
-                    None => Avatar::new(None).seed(seed).xsmall(),
-                };
-
-                h_flex()
-                    .gap_1()
-                    .text_xs()
-                    .child(avatar)
-                    .child(community.name())
-                    .into_any_element()
-            })
-            .unwrap_or_else(|_| div().text_xs().child("Unknown").into_any_element())
-    }
-
-    fn toolbar_buttons(&self, _window: &Window, _cx: &App) -> Vec<Button> {
-        vec![]
-    }
-}
-
-impl EventEmitter<PanelEvent> for CommunityPanel {}
-
-impl Focusable for CommunityPanel {
-    fn focus_handle(&self, _: &App) -> FocusHandle {
-        self.focus_handle.clone()
-    }
-}
-
-impl Render for CommunityPanel {
-    fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        v_flex()
-            .size_full()
-            .min_w_0()
-            .child(
-                v_flex()
-                    .flex_1()
-                    .min_h_0()
-                    .relative()
-                    .map(|this| {
-                        let notice = self.notice(cx);
-
-                        if self.rows.is_empty() {
-                            this.child(
-                                v_flex().size_full().justify_center().child(match notice {
-                                    Some(notice) => self.render_notice(notice, cx),
-                                    None => h_flex()
-                                        .size_full()
-                                        .justify_center()
-                                        .text_sm()
-                                        .text_color(cx.theme().text_placeholder)
-                                        .child("No messages yet")
-                                        .into_any_element(),
-                                }),
-                            )
-                        } else {
-                            this.when_some(notice, |this, notice| {
-                                this.child(self.render_notice(notice, cx))
-                            })
-                            .child(
-                                list(
-                                    self.list_state.clone(),
-                                    cx.processor(move |this, ix, window, cx| {
-                                        this.render_message(ix, window, cx)
-                                    }),
-                                )
-                                .size_full(),
-                            )
-                        }
-                    })
-                    .child(Scrollbar::vertical(&self.list_state)),
-            )
-            .child(self.render_composer(cx))
-    }
-}

crates/community_ui/src/message.rs

@@ -1,76 +0,0 @@
-use std::collections::BTreeMap;
-
-use common::TimestampExt;
-use community::ChatMessage;
-use gpui::prelude::FluentBuilder;
-use gpui::{AnyElement, App, IntoElement, ParentElement, SharedString, Styled, div};
-use nostr_sdk::prelude::*;
-use person::PersonRegistry;
-use settings::AppSettings;
-use theme::ActiveTheme;
-use ui::avatar::Avatar;
-use ui::h_flex;
-use ui::message::MessageRow;
-
-pub(crate) fn render(ix: usize, message: &ChatMessage, show_author: bool, cx: &App) -> AnyElement {
-    let persons = PersonRegistry::global(cx);
-    let author = persons.read(cx).get(&message.author, cx);
-    let hide_avatar = AppSettings::get_hide_avatar(cx);
-
-    MessageRow::new(ix)
-        .show_author(show_author)
-        .hide_avatar(hide_avatar)
-        .avatar(
-            Avatar::new(author.avatar())
-                .seed(author.avatar_seed())
-                .flex_shrink_0(),
-        )
-        .author(author.name())
-        .timestamp(Timestamp::from_secs(message.at_ms / 1000).to_human_time())
-        .when(message.edited_at.is_some(), |this| {
-            this.header_extra(div().child("(edited)"))
-        })
-        .child(content(message, cx))
-        .when(!message.reactions.is_empty(), |this| {
-            this.child(reactions(message, cx))
-        })
-        .into_any_element()
-}
-
-fn content(message: &ChatMessage, cx: &App) -> AnyElement {
-    if message.deleted {
-        return div()
-            .text_color(cx.theme().text_danger)
-            .child("Message deleted")
-            .into_any_element();
-    }
-
-    div()
-        .child(SharedString::from(&message.content))
-        .into_any_element()
-}
-
-fn reactions(message: &ChatMessage, cx: &App) -> AnyElement {
-    let mut grouped: BTreeMap<&str, usize> = BTreeMap::new();
-
-    for emoji in message.reactions.values() {
-        *grouped.entry(emoji.as_str()).or_default() += 1;
-    }
-
-    h_flex()
-        .mt_1()
-        .gap_1()
-        .children(grouped.into_iter().map(|(emoji, count)| {
-            h_flex()
-                .gap_1()
-                .py_0p5()
-                .px_1()
-                .rounded(cx.theme().radius)
-                .border_1()
-                .border_color(cx.theme().border)
-                .text_xs()
-                .child(SharedString::from(emoji))
-                .child(SharedString::from(count.to_string()))
-        }))
-        .into_any_element()
-}

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
-base64.workspace = true
-rand.workspace = true
-serde.workspace = true
-serde_json.workspace = true
-anyhow.workspace = true
-
-[dev-dependencies]
-smol.workspace = true

crates/concord/src/cords/cord01.rs

@@ -1,723 +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::{
-    AsyncGetPublicKey, AsyncNip44, AsyncSignEvent, Event, EventBuilder, EventId, FinalizeEvent,
-    FinalizeEventAsync, 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";
-pub(crate) const TAG_CHANNEL: &str = "channel";
-pub(crate) 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 async fn seal_to_self<S>(signer: &S, plaintext: &str) -> Result<String, StreamError>
-where
-    S: AsyncGetPublicKey + AsyncNip44 + ?Sized,
-{
-    check_plaintext_cap(plaintext.len())?;
-
-    let address = signer
-        .get_public_key_async()
-        .await
-        .map_err(|error| StreamError::Encrypt(error.to_string()))?;
-
-    signer
-        .nip44_encrypt_async(&address, plaintext)
-        .await
-        .map_err(|error| StreamError::Encrypt(error.to_string()))
-}
-
-pub async fn open_to_self<S>(signer: &S, content: &str) -> Result<String, StreamError>
-where
-    S: AsyncGetPublicKey + AsyncNip44 + ?Sized,
-{
-    let address = signer
-        .get_public_key_async()
-        .await
-        .map_err(|error| StreamError::Decrypt(error.to_string()))?;
-
-    signer
-        .nip44_decrypt_async(&address, content)
-        .await
-        .map_err(|error| StreamError::Decrypt(error.to_string()))
-}
-
-pub async fn build_seal<S>(
-    rumor: &UnsignedEvent,
-    form: SealForm,
-    group: &GroupKey,
-    author: &S,
-) -> Result<Event, StreamError>
-where
-    S: AsyncGetPublicKey + AsyncSignEvent + ?Sized,
-{
-    let content = seal_content(rumor, form, group)?;
-    EventBuilder::new(Kind::Custom(form.kind()), content)
-        .custom_created_at(rumor.created_at)
-        .finalize_async(author)
-        .await
-        .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(())
-}
-
-pub(crate) 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 {
-        smol::block_on(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,822 +0,0 @@
-use std::cmp::Reverse;
-use std::collections::{BTreeMap, BTreeSet};
-
-use anyhow::Result;
-use data_encoding::HEXLOWER;
-use nostr_sdk::prelude::*;
-
-use crate::cord01::{
-    KIND_WRAP, OpenedStream, SealForm, build_rumor_ms, build_seal, open_wrap, wrap_seal,
-};
-use crate::cord04::{AuthorityCitation, canonical_decimal, citation_tag};
-pub use crate::cords::rumor::RumorError as GuestbookError;
-use crate::cords::rumor::{optional_citation, pubkey, required, value};
-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, 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 async fn seal_rumor<S>(
-    rumor: &UnsignedEvent,
-    group: &GroupKey,
-    author: &S,
-) -> Result<(Event, Keys), GuestbookError>
-where
-    S: AsyncGetPublicKey + AsyncSignEvent + ?Sized,
-{
-    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).await?;
-
-    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))
-}
-
-/// Coalesce the guestbook flat: one final state per npub, the latest entry
-/// winning by millisecond time, ties broken by the lower rumor id.
-///
-/// `snapshot_authorities` are the npubs whose refounding is known to have minted an epoch this client reads.
-/// A snapshot chunk is honored only from one of them, and an empty set honors no snapshot at all.
-pub fn coalesce(
-    rumors: &[GuestbookRumor],
-    now_ms: u64,
-    snapshot_authorities: &BTreeSet<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_authorities.contains(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 decimal(raw: &str) -> Result<u32, GuestbookError> {
-    canonical_decimal(raw)
-        .and_then(|value| u32::try_from(value).ok())
-        .ok_or(GuestbookError::BadTag(TAG_SNAP))
-}
-
-fn tagged_pubkey(rumor: &UnsignedEvent, name: &'static str) -> Result<PublicKey, GuestbookError> {
-    pubkey(value(required(rumor, name)?, name)?, name)
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use crate::cord01::{StreamError, build_rumor_secs};
-    use crate::cord04::TAG_CITATION;
-    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])
-    }
-
-    /// The refounders a fold is told about: a snapshot seeds members on theirs alone.
-    fn refounders(keys: &[&Keys]) -> BTreeSet<PublicKey> {
-        keys.iter().map(|keys| keys.public_key()).collect()
-    }
-
-    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 = smol::block_on(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, &refounders(&[&carol]), 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, &refounders(&[&carol]), 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, &BTreeSet::new(), 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 [BTreeSet::new(), refounders(&[&refounder])] {
-            let states = coalesce(
-                &[
-                    publish(&by_refounder, &refounder),
-                    publish(&by_impostor, &impostor),
-                ],
-                AT + 1_000,
-                &authority,
-                |_, _, _| true,
-            );
-
-            assert_eq!(
-                states.contains_key(&seeded.public_key()),
-                !authority.is_empty(),
-                "only a known 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, &BTreeSet::new(), |_, _, _| true).is_empty(),
-            "an entry more than an hour ahead is dropped"
-        );
-        assert_eq!(
-            coalesce(&[horizon], AT, &BTreeSet::new(), |_, _, _| 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(
-                &smol::block_on(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(
-                &smol::block_on(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(
-                &smol::block_on(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(
-                    &smol::block_on(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/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
-}
-
-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)]
-struct FoldResult {
-    pub head: Option<usize>,
-    pub gap: bool,
-    pub anchored: bool,
-}
-
-/// The highest version whose chain is intact, given a held floor.
-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.
-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,819 +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, _) = smol::block_on(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, _) = smol::block_on(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, _) =
-            smol::block_on(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, _) =
-                smol::block_on(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,977 +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::{ImageRef, MAX_RELAYS};
-use crate::cord04::{TAG_SUBKIND, vsk};
-use crate::derive::{TOKEN_LEN, verify_community_id};
-use crate::utils::{canonical, union};
-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 async fn build_direct_invite<S>(
-    inviter: &S,
-    recipient: &PublicKey,
-    invite: &CommunityInvite,
-) -> Result<Event, InviteError>
-where
-    S: AsyncGetPublicKey + AsyncSignEvent + AsyncNip44,
-{
-    invite.validate()?;
-
-    let json = serde_json::to_string(invite).map_err(json_error)?;
-    let author = inviter.get_public_key_async().await.map_err(crypto_error)?;
-    let rumor = EventBuilder::new(Kind::Custom(KIND_DIRECT_INVITE), json).finalize_unsigned(author);
-
-    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_async(inviter)
-        .await
-        .map_err(crypto_error)
-}
-
-/// The NIP-59 unwrap is `Sized`-bounded in the SDK, so this stays `Sized` too.
-pub async fn unwrap_direct_invite<S>(
-    wrap: &Event,
-    recipient: &S,
-) -> Result<(PublicKey, CommunityInvite), InviteError>
-where
-    S: AsyncNip44,
-{
-    let unwrapped = UnwrappedGift::from_gift_wrap_async(recipient, wrap)
-        .await
-        .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 async fn build_invite_list<S>(keys: &S, list: &InviteList) -> Result<Event, InviteError>
-where
-    S: AsyncGetPublicKey + AsyncSignEvent + AsyncNip44 + ?Sized,
-{
-    list.fits()?;
-
-    let json = serde_json::to_string(list).map_err(json_error)?;
-    let content = cord01::seal_to_self(keys, &json).await?;
-
-    EventBuilder::new(Kind::Custom(KIND_INVITE_LIST), content)
-        .finalize_async(keys)
-        .await
-        .map_err(crypto_error)
-}
-
-pub async fn parse_invite_list<S>(keys: &S, event: &Event) -> Result<InviteList, InviteError>
-where
-    S: AsyncGetPublicKey + AsyncNip44 + ?Sized,
-{
-    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).await?;
-
-    serde_json::from_str(&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 = smol::block_on(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) =
-            smol::block_on(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!(smol::block_on(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!(
-            smol::block_on(unwrap_direct_invite(&wrap, &recipient)),
-            Err(InviteError::BadEvent(_))
-        ));
-    }
-}

crates/concord/src/cords/mod.rs

@@ -1,8 +0,0 @@
-mod rumor;
-
-pub mod cord01;
-pub mod cord02;
-pub mod cord03;
-pub mod cord04;
-pub mod cord05;
-pub mod cord06;

crates/concord/src/cords/rumor.rs

@@ -1,96 +0,0 @@
-use std::fmt;
-
-use nostr_sdk::prelude::*;
-
-use crate::cord01::StreamError;
-use crate::cord04::{AuthorityCitation, TAG_CITATION, citation_from};
-use crate::decode_hex_32;
-
-#[derive(Debug)]
-pub enum RumorError {
-    Stream(StreamError),
-    NotEncryptedSealed,
-    UnknownKind(u16),
-    MissingTag(&'static str),
-    DuplicateTag(&'static str),
-    BadTag(&'static str),
-    /// Neither a delete nor a timer notice may be erased by the policy it carries.
-    ExemptExpiration,
-}
-
-impl fmt::Display for RumorError {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        match self {
-            RumorError::Stream(error) => write!(f, "stream: {error}"),
-            RumorError::NotEncryptedSealed => write!(f, "rumor must ride an encrypted seal"),
-            RumorError::UnknownKind(kind) => write!(f, "not a rumor kind: {kind}"),
-            RumorError::MissingTag(name) => write!(f, "missing tag: {name}"),
-            RumorError::DuplicateTag(name) => write!(f, "duplicate tag: {name}"),
-            RumorError::BadTag(name) => write!(f, "malformed tag: {name}"),
-            RumorError::ExemptExpiration => {
-                write!(f, "a delete or timer notice must not carry an expiration")
-            }
-        }
-    }
-}
-
-impl std::error::Error for RumorError {}
-
-impl From<StreamError> for RumorError {
-    fn from(error: StreamError) -> Self {
-        RumorError::Stream(error)
-    }
-}
-
-pub fn tag<'a>(
-    rumor: &'a UnsignedEvent,
-    name: &'static str,
-) -> Result<Option<&'a [String]>, RumorError> {
-    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(RumorError::DuplicateTag(name));
-        }
-
-        found = Some(fields);
-    }
-
-    Ok(found)
-}
-
-pub fn required<'a>(
-    rumor: &'a UnsignedEvent,
-    name: &'static str,
-) -> Result<&'a [String], RumorError> {
-    tag(rumor, name)?.ok_or(RumorError::MissingTag(name))
-}
-
-pub fn value<'a>(fields: &'a [String], name: &'static str) -> Result<&'a str, RumorError> {
-    fields
-        .get(1)
-        .map(String::as_str)
-        .ok_or(RumorError::BadTag(name))
-}
-
-pub fn pubkey(hex: &str, name: &'static str) -> Result<PublicKey, RumorError> {
-    let bytes = decode_hex_32(hex).map_err(|_| RumorError::BadTag(name))?;
-
-    PublicKey::from_slice(&bytes).map_err(|_| RumorError::BadTag(name))
-}
-
-pub fn optional_citation(rumor: &UnsignedEvent) -> Result<Option<AuthorityCitation>, RumorError> {
-    let Some(fields) = tag(rumor, TAG_CITATION)? else {
-        return Ok(None);
-    };
-
-    citation_from(fields)
-        .map(Some)
-        .ok_or(RumorError::BadTag(TAG_CITATION))
-}

crates/concord/src/lib.rs

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

crates/concord/src/state.rs

@@ -1,627 +0,0 @@
-use std::collections::{BTreeMap, BTreeSet};
-
-use anyhow::Result;
-use data_encoding::HEXLOWER;
-use nostr_sdk::prelude::*;
-use serde::{Deserialize, Serialize};
-
-use crate::cord02::list::{CommunityListEntry, JoinMaterial};
-use crate::cord02::{
-    ChannelMetadata, CommunityGenesis, CommunityMetadata, ControlFold, ROOT_EPOCH,
-};
-use crate::cord04::{EntityHead, Floors, ParsedEdition, vsk};
-use crate::cord05::ChannelGrant;
-use crate::derive::control_signer_group_key;
-use crate::{ChannelId, CommunityId, Epoch, Extra, decode_hex_32};
-
-/// The `concord/` namespace for locally-keyed documents.
-pub const STATE_PREFIX: &str = "concord/";
-
-/// A key epoch the client still holds, retained so history stays readable.
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Serialize, Deserialize)]
-pub struct HeldKey {
-    pub epoch: Epoch,
-    pub key: [u8; 32],
-    /// The publish time of the rotation that superseded this key.
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub retired_at: Option<Timestamp>,
-}
-
-/// A community root epoch the client still holds, retained for the same reason.
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Serialize, Deserialize)]
-pub struct HeldRoot {
-    pub epoch: Epoch,
-    pub key: [u8; 32],
-    /// The epoch's Control Plane signer, when the rotation delivered one.
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub control_pk: Option<PublicKey>,
-    /// The publish time of the rotation that superseded this root.
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub retired_at: Option<Timestamp>,
-}
-
-#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
-pub struct ChannelKeyRef {
-    pub id: ChannelId,
-    pub name: String,
-    pub private: bool,
-    pub epoch: Epoch,
-    /// The channel's read secret when the member was granted it.
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub key: Option<[u8; 32]>,
-    /// Keys this one superseded, retained so a rotation never blanks history.
-    #[serde(default, skip_serializing_if = "Vec::is_empty")]
-    pub priors: Vec<HeldKey>,
-}
-
-impl ChannelKeyRef {
-    /// The write coordinate: only the current epoch is ever published under.
-    pub fn current(&self) -> Option<(Epoch, [u8; 32])> {
-        self.key.map(|key| (self.epoch, key))
-    }
-}
-
-/// How far a channel's history sync has reached, in wrap times.
-#[derive(Debug, Clone, Copy, Default, PartialEq, Eq, Serialize, Deserialize)]
-pub struct ChannelCursor {
-    /// The newest wrap ingested, so a live subscription knows where to resume.
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub newest: Option<Timestamp>,
-    /// The oldest wrap paged back to, so the next round resumes below it.
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub oldest: Option<Timestamp>,
-    /// History verifiably swept to the bottom.
-    #[serde(default)]
-    pub exhausted: bool,
-}
-
-impl ChannelCursor {
-    pub fn merge(self, round: Self) -> Self {
-        Self {
-            newest: later(self.newest, round.newest),
-            oldest: earlier(self.oldest, round.oldest),
-            exhausted: self.exhausted || round.exhausted,
-        }
-    }
-}
-
-fn later(held: Option<Timestamp>, round: Option<Timestamp>) -> Option<Timestamp> {
-    match (held, round) {
-        (Some(held), Some(round)) => Some(held.max(round)),
-        (held, None) => held,
-        (None, round) => round,
-    }
-}
-
-fn earlier(held: Option<Timestamp>, round: Option<Timestamp>) -> Option<Timestamp> {
-    match (held, round) {
-        (Some(held), Some(round)) => Some(held.min(round)),
-        (held, None) => held,
-        (None, round) => round,
-    }
-}
-
-/// One local document per community, keyed by `concord/<community_id>`.
-#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
-pub struct CommunityState {
-    pub id: CommunityId,
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub name: Option<String>,
-    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>,
-    /// Where each channel's history sync has reached.
-    #[serde(
-        default,
-        rename = "channel_cursors",
-        skip_serializing_if = "BTreeMap::is_empty"
-    )]
-    pub cursors: BTreeMap<ChannelId, ChannelCursor>,
-    /// Root epochs the community has rotated past that this client still holds.
-    #[serde(default, skip_serializing_if = "Vec::is_empty")]
-    pub held_roots: Vec<HeldRoot>,
-    /// The epoch a channel rotation removed us at.
-    #[serde(default, skip_serializing_if = "BTreeMap::is_empty")]
-    pub channel_cuts: BTreeMap<ChannelId, Epoch>,
-    /// The npubs whose rotation minted an epoch of this community we verified.
-    #[serde(default, skip_serializing_if = "BTreeSet::is_empty")]
-    pub refounders: BTreeSet<PublicKey>,
-    /// The base epoch we were excluded at.
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub removed_at: Option<Epoch>,
-    /// A complete rotation ahead of our epoch predates our join and carries no blob.
-    #[serde(default)]
-    pub stranded: bool,
-    #[serde(default)]
-    pub dissolved: bool,
-    /// When this community joined the member's list, in milliseconds.
-    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();
-        let mut name = None;
-
-        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()),
-                    );
-                    name = label(&metadata.name);
-                }
-                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,
-                        key: None,
-                        priors: Vec::new(),
-                    });
-                }
-                _ => {}
-            }
-        }
-
-        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,
-            name,
-            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(),
-            cursors: BTreeMap::new(),
-            held_roots: Vec::new(),
-            channel_cuts: BTreeMap::new(),
-            refounders: BTreeSet::new(),
-            removed_at: None,
-            stranded: false,
-            dissolved: false,
-            added_at_ms,
-        })
-    }
-
-    pub fn from_join_material(material: &JoinMaterial, added_at_ms: u64) -> Result<Self> {
-        let control_pks = match material.control_pk {
-            Some(address) => BTreeMap::from([(material.root_epoch.0, address)]),
-            None => BTreeMap::new(),
-        };
-
-        let mut channels = Vec::with_capacity(material.channels.len());
-
-        for grant in &material.channels {
-            let key = match &grant.key {
-                Some(key) => Some(decode_hex_32(key)?),
-                None => None,
-            };
-
-            channels.push(ChannelKeyRef {
-                id: grant.id,
-                name: grant.name.clone(),
-                private: key.is_some(),
-                epoch: grant.epoch,
-                key,
-                priors: Vec::new(),
-            });
-        }
-
-        Ok(Self {
-            id: material.community_id,
-            name: label(&material.name),
-            owner: material.owner,
-            owner_salt: decode_hex_32(&material.owner_salt)?,
-            community_root: decode_hex_32(&material.community_root)?,
-            root_epoch: material.root_epoch,
-            control_root: match &material.control_root {
-                Some(root) => Some(decode_hex_32(root)?),
-                None => None,
-            },
-            control_pks,
-            channels,
-            relays: material
-                .relays
-                .iter()
-                .filter_map(|relay| RelayUrl::parse(relay).ok())
-                .collect(),
-            heads: Vec::new(),
-            banned: BTreeSet::new(),
-            cursors: BTreeMap::new(),
-            held_roots: Vec::new(),
-            channel_cuts: BTreeMap::new(),
-            refounders: BTreeSet::new(),
-            removed_at: None,
-            stranded: false,
-            dissolved: false,
-            added_at_ms,
-        })
-    }
-
-    pub fn identifier(&self) -> String {
-        state_identifier(&self.id)
-    }
-
-    /// Every root epoch we hold, the current one first.
-    pub fn roots(&self) -> Vec<HeldRoot> {
-        let mut roots = Vec::with_capacity(self.held_roots.len() + 1);
-        roots.push(HeldRoot {
-            epoch: self.root_epoch,
-            key: self.community_root,
-            control_pk: self.control_pks.get(&self.root_epoch.0).copied(),
-            retired_at: None,
-        });
-        roots.extend(self.held_roots.iter().copied());
-        roots
-    }
-
-    /// Every secret held for a channel, newest epoch first.
-    pub fn held_keys(&self, channel: &ChannelId) -> Vec<HeldKey> {
-        let Some(held) = self.channels.iter().find(|held| held.id == *channel) else {
-            return Vec::new();
-        };
-
-        if held.private {
-            let mut keys: Vec<HeldKey> = held
-                .key
-                .map(|key| HeldKey {
-                    epoch: held.epoch,
-                    key,
-                    retired_at: None,
-                })
-                .into_iter()
-                .collect();
-            keys.extend(held.priors.iter().copied());
-            return keys;
-        }
-
-        self.roots()
-            .into_iter()
-            .map(|root| HeldKey {
-                epoch: root.epoch,
-                key: root.key,
-                retired_at: root.retired_at,
-            })
-            .collect()
-    }
-
-    /// Whether a channel rotation removed us at or after `epoch`.
-    pub fn channel_cut(&self, channel: &ChannelId, epoch: Epoch) -> bool {
-        self.channel_cuts
-            .get(channel)
-            .is_some_and(|cut| epoch <= *cut)
-    }
-
-    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();
-
-            if let Some(name) = label(&community.name) {
-                self.name = Some(name);
-            }
-        }
-
-        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,
-                    key: None,
-                    priors: Vec::new(),
-                }),
-                None => {}
-            }
-        }
-    }
-}
-
-pub fn list_entry(state: &CommunityState, name: &str) -> CommunityListEntry {
-    let material = JoinMaterial {
-        community_id: state.id,
-        owner: state.owner,
-        owner_salt: HEXLOWER.encode(&state.owner_salt),
-        community_root: HEXLOWER.encode(&state.community_root),
-        root_epoch: state.root_epoch,
-        control_pk: state.control_pks.get(&state.root_epoch.0).copied(),
-        control_root: state.control_root.map(|root| HEXLOWER.encode(&root)),
-        channels: state
-            .channels
-            .iter()
-            .map(|channel| ChannelGrant {
-                id: channel.id,
-                key: channel.key.map(|key| HEXLOWER.encode(&key)),
-                epoch: channel.epoch,
-                name: channel.name.clone(),
-                extra: Extra::default(),
-            })
-            .collect(),
-        relays: state.relays.iter().map(RelayUrl::to_string).collect(),
-        name: name.to_owned(),
-        extra: Extra::default(),
-    };
-
-    CommunityListEntry {
-        community_id: state.id,
-        seed: material.clone(),
-        current: material,
-        added_at: state.added_at_ms,
-        extra: Extra::default(),
-    }
-}
-
-fn label(name: &str) -> Option<String> {
-    let trimmed = name.trim();
-    (!trimmed.is_empty()).then(|| trimmed.to_owned())
-}
-
-/// The local document key a community's state is stored under.
-pub fn state_identifier(id: &CommunityId) -> String {
-    format!("{STATE_PREFIX}{}", id.to_hex())
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn a_cursor_merge_only_moves_forward_and_never_seals() {
-        let held = ChannelCursor {
-            newest: Some(Timestamp::from_secs(1_000)),
-            oldest: Some(Timestamp::from_secs(5_000)),
-            exhausted: false,
-        };
-
-        // An incomplete round reports nothing and moves neither bound.
-        assert_eq!(held.merge(ChannelCursor::default()), held);
-
-        let merged = held.merge(ChannelCursor {
-            newest: Some(Timestamp::from_secs(2_000)),
-            oldest: Some(Timestamp::from_secs(3_000)),
-            exhausted: true,
-        });
-        assert_eq!(
-            merged,
-            ChannelCursor {
-                newest: Some(Timestamp::from_secs(2_000)),
-                oldest: Some(Timestamp::from_secs(3_000)),
-                exhausted: true,
-            }
-        );
-
-        // A later round that learned less cannot walk either bound back.
-        assert_eq!(
-            merged.merge(ChannelCursor {
-                newest: Some(Timestamp::from_secs(1_500)),
-                oldest: Some(Timestamp::from_secs(4_000)),
-                exhausted: false,
-            }),
-            merged
-        );
-    }
-
-    /// A cursor stored when the boundaries were milliseconds must not be read as
-    /// seconds. The key it was stored under is gone, so the document's counters
-    /// are ignored and the channel re-syncs rather than being sealed off by an
-    /// `exhausted` that outlived the bounds it was earned against.
-    #[test]
-    fn a_cursor_stored_in_the_old_unit_is_dropped_rather_than_reinterpreted() {
-        let channel = ChannelId::from_bytes([0x9c; 32]);
-        let cursor = ChannelCursor {
-            newest: Some(Timestamp::from_secs(1_700_000_000)),
-            exhausted: true,
-            ..ChannelCursor::default()
-        };
-        let mut state = CommunityState {
-            id: CommunityId::from_bytes([0x42; 32]),
-            name: None,
-            owner: Keys::generate().public_key(),
-            owner_salt: [0x01; 32],
-            community_root: [0x02; 32],
-            root_epoch: Epoch(0),
-            control_root: None,
-            control_pks: BTreeMap::new(),
-            channels: Vec::new(),
-            relays: Vec::new(),
-            heads: Vec::new(),
-            banned: BTreeSet::new(),
-            cursors: BTreeMap::new(),
-            held_roots: Vec::new(),
-            channel_cuts: BTreeMap::new(),
-            refounders: BTreeSet::new(),
-            removed_at: None,
-            stranded: false,
-            dissolved: false,
-            added_at_ms: 7,
-        };
-
-        // The document a version that stored milliseconds wrote: its own key,
-        // and boundaries padded by a thousand.
-        let mut stored = serde_json::Map::new();
-        stored.insert(
-            channel.to_hex(),
-            serde_json::json!({
-                "newest_ms": 1_700_000_000_000u64,
-                "oldest_ms": 1_699_999_000_000u64,
-                "exhausted": true
-            }),
-        );
-
-        let mut legacy = serde_json::to_value(&state).expect("serializes");
-        legacy
-            .as_object_mut()
-            .expect("a document")
-            .insert("cursors".to_owned(), serde_json::Value::Object(stored));
-
-        let read: CommunityState = serde_json::from_value(legacy).expect("deserializes");
-
-        assert!(
-            read.cursors.is_empty(),
-            "a millisecond cursor is not a seconds cursor"
-        );
-
-        // A typed cursor still round-trips under the key it is written with.
-        state.cursors.insert(channel, cursor);
-
-        let document = serde_json::to_value(&state).expect("serializes");
-        let read: CommunityState = serde_json::from_value(document).expect("deserializes");
-
-        assert_eq!(read.cursors.get(&channel), Some(&cursor));
-    }
-
-    #[test]
-    fn from_join_material_materializes_a_subscribable_state_with_or_without_the_control_root() {
-        let owner = Keys::generate().public_key();
-        let control_pk = Keys::generate().public_key();
-        let staff = ChannelId::from_bytes([0x9c; 32]);
-        let general = ChannelId::from_bytes([0x9d; 32]);
-
-        let material = JoinMaterial {
-            community_id: CommunityId::from_bytes([0x42; 32]),
-            owner,
-            owner_salt: "01".repeat(32),
-            community_root: "02".repeat(32),
-            root_epoch: Epoch(3),
-            control_pk: Some(control_pk),
-            control_root: Some("03".repeat(32)),
-            channels: vec![
-                ChannelGrant {
-                    id: staff,
-                    key: Some("04".repeat(32)),
-                    epoch: Epoch(2),
-                    name: "staff".to_owned(),
-                    extra: Extra::default(),
-                },
-                ChannelGrant {
-                    id: general,
-                    key: None,
-                    epoch: Epoch(0),
-                    name: "general".to_owned(),
-                    extra: Extra::default(),
-                },
-            ],
-            relays: vec!["wss://relay.example".to_owned()],
-            name: "Room".to_owned(),
-            extra: Extra::default(),
-        };
-
-        let state = CommunityState::from_join_material(&material, 7).expect("materializes");
-
-        assert_eq!(state.id, material.community_id);
-        assert_eq!(state.owner, owner);
-        assert_eq!(state.owner_salt, [0x01; 32]);
-        assert_eq!(state.community_root, [0x02; 32]);
-        assert_eq!(state.root_epoch, Epoch(3));
-        assert_eq!(state.control_root, Some([0x03; 32]));
-        assert_eq!(state.control_pks, BTreeMap::from([(3, control_pk)]));
-        assert!(
-            state.heads.is_empty(),
-            "the first control fold fills the heads"
-        );
-        assert!(state.banned.is_empty());
-        assert!(!state.dissolved);
-        assert_eq!(state.relays.len(), 1);
-        assert_eq!(state.added_at_ms, 7);
-
-        // A granted key lands on the channel and makes it private; a grant with
-        // no key is a public channel.
-        let granted = state
-            .channels
-            .iter()
-            .find(|c| c.id == staff)
-            .expect("staff");
-        assert!(granted.private);
-        assert_eq!(granted.key, Some([0x04; 32]));
-        assert_eq!(granted.epoch, Epoch(2));
-        assert_eq!(granted.name, "staff");
-
-        let public = state
-            .channels
-            .iter()
-            .find(|c| c.id == general)
-            .expect("general");
-        assert!(!public.private);
-        assert_eq!(public.key, None);
-
-        // A member who is not staff carries no control_root, but reading needs no
-        // secret: the address rides in the material either way.
-        let mut member = material.clone();
-        member.control_root = None;
-        let state = CommunityState::from_join_material(&member, 7).expect("materializes");
-        assert_eq!(state.control_root, None);
-        assert_eq!(state.control_pks, BTreeMap::from([(3, control_pk)]));
-    }
-}

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/base64url.rs

@@ -1,34 +0,0 @@
-use anyhow::{Result, anyhow};
-use base64::engine::{DecodePaddingMode, GeneralPurpose, GeneralPurposeConfig};
-use base64::{Engine as _, alphabet};
-
-/// Unpadded base64url (RFC 4648 §5), 43 characters for 32 bytes: §8's value
-/// encoding at any depth.
-///
-/// The reader tolerates non-zero trailing bits; the writer never emits them.
-/// The spec's own worked example (`examples.md` §6.2) contains five such
-/// values, and a reader cannot tell a mis-encoded named field from a correctly
-/// encoded one, so the boundary is the writer's alone.
-const BASE64URL: GeneralPurpose = GeneralPurpose::new(
-    &alphabet::URL_SAFE,
-    GeneralPurposeConfig::new()
-        .with_encode_padding(false)
-        .with_decode_padding_mode(DecodePaddingMode::RequireNone)
-        .with_decode_allow_trailing_bits(true),
-);
-
-pub(crate) fn encode(bytes: &[u8]) -> String {
-    BASE64URL.encode(bytes)
-}
-
-/// Decodes one 32-byte value, the width every §8 field has.
-pub(crate) fn decode_32(value: &str) -> Result<[u8; 32]> {
-    let bytes = BASE64URL
-        .decode(value.trim())
-        .map_err(|error| anyhow!("invalid base64url: {error}"))?;
-
-    bytes
-        .as_slice()
-        .try_into()
-        .map_err(|_| anyhow!("expected 32 bytes, got {}", bytes.len()))
-}

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,77 +0,0 @@
-pub mod base64url;
-pub mod derive;
-
-use anyhow::{Result, anyhow, bail};
-use data_encoding::HEXLOWER;
-use rand::TryRng as _;
-use rand::rngs::SysRng;
-use serde::Serialize;
-
-use crate::Extra;
-
-/// Decode a 64-character lowercase-hex string into 32 bytes.
-///
-/// Uppercase and other non-canonical spellings are rejected.
-pub 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)
-}
-
-/// Hex to unpadded base64url for one 32-byte §8 value.
-pub(crate) fn hex32_to_base64(value: &str) -> Result<String> {
-    Ok(base64url::encode(&decode_hex_32(value)?))
-}
-
-/// Unpadded base64url to lowercase hex for one 32-byte §8 value.
-pub(crate) fn base64_to_hex32(value: &str) -> Result<String> {
-    Ok(HEXLOWER.encode(&base64url::decode_32(value)?))
-}
-
-/// Canonical JSON bytes: the total-order tie-break every content merge uses.
-pub(crate) fn canonical<T: Serialize>(value: &T) -> String {
-    serde_json::to_string(value).unwrap_or_default()
-}
-
-/// Unions an unknown-field map. Where both sides carry a key, the
-/// lexicographically lowest canonical bytes win, so two devices converge
-/// instead of flapping.
-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);
-        }
-    }
-}

crates/coop/Cargo.toml

@@ -0,0 +1,63 @@
+[package]
+name = "coop"
+version.workspace = true
+edition.workspace = true
+publish.workspace = true
+
+[[bin]]
+name = "coop"
+path = "src/main.rs"
+
+[package.metadata.packager]
+name = "Coop"
+product-name = "Coop"
+description = "Chat Freely, Stay Private on Nostr"
+identifier = "su.reya.coop"
+category = "SocialNetworking"
+version = "0.3.0"
+out-dir = "../../dist"
+before-packaging-command = "cargo build --release"
+resources = ["Cargo.toml", "src"]
+icons = [
+    "resources/32x32.png",
+    "resources/128x128.png",
+    "resources/128x128@2x.png",
+    "resources/icon.icns",
+    "resources/icon.ico",
+]
+
+[dependencies]
+assets = { path = "../assets" }
+ui = { path = "../ui" }
+titlebar = { path = "../titlebar" }
+dock = { path = "../dock" }
+theme = { path = "../theme" }
+common = { path = "../common" }
+state = { path = "../state" }
+device = { path = "../device" }
+chat = { path = "../chat" }
+chat_ui = { path = "../chat_ui" }
+settings = { path = "../settings" }
+auto_update = { path = "../auto_update" }
+person = { path = "../person" }
+relay_auth = { path = "../relay_auth" }
+
+gpui.workspace = true
+gpui_tokio.workspace = true
+reqwest_client.workspace = true
+
+nostr-connect.workspace = true
+nostr-sdk.workspace = true
+
+anyhow.workspace = true
+serde.workspace = true
+serde_json.workspace = true
+itertools.workspace = true
+log.workspace = true
+smallvec.workspace = true
+smol.workspace = true
+futures.workspace = true
+oneshot.workspace = true
+
+indexset = "0.12.3"
+tracing-subscriber = { version = "0.3.18", features = ["fmt", "env-filter"] }

crates/coop/resources/flatpak/coop.metainfo.xml.in

@@ -35,13 +35,13 @@
         <content_attribute id="social-audio">intense</content_attribute>
     </content_rating>
 
-    <url type="homepage">https://coopchat.xyz</url>
-    <url type="bugtracker">https://github.com/reyakov/coop/issues</url>
-    <url type="faq">https://github.com/reyakov/coop</url>
-    <url type="help">https://github.com/reyakov/coop/issues</url>
-    <url type="contact">reyakov@proton.me</url>
-    <url type="vcs-browser">https://github.com/reykov/coop</url>
-    <url type="contribute">https://github.com/reyakov/coop/blob/main/CONTRIBUTING.md</url>
+    <url type="homepage">https://reya.su/coop</url>
+    <url type="bugtracker">https://github.com/lumehq/coop/issues</url>
+    <url type="faq">https://github.com/lumehq/coop</url>
+    <url type="help">https://github.com/lumehq/coop/issues</url>
+    <url type="contact">https://reya.su/</url>
+    <url type="vcs-browser">https://github.com/lumehq/coop</url>
+    <url type="contribute">https://github.com/lumehq/coop/blob/main/CONTRIBUTING.md</url>
 
     <supports>
         <internet>yes</internet>