fix: safari chat regressions

2026-05-03 15:24:33 +05:45
117 changed files with 5766 additions and 1520 deletions
@@ -4,6 +4,7 @@ ios
 build

 # Git
+.git
 .gitignore

 # Env files (keep .env for build; exclude local overrides)
@@ -1,17 +1,12 @@
-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
-  IMAGE_NAME: coracle/flotilla
+  REGISTRY: ghcr.io
+  IMAGE_NAME: coracle-social/flotilla

 jobs:
  build-and-push-image:
@@ -28,8 +23,8 @@ jobs:
        uses: docker/login-action@v3
        with:
          registry: ${{ env.REGISTRY }}
-          username: hodlbod
-          password: ${{ secrets.PACKAGE_TOKEN }}
+          username: ${{ secrets.REGISTRY_USERNAME }}
+          password: ${{ secrets.REGISTRY_PASSWORD }}

      - name: Extract metadata (tags, labels) for Docker
        id: meta
@@ -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 }}
@@ -27,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
@@ -1,31 +1,5 @@
 # Changelog

-# 1.8.0
-
-* Fix relay badge overflow
-* Suppress programmatic scroll when user is scrolling
-* Fix vertical alignment of emoji and overflow buttons in shared event action row
-* Use type=email for signup/login email inputs, validate password
-* Improve toggle switch placement on settings screens
-* Fix relay auth privacy toggle
-* Improve field layout
-* Add progress bar to signup flow
-* Bundle emojis properly
-* Rework hosting page
-* Fix padding on pages on small screens
-* Add richer link preview support
-* Fix pasting into event summary
-* Publish fewer join/claim requests
-* Fix new messages not rendering in safari
-* Avoid capturing stale cleanup function in chat
-* Hide keyboard on app resume
-* Add email rendering support
-* Fix bunker login
-* Fix undefined chat draft key
-* Allow sharing to chat without a message
-* Make sure to show date on calendar events when embedded
-* Improve space search
-
 # 1.7.4

 * Fix safe area inset for FAB
@@ -1,31 +1,32 @@
-# Build and run the Flotilla web server.
-#
-#   docker build -t flotilla .
-#   docker run -p 3000:3000 flotilla
-#
-# 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.
+# Stage 1: Build
+# Uses .env from build context for config (logo, branding, etc.)
+# Optional: docker build --build-arg VITE_BUILD_HASH=$(git rev-parse --short HEAD) -t flotilla .

-# 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:20-bookworm AS builder
+
+RUN apt-get update && apt-get install -y --no-install-recommends curl
+
+RUN npm install -g pnpm@latest

 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
+RUN pnpm i
+
+# Copy everything (including .env when present) - build.sh will source it
+COPY . .
+
+ARG VITE_BUILD_HASH
+ENV VITE_BUILD_HASH=${VITE_BUILD_HASH}
+
+ENV NODE_OPTIONS=--max_old_space_size=16384
+RUN pnpm run build
+
+FROM node:20-alpine

-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
-EXPOSE 3000
-USER node
-CMD ["node", "server.js"]
+
+# Copy only the built output - no source, no .env, no dev deps
+COPY --from=builder /app/build ./build
+
+CMD ["npx", "serve", "-s", "build"]
@@ -31,18 +31,18 @@ To run your own Flotilla, it's as simple as:
 ```sh
 pnpm install
 pnpm run build
-pnpm run start
+npx serve -s build
 ```

 Or, if you prefer to use a container:

 ```sh
-docker run -d -p 3000:3000 gitea.coracle.social/coracle/flotilla:latest
+podman run -d -p 3000:3000 ghcr.io/coracle-social/flotilla:latest
 ```

 Alternatively, you can copy the build files into a directory of your choice and serve it yourself:

 ```sh
 mkdir ./mount
-docker run -v ./mount:/app/mount gitea.coracle.social/coracle/flotilla:latest bash -c 'cp -r build/* mount'
+podman run -v ./mount:/app/mount ghcr.io/coracle-social/flotilla:latest bash -c 'cp -r build/* mount'
 ```
