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

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

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

Reviewed-on: #1

.github/workflows/main.yml

@@ -1,81 +0,0 @@
-name: Packager Release Process
-
-run-name: Triggered by ${{ github.actor }}.
-on: workflow_dispatch
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-
-env:
-  CN_APPLICATION: lume/coop
-
-jobs:
-  draft:
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Create draft release
-        uses: crabnebula-dev/cloud-release@v0
-        with:
-          command: release draft ${{ env.CN_APPLICATION }} --framework packager
-          api-key: ${{ secrets.CN_API_KEY }}
-
-  build:
-    needs: draft
-
-    strategy:
-      fail-fast: false
-      matrix:
-        os: [ubuntu-latest, macos-latest, windows-latest]
-
-    runs-on: ${{ matrix.os }}
-
-    steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-node@v4
-      - name: Install stable toolchain
-        uses: actions-rust-lang/setup-rust-toolchain@v1
-        with:
-          toolchain: stable
-          cache: true
-
-      - name: Install dependencies (ubuntu only)
-        if: matrix.os == 'ubuntu-latest'
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y gcc g++ libasound2-dev libfontconfig-dev libwayland-dev libxkbcommon-x11-dev libssl-dev libzstd-dev libvulkan1 libgit2-dev make cmake clang jq netcat-openbsd git curl gettext-base elfutils libsqlite3-dev musl-tools musl-dev build-essential
-
-      - name: install cargo packager
-        run: |
-          cargo install cargo-packager --locked
-
-      - name: Build packager app
-        run: |
-          cargo packager --release
-
-      - name: Move assets to workdir
-        run: |
-          mv target/release/* .
-
-      - name: Upload assets
-        uses: crabnebula-dev/cloud-release@v0
-        with:
-          command: release upload ${{ env.CN_APPLICATION }} --framework packager
-          api-key: ${{ secrets.CN_API_KEY }}
-
-  publish:
-    needs: build
-
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Publish release
-        uses: crabnebula-dev/cloud-release@v0
-        with:
-          command: release publish ${{ env.CN_APPLICATION }} --framework packager
-          api-key: ${{ secrets.CN_API_KEY }}

.github/workflows/release.yml

@@ -0,0 +1,172 @@
+name: Build and Release
+
+on:
+  workflow_dispatch:
+  push:
+    tags:
+      - "v*"
+
+jobs:
+  build:
+    name: Build ${{ matrix.platform }}
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - platform: windows-x64
+            os: windows-latest
+            target: x86_64-pc-windows-msvc
+          - platform: windows-arm64
+            os: windows-11-arm
+            target: aarch64-pc-windows-msvc
+          - platform: macos-x64
+            os: macos-13
+            target: x86_64-apple-darwin
+          - platform: macos-arm64
+            os: macos-latest
+            target: aarch64-apple-darwin
+          - platform: linux-x64
+            os: ubuntu-latest
+            target: x86_64-unknown-linux-gnu
+          - platform: linux-arm64
+            os: ubuntu-24.04-arm
+            target: aarch64-unknown-linux-gnu
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Install Rust toolchain
+        uses: dtolnay/rust-toolchain@stable
+        with:
+          targets: ${{ matrix.target }}
+
+      # Windows and macOS builds using cargo-packager
+      - name: Build with cargo-packager (Windows/macOS)
+        if: runner.os != 'Linux'
+        working-directory: crates/coop
+        run: |
+          cargo install cargo-packager --locked
+          cargo packager --release
+
+      - name: Upload Windows/macOS artifacts
+        if: runner.os != 'Linux'
+        uses: actions/upload-artifact@v4
+        with:
+          name: ${{ matrix.platform }}-artifacts
+          path: |
+            dist/*.dmg
+            dist/*.msi
+            dist/*.exe
+          if-no-files-found: error
+
+      # Linux builds using custom scripts
+      - name: Install Linux build dependencies
+        if: runner.os == 'Linux'
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y flatpak flatpak-builder snapd squashfs-tools jq gettext-base
+
+      - name: Install Snapcraft
+        if: runner.os == 'Linux'
+        run: sudo snap install snapcraft --classic
+
+      - name: Make scripts executable
+        if: runner.os == 'Linux'
+        run: |
+          chmod +x script/get-crate-version
+          chmod +x script/linux
+          chmod +x script/bundle-snap
+          chmod +x script/bundle-linux
+          chmod +x script/flatpak/deps
+          chmod +x script/flatpak/bundle-flatpak
+
+      - name: Install required dependencies
+        if: runner.os == 'Linux'
+        run: ./script/linux
+
+      # Only build Flatpak and Snap for x86_64 (most common use case)
+      - name: Build Flatpak
+        if: runner.os == 'Linux'
+        run: |
+          ./script/bundle-linux --flatpak
+          ./script/flatpak/deps
+          ./script/flatpak/bundle-flatpak
+
+      - name: Build Snap
+        if: runner.os == 'Linux'
+        run: |
+          VERSION=$(script/get-crate-version coop)
+          ./script/bundle-linux
+          ./script/bundle-snap $VERSION
+
+      - name: Collect Linux artifacts
+        if: runner.os == 'Linux'
+        working-directory: ${{ github.workspace }}
+        run: |
+          mkdir -p linux-artifacts
+          # Copy the tarball created by bundle-linux
+          find target/release -name "*.tar.gz" -exec cp {} linux-artifacts/ \;
+          # Find and copy flatpak files (if they exist)
+          find . -name "*.flatpak" -exec cp {} linux-artifacts/ \; || true
+          # Find and copy snap files (if they exist)
+          find . -name "*.snap" -exec cp {} linux-artifacts/ \; || true
+          ls -la linux-artifacts/
+
+      - name: Upload Linux artifacts
+        if: runner.os == 'Linux'
+        uses: actions/upload-artifact@v4
+        with:
+          name: ${{ matrix.platform }}-artifacts
+          path: linux-artifacts/**/*
+          if-no-files-found: error
+
+  release:
+    name: Create Release
+    needs: build
+    runs-on: ubuntu-latest
+    if: startsWith(github.ref, 'refs/tags/v') || github.event_name == 'workflow_dispatch'
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Make get-crate-version executable
+        run: chmod +x script/get-crate-version
+
+      - name: Get version
+        id: version
+        run: |
+          VERSION=$(script/get-crate-version coop)
+          echo "version=$VERSION" >> $GITHUB_OUTPUT
+          echo "tag=v$VERSION" >> $GITHUB_OUTPUT
+
+      - name: Download all artifacts
+        uses: actions/download-artifact@v4
+        with:
+          path: artifacts
+
+      - name: Display artifacts structure
+        run: |
+          echo "Artifacts structure:"
+          find artifacts -type f -exec ls -la {} \;
+
+      - name: Create draft release
+        id: create_release
+        uses: softprops/action-gh-release@v2
+        with:
+          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: |
+          echo "Created draft release: ${{ steps.create_release.outputs.url }}"
+          echo "Release ID: ${{ steps.create_release.outputs.id }}"

.github/workflows/rust.yml

@@ -0,0 +1,32 @@
+name: Rust
+
+on:
+  push:
+    branches: ["**"]
+  pull_request:
+    branches: ["m**"]
+
+env:
+  CARGO_TERM_COLOR: always
+
+jobs:
+  build:
+    strategy:
+      matrix:
+        os: [ubuntu-latest, macos-latest, windows-latest]
+        rustup: [stable]
+
+    runs-on: ${{ matrix.os }}
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: script/linux
+        run: chmod +x ./script/linux && ./script/linux
+        if: matrix.os == 'ubuntu-latest'
+
+      - name: Build
+        run: cargo build --verbose
+
+      - name: Run tests
+        run: cargo test --verbose

.gitignore

@@ -19,3 +19,5 @@ dist/
 
 # Useless stuffs
 .DS_Store
+# Added by goreleaser init:
+.intentionally-empty-file.o

Cargo.toml

@@ -1,53 +1,50 @@
-[workspace]
-resolver = "2"
-members = ["crates/*"]
-default-members = ["crates/coop"]
-
-[workspace.package]
-version = "0.1.5"
-edition = "2021"
-publish = false
-
-[workspace.dependencies]
-coop = { path = "crates/*" }
-
-# UI
-gpui = { git = "https://github.com/zed-industries/zed" }
-reqwest_client = { git = "https://github.com/zed-industries/zed" }
-
-# Nostr
-nostr = { git = "https://github.com/rust-nostr/nostr", features = ["parser"] }
-nostr-relay-builder = { git = "https://github.com/rust-nostr/nostr" }
-nostr-connect = { git = "https://github.com/rust-nostr/nostr" }
-nostr-keyring = { git = "https://github.com/rust-nostr/nostr" }
-nostr-sdk = { git = "https://github.com/rust-nostr/nostr", features = [
-	"lmdb",
-	"nip96",
-	"nip59",
-	"nip49",
-	"nip44",
-	"nip05",
-] }
-
-# Others
-emojis = "0.6.4"
-smol = "2"
-oneshot = "0.1.10"
-serde = { version = "1.0", features = ["derive"] }
-serde_json = "1.0"
-dirs = "5.0"
-itertools = "0.13.0"
-futures = "0.3.30"
-chrono = "0.4.38"
-tracing = "0.1.40"
-anyhow = "1.0.44"
-smallvec = "1.14.0"
-rust-embed = "8.5.0"
-log = "0.4"
-
-[profile.release]
-strip = true
-opt-level = "z"
-lto = true
-codegen-units = 1
-panic = "abort"
+[workspace]
+resolver = "2"
+members = ["crates/*"]
+default-members = ["crates/coop"]
+
+[workspace.package]
+version = "0.3.0"
+edition = "2021"
+publish = false
+
+[workspace.dependencies]
+
+# 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-connect = { git = "https://github.com/rust-nostr/nostr" }
+nostr-sdk = { git = "https://github.com/rust-nostr/nostr", features = [ "nip96", "nip59", "nip49", "nip44" ] }
+
+# Others
+anyhow = "1.0.44"
+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 = "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"
+
+[profile.release]
+strip = true
+opt-level = "z"
+lto = true
+codegen-units = 1
+panic = "abort"
+
+[profile.profiling]
+inherits = "release"
+debug = true

Packager.toml

@@ -1,18 +0,0 @@
-name = "coop"
-description = "Coop is a cross-platform Nostr client designed for secure communication focus on simplicity and customizability."
-product-name = "Coop"
-version = "0.1.5"
-category = "SocialNetworking"
-identifier = "su.reya.coop"
-resources = ["assets/*/*", "Cargo.toml", "./LICENSE", "./README.md"]
-binaries = [ { path = "coop", main = true } ]
-before-packaging-command = "cargo build --release"
-out-dir = "./target/release"
-icons = [
-  "crates/coop/resources/32x32.png",
-  "crates/coop/resources/128x128.png",
-  "crates/coop/resources/128x128@2x.png",
-  "crates/coop/resources/app-icon.icns",
-  "crates/coop/resources/app-icon.png",
-  "crates/coop/resources/app-icon.ico",
-]

README.md

@@ -1,19 +1,34 @@
-![CoopDemo](/docs/coop.jpg)
+![Coop](/docs/coop.png)
 
 <p>
-    <a href="https://github.com/lumehq/coop/actions/workflows/main.yml">
-      <img alt="Actions" src="https://github.com/lumehq/coop/actions/workflows/main.yml/badge.svg">
+    <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 cross-platform Nostr client designed for secure communication focus on simplicity and customizability.
+Coop is a simple, fast, and reliable nostr client for secure messaging across all platforms.
 
