fix: mobile room chat header layout

2026-05-22 03:00:34 +05:30
339 changed files with 10971 additions and 7311 deletions
@@ -1,6 +1,5 @@
 VITE_DEFAULT_PUBKEYS=06639a386c9c1014217622ccbcf40908c4f1a0c33e23f8d6d68f4abf655f8f71,266815e0c9210dfa324c6cba3573b14bee49da4209a9456f9484e5106cd408a5,391819e2f2f13b90cac7209419eb574ef7c0d1f4e81867fc24c47a3ce5e8a248,3bf0c63fcb93463407af97a5e5ee64fa883d107ef9e558472c4eb9aaaefa459d,3f770d65d3a764a9c5cb503ae123e62ec7598ad035d836e2a810f3877a745b24,55f04590674f3648f4cdc9dc8ce32da2a282074cd0b020596ee033d12d385185,58c741aa630c2da35a56a77c1d05381908bd10504fdd2d8b43f725efa6d23196,61066504617ee79387021e18c89fb79d1ddbc3e7bff19cf2298f40466f8715e9,6389be6491e7b693e9f368ece88fcd145f07c068d2c1bbae4247b9b5ef439d32,63fe6318dc58583cfe16810f86dd09e18bfd76aabc24a0081ce2856f330504ed,6e75f7972397ca3295e0f4ca0fbc6eb9cc79be85bafdd56bd378220ca8eee74e,76c71aae3a491f1d9eec47cba17e229cda4113a0bbb6e6ae1776d7643e29cafa,7fa56f5d6962ab1e3cd424e758c3002b8665f7b0d8dcee9fe9e288d7751ac194,82341f882b6eabcd2ba7f1ef90aad961cf074af15b9ef44a09f9d2a8fbfbe6a2,84dee6e676e5bb67b4ad4e042cf70cbd8681155db535942fcc6a0533858a7240,97c70a44366a6535c145b333f973ea86dfdc2d7a99da618c40c64705ad98e322,b676ded7c768d66a757aa3967b1243d90bf57afb09d1044d3219d8d424e4aea0,dace63b00c42e6e017d00dd190a9328386002ff597b841eb5ef91de4f1ce8491,eeb11961b25442b16389fe6c7ebea9adf0ac36dd596816ea7119e521b8821b9e,fe7f6bc6f7338b76bbf80db402ade65953e20b2f23e66e898204b63cc42539a3
 VITE_DEFAULT_BLOSSOM_SERVERS=https://blossom.primal.net/
-VITE_DEFAULT_SPACES=https://chat.flotilla.social/
 VITE_POMADE_SIGNERS=https://pomade.coracle.social,https://pomade.fiatjaf.com,https://pomade.nostrver.se,https://pomade.scuttle.works
 VITE_PLATFORM_URL=https://app.flotilla.social
 VITE_PLATFORM_TERMS=https://flotilla.social/terms
@@ -15,4 +15,3 @@ android/capacitor-cordova-android-plugins
 android/app/src/androidTest
 android/app/src/test
 node_modules
-.svelte-kit
@@ -1,13 +1,8 @@
-name: Container Image Build and Publish
+name: Docker

 on:
  push:
    branches: [master]
-  workflow_dispatch:
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true

 env:
  REGISTRY: gitea.coracle.social
@@ -37,7 +32,6 @@ jobs:
        with:
          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
          tags: |
-            type=sha
            type=raw,value=latest,enable=${{ github.ref == 'refs/heads/master' }}

      - name: Set up Docker Buildx
@@ -51,7 +45,6 @@ jobs:
        with:
          context: .
          push: true
-          target: production
          platforms: linux/amd64,linux/arm64
          tags: ${{ steps.meta.outputs.tags }}
          labels: ${{ steps.meta.outputs.labels }}
@@ -6,11 +6,6 @@
 vite.config.js.timestamp-*
 vite.config.ts.timestamp-*

-# Playwright
-/test-results/
-/playwright-report/
-/playwright/.cache/
-
 # Generated assets
 static/favicon.ico
 static/pwa-64x64.png
@@ -32,10 +27,13 @@ android/app/src/main/assets/public/
 node_modules/
 .pnpm-store/
 build/
-build-server/
 .svelte-kit/
 .next/

+# Rust/Tauri
+*target/
+src-tauri/binaries/
+
 # iOS
 ios/App/App/public
 ios/DerivedData
@@ -73,7 +71,6 @@ GoogleService-Info.plist
 .idea/
 .vscode/
 .claude/
-.local/

 # OS generated
 .DS_Store
@@ -6,26 +6,22 @@
 # Pass --build-arg VITE_BUILD_HASH=$(git rev-parse --short HEAD) to stamp the build.
 # A .env in the build context is picked up by build.sh for branding config.

-# https://pnpm.io/docker#example-3-build-on-cicd
-FROM node:24-slim AS builder
-ENV PNPM_HOME="/pnpm"
-ENV PATH="$PNPM_HOME:$PATH"
-RUN corepack enable
+FROM node:22-bookworm
+
+RUN npm install -g pnpm@10.33.0

 WORKDIR /app
-ENV NODE_OPTIONS=--max_old_space_size=16384
+
 COPY package.json pnpm-lock.yaml ./
-RUN pnpm i --frozen-lockfile
-COPY . .
-ARG VITE_BUILD_HASH
-RUN pnpm run build
-RUN pnpm run build:server

-FROM node:24-slim AS production
-ENV NODE_ENV=production
-WORKDIR /app
-COPY --from=builder /app/build /app/build
-COPY --from=builder /app/build-server/server.js /app/server.js
+RUN pnpm i --frozen-lockfile
+
+ENV NODE_OPTIONS=--max_old_space_size=16384
+
+COPY . .
+
+RUN pnpm run build
+
 EXPOSE 3000
-USER node
+
 CMD ["node", "server.js"]
@@ -8,34 +8,13 @@ If you would like to be interoperable with Flotilla, please check out this guide

 You can also optionally create an `.env.local` file and populate it with the following environment variables (see `.env.template` for examples):

-**Platform branding**
+- `VITE_DEFAULT_PUBKEYS` - A comma-separated list of hex pubkeys for bootstrapping web of trust
 - `VITE_PLATFORM_URL` - The url where the app will be hosted
 - `VITE_PLATFORM_NAME` - The name of the app
 - `VITE_PLATFORM_LOGO` - A logo url for the app. Can be a local path or https link. Must be a PNG file.
+- `VITE_PLATFORM_RELAYS` - A list of comma-separated relay urls that will make flotilla operate in "platform mode". Disables all space browse/add/select functionality and makes the first platform relay the home page.
 - `VITE_PLATFORM_ACCENT` - A hex color for the app's accent color
 - `VITE_PLATFORM_DESCRIPTION` - A description of the app
- `VITE_PLATFORM_TERMS` - URL to your terms of service page
- `VITE_PLATFORM_PRIVACY` - URL to your privacy policy page
-
-**Platform mode**
- `VITE_PLATFORM_RELAYS` - A comma-separated list of relay urls that will make flotilla operate in "platform mode". Disables all space browse/add/select functionality and makes the first platform relay the home page.
-
-**Defaults**
- `VITE_DEFAULT_PUBKEYS` - A comma-separated list of hex pubkeys for bootstrapping web of trust
- `VITE_DEFAULT_SPACES` - A comma-separated list of relay urls that new users will be automatically joined to on signup
- `VITE_DEFAULT_RELAYS` - A comma-separated list of relay urls used as default outbox/inbox relays
- `VITE_DEFAULT_MESSAGING_RELAYS` - A comma-separated list of relay urls used for encrypted direct messages
- `VITE_DEFAULT_BLOSSOM_SERVERS` - A comma-separated list of blossom server urls used for file uploads
-
-**Infrastructure**
- `VITE_INDEXER_RELAYS` - A comma-separated list of relay urls used for user profile/key lookup
- `VITE_SIGNER_RELAYS` - A comma-separated list of relay urls used for NIP-55 remote signers
- `VITE_BLOCKED_RELAYS` - A comma-separated list of relay urls that will be blocked
- `VITE_PUSH_SERVER` - URL of the push notification server
- `VITE_PUSH_BRIDGE` - WebSocket URL of the push notification relay bridge
- `VITE_VAPID_PUBLIC_KEY` - VAPID public key for web push notifications
- `VITE_POMADE_SIGNERS` - A comma-separated list of Pomade signer server URLs (3+ required to enable email signup)
- `VITE_THUMBNAIL_URL` - URL of the image thumbnail service

 These values **won't** be used for a built version. Instead, env variables should be provided to `build.sh` directly or to the built container.