@@ -8,8 +8,8 @@ android {
        applicationId "social.flotilla"
        minSdk rootProject.ext.minSdkVersion
        targetSdk rootProject.ext.targetSdkVersion
-        versionCode 47
-        versionName "1.8.0"
+        versionCode 46
+        versionName "1.7.4"
        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
        aaptOptions {
             // Files and dirs to omit from the packaged assets dir, modified to accommodate modern web apps.
@@ -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')
@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 54;
+	objectVersion = 48;
 	objects = {

 /* Begin PBXBuildFile section */
@@ -131,9 +131,8 @@
 		504EC2FC1FED79650016851F /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				BuildIndependentTargetsInParallel = YES;
 				LastSwiftUpdateCheck = 920;
-				LastUpgradeCheck = 2630;
+				LastUpgradeCheck = 920;
 				TargetAttributes = {
 					504EC3031FED79650016851F = {
 						CreatedOnToolsVersion = 9.2;
@@ -258,7 +257,6 @@
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
-				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
 				CLANG_WARN_EMPTY_BODY = YES;
@@ -266,10 +264,8 @@
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
-				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
-				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
 				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -279,10 +275,8 @@
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				COPY_PHASE_STRIP = NO;
 				DEBUG_INFORMATION_FORMAT = dwarf;
-				DEVELOPMENT_TEAM = S26U9DYW3A;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
-				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_NO_COMMON_BLOCKS = YES;
@@ -301,7 +295,6 @@
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
-				STRING_CATALOG_GENERATE_SYMBOLS = YES;
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 			};
@@ -321,7 +314,6 @@
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
-				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
 				CLANG_WARN_EMPTY_BODY = YES;
@@ -329,10 +321,8 @@
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
-				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
-				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
 				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -342,10 +332,8 @@
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				COPY_PHASE_STRIP = NO;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
-				DEVELOPMENT_TEAM = S26U9DYW3A;
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
-				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
@@ -357,9 +345,7 @@
 				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
-				STRING_CATALOG_GENERATE_SYMBOLS = YES;
-				SWIFT_COMPILATION_MODE = wholemodule;
-				SWIFT_OPTIMIZATION_LEVEL = "-O";
+				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
 				VALIDATE_PRODUCT = YES;
 			};
 			name = Release;
@@ -372,16 +358,14 @@
 				CODE_SIGN_ENTITLEMENTS = "Flotilla Chat.entitlements";
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 38;
+				CURRENT_PROJECT_VERSION = 37;
+				DEVELOPMENT_TEAM = S26U9DYW3A;
 				INFOPLIST_FILE = App/Info.plist;
 				INFOPLIST_KEY_CFBundleDisplayName = "Flotilla Chat";
 				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.social-networking";
 				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
-				LD_RUNPATH_SEARCH_PATHS = (
-					"$(inherited)",
-					"@executable_path/Frameworks",
-				);
-				MARKETING_VERSION = 1.8.0;
+				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
+				MARKETING_VERSION = 1.7.4;
 				OTHER_SWIFT_FLAGS = "$(inherited) \"-D\" \"COCOAPODS\" \"-DDEBUG\"";
 				PRODUCT_BUNDLE_IDENTIFIER = social.flotilla;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -401,16 +385,14 @@
 				CODE_SIGN_ENTITLEMENTS = "Flotilla Chat.entitlements";
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 38;
+				CURRENT_PROJECT_VERSION = 37;
+				DEVELOPMENT_TEAM = S26U9DYW3A;
 				INFOPLIST_FILE = App/Info.plist;
 				INFOPLIST_KEY_CFBundleDisplayName = "Flotilla Chat";
 				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.social-networking";
 				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
-				LD_RUNPATH_SEARCH_PATHS = (
-					"$(inherited)",
-					"@executable_path/Frameworks",
-				);
-				MARKETING_VERSION = 1.8.0;
+				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
+				MARKETING_VERSION = 1.7.4;
 				PRODUCT_BUNDLE_IDENTIFIER = social.flotilla;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -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
@@ -1,13 +1,15 @@
 {
  "name": "flotilla",
-  "version": "1.8.0",
+  "version": "1.7.4",
  "private": true,
  "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",
@@ -18,9 +20,10 @@
  "devDependencies": {
    "@capacitor/assets": "^3.0.5",
    "@eslint/js": "^9.39.2",
-    "@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",
    "autoprefixer": "^10.4.23",
    "classnames": "^2.5.1",
@@ -28,15 +31,15 @@
    "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": {
@@ -57,28 +60,26 @@
    "@capawesome/capacitor-badge": "^8.0.0",
    "@getalby/lightning-tools": "^6.1.0",
    "@getalby/sdk": "^5.1.2",
-    "@hono/node-server": "^2.0.0",
    "@noble/curves": "^1.9.7",
    "@pomade/core": "^0.2.3",
-    "@poppanator/sveltekit-svg": "^7.0.0",
+    "@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.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",
+    "@vite-pwa/assets-generator": "^0.2.6",
+    "@vite-pwa/sveltekit": "^0.6.8",
+    "@welshman/app": "^0.8.13",
+    "@welshman/content": "^0.8.13",
+    "@welshman/editor": "^0.8.13",
+    "@welshman/feeds": "^0.8.13",
+    "@welshman/lib": "^0.8.13",
+    "@welshman/net": "^0.8.13",
+    "@welshman/router": "^0.8.13",
+    "@welshman/signer": "^0.8.13",
+    "@welshman/store": "^0.8.13",
+    "@welshman/util": "^0.8.13",
    "compressorjs-next": "^1.1.2",
    "daisyui": "^5.5.19",
    "date-picker-svelte": "^2.17.0",
@@ -86,7 +87,6 @@
    "emoji-picker-element": "^1.28.1",
    "emoji-picker-element-data": "^1.8.0",
    "fuse.js": "^7.1.0",
-    "hono": "^4.12.23",
    "husky": "^9.1.7",
    "idb": "^8.0.3",
    "livekit-client": "^2.17.2",
@@ -0,0 +1,2 @@
+[toolchain]
+channel = "1.92.0"
@@ -1,288 +0,0 @@
-import path from "node:path"
-import {promises as fs} from "node:fs"
-import {fileURLToPath} from "node:url"
-
-import "dotenv/config"
-import {serve} from "@hono/node-server"
-import {serveStatic} from "@hono/node-server/serve-static"
-import {loadRelay} from "@welshman/app"
-import {displayRelayUrl, normalizeRelayUrl} from "@welshman/util"
-import {load} from "cheerio"
-import {Hono} from "hono"
-
-const __filename = fileURLToPath(import.meta.url)
-const __dirname = path.dirname(__filename)
-
-const BUILD_DIR = path.join(__dirname, "build")
-const INDEX_PATH = path.join(BUILD_DIR, "index.html")
-
-const PORT = parseInt(process.env.PORT || "", 10) || 3000
-const HOST = process.env.HOST || "0.0.0.0"
-
-let TEMPLATE_HTML = ""
-try {
-  TEMPLATE_HTML = await fs.readFile(INDEX_PATH, "utf8")
-} catch (error) {
-  console.error(`Unable to read ${INDEX_PATH}. Run "pnpm run build" first.`)
-  process.exit(1)
-}
-
-const PLATFORM_NAME = process.env.VITE_PLATFORM_NAME
-const PLATFORM_DESCRIPTION = process.env.VITE_PLATFORM_DESCRIPTION
-
-// Match client-side decode logic
-const decodeRelay = url => {
-  try {
-    return normalizeRelayUrl(decodeURIComponent(url))
-  } catch {
-    return undefined
-  }
-}
-
-const requestUrlFromContext = context => {
-  const requestUrl = new URL(context.req.url)
-  const forwardedProto = context.req.header("x-forwarded-proto")?.split(",")[0]?.trim()
-  const forwardedHost = context.req.header("x-forwarded-host")?.split(",")[0]?.trim()
-
-  if (forwardedProto === "http" || forwardedProto === "https") {
-    requestUrl.protocol = `${forwardedProto}:`
-  }
-
-  if (forwardedHost) {
-    requestUrl.host = forwardedHost
-  }
-
-  return requestUrl
-}
-
-const fetchRelayMeta = async relayUrl => {
-  if (!relayUrl) return undefined
-  try {
-    return await loadRelay(normalizeRelayUrl(relayUrl))
-  } catch (err) {
-    console.error(`Failed to fetch relay metadata for ${relayUrl}:`, err)
-    return undefined
-  }
-}
-
-const buildDefaultImage = requestUrl => {
-  return new URL("/maskable-icon-512x512.png", requestUrl.origin).toString()
-}
-
-const getMetadataForInvite = async (url, match) => {
-  const relayParam = url.searchParams.get("r")
-  if (!relayParam) return undefined
-
-  const relayMetadata = await fetchRelayMeta(relayParam)
-  if (!relayMetadata) return undefined
-
-  const relayDisplay = displayRelayUrl(relayParam)
-  const spaceName = relayMetadata.name
-  const relayDescription = relayMetadata.description
-
-  const title = spaceName
-    ? `Invite to ${spaceName} on ${PLATFORM_NAME}`
-    : `Invite to a Space on ${PLATFORM_NAME}`
-
-  const parts = []
-  if (spaceName) {
-    parts.push(`You are invited to join ${spaceName} on ${PLATFORM_NAME}.`)
-  } else {
-    parts.push(`You are invited to join a space on ${PLATFORM_NAME}.`)
-  }
-
-  if (relayDisplay) parts.push(`Relay: ${relayDisplay}.`)
-  if (relayDescription) parts.push(relayDescription)
-  else parts.push(PLATFORM_DESCRIPTION)
-
-  const description = parts.join(" ")
-  const image =
-    relayMetadata.icon ||
-    relayMetadata.picture ||
-    relayMetadata.image ||
-    buildDefaultImage(url)
-
-  return {
-    title,
-    description,
-    image,
-    url: url.toString(),
-    site: url.origin,
-  }
-}
-
-const getMetadataForSpace = async (url, match) => {
-  const relayParam = decodeRelay(match[1])
-  if (!relayParam) return undefined
-
-  const relayMetadata = await fetchRelayMeta(relayParam)
-  if (!relayMetadata) return undefined
-
-  const spaceName = relayMetadata.name || displayRelayUrl(relayParam)
-
-  return {
-    title: `${spaceName} on ${PLATFORM_NAME}`,
-    description: relayMetadata.description || PLATFORM_DESCRIPTION,
-    image:
-      relayMetadata.icon ||
-      relayMetadata.picture ||
-      relayMetadata.image ||
-      buildDefaultImage(url),
-    url: url.toString(),
-    site: url.origin,
-  }
-}
-
-const getMetadataForSpaceSection = async (url, match) => {
-  const spaceMeta = await getMetadataForSpace(url, match)
-  if (!spaceMeta) return undefined
-
-  const section = match[2]
-  const sectionName = section.charAt(0).toUpperCase() + section.slice(1)
-  spaceMeta.title = `${sectionName} on ${spaceMeta.title}`
-  return spaceMeta
-}
-
-const getMetadataForSpaceItem = async (url, match) => {
-  const spaceMeta = await getMetadataForSpace(url, match)
-  if (!spaceMeta) return undefined
-
-  const section = match[2]
-  let itemType = "Item"
-  if (section === "calendar") itemType = "Event"
-  if (section === "threads") itemType = "Thread"
-  if (section === "polls") itemType = "Poll"
-  if (section === "goals") itemType = "Goal"
-  if (section === "classifieds") itemType = "Listing"
-
-  spaceMeta.title = `${itemType} on ${spaceMeta.title}`
-  return spaceMeta
-}
-
-const getMetadataForRoom = async (url, match) => {
-  const spaceMeta = await getMetadataForSpace(url, match)
-  if (!spaceMeta) return undefined
-
-  // Room metadata requires fetching from Nostr, which can be added later.
-  spaceMeta.title = `Room on ${spaceMeta.title}`
-  return spaceMeta
-}
-
-const routes = [
-  [/^\/join\/?$/, getMetadataForInvite],
-  [/^\/spaces\/([^/]+)\/(calendar|chat|threads|polls|goals|classifieds|recent)\/?$/, getMetadataForSpaceSection],
-  [/^\/spaces\/([^/]+)\/(calendar|threads|polls|goals|classifieds)\/([^/]+)\/?$/, getMetadataForSpaceItem],
-  [/^\/spaces\/([^/]+)\/([^/]+)\/?$/, getMetadataForRoom],
-  [/^\/spaces\/([^/]+)\/?$/, getMetadataForSpace],
-]
-
-const getMetadataForRoute = async url => {
-  for (const [regex, getMetadata] of routes) {
-    const match = url.pathname.match(regex)
-    if (match) {
-      try {
-        return await getMetadata(url, match)
-      } catch (err) {
-        console.error(`Error generating metadata for route ${url.pathname}:`, err)
-        return undefined
-      }
-    }
-  }
-  return undefined
-}
-
-const injectMeta = metadata => {
-  const $ = load(TEMPLATE_HTML)
-
-  if (metadata.title) {
-    $("title").text(metadata.title)
-    $('meta[property="og:title"]').attr("content", metadata.title)
-    $('meta[name="twitter:title"]').attr("content", metadata.title)
-  }
-
-  if (metadata.description) {
-    $('meta[name="description"]').attr("content", metadata.description)
-    $('meta[property="og:description"]').attr("content", metadata.description)
-    $('meta[name="twitter:description"]').attr("content", metadata.description)
-  }
-
-  if (metadata.image) {
-    $('meta[property="og:image"]').attr("content", metadata.image)
-    $('meta[name="twitter:image"]').attr("content", metadata.image)
-  }
-
-  if (metadata.url) {
-    $('meta[property="og:url"]').attr("content", metadata.url)
-    $('meta[name="twitter:site"]').attr("content", metadata.site)
-    $('meta[name="twitter:url"]').attr("content", metadata.url)
-    $('link[rel="canonical"]').attr("href", metadata.url)
-  }
-
-  return $.html()
-}
-
-const app = new Hono()
-
-// Only allow GET and HEAD requests
-app.use("*", async (context, next) => {
-  const method = context.req.method
-  if (method !== "GET" && method !== "HEAD") {
-    return context.text("Method Not Allowed", 405, {Allow: "GET, HEAD"})
-  }
-  await next()
-})
-
-// Serve static assets with appropriate caching
-app.use(
-  "*",
-  serveStatic({
-    root: BUILD_DIR,
-    onFound: (filePath, context) => {
-      const isImmutable = filePath.split(path.sep).join("/").includes("/_app/immutable/")
-      const cacheControl =
-        path.basename(filePath) === "index.html"
-          ? "no-cache"
-          : isImmutable
-            ? "public, max-age=31536000, immutable"
-            : "public, max-age=3600"
-
-      context.header("Cache-Control", cacheControl)
-
-      // Immutable assets are content-hashed by Vite, so the filename is itself a
-      // stable content identifier. Exposing it as an ETag lets clients that
-      // revalidate explicitly (e.g. emoji-picker-element checks its data source
-      // on every load) skip re-downloading large files when nothing changed.
-      if (isImmutable) {
-        context.header("ETag", `"${path.basename(filePath)}"`)
-      }
-    },
-  }),
-)
-
-// 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
-
-  return context.html(html, 200, {
-    "Cache-Control": metadata ? "no-store" : "no-cache",
-  })
-})
-
-serve(
-  {
-    fetch: app.fetch,
-    hostname: HOST,
-    port: PORT,
-  },
-  () => {
-    console.log(`Flotilla server running on http://${HOST}:${PORT}`)
-  },
-)
@@ -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"
+    ]
+  }
+}
@@ -235,7 +235,6 @@

  :root {
    font-family: Lato;
-    text-size-adjust: 100%;
    --sait: var(--safe-area-inset-top, env(safe-area-inset-top));
    --saib: var(--safe-area-inset-bottom, env(safe-area-inset-bottom));
    --sail: var(--safe-area-inset-left, env(safe-area-inset-left));
@@ -333,7 +332,7 @@

 .input-editor .tiptap {
  --tiptap-object-bg: var(--color-base-200);
-  @apply input block h-auto p-[.65rem];
+  @apply input h-auto p-[.65rem];
 }

 /* link-content, based on tiptap */
@@ -417,24 +416,12 @@ progress[value]::-webkit-progress-value {
  @apply md:left-[calc(18.5rem+var(--sail))];
 }

-.left-content-full {
-  @apply md:left-[calc(3.5rem+var(--sail))];
-}
-
 /* Keyboard open state adjustments */

-body.keyboard-open {
-  --saib: 0px;
-}
-
 body.keyboard-open .hide-on-keyboard {
  display: none;
 }

-body.keyboard-open .chat__compose {
-  margin-bottom: 0;
-}
-
 /* chat view */

 .chat__compose {
@@ -2,18 +2,15 @@
 <html lang="en">
  <head>
    <meta charset="utf-8" />
-    <title>{NAME}</title>
-    <link rel="canonical" href="{URL}" />
    <meta
      name="viewport"
      content="width=device-width, initial-scale=1.0, viewport-fit=cover, interactive-widget=resizes-content" />
    <meta name="theme-color" content="{ACCENT}" />
    <meta name="description" content="{DESCRIPTION}" />
-    <meta property="og:url" content="{URL}" />
-    <meta property="og:type" content="website" />
-    <meta property="og:title" content="{NAME}" />
-    <meta property="og:description" content="{DESCRIPTION}" />
-    <meta property="og:image" content="" />
+    <meta name="og:url" content="{URL}" />
+    <meta name="og:type" content="website" />
+    <meta name="og:title" content="{NAME}" />
+    <meta name="og:description" content="{DESCRIPTION}" />
    <meta name="twitter:card" content="summary" />
    <meta name="twitter:site" content="{URL}" />
    <meta name="twitter:title" content="{NAME}" />
@@ -6,13 +6,11 @@ export type VoiceSession = {
  url: string
  h: string
  room: LiveKitRoom
+  muted: boolean
  cameraOn: boolean
  screenShareOn: boolean
 }

-/** Mic mute state is separate so toggling it does not re-render video tiles. */
-export const voiceMicMuted = writable(true)
-
 export type Pubkey = string

 export type VoiceParticipant = {pubkey?: Pubkey; identity: string}
@@ -29,6 +27,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

@@ -41,21 +41,6 @@ export const participantKey = (p: VoiceParticipant) => p.pubkey ?? p.identity

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

-export const participantMediaState = writable(
-  new Map<string, {muted: boolean; cameraOn: boolean}>(),
-)
-
-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) =>
@@ -6,16 +6,14 @@ 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, removeUndefined, uniqBy} from "@welshman/lib"
 import type {TrustedEvent} from "@welshman/util"
 import {makeHttpAuth, makeHttpAuthHeader, getTags} from "@welshman/util"
 import {signer} from "@welshman/app"
@@ -24,10 +22,10 @@ import {AbortError, whenAborted, whenTimeout} from "$lib/util"
 import {
  currentVoiceRoom,
  currentVoiceSession,
-  voiceMicMuted,
  participantFromLiveKitIdentity,
  participantKey,
-  participantMediaState,
+  participantPubkeyMap,
+  pubkeyFromLiveKitIdentity,
  speakingParticipants,
  VoiceState,
  type VoiceParticipant,
@@ -77,23 +75,20 @@ export const switchVoiceActiveDevice = async (
  }
 }

-const deleteParticipant = (identity: string) => {
-  participantMediaState.update(m => new Map(reject(nthEq(0, identity), [...m])))
-}
-
-const syncParticipantMedia = (participant: Participant) => {
-  const state = {muted: !participant.isMicrophoneEnabled, cameraOn: participant.isCameraEnabled}
-  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
  })
 }