-**New**✨: A blog post introducing Coop in details has been posted [here](#).
+### Screenshots
 
-> Coop is currently in the **alpha stage** of development. This means the app may contain bugs, incomplete features, or unexpected behavior. We recommend using it for testing purposes only and not for critical or sensitive communications. Your feedback is invaluable in helping us improve Coop, so please report any issues or suggestions via the [GitHub Issue Tracker](https://github.com/lumehq/coop/issues). Thank you for your understanding and support!
+<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
 
@@ -28,9 +43,7 @@ To install Coop, follow these steps:
 
    - **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.
-   - **Ubuntu**: Run the downloaded `.deb` or `.AppImage` installer and follow the on-screen instructions.
-   - **Arch Linux**: For `.tar.gz` packages, extract and install manually. For PKGBUILD, use `makepkg -si` to build and install.
-   - **Flatpak**: Coming soon.
+   - **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).
@@ -56,13 +69,25 @@ Coop is built using Rust and GPUI. All Nostr related stuffs handled by [Rust Nos
    cd coop
    ```
 
-2. Install dependencies:
+2.1 Install Linux dependencies:
+
+   ```bash
+   ./script/linux
+   ```
+
+2.2 Install FreeBSD dependencies:
+
+   ```bash
+   ./script/freebsd
+   ```
+
+3. Install Rust dependencies:
 
    ```bash
    cargo build
    ```
 
-3. Run the app:
+4. Run the app:
    ```bash
    cargo run
    ```
@@ -88,14 +113,6 @@ If you'd like to contribute to Coop, please follow these steps:
 
 For more information, see the [Contributing](#contributing) section.
 
-#### Debugging
-
-To debug Coop, you can use `cargo`'s built-in debugging tools or attach a debugger like `gdb` or `lldb`. For example:
-
-```bash
-cargo run -- --debug
-```
-
 #### Additional Resources
 
 - [Rust Nostr](https://github.com/rust-nostr/nostr/)

assets/fonts/plex-mono/license.txt

@@ -0,0 +1,92 @@
+Copyright © 2017 IBM Corp. with Reserved Font Name "Plex"
+
+This Font Software is licensed under the SIL Open Font License, Version 1.1.
+This license is copied below, and is also available with a FAQ at:
+http://scripts.sil.org/OFL
+
+-----------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+-----------------------------------------------------------
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font creation
+efforts of academic and linguistic communities, and to provide a free and
+open framework in which fonts may be shared and improved in partnership
+with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded, 
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply
+to any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software components as
+distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to, deleting,
+or substituting -- in part or in whole -- any of the components of the
+Original Version, by changing formats or by porting the Font Software to a
+new environment.
+
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed, modify,
+redistribute, and sell modified and unmodified copies of the Font
+Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components,
+in Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the corresponding
+Copyright Holder. This restriction only applies to the primary font name as
+presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder(s) and the Author(s) or with their explicit written
+permission.
+
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under any other license. The requirement for fonts to
+remain under this license does not apply to any document created
+using the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.

assets/fonts/plex-sans/license.txt

@@ -0,0 +1,92 @@
+Copyright © 2017 IBM Corp. with Reserved Font Name "Plex"
+
+This Font Software is licensed under the SIL Open Font License, Version 1.1.
+This license is copied below, and is also available with a FAQ at:
+http://scripts.sil.org/OFL
+
+-----------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+-----------------------------------------------------------
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font creation
+efforts of academic and linguistic communities, and to provide a free and
+open framework in which fonts may be shared and improved in partnership
+with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded, 
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply
+to any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software components as
+distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to, deleting,
+or substituting -- in part or in whole -- any of the components of the
+Original Version, by changing formats or by porting the Font Software to a
+new environment.
+
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed, modify,
+redistribute, and sell modified and unmodified copies of the Font
+Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components,
+in Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the corresponding
+Copyright Holder. This restriction only applies to the primary font name as
+presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder(s) and the Author(s) or with their explicit written
+permission.
+
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under any other license. The requirement for fonts to
+remain under this license does not apply to any document created
+using the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.

assets/icons/address-book.svg

@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="none" viewBox="0 0 24 24">
-  <path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="M19.25 21.25H6c-.69 0-1.25-.56-1.25-1.25M11.5 9.25h1M4.75 20V4.75a2 2 0 0 1 2-2h12.5v16H6c-.69 0-1.25.56-1.25 1.25Zm5-6.25s0-1.5 2.25-1.5 2.25 1.5 2.25 1.5h-4.5ZM13 9.25a1 1 0 1 1-2 0 1 1 0 0 1 2 0Z"/>
-</svg>

assets/icons/arrow-up-circle.svg

@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="none" viewBox="0 0 24 24">
-  <path fill="currentColor" fill-rule="evenodd" d="M2 12C2 6.477 6.477 2 12 2s10 4.477 10 10-4.477 10-10 10S2 17.523 2 12Zm6.22-1.53 3.25-3.25a.75.75 0 0 1 1.06 0l3.25 3.25a.75.75 0 1 1-1.06 1.06l-1.97-1.97v6.69a.75.75 0 0 1-1.5 0V9.56l-1.97 1.97a.75.75 0 0 1-1.06-1.06Z" clip-rule="evenodd"/>
-</svg>

assets/icons/bubble-fill.svg

@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="currentColor" viewBox="0 0 24 24">
-  <path fill="#000" fill-rule="evenodd" d="M2 12C2 6.477 6.477 2 12 2s10 4.477 10 10-4.477 10-10 10a9.967 9.967 0 0 1-4.098-.876.313.313 0 0 0-.195-.026l-3.471.78a1.75 1.75 0 0 1-2.084-2.12l.809-3.33a.313.313 0 0 0-.028-.204A9.965 9.965 0 0 1 2 12Zm4.5 0a1 1 0 1 0 2 0 1 1 0 0 0-2 0Zm4.5 0a1 1 0 1 0 2 0 1 1 0 0 0-2 0Zm5.5 1a1 1 0 1 1 0-2 1 1 0 0 1 0 2Z" clip-rule="evenodd"/>
-</svg>

assets/icons/caret-down.svg

@@ -1,3 +1,3 @@
 <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="none" viewBox="0 0 24 24">
-  <path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="m20 9-6.586 6.586a2 2 0 0 1-2.828 0L4 9"/>
+  <path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="m8 10 3.293 3.293a1 1 0 0 0 1.414 0L16 10"/>
 </svg>

assets/icons/copy.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="none" viewBox="0 0 24 24">
+  <path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="M8.75 8v.75m0-3.75v-.25a2 2 0 0 1 2-2H11m8 0h.25a2 2 0 0 1 2 2V5M14 2.75h2M21.25 8v2m0 3v.25a2 2 0 0 1-2 2H19m-3 0h-.75M14 8.75H4c-.69 0-1.25.56-1.25 1.25v10c0 .69.56 1.25 1.25 1.25h10c.69 0 1.25-.56 1.25-1.25V10c0-.69-.56-1.25-1.25-1.25Z"/>
+</svg>

assets/icons/edit-fill.svg

@@ -1,4 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="none" viewBox="0 0 24 24">
-  <path fill="currentColor" d="M4 4.75A2.75 2.75 0 0 1 6.75 2h10.5A2.75 2.75 0 0 1 20 4.75v7.917a3.9 3.9 0 0 0-4.091.909l-3.75 3.75a2.25 2.25 0 0 0-.659 1.59v2.334c0 .263.045.515.128.75H6.75A2.75 2.75 0 0 1 4 19.25V4.75Z"/>
-  <path fill="currentColor" fill-rule="evenodd" d="M19.303 15.697a.9.9 0 0 0-1.273 0l-3.53 3.53V20.5h1.273l3.53-3.53a.9.9 0 0 0 0-1.273Zm-2.333-1.06a2.4 2.4 0 1 1 3.394 3.393l-3.75 3.75a.75.75 0 0 1-.53.22H13.75a.75.75 0 0 1-.75-.75v-2.333a.75.75 0 0 1 .22-.53l3.75-3.75Z" clip-rule="evenodd"/>
-</svg>

assets/icons/edit.svg

@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="none" viewBox="0 0 24 24">
+  <path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="M10.75 21.25h-4a2 2 0 0 1-2-2V4.75a2 2 0 0 1 2-2h10.5a2 2 0 0 1 2 2v7"/>
+  <path stroke="currentColor" stroke-linecap="square" stroke-linejoin="round" stroke-width="1.5" d="M13.75 21.25v-2.333l3.75-3.75a1.65 1.65 0 0 1 2.333 2.333l-3.75 3.75H13.75Z"/>
+</svg>

assets/icons/encryption.svg

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

assets/icons/folder.svg

@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="none" viewBox="0 0 24 24">
-  <path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="M2.75 5.75v11.5a2 2 0 0 0 2 2h14.5a2 2 0 0 0 2-2v-8.5a2 2 0 0 0-2-2h-6.18a2 2 0 0 1-1.664-.89l-.812-1.22a2 2 0 0 0-1.664-.89H4.75a2 2 0 0 0-2 2Z"/>
-</svg>

assets/icons/group.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="none" viewBox="0 0 24 24">
+  <path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="M17.75 19.25h2.596c1.163 0 2.106-1.001 1.788-2.12-.733-2.573-2.465-4.38-5.134-4.38-.446 0-.866.05-1.26.147M11.25 7a3.25 3.25 0 1 1-6.5 0 3.25 3.25 0 0 1 6.5 0Zm8.5.5a2.75 2.75 0 1 1-5.5 0 2.75 2.75 0 0 1 5.5 0ZM2.08 18.126c.78-3.14 2.78-5.376 5.92-5.376s5.14 2.237 5.918 5.376c.28 1.128-.658 2.124-1.82 2.124H3.901c-1.162 0-2.1-.996-1.82-2.124Z"/>
+</svg>

assets/icons/logout.svg

@@ -1,3 +1,3 @@
 <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="none" viewBox="0 0 24 24">
-  <path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="m7.5 3.25 4.5 3.5 4.5-3.5m-11.75 17h14.5a2 2 0 0 0 2-2v-9.5a2 2 0 0 0-2-2H4.75a2 2 0 0 0-2 2v9.5a2 2 0 0 0 2 2Z"/>
+  <path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="M20.25 12H9m11.25 0-4.5 4.5m4.5-4.5-4.5-4.5m-4.5 12.75h-5.5a2 2 0 0 1-2-2V5.75a2 2 0 0 1 2-2h5.5"/>
 </svg>

assets/icons/mailbox-fill.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="currentColor" viewBox="0 0 256 256"><path d="M104,152a8,8,0,0,1-8,8H56a8,8,0,0,1,0-16H96A8,8,0,0,1,104,152ZM168,32h24a8,8,0,0,0,0-16H160a8,8,0,0,0-8,8V56h16Zm72,84v60a16,16,0,0,1-16,16H136v32a8,8,0,0,1-16,0V192H32a16,16,0,0,1-16-16V116A60.07,60.07,0,0,1,76,56h76v88a8,8,0,0,0,16,0V56h12A60.07,60.07,0,0,1,240,116Zm-120,0a44,44,0,0,0-88,0v60h88Z"></path></svg>

assets/icons/notifications.svg

@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="none" viewBox="0 0 24 24">
-  <path fill="currentColor" fill-rule="evenodd" d="M12 2a7.795 7.795 0 0 0-7.696 6.554l-1.17 7.258A2.75 2.75 0 0 0 5.848 19h1.66c.849 1.75 2.512 3 4.492 3s3.643-1.25 4.492-3h1.66a2.75 2.75 0 0 0 2.714-3.188l-1.17-7.258A7.795 7.795 0 0 0 12 2Zm2.754 17H9.245c.678.937 1.68 1.5 2.754 1.5s2.076-.563 2.754-1.5Z" clip-rule="evenodd"/>
-</svg>

assets/icons/open-url.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="none" viewBox="0 0 24 24">
+  <path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="M18.25 14v3.05c0 1.12 0 1.68-.218 2.108a2 2 0 0 1-.874.874c-.428.218-.988.218-2.108.218h-8.1c-1.12 0-1.68 0-2.108-.218a2 2 0 0 1-.874-.874c-.218-.428-.218-.988-.218-2.108V8.875c0-1.05 0-1.574.192-1.98a2 2 0 0 1 .953-.953c.406-.192.93-.192 1.98-.192H9.25m4.5-2h6.5m0 0v6.5m0-6.5L11 13"/>
+</svg>

assets/icons/plus-fill.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="none" viewBox="0 0 24 24">
+  <path fill="currentColor" fill-rule="evenodd" d="M12 6a1 1 0 0 1 1 1v4h4a1 1 0 1 1 0 2h-4v4a1 1 0 1 1-2 0v-4H7a1 1 0 1 1 0-2h4V7a1 1 0 0 1 1-1Z" clip-rule="evenodd"/>
+</svg>

assets/icons/plus.svg

@@ -1,3 +1,3 @@
 <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="none" viewBox="0 0 24 24">
-  <path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="M12 3.75V12m0 0v8.25M12 12H3.75M12 12h8.25"/>
+  <path stroke="currentColor" stroke-linecap="round" stroke-width="2" d="M12 4v8m0 0v8m0-8H4m8 0h8"/>
 </svg>

assets/icons/refresh.svg

@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="none" viewBox="0 0 24 24">
+  <path fill="currentColor" d="M13 21a1 1 0 1 0 0-2 1 1 0 0 0 0 2Zm8-10a1 1 0 1 0-2 0 1 1 0 0 0 2 0Zm-1.07 3.268a1 1 0 1 1-1 1.732 1 1 0 0 1 1-1.732Zm-2.562 5.026a1 1 0 1 0-1-1.732 1 1 0 0 0 1 1.732ZM18.927 8a1 1 0 1 1-1-1.732 1 1 0 0 1 1 1.732Z"/>
+  <path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="M9.25 14.75v5.5h-5.5M9 19.688a8.25 8.25 0 1 1 6.25-15.273"/>
+</svg>

assets/icons/reply.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="none" viewBox="0 0 24 24">
+  <path stroke="currentColor" stroke-linejoin="round" stroke-width="1.5" d="m1.845 11.45 8.146-7.535a.75.75 0 0 1 1.259.55V8c0 .276.228.5.504.504C19.84 8.632 22 11.92 22 20.25c-1.47-2.94-2.22-4.679-10.245-4.748a.501.501 0 0 0-.505.498v3.535a.75.75 0 0 1-1.26.55L1.846 12.55a.75.75 0 0 1 0-1.1Z"/>
+</svg>

assets/icons/report.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="none" viewBox="0 0 24 24">
+  <path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="m20.001 16-2 2m0 0-2 2m2-2-2-2m2 2 2 2m-8.147-6.749c-3.319.058-5.832 2.055-6.87 4.862-.41 1.105.535 2.137 1.713 2.137h5.554m-.397-6.999L12 13.25c.52 0 1.021.047 1.5.138m-1.647-.137A7.89 7.89 0 0 0 10 13.5m5.75-7a3.75 3.75 0 1 1-7.5 0 3.75 3.75 0 0 1 7.5 0Z"/>
+</svg>

assets/icons/search.svg

@@ -1,3 +1,3 @@
 <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="none" viewBox="0 0 24 24">
-  <path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="m20.25 20.25-4.123-4.123m0 0A7.25 7.25 0 1 0 5.873 5.873a7.25 7.25 0 0 0 10.253 10.253Z"/>
+  <path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="m20 20-3.873-3.873m0 0A7.25 7.25 0 1 0 5.873 5.873a7.25 7.25 0 0 0 10.253 10.253Z"/>
 </svg>

assets/icons/server.svg

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

assets/icons/settings.svg

@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="none" viewBox="0 0 24 24">
+  <path stroke="currentColor" stroke-linejoin="round" stroke-width="1.5" d="m7.878 5.214-.703-.162a1.77 1.77 0 0 0-2.123 2.123l.162.703a2 2 0 0 1-.84 2.114l-.854.57a1.728 1.728 0 0 0 0 2.876l.855.57a2 2 0 0 1 .84 2.114l-.163.703a1.77 1.77 0 0 0 2.123 2.123l.703-.162a2 2 0 0 1 2.114.84l.57.854a1.728 1.728 0 0 0 2.876 0l.57-.855a2 2 0 0 1 2.114-.84l.703.163a1.77 1.77 0 0 0 2.123-2.123l-.162-.703a2 2 0 0 1 .84-2.114l.854-.57a1.728 1.728 0 0 0 0-2.876l-.855-.57a2 2 0 0 1-.84-2.114l.163-.703a1.77 1.77 0 0 0-2.123-2.123l-.703.162a2 2 0 0 1-2.114-.84l-.57-.854a1.728 1.728 0 0 0-2.876 0l-.57.855a2 2 0 0 1-2.114.84Z"/>
+  <path stroke="currentColor" stroke-linejoin="round" stroke-width="1.5" d="M14.75 12a2.75 2.75 0 1 1-5.5 0 2.75 2.75 0 0 1 5.5 0Z"/>
+</svg>

assets/icons/signal.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="none" viewBox="0 0 24 24">
+  <path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M3 17v2m6-6v6m6-10v10m6-14v14"/>
+</svg>

assets/icons/users-three-fill.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="currentColor" viewBox="0 0 256 256"><path d="M64.12,147.8a4,4,0,0,1-4,4.2H16a8,8,0,0,1-7.8-6.17,8.35,8.35,0,0,1,1.62-6.93A67.79,67.79,0,0,1,37,117.51a40,40,0,1,1,66.46-35.8,3.94,3.94,0,0,1-2.27,4.18A64.08,64.08,0,0,0,64,144C64,145.28,64,146.54,64.12,147.8Zm182-8.91A67.76,67.76,0,0,0,219,117.51a40,40,0,1,0-66.46-35.8,3.94,3.94,0,0,0,2.27,4.18A64.08,64.08,0,0,1,192,144c0,1.28,0,2.54-.12,3.8a4,4,0,0,0,4,4.2H240a8,8,0,0,0,7.8-6.17A8.33,8.33,0,0,0,246.17,138.89Zm-89,43.18a48,48,0,1,0-58.37,0A72.13,72.13,0,0,0,65.07,212,8,8,0,0,0,72,224H184a8,8,0,0,0,6.93-12A72.15,72.15,0,0,0,157.19,182.07Z"></path></svg>

assets/icons/warning.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="none" viewBox="0 0 24 24">
+  <path stroke="currentColor" stroke-linecap="round" stroke-width="2" d="M12 9.02v2.993M12 15h.01M10.277 3.99 3.275 15.998C2.499 17.328 3.458 19 4.998 19h14.004c1.54 0 2.5-1.671 1.723-3.002L13.723 3.99c-.77-1.32-2.677-1.32-3.447 0ZM12.25 15a.25.25 0 1 1-.5 0 .25.25 0 0 1 .5 0Z"/>
+</svg>

assets/themes/catppuccin-frappe.json

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

assets/themes/catppuccin-latte.json

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

assets/themes/catppuccin-macchiato.json

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

assets/themes/catppuccin-mocha.json

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

assets/themes/flexoki.json

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

assets/themes/rose-pine-dawn.json

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

assets/themes/rose-pine-moon.json

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

assets/themes/rose-pine.json

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

crates/account/src/lib.rs

@@ -1,230 +0,0 @@
-use std::time::Duration;
-
-use anyhow::Error;
-use global::{
-    constants::{ALL_MESSAGES_SUB_ID, NEW_MESSAGE_SUB_ID},
-    get_client,
-};
-use gpui::{App, AppContext, Context, Entity, Global, Task, Window};
-use nostr_sdk::prelude::*;
-use ui::{notification::Notification, ContextModal};
-
-struct GlobalAccount(Entity<Account>);
-
-impl Global for GlobalAccount {}
-
-pub fn init(cx: &mut App) {
-    Account::set_global(cx.new(|_| Account { profile: None }), cx);
-}
-
-#[derive(Debug, Clone)]
-pub struct Account {
-    pub profile: Option<Profile>,
-}
-
-impl Account {
-    pub fn global(cx: &App) -> Entity<Self> {
-        cx.global::<GlobalAccount>().0.clone()
-    }
-
-    pub fn set_global(account: Entity<Self>, cx: &mut App) {
-        cx.set_global(GlobalAccount(account));
-    }
-
-    /// Login to the account using the given signer.
-    pub fn login<S>(&mut self, signer: S, window: &mut Window, cx: &mut Context<Self>)
-    where
-        S: NostrSigner + 'static,
-    {
-        let task: Task<Result<Profile, Error>> = cx.background_spawn(async move {
-            let client = get_client();
-            // Use user's signer for main signer
-            _ = client.set_signer(signer).await;
-
-            // Verify nostr signer and get public key
-            let signer = client.signer().await?;
-            let public_key = signer.get_public_key().await?;
-            log::info!("Logged in with public key: {:?}", public_key);
-
-            // Fetch user's metadata
-            let metadata = client
-                .fetch_metadata(public_key, Duration::from_secs(2))
-                .await?
-                .unwrap_or_default();
-
-            Ok(Profile::new(public_key, metadata))
-        });
-
-        cx.spawn_in(window, async move |this, cx| match task.await {
-            Ok(profile) => {
-                cx.update(|window, cx| {
-                    this.update(cx, |this, cx| {
-                        this.profile(profile, cx);
-
-                        cx.defer_in(window, |this, _, cx| {
-                            this.subscribe(cx);
-                        });
-                    })
-                    .ok();
-                })
-                .ok();
-            }
-            Err(e) => {
-                cx.update(|window, cx| {
-                    window.push_notification(Notification::error(e.to_string()), cx)
-                })
-                .ok();
-            }
-        })
-        .detach();
-    }
-
-    /// Create a new account with the given metadata.
-    pub fn new_account(&mut self, metadata: Metadata, window: &mut Window, cx: &mut Context<Self>) {
-        const DEFAULT_NIP_65_RELAYS: [&str; 4] = [
-            "wss://relay.damus.io",
-            "wss://relay.primal.net",
-            "wss://relay.nostr.net",
-            "wss://nos.lol",
-        ];
-
-        const DEFAULT_MESSAGING_RELAYS: [&str; 2] =
-            ["wss://auth.nostr1.com", "wss://relay.0xchat.com"];
-
-        let keys = Keys::generate();
-        let public_key = keys.public_key();
-
-        let task: Task<Result<Profile, Error>> = cx.background_spawn(async move {
-            let client = get_client();
-
-            // Update signer
-            client.set_signer(keys).await;
-
-            // Set metadata
-            client.set_metadata(&metadata).await?;
-
-            // Create relay list
-            let tags: Vec<Tag> = DEFAULT_NIP_65_RELAYS
-                .into_iter()
-                .filter_map(|url| {
-                    if let Ok(url) = RelayUrl::parse(url) {
-                        Some(Tag::relay_metadata(url, None))
-                    } else {
-                        None
-                    }
-                })
-                .collect();
-
-            let builder = EventBuilder::new(Kind::RelayList, "").tags(tags);
-
-            if let Err(e) = client.send_event_builder(builder).await {
-                log::error!("Failed to send relay list event: {}", e);
-            };
-
-            // Create messaging relay list
-            let tags: Vec<Tag> = DEFAULT_MESSAGING_RELAYS
-                .into_iter()
-                .filter_map(|url| {
-                    if let Ok(url) = RelayUrl::parse(url) {
-                        Some(Tag::relay(url))
-                    } else {
-                        None
-                    }
-                })
-                .collect();
-
-            let builder = EventBuilder::new(Kind::InboxRelays, "").tags(tags);
-
-            if let Err(e) = client.send_event_builder(builder).await {
-                log::error!("Failed to send messaging relay list event: {}", e);
-            };
-
-            Ok(Profile::new(public_key, metadata))
-        });
-
-        cx.spawn_in(window, async move |this, cx| {
-            if let Ok(profile) = task.await {
-                cx.update(|window, cx| {
-                    this.update(cx, |this, cx| {
-                        this.profile(profile, cx);
-
-                        cx.defer_in(window, |this, _, cx| {
-                            this.subscribe(cx);
-                        });
-                    })
-                    .ok();
-                })
-                .ok();
-            } else {
-                cx.update(|window, cx| {
-                    window.push_notification(Notification::error("Failed to create account."), cx)
-                })
-                .ok();
-            }
-        })
-        .detach();
-    }
-
-    /// Sets the profile for the account.
-    pub fn profile(&mut self, profile: Profile, cx: &mut Context<Self>) {
-        self.profile = Some(profile);
-        cx.notify();
-    }
-
-    /// Subscribes to the current account's metadata.
-    pub fn subscribe(&self, cx: &mut Context<Self>) {
-        let Some(profile) = self.profile.as_ref() else {
-            return;
-        };
-
-        let user = profile.public_key();
-        let opts = SubscribeAutoCloseOptions::default().exit_policy(ReqExitPolicy::ExitOnEOSE);
-
-        let metadata = Filter::new()
-            .kinds(vec![
-                Kind::Metadata,
-                Kind::ContactList,
-                Kind::InboxRelays,
-                Kind::MuteList,
-                Kind::SimpleGroups,
-            ])
-            .author(user)
-            .limit(10);
-
-        let data = Filter::new()
-            .author(user)
-            .since(Timestamp::now())
-            .kinds(vec![
-                Kind::Metadata,
-                Kind::ContactList,
-                Kind::MuteList,
-                Kind::SimpleGroups,
-                Kind::InboxRelays,
-                Kind::RelayList,
-            ]);
-
-        let msg = Filter::new().kind(Kind::GiftWrap).pubkey(user);
-        let new_msg = Filter::new().kind(Kind::GiftWrap).pubkey(user).limit(0);
-
-        let task: Task<Result<(), Error>> = cx.background_spawn(async move {
-            let client = get_client();
-            client.subscribe(metadata, Some(opts)).await?;
-            client.subscribe(data, None).await?;
-
-            let sub_id = SubscriptionId::new(ALL_MESSAGES_SUB_ID);
-            client.subscribe_with_id(sub_id, msg, Some(opts)).await?;
-
-            let sub_id = SubscriptionId::new(NEW_MESSAGE_SUB_ID);
-            client.subscribe_with_id(sub_id, new_msg, None).await?;
-
-            Ok(())
-        });
-
-        cx.spawn(async move |_, _| {
-            if let Err(e) = task.await {
-                log::error!("Error: {}", e);
-            }
-        })
-        .detach();
-    }
-}

crates/assets/Cargo.toml

@@ -0,0 +1,11 @@
+[package]
+name = "assets"
+version.workspace = true
+edition.workspace = true
+publish.workspace = true
+
+[dependencies]
+gpui.workspace = true
+anyhow.workspace = true
+log.workspace = true
+rust-embed.workspace = true

crates/assets/src/lib.rs

@@ -0,0 +1,51 @@
+use anyhow::Context;
+use gpui::{App, AssetSource, Result, SharedString};
+use rust_embed::RustEmbed;
+
+#[derive(RustEmbed)]
+#[folder = "../../assets"]
+#[include = "fonts/**/*"]
+#[include = "brand/**/*"]
+#[include = "icons/**/*"]
+#[include = "themes/**/*"]
+#[exclude = "*.DS_Store"]
+pub struct Assets;
+
+impl AssetSource for Assets {
+    fn load(&self, path: &str) -> Result<Option<std::borrow::Cow<'static, [u8]>>> {
+        Self::get(path)
+            .map(|f| Some(f.data))
+            .with_context(|| format!("loading asset at path {path:?}"))
+    }
+
+    fn list(&self, path: &str) -> Result<Vec<SharedString>> {
+        Ok(Self::iter()
+            .filter_map(|p| {
+                if p.starts_with(path) {
+                    Some(p.into())
+                } else {
+                    None
+                }
+            })
+            .collect())
+    }
+}
+
+impl Assets {
+    /// Populate the [`TextSystem`] of the given [`AppContext`] with all `.ttf` fonts in the `fonts` directory.
+    pub fn load_fonts(&self, cx: &App) -> anyhow::Result<()> {
+        let font_paths = self.list("fonts")?;
+        let mut embedded_fonts = Vec::new();
+        for font_path in font_paths {
+            if font_path.ends_with(".ttf") {
+                let font_bytes = cx
+                    .asset_source()
+                    .load(&font_path)?
+                    .expect("Assets should never return None");
+                embedded_fonts.push(font_bytes);
+            }
+        }
+
+        cx.text_system().add_fonts(embedded_fonts)
+    }
+}

crates/auto_update/Cargo.toml

@@ -1,18 +1,21 @@
-[package]
-name = "auto_update"
-version.workspace = true
-edition.workspace = true
-publish.workspace = true
-
-[dependencies]
-common = { path = "../common" }
-global = { path = "../global" }
-
-gpui.workspace = true
-nostr-sdk.workspace = true
-anyhow.workspace = true
-smol.workspace = true
-log.workspace = true
-
-tempfile = "3.19.1"
-reqwest = { version = "0.12", features = ["stream"] }
+[package]
+name = "auto_update"
+version.workspace = true
+edition.workspace = true
+publish.workspace = true
+
+[dependencies]
+common = { path = "../common" }
+state = { path = "../state" }
+
+gpui.workspace = true
+gpui_tokio.workspace = true
+reqwest.workspace = true
+nostr-sdk.workspace = true
+anyhow.workspace = true
+smol.workspace = true
+log.workspace = true
+smallvec.workspace = true
+
+semver = "1.0.27"
+tempfile = "3.23.0"

crates/auto_update/src/lib.rs

@@ -1,350 +1,494 @@
-use std::{
-    env::{self, consts::OS},
-    ffi::OsString,
-    path::PathBuf,
-};
+use std::ffi::OsString;
+use std::path::{Path, PathBuf};
+use std::sync::Arc;
+use std::time::Duration;
 
-use anyhow::{anyhow, Context as _, Error};
-use global::get_client;
-use gpui::{App, AppContext, Context, Entity, Global, SemanticVersion, Task};
+use anyhow::{anyhow, Context as AnyhowContext, Error};
+use common::BOOTSTRAP_RELAYS;
+use gpui::http_client::{AsyncBody, HttpClient};
+use gpui::{
+    App, AppContext, AsyncApp, BackgroundExecutor, Context, Entity, Global, Subscription, Task,
+};
 use nostr_sdk::prelude::*;
-use smol::{
-    fs::{self, File},
-    io::AsyncWriteExt,
-    process::Command,
-};
-use tempfile::TempDir;
+use semver::Version;
+use smallvec::{smallvec, SmallVec};
+use smol::fs::File;
+use smol::process::Command;
+use state::NostrRegistry;
 
-struct GlobalAutoUpdate(Entity<AutoUpdater>);
-
-impl Global for GlobalAutoUpdate {}
+const APP_PUBKEY: &str = "npub1y9jvl5vznq49eh9f2gj7679v4042kj80lp7p8fte3ql2cr7hty7qsyca8q";
 
 pub fn init(cx: &mut App) {
-    let env = env!("CARGO_PKG_VERSION");
-    let current_version: SemanticVersion = env.parse().expect("Invalid version in Cargo.toml");
-
-    AutoUpdater::set_global(
-        cx.new(|_| AutoUpdater {
-            current_version,
-            status: AutoUpdateStatus::Idle,
-        }),
-        cx,
-    );
+    AutoUpdater::set_global(cx.new(AutoUpdater::new), cx);
 }
 
-struct MacOsUnmounter {
-    mount_path: PathBuf,
-}
+struct GlobalAutoUpdater(Entity<AutoUpdater>);
 
-impl Drop for MacOsUnmounter {
-    fn drop(&mut self) {
-        let unmount_output = std::process::Command::new("hdiutil")
-            .args(["detach", "-force"])
-            .arg(&self.mount_path)
-            .output();
+impl Global for GlobalAutoUpdater {}
 
-        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);
-            }
-        }
+#[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()
     }
 }
 
-#[derive(Debug, Clone, PartialEq, Eq)]
+#[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,
-    Downloading,
+    Checked { files: Vec<EventId> },
     Installing,
-    Updated { binary_path: PathBuf },
-    Errored,
+    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 { .. })
+        matches!(self, Self::Updated)
+    }
+
+    pub fn checked(files: Vec<EventId>) -> Self {
+        Self::Checked { files }
+    }
+
+    pub fn error(e: String) -> Self {
+        Self::Errored { msg: Box::new(e) }
     }
 }
 
 #[derive(Debug)]
 pub struct AutoUpdater {
-    status: AutoUpdateStatus,
-    current_version: SemanticVersion,
+    /// Current status of the auto updater
+    pub status: AutoUpdateStatus,
+
+    /// Current version of the application
+    pub version: Version,
+
+    /// Event subscriptions
+    _subscriptions: SmallVec<[Subscription; 1]>,
+
+    /// Background tasks
+    _tasks: SmallVec<[Task<()>; 2]>,
 }
 
 impl AutoUpdater {
+    /// Retrieve the global auto updater instance
     pub fn global(cx: &App) -> Entity<Self> {
-        cx.global::<GlobalAutoUpdate>().0.clone()
+        cx.global::<GlobalAutoUpdater>().0.clone()
     }
 
-    pub fn set_global(auto_updater: Entity<Self>, cx: &mut App) {
-        cx.set_global(GlobalAutoUpdate(auto_updater));
+    /// Set the global auto updater instance
+    fn set_global(state: Entity<Self>, cx: &mut App) {
+        cx.set_global(GlobalAutoUpdater(state));
     }
 
-    pub fn current_version(&self) -> SemanticVersion {
-        self.current_version
+    fn new(cx: &mut Context<Self>) -> Self {
+        let version = Version::parse(env!("CARGO_PKG_VERSION")).unwrap();
+        let async_version = version.clone();
+
+        let mut subscriptions = smallvec![];
+        let mut tasks = smallvec![];
+
+        tasks.push(
+            // Subscribe to get the new update event in the bootstrap relays
+            Self::subscribe_to_updates(cx),
+        );
+
+        tasks.push(
+            // Subscribe to get the new update event in the bootstrap relays
+            cx.spawn(async move |this, cx| {
+                // Check for updates after 2 minutes
+                cx.background_executor()
+                    .timer(Duration::from_secs(120))
+                    .await;
+
+                // Update the status to checking
+                _ = this.update(cx, |this, cx| {
+                    this.set_status(AutoUpdateStatus::Checking, cx);
+                });
+
+                match Self::check_for_updates(async_version, cx).await {
+                    Ok(ids) => {
+                        // Update the status to downloading
+                        _ = this.update(cx, |this, cx| {
+                            this.set_status(AutoUpdateStatus::checked(ids), cx);
+                        });
+                    }
+                    Err(e) => {
+                        _ = this.update(cx, |this, cx| {
+                            this.set_status(AutoUpdateStatus::Idle, cx);
+                        });
+
+                        log::warn!("{e}");
+                    }
+                }
+            }),
+        );
+
+        subscriptions.push(
+            // Observe the status
+            cx.observe_self(|this, cx| {
+                if let AutoUpdateStatus::Checked { files } = this.status.clone() {
+                    this.get_latest_release(&files, cx);
+                }
+            }),
+        );
+
+        Self {
+            status: AutoUpdateStatus::Idle,
+            version,
+            _subscriptions: subscriptions,
+            _tasks: tasks,
+        }
     }
 
-    pub fn status(&self) -> AutoUpdateStatus {
-        self.status.clone()
-    }
-
-    pub fn set_status(&mut self, status: AutoUpdateStatus, cx: &mut Context<Self>) {
+    fn set_status(&mut self, status: AutoUpdateStatus, cx: &mut Context<Self>) {
         self.status = status;
         cx.notify();
     }
 
-    pub fn update(&mut self, event: Event, cx: &mut Context<Self>) {
-        self.set_status(AutoUpdateStatus::Checking, cx);
+    fn subscribe_to_updates(cx: &App) -> Task<()> {
+        let nostr = NostrRegistry::global(cx);
+        let client = nostr.read(cx).client();
 
-        // Extract the version from the identifier tag
-        let ident = match event.tags.identifier() {
-            Some(i) => match i.split('@').next_back() {
-                Some(i) => i,
-                None => return,
-            },
-            None => return,
-        };
+        cx.background_spawn(async move {
+            let opts = SubscribeAutoCloseOptions::default().exit_policy(ReqExitPolicy::ExitOnEOSE);
+            let app_pubkey = PublicKey::parse(APP_PUBKEY).unwrap();
 
-        // Convert the version string to a SemanticVersion
-        let new_version: SemanticVersion = ident.parse().expect("Invalid version");
+            let filter = Filter::new()
+                .kind(Kind::ReleaseArtifactSet)
+                .author(app_pubkey)
+                .limit(1);
 
-        // Check if the new version is the same as the current version
-        if self.current_version == new_version {
-            self.set_status(AutoUpdateStatus::Idle, cx);
-            return;
-        };
+            if let Err(e) = client
+                .subscribe_to(BOOTSTRAP_RELAYS, filter, Some(opts))
+                .await
+            {
+                log::error!("Failed to subscribe to updates: {e}");
+            };
+        })
+    }
 
-        // Download the new version
-        self.set_status(AutoUpdateStatus::Downloading, cx);
+    fn check_for_updates(version: Version, cx: &AsyncApp) -> Task<Result<Vec<EventId>, Error>> {
+        let client = cx.update(|cx| {
+            let nostr = NostrRegistry::global(cx);
+            nostr.read(cx).client()
+        });
 
-        let task: Task<Result<(TempDir, PathBuf), Error>> = cx.background_spawn(async move {
-            let client = get_client();
-            let ids = event.tags.event_ids().copied();
-            let filter = Filter::new().ids(ids).kind(Kind::FileMetadata);
+        cx.background_spawn(async move {
+            let opts = SubscribeAutoCloseOptions::default().exit_policy(ReqExitPolicy::ExitOnEOSE);
+            let app_pubkey = PublicKey::parse(APP_PUBKEY).unwrap();
+
+            let filter = Filter::new()
+                .kind(Kind::ReleaseArtifactSet)
+                .author(app_pubkey)
+                .limit(1);
+
+            if let Some(event) = client.database().query(filter).await?.first_owned() {
+                let new_version: Version = event
+                    .tags
+                    .find(TagKind::d())
+                    .and_then(|tag| tag.content())
+                    .and_then(|content| content.split("@").last())
+                    .and_then(|content| Version::parse(content).ok())
+                    .context("Failed to parse version")?;
+
+                if new_version > version {
+                    // Get all file metadata event ids
+                    let ids: Vec<EventId> = event.tags.event_ids().copied().collect();
+
+                    let filter = Filter::new()
+                        .kind(Kind::FileMetadata)
+                        .author(app_pubkey)
+                        .ids(ids.clone());
+
+                    // Get all files for this release
+                    client
+                        .subscribe_to(BOOTSTRAP_RELAYS, filter, Some(opts))
+                        .await?;
+
+                    Ok(ids)
+                } else {
+                    Err(anyhow!("No update available"))
+                }
+            } else {
+                Err(anyhow!("No update available"))
+            }
+        })
+    }
+
+    fn get_latest_release(&mut self, ids: &[EventId], cx: &mut Context<Self>) {
+        let nostr = NostrRegistry::global(cx);
+        let client = nostr.read(cx).client();
+        let http_client = cx.http_client();
+        let ids = ids.to_vec();
+
+        let task: Task<Result<(InstallerDir, PathBuf), Error>> = cx.background_spawn(async move {
+            let app_pubkey = PublicKey::parse(APP_PUBKEY).unwrap();
+            let os = std::env::consts::OS;
+
+            let filter = Filter::new()
+                .kind(Kind::FileMetadata)
+                .author(app_pubkey)
+                .ids(ids);
+
+            // Get all urls for this release
             let events = client.database().query(filter).await?;
 
-            if let Some(event) = events.into_iter().find(|event| event.content == OS) {
-                let tag = event.tags.find(TagKind::Url).context("url not found")?;
-                let url = Url::parse(tag.content().context("invalid")?)?;
-
-                let temp_dir = tempfile::Builder::new().prefix("coop-update").tempdir()?;
-                let filename = match OS {
-                    "macos" => Ok("Coop.dmg"),
-                    "linux" => Ok("Coop.tar.gz"),
-                    "windows" => Ok("CoopUpdateInstaller.exe"),
-                    _ => Err(anyhow!("not supported: {:?}", OS)),
-                }?;
-
-                let downloaded_asset = temp_dir.path().join(filename);
-                let mut target_file = File::create(&downloaded_asset).await?;
-
-                let response = reqwest::get(url).await?;
-                let mut stream = response.bytes_stream();
-
-                while let Some(item) = stream.next().await {
-                    let chunk = item?;
-                    target_file.write_all(&chunk).await?;
+            for event in events.into_iter() {
+                // Only process events that match current platform
+                if event.content != os {
+                    continue;
                 }
 
-                log::info!("downloaded update. path:{:?}", downloaded_asset);
+                // Parse the url
+                let url = event
+                    .tags
+                    .find(TagKind::Url)
+                    .and_then(|tag| tag.content())
+                    .and_then(|content| Url::parse(content).ok())
+                    .context("Failed to parse url")?;
 
-                Ok((temp_dir, downloaded_asset))
-            } else {
-                Err(anyhow!("Not found"))
+                let installer_dir = InstallerDir::new().await?;
+                let target_path = Self::target_path(&installer_dir).await?;
+
+                // Download the release
+                download(url.as_str(), &target_path, http_client).await?;
+
+                return Ok((installer_dir, target_path));
             }
+
+            Err(anyhow!("Failed to get latest release"))
         });
 
-        cx.spawn(async move |this, cx| {
-            if let Ok((temp_dir, downloaded_asset)) = task.await {
-                cx.update(|cx| {
-                    this.update(cx, |this, cx| {
-                        this.set_status(AutoUpdateStatus::Installing, cx);
+        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 OS {
-                            "macos" => this.install_release_macos(temp_dir, downloaded_asset, cx),
-                            "linux" => this.install_release_linux(temp_dir, downloaded_asset, cx),
-                            "windows" => this.install_release_windows(downloaded_asset, 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);
+                            });
                         }
-                    })
-                    .ok();
-                })
-                .ok();
-            }
-        })
-        .detach();
+                    }
+                    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);
+                        });
+                    }
+                }
+            }),
+        );
     }
 
-    fn install_release_macos(&mut self, temp_dir: TempDir, asset: PathBuf, cx: &mut Context<Self>) {
-        let running_app_path = cx.app_path().unwrap();
-        let running_app_filename = running_app_path.file_name().unwrap();
+    async fn target_path(installer_dir: &InstallerDir) -> Result<PathBuf, Error> {
+        let filename = match std::env::consts::OS {
+            "macos" => anyhow::Ok("Coop.dmg"),
+            "windows" => Ok("Coop.exe"),
+            unsupported_os => anyhow::bail!("not supported: {unsupported_os}"),
+        }?;
 
-        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 task: Task<Result<PathBuf, Error>> = cx.background_spawn(async move {
-            let output = Command::new("hdiutil")
-                .args(["attach", "-nobrowse"])
-                .arg(&asset)
-                .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(),
-            };
-
-            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(running_app_path)
-        });
-
-        cx.spawn(async move |this, cx| {
-            if let Ok(binary_path) = task.await {
-                cx.update(|cx| {
-                    this.update(cx, |this, cx| {
-                        this.status = AutoUpdateStatus::Updated { binary_path };
-                        cx.notify();
-                    })
-                    .ok();
-                })
-                .ok();
-            }
-        })
-        .detach();
+        Ok(installer_dir.path().join(filename))
     }
 
-    fn install_release_linux(&mut self, temp_dir: TempDir, asset: PathBuf, cx: &mut Context<Self>) {
-        let home_dir = PathBuf::from(env::var("HOME").unwrap());
-        let running_app_path = cx.app_path().unwrap();
-        let extracted = temp_dir.path().join("coop");
-
-        let task: Task<Result<PathBuf, Error>> = cx.background_spawn(async move {
-            fs::create_dir_all(&extracted).await?;
-
-            let output = Command::new("tar")
-                .arg("-xzf")
-                .arg(&asset)
-                .arg("-C")
-                .arg(&extracted)
-                .output()
-                .await?;
-
-            anyhow::ensure!(
-                output.status.success(),
-                "failed to extract {:?} to {:?}: {:?}",
-                asset,
-                extracted,
-                String::from_utf8_lossy(&output.stderr)
-            );
-
-            let app_folder_name: String = "coop.app".into();
-            let from = extracted.join(&app_folder_name);
-            let mut to = home_dir.join(".local");
-
-            let expected_suffix = format!("{}/libexec/coop", app_folder_name);
-
-            if let Some(prefix) = running_app_path
-                .to_str()
-                .and_then(|str| str.strip_suffix(&expected_suffix))
-            {
-                to = PathBuf::from(prefix);
-            }
-
-            let output = Command::new("rsync")
-                .args(["-av", "--delete"])
-                .arg(&from)
-                .arg(&to)
-                .output()
-                .await?;
-
-            anyhow::ensure!(
-                output.status.success(),
-                "failed to copy Coop update from {:?} to {:?}: {:?}",
-                from,
-                to,
-                String::from_utf8_lossy(&output.stderr)
-            );
-
-            Ok(to.join(expected_suffix))
-        });
-
-        cx.spawn(async move |this, cx| {
-            if let Ok(binary_path) = task.await {
-                cx.update(|cx| {
-                    this.update(cx, |this, cx| {
-                        this.status = AutoUpdateStatus::Updated { binary_path };
-                        cx.notify();
-                    })
-                    .ok();
-                })
-                .ok();
-            }
-        })
-        .detach();
-    }
-
-    fn install_release_windows(&mut self, asset: PathBuf, cx: &mut Context<Self>) {
-        let task: Task<Result<PathBuf, Error>> = cx.background_spawn(async move {
-            let output = Command::new(asset)
-                .arg("/verysilent")
-                .arg("/update=true")
-                .arg("!desktopicon")
-                .arg("!quicklaunchicon")
-                .output()
-                .await?;
-            anyhow::ensure!(
-                output.status.success(),
-                "failed to start installer: {:?}",
-                String::from_utf8_lossy(&output.stderr)
-            );
-            Ok(std::env::current_exe()?)
-        });
-
-        cx.spawn(async move |this, cx| {
-            if let Ok(binary_path) = task.await {
-                cx.update(|cx| {
-                    this.update(cx, |this, cx| {
-                        this.status = AutoUpdateStatus::Updated { binary_path };
-                        cx.notify();
-                    })
-                    .ok();
-                })
-                .ok();
-            }
-        })
-        .detach();
+    async fn install(
+        installer_dir: InstallerDir,
+        target_path: PathBuf,
+        cx: &AsyncApp,
+    ) -> Result<(), Error> {
+        match std::env::consts::OS {
+            "macos" => install_release_macos(&installer_dir, target_path, cx).await,
+            "windows" => install_release_windows(target_path).await,
+            unsupported_os => anyhow::bail!("Not supported: {unsupported_os}"),
+        }
     }
 }
+
+async fn download(
+    url: &str,
+    target_path: &std::path::Path,
+    client: Arc<dyn HttpClient>,
+) -> Result<(), Error> {
+    let body = AsyncBody::default();
+    let mut target_file = File::create(&target_path).await?;
+    let mut response = client.get(url, body, true).await?;
+
+    // Copy the response body to the target file
+    smol::io::copy(response.body_mut(), &mut target_file).await?;
+
+    Ok(())
+}
+
+async fn install_release_macos(
+    temp_dir: &InstallerDir,
+    downloaded_dmg: PathBuf,
+    cx: &AsyncApp,
+) -> Result<(), Error> {
+    let running_app_path = cx.update(|cx| cx.app_path())?;
+    let running_app_filename = running_app_path
+        .file_name()
+        .with_context(|| format!("invalid running app path {running_app_path:?}"))?;
+
+    let mount_path = temp_dir.path().join("Coop");
+    let mut mounted_app_path: OsString = mount_path.join(running_app_filename).into();
+
+    mounted_app_path.push("/");
+
+    let output = Command::new("hdiutil")
+        .args(["attach", "-nobrowse"])
+        .arg(&downloaded_dmg)
+        .arg("-mountroot")
+        .arg(temp_dir.path())
+        .output()
+        .await?;
+
+    anyhow::ensure!(
+        output.status.success(),
+        "failed to mount: {:?}",
+        String::from_utf8_lossy(&output.stderr)
+    );
+
+    // Create an MacOsUnmounter that will be dropped (and thus unmount the disk) when this function exits
+    let _unmounter = MacOsUnmounter {
+        mount_path: mount_path.clone(),
+        background_executor: cx.background_executor(),
+    };
+
+    let output = Command::new("rsync")
+        .args(["-av", "--delete"])
+        .arg(&mounted_app_path)
+        .arg(&running_app_path)
+        .output()
+        .await?;
+
+    anyhow::ensure!(
+        output.status.success(),
+        "failed to copy app: {:?}",
+        String::from_utf8_lossy(&output.stderr)
+    );
+
+    Ok(())
+}
+
+async fn install_release_windows(downloaded_installer: PathBuf) -> Result<(), Error> {
+    //const CREATE_NO_WINDOW: u32 = 0x08000000;
+
+    let system_root = std::env::var("SYSTEMROOT");
+    let powershell_path = system_root.as_ref().map_or_else(
+        |_| "powershell.exe".to_string(),
+        |p| format!("{p}\\System32\\WindowsPowerShell\\v1.0\\powershell.exe"),
+    );
+
+    let mut installer_path = std::ffi::OsString::new();
+    installer_path.push("\"");
+    installer_path.push(&downloaded_installer);
+    installer_path.push("\"");
+
+    let output = Command::new(powershell_path)
+        //.creation_flags(CREATE_NO_WINDOW)
+        .args(["-NoProfile", "-WindowStyle", "Hidden"])
+        .args(["Start-Process"])
+        .arg(installer_path)
+        .arg("-ArgumentList")
+        .args(["/P", "/R"])
+        .output()
+        .await?;
+
+    anyhow::ensure!(
+        output.status.success(),
+        "failed to start installer: {:?}",
+        String::from_utf8_lossy(&output.stderr)
+    );
+
+    Ok(())
+}

crates/chat/Cargo.toml

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

crates/chat/src/lib.rs

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

crates/chat/src/message.rs

@@ -0,0 +1,212 @@
+use std::hash::Hash;
+
+use nostr_sdk::prelude::*;
+
+/// New message.
+#[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord)]
+pub struct NewMessage {
+    pub gift_wrap: EventId,
+    pub rumor: UnsignedEvent,
+}
+
+impl NewMessage {
+    pub fn new(gift_wrap: EventId, rumor: UnsignedEvent) -> Self {
+        Self { gift_wrap, rumor }
+    }
+}
+
+/// Message.
+#[derive(Debug, Clone, Hash, PartialEq, Eq)]
+pub enum Message {
+    User(RenderedMessage),
+    Warning(String, Timestamp),
+    System(Timestamp),
+}
+
+impl Message {
+    pub fn user<I>(user: I) -> Self
+    where
+        I: Into<RenderedMessage>,
+    {
+        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,
+        }
+    }
+}
+
+impl From<&NewMessage> for Message {
+    fn from(val: &NewMessage) -> Self {
+        Self::User(val.into())
+    }
+}
+
+impl From<&UnsignedEvent> for Message {
+    fn from(val: &UnsignedEvent) -> Self {
+        Self::User(val.into())
+    }
+}
+
+impl Ord for Message {
+    fn cmp(&self, other: &Self) -> std::cmp::Ordering {
+        match (self, other) {
+            // 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<PublicKey> {
+    let parser = NostrParser::new();
+    let tokens = parser.parse(content);
+
+    tokens
+        .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::<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.filter(TagKind::e()) {
+        if let Some(id) = tag.content().and_then(|id| EventId::parse(id).ok()) {
+            replies_to.push(id);
+        }
+    }
+
+    for tag in inner.filter(TagKind::q()) {
+        if let Some(id) = tag.content().and_then(|id| EventId::parse(id).ok()) {
+            replies_to.push(id);
+        }
+    }
+
+    replies_to
+}

crates/chat/src/room.rs

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

crates/chat_ui/Cargo.toml

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

crates/chat_ui/src/actions.rs

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

crates/chat_ui/src/emoji.rs

@@ -1,35 +1,20 @@
-use std::rc::Rc;
+use std::sync::OnceLock;
 
+use gpui::prelude::FluentBuilder;
 use gpui::{
-    div, impl_internal_actions, prelude::FluentBuilder, px, App, AppContext, Corner, Element,
-    InteractiveElement, IntoElement, ParentElement, RenderOnce, SharedString,
-    StatefulInteractiveElement, Styled, WeakEntity, Window,
+    div, px, App, AppContext, Corner, Element, InteractiveElement, IntoElement, ParentElement,
+    RenderOnce, SharedString, StatefulInteractiveElement, Styled, WeakEntity, Window,
 };
-use serde::Deserialize;
+use theme::ActiveTheme;
+use ui::button::{Button, ButtonVariants};
+use ui::input::InputState;
+use ui::popover::{Popover, PopoverContent};
+use ui::{Icon, Sizable, Size};
 
-use crate::{
-    button::{Button, ButtonVariants},
-    input::TextInput,
-    popover::{Popover, PopoverContent},
-    theme::{scale::ColorScaleStep, ActiveTheme},
-    Icon,
-};
+static EMOJIS: OnceLock<Vec<SharedString>> = OnceLock::new();
 
-#[derive(PartialEq, Clone, Debug, Deserialize)]
-pub struct EmitEmoji(pub SharedString);
-
-impl_internal_actions!(emoji, [EmitEmoji]);
-
-#[derive(IntoElement)]
-pub struct EmojiPicker {
-    icon: Option<Icon>,
-    anchor: Option<Corner>,
-    input: WeakEntity<TextInput>,
-    emojis: Rc<Vec<SharedString>>,
-}
-
-impl EmojiPicker {
-    pub fn new(input: WeakEntity<TextInput>) -> Self {
+fn get_emojis() -> &'static Vec<SharedString> {
+    EMOJIS.get_or_init(|| {
         let mut emojis: Vec<SharedString> = vec![];
 
         emojis.extend(
@@ -39,35 +24,55 @@ impl EmojiPicker {
                 .collect::<Vec<SharedString>>(),
         );
 
-        emojis.extend(
-            emojis::Group::Symbols
-                .emojis()
-                .map(|e| SharedString::from(e.as_str()))
-                .collect::<Vec<SharedString>>(),
-        );
+        emojis
+    })
+}
 
+#[derive(IntoElement)]
+pub struct EmojiPicker {
+    target: Option<WeakEntity<InputState>>,
+    icon: Option<Icon>,
+    anchor: Option<Corner>,
+    size: Size,
+}
+
+impl EmojiPicker {
+    pub fn new() -> Self {
         Self {
-            input,
-            emojis: emojis.into(),
+            size: Size::default(),
+            target: None,
             anchor: None,
             icon: None,
         }
     }
 
+    pub fn target(mut self, target: WeakEntity<InputState>) -> Self {
+        self.target = Some(target);
+        self
+    }
+
     pub fn icon(mut self, icon: impl Into<Icon>) -> Self {
         self.icon = Some(icon.into());
         self
     }
 
+    #[allow(dead_code)]
     pub fn anchor(mut self, corner: Corner) -> Self {
         self.anchor = Some(corner);
         self
     }
 }
 
+impl Sizable for EmojiPicker {
+    fn with_size(mut self, size: impl Into<Size>) -> Self {
+        self.size = size.into();
+        self
+    }
+}
+
 impl RenderOnce for EmojiPicker {
     fn render(self, _window: &mut Window, _cx: &mut App) -> impl IntoElement {
-        Popover::new("emoji-picker")
+        Popover::new("emojis")
             .map(|this| {
                 if let Some(corner) = self.anchor {
                     this.anchor(corner)
@@ -76,13 +81,13 @@ impl RenderOnce for EmojiPicker {
                 }
             })
             .trigger(
-                Button::new("emoji-trigger")
+                Button::new("emojis-trigger")
                     .when_some(self.icon, |this, icon| this.icon(icon))
-                    .ghost(),
+                    .ghost()
+                    .with_size(self.size),
             )
             .content(move |window, cx| {
-                let emojis = self.emojis.clone();
-                let input = self.input.clone();
+                let input = self.target.clone();
 
                 cx.new(|cx| {
                     PopoverContent::new(window, cx, move |_window, cx| {
@@ -91,7 +96,7 @@ impl RenderOnce for EmojiPicker {
                             .flex_wrap()
                             .items_center()
                             .gap_2()
-                            .children(emojis.iter().map(|e| {
+                            .children(get_emojis().iter().map(|e| {
                                 div()
                                     .id(e.clone())
                                     .flex_auto()
@@ -99,27 +104,25 @@ impl RenderOnce for EmojiPicker {
                                     .flex()
                                     .items_center()
                                     .justify_center()
-                                    .rounded(px(cx.theme().radius))
+                                    .rounded(cx.theme().radius)
                                     .child(e.clone())
-                                    .hover(|this| {
-                                        this.bg(cx.theme().base.step(cx, ColorScaleStep::THREE))
-                                    })
+                                    .hover(|this| this.bg(cx.theme().ghost_element_hover))
                                     .on_click({
                                         let item = e.clone();
-                                        let input = input.upgrade();
+                                        let input = input.clone();
 
                                         move |_, window, cx| {
                                             if let Some(input) = input.as_ref() {
-                                                input.update(cx, |this, cx| {
-                                                    let current = this.text();
-                                                    let new_text = if current.is_empty() {
-                                                        format!("{}", item)
-                                                    } else if current.ends_with(" ") {
-                                                        format!("{}{}", current, item)
+                                                _ = input.update(cx, |this, cx| {
+                                                    let value = this.value();
+                                                    let new_text = if value.is_empty() {
+                                                        format!("{item}")
+                                                    } else if value.ends_with(" ") {
+                                                        format!("{value}{item}")
                                                     } else {
-                                                        format!("{} {}", current, item)
+                                                        format!("{value} {item}")
                                                     };
-                                                    this.set_text(new_text, window, cx);
+                                                    this.set_value(new_text, window, cx);
                                                 });
                                             }
                                         }

crates/chat_ui/src/subject.rs

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

crates/chat_ui/src/text.rs

@@ -0,0 +1,323 @@
+use std::ops::Range;
+use std::sync::Arc;
+
+use gpui::{
+    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;
+
+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());
+
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub enum Highlight {
+    Link,
+    Nostr,
+}
+
+#[derive(Default)]
+pub struct RenderedText {
+    pub text: SharedString,
+    pub highlights: Vec<(Range<usize>, Highlight)>,
+    pub link_ranges: Vec<Range<usize>>,
+    pub link_urls: Arc<[String]>,
+}
+
+impl RenderedText {
+    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_plain_text_mut(
+            content,
+            &mut text,
+            &mut highlights,
+            &mut link_ranges,
+            &mut link_urls,
+            cx,
+        );
+
+        text.truncate(text.trim_end().len());
+
+        RenderedText {
+            text: SharedString::from(text),
+            link_urls: link_urls.into(),
+            link_ranges,
+            highlights,
+        }
+    }
+
+    pub fn element(&self, id: ElementId, window: &Window, cx: &App) -> AnyElement {
+        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::Link => HighlightStyle {
+                                color: Some(link_color),
+                                underline: Some(UnderlineStyle::default()),
+                                ..Default::default()
+                            },
+                            Highlight::Nostr => HighlightStyle {
+                                color: Some(link_color),
+                                ..Default::default()
+                            },
+                        },
+                    )
+                }),
+            ),
+        )
+        .on_click(self.link_ranges.clone(), {
+            let link_urls = self.link_urls.clone();
+            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}")
+                }
+            }
+        })
+        .into_any_element()
+    }
+}
+
+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>,
+    cx: &App,
+) {
+    // Copy the content directly
+    text.push_str(content);
+
+    // Collect all URLs
+    let mut url_matches: Vec<(Range<usize>, String)> = Vec::new();
+
+    for link in URL_REGEX.find_iter(content) {
+        let range = link.start()..link.end();
+        let url = link.as_str().to_string();
+
+        url_matches.push((range, url));
+    }
+
+    // Collect all nostr entities with nostr: prefix
+    let mut nostr_matches: Vec<(Range<usize>, String)> = Vec::new();
+
+    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();
+
+        // 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));
+        }
+    }
+
+    // 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);
+
+    // 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));
+
+    // 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;
+        };
+
+        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,
+                    );
+                }
+            }
+        }
+    }
+}
+
+/// 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>,
+) {
+    let njump_url = format!("https://njump.me/{bech32}");
+    let shortened_entity = format_shortened_entity(&bech32);
+    let display_text = format!("https://njump.me/{shortened_entity}");
+
+    text.replace_range(range.clone(), &display_text);
+
+    let new_length = display_text.len();
+    let length_diff = new_length as isize - (range.end - range.start) as isize;
+    let new_range = range.start..(range.start + new_length);
+
+    highlights.push((new_range.clone(), Highlight::Link));
+    link_ranges.push(new_range);
+    link_urls.push(njump_url);
+
+    if length_diff != 0 {
+        adjust_ranges(highlights, link_ranges, range.end, length_diff);
+    }
+}
+
+// Helper function to adjust ranges when text length changes
+fn adjust_ranges(
+    highlights: &mut [(Range<usize>, Highlight)],
+    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;
+        }
+    }
+
+    // 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;
+        }
+    }
+}

crates/chats/src/constants.rs

@@ -1,5 +0,0 @@
-pub(crate) const NOW: &str = "now";
-pub(crate) const SECONDS_IN_MINUTE: i64 = 60;
-pub(crate) const MINUTES_IN_HOUR: i64 = 60;
-pub(crate) const HOURS_IN_DAY: i64 = 24;
-pub(crate) const DAYS_IN_MONTH: i64 = 30;

crates/chats/src/lib.rs

@@ -1,307 +0,0 @@
-use std::{cmp::Reverse, collections::HashMap};
-
-use anyhow::{anyhow, Error};
-use common::room_hash;
-use global::get_client;
-use gpui::{App, AppContext, Context, Entity, Global, Subscription, Task, Window};
-use itertools::Itertools;
-use nostr_sdk::prelude::*;
-use room::RoomKind;
-use smallvec::{smallvec, SmallVec};
-
-use crate::room::Room;
-
-mod constants;
-pub mod message;
-pub mod room;
-
-pub fn init(cx: &mut App) {
-    ChatRegistry::set_global(cx.new(ChatRegistry::new), cx);
-}
-
-struct GlobalChatRegistry(Entity<ChatRegistry>);
-
-impl Global for GlobalChatRegistry {}
-
-/// Main registry for managing chat rooms and user profiles
-///
-/// The ChatRegistry is responsible for:
-/// - Managing chat rooms and their states
-/// - Tracking user profiles
-/// - Loading room data from the lmdb
-/// - Handling messages and room creation
-pub struct ChatRegistry {
-    /// Collection of all chat rooms
-    rooms: Vec<Entity<Room>>,
-
-    /// Map of user public keys to their profile metadata
-    profiles: Entity<HashMap<PublicKey, Option<Metadata>>>,
-
-    /// Indicates if rooms are currently being loaded
-    loading: bool,
-
-    /// Subscriptions for observing changes
-    #[allow(dead_code)]
-    subscriptions: SmallVec<[Subscription; 1]>,
-}
-
-impl ChatRegistry {
-    /// Retrieve the global ChatRegistry instance
-    pub fn global(cx: &App) -> Entity<Self> {
-        cx.global::<GlobalChatRegistry>().0.clone()
-    }
-
-    /// Set the global ChatRegistry instance
-    pub fn set_global(state: Entity<Self>, cx: &mut App) {
-        cx.set_global(GlobalChatRegistry(state));
-    }
-
-    /// Create a new ChatRegistry instance
-    fn new(cx: &mut Context<Self>) -> Self {
-        let profiles = cx.new(|_| HashMap::new());
-        let mut subscriptions = smallvec![];
-
-        // Observe new Room creations to collect profile metadata
-        subscriptions.push(cx.observe_new::<Room>(|this, _, cx| {
-            let task = this.metadata(cx);
-
-            cx.spawn(async move |_, cx| {
-                if let Ok(data) = task.await {
-                    cx.update(|cx| {
-                        for (public_key, metadata) in data.into_iter() {
-                            Self::global(cx).update(cx, |this, cx| {
-                                this.add_profile(public_key, metadata, cx);
-                            })
-                        }
-                    })
-                    .ok();
-                }
-            })
-            .detach();
-        }));
-
-        Self {
-            rooms: vec![],
-            loading: true,
-            profiles,
-            subscriptions,
-        }
-    }
-
-    /// Get the global loading status
-    pub fn loading(&self) -> bool {
-        self.loading
-    }
-
-    /// Get a room by its ID.
-    pub fn room(&self, id: &u64, cx: &App) -> Option<Entity<Room>> {
-        self.rooms
-            .iter()
-            .find(|model| model.read(cx).id == *id)
-            .cloned()
-    }
-
-    /// Get all rooms grouped by their kind.
-    pub fn rooms(&self, cx: &App) -> HashMap<RoomKind, Vec<&Entity<Room>>> {
-        let mut groups = HashMap::new();
-        groups.insert(RoomKind::Ongoing, Vec::new());
-        groups.insert(RoomKind::Trusted, Vec::new());
-        groups.insert(RoomKind::Unknown, Vec::new());
-
-        for room in self.rooms.iter() {
-            let kind = room.read(cx).kind;
-            groups.entry(kind).or_insert_with(Vec::new).push(room);
-        }
-
-        groups
-    }
-
-    /// Get rooms by their kind.
-    pub fn rooms_by_kind(&self, kind: RoomKind, cx: &App) -> Vec<&Entity<Room>> {
-        self.rooms
-            .iter()
-            .filter(|room| room.read(cx).kind == kind)
-            .collect()
-    }
-
-    /// Get the IDs of all rooms.
-    pub fn room_ids(&self, cx: &mut Context<Self>) -> Vec<u64> {
-        self.rooms.iter().map(|room| room.read(cx).id).collect()
-    }
-
-    /// Load all rooms from the lmdb.
-    ///
-    /// This method:
-    /// 1. Fetches all private direct messages from the lmdb
-    /// 2. Groups them by ID
-    /// 3. Determines each room's type based on message frequency and trust status
-    /// 4. Creates Room entities for each unique room
-    pub fn load_rooms(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        type Rooms = Vec<(Event, usize, bool)>;
-
-        let task: Task<Result<Rooms, Error>> = cx.background_spawn(async move {
-            let client = get_client();
-            let signer = client.signer().await?;
-            let public_key = signer.get_public_key().await?;
-
-            // Get messages sent by the user
-            let send = Filter::new()
-                .kind(Kind::PrivateDirectMessage)
-                .author(public_key);
-
-            // Get messages received by the user
-            let recv = Filter::new()
-                .kind(Kind::PrivateDirectMessage)
-                .pubkey(public_key);
-
-            let send_events = client.database().query(send).await?;
-            let recv_events = client.database().query(recv).await?;
-            let events = send_events.merge(recv_events);
-
-            let mut room_map: HashMap<u64, (Event, usize, bool)> = HashMap::new();
-
-            // Process each event and group by room hash
-            for event in events
-                .into_iter()
-                .filter(|ev| ev.tags.public_keys().peekable().peek().is_some())
-            {
-                let hash = room_hash(&event);
-
-                let filter = Filter::new().kind(Kind::ContactList).pubkey(event.pubkey);
-                let is_trust = client.database().count(filter).await? >= 1;
-
-                room_map
-                    .entry(hash)
-                    .and_modify(|(_, count, trusted)| {
-                        *count += 1;
-                        *trusted = is_trust;
-                    })
-                    .or_insert((event, 1, is_trust));
-            }
-
-            // Sort rooms by creation date (newest first)
-            let result: Vec<(Event, usize, bool)> = room_map
-                .into_values()
-                .sorted_by_key(|(ev, _, _)| Reverse(ev.created_at))
-                .collect();
-
-            Ok(result)
-        });
-
-        cx.spawn_in(window, async move |this, cx| {
-            if let Ok(events) = task.await {
-                cx.update(|_, cx| {
-                    this.update(cx, |this, cx| {
-                        let ids = this.room_ids(cx);
-                        let rooms: Vec<Entity<Room>> = events
-                            .into_iter()
-                            .filter_map(|(event, count, trusted)| {
-                                let hash = room_hash(&event);
-                                if !ids.iter().any(|this| this == &hash) {
-                                    let kind = if count > 2 {
-                                        // If frequency count is greater than 2, mark this room as ongoing
-                                        RoomKind::Ongoing
-                                    } else if trusted {
-                                        RoomKind::Trusted
-                                    } else {
-                                        RoomKind::Unknown
-                                    };
-                                    Some(cx.new(|_| Room::new(&event).kind(kind)))
-                                } else {
-                                    None
-                                }
-                            })
-                            .collect();
-
-                        this.rooms.extend(rooms);
-                        this.rooms.sort_by_key(|r| Reverse(r.read(cx).created_at));
-                        this.loading = false;
-
-                        cx.notify();
-                    })
-                    .ok();
-                })
-                .ok();
-            }
-        })
-        .detach();
-    }
-
-    /// Add a user profile to the registry
-    ///
-    /// Only adds the profile if it doesn't already exist or is currently none
-    pub fn add_profile(
-        &mut self,
-        public_key: PublicKey,
-        metadata: Option<Metadata>,
-        cx: &mut Context<Self>,
-    ) {
-        self.profiles.update(cx, |this, _cx| {
-            this.entry(public_key)
-                .and_modify(|entry| {
-                    if entry.is_none() {
-                        *entry = metadata.clone();
-                    }
-                })
-                .or_insert_with(|| metadata);
-        });
-    }
-
-    /// Get a user profile by public key
-    pub fn profile(&self, public_key: &PublicKey, cx: &App) -> Profile {
-        let metadata = if let Some(profile) = self.profiles.read(cx).get(public_key) {
-            profile.clone().unwrap_or_default()
-        } else {
-            Metadata::default()
-        };
-
-        Profile::new(*public_key, metadata)
-    }
-
-    /// Add a new room to the registry
-    ///
-    /// Returns an error if the room already exists
-    pub fn push(&mut self, room: Room, cx: &mut Context<Self>) -> Result<(), anyhow::Error> {
-        let room = cx.new(|_| room);
-
-        if !self
-            .rooms
-            .iter()
-            .any(|current| current.read(cx) == room.read(cx))
-        {
-            self.rooms.insert(0, room);
-            cx.notify();
-
-            Ok(())
-        } else {
-            Err(anyhow!("Room already exists"))
-        }
-    }
-
-    /// Push a new message to a room
-    ///
-    /// If the room doesn't exist, it will be created.
-    /// Updates room ordering based on the most recent messages.
-    pub fn push_message(&mut self, event: Event, window: &mut Window, cx: &mut Context<Self>) {
-        let id = room_hash(&event);
-
-        if let Some(room) = self.rooms.iter().find(|room| room.read(cx).id == id) {
-            room.update(cx, |this, cx| {
-                this.created_at(event.created_at, cx);
-
-                cx.defer_in(window, |this, window, cx| {
-                    this.emit_message(event, window, cx);
-                });
-            });
-
-            cx.defer_in(window, |this, _, cx| {
-                this.rooms
-                    .sort_by_key(|room| Reverse(room.read(cx).created_at));
-            });
-        } else {
-            // Push the new room to the front of the list
-            self.rooms.insert(0, cx.new(|_| Room::new(&event)));
-            cx.notify();
-        }
-    }
-}

crates/chats/src/message.rs

@@ -1,145 +0,0 @@
-use chrono::{Local, TimeZone};
-use gpui::SharedString;
-use nostr_sdk::prelude::*;
-
-/// # Message
-///
-/// Represents a message in the application.
-///
-/// ## Fields
-///
-/// - `id`: The unique identifier for the message
-/// - `content`: The text content of the message
-/// - `author`: Profile information about who created the message
-/// - `mentions`: List of profiles mentioned in the message
-/// - `created_at`: Timestamp when the message was created
-#[derive(Debug, Clone, PartialEq, Eq)]
-pub struct Message {
-    pub id: EventId,
-    pub content: String,
-    pub author: Profile,
-    pub mentions: Vec<Profile>,
-    pub created_at: Timestamp,
-}
-
-impl Message {
-    /// Creates a new message with the provided details
-    ///
-    /// # Arguments
-    ///
-    /// * `id` - Unique event identifier
-    /// * `content` - Message text content
-    /// * `author` - Profile of the message author
-    /// * `created_at` - When the message was created
-    ///
-    /// # Returns
-    ///
-    /// A new `Message` instance
-    pub fn new(id: EventId, content: String, author: Profile, created_at: Timestamp) -> Self {
-        Self {
-            id,
-            content,
-            author,
-            created_at,
-            mentions: vec![],
-        }
-    }
-
-    /// Adds or replaces mentions in the message
-    ///
-    /// # Arguments
-    ///
-    /// * `mentions` - New list of mentioned profiles
-    ///
-    /// # Returns
-    ///
-    /// The same message with updated mentions
-    pub fn with_mentions(mut self, mentions: impl IntoIterator<Item = Profile>) -> Self {
-        self.mentions.extend(mentions);
-        self
-    }
-
-    /// Formats the message timestamp as a human-readable relative time
-    ///
-    /// # Returns
-    ///
-    /// A formatted string like "Today at 12:30 PM", "Yesterday at 3:45 PM",
-    /// or a date and time for older messages
-    pub fn ago(&self) -> SharedString {
-        let input_time = match Local.timestamp_opt(self.created_at.as_u64() as i64, 0) {
-            chrono::LocalResult::Single(time) => time,
-            _ => return "Invalid timestamp".into(),
-        };
-
-        let now = Local::now();
-        let input_date = input_time.date_naive();
-        let now_date = now.date_naive();
-        let yesterday_date = (now - chrono::Duration::days(1)).date_naive();
-
-        let time_format = input_time.format("%H:%M %p");
-
-        match input_date {
-            date if date == now_date => format!("Today at {time_format}"),
-            date if date == yesterday_date => format!("Yesterday at {time_format}"),
-            _ => format!("{}, {time_format}", input_time.format("%d/%m/%y")),
-        }
-        .into()
-    }
-}
-
-/// # RoomMessage
-///
-/// Represents different types of messages that can appear in a room.
-///
-/// ## Variants
-///
-/// - `User`: A message sent by a user
-/// - `System`: A message generated by the system
-/// - `Announcement`: A special message type used for room announcements
-#[derive(Debug, Clone, PartialEq, Eq)]
-pub enum RoomMessage {
-    /// User message
-    User(Box<Message>),
-    /// System message
-    System(SharedString),
-    /// Only use for UI purposes.
-    /// Placeholder will be used for display room announcement
-    Announcement,
-}
-
-impl RoomMessage {
-    /// Creates a new user message
-    ///
-    /// # Arguments
-    ///
-    /// * `message` - The message content
-    ///
-    /// # Returns
-    ///
-    /// A `RoomMessage::User` variant
-    pub fn user(message: Message) -> Self {
-        Self::User(Box::new(message))
-    }
-
-    /// Creates a new system message
-    ///
-    /// # Arguments
-    ///
-    /// * `content` - The system message content
-    ///
-    /// # Returns
-    ///
-    /// A `RoomMessage::System` variant
-    pub fn system(content: SharedString) -> Self {
-        Self::System(content)
-    }
-
-    /// Creates a new announcement placeholder
-    ///
-    /// # Returns
-    ///
-    /// A `RoomMessage::Announcement` variant
-    pub fn announcement() -> Self {
-        Self::Announcement
-    }
-}

crates/chats/src/room.rs

@@ -1,617 +0,0 @@
-use std::sync::Arc;
-
-use account::Account;
-use anyhow::Error;
-use chrono::{Local, TimeZone};
-use common::{compare, profile::SharedProfile, room_hash};
-use global::get_client;
-use gpui::{App, AppContext, Context, EventEmitter, SharedString, Task, Window};
-use itertools::Itertools;
-use nostr_sdk::prelude::*;
-use smol::channel::Receiver;
-
-use crate::{
-    constants::{DAYS_IN_MONTH, HOURS_IN_DAY, MINUTES_IN_HOUR, NOW, SECONDS_IN_MINUTE},
-    message::{Message, RoomMessage},
-    ChatRegistry,
-};
-
-#[derive(Debug, Clone)]
-pub struct IncomingEvent {
-    pub event: RoomMessage,
-}
-
-#[derive(Debug)]
-pub enum SendStatus {
-    Sent(EventId),
-    Failed(Error),
-}
-
-#[derive(Clone, Copy, Hash, Debug, PartialEq, Eq, Default)]
-pub enum RoomKind {
-    Ongoing,
-    Trusted,
-    #[default]
-    Unknown,
-}
-
-pub struct Room {
-    pub id: u64,
-    pub created_at: Timestamp,
-    /// Subject of the room
-    pub subject: Option<SharedString>,
-    /// Picture of the room
-    pub picture: Option<SharedString>,
-    /// All members of the room
-    pub members: Arc<Vec<PublicKey>>,
-    /// Kind
-    pub kind: RoomKind,
-}
-
-impl EventEmitter<IncomingEvent> for Room {}
-
-impl PartialEq for Room {
-    fn eq(&self, other: &Self) -> bool {
-        self.id == other.id
-    }
-}
-
-impl Room {
-    /// Creates a new Room instance from a Nostr event
-    ///
-    /// # Arguments
-    ///
-    /// * `event` - The Nostr event containing chat information
-    ///
-    /// # Returns
-    ///
-    /// A new Room instance with information extracted from the event
-    pub fn new(event: &Event) -> Self {
-        let id = room_hash(event);
-        let created_at = event.created_at;
-
-        // Get all pubkeys from the event's tags
-        let mut pubkeys: Vec<PublicKey> = event.tags.public_keys().cloned().collect();
-        pubkeys.push(event.pubkey);
-
-        // Convert pubkeys into members
-        let members = Arc::new(pubkeys.into_iter().unique().sorted().collect());
-
-        // Get the subject from the event's tags
-        let subject = if let Some(tag) = event.tags.find(TagKind::Subject) {
-            tag.content().map(|s| s.to_owned().into())
-        } else {
-            None
-        };
-
-        // Get the picture from the event's tags
-        let picture = if let Some(tag) = event.tags.find(TagKind::custom("picture")) {
-            tag.content().map(|s| s.to_owned().into())
-        } else {
-            None
-        };
-
-        Self {
-            id,
-            created_at,
-            subject,
-            picture,
-            members,
-            kind: RoomKind::Unknown,
-        }
-    }
-
-    /// Sets the kind of the room
-    ///
-    /// # Arguments
-    ///
-    /// * `kind` - The kind of room to set
-    ///
-    /// # Returns
-    ///
-    /// The room with the updated kind
-    pub fn kind(mut self, kind: RoomKind) -> Self {
-        self.kind = kind;
-        self
-    }
-
-    /// Calculates a human-readable representation of the time passed since room creation
-    ///
-    /// # Returns
-    ///
-    /// A SharedString representing the relative time since room creation:
-    /// - "now" for less than a minute
-    /// - "Xm" for minutes
-    /// - "Xh" for hours
-    /// - "Xd" for days
-    /// - Month and day (e.g. "Jan 15") for older dates
-    pub fn ago(&self) -> SharedString {
-        let input_time = match Local.timestamp_opt(self.created_at.as_u64() as i64, 0) {
-            chrono::LocalResult::Single(time) => time,
-            _ => return "1m".into(),
-        };
-
-        let now = Local::now();
-        let duration = now.signed_duration_since(input_time);
-
-        match duration {
-            d if d.num_seconds() < SECONDS_IN_MINUTE => NOW.into(),
-            d if d.num_minutes() < MINUTES_IN_HOUR => format!("{}m", d.num_minutes()),
-            d if d.num_hours() < HOURS_IN_DAY => format!("{}h", d.num_hours()),
-            d if d.num_days() < DAYS_IN_MONTH => format!("{}d", d.num_days()),
-            _ => input_time.format("%b %d").to_string(),
-        }
-        .into()
-    }
-
-    /// Gets the profile for a specific public key
-    ///
-    /// # Arguments
-    ///
-    /// * `public_key` - The public key to get the profile for
-    /// * `cx` - The App context
-    ///
-    /// # Returns
-    ///
-    /// The Profile associated with the given public key
-    pub fn profile_by_pubkey(&self, public_key: &PublicKey, cx: &App) -> Profile {
-        ChatRegistry::global(cx).read(cx).profile(public_key, cx)
-    }
-
-    /// Gets the first member in the room that isn't the current user
-    ///
-    /// # Arguments
-    ///
-    /// * `cx` - The App context
-    ///
-    /// # Returns
-    ///
-    /// The Profile of the first member in the room
-    pub fn first_member(&self, cx: &App) -> Profile {
-        let account = Account::global(cx).read(cx);
-        let Some(profile) = account.profile.clone() else {
-            return self.profile_by_pubkey(&self.members[0], cx);
-        };
-
-        if let Some(public_key) = self
-            .members
-            .iter()
-            .filter(|&pubkey| pubkey != &profile.public_key())
-            .collect::<Vec<_>>()
-            .first()
-        {
-            self.profile_by_pubkey(public_key, cx)
-        } else {
-            profile
-        }
-    }
-
-    /// Gets all avatars for members in the room
-    ///
-    /// # Arguments
-    ///
-    /// * `cx` - The App context
-    ///
-    /// # Returns
-    ///
-    /// A vector of SharedString containing all members' avatars
-    pub fn avatars(&self, cx: &App) -> Vec<SharedString> {
-        let profiles: Vec<Profile> = self
-            .members
-            .iter()
-            .map(|pubkey| ChatRegistry::global(cx).read(cx).profile(pubkey, cx))
-            .collect();
-
-        profiles
-            .iter()
-            .map(|member| member.shared_avatar())
-            .collect()
-    }
-
-    /// Gets a formatted string of member names
-    ///
-    /// # Arguments
-    ///
-    /// * `cx` - The App context
-    ///
-    /// # Returns
-    ///
-    /// A SharedString containing formatted member names:
-    /// - For a group chat: "name1, name2, +X" where X is the number of additional members
-    /// - For a direct message: just the name of the other person
-    pub fn names(&self, cx: &App) -> SharedString {
-        if self.is_group() {
-            let profiles = self
-                .members
-                .iter()
-                .map(|pubkey| ChatRegistry::global(cx).read(cx).profile(pubkey, cx))
-                .collect::<Vec<_>>();
-
-            let mut name = profiles
-                .iter()
-                .take(2)
-                .map(|profile| profile.shared_name())
-                .collect::<Vec<_>>()
-                .join(", ");
-
-            if profiles.len() > 2 {
-                name = format!("{}, +{}", name, profiles.len() - 2);
-            }
-
-            name.into()
-        } else {
-            self.first_member(cx).shared_name()
-        }
-    }
-
-    /// Gets the display name for the room
-    ///
-    /// # Arguments
-    ///
-    /// * `cx` - The App context
-    ///
-    /// # Returns
-    ///
-    /// A SharedString representing the display name:
-    /// - The subject of the room if it exists
-    /// - Otherwise, the formatted names of the members
-    pub fn display_name(&self, cx: &App) -> SharedString {
-        if let Some(subject) = self.subject.as_ref() {
-            subject.clone()
-        } else {
-            self.names(cx)
-        }
-    }
-
-    /// Gets the display image for the room
-    ///
-    /// # Arguments
-    ///
-    /// * `cx` - The App context
-    ///
-    /// # Returns
-    ///
-    /// An Option<SharedString> containing the avatar:
-    /// - For a direct message: the other person's avatar
-    /// - For a group chat: None
-    pub fn display_image(&self, cx: &App) -> Option<SharedString> {
-        if !self.is_group() {
-            Some(self.first_member(cx).shared_avatar())
-        } else {
-            None
-        }
-    }
-
-    /// Checks if the room is a group chat
-    ///
-    /// # Returns
-    ///
-    /// true if the room has more than 2 members, false otherwise
-    pub fn is_group(&self) -> bool {
-        self.members.len() > 2
-    }
-
-    /// Updates the creation timestamp of the room
-    ///
-    /// # Arguments
-    ///
-    /// * `created_at` - The new Timestamp to set
-    /// * `cx` - The context to notify about the update
-    pub fn created_at(&mut self, created_at: Timestamp, cx: &mut Context<Self>) {
-        self.created_at = created_at;
-        cx.notify();
-    }
-
-    /// Updates the subject of the room
-    ///
-    /// # Arguments
-    ///
-    /// * `subject` - The new subject to set
-    /// * `cx` - The context to notify about the update
-    pub fn subject(&mut self, subject: String, cx: &mut Context<Self>) {
-        self.subject = Some(subject.into());
-        cx.notify();
-    }
-
-    /// Updates the picture of the room
-    ///
-    /// # Arguments
-    ///
-    /// * `picture` - The new subject to set
-    /// * `cx` - The context to notify about the update
-    pub fn picture(&mut self, picture: String, cx: &mut Context<Self>) {
-        self.picture = Some(picture.into());
-        cx.notify();
-    }
-
-    /// Fetches metadata for all members in the room
-    ///
-    /// # Arguments
-    ///
-    /// * `cx` - The context for the background task
-    ///
-    /// # Returns
-    ///
-    /// A Task that resolves to Result<Vec<(PublicKey, Option<Metadata>)>, Error>
-    #[allow(clippy::type_complexity)]
-    pub fn metadata(
-        &self,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<Vec<(PublicKey, Option<Metadata>)>, Error>> {
-        let client = get_client();
-        let public_keys = self.members.clone();
-
-        cx.background_spawn(async move {
-            let mut output = vec![];
-
-            for public_key in public_keys.iter() {
-                let metadata = client.database().metadata(*public_key).await?;
-                output.push((*public_key, metadata));
-            }
-
-            Ok(output)
-        })
-    }
-
-    /// Checks which members have inbox relays set up
-    ///
-    /// # Arguments
-    ///
-    /// * `cx` - The App context
-    ///
-    /// # Returns
-    ///
-    /// A Task that resolves to Result<Vec<(PublicKey, bool)>, Error> where
-    /// the boolean indicates if the member has inbox relays configured
-    pub fn messaging_relays(&self, cx: &App) -> Task<Result<Vec<(PublicKey, bool)>, Error>> {
-        let client = get_client();
-        let pubkeys = Arc::clone(&self.members);
-
-        cx.background_spawn(async move {
-            let mut result = Vec::with_capacity(pubkeys.len());
-
-            for pubkey in pubkeys.iter() {
-                let filter = Filter::new()
-                    .kind(Kind::InboxRelays)
-                    .author(*pubkey)
-                    .limit(1);
-
-                let is_ready = client.database().query(filter).await?.first().is_some();
-
-                result.push((*pubkey, is_ready));
-            }
-
-            Ok(result)
-        })
-    }
-
-    /// Sends a message to all members in the room
-    ///
-    /// # Arguments
-    ///
-    /// * `content` - The content of the message to send
-    /// * `cx` - The App context
-    ///
-    /// # Returns
-    ///
-    /// A Task that resolves to Result<Vec<String>, Error> where the
-    /// strings contain error messages for any failed sends
-    pub fn send_message(&self, content: String, cx: &App) -> Option<Receiver<SendStatus>> {
-        let profile = Account::global(cx).read(cx).profile.clone()?;
-        let public_key = profile.public_key();
-
-        let subject = self.subject.clone();
-        let picture = self.picture.clone();
-        let pubkeys = self.members.clone();
-
-        let (tx, rx) = smol::channel::bounded::<SendStatus>(pubkeys.len());
-
-        cx.background_spawn(async move {
-            let client = get_client();
-
-            let mut tags: Vec<Tag> = pubkeys
-                .iter()
-                .filter_map(|pubkey| {
-                    if pubkey != &public_key {
-                        Some(Tag::public_key(*pubkey))
-                    } else {
-                        None
-                    }
-                })
-                .collect();
-
-            // Add subject tag if it's present
-            if let Some(subject) = subject {
-                tags.push(Tag::from_standardized(TagStandard::Subject(
-                    subject.to_string(),
-                )));
-            }
-
-            // Add picture tag if it's present
-            if let Some(picture) = picture {
-                tags.push(Tag::custom(TagKind::custom("picture"), vec![picture]));
-            }
-
-            for pubkey in pubkeys.iter() {
-                match client
-                    .send_private_msg(*pubkey, &content, tags.clone())
-                    .await
-                {
-                    Ok(output) => {
-                        if let Err(e) = tx.send(SendStatus::Sent(output.val)).await {
-                            log::error!("Failed to send message to {}: {}", pubkey, e);
-                        }
-                    }
-                    Err(e) => {
-                        if let Err(e) = tx.send(SendStatus::Failed(e.into())).await {
-                            log::error!("Failed to send message to {}: {}", pubkey, e);
-                        }
-                    }
-                }
-            }
-        })
-        .detach();
-
-        Some(rx)
-    }
-
-    /// Loads all messages for this room from the database
-    ///
-    /// # Arguments
-    ///
-    /// * `cx` - The App context
-    ///
-    /// # Returns
-    ///
-    /// A Task that resolves to Result<Vec<RoomMessage>, Error> containing
-    /// all messages for this room
-    pub fn load_messages(&self, cx: &App) -> Task<Result<Vec<RoomMessage>, Error>> {
-        let client = get_client();
-        let pubkeys = Arc::clone(&self.members);
-
-        let profiles: Vec<Profile> = pubkeys
-            .iter()
-            .map(|pubkey| ChatRegistry::global(cx).read(cx).profile(pubkey, cx))
-            .collect();
-
-        let filter = Filter::new()
-            .kind(Kind::PrivateDirectMessage)
-            .authors(pubkeys.to_vec())
-            .pubkeys(pubkeys.to_vec());
-
-        cx.background_spawn(async move {
-            let mut messages = vec![];
-            let parser = NostrParser::new();
-
-            // Get all events from database
-            let events = client
-                .database()
-                .query(filter)
-                .await?
-                .into_iter()
-                .sorted_by_key(|ev| ev.created_at)
-                .filter(|ev| {
-                    let mut other_pubkeys = ev.tags.public_keys().copied().collect::<Vec<_>>();
-                    other_pubkeys.push(ev.pubkey);
-                    // Check if the event is from a member of the room
-                    compare(&other_pubkeys, &pubkeys)
-                })
-                .collect::<Vec<_>>();
-
-            for event in events.into_iter() {
-                let mut mentions = vec![];
-                let id = event.id;
-                let created_at = event.created_at;
-                let content = event.content.clone();
-                let tokens = parser.parse(&content);
-
-                let author = profiles
-                    .iter()
-                    .find(|profile| profile.public_key() == event.pubkey)
-                    .cloned()
-                    .unwrap_or_else(|| Profile::new(event.pubkey, Metadata::default()));
-
-                let pubkey_tokens = tokens
-                    .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::<Vec<_>>();
-
-                for pubkey in pubkey_tokens {
-                    mentions.push(
-                        profiles
-                            .iter()
-                            .find(|profile| profile.public_key() == pubkey)
-                            .cloned()
-                            .unwrap_or_else(|| Profile::new(pubkey, Metadata::default())),
-                    );
-                }
-
-                let message = Message::new(id, content, author, created_at).with_mentions(mentions);
-                let room_message = RoomMessage::user(message);
-
-                messages.push(room_message);
-            }
-
-            Ok(messages)
-        })
-    }
-
-    /// Emits a message event to the GPUI
-    ///
-    /// # Arguments
-    ///
-    /// * `event` - The Nostr event to emit
-    /// * `window` - The Window to emit the event to
-    /// * `cx` - The context for the room
-    ///
-    /// # Effects
-    ///
-    /// Processes the event and emits an IncomingEvent to the UI when complete
-    pub fn emit_message(&self, event: Event, window: &mut Window, cx: &mut Context<Self>) {
-        let pubkeys = self.members.clone();
-        let profiles: Vec<Profile> = pubkeys
-            .iter()
-            .map(|pubkey| ChatRegistry::global(cx).read(cx).profile(pubkey, cx))
-            .collect();
-
-        let task: Task<Result<RoomMessage, Error>> = cx.background_spawn(async move {
-            let parser = NostrParser::new();
-            let id = event.id;
-            let created_at = event.created_at;
-            let content = event.content.clone();
-            let tokens = parser.parse(&content);
-            let mut mentions = vec![];
-
-            let author = profiles
-                .iter()
-                .find(|profile| profile.public_key() == event.pubkey)
-                .cloned()
-                .unwrap_or_else(|| Profile::new(event.pubkey, Metadata::default()));
-
-            let pubkey_tokens = tokens
-                .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::<Vec<_>>();
-
-            for pubkey in pubkey_tokens {
-                mentions.push(
-                    profiles
-                        .iter()
-                        .find(|profile| profile.public_key() == pubkey)
-                        .cloned()
-                        .unwrap_or_else(|| Profile::new(pubkey, Metadata::default())),
-                );
-            }
-
-            let message = Message::new(id, content, author, created_at).with_mentions(mentions);
-            let room_message = RoomMessage::user(message);
-
-            Ok(room_message)
-        });
-
-        cx.spawn_in(window, async move |this, cx| {
-            if let Ok(message) = task.await {
-                cx.update(|_, cx| {
-                    this.update(cx, |_, cx| {
-                        cx.emit(IncomingEvent { event: message });
-                    })
-                    .ok();
-                })
-                .ok();
-            }
-        })
-        .detach();
-    }
-}

crates/common/Cargo.toml

@@ -5,14 +5,19 @@ edition.workspace = true
 publish.workspace = true
 
 [dependencies]
-global = { path = "../global" }
-
 gpui.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
 
-random_name_generator = "0.3.6"
-qrcode-generator = "5.0.0"
+dirs = "5.0"
+qrcode = "0.14.1"
+whoami = "1.6.1"
+nostr = { git = "https://github.com/rust-nostr/nostr" }

crates/common/src/constants.rs

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

crates/common/src/debounced_delay.rs

@@ -0,0 +1,66 @@
+use std::marker::PhantomData;
+use std::time::Duration;
+
+use futures::channel::oneshot;
+use futures::FutureExt;
+use gpui::{Context, Task, Window};
+
+pub struct DebouncedDelay<E: 'static> {
+    task: Option<Task<()>>,
+    cancel_channel: Option<oneshot::Sender<()>>,
+    _phantom_data: PhantomData<E>,
+}
+
+impl<E: 'static> Default for DebouncedDelay<E> {
+    fn default() -> Self {
+        Self::new()
+    }
+}
+
+impl<E: 'static> DebouncedDelay<E> {
+    pub fn new() -> Self {
+        Self {
+            task: None,
+            cancel_channel: None,
+            _phantom_data: PhantomData,
+        }
+    }
+
+    pub fn fire_new<F>(
+        &mut self,
+        delay: Duration,
+        window: &mut Window,
+        cx: &mut Context<E>,
+        func: F,
+    ) where
+        F: 'static + Send + FnOnce(&mut E, &mut Window, &mut Context<E>) -> Task<()>,
+    {
+        if let Some(channel) = self.cancel_channel.take() {
+            _ = channel.send(());
+        }
+
+        let (sender, mut receiver) = oneshot::channel::<()>();
+        self.cancel_channel = Some(sender);
+
+        let previous_task = self.task.take();
+
+        self.task = Some(cx.spawn_in(window, async move |entity, cx| {
+            let mut timer = cx.background_executor().timer(delay).fuse();
+
+            if let Some(previous_task) = previous_task {
+                previous_task.await;
+            }
+
+            futures::select_biased! {
+                _ = receiver => return,
+                _ = timer => {}
+            }
+
+            if let Ok(Ok(task)) =
+                cx.update(|window, cx| entity.update(cx, |project, cx| (func)(project, window, cx)))
+            {
+                task.await;
+            }
+        }));
+    }
+}

crates/common/src/display.rs

@@ -0,0 +1,150 @@
+use std::sync::Arc;
+
+use anyhow::{anyhow, Error};
+use chrono::{Local, TimeZone};
+use gpui::{Image, ImageFormat, SharedString};
+use nostr_sdk::prelude::*;
+use qrcode::render::svg;
+use qrcode::QrCode;
+
+const NOW: &str = "now";
+const SECONDS_IN_MINUTE: i64 = 60;
+const MINUTES_IN_HOUR: i64 = 60;
+const HOURS_IN_DAY: i64 = 24;
+const DAYS_IN_MONTH: i64 = 30;
+const FALLBACK_IMG: &str = "https://image.nostr.build/c30703b48f511c293a9003be8100cdad37b8798b77a1dc3ec6eb8a20443d5dea.png";
+const IMAGE_RESIZE_SERVICE: &str = "https://wsrv.nl";
+
+pub trait RenderedProfile {
+    fn avatar(&self, proxy: bool) -> SharedString;
+    fn display_name(&self) -> SharedString;
+}
+
+impl RenderedProfile for Profile {
+    fn avatar(&self, proxy: bool) -> SharedString {
+        self.metadata()
+            .picture
+            .as_ref()
+            .filter(|picture| !picture.is_empty())
+            .map(|picture| {
+                if proxy {
+                    let url = format!(
+                        "{IMAGE_RESIZE_SERVICE}/?url={picture}&w=100&h=100&fit=cover&mask=circle&default={FALLBACK_IMG}&n=-1"
+                    );
+
+                    url.into()
+                } else {
+                    picture.into()
+                }
+            })
+            .unwrap_or_else(|| "brand/avatar.png".into())
+    }
+
+    fn display_name(&self) -> SharedString {
+        if let Some(display_name) = self.metadata().display_name.as_ref() {
+            if !display_name.is_empty() {
+                return SharedString::from(display_name);
+            }
+        }
+
+        if let Some(name) = self.metadata().name.as_ref() {
+            if !name.is_empty() {
+                return SharedString::from(name);
+            }
+        }
+
+        SharedString::from(shorten_pubkey(self.public_key(), 4))
+    }
+}
+
+pub trait RenderedTimestamp {
+    fn to_human_time(&self) -> SharedString;
+    fn to_ago(&self) -> SharedString;
+}
+
+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,
+            _ => return SharedString::from("9999"),
+        };
+
+        let now = Local::now();
+        let input_date = input_time.date_naive();
+        let now_date = now.date_naive();
+        let yesterday_date = (now - chrono::Duration::days(1)).date_naive();
+        let time_format = input_time.format("%H:%M %p");
+
+        match input_date {
+            date if date == now_date => SharedString::from(format!("Today at {time_format}")),
+            date if date == yesterday_date => {
+                SharedString::from(format!("Yesterday at {time_format}"))
+            }
+            _ => SharedString::from(format!("{}, {time_format}", input_time.format("%d/%m/%y"))),
+        }
+    }
+
+    fn to_ago(&self) -> SharedString {
+        let input_time = match Local.timestamp_opt(self.as_secs() as i64, 0) {
+            chrono::LocalResult::Single(time) => time,
+            _ => return SharedString::from("1m"),
+        };
+
+        let now = Local::now();
+        let duration = now.signed_duration_since(input_time);
+
+        match duration {
+            d if d.num_seconds() < SECONDS_IN_MINUTE => SharedString::from(NOW),
+            d if d.num_minutes() < MINUTES_IN_HOUR => {
+                SharedString::from(format!("{}m", d.num_minutes()))
+            }
+            d if d.num_hours() < HOURS_IN_DAY => SharedString::from(format!("{}h", d.num_hours())),
+            d if d.num_days() < DAYS_IN_MONTH => SharedString::from(format!("{}d", d.num_days())),
+            _ => SharedString::from(input_time.format("%b %d").to_string()),
+        }
+    }
+}
+
+pub trait TextUtils {
+    fn to_public_key(&self) -> Result<PublicKey, Error>;
+    fn to_qr(&self) -> Option<Arc<Image>>;
+}
+
+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();
+        let svg = code
+            .render()
+            .min_dimensions(256, 256)
+            .dark_color(svg::Color("#000000"))
+            .light_color(svg::Color("#FFFFFF"))
+            .build();
+
+        Some(Arc::new(Image::from_bytes(
+            ImageFormat::Svg,
+            svg.into_bytes(),
+        )))
+    }
+}
+
+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

@@ -0,0 +1,53 @@
+use std::hash::{DefaultHasher, Hash, Hasher};
+
+use itertools::Itertools;
+use nostr_sdk::prelude::*;
+
+pub trait EventUtils {
+    fn uniq_id(&self) -> u64;
+    fn extract_public_keys(&self) -> Vec<PublicKey>;
+}
+
+impl EventUtils for Event {
+    fn uniq_id(&self) -> u64 {
+        let mut hasher = DefaultHasher::new();
+        let mut pubkeys: Vec<PublicKey> = self.extract_public_keys();
+        pubkeys.sort();
+        pubkeys.hash(&mut hasher);
+        hasher.finish()
+    }
+
+    fn extract_public_keys(&self) -> Vec<PublicKey> {
+        let mut public_keys: Vec<PublicKey> = self.tags.public_keys().copied().collect();
+        public_keys.push(self.pubkey);
+
+        public_keys.into_iter().unique().collect()
+    }
+}
+
+impl EventUtils for UnsignedEvent {
+    fn uniq_id(&self) -> u64 {
+        let mut hasher = DefaultHasher::new();
+        let mut pubkeys: Vec<PublicKey> = vec![];
+
+        // Add all public keys from event
+        pubkeys.push(self.pubkey);
+        pubkeys.extend(self.tags.public_keys().collect::<Vec<_>>());
+
+        // Generate unique hash
+        pubkeys
+            .into_iter()
+            .unique()
+            .sorted()
+            .collect::<Vec<_>>()
+            .hash(&mut hasher);
+
+        hasher.finish()
+    }
+
+    fn extract_public_keys(&self) -> Vec<PublicKey> {
+        let mut public_keys: Vec<PublicKey> = self.tags.public_keys().copied().collect();
+        public_keys.push(self.pubkey);
+        public_keys.into_iter().unique().sorted().collect()
+    }
+}

crates/common/src/lib.rs

@@ -1,78 +1,68 @@
-use std::{
-    collections::HashSet,
-    hash::{DefaultHasher, Hash, Hasher},
-    sync::Arc,
-};
-
-use anyhow::Context;
-use global::constants::NIP96_SERVER;
-use gpui::Image;
-use itertools::Itertools;
-use nostr_sdk::prelude::*;
-use qrcode_generator::QrCodeEcc;
-use rnglib::{Language, RNG};
-
-pub mod profile;
-
-pub async fn nip96_upload(client: &Client, file: Vec<u8>) -> anyhow::Result<Url, anyhow::Error> {
-    let signer = client.signer().await?;
-    let server_url = Url::parse(NIP96_SERVER)?;
-
-    let config: ServerConfig = nip96::get_server_config(server_url, None).await?;
-    let url = nip96::upload_data(&signer, &config, file, None, None).await?;
-
-    Ok(url)
-}
-
-pub fn room_hash(event: &Event) -> u64 {
-    let mut hasher = DefaultHasher::new();
-    let mut pubkeys: Vec<&PublicKey> = vec![];
-
-    // Add all public keys from event
-    pubkeys.push(&event.pubkey);
-    pubkeys.extend(event.tags.public_keys().collect::<Vec<_>>());
-
-    // Generate unique hash
-    pubkeys
-        .into_iter()
-        .unique()
-        .sorted()
-        .collect::<Vec<_>>()
-        .hash(&mut hasher);
-
-    hasher.finish()
-}
-
-pub fn device_pubkey(event: &Event) -> Result<PublicKey, anyhow::Error> {
-    let n_tag = event.tags.find(TagKind::custom("n")).context("Invalid")?;
-    let hex = n_tag.content().context("Invalid")?;
-    let pubkey = PublicKey::parse(hex)?;
-
-    Ok(pubkey)
-}
-
-pub fn random_name(length: usize) -> String {
-    let rng = RNG::from(&Language::Roman);
-    rng.generate_names(length, true).join("-").to_lowercase()
-}
-
-pub fn create_qr(data: &str) -> Result<Arc<Image>, anyhow::Error> {
-    let qr = qrcode_generator::to_png_to_vec_from_str(data, QrCodeEcc::Medium, 256)?;
-    let img = Arc::new(Image {
-        format: gpui::ImageFormat::Png,
-        bytes: qr.clone(),
-        id: 1,
-    });
-
-    Ok(img)
-}
-
-pub fn compare<T>(a: &[T], b: &[T]) -> bool
-where
-    T: Eq + Hash,
-{
-    let a: HashSet<_> = a.iter().collect();
-    let b: HashSet<_> = b.iter().collect();
-
-    a == b
-}
+use std::sync::OnceLock;
+
+pub use constants::*;
+pub use debounced_delay::*;
+pub use display::*;
+pub use event::*;
+pub use nip05::*;
+pub use nip96::*;
+use nostr_sdk::prelude::*;
+pub use paths::*;
+
+mod constants;
+mod debounced_delay;
+mod display;
+mod event;
+mod nip05;
+mod nip96;
+mod paths;
+
+static APP_NAME: OnceLock<String> = OnceLock::new();
+static NIP65_RELAYS: OnceLock<Vec<(RelayUrl, Option<RelayMetadata>)>> = OnceLock::new();
+static NIP17_RELAYS: OnceLock<Vec<RelayUrl>> = OnceLock::new();
+
+/// Get the app name
+pub fn app_name() -> &'static String {
+    APP_NAME.get_or_init(|| {
+        let devicename = whoami::devicename();
+        let platform = whoami::platform();
+
+        format!("{CLIENT_NAME} on {platform} ({devicename})")
+    })
+}
+
+/// Default NIP-65 Relays. Used for new account
+pub fn default_nip65_relays() -> &'static Vec<(RelayUrl, Option<RelayMetadata>)> {
+    NIP65_RELAYS.get_or_init(|| {
+        vec![
+            (
+                RelayUrl::parse("wss://nostr.mom").unwrap(),
+                Some(RelayMetadata::Read),
+            ),
+            (
+                RelayUrl::parse("wss://nostr.bitcoiner.social").unwrap(),
+                Some(RelayMetadata::Read),
+            ),
+            (
+                RelayUrl::parse("wss://nos.lol").unwrap(),
+                Some(RelayMetadata::Write),
+            ),
+            (
+                RelayUrl::parse("wss://relay.snort.social").unwrap(),
+                Some(RelayMetadata::Write),
+            ),
+            (RelayUrl::parse("wss://relay.primal.net").unwrap(), None),
+            (RelayUrl::parse("wss://relay.damus.io").unwrap(), None),
+        ]
+    })
+}
+
+/// Default NIP-17 Relays. Used for new account
+pub fn default_nip17_relays() -> &'static Vec<RelayUrl> {
+    NIP17_RELAYS.get_or_init(|| {
+        vec![
+            RelayUrl::parse("wss://nip17.com").unwrap(),
+            RelayUrl::parse("wss://auth.nostr1.com").unwrap(),
+        ]
+    })
+}

crates/common/src/nip05.rs

@@ -0,0 +1,31 @@
+use anyhow::anyhow;
+use nostr::prelude::*;
+use reqwest::Client as ReqClient;
+
+pub async fn nip05_verify(public_key: PublicKey, address: &str) -> Result<bool, anyhow::Error> {
+    let req_client = ReqClient::new();
+    let address = Nip05Address::parse(address)?;
+
+    // Get NIP-05 response
+    let res = req_client.get(address.url().to_string()).send().await?;
+    let json: Value = res.json().await?;
+
+    let verify = nip05::verify_from_json(&public_key, &address, &json);
+
+    Ok(verify)
+}
+
+pub async fn nip05_profile(address: &str) -> Result<Nip05Profile, anyhow::Error> {
+    let req_client = ReqClient::new();
+    let address = Nip05Address::parse(address)?;
+
+    // Get NIP-05 response
+    let res = req_client.get(address.url().to_string()).send().await?;
+    let json: Value = res.json().await?;
+
+    if let Ok(profile) = Nip05Profile::from_json(&address, &json) {
+        Ok(profile)
+    } else {
+        Err(anyhow!("Failed to get NIP-05 profile"))
+    }
+}

crates/common/src/nip96.rs

@@ -0,0 +1,84 @@
+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 = if client.has_signer().await {
+        client.signer().await?
+    } else {
+        Keys::generate().into_nostr_signer()
+    };
+
+    let url = upload(&signer, &config, file, None).await?;
+
+    Ok(url)
+}

crates/common/src/paths.rs

@@ -60,5 +60,5 @@ pub fn support_dir() -> &'static PathBuf {
 /// 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"))
+    NOSTR_FILE.get_or_init(|| support_dir().join("nostr-db"))
 }

crates/common/src/profile.rs

@@ -1,43 +0,0 @@
-use global::constants::IMAGE_SERVICE;
-use gpui::SharedString;
-use nostr_sdk::prelude::*;
-
-pub trait SharedProfile {
-    fn shared_avatar(&self) -> SharedString;
-    fn shared_name(&self) -> SharedString;
-}
-
-impl SharedProfile for Profile {
-    fn shared_avatar(&self) -> SharedString {
-        self.metadata()
-            .picture
-            .as_ref()
-            .filter(|picture| !picture.is_empty())
-            .map(|picture| {
-                format!(
-                    "{}/?url={}&w=100&h=100&fit=cover&mask=circle&n=-1&default=npub1zfss807aer0j26mwp2la0ume0jqde3823rmu97ra6sgyyg956e0s6xw445.blossom.band/c30703b48f511c293a9003be8100cdad37b8798b77a1dc3ec6eb8a20443d5dea.png",
-                    IMAGE_SERVICE, picture
-                )
-                .into()
-            })
-            .unwrap_or_else(|| "brand/avatar.png".into())
-    }
-
-    fn shared_name(&self) -> SharedString {
-        if let Some(display_name) = self.metadata().display_name.as_ref() {
-            if !display_name.is_empty() {
-                return display_name.into();
-            }
-        }
-
-        if let Some(name) = self.metadata().name.as_ref() {
-            if !name.is_empty() {
-                return name.into();
-            }
-        }
-
-        let pubkey = self.public_key().to_hex();
-
-        format!("{}:{}", &pubkey[0..4], &pubkey[pubkey.len() - 4..]).into()
-    }
-}

crates/coop/Cargo.toml

@@ -1,38 +1,64 @@
-[package]
-name = "coop"
-version.workspace = true
-edition.workspace = true
-publish.workspace = true
-
-[[bin]]
-name = "coop"
-path = "src/main.rs"
-
-[dependencies]
-ui = { path = "../ui" }
-common = { path = "../common" }
-global = { path = "../global" }
-chats = { path = "../chats" }
-account = { path = "../account" }
-auto_update = { path = "../auto_update" }
-
-gpui.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
-dirs.workspace = true
-rust-embed.workspace = true
-log.workspace = true
-smallvec.workspace = true
-smol.workspace = true
-oneshot.workspace = true
-
-rustls = "0.23.23"
-futures = "0.3"
-tracing-subscriber = { version = "0.3.18", features = ["fmt"] }
+[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" }
+title_bar = { path = "../title_bar" }
+theme = { path = "../theme" }
+common = { path = "../common" }
+state = { path = "../state" }
+device = { path = "../device" }
+key_store = { path = "../key_store" }
+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
+webbrowser.workspace = true
+
+indexset = "0.12.3"
+tracing-subscriber = { version = "0.3.18", features = ["fmt"] }

crates/coop/resources/coop.desktop.in

@@ -0,0 +1,14 @@
+[Desktop Entry]
+Version=1.0
+Type=Application
+Name=$APP_NAME
+GenericName=Chat Application
+Comment=Chat Freely, Stay Private on Nostr.
+TryExec=$APP_CLI
+StartupNotify=$DO_STARTUP_NOTIFY
+Exec=$APP_CLI $APP_ARGS
+Icon=$APP_ICON
+Categories=Network;InstantMessaging;
+Keywords=chat;messaging;nostr;privacy;
+MimeType=x-scheme-handler/nostr;x-scheme-handler/coop;
+Actions=NewChat;

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

@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<component type="desktop-application">
+    <id>$APP_ID</id>
+    <metadata_license>MIT</metadata_license>
+    <project_license>GPL-3.0-or-later</project_license>
+
+    <name>$APP_NAME</name>
+    <summary>Chat Freely, Stay Private on Nostr</summary>
+
+    <developer id="su.reya">
+        <name translate="no">Ren Amamiya</name>
+    </developer>
+
+    <description>
+        <p>
+            Chat freely without sharing phone numbers or emails.
+        </p>
+        <p>
+            Your messages are encrypted, and your privacy stays protected.
+        </p>
+        <p>
+            Just privacy, made simple - with Nostr.
+        </p>
+    </description>
+
+    <launchable type="desktop-id">$APP_ID.desktop</launchable>
+
+    <branding>
+        <color type="primary" scheme_preference="light">$BRANDING_LIGHT</color>
+        <color type="primary" scheme_preference="dark">$BRANDING_DARK</color>
+    </branding>
+
+    <content_rating type="oars-1.1">
+        <content_attribute id="social-chat">intense</content_attribute>
+        <content_attribute id="social-audio">intense</content_attribute>
+    </content_rating>
+
+    <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>
+    </supports>
+
+    <recommends>
+        <control>pointing</control>
+        <control>keyboard</control>
+        <display_length compare="ge">768</display_length>
+    </recommends>
+
+    <screenshots>
+        <screenshot type="default">
+            <caption>Coop with the default screen, showing current user's chat rooms</caption>
+            <image>https://npub1zfss807aer0j26mwp2la0ume0jqde3823rmu97ra6sgyyg956e0s6xw445.blossom.band/07b03b8c269b67eedcd265d11ebe7384ba797364056a60105cd02cf34de4eff2.png</image>
+        </screenshot>
+        <screenshot>
+            <caption>Example of chat room's message list</caption>
+            <image>https://npub1zfss807aer0j26mwp2la0ume0jqde3823rmu97ra6sgyyg956e0s6xw445.blossom.band/4125cd78696274e92c53c09ac2fed0c8c7a74912dca6ab80bef21badd6ae4232.png</image>
+        </screenshot>
+        <screenshot>
+            <caption>Coop in Dark Mode with split panels feature</caption>
+            <image>https://npub1zfss807aer0j26mwp2la0ume0jqde3823rmu97ra6sgyyg956e0s6xw445.blossom.band/9cea2a2d5d18ec6472d357f7288f283dc43c672580956cef3242f0d07e214691.png</image>
+        </screenshot>
+        <screenshot>
+            <caption>Example of screening chat request</caption>
+            <image>https://npub1zfss807aer0j26mwp2la0ume0jqde3823rmu97ra6sgyyg956e0s6xw445.blossom.band/6f1c32b150788b706dd29a311bd7e342c63387013c0b084392b2e5a05c7908d5.png</image>
+        </screenshot>
+        <screenshot>
+            <caption>Example of composing a new message</caption>
+            <image>https://npub1zfss807aer0j26mwp2la0ume0jqde3823rmu97ra6sgyyg956e0s6xw445.blossom.band/9be26d1132de3feff0a518cb17afd8319e421ed2cfb0035cb47aceba928bf96d.png</image>
+        </screenshot>
+    </screenshots>
+
+    <releases>
+		@release_info@
+		<release version="0.0.0" date="1970-01-01">
+			<description>
+				<p>Dummy release to keep flatpak-builder AppStream metadata validation from complaining</p>
+			</description>
+		</release>
+    </releases>
+</component>

crates/coop/resources/flatpak/manifest-template.json

@@ -0,0 +1,58 @@
+{
+  "id": "$APP_ID",
+  "runtime": "org.freedesktop.Platform",
+  "runtime-version": "24.08",
+  "sdk": "org.freedesktop.Sdk",
+  "sdk-extensions": ["org.freedesktop.Sdk.Extension.rust-stable"],
+  "command": "coop",
+  "finish-args": [
+    "--talk-name=org.freedesktop.Flatpak",
+    "--device=dri",
+    "--share=ipc",
+    "--share=network",
+    "--socket=wayland",
+    "--socket=fallback-x11",
+    "--socket=pulseaudio",
+    "--filesystem=host"
+  ],
+  "build-options": {
+    "append-path": "/usr/lib/sdk/rust-stable/bin"
+  },
+  "modules": [
+    {
+      "name": "coop",
+      "buildsystem": "simple",
+      "build-options": {
+        "env": {
+          "APP_ID": "$APP_ID",
+          "APP_ICON": "$APP_ID",
+          "APP_NAME": "$APP_NAME",
+          "BRANDING_LIGHT": "$BRANDING_LIGHT",
+          "BRANDING_DARK": "$BRANDING_DARK",
+          "APP_CLI": "coop",
+          "APP_ARGS": "--foreground %U",
+          "DO_STARTUP_NOTIFY": "false"
+        }
+      },
+      "build-commands": [
+        "install -Dm644 $ICON_FILE.png /app/share/icons/hicolor/512x512/apps/$APP_ID.png",
+        "envsubst < coop.desktop.in > coop.desktop && install -Dm644 coop.desktop /app/share/applications/$APP_ID.desktop",
+        "envsubst < flatpak/coop.metainfo.xml.in > coop.metainfo.xml && install -Dm644 coop.metainfo.xml /app/share/metainfo/$APP_ID.metainfo.xml",
+        "sed -i -e '/@release_info@/{r flatpak/release-info/$CHANNEL' -e 'd}' /app/share/metainfo/$APP_ID.metainfo.xml",
+        "install -Dm755 bin/coop /app/bin/coop",
+        "install -Dm755 libexec/coop /app/libexec/coop",
+        "install -Dm755 lib/* -t /app/lib"
+      ],
+      "sources": [
+        {
+          "type": "archive",
+          "path": "./target/release/$ARCHIVE"
+        },
+        {
+          "type": "dir",
+          "path": "./crates/coop/resources"
+        }
+      ]
+    }
+  ]
+}

crates/coop/resources/snap/snapcraft.yaml.in

@@ -0,0 +1,60 @@
+name: coop
+title: Coop
+base: core24
+version: "$RELEASE_VERSION"
+summary: Chat Freely, Stay Private on Nostr
+description: |
+  Chat freely without sharing phone numbers or emails.
+  Your messages are encrypted, and your privacy stays protected.
+  Just privacy, made simple - with Nostr.
+grade: stable
+confinement: classic
+compression: lzo
+website: https://reya.su/coop
+source-code: https://github.com/lumehq/coop
+issues: https://github.com/lumehq/coop/issues
+contact: https://reya.su
+
+parts:
+  coop:
+    plugin: dump
+    source: target/release/coop-linux-$ARCH_SUFFIX.tar.gz
+
+    organize:
+      # These renames seem to not be necessary, but it's tidier.
+      bin: usr/bin
+      libexec: usr/libexec
+
+    stage-packages:
+      - libasound2t64
+      # snapcraft has a lint that this is unused, but without it Coop exits with
+      # "Missing Vulkan entry points: LibraryLoadFailure" in blade_graphics.
+      - libvulkan1
+      # snapcraft has a lint that this is unused, but without it Coop exits with
+      # "NoWaylandLib" when run with Wayland.
+      - libwayland-client0
+      - libxcb1
+      - libxkbcommon-x11-0
+      - libxkbcommon0
+
+    build-attributes:
+      - enable-patchelf
+
+    prime:
+      # Omit unneeded files from the tarball
+      - -lib
+      - -licenses.md
+      - -share
+
+      # Omit unneeded files from stage-packages
+      - -etc
+      - -usr/share/doc
+      - -usr/share/lintian
+      - -usr/share/man
+
+apps:
+  coop:
+    command: usr/bin/coop
+    common-id: su.reya.coop
+    environment:
+      COOP_BUNDLE_TYPE: snap

crates/coop/src/actions.rs

@@ -0,0 +1,94 @@
+use std::sync::Mutex;
+
+use gpui::{actions, App};
+use key_store::{KeyItem, KeyStore};
+use nostr_connect::prelude::*;
+use state::NostrRegistry;
+
+// Sidebar actions
+actions!(sidebar, [Reload, RelayStatus]);
+
+// User actions
+actions!(
+    coop,
+    [
+        KeyringPopup,
+        DarkMode,
+        ViewProfile,
+        ViewRelays,
+        Themes,
+        Settings,
+        Logout,
+        Quit
+    ]
+);
+
+#[derive(Debug, Clone)]
+pub struct CoopAuthUrlHandler;
+
+impl AuthUrlHandler for CoopAuthUrlHandler {
+    #[allow(mismatched_lifetime_syntaxes)]
+    fn on_auth_url(&self, auth_url: Url) -> BoxedFuture<Result<()>> {
+        Box::pin(async move {
+            log::info!("Received Auth URL: {auth_url}");
+            webbrowser::open(auth_url.as_str())?;
+            Ok(())
+        })
+    }
+}
+
+pub fn load_embedded_fonts(cx: &App) {
+    let asset_source = cx.asset_source();
+    let font_paths = asset_source.list("fonts").unwrap();
+    let embedded_fonts = Mutex::new(Vec::new());
+    let executor = cx.background_executor();
+
+    executor.block(executor.scoped(|scope| {
+        for font_path in &font_paths {
+            if !font_path.ends_with(".ttf") {
+                continue;
+            }
+
+            scope.spawn(async {
+                let font_bytes = asset_source.load(font_path).unwrap().unwrap();
+                embedded_fonts.lock().unwrap().push(font_bytes);
+            });
+        }
+    }));
+
+    cx.text_system()
+        .add_fonts(embedded_fonts.into_inner().unwrap())
+        .unwrap();
+}
+
+pub fn reset(cx: &mut App) {
+    let backend = KeyStore::global(cx).read(cx).backend();
+    let client = NostrRegistry::global(cx).read(cx).client();
+
+    cx.spawn(async move |cx| {
+        // Remove the signer
+        client.unset_signer().await;
+
+        // Delete user's credentials
+        backend
+            .delete_credentials(&KeyItem::User.to_string(), cx)
+            .await
+            .ok();
+
+        // Remove bunker's credentials if available
+        backend
+            .delete_credentials(&KeyItem::Bunker.to_string(), cx)
+            .await
+            .ok();
+
+        cx.update(|cx| {
+            cx.restart();
+        });
+    })
+    .detach();
+}
+
+pub fn quit(_: &Quit, cx: &mut App) {
+    log::info!("Gracefully quitting the application . . .");
+    cx.quit();
+}

crates/coop/src/asset.rs

@@ -1,27 +0,0 @@
-use anyhow::anyhow;
-use gpui::{AssetSource, Result, SharedString};
-use rust_embed::RustEmbed;
-
-#[derive(RustEmbed)]
-#[folder = "../../assets"]
-pub struct Assets;
-
-impl AssetSource for Assets {
-    fn load(&self, path: &str) -> Result<Option<std::borrow::Cow<'static, [u8]>>> {
-        Self::get(path)
-            .map(|f| Some(f.data))
-            .ok_or_else(|| anyhow!("could not find asset at path \"{}\"", path))
-    }
-
-    fn list(&self, path: &str) -> Result<Vec<SharedString>> {
-        Ok(Self::iter()
-            .filter_map(|p| {
-                if p.starts_with(path) {
-                    Some(p.into())
-                } else {
-                    None
-                }
-            })
-            .collect())
-    }
-}

crates/coop/src/chatspace.rs

@@ -1,35 +1,42 @@
-use account::Account;
-use anyhow::Error;
-use global::get_client;
-use gpui::{
-    div, image_cache, impl_internal_actions, prelude::FluentBuilder, px, App, AppContext, Axis,
-    Context, Entity, InteractiveElement, IntoElement, ParentElement, Render, Styled, Subscription,
-    Task, Window,
-};
-use nostr_sdk::prelude::*;
-use serde::Deserialize;
-use smallvec::{smallvec, SmallVec};
 use std::sync::Arc;
-use ui::{
-    button::{Button, ButtonVariants},
-    dock_area::{dock::DockPlacement, panel::PanelView, DockArea, DockItem},
-    theme::{ActiveTheme, Appearance, Theme},
-    ContextModal, IconName, Root, Sizable, TitleBar,
-};
 
-use crate::{
-    lru_cache::cache_provider,
-    views::{
-        chat, compose, contacts, login, new_account, onboarding, profile, relays, sidebar, welcome,
-    },
+use auto_update::{AutoUpdateStatus, AutoUpdater};
+use chat::{ChatEvent, ChatRegistry};
+use chat_ui::{CopyPublicKey, OpenPublicKey};
+use common::DEFAULT_SIDEBAR_WIDTH;
+use gpui::prelude::FluentBuilder;
+use gpui::{
+    deferred, div, px, relative, rems, App, AppContext, Axis, ClipboardItem, Context, Entity,
+    InteractiveElement, IntoElement, ParentElement, Render, SharedString,
+    StatefulInteractiveElement, Styled, Subscription, Window,
 };
+use key_store::{Credential, KeyItem, KeyStore};
+use nostr_connect::prelude::*;
+use person::PersonRegistry;
+use relay_auth::RelayAuth;
+use smallvec::{smallvec, SmallVec};
+use state::NostrRegistry;
+use theme::{ActiveTheme, Theme, ThemeMode, ThemeRegistry};
+use title_bar::TitleBar;
+use ui::avatar::Avatar;
+use ui::button::{Button, ButtonVariants};
+use ui::dock_area::dock::DockPlacement;
+use ui::dock_area::panel::PanelView;
+use ui::dock_area::{ClosePanel, DockArea, DockItem};
+use ui::modal::ModalButtonProps;
+use ui::popup_menu::PopupMenuExt;
+use ui::{h_flex, v_flex, ContextModal, IconName, Root, Sizable, StyledExt};
 
-const CACHE_SIZE: usize = 200;
-const MODAL_WIDTH: f32 = 420.;
-const SIDEBAR_WIDTH: f32 = 280.;
+use crate::actions::{
+    reset, DarkMode, KeyringPopup, Logout, Settings, Themes, ViewProfile, ViewRelays,
+};
+use crate::user::viewer;
+use crate::views::compose::compose_button;
+use crate::views::{onboarding, preferences, setup_relay, startup, welcome};
+use crate::{login, new_identity, sidebar, user};
 
 pub fn init(window: &mut Window, cx: &mut App) -> Entity<ChatSpace> {
-    ChatSpace::new(window, cx)
+    cx.new(|cx| ChatSpace::new(window, cx))
 }
 
 pub fn login(window: &mut Window, cx: &mut App) {
@@ -38,238 +45,391 @@ pub fn login(window: &mut Window, cx: &mut App) {
 }
 
 pub fn new_account(window: &mut Window, cx: &mut App) {
-    let panel = new_account::init(window, cx);
+    let panel = new_identity::init(window, cx);
     ChatSpace::set_center_panel(panel, window, cx);
 }
 
-#[derive(Clone, PartialEq, Eq, Deserialize)]
-pub enum PanelKind {
-    Room(u64),
-    // More kind will be added here
-}
-
-#[derive(Clone, PartialEq, Eq, Deserialize)]
-pub enum ModalKind {
-    Profile,
-    Compose,
-    Contact,
-    Relay,
-    SetupRelay,
-}
-
-#[derive(Clone, PartialEq, Eq, Deserialize)]
-pub struct ToggleModal {
-    pub modal: ModalKind,
-}
-
-impl_internal_actions!(dock, [AddPanel, ToggleModal]);
-
-#[derive(Clone, PartialEq, Eq, Deserialize)]
-pub struct AddPanel {
-    panel: PanelKind,
-    position: DockPlacement,
-}
-
-impl AddPanel {
-    pub fn new(panel: PanelKind, position: DockPlacement) -> Self {
-        Self { panel, position }
-    }
-}
-
+#[derive(Debug)]
 pub struct ChatSpace {
-    titlebar: bool,
+    /// App's Title Bar
+    title_bar: Entity<TitleBar>,
+
+    /// App's Dock Area
     dock: Entity<DockArea>,
-    #[allow(unused)]
-    subscriptions: SmallVec<[Subscription; 1]>,
+
+    /// Determines if the chat space is ready to use
+    ready: bool,
+
+    /// Event subscriptions
+    _subscriptions: SmallVec<[Subscription; 4]>,
 }
 
 impl ChatSpace {
-    pub fn new(window: &mut Window, cx: &mut App) -> Entity<Self> {
-        let dock = cx.new(|cx| {
-            let panel = Arc::new(onboarding::init(window, cx));
-            let center = DockItem::panel(panel);
-            let mut dock = DockArea::new(window, cx);
-            // Initialize the dock area with the center panel
-            dock.set_center(center, window, cx);
-            dock
-        });
+    pub fn new(window: &mut Window, cx: &mut Context<Self>) -> Self {
+        let nostr = NostrRegistry::global(cx);
+        let chat = ChatRegistry::global(cx);
+        let keystore = KeyStore::global(cx);
 
-        cx.new(|cx| {
-            let account = Account::global(cx);
-            let mut subscriptions = smallvec![];
+        let title_bar = cx.new(|_| TitleBar::new());
+        let dock = cx.new(|cx| DockArea::new(window, cx));
 
-            subscriptions.push(cx.observe_in(
-                &account,
-                window,
-                |this: &mut ChatSpace, account, window, cx| {
-                    if account.read(cx).profile.is_some() {
-                        this.open_chats(window, cx);
-                    } else {
-                        this.open_onboarding(window, cx);
+        let identity = nostr.read(cx).identity();
+
+        let mut subscriptions = smallvec![];
+
+        subscriptions.push(
+            // Automatically sync theme with system appearance
+            window.observe_window_appearance(|window, cx| {
+                Theme::sync_system_appearance(Some(window), cx);
+            }),
+        );
+
+        subscriptions.push(
+            // Observe account entity changes
+            cx.observe_in(&identity, window, move |this, state, window, cx| {
+                if !this.ready && state.read(cx).has_public_key() {
+                    this.set_default_layout(window, cx);
+
+                    // Load all chat room in the database if available
+                    let chat = ChatRegistry::global(cx);
+                    chat.update(cx, |this, cx| {
+                        this.get_rooms(cx);
+                    });
+                };
+            }),
+        );
+
+        subscriptions.push(
+            // Observe keystore entity changes
+            cx.observe_in(&keystore, window, move |_this, state, window, cx| {
+                if state.read(cx).initialized {
+                    let backend = state.read(cx).backend();
+
+                    cx.spawn_in(window, async move |this, cx| {
+                        let result = backend
+                            .read_credentials(&KeyItem::User.to_string(), cx)
+                            .await;
+
+                        this.update_in(cx, |this, window, cx| {
+                            match result {
+                                Ok(Some((user, secret))) => {
+                                    let credential = Credential::new(user, secret);
+                                    this.set_startup_layout(credential, window, cx);
+                                }
+                                _ => {
+                                    this.set_onboarding_layout(window, cx);
+                                }
+                            };
+                        })
+                        .ok();
+                    })
+                    .detach();
+                }
+            }),
+        );
+
+        subscriptions.push(
+            // Observe all events emitted by the chat registry
+            cx.subscribe_in(&chat, window, move |this, chat, ev, window, cx| {
+                match ev {
+                    ChatEvent::OpenRoom(id) => {
+                        if let Some(room) = chat.read(cx).room(id, cx) {
+                            this.dock.update(cx, |this, cx| {
+                                this.add_panel(
+                                    Arc::new(chat_ui::init(room, window, cx)),
+                                    DockPlacement::Center,
+                                    window,
+                                    cx,
+                                );
+                            });
+                        }
                     }
-                },
-            ));
+                    ChatEvent::CloseRoom(..) => {
+                        this.dock.update(cx, |this, cx| {
+                            // Force focus to the tab panel
+                            this.focus_tab_panel(window, cx);
+                            // Dispatch the close panel action
+                            cx.defer_in(window, |_, window, cx| {
+                                window.dispatch_action(Box::new(ClosePanel), cx);
+                                window.close_all_modals(cx);
+                            });
+                        });
+                    }
+                    _ => {}
+                };
+            }),
+        );
 
-            Self {
-                dock,
-                subscriptions,
-                titlebar: false,
-            }
-        })
+        subscriptions.push(
+            // Observe the chat registry
+            cx.observe(&chat, move |this, chat, cx| {
+                let ids = this.get_all_panels(cx);
+
+                chat.update(cx, |this, cx| {
+                    this.refresh_rooms(ids, cx);
+                });
+            }),
+        );
+
+        Self {
+            dock,
+            title_bar,
+            ready: false,
+            _subscriptions: subscriptions,
+        }
     }
 
-    fn show_titlebar(&mut self, cx: &mut Context<Self>) {
-        self.titlebar = true;
-        cx.notify();
-    }
-
-    fn open_onboarding(&mut self, window: &mut Window, cx: &mut Context<Self>) {
+    fn set_onboarding_layout(&mut self, window: &mut Window, cx: &mut Context<Self>) {
         let panel = Arc::new(onboarding::init(window, cx));
         let center = DockItem::panel(panel);
 
         self.dock.update(cx, |this, cx| {
+            this.reset(window, cx);
             this.set_center(center, window, cx);
         });
     }
 
-    fn open_chats(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        self.show_titlebar(cx);
+    fn set_startup_layout(&mut self, cre: Credential, window: &mut Window, cx: &mut Context<Self>) {
+        let panel = Arc::new(startup::init(cre, window, cx));
+        let center = DockItem::panel(panel);
 
+        self.dock.update(cx, |this, cx| {
+            this.reset(window, cx);
+            this.set_center(center, window, cx);
+        });
+    }
+
+    fn set_default_layout(&mut self, window: &mut Window, cx: &mut Context<Self>) {
         let weak_dock = self.dock.downgrade();
-        let left = DockItem::panel(Arc::new(sidebar::init(window, cx)));
+
+        let sidebar = Arc::new(sidebar::init(window, cx));
+        let center = Arc::new(welcome::init(window, cx));
+
+        let left = DockItem::panel(sidebar);
         let center = DockItem::split_with_sizes(
             Axis::Vertical,
-            vec![DockItem::tabs(
-                vec![Arc::new(welcome::init(window, cx))],
-                None,
-                &weak_dock,
-                window,
-                cx,
-            )],
+            vec![DockItem::tabs(vec![center], None, &weak_dock, window, cx)],
             vec![None],
             &weak_dock,
             window,
             cx,
         );
 
+        self.ready = true;
         self.dock.update(cx, |this, cx| {
-            this.set_left_dock(left, Some(px(SIDEBAR_WIDTH)), true, window, cx);
+            this.set_left_dock(left, Some(px(DEFAULT_SIDEBAR_WIDTH)), true, window, cx);
             this.set_center(center, window, cx);
         });
-
-        cx.defer_in(window, |this, window, cx| {
-            let verify_messaging_relays = this.verify_messaging_relays(cx);
-
-            cx.spawn_in(window, async move |_, cx| {
-                if let Ok(status) = verify_messaging_relays.await {
-                    if !status {
-                        cx.update(|window, cx| {
-                            window.dispatch_action(
-                                Box::new(ToggleModal {
-                                    modal: ModalKind::SetupRelay,
-                                }),
-                                cx,
-                            );
-                        })
-                        .ok();
-                    }
-                }
-            })
-            .detach();
-        });
     }
 
-    fn verify_messaging_relays(&self, cx: &App) -> Task<Result<bool, Error>> {
-        cx.background_spawn(async move {
-            let client = get_client();
-            let signer = client.signer().await?;
-            let public_key = signer.get_public_key().await?;
+    fn on_settings(&mut self, _ev: &Settings, window: &mut Window, cx: &mut Context<Self>) {
+        let view = preferences::init(window, cx);
 
-            let filter = Filter::new()
-                .kind(Kind::InboxRelays)
-                .author(public_key)
-                .limit(1);
+        window.open_modal(cx, move |modal, _window, _cx| {
+            modal
+                .title(SharedString::from("Preferences"))
+                .width(px(520.))
+                .child(view.clone())
+        });
+    }
 
-            let exist = client.database().query(filter).await?.first().is_some();
+    fn on_profile(&mut self, _ev: &ViewProfile, window: &mut Window, cx: &mut Context<Self>) {
+        let view = user::init(window, cx);
+        let entity = view.downgrade();
 
-            Ok(exist)
+        window.open_modal(cx, move |modal, _window, _cx| {
+            let entity = entity.clone();
+
+            modal
+                .title("Profile")
+                .confirm()
+                .child(view.clone())
+                .button_props(ModalButtonProps::default().ok_text("Update"))
+                .on_ok(move |_, window, cx| {
+                    entity
+                        .update(cx, |this, cx| {
+                            let persons = PersonRegistry::global(cx);
+                            let set_metadata = this.set_metadata(cx);
+
+                            cx.spawn_in(window, async move |this, cx| {
+                                let result = set_metadata.await;
+
+                                this.update_in(cx, |_, window, cx| {
+                                    match result {
+                                        Ok(person) => {
+                                            persons.update(cx, |this, cx| {
+                                                this.insert(person, cx);
+                                                // Close the edit profile modal
+                                                window.close_all_modals(cx);
+                                            });
+                                        }
+                                        Err(e) => {
+                                            window.push_notification(e.to_string(), cx);
+                                        }
+                                    };
+                                })
+                                .ok();
+                            })
+                            .detach();
+                        })
+                        .ok();
+
+                    // false to keep the modal open
+                    false
+                })
+        });
+    }
+
+    fn on_relays(&mut self, _ev: &ViewRelays, window: &mut Window, cx: &mut Context<Self>) {
+        let view = setup_relay::init(window, cx);
+        let entity = view.downgrade();
+
+        window.open_modal(cx, move |this, _window, _cx| {
+            let entity = entity.clone();
+
+            this.confirm()
+                .title(SharedString::from("Set Up Messaging Relays"))
+                .child(view.clone())
+                .button_props(ModalButtonProps::default().ok_text("Update"))
+                .on_ok(move |_, window, cx| {
+                    entity
+                        .update(cx, |this, cx| {
+                            this.set_relays(window, cx);
+                        })
+                        .ok();
+
+                    // false to keep the modal open
+                    false
+                })
+        });
+    }
+
+    fn on_dark_mode(&mut self, _ev: &DarkMode, window: &mut Window, cx: &mut Context<Self>) {
+        if cx.theme().mode.is_dark() {
+            Theme::change(ThemeMode::Light, Some(window), cx);
+        } else {
+            Theme::change(ThemeMode::Dark, Some(window), cx);
+        }
+    }
+
+    fn on_themes(&mut self, _ev: &Themes, window: &mut Window, cx: &mut Context<Self>) {
+        window.open_modal(cx, move |this, _window, cx| {
+            let registry = ThemeRegistry::global(cx);
+            let themes = registry.read(cx).themes();
+
+            this.title("Select theme")
+                .show_close(true)
+                .overlay_closable(true)
+                .child(v_flex().gap_2().pb_4().children({
+                    let mut items = Vec::with_capacity(themes.len());
+
+                    for (name, theme) in themes.iter() {
+                        items.push(
+                            h_flex()
+                                .h_10()
+                                .justify_between()
+                                .child(
+                                    v_flex()
+                                        .child(
+                                            div()
+                                                .text_sm()
+                                                .text_color(cx.theme().text)
+                                                .line_height(relative(1.3))
+                                                .child(theme.name.clone()),
+                                        )
+                                        .child(
+                                            div()
+                                                .text_xs()
+                                                .text_color(cx.theme().text_muted)
+                                                .child(theme.author.clone()),
+                                        ),
+                                )
+                                .child(
+                                    Button::new(format!("change-{name}"))
+                                        .label("Set")
+                                        .small()
+                                        .ghost()
+                                        .on_click({
+                                            let theme = theme.clone();
+                                            move |_ev, window, cx| {
+                                                Theme::apply_theme(theme.clone(), Some(window), cx);
+                                            }
+                                        }),
+                                ),
+                        );
+                    }
+
+                    items
+                }))
         })
     }
 
-    fn on_panel_action(&mut self, action: &AddPanel, window: &mut Window, cx: &mut Context<Self>) {
-        match &action.panel {
-            PanelKind::Room(id) => {
-                // User must be logged in to open a room
-                match chat::init(id, window, cx) {
-                    Ok(panel) => {
-                        self.dock.update(cx, |dock_area, cx| {
-                            dock_area.add_panel(panel, action.position, window, cx);
-                        });
-                    }
-                    Err(e) => window.push_notification(e.to_string(), cx),
-                }
-            }
-        };
+    fn on_sign_out(&mut self, _e: &Logout, _window: &mut Window, cx: &mut Context<Self>) {
+        reset(cx);
     }
 
-    fn on_modal_action(
-        &mut self,
-        action: &ToggleModal,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        match action.modal {
-            ModalKind::Profile => {
-                let profile = profile::init(window, cx);
+    fn on_open_pubkey(&mut self, ev: &OpenPublicKey, window: &mut Window, cx: &mut Context<Self>) {
+        let public_key = ev.0;
+        let view = viewer::init(public_key, window, cx);
 
-                window.open_modal(cx, move |modal, _, _| {
-                    modal
-                        .title("Profile")
-                        .width(px(MODAL_WIDTH))
-                        .child(profile.clone())
+        window.open_modal(cx, move |this, _window, _cx| {
+            this.alert()
+                .show_close(true)
+                .overlay_closable(true)
+                .child(view.clone())
+                .button_props(ModalButtonProps::default().ok_text("View on njump.me"))
+                .on_ok(move |_, _window, cx| {
+                    let bech32 = public_key.to_bech32().unwrap();
+                    let url = format!("https://njump.me/{bech32}");
+
+                    // Open the URL in the default browser
+                    cx.open_url(&url);
+
+                    // false to keep the modal open
+                    false
                 })
-            }
-            ModalKind::Compose => {
-                let compose = compose::init(window, cx);
-
-                window.open_modal(cx, move |modal, _, _| {
-                    modal
-                        .title("Direct Messages")
-                        .width(px(MODAL_WIDTH))
-                        .child(compose.clone())
-                })
-            }
-            ModalKind::Contact => {
-                let contacts = contacts::init(window, cx);
-
-                window.open_modal(cx, move |this, _window, _cx| {
-                    this.width(px(MODAL_WIDTH))
-                        .title("Contacts")
-                        .child(contacts.clone())
-                });
-            }
-            ModalKind::Relay => {
-                let relays = relays::init(window, cx);
-
-                window.open_modal(cx, move |this, _, _| {
-                    this.width(px(MODAL_WIDTH))
-                        .title("Edit your Messaging Relays")
-                        .child(relays.clone())
-                });
-            }
-            ModalKind::SetupRelay => {
-                let relays = relays::init(window, cx);
-
-                window.open_modal(cx, move |this, _, _| {
-                    this.width(px(MODAL_WIDTH))
-                        .title("Your Messaging Relays are not configured")
-                        .child(relays.clone())
-                });
-            }
-        };
+        });
     }
 
-    pub(crate) fn set_center_panel<P: PanelView>(panel: P, window: &mut Window, cx: &mut App) {
+    fn on_copy_pubkey(&mut self, ev: &CopyPublicKey, window: &mut Window, cx: &mut Context<Self>) {
+        let Ok(bech32) = ev.0.to_bech32();
+        cx.write_to_clipboard(ClipboardItem::new_string(bech32));
+        window.push_notification("Copied", cx);
+    }
+
+    fn on_keyring(&mut self, _ev: &KeyringPopup, window: &mut Window, cx: &mut Context<Self>) {
+        window.open_modal(cx, move |this, _window, _cx| {
+            this.show_close(true)
+                .title(SharedString::from("Keyring is disabled"))
+                .child(
+                    v_flex()
+                        .gap_2()
+                        .pb_4()
+                        .text_sm()
+                        .child(SharedString::from("Coop cannot access the Keyring Service on your system. By design, Coop uses Keyring to store your credentials."))
+                        .child(SharedString::from("Without access to Keyring, Coop will store your credentials as plain text."))
+                        .child(SharedString::from("If you want to store your credentials in the Keyring, please enable Keyring and allow Coop to access it.")),
+                )
+        });
+    }
+
+    fn get_all_panels(&self, cx: &App) -> Option<Vec<u64>> {
+        let ids: Vec<u64> = self
+            .dock
+            .read(cx)
+            .items
+            .panel_ids(cx)
+            .into_iter()
+            .filter_map(|panel| panel.parse::<u64>().ok())
+            .collect();
+
+        Some(ids)
+    }
+
+    fn set_center_panel<P>(panel: P, window: &mut Window, cx: &mut App)
+    where
+        P: PanelView,
+    {
         if let Some(Some(root)) = window.root::<Root>() {
             if let Ok(chatspace) = root.read(cx).view().clone().downcast::<ChatSpace>() {
                 let panel = Arc::new(panel);
@@ -283,6 +443,190 @@ impl ChatSpace {
             }
         }
     }
+
+    fn titlebar_left(&mut self, _window: &mut Window, cx: &Context<Self>) -> impl IntoElement {
+        let nostr = NostrRegistry::global(cx);
+        let chat = ChatRegistry::global(cx);
+        let status = chat.read(cx).loading();
+
+        if !nostr.read(cx).identity().read(cx).has_public_key() {
+            return div();
+        }
+
+        h_flex()
+            .gap_2()
+            .h_6()
+            .w_full()
+            .child(compose_button())
+            .when(status, |this| {
+                this.child(deferred(
+                    h_flex()
+                        .px_2()
+                        .h_6()
+                        .gap_1()
+                        .text_xs()
+                        .rounded_full()
+                        .bg(cx.theme().surface_background)
+                        .child(SharedString::from(
+                            "Getting messages. This may take a while...",
+                        )),
+                ))
+            })
+    }
+
+    fn titlebar_right(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
+        let auto_update = AutoUpdater::global(cx);
+
+        let relay_auth = RelayAuth::global(cx);
+        let pending_requests = relay_auth.read(cx).pending_requests(cx);
+
+        let nostr = NostrRegistry::global(cx);
+        let identity = nostr.read(cx).identity();
+
+        h_flex()
+            .gap_2()
+            .map(|this| match auto_update.read(cx).status.as_ref() {
+                AutoUpdateStatus::Checking => this.child(
+                    div()
+                        .text_xs()
+                        .text_color(cx.theme().text_muted)
+                        .child(SharedString::from("Checking for Coop updates...")),
+                ),
+                AutoUpdateStatus::Installing => this.child(
+                    div()
+                        .text_xs()
+                        .text_color(cx.theme().text_muted)
+                        .child(SharedString::from("Installing updates...")),
+                ),
+                AutoUpdateStatus::Errored { msg } => this.child(
+                    div()
+                        .text_xs()
+                        .text_color(cx.theme().text_muted)
+                        .child(SharedString::from(msg.as_ref())),
+                ),
+                AutoUpdateStatus::Updated => this.child(
+                    div()
+                        .id("restart")
+                        .text_xs()
+                        .text_color(cx.theme().text_muted)
+                        .child(SharedString::from("Updated. Click to restart"))
+                        .on_click(|_ev, _window, cx| {
+                            cx.restart();
+                        }),
+                ),
+                _ => this.child(div()),
+            })
+            .when(pending_requests > 0, |this| {
+                this.child(
+                    h_flex()
+                        .id("requests")
+                        .h_6()
+                        .px_2()
+                        .items_center()
+                        .justify_center()
+                        .text_xs()
+                        .rounded_full()
+                        .bg(cx.theme().warning_background)
+                        .text_color(cx.theme().warning_foreground)
+                        .hover(|this| this.bg(cx.theme().warning_hover))
+                        .active(|this| this.bg(cx.theme().warning_active))
+                        .child(SharedString::from(format!(
+                            "You have {} pending authentication requests",
+                            pending_requests
+                        )))
+                        .on_click(move |_ev, window, cx| {
+                            relay_auth.update(cx, |this, cx| {
+                                this.re_ask(window, cx);
+                            });
+                        }),
+                )
+            })
+            .when_some(identity.read(cx).public_key, |this, public_key| {
+                let persons = PersonRegistry::global(cx);
+                let profile = persons.read(cx).get(&public_key, cx);
+
+                let keystore = KeyStore::global(cx);
+                let is_using_file_keystore = keystore.read(cx).is_using_file_keystore();
+
+                let keyring_label = if is_using_file_keystore {
+                    SharedString::from("Disabled")
+                } else {
+                    SharedString::from("Enabled")
+                };
+
+                this.child(
+                    Button::new("user")
+                        .small()
+                        .reverse()
+                        .transparent()
+                        .icon(IconName::CaretDown)
+                        .child(Avatar::new(profile.avatar()).size(rems(1.45)))
+                        .popup_menu(move |this, _window, _cx| {
+                            this.label(profile.name())
+                                .menu_with_icon(
+                                    "Profile",
+                                    IconName::EmojiFill,
+                                    Box::new(ViewProfile),
+                                )
+                                .menu_with_icon(
+                                    "Messaging Relays",
+                                    IconName::Server,
+                                    Box::new(ViewRelays),
+                                )
+                                .separator()
+                                .label(SharedString::from("Keyring Service"))
+                                .menu_with_icon_and_disabled(
+                                    keyring_label.clone(),
+                                    IconName::Encryption,
+                                    Box::new(KeyringPopup),
+                                    !is_using_file_keystore,
+                                )
+                                .separator()
+                                .menu_with_icon("Dark Mode", IconName::Sun, Box::new(DarkMode))
+                                .menu_with_icon("Themes", IconName::Moon, Box::new(Themes))
+                                .menu_with_icon("Settings", IconName::Settings, Box::new(Settings))
+                                .menu_with_icon("Sign Out", IconName::Logout, Box::new(Logout))
+                        }),
+                )
+            })
+    }
+
+    fn titlebar_center(&mut self, cx: &mut Context<Self>) -> impl IntoElement {
+        let entity = cx.entity().downgrade();
+        let panel = self.dock.read(cx).items.view();
+        let title = panel.title(cx);
+        let id = panel.panel_id(cx);
+
+        if id == "Onboarding" {
+            return div();
+        };
+
+        h_flex()
+            .flex_1()
+            .w_full()
+            .justify_center()
+            .text_center()
+            .font_semibold()
+            .text_sm()
+            .child(
+                div().flex_1().child(
+                    Button::new("back")
+                        .icon(IconName::ArrowLeft)
+                        .small()
+                        .ghost_alt()
+                        .rounded()
+                        .on_click(move |_ev, window, cx| {
+                            entity
+                                .update(cx, |this, cx| {
+                                    this.set_onboarding_layout(window, cx);
+                                })
+                                .expect("Entity has been released");
+                        }),
+                ),
+            )
+            .child(div().flex_1().child(title))
+            .child(div().flex_1())
+    }
 }
 
 impl Render for ChatSpace {
@@ -290,73 +634,44 @@ impl Render for ChatSpace {
         let modal_layer = Root::render_modal_layer(window, cx);
         let notification_layer = Root::render_notification_layer(window, cx);
 
+        let left = self.titlebar_left(window, cx).into_any_element();
+        let right = self.titlebar_right(window, cx).into_any_element();
+        let center = self.titlebar_center(cx).into_any_element();
+        let single_panel = self.dock.read(cx).items.panel_ids(cx).is_empty();
+
+        // Update title bar children
+        self.title_bar.update(cx, |this, _cx| {
+            if single_panel {
+                this.set_children(vec![center]);
+            } else {
+                this.set_children(vec![left, right]);
+            }
+        });
+
         div()
+            .id(SharedString::from("chatspace"))
+            .on_action(cx.listener(Self::on_settings))
+            .on_action(cx.listener(Self::on_profile))
+            .on_action(cx.listener(Self::on_relays))
+            .on_action(cx.listener(Self::on_dark_mode))
+            .on_action(cx.listener(Self::on_themes))
+            .on_action(cx.listener(Self::on_sign_out))
+            .on_action(cx.listener(Self::on_open_pubkey))
+            .on_action(cx.listener(Self::on_copy_pubkey))
+            .on_action(cx.listener(Self::on_keyring))
             .relative()
             .size_full()
             .child(
-                image_cache(cache_provider("image-cache", CACHE_SIZE))
+                v_flex()
                     .size_full()
-                    .child(
-                        div()
-                            .flex()
-                            .flex_col()
-                            .size_full()
-                            // Title Bar
-                            .when(self.titlebar, |this| {
-                                this.child(
-                                    TitleBar::new()
-                                        // Left side
-                                        .child(div())
-                                        // Right side
-                                        .child(
-                                            div()
-                                                .flex()
-                                                .items_center()
-                                                .justify_end()
-                                                .gap_2()
-                                                .px_2()
-                                                .child(
-                                                    Button::new("appearance")
-                                                        .xsmall()
-                                                        .ghost()
-                                                        .map(|this| {
-                                                            if cx.theme().appearance.is_dark() {
-                                                                this.icon(IconName::Sun)
-                                                            } else {
-                                                                this.icon(IconName::Moon)
-                                                            }
-                                                        })
-                                                        .on_click(cx.listener(
-                                                            |_, _, window, cx| {
-                                                                if cx.theme().appearance.is_dark() {
-                                                                    Theme::change(
-                                                                        Appearance::Light,
-                                                                        Some(window),
-                                                                        cx,
-                                                                    );
-                                                                } else {
-                                                                    Theme::change(
-                                                                        Appearance::Dark,
-                                                                        Some(window),
-                                                                        cx,
-                                                                    );
-                                                                }
-                                                            },
-                                                        )),
-                                                ),
-                                        ),
-                                )
-                            })
-                            // Dock
-                            .child(self.dock.clone()),
-                    ),
+                    // Title Bar
+                    .child(self.title_bar.clone())
+                    // Dock
+                    .child(self.dock.clone()),
             )
             // Notifications
-            .child(div().absolute().top_8().children(notification_layer))
+            .children(notification_layer)
             // Modals
             .children(modal_layer)
-            // Actions
-            .on_action(cx.listener(Self::on_panel_action))
-            .on_action(cx.listener(Self::on_modal_action))
     }
 }

crates/coop/src/login/mod.rs

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

crates/coop/src/lru_cache.rs

@@ -1,117 +0,0 @@
-use std::{collections::HashMap, sync::Arc};
-
-use futures::FutureExt;
-use gpui::{
-    hash, AnyImageCache, App, AppContext, Asset, AssetLogger, Context, ElementId, Entity,
-    ImageAssetLoader, ImageCache, ImageCacheProvider, Window,
-};
-
-pub fn cache_provider(id: impl Into<ElementId>, max_items: usize) -> LruCacheProvider {
-    LruCacheProvider {
-        id: id.into(),
-        max_items,
-    }
-}
-
-pub struct LruCacheProvider {
-    id: ElementId,
-    max_items: usize,
-}
-
-impl ImageCacheProvider for LruCacheProvider {
-    fn provide(&mut self, window: &mut Window, cx: &mut App) -> AnyImageCache {
-        window
-            .with_global_id(self.id.clone(), |global_id, window| {
-                window.with_element_state::<Entity<LruCache>, _>(global_id, |lru_cache, _window| {
-                    let mut lru_cache =
-                        lru_cache.unwrap_or_else(|| cx.new(|cx| LruCache::new(self.max_items, cx)));
-                    if lru_cache.read(cx).max_items != self.max_items {
-                        lru_cache = cx.new(|cx| LruCache::new(self.max_items, cx));
-                    }
-                    (lru_cache.clone(), lru_cache)
-                })
-            })
-            .into()
-    }
-}
-
-struct LruCache {
-    max_items: usize,
-    usages: Vec<u64>,
-    cache: HashMap<u64, gpui::ImageCacheItem>,
-}
-
-impl LruCache {
-    fn new(max_items: usize, cx: &mut Context<Self>) -> Self {
-        cx.on_release(|simple_cache, cx| {
-            for (_, mut item) in std::mem::take(&mut simple_cache.cache) {
-                if let Some(Ok(image)) = item.get() {
-                    cx.drop_image(image, None);
-                }
-            }
-        })
-        .detach();
-
-        Self {
-            max_items,
-            usages: Vec::with_capacity(max_items),
-            cache: HashMap::with_capacity(max_items),
-        }
-    }
-}
-
-impl ImageCache for LruCache {
-    fn load(
-        &mut self,
-        resource: &gpui::Resource,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> Option<Result<Arc<gpui::RenderImage>, gpui::ImageCacheError>> {
-        assert_eq!(self.usages.len(), self.cache.len());
-        assert!(self.cache.len() <= self.max_items);
-
-        let hash = hash(resource);
-
-        if let Some(item) = self.cache.get_mut(&hash) {
-            let current_ix = self
-                .usages
-                .iter()
-                .position(|item| *item == hash)
-                .expect("cache and usages must stay in sync");
-            self.usages.remove(current_ix);
-            self.usages.insert(0, hash);
-
-            return item.get();
-        }
-
-        let fut = AssetLogger::<ImageAssetLoader>::load(resource.clone(), cx);
-        let task = cx.background_executor().spawn(fut).shared();
-        if self.usages.len() == self.max_items {
-            let oldest = self.usages.pop().unwrap();
-            let mut image = self
-                .cache
-                .remove(&oldest)
-                .expect("cache and usages must be in sync");
-            if let Some(Ok(image)) = image.get() {
-                cx.drop_image(image, Some(window));
-            }
-        }
-        self.cache
-            .insert(hash, gpui::ImageCacheItem::Loading(task.clone()));
-        self.usages.insert(0, hash);
-
-        let entity = window.current_view();
-        window
-            .spawn(cx, {
-                async move |cx| {
-                    _ = task.await;
-                    cx.on_next_frame(move |_, cx| {
-                        cx.notify(entity);
-                    });
-                }
-            })
-            .detach();
-
-        None
-    }
-}

crates/coop/src/main.rs

@@ -1,400 +1,118 @@
-use anyhow::{anyhow, Error};
-use asset::Assets;
-use auto_update::AutoUpdater;
-use chats::ChatRegistry;
-use futures::{select, FutureExt};
-#[cfg(not(target_os = "linux"))]
-use global::constants::APP_NAME;
-use global::{
-    constants::{ALL_MESSAGES_SUB_ID, APP_ID, APP_PUBKEY, BOOTSTRAP_RELAYS, NEW_MESSAGE_SUB_ID},
-    get_client,
-};
+use std::sync::Arc;
+
+use assets::Assets;
+use common::{APP_ID, CLIENT_NAME};
 use gpui::{
-    actions, px, size, App, AppContext, Application, Bounds, KeyBinding, Menu, MenuItem,
-    WindowBounds, WindowKind, WindowOptions,
+    point, px, size, AppContext, Application, Bounds, KeyBinding, Menu, MenuItem, SharedString,
+    TitlebarOptions, WindowBackgroundAppearance, WindowBounds, WindowDecorations, WindowKind,
+    WindowOptions,
 };
-#[cfg(not(target_os = "linux"))]
-use gpui::{point, SharedString, TitlebarOptions};
-#[cfg(target_os = "linux")]
-use gpui::{WindowBackgroundAppearance, WindowDecorations};
-use nostr_sdk::{
-    nips::nip01::Coordinate, pool::prelude::ReqExitPolicy, Client, Event, EventBuilder, EventId,
-    Filter, JsonUtil, Keys, Kind, Metadata, PublicKey, RelayMessage, RelayPoolNotification,
-    SubscribeAutoCloseOptions, SubscriptionId, Tag,
-};
-use smol::Timer;
-use std::{collections::HashSet, mem, sync::Arc, time::Duration};
-use ui::{theme::Theme, Root};
+use ui::Root;
 
-pub(crate) mod asset;
-pub(crate) mod chatspace;
-pub(crate) mod lru_cache;
-pub(crate) mod views;
+use crate::actions::{load_embedded_fonts, quit, Quit};
 
-actions!(coop, [Quit]);
-
-#[derive(Debug)]
-enum Signal {
-    /// Receive event
-    Event(Event),
-    /// Receive metadata
-    Metadata(Box<(PublicKey, Option<Metadata>)>),
-    /// Receive eose
-    Eose,
-    /// Receive app updates
-    AppUpdates(Event),
-}
+mod actions;
+mod chatspace;
+mod login;
+mod new_identity;
+mod sidebar;
+mod user;
+mod views;
 
 fn main() {
-    // Enable logging
+    // Initialize logging
     tracing_subscriber::fmt::init();
-    // Fix crash on startup
-    _ = rustls::crypto::aws_lc_rs::default_provider().install_default();
 
-    let (event_tx, event_rx) = smol::channel::bounded::<Signal>(2048);
-    let (batch_tx, batch_rx) = smol::channel::bounded::<Vec<PublicKey>>(500);
-
-    // Initialize nostr client
-    let client = get_client();
-    let opts = SubscribeAutoCloseOptions::default().exit_policy(ReqExitPolicy::ExitOnEOSE);
-
-    // Initialize application
+    // Initialize the Application
     let app = Application::new()
         .with_assets(Assets)
         .with_http_client(Arc::new(reqwest_client::ReqwestClient::new()));
 
-    // Connect to default relays
-    app.background_executor()
-        .spawn(async move {
-            for relay in BOOTSTRAP_RELAYS.into_iter() {
-                if let Err(e) = client.add_relay(relay).await {
-                    log::error!("Failed to add relay {}: {}", relay, e);
-                }
-            }
-
-            // Establish connection to bootstrap relays
-            client.connect().await;
-
-            log::info!("Connected to bootstrap relays");
-            log::info!("Subscribing to app updates...");
-
-            let coordinate = Coordinate {
-                kind: Kind::Custom(32267),
-                public_key: PublicKey::from_hex(APP_PUBKEY).expect("App Pubkey is invalid"),
-                identifier: APP_ID.into(),
-            };
-
-            let filter = Filter::new()
-                .kind(Kind::ReleaseArtifactSet)
-                .coordinate(&coordinate)
-                .limit(1);
-
-            if let Err(e) = client
-                .subscribe_to(BOOTSTRAP_RELAYS, filter, Some(opts))
-                .await
-            {
-                log::error!("Failed to subscribe for app updates: {}", e);
-            }
-        })
-        .detach();
-
-    // Handle batch metadata
-    app.background_executor()
-        .spawn(async move {
-            const BATCH_SIZE: usize = 500;
-            const BATCH_TIMEOUT: Duration = Duration::from_millis(300);
-
-            let mut batch: HashSet<PublicKey> = HashSet::new();
-
-            loop {
-                let mut timeout = Box::pin(Timer::after(BATCH_TIMEOUT).fuse());
-
-                select! {
-                    pubkeys = batch_rx.recv().fuse() => {
-                        match pubkeys {
-                            Ok(keys) => {
-                                batch.extend(keys);
-                                if batch.len() >= BATCH_SIZE {
-                                    sync_metadata(mem::take(&mut batch), client, opts).await;
-                                }
-                            }
-                            Err(_) => break,
-                        }
-                    }
-                    _ = timeout => {
-                        if !batch.is_empty() {
-                            sync_metadata(mem::take(&mut batch), client, opts).await;
-                        }
-                    }
-                }
-            }
-        })
-        .detach();
-
-    // Handle notifications
-    app.background_executor()
-        .spawn(async move {
-            let rng_keys = Keys::generate();
-            let all_id = SubscriptionId::new(ALL_MESSAGES_SUB_ID);
-            let new_id = SubscriptionId::new(NEW_MESSAGE_SUB_ID);
-            let mut notifications = client.notifications();
-
-            while let Ok(notification) = notifications.recv().await {
-                if let RelayPoolNotification::Message { message, .. } = notification {
-                    match message {
-                        RelayMessage::Event {
-                            event,
-                            subscription_id,
-                        } => {
-                            match event.kind {
-                                Kind::GiftWrap => {
-                                    let event = match get_unwrapped(event.id).await {
-                                        Ok(event) => event,
-                                        Err(_) => match client.unwrap_gift_wrap(&event).await {
-                                            Ok(unwrap) => {
-                                                match unwrap.rumor.sign_with_keys(&rng_keys) {
-                                                    Ok(ev) => {
-                                                        set_unwrapped(event.id, &ev, &rng_keys)
-                                                            .await
-                                                            .ok();
-                                                        ev
-                                                    }
-                                                    Err(_) => continue,
-                                                }
-                                            }
-                                            Err(_) => continue,
-                                        },
-                                    };
-
-                                    let mut pubkeys = vec![];
-                                    pubkeys.extend(event.tags.public_keys());
-                                    pubkeys.push(event.pubkey);
-
-                                    // Send all pubkeys to the batch to sync metadata
-                                    batch_tx.send(pubkeys).await.ok();
-
-                                    // Save the event to the database, use for query directly.
-                                    client.database().save_event(&event).await.ok();
-
-                                    // Send this event to the GPUI
-                                    if new_id == *subscription_id {
-                                        event_tx.send(Signal::Event(event)).await.ok();
-                                    }
-                                }
-                                Kind::Metadata => {
-                                    let metadata = Metadata::from_json(&event.content).ok();
-
-                                    event_tx
-                                        .send(Signal::Metadata(Box::new((event.pubkey, metadata))))
-                                        .await
-                                        .ok();
-                                }
-                                Kind::ContactList => {
-                                    if let Ok(signer) = client.signer().await {
-                                        if let Ok(public_key) = signer.get_public_key().await {
-                                            if public_key == event.pubkey {
-                                                let pubkeys = event
-                                                    .tags
-                                                    .public_keys()
-                                                    .copied()
-                                                    .collect::<Vec<_>>();
-
-                                                batch_tx.send(pubkeys).await.ok();
-                                            }
-                                        }
-                                    }
-                                }
-                                Kind::ReleaseArtifactSet => {
-                                    let filter = Filter::new()
-                                        .ids(event.tags.event_ids().copied())
-                                        .kind(Kind::FileMetadata);
-
-                                    if let Err(e) = client
-                                        .subscribe_to(BOOTSTRAP_RELAYS, filter, Some(opts))
-                                        .await
-                                    {
-                                        log::error!("Failed to subscribe for file metadata: {}", e);
-                                    } else {
-                                        event_tx
-                                            .send(Signal::AppUpdates(event.into_owned()))
-                                            .await
-                                            .ok();
-                                    }
-                                }
-                                _ => {}
-                            }
-                        }
-                        RelayMessage::EndOfStoredEvents(subscription_id) => {
-                            if all_id == *subscription_id {
-                                event_tx.send(Signal::Eose).await.ok();
-                            }
-                        }
-                        _ => {}
-                    }
-                }
-            }
-        })
-        .detach();
-
+    // Run application
     app.run(move |cx| {
-        // Bring the app to the foreground
-        cx.activate(true);
+        // Load embedded fonts in assets/fonts
+        load_embedded_fonts(cx);
 
         // Register the `quit` function
         cx.on_action(quit);
 
-        // Register the `quit` function with CMD+Q
+        // Register the `quit` function with CMD+Q (macOS)
+        #[cfg(target_os = "macos")]
         cx.bind_keys([KeyBinding::new("cmd-q", Quit, None)]);
 
+        // Register the `quit` function with Super+Q (others)
+        #[cfg(not(target_os = "macos"))]
+        cx.bind_keys([KeyBinding::new("super-q", Quit, None)]);
+
         // Set menu items
         cx.set_menus(vec![Menu {
             name: "Coop".into(),
             items: vec![MenuItem::action("Quit", Quit)],
         }]);
 
+        // Set up the window bounds
+        let bounds = Bounds::centered(None, size(px(920.0), px(700.0)), cx);
+
         // Set up the window options
         let opts = WindowOptions {
-            #[cfg(not(target_os = "linux"))]
+            window_background: WindowBackgroundAppearance::Opaque,
+            window_decorations: Some(WindowDecorations::Client),
+            window_bounds: Some(WindowBounds::Windowed(bounds)),
+            kind: WindowKind::Normal,
+            app_id: Some(APP_ID.to_owned()),
             titlebar: Some(TitlebarOptions {
-                title: Some(SharedString::new_static(APP_NAME)),
+                title: Some(SharedString::new_static(CLIENT_NAME)),
                 traffic_light_position: Some(point(px(9.0), px(9.0))),
                 appears_transparent: true,
             }),
-            window_bounds: Some(WindowBounds::Windowed(Bounds::centered(
-                None,
-                size(px(920.0), px(700.0)),
-                cx,
-            ))),
-            #[cfg(target_os = "linux")]
-            window_background: WindowBackgroundAppearance::Transparent,
-            #[cfg(target_os = "linux")]
-            window_decorations: Some(WindowDecorations::Client),
-            kind: WindowKind::Normal,
-            app_id: Some(APP_ID.to_owned()),
             ..Default::default()
         };
 
         // Open a window with default options
         cx.open_window(opts, |window, cx| {
-            // Automatically sync theme with system appearance
-            window
-                .observe_window_appearance(|window, cx| {
-                    Theme::sync_system_appearance(Some(window), cx);
-                })
-                .detach();
+            // Bring the app to the foreground
+            cx.activate(true);
 
-            // Root Entity
             cx.new(|cx| {
+                // Initialize the tokio runtime
+                gpui_tokio::init(cx);
+
                 // Initialize components
                 ui::init(cx);
 
+                // Initialize theme registry
+                theme::init(cx);
+
+                // Initialize backend for keys storage
+                key_store::init(cx);
+
+                // Initialize the nostr client
+                state::init(cx);
+
+                // Initialize device signer
+                //
+                // NIP-4e: https://github.com/nostr-protocol/nips/blob/per-device-keys/4e.md
+                device::init(cx);
+
+                // Initialize settings
+                settings::init(cx);
+
+                // Initialize relay auth registry
+                relay_auth::init(window, cx);
+
+                // Initialize app registry
+                chat::init(cx);
+
+                // Initialize person registry
+                person::init(cx);
+
                 // Initialize auto update
                 auto_update::init(cx);
 
-                // Initialize chat state
-                chats::init(cx);
-
-                // Initialize account state
-                account::init(cx);
-
-                // Spawn a task to handle events from nostr channel
-                cx.spawn_in(window, async move |_, cx| {
-                    while let Ok(signal) = event_rx.recv().await {
-                        cx.update(|window, cx| {
-                            let chats = ChatRegistry::global(cx);
-                            let auto_updater = AutoUpdater::global(cx);
-
-                            match signal {
-                                Signal::Event(event) => {
-                                    chats.update(cx, |this, cx| {
-                                        this.push_message(event, window, cx)
-                                    });
-                                }
-                                Signal::Metadata(data) => {
-                                    chats.update(cx, |this, cx| {
-                                        this.add_profile(data.0, data.1, cx)
-                                    });
-                                }
-                                Signal::Eose => {
-                                    chats.update(cx, |this, cx| {
-                                        // This function maybe called multiple times
-                                        // TODO: only handle the last EOSE signal
-                                        this.load_rooms(window, cx)
-                                    });
-                                }
-                                Signal::AppUpdates(event) => {
-                                    // TODO: add settings for auto updates
-                                    auto_updater.update(cx, |this, cx| {
-                                        this.update(event, cx);
-                                    })
-                                }
-                            };
-                        })
-                        .ok();
-                    }
-                })
-                .detach();
-
+                // Root Entity
                 Root::new(chatspace::init(window, cx).into(), window, cx)
             })
         })
         .expect("Failed to open window. Please restart the application.");
     });
 }
-
-async fn set_unwrapped(root: EventId, event: &Event, keys: &Keys) -> Result<(), Error> {
-    let client = get_client();
-    let event = EventBuilder::new(Kind::Custom(9001), event.as_json())
-        .tags(vec![Tag::event(root)])
-        .sign(keys)
-        .await?;
-
-    client.database().save_event(&event).await?;
-
-    Ok(())
-}
-
-async fn get_unwrapped(gift_wrap: EventId) -> Result<Event, Error> {
-    let client = get_client();
-    let filter = Filter::new()
-        .kind(Kind::Custom(9001))
-        .event(gift_wrap)
-        .limit(1);
-
-    if let Some(event) = client.database().query(filter).await?.first_owned() {
-        let parsed = Event::from_json(event.content)?;
-        Ok(parsed)
-    } else {
-        Err(anyhow!("Event not found"))
-    }
-}
-
-async fn sync_metadata(
-    buffer: HashSet<PublicKey>,
-    client: &Client,
-    opts: SubscribeAutoCloseOptions,
-) {
-    let kinds = vec![
-        Kind::Metadata,
-        Kind::ContactList,
-        Kind::InboxRelays,
-        Kind::UserStatus,
-    ];
-
-    let filter = Filter::new()
-        .authors(buffer.iter().cloned())
-        .limit(buffer.len() * kinds.len())
-        .kinds(kinds);
-
-    if let Err(e) = client
-        .subscribe_to(BOOTSTRAP_RELAYS, filter, Some(opts))
-        .await
-    {
-        log::error!("Failed to sync metadata: {e}");
-    }
-}
-
-fn quit(_: &Quit, cx: &mut App) {
-    log::info!("Gracefully quitting the application . . .");
-    cx.quit();
-}