@@ -36,4 +36,4 @@ include ':capawesome-capacitor-badge'
 project(':capawesome-capacitor-badge').projectDir = new File('../node_modules/.pnpm/@capawesome+capacitor-badge@8.0.0_@capacitor+core@8.0.1/node_modules/@capawesome/capacitor-badge/android')

 include ':nostr-signer-capacitor-plugin'
-project(':nostr-signer-capacitor-plugin').projectDir = new File('../node_modules/.pnpm/nostr-signer-capacitor-plugin@https+++codeload.github.com+coracle-social+nostr-signer-c_a3c0fb15d5bfa83f24d0070ca2583fc9/node_modules/nostr-signer-capacitor-plugin/android')
+project(':nostr-signer-capacitor-plugin').projectDir = new File('../node_modules/.pnpm/nostr-signer-capacitor-plugin@https+++codeload.github.com+coracle-social+nostr-signer-c_2704ecccfd05fcfb1ad8852744422b7c/node_modules/nostr-signer-capacitor-plugin/android')
@@ -1,12 +0,0 @@
-import {expect, test} from "@playwright/test"
-
-test("boots the SPA on the home page", async ({page}) => {
-  const response = await page.goto("/")
-
-  expect(response?.ok()).toBeTruthy()
-
-  // adapter-static serves an empty shell that hydrates client-side, so the presence of
-  // rendered text proves the Svelte app actually mounted (not just that a file was served).
-  // TODO: tighten this to assert concrete onboarding UI once the markup is settled.
-  await expect(page.locator("body")).toContainText(/\S/, {timeout: 15_000})
-})
@@ -1,29 +0,0 @@
-import type {SignedEvent} from "@welshman/util"
-import type {RelayMockConfig} from "../../src/lib/test/relayMocks"
-
-import relay1Events from "./fixtures/relay1.json"
-
-// Fake relay urls used by tests. Each maps to a json fixture under ./fixtures/ and an entry in
-// EVENTS_BY_RELAY below. To add a relay: drop a `<name>.json` file in ./fixtures/, import it, add a
-// url here, and wire it into EVENTS_BY_RELAY.
-export const FIXTURE_RELAYS = {
-  relay1: "wss://relay1.test/",
-} as const
-
-// The events each fake relay serves. The json files hold static, pre-signed events: schnorr
-// signatures are non-deterministic, so events are signed once and committed verbatim (they pass
-// verifyEvent, which netContext.isEventValid enforces). Regenerate with @welshman/signer:
-//   await Nip01Signer.fromSecret(secret).sign(makeEvent(kind, {content, created_at}))
-const EVENTS_BY_RELAY: Record<string, SignedEvent[]> = {
-  [FIXTURE_RELAYS.relay1]: relay1Events as SignedEvent[],
-}
-
-// Build a RelayMockConfig populating the given fixture relays (all of them when none are passed).
-// Any relay not included returns nothing, keeping tests offline.
-export const relayFixtures = (...urls: string[]): RelayMockConfig => {
-  const selected = urls.length > 0 ? urls : Object.keys(EVENTS_BY_RELAY)
-
-  return {
-    relays: Object.fromEntries(selected.map(url => [url, EVENTS_BY_RELAY[url] ?? []])),
-  }
-}
@@ -1,29 +0,0 @@
-[
-  {
-    "kind": 0,
-    "content": "{\"name\":\"Alice\"}",
-    "tags": [],
-    "created_at": 1700000000,
-    "pubkey": "79be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798",
-    "id": "9b3d138641b38364945b20d800268006c2cb7d974bb4b1d63a9f90f5ab974b90",
-    "sig": "de6b86274e7bcf6c02aa881ada1feee9e01ba320691711d4975916b3cd231ab43cf469a47c5db99503ed72707d5db85fede1ad3763c4fbd7c998d04f00eda6bc"
-  },
-  {
-    "kind": 1,
-    "content": "hello from the fixture relay",
-    "tags": [],
-    "created_at": 1700000000,
-    "pubkey": "79be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798",
-    "id": "b9874875bfa8d830c5c9ef3673104360cf21b94848a311febfaf52f0a652b1a9",
-    "sig": "85df94a2e9884ac3d280145492d5191cde2948d49a824c443a1f5d2143633eff1e1789fa7e8843b6efc3dd2dc0d7e33322edb628125d8e35de8ddca1d06ca970"
-  },
-  {
-    "kind": 1,
-    "content": "reply from bob",
-    "tags": [],
-    "created_at": 1700000001,
-    "pubkey": "c6047f9441ed7d6d3045406e95c07cd85c778e4b8cef3ca7abac09b95c709ee5",
-    "id": "171dcbdd63d474ba46da609e8b0104cbcf4801fbb581b6c343d9426280f9e1be",
-    "sig": "eecf26e616a6b70dc67c7eae16fc4fe159314647ba1d4581332257de7f070410aa9a9e41f571b9403ff145d16c9b32766846fce08516201263e25cf08c1ed8f1"
-  }
-]
@@ -1,30 +0,0 @@
-import type {Page} from "@playwright/test"
-import type {RelayMockConfig} from "../../src/lib/test/relayMocks"
-
-// Must match RELAY_MOCKS_KEY in src/lib/test/relayMocks.ts.
-const RELAY_MOCKS_KEY = "__RELAY_MOCKS__"
-
-// Hard safety net: intercept every real websocket so a test can never reach the network, even if
-// some code path opens a socket directly (e.g. relay AUTH) rather than going through the adapter
-// layer. We never call route.connectToServer(), so the socket connects to Playwright's in-process
-// mock and simply receives nothing.
-export const blockWebsockets = (page: Page) => page.routeWebSocket(/^wss?:\/\//, () => {})
-
-// Inject the relay-mock config the app reads on startup. addInitScript runs before any page script
-// on every navigation, so this must be called before page.goto().
-export const injectRelayConfig = (page: Page, config: RelayMockConfig) =>
-  page.addInitScript(
-    ([key, value]) => {
-      Object.assign(window, {[key]: value})
-    },
-    [RELAY_MOCKS_KEY, config] as const,
-  )
-
-// Full network isolation plus optional fixtures, in one call. With no config, every relay returns
-// nothing (requirement 1). Pass {relays: {url: events}} to populate specific relays (requirement 2).
-export const setupRelayMocks = async (page: Page, config: RelayMockConfig = {}) => {
-  await blockWebsockets(page)
-  await injectRelayConfig(page, config)
-}
-
-export type {RelayMockConfig}
@@ -21,7 +21,7 @@ def capacitor_pods
  pod 'CapacitorPushNotifications', :path => '../../node_modules/.pnpm/@capacitor+push-notifications@8.0.0_@capacitor+core@8.0.1/node_modules/@capacitor/push-notifications'
  pod 'CapacitorShare', :path => '../../node_modules/.pnpm/@capacitor+share@8.0.1_@capacitor+core@8.0.1/node_modules/@capacitor/share'
  pod 'CapawesomeCapacitorBadge', :path => '../../node_modules/.pnpm/@capawesome+capacitor-badge@8.0.0_@capacitor+core@8.0.1/node_modules/@capawesome/capacitor-badge'
-  pod 'NostrSignerCapacitorPlugin', :path => '../../node_modules/.pnpm/nostr-signer-capacitor-plugin@https+++codeload.github.com+coracle-social+nostr-signer-c_a3c0fb15d5bfa83f24d0070ca2583fc9/node_modules/nostr-signer-capacitor-plugin'
+  pod 'NostrSignerCapacitorPlugin', :path => '../../node_modules/.pnpm/nostr-signer-capacitor-plugin@https+++codeload.github.com+coracle-social+nostr-signer-c_2704ecccfd05fcfb1ad8852744422b7c/node_modules/nostr-signer-capacitor-plugin'
 end

 target 'Flotilla Chat' do
@@ -12,7 +12,6 @@ if (execSync('git status --porcelain', { encoding: 'utf8' }).trim() && !force) {

 const pkg = JSON.parse(fs.readFileSync('./package.json', 'utf8'))

-pkg.pnpm = pkg.pnpm || {}
 pkg.pnpm.overrides = pkg.pnpm.overrides || {}
 pkg.pnpm.overrides["@welshman/app"] = "link:../welshman/packages/app"
 pkg.pnpm.overrides["@welshman/content"] = "link:../welshman/packages/content"
@@ -5,14 +5,15 @@
  "scripts": {
    "dev": "vite dev",
    "build": "./build.sh",
-    "build:server": "vite build --config vite.config.server.ts",
    "start": "node server.js",
    "release:android": "./build.sh && cap build android --androidreleasetype APK --signing-type apksigner",
+    "tauri:dev": "tauri dev",
+    "tauri:build": "tauri build",
+    "tauri:info": "tauri info",
+    "tauri:icons": "tauri icon assets/logo.png --output src-tauri/icons",
    "check": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json",
    "check:watch": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json --watch",
    "lint": "prettier --check src && eslint src",
-    "test": "playwright test",
-    "test:ui": "playwright test --ui",
    "format": "git diff head --name-only --diff-filter d | grep -E '(js|ts|svelte|css)$' | xargs -r prettier --write",
    "format:all": "prettier --write src",
    "prepare": "husky"
@@ -20,27 +21,26 @@
  "devDependencies": {
    "@capacitor/assets": "^3.0.5",
    "@eslint/js": "^9.39.2",
-    "@playwright/test": "^1.49.1",
-    "@sveltejs/kit": "^2.61.1",
-    "@sveltejs/vite-plugin-svelte": "^5.1.1",
+    "@sveltejs/kit": "^2.50.1",
+    "@sveltejs/vite-plugin-svelte": "^4.0.4",
    "@tailwindcss/postcss": "^4.2.2",
+    "@tauri-apps/cli": "^2.9.6",
    "@types/eslint": "^9.6.1",
-    "@types/node": "^25.9.1",
    "autoprefixer": "^10.4.23",
    "classnames": "^2.5.1",
    "eslint": "^9.39.2",
    "eslint-config-prettier": "^9.1.2",
    "eslint-plugin-svelte": "^2.46.1",
    "globals": "^15.15.0",
-    "postcss": "^8.5.15",
+    "postcss": "^8.5.6",
    "prettier": "^3.8.1",
    "prettier-plugin-svelte": "^3.4.1",
-    "svelte": "^5.55.9",
+    "svelte": "^5.48.0",
    "svelte-check": "^4.3.5",
    "tailwindcss": "^4.2.2",
    "typescript": "^5.9.3",
    "typescript-eslint": "^8.53.1",
-    "vite": "^6.4.2"
+    "vite": "^5.4.21"
  },
  "type": "module",
  "dependencies": {
@@ -63,25 +63,25 @@
    "@getalby/sdk": "^5.1.2",
    "@hono/node-server": "^2.0.0",
    "@noble/curves": "^1.9.7",
-    "@pomade/core": "^0.2.5",
-    "@poppanator/sveltekit-svg": "^7.0.0",
+    "@pomade/core": "^0.2.3",
+    "@poppanator/sveltekit-svg": "^4.2.1",
    "@sveltejs/adapter-static": "^3.0.10",
    "@tiptap/core": "^2.27.2",
    "@tiptap/pm": "^2.27.2",
    "@types/qrcode": "^1.5.6",
    "@types/throttle-debounce": "^5.0.2",
-    "@vite-pwa/assets-generator": "^1.0.2",
-    "@vite-pwa/sveltekit": "^1.1.0",
-    "@welshman/app": "^0.8.16",
-    "@welshman/content": "^0.8.16",
-    "@welshman/editor": "^0.8.16",
-    "@welshman/feeds": "^0.8.16",
-    "@welshman/lib": "^0.8.16",
-    "@welshman/net": "^0.8.16",
-    "@welshman/router": "^0.8.16",
-    "@welshman/signer": "^0.8.16",
-    "@welshman/store": "^0.8.16",
-    "@welshman/util": "^0.8.16",
+    "@vite-pwa/assets-generator": "^0.2.6",
+    "@vite-pwa/sveltekit": "^0.6.8",
+    "@welshman/app": "^0.8.15",
+    "@welshman/content": "^0.8.15",
+    "@welshman/editor": "^0.8.15",
+    "@welshman/feeds": "^0.8.15",
+    "@welshman/lib": "^0.8.15",
+    "@welshman/net": "^0.8.15",
+    "@welshman/router": "^0.8.15",
+    "@welshman/signer": "^0.8.15",
+    "@welshman/store": "^0.8.15",
+    "@welshman/util": "^0.8.15",
    "cheerio": "^1.2.0",
    "compressorjs-next": "^1.1.2",
    "daisyui": "^5.5.19",
@@ -90,7 +90,7 @@
    "emoji-picker-element": "^1.28.1",
    "emoji-picker-element-data": "^1.8.0",
    "fuse.js": "^7.1.0",
-    "hono": "^4.12.23",
+    "hono": "^4.12.15",
    "husky": "^9.1.7",
    "idb": "^8.0.3",
    "livekit-client": "^2.17.2",
@@ -102,5 +102,17 @@
    "throttle-debounce": "^5.0.2",
    "tippy.js": "^6.3.7"
  },
-  "packageManager": "pnpm@11.5.1"
+  "pnpm": {
+    "ignoredBuiltDependencies": [
+      "esbuild"
+    ],
+    "onlyBuiltDependencies": [
+      "sharp",
+      "nostr-signer-capacitor-plugin"
+    ],
+    "overrides": {
+      "sharp": "0.35.0-rc.0"
+    }
+  },
+  "packageManager": "pnpm@10.33.0+sha512.10568bb4a6afb58c9eb3630da90cc9516417abebd3fabbe6739f0ae795728da1491e9db5a544c76ad8eb7570f5c4bb3d6c637b2cb41bfdcdb47fa823c8649319"
 }
@@ -1,27 +0,0 @@
-import {defineConfig, devices} from "@playwright/test"
-
-// E2E tests live in ./e2e and run against the dev server (port 1847 from vite.config.ts).
-// Run with `pnpm test:e2e` (after `pnpm exec playwright install` to fetch browsers).
-export default defineConfig({
-  testDir: "e2e",
-  fullyParallel: true,
-  forbidOnly: !!process.env.CI,
-  retries: process.env.CI ? 2 : 0,
-  reporter: "html",
-  use: {
-    baseURL: "http://localhost:1847",
-    trace: "on-first-retry",
-  },
-  // Boots the SvelteKit dev server before the suite and reuses one if already running locally.
-  webServer: {
-    command: "pnpm dev",
-    url: "http://localhost:1847",
-    reuseExistingServer: !process.env.CI,
-    timeout: 120_000,
-  },
-  projects: [
-    {name: "chromium", use: {...devices["Desktop Chrome"]}},
-    {name: "firefox", use: {...devices["Desktop Firefox"]}},
-    {name: "webkit", use: {...devices["Desktop Safari"]}},
-  ],
-})
@@ -1,19 +0,0 @@
-allowBuilds:
-  nostr-signer-capacitor-plugin: true
-  cbor-extract: false
-  esbuild: false
-  sharp: true
-minimumReleaseAgeExclude:
-  - '@pomade/core'
-  - '@welshman/app'
-  - '@welshman/content'
-  - '@welshman/editor'
-  - '@welshman/feeds'
-  - '@welshman/lib'
-  - '@welshman/net'
-  - '@welshman/router'
-  - '@welshman/signer'
-  - '@welshman/store'
-  - '@welshman/util'
-overrides:
-  sharp: 0.35.0-rc.0
@@ -0,0 +1,2 @@
+[toolchain]
+channel = "1.92.0"
@@ -262,6 +262,12 @@ app.use(
 // SPA fallback for routes that don't match static files
 app.get("*", async context => {
  const requestUrl = requestUrlFromContext(context)
+
+  // If the path has an extension, it's likely a missing static asset, not an SPA route
+  if (path.extname(requestUrl.pathname)) {
+    return context.text("Not found", 404)
+  }
+
  const metadata = await getMetadataForRoute(requestUrl)
  const html = metadata ? injectMeta(metadata) : TEMPLATE_HTML

@@ -0,0 +1,18 @@
+[package]
+name = "flotilla"
+version = "0.1.0"
+edition = "2021"
+
+[lib]
+name = "flotilla_lib"
+crate-type = ["staticlib", "cdylib", "rlib"]
+
+[build-dependencies]
+tauri-build = { version = "2.5.3", features = [] }
+
+[dependencies]
+tauri = { version = "2.9.5", features = [] }
+
+[features]
+default = ["custom-protocol"]
+custom-protocol = ["tauri/custom-protocol"]
@@ -0,0 +1,3 @@
+fn main() {
+    tauri_build::build()
+}
@@ -0,0 +1,7 @@
+{
+  "$schema": "../gen/schemas/desktop-schema.json",
+  "identifier": "default",
+  "description": "Default desktop capability for the main window",
+  "windows": ["main"],
+  "permissions": ["core:default"]
+}
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+  <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
+  <background android:drawable="@color/ic_launcher_background"/>
+</adaptive-icon>
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <color name="ic_launcher_background">#fff</color>
+</resources>
@@ -0,0 +1,2 @@
+[toolchain]
+channel = "1.92.0"
@@ -0,0 +1,6 @@
+#[cfg_attr(mobile, tauri::mobile_entry_point)]
+pub fn run() {
+    tauri::Builder::default()
+        .run(tauri::generate_context!())
+        .expect("error while running tauri application");
+}
@@ -0,0 +1,6 @@
+// Prevents additional console window on Windows in release, DO NOT REMOVE!!
+#![cfg_attr(not(debug_assertions), windows_subsystem = "windows")]
+
+fn main() {
+    flotilla_lib::run();
+}
@@ -0,0 +1,37 @@
+{
+  "$schema": "../node_modules/@tauri-apps/cli/config.schema.json",
+  "productName": "Flotilla",
+  "mainBinaryName": "flotilla",
+  "identifier": "social.flotilla.app",
+  "build": {
+    "beforeDevCommand": "pnpm dev",
+    "beforeBuildCommand": "pnpm build",
+    "devUrl": "http://localhost:1847",
+    "frontendDist": "../build"
+  },
+  "app": {
+    "security": {
+      "capabilities": ["default"]
+    },
+    "windows": [
+      {
+        "label": "main",
+        "title": "Flotilla",
+        "width": 1240,
+        "height": 775,
+        "resizable": true
+      }
+    ]
+  },
+  "bundle": {
+    "active": false,
+    "targets": "all",
+    "icon": [
+      "icons/32x32.png",
+      "icons/128x128.png",
+      "icons/128x128@2x.png",
+      "icons/icon.icns",
+      "icons/icon.ico"
+    ]
+  }
+}
@@ -1,89 +0,0 @@
-import {
-  REPORT,
-  ROOM_ADD_MEMBER,
-  ROOM_JOIN,
-  ROOM_LEAVE,
-  ROOM_MEMBERS,
-  ROOM_REMOVE_MEMBER,
-  getPubkeyTagValues,
-  getTagValue,
-  sortEventsDesc,
-} from "@welshman/util"
-import type {TrustedEvent} from "@welshman/util"
-import {first, groupBy, removeUndefined} from "@welshman/lib"
-import {derived} from "svelte/store"
-import {deriveEventsForUrl} from "@app/repository"
-import {getRoomMembers} from "@app/members"
-// Action items (admin review queue)
-
-export const deriveSpaceActionItems = (url: string) =>
-  derived(
-    deriveEventsForUrl(url, [
-      {
-        kinds: [REPORT, ROOM_JOIN, ROOM_LEAVE, ROOM_MEMBERS, ROOM_ADD_MEMBER, ROOM_REMOVE_MEMBER],
-      },
-    ]),
-    $events => {
-      const getRoomId = (e: TrustedEvent) =>
-        getTagValue(e.kind === ROOM_MEMBERS ? "d" : "h", e.tags)
-      const reports = $events.filter(e => e.kind === REPORT)
-      const pendingJoins: TrustedEvent[] = []
-
-      // Room-level join requests — most recent per pubkey+h
-      for (const [h, roomEvents] of groupBy(getRoomId, $events)) {
-        if (!h) continue
-
-        const roomJoins: TrustedEvent[] = []
-        const roomLeaves: TrustedEvent[] = []
-        const roomMembershipEvents: TrustedEvent[] = []
-
-        for (const event of roomEvents) {
-          switch (event.kind) {
-            case ROOM_JOIN:
-              roomJoins.push(event)
-              break
-            case ROOM_LEAVE:
-              roomLeaves.push(event)
-              break
-            case ROOM_MEMBERS:
-            case ROOM_ADD_MEMBER:
-            case ROOM_REMOVE_MEMBER:
-              roomMembershipEvents.push(event)
-              break
-          }
-        }
-
-        const roomMembers = new Set(getRoomMembers(url, h, roomMembershipEvents))
-
-        pendingJoins.push(
-          ...removeUndefined(
-            Array.from(groupBy(e => e.pubkey, roomJoins).values()).map(events =>
-              first(sortEventsDesc(events)),
-            ),
-          ).filter(({pubkey, created_at}) => {
-            if (roomMembers.has(pubkey)) return false
-            if (
-              roomMembershipEvents.some(event => {
-                if (event.created_at <= created_at) {
-                  return false
-                }
-
-                if (event.kind === ROOM_MEMBERS) {
-                  return true
-                }
-
-                return getPubkeyTagValues(event.tags).includes(pubkey)
-              })
-            ) {
-              return false
-            }
-            if (roomLeaves.some(e => e.pubkey === pubkey && e.created_at > created_at)) return false
-
-            return true
-          }),
-        )
-      }
-
-      return sortEventsDesc([...reports, ...pendingJoins])
-    },
-  )
@@ -1,6 +1,6 @@
 import {Room as LiveKitRoom} from "livekit-client"
 import {derived, writable} from "svelte/store"
-import type {Room} from "@app/groups"
+import {type Room} from "@app/core/state"

 export type VoiceSession = {
  url: string
@@ -17,11 +17,6 @@ export type Pubkey = string

 export type VoiceParticipant = {pubkey?: Pubkey; identity: string}

-export type ParticipantMediaState = {
-  muted: boolean
-  cameraOn: boolean
-}
-
 export enum VoiceState {
  Joining = "joining",
  Connected = "connected",
@@ -34,6 +29,8 @@ export const voiceState = writable<VoiceState>(VoiceState.Disconnected)

 export const currentVoiceRoom = writable<Room | undefined>(undefined)

+export const participantPubkeyMap = writable<Map<string, Pubkey>>(new Map())
+
 export const pubkeyFromLiveKitIdentity = (identity: string): string | undefined =>
  /^[a-f0-9]{64}$/.test(identity.slice(0, 64)) ? identity.slice(0, 64) : undefined

@@ -46,19 +43,6 @@ export const participantKey = (p: VoiceParticipant) => p.pubkey ?? p.identity

 export const speakingParticipants = writable<VoiceParticipant[]>([])

-export const participantMediaState = writable(new Map<string, ParticipantMediaState>())
-
-export const mediaStateByIdentity = derived(
-  [participantMediaState, currentVoiceSession, voiceMicMuted],
-  ([$media, $session, $micMuted]) =>
-    (identity: string) => {
-      if ($session?.room.localParticipant.identity === identity) {
-        return {muted: $micMuted, cameraOn: $session.cameraOn}
-      }
-      return $media.get(identity) ?? {muted: true, cameraOn: false}
-    },
-)
-
 export const isParticipantSpeaking = derived(
  speakingParticipants,
  $participants => (p: VoiceParticipant) =>
@@ -2,7 +2,7 @@ import {Track} from "livekit-client"
 import {MediaQuery} from "svelte/reactivity"
 import {derived, get, writable} from "svelte/store"
 import {currentVoiceSession, VoiceState, type VoiceSession, voiceState} from "@app/call/stores"
-import {pushToast} from "@app/toast"
+import {pushToast} from "@app/util/toast"

 export enum VideoCallLayout {
  Chat = "chat",
@@ -6,39 +6,35 @@ import {
  DisconnectReason,
  LocalParticipant,
  LocalTrackPublication,
-  Participant,
  Room as LiveKitRoom,
  RoomEvent,
  Track,
-  TrackPublication,
  supportsAudioOutputSelection,
  type AudioCaptureOptions,
 } from "livekit-client"
 import {derived, get} from "svelte/store"
-import {map, not, nthEq, reject, removeUndefined, uniqBy} from "@welshman/lib"
+import {map, not, removeUndefined, uniqBy} from "@welshman/lib"
 import type {TrustedEvent} from "@welshman/util"
 import {makeHttpAuth, makeHttpAuthHeader, getTags} from "@welshman/util"
 import {signer} from "@welshman/app"
-import {load} from "@welshman/net"
 import {getLivekitEndpoint} from "$lib/livekit"
-import {AbortError, TimeoutError, whenAborted, whenTimeout} from "$lib/util"
+import {AbortError, whenAborted, whenTimeout} from "$lib/util"
 import {
  currentVoiceRoom,
  currentVoiceSession,
  voiceMicMuted,
  participantFromLiveKitIdentity,
  participantKey,
-  participantMediaState,
+  participantPubkeyMap,
+  pubkeyFromLiveKitIdentity,
  speakingParticipants,
  VoiceState,
-  type ParticipantMediaState,
  type VoiceParticipant,
  voiceState,
 } from "@app/call/stores"
 import {resetVideoCallLayout, triggerVideoFeedCount, videoPrimaryTileKey} from "@app/call/video"
-import {deriveLatestEventForUrl} from "@app/repository"
-import {deriveRoom, makeRoomId} from "@app/groups"
-import {pushToast} from "@app/toast"
+import {deriveLatestEventForUrl, deriveRoom, makeRoomId} from "@app/core/state"
+import {pushToast} from "@app/util/toast"

 export const LIVEKIT_PARTICIPANTS = 39004

@@ -80,51 +76,20 @@ export const switchVoiceActiveDevice = async (
  }
 }

-const participantMediaFrom = (participant: Participant): ParticipantMediaState => ({
-  muted: !participant.isMicrophoneEnabled,
-  cameraOn: participant.isCameraEnabled,
-})
-
-const deleteParticipant = (identity: string) => {
-  participantMediaState.update(m => new Map(reject(nthEq(0, identity), [...m])))
-}
-
-const syncParticipantMedia = (participant: Participant) => {
-  const state = participantMediaFrom(participant)
-  participantMediaState.update(m => {
-    const prev = m.get(participant.identity)
-    if (prev?.muted === state.muted && prev?.cameraOn === state.cameraOn) return m
+const addParticipant = (identity: string) => {
+  participantPubkeyMap.update(m => {
    const next = new Map(m)
-    next.set(participant.identity, state)
+    next.set(identity, pubkeyFromLiveKitIdentity(identity) ?? "")
    return next
  })
 }

-// LiveKit does not emit ParticipantConnected/Disconnected during reconnect.
-const resyncAfterReconnect = (room: LiveKitRoom) => {
-  if (room !== activeRoom) return
-
-  const next = new Map<string, ParticipantMediaState>()
-  for (const p of [room.localParticipant, ...room.remoteParticipants.values()]) {
-    next.set(p.identity, participantMediaFrom(p))
-  }
-  participantMediaState.set(next)
-
-  const session = get(currentVoiceSession)
-  if (!session) return
-
-  const {localParticipant} = room
-  voiceMicMuted.set(!localParticipant.isMicrophoneEnabled)
-  currentVoiceSession.set({
-    ...session,
-    cameraOn: localParticipant.isCameraEnabled,
-    screenShareOn: localParticipant.isScreenShareEnabled,
+const deleteParticipant = (identity: string) => {
+  participantPubkeyMap.update(m => {
+    const next = new Map(m)
+    next.delete(identity)
+    return next
  })
-  triggerVideoFeedCount()
-}
-
-const onParticipantMediaChanged = (_publication: TrackPublication, participant: Participant) => {
-  syncParticipantMedia(participant)
 }

 const fetchLivekitToken = async (
@@ -156,32 +121,26 @@ const fetchLivekitToken = async (
  return response.json()
 }

-export const loadVoiceParticipants = (url: string, h: string) =>
-  load({
-    relays: [url],
-    filters: [{kinds: [LIVEKIT_PARTICIPANTS], "#d": [h]}],
-  })
-
 export const deriveVoiceParticipants = (url: string, h: string) =>
  // We use the livekit identity list while in a call, and fall back to the list in kind 39004.
  derived(
    [
-      participantMediaState,
+      participantPubkeyMap,
      currentVoiceRoom,
      deriveLatestEventForUrl(url, [{kinds: [LIVEKIT_PARTICIPANTS], "#d": [h]}]),
    ],
-    ([$participantMediaState, $currentVoiceRoom, $publishedParticipantList]) => {
-      const inCall = $participantMediaState.size > 0 && $currentVoiceRoom?.id === makeRoomId(url, h)
+    ([$participantPubkeyMap, $currentVoiceRoom, $publishedParticipantList]) => {
+      const inCall = $participantPubkeyMap.size > 0 && $currentVoiceRoom?.id === makeRoomId(url, h)

      if (inCall) {
-        const participants = [...$participantMediaState.keys()].map(participantFromLiveKitIdentity)
+        const participants = [...$participantPubkeyMap.keys()].map(participantFromLiveKitIdentity)
        return uniqBy((p: VoiceParticipant) => participantKey(p), participants)
      } else {
        const latestEvent = $publishedParticipantList as TrustedEvent | undefined
        if (!latestEvent) return []
        const participants = removeUndefined(
          map(
-            (tag: string[]) => (tag[1] ? participantFromLiveKitIdentity(tag[1]) : undefined),
+            (tag: string[]) => (tag[1] ? {pubkey: tag[1], identity: tag[1]} : undefined),
            getTags("participant", latestEvent.tags),
          ),
        )
@@ -194,8 +153,6 @@ const setUpMicrophone = async (
  startMuted: boolean,
  preferredMicId: string | undefined,
  participant: LocalParticipant,
-  signal?: AbortSignal,
-  settleSignal?: AbortSignal,
 ): Promise<boolean> => {
  if (startMuted) {
    return true
@@ -207,100 +164,29 @@ const setUpMicrophone = async (
    capture = {deviceId: preferredMicId}
  }
  try {
-    await Promise.race([
-      participant.setMicrophoneEnabled(true, capture),
-      whenTimeout(15_000, {message: "Microphone access timed out.", signal: settleSignal}),
-      whenAborted(signal),
-    ])
+    await participant.setMicrophoneEnabled(true, capture)
    muted = false
  } catch (e) {
-    // Timeout or microphone rejection: join muted, the call is still usable. A
-    // genuine abort is surfaced to the caller so it can tear down the room.
-    if (e instanceof AbortError) throw e
-    if (!(e instanceof TimeoutError)) {
-      pushToast({theme: "error", message: "Could not access microphone"})
-    }
+    pushToast({theme: "error", message: "Could not access microphone"})
  }
  return muted
 }

-// The room whose events are allowed to mutate shared state. Abandoned rooms
-// (after switching calls or an engine reconnect give-up) must not clobber it.
-let activeRoom: LiveKitRoom | undefined
-
-const RECONNECT_DELAYS = [1000, 2000, 4000, 8000, 16000]
-let reconnectTimeout: ReturnType<typeof setTimeout> | undefined
-let reconnectAttempt = 0
-
-const clearReconnectSchedule = () => {
-  if (reconnectTimeout !== undefined) {
-    clearTimeout(reconnectTimeout)
-    reconnectTimeout = undefined
-  }
-  reconnectAttempt = 0
-}
-
-const attemptReconnect = async () => {
-  const target = get(currentVoiceRoom)
-  if (!target) return
-
-  try {
-    await joinVoiceRoom(target.url, target.h)
-  } catch {
-    if (reconnectAttempt >= RECONNECT_DELAYS.length) {
-      pushToast({theme: "error", message: "Voice connection lost."})
-      clearReconnectSchedule()
-      return
-    }
-    scheduleReconnect()
-  }
-}
-
-const scheduleReconnect = () => {
-  if (reconnectTimeout !== undefined) return
-  if (!get(currentVoiceRoom)) return
-  if (reconnectAttempt >= RECONNECT_DELAYS.length) {
-    pushToast({theme: "error", message: "Voice connection lost."})
-    return
-  }
-
-  const delay = RECONNECT_DELAYS[reconnectAttempt]!
-  reconnectAttempt++
-  reconnectTimeout = setTimeout(() => {
-    reconnectTimeout = undefined
-    void attemptReconnect()
-  }, delay)
-}
-
-const makeOnRoomReconnected = (room: LiveKitRoom) => () => {
-  if (room !== activeRoom) return
-  resyncAfterReconnect(room)
-}
-
-const makeOnRoomDisconnected = (room: LiveKitRoom) => (reason?: DisconnectReason) => {
-  // Ignore disconnects from rooms that are no longer the active session.
-  if (room !== activeRoom) return
-
-  activeRoom = undefined
-  room.removeAllListeners()
-
+const onRoomDisconnected = (reason?: DisconnectReason) => {
  videoPrimaryTileKey.set(undefined)
  voiceMicMuted.set(true)
  currentVoiceSession.set(undefined)
  resetVideoCallLayout()
  if (reason !== undefined && reason !== DisconnectReason.CLIENT_INITIATED) {
    voiceState.set(VoiceState.Disconnected)
-    if (reason === DisconnectReason.JOIN_FAILURE) {
-      pushToast({theme: "error", message: "Could not connect to voice room. Please try again."})
-    } else if (get(currentVoiceRoom)) {
-      clearReconnectSchedule()
-      scheduleReconnect()
-    } else {
-      pushToast({theme: "error", message: "Voice connection lost."})
-    }
+    const message =
+      reason === DisconnectReason.JOIN_FAILURE
+        ? "Could not connect to voice room. Please try again."
+        : "Voice connection lost."
+    pushToast({theme: "error", message})
  }
  speakingParticipants.set([])
-  participantMediaState.set(new Map())
+  participantPubkeyMap.set(new Map())
 }

 const onTrackSubscribed = (track: Track) => {
@@ -330,8 +216,8 @@ const playJoinSound = () => {
  audio.play().catch(() => {})
 }

-const onParticipantConnected = (participant: Participant) => {
-  syncParticipantMedia(participant)
+const onParticipantConnected = (participant: {identity: string}) => {
+  addParticipant(participant.identity)
  playJoinSound()
 }

@@ -352,13 +238,8 @@ const onLocalTrackUnpublished = (

 let joinAbortController: AbortController | undefined

-const abortJoinVoiceRoom = () => {
-  joinAbortController?.abort()
-}
-
 export const cancelJoinVoiceRoom = () => {
-  clearReconnectSchedule()
-  abortJoinVoiceRoom()
+  joinAbortController?.abort()
 }

 export const joinVoiceRoom = async (
@@ -367,7 +248,10 @@ export const joinVoiceRoom = async (
  startMuted = true,
  preferredMicId?: string,
 ): Promise<void> => {
-  abortJoinVoiceRoom()
+  cancelJoinVoiceRoom()
+
+  const session = get(currentVoiceSession)
+  if (session) await leaveVoiceRoom()

  currentVoiceRoom.set(get(deriveRoom(url, h)))
  voiceState.set(VoiceState.Joining)
@@ -377,96 +261,41 @@ export const joinVoiceRoom = async (
  const signal = controller.signal
  const isActive = () => joinAbortController === controller

-  // Self-cleaning controller: aborted in finally so whenTimeout/whenAborted
-  // helpers clear their timers/listeners once the races below have settled.
-  const settle = new AbortController()
-
  try {
-    // Tear down any existing session before joining. Bound it so a slow leave
-    // (camera/screenshare renegotiation can take ~15s) cannot block this join.
-    if (get(currentVoiceSession)) {
-      await Promise.race([
-        leaveVoiceRoom(),
-        whenTimeout(15_000, {message: "Leaving previous call timed out.", signal: settle.signal}),
-        whenAborted(signal),
-      ]).catch(e => {
-        if (e instanceof AbortError) throw e
-      })
-
-      // leaveVoiceRoom flips voiceState to Disconnected; re-assert Joining.
-      voiceState.set(VoiceState.Joining)
-    }
-
-    if (signal.aborted) throw new AbortError()
-
-    const {server_url, participant_token} = await Promise.race([
-      fetchLivekitToken(url, h, signal),
-      whenTimeout(15_000, {
-        message: "Connection timed out. Please check your network and try again.",
-        signal: settle.signal,
-      }),
-      whenAborted(signal),
-    ])
+    const {server_url, participant_token} = await fetchLivekitToken(url, h, signal)

    if (signal.aborted) throw new AbortError()

    const liveKitRoom = new LiveKitRoom({adaptiveStream: true, dynacast: true})
-    activeRoom = liveKitRoom

-    liveKitRoom.on(RoomEvent.Disconnected, makeOnRoomDisconnected(liveKitRoom))
-    liveKitRoom.on(RoomEvent.Reconnected, makeOnRoomReconnected(liveKitRoom))
+    liveKitRoom.on(RoomEvent.Disconnected, onRoomDisconnected)
    liveKitRoom.on(RoomEvent.ParticipantConnected, onParticipantConnected)
    liveKitRoom.on(RoomEvent.ParticipantDisconnected, onParticipantDisconnected)
    liveKitRoom.on(RoomEvent.TrackSubscribed, onTrackSubscribed)
    liveKitRoom.on(RoomEvent.TrackUnsubscribed, onTrackUnsubscribed)
    liveKitRoom.on(RoomEvent.LocalTrackUnpublished, onLocalTrackUnpublished)
    liveKitRoom.on(RoomEvent.ActiveSpeakersChanged, onActiveSpeakersChanged)
-    liveKitRoom.on(RoomEvent.TrackMuted, onParticipantMediaChanged)
-    liveKitRoom.on(RoomEvent.TrackUnmuted, onParticipantMediaChanged)
-    liveKitRoom.on(RoomEvent.TrackPublished, onParticipantMediaChanged)
-    liveKitRoom.on(RoomEvent.TrackUnpublished, onParticipantMediaChanged)
-    liveKitRoom.on(RoomEvent.LocalTrackPublished, onParticipantMediaChanged)

    try {
      await Promise.race([
        liveKitRoom.connect(server_url, participant_token, {maxRetries: 0}),
        whenTimeout(15_000, {
          message: "Connection timed out. Please check your network and try again.",
-          signal: settle.signal,
        }),
        whenAborted(signal),
      ])
    } catch (e) {
-      if (activeRoom === liveKitRoom) activeRoom = undefined
-      liveKitRoom.removeAllListeners()
      liveKitRoom.disconnect()
      throw e
    }

-    participantMediaState.set(new Map())
-    syncParticipantMedia(liveKitRoom.localParticipant)
+    participantPubkeyMap.set(new Map())
+    addParticipant(liveKitRoom.localParticipant.identity)
    for (const p of liveKitRoom.remoteParticipants.values()) {
-      syncParticipantMedia(p)
+      addParticipant(p.identity)
    }

-    // Bounded against timeout/abort inside setUpMicrophone: a stuck permission
-    // prompt resolves to muted rather than hanging the join forever.
-    const muted = await setUpMicrophone(
-      startMuted,
-      preferredMicId,
-      liveKitRoom.localParticipant,
-      signal,
-      settle.signal,
-    )
-
-    // A cancel during the mic step must tear down the connected room rather
-    // than leaking it.
-    if (signal.aborted) {
-      if (activeRoom === liveKitRoom) activeRoom = undefined
-      liveKitRoom.removeAllListeners()
-      liveKitRoom.disconnect()
-      throw new AbortError()
-    }
+    const muted = await setUpMicrophone(startMuted, preferredMicId, liveKitRoom.localParticipant)

    voiceMicMuted.set(muted)
    currentVoiceSession.set({
@@ -477,23 +306,17 @@ export const joinVoiceRoom = async (
      screenShareOn: false,
    })
    voiceState.set(VoiceState.Connected)
-    clearReconnectSchedule()
    playJoinSound()
  } catch (e) {
    if (isActive()) voiceState.set(VoiceState.Disconnected)
-    if (e instanceof AbortError) {
-      clearReconnectSchedule()
-      return
-    }
+    if (e instanceof AbortError) return
    throw e
  } finally {
-    settle.abort()
    if (isActive()) joinAbortController = undefined
  }
 }

 export const leaveVoiceRoom = async () => {
-  clearReconnectSchedule()
  const session = get(currentVoiceSession)
  if (!session) return

@@ -516,23 +339,20 @@ export const leaveVoiceRoom = async () => {
    }
  }

-  // Always tear down this room's connection and listeners.
-  if (activeRoom === session.room) activeRoom = undefined
-  session.room.removeAllListeners()
+  voiceState.set(VoiceState.Disconnected)
+  videoPrimaryTileKey.set(undefined)
+  voiceMicMuted.set(true)
+  currentVoiceSession.set(undefined)
+  resetVideoCallLayout()
  session.room.disconnect()
+  speakingParticipants.set([])
+  participantPubkeyMap.set(new Map())
+}

-  // Only reset shared UI state if this session is still current. A slow leave
-  // that was superseded by a new join (bounded by a timeout in joinVoiceRoom)
-  // must not clobber the freshly-joined session when it finally completes.
-  if (get(currentVoiceSession) === session) {
-    voiceState.set(VoiceState.Disconnected)
-    videoPrimaryTileKey.set(undefined)
-    voiceMicMuted.set(true)
-    currentVoiceSession.set(undefined)
-    resetVideoCallLayout()
-    speakingParticipants.set([])
-    participantMediaState.set(new Map())
-  }
+export const rejoinVoiceRoom = async (): Promise<void> => {
+  const target = get(currentVoiceRoom)
+  if (!target) return
+  return joinVoiceRoom(target.url, target.h)
 }

 export const toggleMute = async () => {
@@ -1,139 +0,0 @@
-import {DELETE, PROFILE, getPubkeyTagValues} from "@welshman/util"
-import type {TrustedEvent} from "@welshman/util"
-import {append, call, on, reject, remove, sort, sortBy, spec, uniq, uniqBy} from "@welshman/lib"
-import type {Override} from "@welshman/lib"
-import {createSearch, displayProfileByPubkey, pubkey, repository} from "@welshman/app"
-import {derived, readable} from "svelte/store"
-import {DM_KINDS} from "@app/content"
-import type {RepositoryUpdate} from "@welshman/net"
-import {makeDeriveItem, throttled} from "@welshman/store"
-export type Chat = {
-  id: string
-  pubkeys: string[]
-  messages: TrustedEvent[]
-  last_activity: number
-  search_text: string
-}
-
-export const getChatPubkeys = (pubkeys: string[]) => sort(uniq(append(pubkey.get()!, pubkeys)))
-
-export const getChatPubkeysFromEvent = (event: TrustedEvent) =>
-  getChatPubkeys(getPubkeyTagValues(event.tags).concat(event.pubkey))
-
-export const makeChatId = (pubkeys: string[]) => {
-  const userPubkey = pubkey.get()!
-  const otherPubkeys = remove(userPubkey, uniq(pubkeys))
-  const visiblePubkeys = otherPubkeys.length === 0 ? [userPubkey] : otherPubkeys
-
-  return sort(visiblePubkeys).join(",")
-}
-
-export const splitChatId = (id: string) => getChatPubkeys(id.split(","))
-
-export const chatsById = call(() => {
-  const chatsById = new Map<string, Chat>()
-  const chatsByPubkey = new Map<string, string[]>()
-
-  const addSearchText = (chat: Override<Chat, {search_text?: string}>) => {
-    chat.search_text =
-      chat.pubkeys.length === 1
-        ? displayProfileByPubkey(chat.pubkeys[0]) + " note to self"
-        : remove(pubkey.get()!, chat.pubkeys).map(displayProfileByPubkey).join(" ")
-
-    return chat as Chat
-  }
-
-  return readable(chatsById, set => {
-    const indexChatByPubkeys = (chat: Chat) => {
-      for (const pubkey of chat.pubkeys) {
-        chatsByPubkey.set(pubkey, uniq(append(chat.id, chatsByPubkey.get(pubkey) || [])))
-      }
-    }
-
-    const addEvents = (events: TrustedEvent[]) => {
-      let dirty = false
-      for (const event of events) {
-        if (DM_KINDS.includes(event.kind)) {
-          const pubkeys = getChatPubkeysFromEvent(event)
-          const id = makeChatId(pubkeys)
-          const chat = chatsById.get(id)
-          const messages = sortBy(
-            e => -e.created_at,
-            uniqBy(e => e.id, append(event, chat?.messages || [])),
-          )
-          const last_activity = Math.max(chat?.last_activity || 0, event.created_at)
-          const updatedChat = addSearchText({id, pubkeys, messages, last_activity})
-
-          chatsById.set(id, updatedChat)
-          indexChatByPubkeys(updatedChat)
-
-          dirty = true
-        }
-
-        if (event.kind === PROFILE) {
-          for (const chatId of chatsByPubkey.get(event.pubkey) || []) {
-            const chat = chatsById.get(chatId)
-
-            if (chat) {
-              addSearchText(chat)
-              dirty = true
-            }
-          }
-        }
-      }
-
-      if (dirty) {
-        set(chatsById)
-      }
-    }
-
-    const removeEvents = (removed: Set<string>) => {
-      let dirty = false
-
-      for (const id of removed) {
-        const event = repository.getEvent(id)
-
-        if (event && DM_KINDS.includes(event.kind)) {
-          for (const chatId of chatsByPubkey.get(event.pubkey) || []) {
-            const chat = chatsById.get(chatId)
-
-            if (chat) {
-              chat.messages = reject(spec({id: event.id}), chat.messages)
-              dirty = true
-            }
-          }
-        }
-      }
-
-      if (dirty) {
-        set(chatsById)
-      }
-    }
-
-    addEvents(repository.query([{kinds: [...DM_KINDS, DELETE, PROFILE]}]))
-
-    const unsubscribers = [
-      on(repository, "update", ({added, removed}: RepositoryUpdate) => {
-        // Do this async so that profiles are populated
-        setTimeout(() => {
-          addEvents(added)
-          removeEvents(removed)
-        }, 200)
-      }),
-    ]
-
-    return () => unsubscribers.forEach(call)
-  })
-})
-
-export const deriveChat = makeDeriveItem(chatsById)
-
-export const chatSearch = derived(throttled(1500, chatsById), $chatsByPubkey => {
-  return createSearch(
-    sortBy(c => -c.last_activity, Array.from($chatsByPubkey.values())),
-    {
-      getValue: (chat: Chat) => chat.id,
-      fuseOptions: {keys: ["search_text"]},
-    },
-  )
-})
@@ -1,16 +0,0 @@
-import type {TrustedEvent} from "@welshman/util"
-import {COMMENT, makeEvent} from "@welshman/util"
-import {publishThunk, tagEventForComment} from "@welshman/app"
-
-export type CommentParams = {
-  event: TrustedEvent
-  content: string
-  tags?: string[][]
-  url?: string
-}
-
-export const makeComment = ({url, event, content, tags = []}: CommentParams) =>
-  makeEvent(COMMENT, {content, tags: [...tags, ...tagEventForComment(event, url)]})
-
-export const publishComment = ({relays, ...params}: CommentParams & {relays: string[]}) =>
-  publishThunk({event: makeComment({url: relays[0], ...params}), relays})
@@ -5,7 +5,7 @@
  import Landing from "@app/components/Landing.svelte"
  import Toast from "@app/components/Toast.svelte"
  import PrimaryNav from "@app/components/PrimaryNav.svelte"
-  import {modal} from "@app/modal"
+  import {modal} from "@app/util/modal"

  interface Props {
    children: Snippet
@@ -1,7 +1,7 @@
 <script lang="ts">
  import Spinner from "@lib/components/Spinner.svelte"
  import QRCode from "@app/components/QRCode.svelte"
-  import type {Nip46Controller} from "@app/nip46"
+  import type {Nip46Controller} from "@app/util/nip46"

  type Props = {
    controller: Nip46Controller
@@ -7,8 +7,8 @@
  import QrCode from "@assets/icons/qr-code.svg?dataurl"
  import Icon from "@lib/components/Icon.svelte"
  import InfoBunker from "@app/components/InfoBunker.svelte"
-  import type {Nip46Controller} from "@app/nip46"
-  import {pushModal} from "@app/modal"
+  import type {Nip46Controller} from "@app/util/nip46"
+  import {pushModal} from "@app/util/modal"

  type Props = {
    controller: Nip46Controller
@@ -12,11 +12,9 @@
  import EventActivity from "@app/components/EventActivity.svelte"
  import EventActions from "@app/components/EventActions.svelte"
  import CalendarEventEdit from "@app/components/CalendarEventEdit.svelte"
-  import {publishDelete} from "@app/deletes"
-  import {publishReaction} from "@app/reactions"
-  import {canEnforceNip70} from "@app/relays"
-  import {makeCalendarPath, makeSpacePath} from "@app/routes"
-  import {pushModal} from "@app/modal"
+  import {publishDelete, publishReaction, canEnforceNip70} from "@app/core/commands"
+  import {makeCalendarPath, makeSpacePath} from "@app/util/routes"
+  import {pushModal} from "@app/util/modal"

  type Props = {
    url: string
@@ -18,11 +18,11 @@
  import ModalBody from "@lib/components/ModalBody.svelte"
  import DateTimeInput from "@lib/components/DateTimeInput.svelte"
  import EditorContent from "@app/editor/EditorContent.svelte"
-  import {PROTECTED, publishRoomQuote} from "@app/groups"
+  import {PROTECTED} from "@app/core/state"
  import {makeEditor} from "@app/editor"
-  import {DraftKey} from "@app/drafts"
-  import {pushToast} from "@app/toast"
-  import {canEnforceNip70} from "@app/relays"
+  import {DraftKey} from "@app/util/drafts"
+  import {pushToast} from "@app/util/toast"
+  import {canEnforceNip70, publishRoomQuote} from "@app/core/commands"

  type Values = {
    d: string
@@ -6,7 +6,7 @@
  import CalendarEventHeader from "@app/components/CalendarEventHeader.svelte"
  import ProfileLink from "@app/components/ProfileLink.svelte"
  import RoomLink from "@app/components/RoomLink.svelte"
-  import {makeCalendarPath} from "@app/routes"
+  import {makeCalendarPath} from "@app/util/routes"

  type Props = {
    url: string
@@ -53,13 +53,11 @@
  import ChatComposeEdit from "@app/components/ChatComposeEdit.svelte"
  import ChatComposeParent from "@app/components/ChatComposeParent.svelte"
  import ThunkToast from "@app/components/ThunkToast.svelte"
-  import {userSettingsValues} from "@app/settings"
-  import {deriveChat, makeChatId} from "@app/chats"
-  import {pushModal} from "@app/modal"
-  import {DraftKey} from "@app/drafts"
-  import {makeDelete} from "@app/deletes"
-  import {prependParent} from "@app/groups"
-  import {pushToast} from "@app/toast"
+  import {userSettingsValues, deriveChat, makeChatId} from "@app/core/state"
+  import {pushModal} from "@app/util/modal"
+  import {DraftKey} from "@app/util/drafts"
+  import {makeDelete, prependParent} from "@app/core/commands"
+  import {pushToast} from "@app/util/toast"

  type Props = {
    pubkeys: string[]
@@ -282,7 +280,7 @@
  </div>
 </PageBar>

-<PageContent class="flex flex-col-reverse gap-2 py-2 !mb-0">
+<PageContent class="flex flex-col-reverse gap-2 py-4">
  {#if missingRelayLists.length > 0}
    <div class="py-12">
      <div class="card2 col-2 m-auto max-w-md items-center text-center">
@@ -10,7 +10,7 @@
  import Button from "@lib/components/Button.svelte"
  import EditorContent from "@app/editor/EditorContent.svelte"
  import {makeEditor} from "@app/editor"
-  import {type DraftKey} from "@app/drafts"
+  import {type DraftKey} from "@app/util/drafts"

  type Values = {
    content?: string | object
@@ -12,8 +12,8 @@
  import ModalHeader from "@lib/components/ModalHeader.svelte"
  import ModalTitle from "@lib/components/ModalTitle.svelte"
  import ModalFooter from "@lib/components/ModalFooter.svelte"
-  import {DEFAULT_RELAYS, DEFAULT_MESSAGING_RELAYS} from "@app/env"
-  import {pushToast} from "@app/toast"
+  import {DEFAULT_RELAYS, DEFAULT_MESSAGING_RELAYS} from "@app/core/state"
+  import {pushToast} from "@app/util/toast"

  type Props = {
    next: () => void
@@ -9,8 +9,8 @@
  import ProfileName from "@app/components/ProfileName.svelte"
  import ProfileCircle from "@app/components/ProfileCircle.svelte"
  import ProfileCircles from "@app/components/ProfileCircles.svelte"
-  import {makeChatPath, goToChat} from "@app/routes"
-  import {notifications} from "@app/notifications"
+  import {makeChatPath, goToChat} from "@app/util/routes"
+  import {notifications} from "@app/util/notifications"

  interface Props {
    id: string
@@ -7,8 +7,8 @@
  import Button from "@lib/components/Button.svelte"
  import Modal from "@lib/components/Modal.svelte"
  import ModalBody from "@lib/components/ModalBody.svelte"
-  import {setChecked} from "@app/notifications"
-  import {notificationSettings} from "@app/settings"
+  import {setChecked} from "@app/util/notifications"
+  import {notificationSettings} from "@app/core/state"

  const markAsRead = () => {
    setChecked("/chat/*")
@@ -16,10 +16,9 @@
  import ProfileDetail from "@app/components/ProfileDetail.svelte"
  import ChatMessageMenu from "@app/components/ChatMessageMenu.svelte"
  import ChatMessageMenuMobile from "@app/components/ChatMessageMenuMobile.svelte"
-  import {colors} from "@app/theme"
-  import {makeDelete} from "@app/deletes"
-  import {makeReaction} from "@app/reactions"
-  import {pushModal} from "@app/modal"
+  import {colors} from "@app/core/state"
+  import {makeDelete, makeReaction} from "@app/core/commands"
+  import {pushModal} from "@app/util/modal"

  interface Props {
    event: TrustedEvent
@@ -5,7 +5,7 @@
  import SmileCircle from "@assets/icons/smile-circle.svg?dataurl"
  import Icon from "@lib/components/Icon.svelte"
  import EmojiButton from "@lib/components/EmojiButton.svelte"
-  import {makeReaction} from "@app/reactions"
+  import {makeReaction} from "@app/core/commands"

  interface Props {
    event: TrustedEvent
@@ -3,7 +3,7 @@
  import Button from "@lib/components/Button.svelte"
  import ChatMessageEmojiButton from "@app/components/ChatMessageEmojiButton.svelte"
  import EventInfo from "@app/components/EventInfo.svelte"
-  import {pushModal} from "@app/modal"
+  import {pushModal} from "@app/util/modal"
  import Pen from "@assets/icons/pen.svg?dataurl"
  import Reply from "@assets/icons/reply-2.svg?dataurl"
  import Code2 from "@assets/icons/code-2.svg?dataurl"
@@ -13,9 +13,9 @@
  import Button from "@lib/components/Button.svelte"
  import EmojiPicker from "@lib/components/EmojiPicker.svelte"
  import EventInfo from "@app/components/EventInfo.svelte"
-  import {makeReaction} from "@app/reactions"
-  import {pushModal} from "@app/modal"
-  import {clip} from "@app/toast"
+  import {makeReaction} from "@app/core/commands"
+  import {pushModal} from "@app/util/modal"
+  import {clip} from "@app/util/toast"

  type Props = {
    pubkeys: string[]
--- a/Show More
+++ b/Show More