-const onParticipantMediaChanged = (_publication: TrackPublication, participant: Participant) => {
-  syncParticipantMedia(participant)
+const deleteParticipant = (identity: string) => {
+  participantPubkeyMap.update(m => {
+    const next = new Map(m)
+    next.delete(identity)
+    return next
+  })
 }

 const fetchLivekitToken = async (
@@ -129,15 +124,15 @@ 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
@@ -178,7 +173,6 @@ const setUpMicrophone = async (

 const onRoomDisconnected = (reason?: DisconnectReason) => {
  videoPrimaryTileKey.set(undefined)
-  voiceMicMuted.set(true)
  currentVoiceSession.set(undefined)
  resetVideoCallLayout()
  if (reason !== undefined && reason !== DisconnectReason.CLIENT_INITIATED) {
@@ -190,7 +184,7 @@ const onRoomDisconnected = (reason?: DisconnectReason) => {
    pushToast({theme: "error", message})
  }
  speakingParticipants.set([])
-  participantMediaState.set(new Map())
+  participantPubkeyMap.set(new Map())
 }

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

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

@@ -279,11 +273,6 @@ export const joinVoiceRoom = async (
    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([
@@ -298,19 +287,19 @@ export const joinVoiceRoom = async (
      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)
    }

    const muted = await setUpMicrophone(startMuted, preferredMicId, liveKitRoom.localParticipant)

-    voiceMicMuted.set(muted)
    currentVoiceSession.set({
      url,
      h,
      room: liveKitRoom,
+      muted,
      cameraOn: false,
      screenShareOn: false,
    })
@@ -350,12 +339,11 @@ export const leaveVoiceRoom = async () => {

  voiceState.set(VoiceState.Disconnected)
  videoPrimaryTileKey.set(undefined)
-  voiceMicMuted.set(true)
  currentVoiceSession.set(undefined)
  resetVideoCallLayout()
  session.room.disconnect()
  speakingParticipants.set([])
-  participantMediaState.set(new Map())
+  participantPubkeyMap.set(new Map())
 }

 export const rejoinVoiceRoom = async (): Promise<void> => {
@@ -368,17 +356,18 @@ export const toggleMute = async () => {
  const session = get(currentVoiceSession)
  if (!session) return

-  voiceMicMuted.update(not)
-  if (get(voiceMicMuted)) {
+  const muted = !session.muted
+  if (muted) {
    // Disable and re-enable microphone to trigger permission prompt
    session.room.localParticipant.setMicrophoneEnabled(false)
+    currentVoiceSession.set({...session, muted})
    return
  }

  try {
    await session.room.localParticipant.setMicrophoneEnabled(true)
+    currentVoiceSession.set({...session, muted})
  } catch (e) {
-    voiceMicMuted.set(true)
    pushToast({theme: "error", message: "Could not access microphone"})
  }
 }
@@ -19,17 +19,15 @@
  const end = $derived(parseInt(meta.end))
 </script>

-<div class="flex flex-col justify-between gap-1">
-  <p class="text-lg">{meta.title || meta.name}</p>
+<div class="flex grow flex-wrap justify-between gap-2">
+  <p class="text-xl">{meta.title || meta.name}</p>
  {#if !isNaN(start) && !isNaN(end)}
    {@const startDateDisplay = formatTimestampAsDate(start)}
    {@const endDateDisplay = formatTimestampAsDate(end)}
    {@const isSingleDay = startDateDisplay === endDateDisplay}
-    <div class="flex flex-wrap gap-2 text-xs">
-      <div class="flex items-center gap-2">
-        <Icon icon={ClockCircle} size={4} />
-        {formatTimestampAsDate(start)}
-      </div>
+    <div class="flex items-center gap-2 text-sm">
+      <Icon icon={ClockCircle} size={4} />
+      <span class="hidden sm:block">{formatTimestampAsDate(start)}</span>
      {formatTimestampAsTime(start)} — {isSingleDay
        ? formatTimestampAsTime(end)
        : formatTimestamp(end)}
@@ -53,7 +53,7 @@
  import ChatComposeEdit from "@app/components/ChatComposeEdit.svelte"
  import ChatComposeParent from "@app/components/ChatComposeParent.svelte"
  import ThunkToast from "@app/components/ThunkToast.svelte"
-  import {userSettingsValues, deriveChat, makeChatId} from "@app/core/state"
+  import {userSettingsValues, deriveChat} from "@app/core/state"
  import {pushModal} from "@app/util/modal"
  import {DraftKey} from "@app/util/drafts"
  import {makeDelete, prependParent} from "@app/core/commands"
@@ -66,9 +66,8 @@

  const {pubkeys, info}: Props = $props()

-  const chatId = makeChatId(pubkeys)
-  const chat = deriveChat(chatId)
-  const draftKey = new DraftKey<{content?: string | object}>(`dm:${chatId}`)
+  const chat = deriveChat(pubkeys)
+  const draftKey = new DraftKey<{content?: string | object}>(`dm:${$chat?.id}`)
  const others = remove($pubkey!, pubkeys)
  const missingRelayLists = $derived(others.filter(pk => !$messagingRelayListsByPubkey.has(pk)))

@@ -6,7 +6,6 @@
    truncate,
    renderAsHtml,
    isText,
-    isEmail,
    isEmoji,
    isTopic,
    isCode,
@@ -27,7 +26,6 @@
  import Button from "@lib/components/Button.svelte"
  import ContentToken from "@app/components/ContentToken.svelte"
  import ContentEmoji from "@app/components/ContentEmoji.svelte"
-  import ContentEmail from "@app/components/ContentEmail.svelte"
  import ContentCode from "@app/components/ContentCode.svelte"
  import ContentLinkInline from "@app/components/ContentLinkInline.svelte"
  import ContentLinkBlock from "@app/components/ContentLinkBlock.svelte"
@@ -161,8 +159,6 @@
          <ContentTopic value={parsed.value} />
        {:else if isEmoji(parsed)}
          <ContentEmoji value={parsed.value} />
-        {:else if isEmail(parsed)}
-          <ContentEmail value={parsed.value} />
        {:else if isCode(parsed)}
          <ContentCode
            value={parsed.value}
@@ -1,12 +0,0 @@
-<script lang="ts">
-  import LinkRound from "@assets/icons/link-round.svg?dataurl"
-  import Icon from "@lib/components/Icon.svelte"
-  import Link from "@lib/components/Link.svelte"
-
-  export let value: string
-</script>
-
-<Link external href="mailto:{value}">
-  <Icon icon={LinkRound} size={3} />
-  {value}
-</Link>
@@ -7,7 +7,6 @@
    renderAsHtml,
    isText,
    isEmoji,
-    isEmail,
    isTopic,
    isCode,
    isCashu,
@@ -25,7 +24,6 @@
  import Button from "@lib/components/Button.svelte"
  import ContentToken from "@app/components/ContentToken.svelte"
  import ContentEmoji from "@app/components/ContentEmoji.svelte"
-  import ContentEmail from "@app/components/ContentEmail.svelte"
  import ContentCode from "@app/components/ContentCode.svelte"
  import ContentLinkInline from "@app/components/ContentLinkInline.svelte"
  import ContentNewline from "@app/components/ContentNewline.svelte"
@@ -111,8 +109,6 @@
          <ContentTopic value={parsed.value} />
        {:else if isEmoji(parsed)}
          <ContentEmoji value={parsed.value} />
-        {:else if isEmail(parsed)}
-          <ContentEmail value={parsed.value} />
        {:else if isCode(parsed)}
          <ContentCode
            value={parsed.value}
@@ -13,16 +13,13 @@

  const onClick = () => goToSpace(url)

-  const path = makeSpacePath(url)
-
  const display = $derived(deriveRelayDisplay(url))
 </script>

 <PrimaryNavItem
-  href={path}
  onclick={onClick}
  title={$display}
  class="tooltip-right"
-  notification={$notifications.has(path)}>
+  notification={$notifications.has(makeSpacePath(url))}>
  <RelayIcon {url} size={10} class="rounded-full" />
 </PrimaryNavItem>
@@ -19,12 +19,12 @@

 <div class="col-4 text-left">
  <div class="col-2">
-    <div class="relative flex gap-2 sm:gap-4">
+    <div class="relative flex gap-4">
      <div class="relative">
        <div class="avatar relative">
          <div
            class="center flex! h-12 w-12 min-w-12 rounded-full border-2 border-solid border-base-300 bg-base-300">
-            <RelayIcon {url} size={10} />
+            <RelayIcon {url} />
          </div>
        </div>
        {#if $rooms.includes(url)}
@@ -36,11 +36,13 @@
        {/if}
      </div>
      <div class="min-w-0">
-        <RelayName {url} class="ellipsize whitespace-nowrap text-lg sm:text-xl" />
-        <p class="text-xs sm:text-sm opacity-75">{url}</p>
+        <h2 class="ellipsize whitespace-nowrap text-xl">
+          <RelayName {url} />
+        </h2>
+        <p class="text-sm opacity-75">{url}</p>
      </div>
    </div>
-    <RelayDescription {url} class="text-sm sm:text-md" />
+    <RelayDescription {url} />
  </div>
  {#if !hideFavorites && $favorited.size > 0}
    <div class="row-2 card2 card2-sm bg-alt">
@@ -68,6 +68,8 @@
    const content = ed.getText({blockSeparator: "\n"}).trim()
    const tags = ed.storage.nostr.getEditorTags()

+    if (!content) return
+
    onSubmit({content, tags})

    draftKey?.clear()
@@ -122,7 +122,6 @@
          repository.removeEvent(thunk.event.id)
          pushToast({theme: "error", message})
        } else {
-          await removeRoomMembership(url, h)
          goto(makeSpacePath(url))
        }
      },
@@ -11,6 +11,7 @@
  import Modal from "@lib/components/Modal.svelte"
  import ModalBody from "@lib/components/ModalBody.svelte"
  import LogIn from "@app/components/LogIn.svelte"
+  import InfoNostr from "@app/components/InfoNostr.svelte"
  import SignUpKey from "@app/components/SignUpKey.svelte"
  import SignUpEmail from "@app/components/SignUpEmail.svelte"
  import SignUpProfile from "@app/components/SignUpProfile.svelte"
@@ -90,9 +91,11 @@

 <Modal>
  <ModalBody>
-    <h1 class="heading">Join {PLATFORM_NAME}</h1>
+    <h1 class="heading">Sign up with Nostr</h1>
    <p class="m-auto max-w-sm text-center">
-      Censorship resistant digital spaces for communities. Meet new people, own your identity.
+      {PLATFORM_NAME} is built using the
+      <Button class="link" onclick={() => pushModal(InfoNostr)}>nostr protocol</Button>, which gives
+      users control over their digital identity using <strong>cryptographic key pairs</strong>.
    </p>
    {#if hasPomade}
      <Button onclick={flows.email.start} class="btn btn-primary">
@@ -7,19 +7,17 @@
  import Icon from "@lib/components/Icon.svelte"
  import Button from "@lib/components/Button.svelte"
  import PageBar from "@lib/components/PageBar.svelte"
-  import RelayIcon from "@app/components/RelayIcon.svelte"
  import {decodeRelay} from "@app/core/state"
  import {makeSpacePath} from "@app/util/routes"

  interface Props {
    back?: () => unknown
-    leading?: Snippet
    title?: Snippet
    action?: Snippet
    [key: string]: any
  }

-  const {back = () => goto(makeSpacePath(url)), leading, title, action, ...props}: Props = $props()
+  const {back = () => goto(makeSpacePath(url)), title, action, ...props}: Props = $props()

  const url = decodeRelay($page.params.relay!)
 </script>
@@ -32,10 +30,6 @@
    <div class="ellipsize whitespace-nowrap flex grow items-center justify-between gap-4">
      <div class="flex flex-col">
        <div class="flex gap-2 items-center">
-          <RelayIcon {url} size={5} class="rounded-full md:hidden" />
-          <div class="hidden md:contents">
-            {@render leading?.()}
-          </div>
          {@render title?.()}
        </div>
        <div class="text-xs text-primary md:hidden">
@@ -1,7 +1,7 @@
 <script lang="ts">
  import {derived} from "svelte/store"
  import {displayRelayUrl, EVENT_TIME, ZAP_GOAL, THREAD, CLASSIFIED, POLL} from "@welshman/util"
-  import {deriveRelay, createSearch, pubkey} from "@welshman/app"
+  import {deriveRelay, deriveRelayDisplay, createSearch, pubkey} from "@welshman/app"
  import {fly} from "@lib/transition"
  import Magnifier from "@assets/icons/magnifier.svg?dataurl"
  import AltArrowDown from "@assets/icons/alt-arrow-down.svg?dataurl"
@@ -65,6 +65,7 @@
  const {url} = $props()

  const relay = deriveRelay(url)
+  const display = deriveRelayDisplay(url)
  const chatPath = makeSpacePath(url, "chat")
  const goalsPath = makeSpacePath(url, "goals")
  const threadsPath = makeSpacePath(url, "threads")
@@ -143,7 +144,9 @@
        class="relative flex w-full flex-col rounded-xl p-3 transition-all hover:bg-base-100"
        onclick={openMenu}>
        <div class="flex items-center justify-between">
-          <strong class="flex items-center gap-1 relative">
+          <strong
+            class="flex items-center gap-1 relative tooltip tooltip-right"
+            data-tip={$display}>
            <RelayName {url} class="ellipsize" />
            <div
              class="absolute -right-3 top-0 h-2 w-2 rounded-full bg-primary transition-all opacity-0"
@@ -26,22 +26,22 @@
    {@const {pubkey, software, version, supported_nips, limitation} = $relay}
    <div class="flex flex-wrap gap-1">
      {#if pubkey}
-        <div class="badge badge-neutral text-wrap h-auto">
+        <div class="badge badge-neutral">
          <span class="ellipsize">Administrator: <ProfileLink unstyled {pubkey} /></span>
        </div>
      {/if}
      {#if $relay?.contact}
-        <div class="badge badge-neutral text-wrap h-auto">
+        <div class="badge badge-neutral">
          <span class="ellipsize">Contact: {$relay.contact}</span>
        </div>
      {/if}
      {#if software}
-        <div class="badge badge-neutral text-wrap h-auto">
+        <div class="badge badge-neutral">
          <span class="ellipsize">Software: {software}</span>
        </div>
      {/if}
      {#if version}
-        <div class="badge badge-neutral text-wrap h-auto">
+        <div class="badge badge-neutral">
          <span class="ellipsize">Version: {version}</span>
        </div>
      {/if}
@@ -61,7 +61,7 @@
        </p>
      {/if}
      {#if limitation?.min_pow_difficulty}
-        <p class="badge badge-warning text-wrap h-auto">
+        <p class="badge badge-warning">
          <span class="ellipsize">Min PoW: {limitation?.min_pow_difficulty}</span>
        </p>
      {/if}
@@ -71,7 +71,6 @@

 {#if $toast}
  {@const theme = $toast.theme || "info"}
-  <!-- svelte-ignore a11y_no_static_element_interactions -->
  <div
    bind:this={containerEl}
    transition:fly={{y: -20}}
@@ -8,7 +8,6 @@
  import ProfileCircle from "@app/components/ProfileCircle.svelte"
  import VideoCallTile from "@app/components/VideoCallTile.svelte"
  import VoiceWidget from "@app/components/VoiceWidget.svelte"
-  import VoiceParticipantMediaBadges from "@app/components/VoiceParticipantMediaBadges.svelte"
  import {get} from "svelte/store"
  import {
    VideoCallLayout,
@@ -19,12 +18,7 @@
    ViewportSize,
    videoPrimaryTileKey,
  } from "@app/call/video"
-  import {
-    currentVoiceSession,
-    currentVoiceRoom,
-    mediaStateByIdentity,
-    pubkeyFromLiveKitIdentity,
-  } from "@app/call/stores"
+  import {currentVoiceSession, currentVoiceRoom, pubkeyFromLiveKitIdentity} from "@app/call/stores"

  type Props = {
    layout: VideoCallLayout
@@ -127,25 +121,6 @@
          source: Track.Source.ScreenShare,
        })
      }
-      if (!videoTiles.some(t => t.identity === rp.identity)) {
-        videoTiles.push({
-          identity: rp.identity,
-          isLocal: false,
-          trackSid: `avatar-${rp.identity}`,
-          track: undefined,
-          source: Track.Source.Camera,
-        })
-      }
-    }
-
-    if (!videoTiles.some(t => t.identity === user.identity)) {
-      videoTiles.push({
-        identity: user.identity,
-        isLocal: true,
-        trackSid: "local-avatar",
-        track: undefined,
-        source: Track.Source.Camera,
-      })
    }

    return videoTiles
@@ -169,9 +144,6 @@

  const useSpotlightLayout = $derived(primaryTile !== undefined)
  const useMultiGrid = $derived(!useSpotlightLayout && videoTiles.length > 2)
-  const multiGridClass = $derived(
-    layout === VideoCallLayout.Split ? "grid-cols-1" : "grid-cols-1 sm:grid-cols-2",
-  )

  $effect(() => {
    const k = $videoPrimaryTileKey
@@ -212,7 +184,6 @@
 </script>

 {#snippet videoTile(tile: VideoTileData, layout: TileLayout)}
-  {@const media = $mediaStateByIdentity(tile.identity)}
  <div
    class={cx(
      "relative isolate overflow-hidden rounded-box shadow-sm",
@@ -232,15 +203,6 @@
        <ProfileCircle pubkey={pubkeyFromLiveKitIdentity(tile.identity)} {url} size={14} />
      </div>
    {/if}
-    {#if tile.track}
-      <div class="pointer-events-none absolute left-1 top-1 z-10">
-        <VoiceParticipantMediaBadges
-          muted={media.muted}
-          cameraOn={media.cameraOn}
-          showCamera={tile.source === Track.Source.Camera}
-          size={3} />
-      </div>
-    {/if}
    <span
      class="pointer-events-none absolute bottom-1 left-1 max-w-[calc(100%-0.5rem)] truncate rounded bg-base-100/80 px-1.5 py-0.5 text-xs">
      {labelFor(tile.identity, tile.source)}{tile.isLocal ? " (you)" : ""}
@@ -251,8 +213,8 @@
        data-tip={pinned ? "Exit spotlight" : "Spotlight"}
        aria-pressed={pinned}
        class={cx(
-          "absolute right-1 top-1 z-20 btn btn-xs btn-square",
-          pinned ? "btn-primary" : "btn-ghost bg-base-100",
+          "absolute right-1 top-1 z-20 btn btn-xs btn-square btn-ghost",
+          pinned ? "btn-active bg-primary/25 text-primary" : "bg-base-100/70",
        )}
        onclick={spotlightHandlerFor(tileKey(tile))}>
        <Icon icon={Pin} size={3} />
@@ -276,7 +238,8 @@
        {/if}
      </div>
    {:else if useMultiGrid}
-      <div class={cx("grid min-h-0 flex-1 content-start gap-2 overflow-y-auto", multiGridClass)}>
+      <div
+        class="grid min-h-0 flex-1 grid-cols-1 content-start gap-2 overflow-y-auto sm:grid-cols-2">
        {#each videoTiles as tile (tileKey(tile))}
          {@render videoTile(tile, "default")}
        {/each}
@@ -291,10 +254,8 @@
  {:else}
    <div
      class="flex min-h-[12rem] flex-1 flex-col items-center justify-center gap-2 rounded-box bg-base-200/50 p-4 text-center text-sm opacity-80">
-      <p>No one is sharing video yet.</p>
-      <p class="text-xs">
-        Participants appear here when they turn on their camera or share their screen.
-      </p>
+      <p>No camera or screen share yet.</p>
+      <p class="text-xs">Use the camera or screen share control to share video.</p>
    </div>
  {/if}
 {/snippet}
@@ -1,34 +0,0 @@
-<script lang="ts">
-  import cx from "classnames"
-  import MicrophoneOff from "@assets/icons/microphone-off.svg?dataurl"
-  import VideocameraOff from "@assets/icons/videocamera-off.svg?dataurl"
-  import Icon from "@lib/components/Icon.svelte"
-
-  type Props = {
-    muted: boolean
-    cameraOn: boolean
-    showCamera?: boolean
-    size?: number
-    class?: string
-  }
-
-  const {muted, cameraOn, showCamera = true, size = 3, class: className = ""}: Props = $props()
-
-  const badgeClass =
-    "inline-flex size-4 shrink-0 items-center justify-center rounded bg-base-100/80 p-0.5 text-error"
-</script>
-
-{#if muted || (showCamera && !cameraOn)}
-  <div class={cx("flex items-center gap-1", className)}>
-    {#if muted}
-      <span class={badgeClass} aria-label="Muted">
-        <Icon icon={MicrophoneOff} {size} />
-      </span>
-    {/if}
-    {#if showCamera && !cameraOn}
-      <span class={badgeClass} aria-label="Camera off">
-        <Icon icon={VideocameraOff} {size} />
-      </span>
-    {/if}
-  </div>
-{/if}
@@ -9,13 +9,11 @@
  import {makeRoomPath} from "@app/util/routes"
  import {pushModal} from "@app/util/modal"
  import VoiceRoomJoinDialog from "@app/components/VoiceRoomJoinDialog.svelte"
-  import VoiceParticipantMediaBadges from "@app/components/VoiceParticipantMediaBadges.svelte"
  import {makeRoomId} from "@app/core/state"
  import {
    VoiceState,
    currentVoiceRoom,
    isParticipantSpeaking,
-    mediaStateByIdentity,
    participantKey,
    voiceState,
    type VoiceParticipant,
@@ -85,17 +83,9 @@
            )}>
            <ProfileCircle pubkey={p.pubkey} size={5} class="h-5 w-5" />
          </div>
-          <span class="ellipsize min-w-0 flex-1 text-xs opacity-70">
+          <span class="ellipsize text-xs opacity-70">
            {p.pubkey ? displayProfileByPubkey(p.pubkey) : "Unknown"}
          </span>
-          {#if isActive}
-            {@const media = $mediaStateByIdentity(p.identity)}
-            <VoiceParticipantMediaBadges
-              muted={media.muted}
-              cameraOn={media.cameraOn}
-              size={3}
-              class="shrink-0" />
-          {/if}
        </div>
      {/each}
    {/if}
@@ -6,7 +6,7 @@
  import cx from "classnames"
  import {displayRelayUrl} from "@welshman/util"
  import Microphone from "@assets/icons/microphone.svg?dataurl"
-  import VideocameraOff from "@assets/icons/videocamera-off.svg?dataurl"
+  import Videocamera from "@assets/icons/videocamera.svg?dataurl"
  import VideocameraRecord from "@assets/icons/videocamera-record.svg?dataurl"
  import Monitor from "@assets/icons/monitor.svg?dataurl"
  import PhoneRounded from "@assets/icons/phone-rounded.svg?dataurl"
@@ -41,8 +41,8 @@
    VoiceState,
    currentVoiceSession,
    currentVoiceRoom,
-    voiceMicMuted,
    voiceState,
+    isLocalSpeaking,
  } from "@app/call/stores"
  import {cancelJoinVoiceRoom, leaveVoiceRoom, toggleMute} from "@app/call/voice"

@@ -183,16 +183,18 @@
        </Button>
      {:else if $voiceState === VoiceState.Connected && $currentVoiceSession}
        <Button
-          data-tip={$voiceMicMuted ? "Unmute" : "Mute"}
+          data-tip={$currentVoiceSession.muted ? "Unmute" : "Mute"}
          class={cx(
            mediaToggleClass,
            "overflow-visible",
-            $voiceMicMuted && "text-error ring-1 ring-error/50 ring-offset-0 ring-offset-base-100",
+            !$currentVoiceSession.muted && $isLocalSpeaking && "text-primary",
+            $currentVoiceSession.muted &&
+              "text-error ring-1 ring-error/50 ring-offset-0 ring-offset-base-100",
          )}
          onclick={toggleMute}>
          <span class="relative inline-flex items-center justify-center overflow-visible">
            <Icon icon={Microphone} size={4} />
-            {#if $voiceMicMuted}
+            {#if $currentVoiceSession.muted}
              <span
                class="pointer-events-none absolute inset-0 flex items-center justify-center overflow-visible"
                aria-hidden="true">
@@ -205,17 +207,9 @@
        </Button>
        <Button
          data-tip={$currentVoiceSession.cameraOn ? "Turn off camera" : "Turn on camera"}
-          class={cx(
-            mediaToggleClass,
-            "overflow-visible",
-            $currentVoiceSession.cameraOn && "text-primary",
-            !$currentVoiceSession.cameraOn &&
-              "text-error ring-1 ring-error/50 ring-offset-0 ring-offset-base-100",
-          )}
+          class={cx(mediaToggleClass, $currentVoiceSession.cameraOn && "text-primary")}
          onclick={toggleCamera}>
-          <Icon
-            icon={$currentVoiceSession.cameraOn ? VideocameraRecord : VideocameraOff}
-            size={4} />
+          <Icon icon={$currentVoiceSession.cameraOn ? VideocameraRecord : Videocamera} size={4} />
        </Button>
        {#if !Capacitor.isNativePlatform()}
          <Button
@@ -73,6 +73,7 @@ import {
  waitForThunkError,
  getPubkeyRelays,
  userBlossomServerList,
+  getThunkError,
  addRoomMember,
  manageRelay,
  getRelay,
@@ -263,12 +264,16 @@ export const attemptRelayAccess = async (url: string, claim = "") => {
  return stripPrefix(error)
 }

-export const deriveRelayAuthError = (url: string) => {
+export const deriveRelayAuthError = (url: string, claim = "") => {
+  // Kick off the auth process
  Pool.get().get(url).auth.attemptAuth(sign)

+  // Attempt to join the relay
+  const thunk = publishJoinRequest({url, claim})
+
  return derived(
-    [relaysMostlyRestricted, deriveSocket(url)],
-    ([$relaysMostlyRestricted, $socket]) => {
+    [thunk, relaysMostlyRestricted, deriveSocket(url)],
+    ([$thunk, $relaysMostlyRestricted, $socket]) => {
      if ($socket.auth.status === AuthStatus.Forbidden && $socket.auth.details) {
        return stripPrefix($socket.auth.details)
      }
@@ -276,6 +281,16 @@ export const deriveRelayAuthError = (url: string) => {
      if ($relaysMostlyRestricted[url]) {
        return stripPrefix($relaysMostlyRestricted[url])
      }
+
+      const error = getThunkError($thunk)
+
+      if (error) {
+        const isEmptyInvite = !claim && error.includes("invite code")
+
+        if (!shouldIgnoreError(error) && !isEmptyInvite) {
+          return stripPrefix(error) || "join request rejected"
+        }
+      }
    },
  )
 }
@@ -28,7 +28,7 @@ import {
 import type {TrustedEvent, Filter, List} from "@welshman/util"
 import {load, request, mergeRepositoryUpdates} from "@welshman/net"
 import type {RepositoryUpdate} from "@welshman/net"
-import {repository, loadRelay, tracker} from "@welshman/app"
+import {pubkey, repository, loadRelay, tracker} from "@welshman/app"
 import {createScroller} from "@lib/html"
 import {daysBetween} from "@lib/util"
 import {getEventsForUrl} from "@app/core/state"
@@ -41,6 +41,7 @@ export const makeFeed = ({
  element,
  onBackwardExhausted,
  onForwardExhausted,
+  allowOptimisticSelfEvents = false,
  at = now(),
 }: {
  url: string
@@ -48,6 +49,7 @@ export const makeFeed = ({
  element: HTMLElement
  onBackwardExhausted?: () => void
  onForwardExhausted?: () => void
+  allowOptimisticSelfEvents?: boolean
  at?: number
 }) => {
  const controller = new AbortController()
@@ -113,7 +115,15 @@ export const makeFeed = ({
        }

        const matching = added.filter(
-          event => matchFilters(filters, event) && tracker.getRelays(event.id).has(url),
+          event =>
+            matchFilters(filters, event) &&
+            (tracker.getRelays(event.id).has(url) ||
+              // In Safari, relay confirmation can lag behind local repository updates.
+              // Only enable this for chat-like feeds that explicitly opt in.
+              (allowOptimisticSelfEvents &&
+                event.pubkey === pubkey.get() &&
+                tracker.getRelays(event.id).size === 0 &&
+                event.created_at >= now() - 60)),
        )

        if (matching.length > 0) {
@@ -5,7 +5,7 @@ import {derived, readable, writable} from "svelte/store"
 import * as nip19 from "nostr-tools/nip19"
 import {
  on,
-  gte,
+  gt,
  max,
  spec,
  call,
@@ -560,7 +560,11 @@ export const chatsById = call(() => {
  })
 })

-export const deriveChat = makeDeriveItem(chatsById)
+export const deriveChat = call(() => {
+  const _deriveChat = makeDeriveItem(chatsById)
+
+  return (pubkeys: string[]) => _deriveChat(makeChatId(pubkeys))
+})

 export const chatSearch = derived(throttled(1500, chatsById), $chatsByPubkey => {
  return createSearch(
@@ -596,9 +600,6 @@ export const splitRoomId = (id: string) => id.split("'")
 export const hasNip29 = (relay?: RelayProfile) =>
  Boolean(relay?.supported_nips?.map?.(String)?.includes?.("29"))

-const getRoomDeleteId = (event: TrustedEvent) =>
-  getTagValue("h", event.tags) || getTagValue("d", event.tags)
-
 export const roomMetaEventsByIdByUrl = deriveEventsByIdByUrl({
  tracker,
  repository,
@@ -608,25 +609,12 @@ export const roomMetaEventsByIdByUrl = deriveEventsByIdByUrl({
 export const roomsByUrl = derived(roomMetaEventsByIdByUrl, roomMetaEventsByIdByUrl => {
  const result = new Map<string, Room[]>()

-  // Build a global set of deleted rooms from the repository directly so that
-  // deletes are visible even before the tracker has mapped them to a URL.
-  const deletedByH = new Map<string, number>()
-
-  for (const event of repository.query([{kinds: [ROOM_DELETE]}])) {
-    const h = getRoomDeleteId(event)
-
-    if (h) {
-      deletedByH.set(h, max([deletedByH.get(h), event.created_at]))
-    }
-  }
-
  for (const [url, events] of roomMetaEventsByIdByUrl.entries()) {
    const [metaEvents, deleteEvents] = partition(spec({kind: ROOM_META}), events.values())
+    const deletedByH = new Map<string, number>()

    for (const event of deleteEvents) {
-      const h = getRoomDeleteId(event)
-
-      if (h) {
+      for (const h of getTagValues("h", event.tags)) {
        deletedByH.set(h, max([deletedByH.get(h), event.created_at]))
      }
    }
@@ -636,7 +624,7 @@ export const roomsByUrl = derived(roomMetaEventsByIdByUrl, roomMetaEventsByIdByU
    for (const event of metaEvents) {
      const meta = tryCatch(() => readRoomMeta(event))

-      if (!meta || gte(deletedByH.get(meta.h), meta.event.created_at)) {
+      if (!meta || gt(deletedByH.get(meta.h), meta.event.created_at)) {
        continue
      }

@@ -667,10 +655,7 @@ export const loadRoom = call(() => {

    await load({
      relays: [url],
-      filters: [
-        {kinds: [ROOM_META], "#d": [h]},
-        {kinds: [ROOM_DELETE], "#h": [h]},
-      ],
+      filters: [{kinds: [ROOM_META], "#d": [h]}],
    })
  }

@@ -1,4 +1,3 @@
-import {App} from "@capacitor/app"
 import {Capacitor} from "@capacitor/core"
 import {Keyboard} from "@capacitor/keyboard"
 import {noop} from "@welshman/lib"
@@ -14,16 +13,9 @@ export const syncKeyboard = () => {
    document.body.classList.remove("keyboard-open")
  })

-  // On Android, system-dismissing the IME during pause doesn't fire keyboardWillHide,
-  // so on resume we force a hide to re-sync native insets and clear our CSS state.
-  const resumeListener = App.addListener("appStateChange", ({isActive}) => {
-    if (isActive) Keyboard.hide()
-  })
-
  return () => {
    showListener.then(listener => listener.remove())
    hideListener.then(listener => listener.remove())
-    resumeListener.then(listener => listener.remove())
    document.body.classList.remove("keyboard-open")
  }
 }
--- a/Show More
+++ b/Show More