Factor video code and stores out of voice.ts

Clean up VideoCallContent
Simplify how video call layout is stored
2026-04-08 10:30:22 -04:00 · 2026-04-08 09:46:33 -04:00 · 2026-04-07 14:57:24 -04:00 · 2026-04-07 13:51:51 -04:00 · 2026-04-07 13:51:09 -04:00 · 2026-04-07 13:51:09 -04:00
136 changed files with 1679 additions and 2477 deletions
@@ -19,6 +19,5 @@ VITE_DEFAULT_SEARCH_RELAYS=relay.ditto.pub,antiprimal.net,relay.vertexlab.io
 VITE_DEFAULT_MESSAGING_RELAYS=auth.nostr1.com,relay.keychat.io,relay.ditto.pub
 VITE_SIGNER_RELAYS=relay.nsec.app,ephemeral.snowflare.cc,bucket.coracle.social
 VITE_VAPID_PUBLIC_KEY=BIt2D4BdgdbCowD_0d3Np6GbrIGHxd7aIEUeZNe3hQuRlHz02OhzvDaai0XSFoJYVzSzdMjdyW-QhvW9_yq8j4Y
-VITE_THUMBNAIL_URL=https://vthumbs.coracle.social
 VITE_GLITCHTIP_API_KEY=
 GLITCHTIP_AUTH_TOKEN=
@@ -1,5 +1,4 @@
 src/assets
-.claude
 target
 build
 .idea
@@ -14,4 +13,4 @@ ios/App/Pods/
 android/capacitor-cordova-android-plugins
 android/app/src/androidTest
 android/app/src/test
-node_modules
+
@@ -28,7 +28,6 @@ node_modules/
 .pnpm-store/
 build/
 .svelte-kit/
-.next/

 # Rust/Tauri
 *target/
@@ -70,7 +69,6 @@ GoogleService-Info.plist
 .roo
 .idea/
 .vscode/
-.claude/

 # OS generated
 .DS_Store
@@ -1,36 +1,5 @@
 # Changelog

-# 1.7.4
-
-* Fix safe area inset for FAB
-
-# 1.7.3
-
-* Add native share support for space invites
-* Stop sending duplicate requests per room
-* Add more robust thumbnail url generation
-* Make space reordering discoverable with smoother drag animation
-* Improve relay member list
-* Add room mentions and clickable room/relay refs
-* Support native clipboard image paste on mobile
-* publish kind 9 quote after room content creation for cross-client interoperability
-* Improve feed pagination logic and performance
-* Support Aegis URL scheme for NIP-46 login
-* Various UI and bug fixes
-* Raise message size limit in chat
-* Fix realtime updates for room members and admins
-* Add video to calls
-* Remove follow graph building
-* Add start chat FAB
-* Add drafts
-* Redesign toast notifications
-* Remove room/space leave indications
-* Hide report badge for non-admin users
-* Add polls
-* Add search to recent activity page
-* Fix notification badge on mobile nav
-* Change audio devices in call
-
 # 1.7.2

 * Fix race condition in nip 46
@@ -8,8 +8,8 @@ android {
        applicationId "social.flotilla"
        minSdk rootProject.ext.minSdkVersion
        targetSdk rootProject.ext.targetSdkVersion
-        versionCode 46
-        versionName "1.7.4"
+        versionCode 44
+        versionName "1.7.2"
        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
        aaptOptions {
             // Files and dirs to omit from the packaged assets dir, modified to accommodate modern web apps.
@@ -12,12 +12,10 @@ dependencies {
    implementation project(':aparajita-capacitor-secure-storage')
    implementation project(':capacitor-community-safe-area')
    implementation project(':capacitor-app')
-    implementation project(':capacitor-clipboard')
    implementation project(':capacitor-filesystem')
    implementation project(':capacitor-keyboard')
    implementation project(':capacitor-preferences')
    implementation project(':capacitor-push-notifications')
-    implementation project(':capacitor-share')
    implementation project(':capawesome-capacitor-android-dark-mode-support')
    implementation project(':capawesome-capacitor-badge')
    implementation project(':nostr-signer-capacitor-plugin')
@@ -7,7 +7,6 @@ import androidx.work.ExistingPeriodicWorkPolicy
 import androidx.work.ExistingWorkPolicy
 import androidx.work.NetworkType
 import androidx.work.OneTimeWorkRequest
-import androidx.work.OutOfQuotaPolicy
 import androidx.work.PeriodicWorkRequest
 import androidx.work.WorkManager
 import com.getcapacitor.JSObject
@@ -77,7 +76,6 @@ class AndroidPushFallbackPlugin : Plugin() {

    val immediate = OneTimeWorkRequest.Builder(AndroidPushFallbackWorker::class.java)
      .setConstraints(constraints)
-      .setExpedited(OutOfQuotaPolicy.RUN_AS_NON_EXPEDITED_WORK_REQUEST)
      .build()

    workManager.enqueueUniquePeriodicWork(
@@ -43,7 +43,7 @@ class AndroidPushFallbackWorker(context: Context, params: WorkerParameters) : Wo
    private const val TAG = "PushFallback"
    private const val CHANNEL_ID = "flotilla_fallback"
    private const val CURSOR_PREFIX = "androidPushFallback.cursor."
-    private const val SOCKET_TIMEOUT_SECONDS = 30L
+    private const val SOCKET_TIMEOUT_SECONDS = 20L
    private const val REJECTED = "__REJECTED__"
    private const val KIND_RELAY_AUTH = 22242
    private const val KIND_NIP46_RPC = 24133
@@ -72,8 +72,6 @@ class AndroidPushFallbackWorker(context: Context, params: WorkerParameters) : Wo
  }

  override fun doWork(): Result {
-    Log.i(TAG, "doWork() started")
-
    if (isAppInForeground()) {
      return Result.success()
    }
@@ -90,7 +88,7 @@ class AndroidPushFallbackWorker(context: Context, params: WorkerParameters) : Wo

      val activeSince = state.optLong("activeSince", 0L)
      val seen = mutableSetOf<String>()
-      val newEvents = mutableListOf<Pair<String, JSONObject>>()
+      var latestPair: Pair<String, JSONObject>? = null

      for (sub in subscriptions) {
        val cursorKey = CURSOR_PREFIX + sub.relay + ":" + sub.key
@@ -104,19 +102,23 @@ class AndroidPushFallbackWorker(context: Context, params: WorkerParameters) : Wo
        for (event in result.events) {
          val id = event.optString("id", "")
          if (id.isNotEmpty() && seen.add(id)) {
-            newEvents.add(Pair(sub.relay, event))
+            val createdAt = event.optLong("created_at", 0L)
+            if (latestPair == null || createdAt > latestPair!!.second.optLong("created_at", 0L)) {
+              latestPair = Pair(sub.relay, event)
+            }
          }
        }
      }

-      for ((relay, event) in newEvents) {
+      if (latestPair != null) {
+        val (relay, event) = latestPair!!
        postNotification(relay, event)
      }

      return Result.success()
    } catch (e: Exception) {
      Log.e(TAG, "Worker failed", e)
-      return Result.retry()
+      return Result.success()
    } finally {
      pool.closeAll()
      client.dispatcher.executorService.shutdown()
@@ -212,8 +214,7 @@ class AndroidPushFallbackWorker(context: Context, params: WorkerParameters) : Wo
      .setContentIntent(pendingIntent)
      .build()

-    val notificationId = id.hashCode().let { if (it == 0) 1 else it }
-    NotificationManagerCompat.from(context).notify(notificationId, notification)
+    NotificationManagerCompat.from(context).notify(1, notification)
  }

  private fun matchesFilter(filter: JSONObject, event: JSONObject): Boolean {
@@ -11,9 +11,6 @@ project(':capacitor-community-safe-area').projectDir = new File('../node_modules
 include ':capacitor-app'
 project(':capacitor-app').projectDir = new File('../node_modules/.pnpm/@capacitor+app@8.0.0_@capacitor+core@8.0.1/node_modules/@capacitor/app/android')

-include ':capacitor-clipboard'
-project(':capacitor-clipboard').projectDir = new File('../node_modules/.pnpm/@capacitor+clipboard@8.0.1_@capacitor+core@8.0.1/node_modules/@capacitor/clipboard/android')
-
 include ':capacitor-filesystem'
 project(':capacitor-filesystem').projectDir = new File('../node_modules/.pnpm/@capacitor+filesystem@8.1.0_@capacitor+core@8.0.1/node_modules/@capacitor/filesystem/android')

@@ -26,9 +23,6 @@ project(':capacitor-preferences').projectDir = new File('../node_modules/.pnpm/@
 include ':capacitor-push-notifications'
 project(':capacitor-push-notifications').projectDir = new File('../node_modules/.pnpm/@capacitor+push-notifications@8.0.0_@capacitor+core@8.0.1/node_modules/@capacitor/push-notifications/android')

-include ':capacitor-share'
-project(':capacitor-share').projectDir = new File('../node_modules/.pnpm/@capacitor+share@8.0.1_@capacitor+core@8.0.1/node_modules/@capacitor/share/android')
-
 include ':capawesome-capacitor-android-dark-mode-support'
 project(':capawesome-capacitor-android-dark-mode-support').projectDir = new File('../node_modules/.pnpm/@capawesome+capacitor-android-dark-mode-support@8.0.0_@capacitor+core@8.0.1/node_modules/@capawesome/capacitor-android-dark-mode-support/android')

@@ -358,14 +358,14 @@
 				CODE_SIGN_ENTITLEMENTS = "Flotilla Chat.entitlements";
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 37;
+				CURRENT_PROJECT_VERSION = 35;
 				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.7.4;
+				MARKETING_VERSION = 1.7.2;
 				OTHER_SWIFT_FLAGS = "$(inherited) \"-D\" \"COCOAPODS\" \"-DDEBUG\"";
 				PRODUCT_BUNDLE_IDENTIFIER = social.flotilla;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -385,14 +385,14 @@
 				CODE_SIGN_ENTITLEMENTS = "Flotilla Chat.entitlements";
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 37;
+				CURRENT_PROJECT_VERSION = 35;
 				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.7.4;
+				MARKETING_VERSION = 1.7.2;
 				PRODUCT_BUNDLE_IDENTIFIER = social.flotilla;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -14,12 +14,10 @@ def capacitor_pods
  pod 'AparajitaCapacitorSecureStorage', :path => '../../node_modules/.pnpm/@aparajita+capacitor-secure-storage@8.0.0/node_modules/@aparajita/capacitor-secure-storage'
  pod 'CapacitorCommunitySafeArea', :path => '../../node_modules/.pnpm/@capacitor-community+safe-area@8.0.1_@capacitor+core@8.0.1/node_modules/@capacitor-community/safe-area'
  pod 'CapacitorApp', :path => '../../node_modules/.pnpm/@capacitor+app@8.0.0_@capacitor+core@8.0.1/node_modules/@capacitor/app'
-  pod 'CapacitorClipboard', :path => '../../node_modules/.pnpm/@capacitor+clipboard@8.0.1_@capacitor+core@8.0.1/node_modules/@capacitor/clipboard'
  pod 'CapacitorFilesystem', :path => '../../node_modules/.pnpm/@capacitor+filesystem@8.1.0_@capacitor+core@8.0.1/node_modules/@capacitor/filesystem'
  pod 'CapacitorKeyboard', :path => '../../node_modules/.pnpm/@capacitor+keyboard@8.0.0_@capacitor+core@8.0.1/node_modules/@capacitor/keyboard'
  pod 'CapacitorPreferences', :path => '../../node_modules/.pnpm/@capacitor+preferences@8.0.0_@capacitor+core@8.0.1/node_modules/@capacitor/preferences'
  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_2704ecccfd05fcfb1ad8852744422b7c/node_modules/nostr-signer-capacitor-plugin'
 end
@@ -1,6 +1,6 @@
 {
  "name": "flotilla",
-  "version": "1.7.4",
+  "version": "1.7.2",
  "private": true,
  "scripts": {
    "dev": "vite dev",
@@ -22,7 +22,6 @@
    "@eslint/js": "^9.39.2",
    "@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",
@@ -36,7 +35,7 @@
    "prettier-plugin-svelte": "^3.4.1",
    "svelte": "^5.48.0",
    "svelte-check": "^4.3.5",
-    "tailwindcss": "^4.2.2",
+    "tailwindcss": "^3.4.19",
    "typescript": "^5.9.3",
    "typescript-eslint": "^8.53.1",
    "vite": "^5.4.21"
@@ -48,40 +47,37 @@
    "@capacitor/android": "^8.0.1",
    "@capacitor/app": "^8.0.0",
    "@capacitor/cli": "^8.0.1",
-    "@capacitor/clipboard": "^8.0.1",
    "@capacitor/core": "^8.0.1",
    "@capacitor/filesystem": "^8.1.0",
    "@capacitor/ios": "^8.0.1",
    "@capacitor/keyboard": "^8.0.0",
    "@capacitor/preferences": "^8.0.0",
    "@capacitor/push-notifications": "^8.0.0",
-    "@capacitor/share": "^8.0.1",
    "@capawesome/capacitor-android-dark-mode-support": "^8.0.0",
    "@capawesome/capacitor-badge": "^8.0.0",
    "@getalby/lightning-tools": "^6.1.0",
    "@getalby/sdk": "^5.1.2",
    "@noble/curves": "^1.9.7",
-    "@pomade/core": "^0.2.3",
+    "@pomade/core": "^0.2.2",
    "@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": "^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",
+    "@welshman/app": "^0.8.12",
+    "@welshman/content": "^0.8.12",
+    "@welshman/editor": "^0.8.12",
+    "@welshman/feeds": "^0.8.12",
+    "@welshman/lib": "^0.8.12",
+    "@welshman/net": "^0.8.12",
+    "@welshman/router": "^0.8.12",
+    "@welshman/signer": "^0.8.12",
+    "@welshman/store": "^0.8.12",
+    "@welshman/util": "^0.8.12",
    "compressorjs-next": "^1.1.2",
-    "daisyui": "^5.5.19",
+    "daisyui": "^4.12.24",
    "date-picker-svelte": "^2.17.0",
    "dotenv": "^16.6.1",
    "emoji-picker-element": "^1.28.1",
@@ -91,7 +87,7 @@
    "livekit-client": "^2.17.2",
    "nostr-signer-capacitor-plugin": "github:coracle-social/nostr-signer-capacitor-plugin#main",
    "nostr-tools": "^2.19.4",
-    "prettier-plugin-tailwindcss": "^0.7.2",
+    "prettier-plugin-tailwindcss": "^0.6.14",
    "qr-scanner": "^1.4.2",
    "qrcode": "^1.5.4",
    "throttle-debounce": "^5.0.2",
@@ -108,6 +104,5 @@
    "overrides": {
      "sharp": "0.35.0-rc.0"
    }
-  },
-  "packageManager": "pnpm@10.33.0+sha512.10568bb4a6afb58c9eb3630da90cc9516417abebd3fabbe6739f0ae795728da1491e9db5a544c76ad8eb7570f5c4bb3d6c637b2cb41bfdcdb47fa823c8649319"
+  }
 }
@@ -1,5 +1,6 @@
 export default {
  plugins: {
-    "@tailwindcss/postcss": {},
+    tailwindcss: {},
+    autoprefixer: {},
  },
 }
@@ -1,6 +1,46 @@
-@import "tailwindcss";
+@import "@welshman/editor/index.css";

-@config "../tailwind.config.js";
+@tailwind base;
+@tailwind components;
+@tailwind utilities;
+
+/* Fonts */
+
+@font-face {
+  font-family: "Satoshis";
+  font-style: normal;
+  font-weight: 400;
+  src:
+    local(""),
+    url("/fonts/Satoshi Symbol.ttf") format("truetype");
+}
+
+@font-face {
+  font-family: "Lato";
+  font-style: normal;
+  font-weight: 400;
+  src:
+    local(""),
+    url("/fonts/Lato-Regular.ttf") format("truetype");
+}
+
+@font-face {
+  font-family: "Lato";
+  font-style: bold;
+  font-weight: 600;
+  src:
+    local(""),
+    url("/fonts/Lato-Bold.ttf") format("truetype");
+}
+
+@font-face {
+  font-family: "Lato";
+  font-style: italic;
+  font-weight: 400;
+  src:
+    local(""),
+    url("/fonts/Italic.ttf") format("truetype");
+}

 /* root */

@@ -12,244 +52,98 @@
  --sair: var(--safe-area-inset-right, env(safe-area-inset-right));
 }

-@utility pt-sai {
-  padding-top: var(--sait);
+[data-theme] {
+  @apply bg-base-300;
+  --base-100: oklch(var(--b1));
+  --base-200: oklch(var(--b2));
+  --base-300: oklch(var(--b3));
+  --base-content: oklch(var(--bc));
+  --primary: oklch(var(--p));
+  --primary-content: oklch(var(--pc));
+  --secondary: oklch(var(--s));
+  --secondary-content: oklch(var(--sc));
+  --neutral: oklch(var(--n));
+  --neutral-content: oklch(var(--nc));
 }

-@utility pr-sai {
-  padding-right: var(--sair);
+.mobile [data-tip]::before {
+  display: none !important;
 }

-@utility pb-sai {
-  padding-bottom: var(--saib);
-}
+/* safe area insets */

-@utility pl-sai {
-  padding-left: var(--sail);
-}
-
-@utility px-sai {
-  @apply pl-sai pr-sai;
-}
-
-@utility py-sai {
-  @apply pt-sai pb-sai;
-}
-
-@utility p-sai {
-  @apply py-sai px-sai;
-}
-
-@utility mt-sai {
-  margin-top: var(--sait);
-}
-
-@utility mr-sai {
-  margin-right: var(--sair);
-}
-
-@utility mb-sai {
-  margin-bottom: var(--saib);
-}
-
-@utility ml-sai {
-  margin-left: var(--sail);
-}
-
-@utility mx-sai {
-  @apply ml-sai mr-sai;
-}
-
-@utility my-sai {
-  @apply mt-sai mb-sai;
-}
-
-@utility m-sai {
-  @apply my-sai mx-sai;
-}
-
-@utility top-sai {
-  top: var(--sait);
-}
-
-@utility right-sai {
-  right: var(--sair);
-}
-
-@utility bottom-sai {
-  bottom: var(--saib);
-}
-
-@utility left-sai {
-  left: var(--sail);
-}
-
-@utility card2 {
-  @apply rounded-box text-base-content p-4 sm:p-6;
-}
-
-@utility column {
-  @apply flex flex-col;
-}
-
-@utility center {
-  @apply flex items-center justify-center;
-}
-
-@utility row-2 {
-  @apply flex items-center gap-2;
-}
-
-@utility row-3 {
-  @apply flex items-center gap-3;
-}
-
-@utility row-4 {
-  @apply flex items-center gap-4;
-}
-
-@utility col-2 {
-  @apply flex flex-col gap-2;
-}
-
-@utility col-3 {
-  @apply flex flex-col gap-3;
-}
-
-@utility col-4 {
-  @apply flex flex-col gap-4;
-}
-
-@utility col-8 {
-  @apply flex flex-col gap-8;
-}
-
-@utility ellipsize {
-  @apply overflow-hidden text-ellipsis;
-}
-
-@utility content-padding-x {
-  @apply px-4 sm:px-8 md:px-12;
-}
-
-@utility content-padding-t {
-  @apply pt-4 sm:pt-8 md:pt-12;
-}
-
-@utility content-padding-b {
-  @apply pb-4 sm:pb-8 md:pb-12;
-}
-
-@utility content-padding-y {
-  @apply pt-4 pb-4 sm:pt-8 sm:pb-8 md:pt-12 md:pb-12;
-}
-
-@utility content-sizing {
-  @apply m-auto w-full max-w-3xl;
-}
-
-@utility content {
-  @apply m-auto w-full max-w-3xl px-4 pt-4 pb-4 sm:px-8 sm:pt-8 sm:pb-8 md:px-12 md:pt-12 md:pb-12;
-}
-
-@utility heading {
-  @apply text-center text-2xl;
-}
-
-@utility subheading {
-  @apply text-center text-xl;
-}
-
-@utility superheading {
-  @apply text-center text-4xl;
-}
-
-@utility link {
-  @apply text-primary cursor-pointer underline;
-}
-
-/* content visibility */
-
-@utility cv {
-  content-visibility: auto;
-}
-
-/*
-  The default border color has changed to `currentcolor` in Tailwind CSS v4,
-  so we've added these compatibility styles to make sure everything still
-  looks the same as it did with Tailwind CSS v3.
-
-  If we ever want to remove these styles, we need to add an explicit border
-  color utility to any element that depends on these defaults.
-*/
-@layer base {
-  *,
-  ::after,
-  ::before,
-  ::backdrop,
-  ::file-selector-button {
-    border-color: var(--color-gray-200, currentcolor);
-  }
-}
-
-@layer utilities {
-  /* Fonts */
-
-  @font-face {
-    font-family: "Satoshis";
-    font-style: normal;
-    font-weight: 400;
-    src:
-      local(""),
-      url("/fonts/Satoshi Symbol.ttf") format("truetype");
+@layer components {
+  .pt-sai {
+    padding-top: var(--sait);
  }

-  @font-face {
-    font-family: "Lato";
-    font-style: normal;
-    font-weight: 400;
-    src:
-      local(""),
-      url("/fonts/Lato-Regular.ttf") format("truetype");
+  .pr-sai {
+    padding-right: var(--sair);
  }

-  @font-face {
-    font-family: "Lato";
-    font-style: bold;
-    font-weight: 600;
-    src:
-      local(""),
-      url("/fonts/Lato-Bold.ttf") format("truetype");
+  .pb-sai {
+    padding-bottom: var(--saib);
  }

-  @font-face {
-    font-family: "Lato";
-    font-style: italic;
-    font-weight: 400;
-    src:
-      local(""),
-      url("/fonts/Italic.ttf") format("truetype");
+  .pl-sai {
+    padding-left: var(--sail);
  }

-  /* root */
-
-  :root {
-    font-family: Lato;
-    --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));
-    --sair: var(--safe-area-inset-right, env(safe-area-inset-right));
+  .px-sai {
+    @apply pl-sai pr-sai;
  }

-  [data-theme] {
-    @apply bg-base-300;
+  .py-sai {
+    @apply pt-sai pb-sai;
  }

-  .mobile [data-tip]::before {
-    display: none !important;
+  .p-sai {
+    @apply py-sai px-sai;
  }

-  /* safe area insets */
+  .mt-sai {
+    margin-top: var(--sait);
+  }
+
+  .mr-sai {
+    margin-right: var(--sair);
+  }
+
+  .mb-sai {
+    margin-bottom: var(--saib);
+  }
+
+  .ml-sai {
+    margin-left: var(--sail);
+  }
+
+  .mx-sai {
+    @apply ml-sai mr-sai;
+  }
+
+  .my-sai {
+    @apply mt-sai mb-sai;
+  }
+
+  .m-sai {
+    @apply my-sai mx-sai;
+  }
+
+  .top-sai {
+    top: var(--sait);
+  }
+
+  .right-sai {
+    right: var(--sair);
+  }
+
+  .bottom-sai {
+    bottom: var(--saib);
+  }
+
+  .left-sai {
+    left: var(--sail);
+  }
 }

 /* utilities */
@@ -271,18 +165,110 @@
  @apply bg-base-300 text-base-content transition-colors;
 }

+.card2 {
+  @apply rounded-box p-4 text-base-content sm:p-6;
+}
+
 .card2.card2-sm {
-  @apply text-base-content p-2 sm:p-4;
+  @apply p-2 text-base-content sm:p-4;
+}
+
+.column {
+  @apply flex flex-col;
+}
+
+.center {
+  @apply flex items-center justify-center;
+}
+
+.row-2 {
+  @apply flex items-center gap-2;
+}
+
+.row-3 {
+  @apply flex items-center gap-3;
+}
+
+.row-4 {
+  @apply flex items-center gap-4;
+}
+
+.col-2 {
+  @apply flex flex-col gap-2;
+}
+
+.col-3 {
+  @apply flex flex-col gap-3;
+}
+
+.col-4 {
+  @apply flex flex-col gap-4;
+}
+
+.col-8 {
+  @apply flex flex-col gap-8;
+}
+
+.badge {
+  @apply justify-start overflow-hidden text-ellipsis whitespace-nowrap;
+}
+
+.ellipsize {
+  @apply overflow-hidden text-ellipsis;
 }

 [data-tip]::before {
-  @apply overflow-hidden text-ellipsis;
+  @apply ellipsize;
+}
+
+.content-padding-x {
+  @apply px-4 sm:px-8 md:px-12;
+}
+
+.content-padding-t {
+  @apply pt-4 sm:pt-8 md:pt-12;
+}
+
+.content-padding-b {
+  @apply pb-4 sm:pb-8 md:pb-12;
+}
+
+.content-padding-y {
+  @apply content-padding-t content-padding-b;
+}
+
+.content-sizing {
+  @apply m-auto w-full max-w-3xl;
+}
+
+.content {
+  @apply content-sizing content-padding-x content-padding-y;
+}
+
+.heading {
+  @apply text-center text-2xl;
+}
+
+.subheading {
+  @apply text-center text-xl;
+}
+
+.superheading {
+  @apply text-center text-4xl;
+}
+
+.link {
+  @apply cursor-pointer text-primary underline;
 }

 .input input::placeholder {
  opacity: 0.5;
 }

+.shadow-top-xl {
+  @apply shadow-[0_20px_25px_-5px_rgb(0,0,0,0.1)_0_8px_10px_-6px_rgb(0,0,0,0.1)];
+}
+
 /* tiptap */

 .input-editor,
@@ -292,21 +278,21 @@
 }

 .tiptap {
-  --tiptap-object-bg: var(--color-neutral);
-  --tiptap-object-fg: var(--color-neutral-content);
-  --tiptap-active-bg: var(--color-primary);
-  --tiptap-active-fg: var(--color-primary-content);
+  --tiptap-object-bg: var(--neutral);
+  --tiptap-object-fg: var(--neutral-content);
+  --tiptap-active-bg: var(--primary);
+  --tiptap-active-fg: var(--primary-content);
 }

 .tiptap-suggestions {
-  --tiptap-object-bg: var(--color-base-100);
-  --tiptap-object-fg: var(--color-base-content);
-  --tiptap-active-bg: var(--color-base-300);
-  --tiptap-active-fg: var(--color-base-content);
+  --tiptap-object-bg: var(--base-100);
+  --tiptap-object-fg: var(--base-content);
+  --tiptap-active-bg: var(--base-300);
+  --tiptap-active-fg: var(--base-content);
 }

 .tiptap-suggestions__item {
-  @apply border-base-100 border-l-2 border-solid;
+  @apply border-l-2 border-solid border-base-100;
 }

 .tiptap-suggestions__selected {
@@ -326,13 +312,13 @@
 }

 .note-editor .tiptap {
-  --tiptap-object-bg: var(--color-base-200);
-  @apply input rounded-box block h-auto min-h-32 w-full p-[.65rem] pb-6;
+  --tiptap-object-bg: var(--base-200);
+  @apply input input-bordered h-auto min-h-32 rounded-box p-[.65rem] pb-6;
 }

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

 /* link-content, based on tiptap */
@@ -344,8 +330,8 @@
  white-space: nowrap;
  border-radius: 3px;
  padding: 0 0.25rem;
-  background-color: var(--color-base-100);
-  color: var(--color-base-content);
+  background-color: var(--base-100);
+  color: var(--base-content);
 }

 /* content rendered by welshman/content */
@@ -361,25 +347,25 @@
 /* date input */

 .picker {
-  --date-picker-foreground: var(--color-base-content);
-  --date-picker-background: var(--color-base-300);
-  --date-picker-highlight-border: var(--color-primary);
-  --date-picker-selected-color: var(--color-primary-content);
-  --date-picker-selected-background: var(--color-primary);
+  --date-picker-foreground: var(--base-content);
+  --date-picker-background: var(--base-300);
+  --date-picker-highlight-border: var(--primary);
+  --date-picker-selected-color: var(--primary-content);
+  --date-picker-selected-background: var(--primary);
 }

 .date-time-field {
-  @apply input rounded-lg px-0;
+  @apply input input-bordered rounded-lg px-0;
 }

 .date-time-field input {
-  @apply h-full! w-full! rounded-lg! border-none! bg-inherit! px-4! text-inherit!;
+  @apply !h-full !w-full !rounded-lg !border-none !bg-inherit !px-4 !text-inherit;
 }

 /* tippy popover */

 .tippy-target {
-  @apply z-tooltip pointer-events-none fixed inset-0;
+  @apply pointer-events-none fixed inset-0 z-tooltip;
 }

 .tippy-target > * {
@@ -393,15 +379,15 @@
 /* emoji picker */

 emoji-picker {
-  --background: var(--color-base-100);
-  --border-color: var(--color-base-100);
+  --background: var(--base-100);
+  --border-color: var(--base-100);
  --border-radius: var(--rounded-box);
-  --button-active-background: var(--color-base-content);
-  --button-hover-background: var(--color-base-content);
-  --indicator-color: var(--color-base-content);
-  --input-border-color: var(--color-base-100);
-  --input-font-color: var(--color-base-content);
-  --outline-color: var(--color-base-100);
+  --button-active-background: var(--base-content);
+  --button-hover-background: var(--base-content);
+  --indicator-color: var(--base-content);
+  --input-border-color: var(--base-100);
+  --input-font-color: var(--base-content);
+  --outline-color: var(--base-100);
 }

 /* progress */
@@ -425,7 +411,7 @@ body.keyboard-open .hide-on-keyboard {
 /* chat view */

 .chat__compose {
-  @apply z-compose relative mb-14 shrink-0 md:mb-0;
+  @apply relative z-compose mb-14 shrink-0 md:mb-0;
 }

 .chat__compose .chat__compose-inner {
@@ -433,5 +419,11 @@ body.keyboard-open .hide-on-keyboard {
 }

 .chat__scroll-down {
-  @apply pb-sai z-feature fixed right-4 bottom-28 md:bottom-16;
+  @apply pb-sai fixed bottom-28 right-4 z-feature md:bottom-16;
+}
+
+/* content visibility */
+
+.cv {
+  content-visibility: auto;
 }
@@ -47,6 +47,7 @@ export const isParticipantSpeaking = derived(
    $participants.some(sp => participantKey(sp) === participantKey(p)),
 )

+/** True when the local user is in LiveKit’s active-speakers list (currently talking). */
 export const isLocalSpeaking = derived(
  [currentVoiceSession, speakingParticipants],
  ([$session, $speaking]) => {
@@ -71,14 +71,17 @@ export const toggleCamera = async () => {
  if (!session) return

  const cameraOn = !session.cameraOn
-  try {
-    await session.room.localParticipant.setCameraEnabled(cameraOn)
+  if (!cameraOn) {
+    session.room.localParticipant.setCameraEnabled(false)
    currentVoiceSession.set({...session, cameraOn})
-  } catch {
-    pushToast({
-      theme: "error",
-      message: cameraOn ? "Could not access camera" : "Could not turn off camera",
-    })
+    return
+  }
+
+  try {
+    await session.room.localParticipant.setCameraEnabled(true)
+    currentVoiceSession.set({...session, cameraOn})
+  } catch (e) {
+    pushToast({theme: "error", message: "Could not access camera"})
  }
 }

@@ -87,13 +90,16 @@ export const toggleScreenShare = async () => {
  if (!session) return

  const screenShareOn = !session.screenShareOn
-  try {
-    await session.room.localParticipant.setScreenShareEnabled(screenShareOn)
+  if (!screenShareOn) {
+    session.room.localParticipant.setScreenShareEnabled(false)
    currentVoiceSession.set({...session, screenShareOn})
-  } catch {
-    pushToast({
-      theme: "error",
-      message: screenShareOn ? "Could not start screen sharing" : "Could not stop screen sharing",
-    })
+    return
+  }
+
+  try {
+    await session.room.localParticipant.setScreenShareEnabled(true)
+    currentVoiceSession.set({...session, screenShareOn})
+  } catch (e) {
+    pushToast({theme: "error", message: "Could not start screen sharing"})
  }
 }
@@ -277,7 +277,7 @@ export const joinVoiceRoom = async (
    try {
      await Promise.race([
        liveKitRoom.connect(server_url, participant_token, {maxRetries: 0}),
-        whenTimeout(15_000, {
+        whenTimeout(5_000, {
          message: "Connection timed out. Please check your network and try again.",
        }),
        whenAborted(signal),
@@ -325,7 +325,7 @@ export const leaveVoiceRoom = async () => {
    try {
      await session.room.localParticipant.setCameraEnabled(false)
    } catch {
-      pushToast({theme: "error", message: "Error turning off camera."})
+      /* pass */
    }
  }

@@ -333,7 +333,7 @@ export const leaveVoiceRoom = async () => {
    try {
      await session.room.localParticipant.setScreenShareEnabled(false)
    } catch {
-      pushToast({theme: "error", message: "Error turning off screen sharing."})
+      /* pass */
    }
  }

@@ -38,7 +38,7 @@
    publishReaction({...template, event, relays: [url], protect: await shouldProtect})
 </script>

-<div class="flex grow flex-wrap justify-end gap-2">
+<div class="flex flex-grow flex-wrap justify-end gap-2">
  {#if h && showRoom}
    <Link href={makeSpacePath(url, h)} class="btn btn-neutral btn-xs rounded-full">
      Posted in #<RoomName {h} {url} />
@@ -7,13 +7,12 @@
  type Props = {
    url: string
    h?: string
-    shareToChat?: boolean
  }

-  const {url, h, shareToChat = false}: Props = $props()
+  const {url, h}: Props = $props()
 </script>

-<CalendarEventForm {url} {h} {shareToChat}>
+<CalendarEventForm {url} {h}>
  {#snippet header()}
    <ModalHeader>
      <ModalTitle>Create an Event</ModalTitle>
@@ -3,7 +3,7 @@
  import {writable} from "svelte/store"
  import {randomId, HOUR} from "@welshman/lib"
  import {makeEvent, EVENT_TIME} from "@welshman/util"
-  import {publishThunk, waitForThunkError} from "@welshman/app"
+  import {publishThunk} from "@welshman/app"
  import {preventDefault} from "@lib/html"
  import {daysBetween} from "@lib/util"
  import GallerySend from "@assets/icons/gallery-send.svg?dataurl"
@@ -22,7 +22,7 @@
  import {makeEditor} from "@app/editor"
  import {DraftKey} from "@app/util/drafts"
  import {pushToast} from "@app/util/toast"
-  import {canEnforceNip70, publishRoomQuote} from "@app/core/commands"
+  import {canEnforceNip70} from "@app/core/commands"

  type Values = {
    d: string
@@ -36,12 +36,11 @@
  type Props = {
    url: string
    h?: string
-    shareToChat?: boolean
    header: Snippet
    initialValues?: Values
  }

-  let {url, h, shareToChat = false, header, initialValues}: Props = $props()
+  let {url, h, header, initialValues}: Props = $props()

  const draftKey = new DraftKey<Values>(`calendar:${url}:${h ?? ""}`)

@@ -58,7 +57,7 @@
  const selectFiles = () => editor.then(ed => ed.chain().selectFiles().run())

  const submit = async () => {
-    if ($uploading || loading) return
+    if ($uploading) return

    if (!title) {
      return pushToast({
@@ -93,41 +92,21 @@
      ...ed.storage.nostr.getEditorTags(),
    ]

-    loading = true
-
-    try {
-      const protect = await shouldProtect
-
-      if (protect) {
-        tags.push(PROTECTED)
-      }
-
-      if (h) {
-        tags.push(["h", h])
-      }
-
-      const event = makeEvent(EVENT_TIME, {content, tags})
-      const calendarThunk = publishThunk({event, relays: [url]})
-      const error = await waitForThunkError(calendarThunk)
-
-      if (error) {
-        return pushToast({theme: "error", message: error})
-      }
-
-      draftKey.clear()
-      history.back()
-
-      if (shareToChat) {
-        publishRoomQuote({url, h, parent: calendarThunk.event, protect})
-      }
-
-      pushToast({message: "Your event has been saved!"})
-    } finally {
-      loading = false
+    if (await shouldProtect) {
+      tags.push(PROTECTED)
    }
-  }

-  let loading = $state(false)
+    if (h) {
+      tags.push(["h", h])
+    }
+
+    const event = makeEvent(EVENT_TIME, {content, tags})
+
+    pushToast({message: "Your event has been saved!"})
+    publishThunk({event, relays: [url]})
+    draftKey.clear()
+    history.back()
+  }

  const d = $state(initialValues?.d ?? randomId())
  let title = $state(initialValues?.title ?? "")
@@ -176,14 +155,10 @@
      {#snippet input()}
        <div
          class="relative z-feature flex gap-2 border-t border-solid border-base-100 bg-base-100">
-          <div class="input-editor grow overflow-hidden">
+          <div class="input-editor flex-grow overflow-hidden">
            <EditorContent {editor} />
          </div>
-          <Button
-            data-tip="Add an image"
-            class="center btn tooltip"
-            onclick={selectFiles}
-            disabled={loading}>
+          <Button data-tip="Add an image" class="center btn tooltip" onclick={selectFiles}>
            {#if $uploading}
              <span class="loading loading-spinner loading-xs"></span>
            {:else}
@@ -222,12 +197,12 @@
    </Field>
  </ModalBody>
  <ModalFooter>
-    <Button class="btn btn-link" onclick={back} disabled={loading}>
+    <Button class="btn btn-link" onclick={back}>
      <Icon icon={AltArrowLeft} />
      Go back
    </Button>
-    <Button type="submit" class="btn btn-primary" disabled={$uploading || loading}>
-      <Spinner loading={$uploading || loading}>Save Event</Spinner>
+    <Button type="submit" class="btn btn-primary" disabled={$uploading}>
+      <Spinner loading={$uploading}>Save Event</Spinner>
    </Button>
  </ModalFooter>
 </Modal>
@@ -19,7 +19,7 @@
  const end = $derived(parseInt(meta.end))
 </script>

-<div class="flex grow flex-wrap justify-between gap-2">
+<div class="flex 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)}
@@ -23,7 +23,7 @@
  {#if meta.location}
    <span class="flex items-start gap-1">
      <Icon icon={MapPoint} class="mt-[2px]" size={4} />
-      <span class="wrap-break-word">{meta.location}</span>
+      <span class="break-words">{meta.location}</span>
    </span>
  {/if}
 </div>
@@ -279,7 +279,7 @@
  </div>
 </PageBar>

-<PageContent class="flex flex-col-reverse gap-2 py-4">
+<PageContent class="flex flex-col-reverse gap-2 pt-4">
  {#if missingRelayLists.length > 0}
    <div class="py-12">
      <div class="card2 col-2 m-auto max-w-md items-center text-center">
@@ -43,7 +43,7 @@
  const uploading = writable(false)

  const editorClass = $derived(
-    cx("chat-editor grow overflow-hidden", {
+    cx("chat-editor flex-grow overflow-hidden", {
      "pointer-events-none opacity-50": disabled,
    }),
  )
@@ -35,7 +35,7 @@

 <Button class="flex flex-col justify-start gap-1 w-full" onclick={openChat}>
  <div
-    class="cursor-pointer border-t border-solid border-base-100 px-3 py-2 transition-colors hover:bg-base-100 {props.class}"
+    class="cursor-pointer border-t border-solid border-base-100 px-6 py-2 transition-colors hover:bg-base-100 {props.class}"
    class:bg-base-100={active}>
    <div class="flex flex-col justify-start gap-1">
      <div class="flex items-center justify-between gap-2">
@@ -42,7 +42,7 @@
    publishReaction({...template, event, relays: [url], protect: await shouldProtect})
 </script>

-<div class="flex grow flex-wrap justify-end gap-2">
+<div class="flex flex-grow flex-wrap justify-end gap-2">
  {#if h && showRoom}
    <Link href={makeSpacePath(url, h)} class="btn btn-neutral btn-xs rounded-full">
      Posted in #<RoomName {h} {url} />
@@ -7,13 +7,12 @@
  type Props = {
    url: string
    h?: string
-    shareToChat?: boolean
  }

-  const {url, h, shareToChat = false}: Props = $props()
+  const {url, h}: Props = $props()
 </script>

-<ClassifiedForm {url} {h} {shareToChat}>
+<ClassifiedForm {url} {h}>
  {#snippet header()}
    <ModalHeader>
      <ModalTitle>Create a Classified Listing</ModalTitle>
@@ -2,7 +2,7 @@
  import type {Snippet} from "svelte"
  import {removeUndefined, randomId, uniq} from "@welshman/lib"
  import {makeEvent, CLASSIFIED} from "@welshman/util"
-  import {publishThunk, waitForThunkError} from "@welshman/app"
+  import {publishThunk} from "@welshman/app"
  import {isMobile, preventDefault} from "@lib/html"
  import {normalizeTopic} from "@lib/util"
  import AltArrowLeft from "@assets/icons/alt-arrow-left.svg?dataurl"
@@ -21,7 +21,7 @@
  import {PROTECTED} from "@app/core/state"
  import {makeEditor} from "@app/editor"
  import {DraftKey} from "@app/util/drafts"
-  import {canEnforceNip70, publishRoomQuote, uploadFile} from "@app/core/commands"
+  import {canEnforceNip70, uploadFile} from "@app/core/commands"

  type Values = {
    d: string
@@ -37,12 +37,11 @@
  type Props = {
    url: string
    h?: string
-    shareToChat?: boolean
    header: Snippet
    initialValues?: Values
  }

-  let {url, h, shareToChat = false, header, initialValues}: Props = $props()
+  let {url, h, header, initialValues}: Props = $props()

  const draftKey = new DraftKey<Values>(`classified:${url}:${h ?? ""}`)

@@ -88,9 +87,7 @@
        tags.push(["t", topic])
      }

-      const protect = await shouldProtect
-
-      if (protect) {
+      if (await shouldProtect) {
        tags.push(PROTECTED)
      }

@@ -117,23 +114,13 @@
        }
      }

-      const classifiedThunk = publishThunk({
+      publishThunk({
        relays: [url],
        event: makeEvent(CLASSIFIED, {content, tags}),
      })

-      const error = await waitForThunkError(classifiedThunk)
-
-      if (error) {
-        return pushToast({theme: "error", message: error})
-      }
-
      draftKey.clear()
      history.back()
-
-      if (shareToChat) {
-        publishRoomQuote({url, h, parent: classifiedThunk.event, protect})
-      }
    } finally {
      loading = false
    }
@@ -185,7 +172,7 @@
          <p>Description*</p>
        {/snippet}
        {#snippet input()}
-          <div class="note-editor grow overflow-hidden">
+          <div class="note-editor flex-grow overflow-hidden">
            <EditorContent {editor} />
          </div>
        {/snippet}
@@ -28,7 +28,7 @@
 </script>

 <div class="flex flex-wrap items-center justify-between gap-2">
-  <div class="flex grow flex-wrap justify-end gap-2">
+  <div class="flex flex-grow flex-wrap justify-end gap-2">
    <ReactionSummary {url} {event} {deleteReaction} {createReaction} reactionClass="tooltip-left" />
    <ThunkStatusOrDeleted {event} />
    {#if showActivity}
@@ -22,15 +22,15 @@

  const {url, h, onClick}: Props = $props()

-  const createGoal = () => pushModal(GoalCreate, {url, h, shareToChat: true})
+  const createGoal = () => pushModal(GoalCreate, {url, h})

-  const createCalendarEvent = () => pushModal(CalendarEventCreate, {url, h, shareToChat: true})
+  const createCalendarEvent = () => pushModal(CalendarEventCreate, {url, h})

-  const createThread = () => pushModal(ThreadCreate, {url, h, shareToChat: true})
+  const createThread = () => pushModal(ThreadCreate, {url, h})

-  const createClassified = () => pushModal(ClassifiedCreate, {url, h, shareToChat: true})
+  const createClassified = () => pushModal(ClassifiedCreate, {url, h})

-  const createPoll = () => pushModal(PollCreate, {url, h, shareToChat: true})
+  const createPoll = () => pushModal(PollCreate, {url, h})

  let ul: Element

@@ -150,7 +150,7 @@
    </div>
  {:else}
    <div
-      class="overflow-hidden text-ellipsis wrap-break-word"
+      class="overflow-hidden text-ellipsis break-words"
      style={expandBlock ? "mask-image: linear-gradient(0deg, transparent 0px, black 100px)" : ""}>
      {#each shortContent as parsed, i}
        {#if isNewline(parsed) && !isBlock(i - 1)}
@@ -1,44 +1,27 @@
 <script lang="ts">
  import {call, ellipsize, displayUrl, postJson} from "@welshman/lib"
  import {isRelayUrl, getTagValue} from "@welshman/util"
-  import {Capacitor} from "@capacitor/core"
  import {preventDefault, stopPropagation} from "@lib/html"
  import Link from "@lib/components/Link.svelte"
  import ContentLinkDetail from "@app/components/ContentLinkDetail.svelte"
-  import ContentLinkUrl from "@app/components/ContentLinkUrl.svelte"
  import ContentLinkBlockImage from "@app/components/ContentLinkBlockImage.svelte"
  import {pushModal} from "@app/util/modal"
-  import {
-    dufflepud,
-    IMAGE_CONTENT_TYPES,
-    PLATFORM_URL,
-    VIDEO_CONTENT_TYPES,
-    THUMBNAIL_URL,
-    isRoomId,
-  } from "@app/core/state"
+  import {dufflepud, PLATFORM_URL, IMAGE_CONTENT_TYPES, VIDEO_CONTENT_TYPES} from "@app/core/state"
+  import {makeSpacePath} from "@app/util/routes"

  const {value, event} = $props()

  let hideImage = $state(false)

  const url = value.url.toString()
-  const isRoomOrRelay = isRoomId(url) || isRelayUrl(url)
+  const fileType = getTagValue("file-type", event.tags) || ""
  const [href, external] = call(() => {
+    if (isRelayUrl(url)) return [makeSpacePath(url), false]
    if (url.startsWith(PLATFORM_URL)) return [url.replace(PLATFORM_URL, ""), false]

    return [url, true]
  })

-  const fileType = getTagValue("file-type", event.tags) || ""
-
-  const getVideoPoster = (videoUrl: string): string | undefined => {
-    if (Capacitor.getPlatform() === "android" && THUMBNAIL_URL) {
-      return `${THUMBNAIL_URL}/thumbnail?url=${encodeURIComponent(videoUrl)}`
-    }
-
-    return undefined
-  }
-
  const loadPreview = async () => {
    const json = await postJson(dufflepud("link/preview"), {url})

@@ -56,52 +39,41 @@
  const expand = () => pushModal(ContentLinkDetail, {value, event}, {fullscreen: true})
 </script>

-{#if isRoomOrRelay}
-  <div>
-    <ContentLinkUrl {url} class="link-content whitespace-nowrap" />
+<Link {external} {href} class="my-2 block">
+  <div class="overflow-hidden rounded-box">
+    {#if url.match(/\.(mov|webm|mp4)$/) || VIDEO_CONTENT_TYPES.includes(fileType)}
+      <video controls src={url} class="max-h-96 rounded-box object-contain object-center">
+        <track kind="captions" />
+      </video>
+    {:else if url.match(/\.(jpe?g|png|gif|webp)$/) || IMAGE_CONTENT_TYPES.includes(fileType)}
+      <button type="button" onclick={stopPropagation(preventDefault(expand))}>
+        <ContentLinkBlockImage {value} {event} class="m-auto max-h-96 rounded-box" />
+      </button>
+    {:else}
+      {#await loadPreview()}
+        <div class="center my-12 w-full">
+          <span class="loading loading-spinner"></span>
+        </div>
+      {:then preview}
+        <div class="bg-alt flex max-w-xl flex-col leading-normal">
+          {#if preview.image && !hideImage}
+            <img
+              alt=""
+              onerror={onError}
+              src={preview.image}
+              class="bg-alt max-h-72 rounded-t-box object-contain object-center" />
+          {/if}
+          <div class="flex flex-col gap-2 p-4">
+            <strong class="overflow-hidden text-ellipsis whitespace-nowrap"
+              >{preview.title || displayUrl(url)}</strong>
+            <p>{ellipsize(preview.description, 140)}</p>
+          </div>
+        </div>
+      {:catch}
+        <p class="bg-alt p-12 text-center leading-normal">
+          Unable to load a preview for {url}
+        </p>
+      {/await}
+    {/if}
  </div>
-{:else}
-  <Link {external} {href} class="my-2 block">
-    <div class="overflow-hidden rounded-box">
-      {#if url.match(/\.(mov|webm|mp4)$/) || VIDEO_CONTENT_TYPES.includes(fileType)}
-        <video
-          controls
-          src={url}
-          poster={getVideoPoster(url)}
-          preload="metadata"
-          class="max-h-96 rounded-box object-contain object-center">
-          <track kind="captions" />
-        </video>
-      {:else if url.match(/\.(jpe?g|png|gif|webp)$/) || IMAGE_CONTENT_TYPES.includes(fileType)}
-        <button type="button" onclick={stopPropagation(preventDefault(expand))}>
-          <ContentLinkBlockImage {value} {event} class="m-auto max-h-96 rounded-box" />
-        </button>
-      {:else}
-        {#await loadPreview()}
-          <div class="center my-12 w-full">
-            <span class="loading loading-spinner"></span>
-          </div>
-        {:then preview}
-          <div class="bg-alt flex max-w-xl flex-col leading-normal">
-            {#if preview.image && !hideImage}
-              <img
-                alt=""
-                onerror={onError}
-                src={preview.image}
-                class="bg-alt max-h-72 rounded-t-box object-contain object-center" />
-            {/if}
-            <div class="flex flex-col gap-2 p-4">
-              <strong class="overflow-hidden text-ellipsis whitespace-nowrap"
-                >{preview.title || displayUrl(url)}</strong>
-              <p>{ellipsize(preview.description, 140)}</p>
-            </div>
-          </div>
-        {:catch}
-          <p class="bg-alt p-12 text-center leading-normal">
-            Unable to load a preview for {url}
-          </p>
-        {/await}
-      {/if}
-    </div>
-  </Link>
-{/if}
+</Link>
@@ -1,18 +1,25 @@
 <script lang="ts">
-  import {displayUrl} from "@welshman/lib"
-  import {getTagValue} from "@welshman/util"
+  import {call, displayUrl} from "@welshman/lib"
+  import {isRelayUrl, getTagValue} from "@welshman/util"
  import {preventDefault, stopPropagation} from "@lib/html"
  import LinkRound from "@assets/icons/link-round.svg?dataurl"
  import Icon from "@lib/components/Icon.svelte"
+  import Link from "@lib/components/Link.svelte"
  import ContentLinkDetail from "@app/components/ContentLinkDetail.svelte"
-  import ContentLinkUrl from "@app/components/ContentLinkUrl.svelte"
  import {pushModal} from "@app/util/modal"
-  import {IMAGE_CONTENT_TYPES} from "@app/core/state"
+  import {PLATFORM_URL, IMAGE_CONTENT_TYPES} from "@app/core/state"
+  import {makeSpacePath} from "@app/util/routes"

  const {value, event} = $props()

  const url = value.url.toString()
  const fileType = getTagValue("file-type", event.tags) || ""
+  const [href, external] = call(() => {
+    if (isRelayUrl(url)) return [makeSpacePath(url), false]
+    if (url.startsWith(PLATFORM_URL)) return [url.replace(PLATFORM_URL, ""), false]
+
+    return [url, true]
+  })

  const expand = () => pushModal(ContentLinkDetail, {value, event}, {fullscreen: true})
 </script>
@@ -27,5 +34,8 @@
    {displayUrl(url)}
  </a>
 {:else}
-  <ContentLinkUrl {url} class="link-content whitespace-nowrap" />
+  <Link {external} {href} class="link-content whitespace-nowrap">
+    <Icon icon={LinkRound} size={3} class="inline-block" />
+    {displayUrl(url)}
+  </Link>
 {/if}
@@ -1,59 +0,0 @@
-<script lang="ts">
-  import {call, displayUrl} from "@welshman/lib"
-  import {displayRelayUrl, isRelayUrl, normalizeRelayUrl} from "@welshman/util"
-  import LinkRound from "@assets/icons/link-round.svg?dataurl"
-  import Icon from "@lib/components/Icon.svelte"
-  import Link from "@lib/components/Link.svelte"
-  import {PLATFORM_URL, displayRoom, isRoomId, splitRoomId} from "@app/core/state"
-  import {makeRoomPath, makeSpacePath} from "@app/util/routes"
-
-  const {
-    url,
-    class: className = "",
-  }: {
-    url: string
-    class?: string
-  } = $props()
-
-  const roomReference = call(() => {
-    if (!isRoomId(url)) {
-      return undefined
-    }
-
-    const [roomUrl, h] = splitRoomId(url)
-
-    if (!roomUrl || !h || !isRelayUrl(roomUrl)) {
-      return undefined
-    }
-
-    return {url: normalizeRelayUrl(roomUrl), h}
-  })
-
-  const relayReference = call(() => {
-    if (roomReference || !isRelayUrl(url)) {
-      return undefined
-    }
-
-    return normalizeRelayUrl(url)
-  })
-
-  const [href, external] = call(() => {
-    if (roomReference) return [makeRoomPath(roomReference.url, roomReference.h), false]
-    if (relayReference) return [makeSpacePath(relayReference), false]
-    if (url.startsWith(PLATFORM_URL)) return [url.replace(PLATFORM_URL, ""), false]
-
-    return [url, true]
-  })
-</script>
-
-<Link {external} {href} class={className}>
-  {#if roomReference}
-    ~<span class="text-primary">{displayRelayUrl(roomReference.url)}</span> /
-    {displayRoom(roomReference.url, roomReference.h)}
-  {:else if relayReference}
-    <span class="text-primary">{displayRelayUrl(relayReference)}</span>
-  {:else}
-    <Icon icon={LinkRound} size={3} class="inline-block" />
-    {displayUrl(url)}
-  {/if}
-</Link>
@@ -101,7 +101,7 @@
      </p>
    </div>
  {:else}
-    <div class="overflow-hidden text-ellipsis wrap-break-word">
+    <div class="overflow-hidden text-ellipsis break-words">
      {#each shortContent as parsed, i}
        {#if isNewline(parsed)}
          <ContentNewline value={parsed.value} />
@@ -45,11 +45,11 @@
    {#if $quote.kind === MESSAGE}
      <div
        class="border-l-2 border-solid border-l-primary py-1 pl-2 opacity-90"
-        style="background-color: color-mix(in srgb, var(--color-primary) 10%, var(--color-base-300) 90%);">
+        style="background-color: color-mix(in srgb, var(--primary) 10%, var(--base-300) 90%);">
        <NoteContentMinimal trimParent {url} event={$quote} />
      </div>
    {:else}
-      <NoteCard noShadow event={$quote} {url} class="bg-alt rounded-box p-4">
+      <NoteCard event={$quote} {url} class="bg-alt rounded-box p-4">
        <NoteContentMinimal {url} event={$quote} />
      </NoteCard>
    {/if}
@@ -101,7 +101,7 @@
    {/if}
    <div class="relative">
      <pre class="card2 card2-sm bg-alt overflow-auto text-xs"><code>{json}</code></pre>
-      <p class="absolute right-2 top-2 flex grow items-center justify-between">
+      <p class="absolute right-2 top-2 flex flex-grow items-center justify-between">
        <Button onclick={copyJson} class="btn btn-neutral btn-sm flex items-center">
          <Icon icon={Copy} /> Copy
        </Button>
@@ -109,6 +109,6 @@
    </div>
  </ModalBody>
  <ModalFooter>
-    <Button class="btn btn-primary grow" onclick={() => history.back()}>Got it</Button>
+    <Button class="btn btn-primary flex-grow" onclick={() => history.back()}>Got it</Button>
  </ModalFooter>
 </Modal>
@@ -68,7 +68,7 @@
    })

    const observer = new ResizeObserver(() => {
-      spacer!.style.minHeight = `${form!.offsetHeight + 60}px`
+      spacer!.style.minHeight = `${form!.offsetHeight}px`
    })

    observer.observe(form!)
@@ -84,10 +84,10 @@
  in:fly
  bind:this={form}
  onsubmit={preventDefault(submit)}
-  class="left-content bottom-sai right-sai fixed z-feature mb-14 md:mb-0 w-full md:w-auto pr-2">
+  class="left-content bottom-sai right-sai ml-2 pl-2 fixed z-feature">
  <div class="card2 mx-2 my-2 bg-alt shadow-md">
    <div class="relative">
-      <div class="note-editor grow overflow-hidden">
+      <div class="note-editor flex-grow overflow-hidden">
        <EditorContent {autofocus} {editor} />
      </div>
      <Button
@@ -30,7 +30,7 @@
    publishReaction({...template, event, relays: [url], protect: await shouldProtect})
 </script>

-<div class="flex grow flex-wrap justify-end gap-2">
+<div class="flex flex-grow flex-wrap justify-end gap-2">
  {#if h && showRoom}
    <Link href={makeSpacePath(url, h)} class="btn btn-neutral btn-xs rounded-full">
      Posted in #<RoomName {h} {url} />
@@ -1,7 +1,7 @@
 <script lang="ts">
  import {writable} from "svelte/store"
  import {makeEvent, ZAP_GOAL} from "@welshman/util"
-  import {publishThunk, waitForThunkError} from "@welshman/app"
+  import {publishThunk} from "@welshman/app"
  import {isMobile, preventDefault} from "@lib/html"
  import Paperclip from "@assets/icons/paperclip-2.svg?dataurl"
  import Bolt from "@assets/icons/bolt.svg?dataurl"
@@ -10,7 +10,6 @@
  import Field from "@lib/components/Field.svelte"
  import FieldInline from "@lib/components/FieldInline.svelte"
  import Button from "@lib/components/Button.svelte"
-  import Spinner from "@lib/components/Spinner.svelte"
  import ModalHeader from "@lib/components/ModalHeader.svelte"
  import ModalTitle from "@lib/components/ModalTitle.svelte"
  import ModalSubtitle from "@lib/components/ModalSubtitle.svelte"
@@ -22,7 +21,7 @@
  import {PROTECTED} from "@app/core/state"
  import {makeEditor} from "@app/editor"
  import {DraftKey} from "@app/util/drafts"
-  import {canEnforceNip70, publishRoomQuote} from "@app/core/commands"
+  import {canEnforceNip70} from "@app/core/commands"

  type Values = {
    title: string
@@ -34,10 +33,9 @@
    url: string
    h?: string
    initialValues?: Values
-    shareToChat?: boolean
  }

-  let {url, h, initialValues, shareToChat = false}: Props = $props()
+  let {url, h, initialValues}: Props = $props()

  const draftKey = new DraftKey<Values>(`goal:${url}:${h ?? ""}`)

@@ -54,7 +52,7 @@
  const selectFiles = () => editor.then(ed => ed.commands.selectFiles())

  const submit = async () => {
-    if ($uploading || loading) return
+    if ($uploading) return

    if (!title) {
      return pushToast({
@@ -80,42 +78,22 @@
      ["relays", url],
    ]

-    loading = true
-
-    try {
-      const protect = await shouldProtect
-
-      if (protect) {
-        tags.push(PROTECTED)
-      }
-
-      if (h) {
-        tags.push(["h", h])
-      }
-
-      const goalThunk = publishThunk({
-        relays: [url],
-        event: makeEvent(ZAP_GOAL, {content: title, tags}),
-      })
-
-      const error = await waitForThunkError(goalThunk)
-
-      if (error) {
-        return pushToast({theme: "error", message: error})
-      }
-
-      draftKey.clear()
-      history.back()
-
-      if (shareToChat) {
-        publishRoomQuote({url, h, parent: goalThunk.event, protect})
-      }
-    } finally {
-      loading = false
+    if (await shouldProtect) {
+      tags.push(PROTECTED)
    }
-  }

-  let loading = $state(false)
+    if (h) {
+      tags.push(["h", h])
+    }
+
+    publishThunk({
+      relays: [url],
+      event: makeEvent(ZAP_GOAL, {content: title, tags}),
+    })
+
+    draftKey.clear()
+    history.back()
+  }

  let title = $state(initialValues?.title ?? "")
  let amount = $state(initialValues?.amount ?? 1000)
@@ -168,7 +146,7 @@
            <p>Details*</p>
          {/snippet}
          {#snippet input()}
-            <div class="note-editor grow overflow-hidden">
+            <div class="note-editor flex-grow overflow-hidden">
              <EditorContent {editor} />
            </div>
          {/snippet}
@@ -176,8 +154,7 @@
        <Button
          data-tip="Add an image"
          class="tooltip tooltip-left absolute bottom-1 right-2"
-          onclick={selectFiles}
-          disabled={loading}>
+          onclick={selectFiles}>
          {#if $uploading}
            <span class="loading loading-spinner loading-xs"></span>
          {:else}
@@ -191,17 +168,17 @@
            Goal Amount (sats)*
          {/snippet}
          {#snippet input()}
-            <div class="flex grow justify-end">
-              <label class="input input-bordered flex w-auto items-center gap-2">
+            <div class="flex flex-grow justify-end">
+              <label class="input input-bordered flex items-center gap-2">
                <Icon icon={Bolt} />
-                <input bind:value={amount} type="number" class="w-28 grow" />
-                <p class="shrink-0 opacity-50">sats</p>
+                <input bind:value={amount} type="number" class="w-28" />
+                <p class="opacity-50">sats</p>
              </label>
            </div>
          {/snippet}
        </FieldInline>
        <input
-          class="range range-primary -mt-2 w-full"
+          class="range range-primary -mt-2"
          type="range"
          min="1000"
          max="100000"
@@ -211,12 +188,10 @@
    </div>
  </ModalBody>
  <ModalFooter>
-    <Button class="btn btn-link" onclick={back} disabled={loading}>
+    <Button class="btn btn-link" onclick={back}>
      <Icon icon={AltArrowLeft} />
      Go back
    </Button>
-    <Button type="submit" class="btn btn-primary" disabled={$uploading || loading}>
-      <Spinner {loading}>Create Goal</Spinner>
-    </Button>
+    <Button type="submit" class="btn btn-primary">Create Goal</Button>
  </ModalFooter>
 </Modal>
@@ -23,7 +23,7 @@
      <ModalTitle>Unable to Zap</ModalTitle>
    </ModalHeader>
    <p>
-      Zapping <ProfileLink {pubkey} class="text-primary!" /> isn't possible right now because
+      Zapping <ProfileLink {pubkey} class="!text-primary" /> isn't possible right now because
      {#if $zapper}
        their zap receiver isn't correctly set up.
      {:else}
@@ -97,10 +97,10 @@
          tabindex="-1"
          onmousedown={stopPropagation(onClear)}
          ontouchstart={stopPropagation(onClear)}>
-          <Icon icon={CloseCircle} class="scale-150 bg-base-300!" />
+          <Icon icon={CloseCircle} class="scale-150 !bg-base-300" />
        </span>
      {:else}
-        <Icon icon={AddCircle} class="scale-150 bg-base-300!" />
+        <Icon icon={AddCircle} class="scale-150 !bg-base-300" />
      {/if}
    </div>
    {#if !url}
@@ -1,5 +1,4 @@
 <script lang="ts">
-  import {Capacitor} from "@capacitor/core"
  import {onMount, onDestroy} from "svelte"
  import type {Nip46ResponseWithResult} from "@welshman/signer"
  import {Nip46Broker} from "@welshman/signer"
@@ -104,16 +103,10 @@
    mode = "connect"
  }

-  const openSigner = () => {
-    controller.launchSigner()
-  }
-
  const selectBunker = () => {
    mode = "bunker"
  }

-  const isIos = Capacitor.getPlatform() === "ios"
-
  let mode: string = $state("bunker")

  $effect(() => {
@@ -145,9 +138,6 @@
      <BunkerUrl {controller} />
      <Button class="btn {$bunker ? 'btn-neutral' : 'btn-primary'}" onclick={selectConnect}
        >Log in with a QR code instead</Button>
-      {#if isIos}
-        <Button class="btn btn-neutral" onclick={openSigner}>Open in Signer</Button>
-      {/if}
    {/if}
  </ModalBody>
  <ModalFooter>
@@ -16,7 +16,6 @@
    children,
    minimal = false,
    hideProfile = false,
-    noShadow = false,
    url,
    ...restProps
  }: {
@@ -24,7 +23,6 @@
    children: Snippet
    minimal?: boolean
    hideProfile?: boolean
-    noShadow?: boolean
    url?: string
    class?: string
  } = $props()
@@ -36,7 +34,7 @@
  let muted = $state($isEventMuted(event))
 </script>

-<div class="flex flex-col gap-2 {restProps.class}" class:shadow-md={!noShadow}>
+<div class="flex flex-col gap-2 shadow-md {restProps.class}">
  {#if muted}
    <div class="flex items-center justify-between">
      <div class="row-2 relative">
@@ -1,6 +1,7 @@
 <script lang="ts">
  import type {ComponentProps} from "svelte"
-  import {EVENT_TIME, ZAP_GOAL, THREAD, CLASSIFIED, POLL} from "@welshman/util"
+  import {EVENT_TIME, ZAP_GOAL, THREAD, CLASSIFIED} from "@welshman/util"
+  import {Poll} from "nostr-tools/kinds"
  import NoteContentEventTime from "@app/components/NoteContentEventTime.svelte"
  import NoteContentThread from "@app/components/NoteContentThread.svelte"
  import NoteContentClassified from "@app/components/NoteContentClassified.svelte"
@@ -20,7 +21,7 @@
    <NoteContentClassified {...props} />
  {:else if props.event.kind === ZAP_GOAL}
    <NoteContentGoal {...props} />
-  {:else if props.event.kind === POLL}
+  {:else if props.event.kind === Poll}
    <NoteContentPoll {...props} />
  {:else}
    <Content {...props} />
@@ -9,10 +9,10 @@

 <div class="flex items-start gap-4">
  <CalendarEventDate event={props.event} />
-  <div class="flex grow flex-col">
+  <div class="flex flex-grow flex-col">
    <CalendarEventHeader event={props.event} />
    <div class="flex py-2 opacity-50">
-      <div class="h-px grow bg-base-content opacity-25"></div>
+      <div class="h-px flex-grow bg-base-content opacity-25"></div>
    </div>
    <Content {...props} />
  </div>
@@ -1,6 +1,7 @@
 <script lang="ts">
  import type {ComponentProps} from "svelte"
-  import {EVENT_TIME, ZAP_GOAL, THREAD, CLASSIFIED, POLL} from "@welshman/util"
+  import {EVENT_TIME, ZAP_GOAL, THREAD, CLASSIFIED} from "@welshman/util"
+  import {Poll} from "nostr-tools/kinds"
  import NoteContentMinimalEventTime from "@app/components/NoteContentMinimalEventTime.svelte"
  import NoteContentMinimalThread from "@app/components/NoteContentMinimalThread.svelte"
  import NoteContentMinimalClassified from "@app/components/NoteContentMinimalClassified.svelte"
@@ -20,7 +21,7 @@
    <NoteContentMinimalClassified {...props} />
  {:else if props.event.kind === ZAP_GOAL}
    <NoteContentMinimalGoal {...props} />
-  {:else if props.event.kind === POLL}
+  {:else if props.event.kind === Poll}
    <NoteContentMinimalPoll {...props} />
  {:else}
    <ContentMinimal {...props} />
@@ -17,7 +17,7 @@
 </script>

 <div class="flex flex-col">
-  <div class="flex grow flex-wrap justify-between gap-2">
+  <div class="flex flex-grow flex-wrap justify-between gap-2">
    <p class="text-sm">{meta.title || meta.name}</p>
    {#if !isNaN(start) && !isNaN(end)}
      {@const startDateDisplay = formatTimestampAsDate(start)}
@@ -1,14 +1,14 @@
 <script lang="ts">
  import type {ComponentProps} from "svelte"
  import {derived} from "svelte/store"
-  import {POLL_RESPONSE} from "@welshman/util"
+  import {PollResponse} from "nostr-tools/kinds"
  import ContentMinimal from "@app/components/ContentMinimal.svelte"
  import {deriveEvents} from "@app/core/state"
  import {getPollResults} from "@app/util/polls"

  const props: ComponentProps<typeof ContentMinimal> = $props()

-  const responses = deriveEvents([{kinds: [POLL_RESPONSE], "#e": [props.event.id]}])
+  const responses = deriveEvents([{kinds: [PollResponse], "#e": [props.event.id]}])

  const results = derived(responses, $responses => getPollResults(props.event, $responses))
 </script>
@@ -2,7 +2,7 @@
  import type {ComponentProps} from "svelte"
  import {onMount} from "svelte"
  import {request} from "@welshman/net"
-  import {POLL_RESPONSE} from "@welshman/util"
+  import {PollResponse} from "nostr-tools/kinds"
  import PollVotes from "@app/components/PollVotes.svelte"
  import Content from "@app/components/Content.svelte"

@@ -15,7 +15,7 @@

    request({
      relays: [props.url],
-      filters: [{kinds: [POLL_RESPONSE], "#e": [props.event.id]}],
+      filters: [{kinds: [PollResponse], "#e": [props.event.id]}],
    })
  })
 </script>
@@ -1,7 +1,8 @@
 <script lang="ts">
  import {insertAt, now, randomId, removeAt, removeUndefined} from "@welshman/lib"
-  import {makeEvent, POLL} from "@welshman/util"
-  import {publishThunk, waitForThunkError} from "@welshman/app"
+  import {makeEvent} from "@welshman/util"
+  import {publishThunk} from "@welshman/app"
+  import {Poll} from "nostr-tools/kinds"
  import {isMobile, preventDefault} from "@lib/html"
  import AltArrowLeft from "@assets/icons/alt-arrow-left.svg?dataurl"
  import HamburgerMenu from "@assets/icons/hamburger-menu.svg?dataurl"
@@ -12,7 +13,6 @@
  import FieldInline from "@lib/components/FieldInline.svelte"
  import DateTimeInput from "@lib/components/DateTimeInput.svelte"
  import Button from "@lib/components/Button.svelte"
-  import Spinner from "@lib/components/Spinner.svelte"
  import ModalHeader from "@lib/components/ModalHeader.svelte"
  import ModalTitle from "@lib/components/ModalTitle.svelte"
  import ModalSubtitle from "@lib/components/ModalSubtitle.svelte"
@@ -21,7 +21,7 @@
  import ModalBody from "@lib/components/ModalBody.svelte"
  import {pushToast} from "@app/util/toast"
  import {PROTECTED} from "@app/core/state"
-  import {canEnforceNip70, publishRoomQuote} from "@app/core/commands"
+  import {canEnforceNip70} from "@app/core/commands"
  import {DraftKey} from "@app/util/drafts"
  import type {PollType} from "@app/util/polls"

@@ -40,10 +40,9 @@
  type Props = {
    url: string
    h?: string
-    shareToChat?: boolean
  }

-  const {url, h, shareToChat = false}: Props = $props()
+  const {url, h}: Props = $props()
  const draftKey = new DraftKey<Values>(`poll:${url}:${h ?? ""}`)
  const initialValues = draftKey.get()

@@ -103,8 +102,6 @@
  }

  const submit = async () => {
-    if (loading) return
-
    if (!title.trim()) {
      return pushToast({theme: "error", message: "Please provide a title for your poll."})
    }
@@ -133,38 +130,18 @@
      tags.push(["h", h])
    }

-    loading = true
-
-    try {
-      const protect = await shouldProtect
-
-      if (protect) {
-        tags.push(PROTECTED)
-      }
-
-      const pollThunk = publishThunk({
-        relays: [url],
-        event: makeEvent(POLL, {content: title.trim(), tags}),
-      })
-
-      const error = await waitForThunkError(pollThunk)
-
-      if (error) {
-        return pushToast({theme: "error", message: error})
-      }
-
-      draftKey.clear()
-      history.back()
-
-      if (shareToChat) {
-        publishRoomQuote({url, h, parent: pollThunk.event, protect})
-      }
-    } finally {
-      loading = false
+    if (await shouldProtect) {
+      tags.push(PROTECTED)
    }
-  }

-  let loading = $state(false)
+    publishThunk({
+      relays: [url],
+      event: makeEvent(Poll, {content: title.trim(), tags}),
+    })
+
+    draftKey.clear()
+    history.back()
+  }

  let draggedOptionId = $state<string | undefined>()
  let title = $state(initialValues?.title ?? "")
@@ -269,12 +246,10 @@
    </div>
  </ModalBody>
  <ModalFooter>
-    <Button class="btn btn-link" onclick={back} disabled={loading}>
+    <Button class="btn btn-link" onclick={back}>
      <Icon icon={AltArrowLeft} />
      Go back
    </Button>
-    <Button type="submit" class="btn btn-primary" disabled={loading}>
-      <Spinner {loading}>Create Poll</Spinner>
-    </Button>
+    <Button type="submit" class="btn btn-primary">Create Poll</Button>
  </ModalFooter>
 </Modal>
@@ -43,7 +43,7 @@

 <div class="flex flex-col gap-2 card2 card2-sm bg-alt">
  <div class="flex items-center justify-between gap-2">
-    <label class="flex min-w-0 grow items-center gap-2">
+    <label class="flex min-w-0 flex-grow items-center gap-2">
      {#if !closed}
        {#if pollType === "singlechoice"}
          <input
@@ -1,8 +1,8 @@
 <script lang="ts">
  import {onDestroy} from "svelte"
  import type {TrustedEvent} from "@welshman/util"
-  import {POLL_RESPONSE} from "@welshman/util"
  import {pubkey, publishThunk, abortThunk} from "@welshman/app"
+  import {PollResponse} from "nostr-tools/kinds"
  import {formatTimestampRelative} from "@welshman/lib"
  import {deriveEvents} from "@app/core/state"
  import {pushToast} from "@app/util/toast"
@@ -24,7 +24,7 @@

  const {url, event}: Props = $props()

-  const responses = deriveEvents([{kinds: [POLL_RESPONSE], "#e": [event.id]}])
+  const responses = deriveEvents([{kinds: [PollResponse], "#e": [event.id]}])

  const pollType = getPollType(event)
  const options = getPollOptions(event)
@@ -32,7 +32,7 @@
 </script>

 <div
-  class="ml-sai mt-sai mb-sai relative z-popover isolate hidden w-14 shrink-0 bg-base-200 pt-2 md:block">
+  class="ml-sai mt-sai mb-sai relative z-popover isolate hidden w-14 flex-shrink-0 bg-base-200 pt-2 md:block">
  <div class="flex h-full flex-col" class:justify-between={PLATFORM_RELAYS.length === 0}>
    <PrimaryNavSpaces />
    {#if PLATFORM_RELAYS.length > 0}
@@ -62,7 +62,8 @@
 {@render children?.()}

 <!-- a little extra something for ios -->
-<div class="hide-on-keyboard fixed bottom-0 left-0 right-0 z-nav h-(--saib) bg-base-100 md:hidden">
+<div
+  class="hide-on-keyboard fixed bottom-0 left-0 right-0 z-nav h-[var(--saib)] bg-base-100 md:hidden">
 </div>
 <div
  class="hide-on-keyboard border-top bottom-sai fixed left-0 right-0 z-nav h-14 border border-base-200 bg-base-100 md:hidden">
@@ -5,11 +5,11 @@
  import type {Filter} from "@welshman/util"
  import {deriveEventsDesc, deriveEventsById} from "@welshman/store"
  import {formatTimestampRelative} from "@welshman/lib"
-  import {NOTE, ROOMS, COMMENT, MESSAGE} from "@welshman/util"
+  import {NOTE, ROOMS, COMMENT} from "@welshman/util"
  import {repository, loadRelayList} from "@welshman/app"
  import Button from "@lib/components/Button.svelte"
  import ProfileSpaces from "@app/components/ProfileSpaces.svelte"
-  import {deriveGroupList, getSpaceUrlsFromGroupList} from "@app/core/state"
+  import {deriveGroupList, getSpaceUrlsFromGroupList, MESSAGE_KINDS} from "@app/core/state"
  import {goToEvent} from "@app/util/routes"
  import {pushModal} from "@app/util/modal"

@@ -36,7 +36,7 @@
    load({
      filters: [
        {authors: [pubkey], kinds: [ROOMS]},
-        {authors: [pubkey], limit: 1, kinds: [NOTE, COMMENT, MESSAGE]},
+        {authors: [pubkey], limit: 1, kinds: [NOTE, COMMENT, ...MESSAGE_KINDS]},
      ],
      relays: Router.get().FromPubkeys([pubkey]).getUrls(),
    })
@@ -1,6 +1,6 @@
 <script lang="ts">
  import type {Profile} from "@welshman/util"
-  import {makeProfile} from "@welshman/util"
+  import {getTag, makeProfile} from "@welshman/util"
  import {pubkey, profilesByPubkey, waitForThunkError} from "@welshman/app"
  import AltArrowLeft from "@assets/icons/alt-arrow-left.svg?dataurl"
  import {errorMessage} from "@lib/util"
@@ -10,18 +10,26 @@
  import ProfileEditForm from "@app/components/ProfileEditForm.svelte"
  import {clearModals} from "@app/util/modal"
  import {pushToast} from "@app/util/toast"
+  import {PROTECTED} from "@app/core/state"
  import {updateProfile} from "@app/core/commands"

  const profile = $profilesByPubkey.get($pubkey!) || makeProfile()
-  const initialValues = {profile}
+  const shouldBroadcast = !getTag(PROTECTED, profile.event?.tags || [])
+  const initialValues = {profile, shouldBroadcast}

  const back = () => history.back()

-  const onsubmit = async ({profile}: {profile: Profile}) => {
+  const onsubmit = async ({
+    profile,
+    shouldBroadcast,
+  }: {
+    profile: Profile
+    shouldBroadcast: boolean
+  }) => {
    loading = true

    try {
-      const error = await waitForThunkError(updateProfile({profile}))
+      const error = await waitForThunkError(updateProfile({profile, shouldBroadcast}))

      if (error) {
        pushToast({
@@ -6,6 +6,7 @@
  import MapPoint from "@assets/icons/map-point.svg?dataurl"
  import Icon from "@lib/components/Icon.svelte"
  import Field from "@lib/components/Field.svelte"
+  import FieldInline from "@lib/components/FieldInline.svelte"
  import Button from "@lib/components/Button.svelte"
  import Modal from "@lib/components/Modal.svelte"
  import ModalBody from "@lib/components/ModalBody.svelte"
@@ -16,6 +17,7 @@

  type Values = {
    profile: Profile
+    shouldBroadcast: boolean
  }

  type Props = {
@@ -75,7 +77,7 @@
      {/snippet}
      {#snippet input()}
        <textarea
-          class="textarea textarea-bordered leading-4 w-full"
+          class="textarea textarea-bordered leading-4"
          rows="5"
          bind:value={values.profile.about}></textarea>
      {/snippet}
@@ -102,6 +104,25 @@
        {/snippet}
      </Field>
    {/if}
+    {#if !isSignup}
+      <FieldInline>
+        {#snippet label()}
+          <p>Broadcast Profile</p>
+        {/snippet}
+        {#snippet input()}
+          <input
+            type="checkbox"
+            class="toggle toggle-primary"
+            bind:checked={values.shouldBroadcast} />
+        {/snippet}
+        {#snippet info()}
+          <p>
+            If enabled, changes will be published to the broader nostr network in addition to spaces
+            you are a member of.
+          </p>
+        {/snippet}
+      </FieldInline>
+    {/if}
  </ModalBody>
  <ModalFooter>
    {@render footer()}
@@ -25,10 +25,10 @@
 <div class="flex flex-col gap-2">
  {#each spaceUrls as url (url)}
    <div class="card2 bg-alt flex flex-row items-center gap-2">
-      <div class="shrink-0">
+      <div class="flex-shrink-0">
        <RelayIcon {url} size={12} />
      </div>
-      <div class="flex grow flex-col">
+      <div class="flex flex-grow flex-col">
        <RelayName {url} />
        <div class="text-sm opacity-75">
          {url}
@@ -33,7 +33,6 @@
    url?: string
    reactionClass?: string
    noTooltip?: boolean
-    innerEvent?: TrustedEvent
    children?: Snippet
  }

@@ -44,36 +43,23 @@
    url = "",
    reactionClass = "",
    noTooltip = false,
-    innerEvent = undefined,
    children,
  }: Props = $props()

-  const eventIds = innerEvent ? [event.id, innerEvent.id] : [event.id]
-
  const reports = deriveArray(
    deriveEventsById({repository, filters: [{kinds: [REPORT], "#e": [event.id]}]}),
  )

  const reactions = deriveArray(
-    deriveEventsById({repository, filters: [{kinds: [REACTION], "#e": eventIds}]}),
+    deriveEventsById({repository, filters: [{kinds: [REACTION], "#e": [event.id]}]}),
  )

  const zaps = deriveArray(
    deriveItemsByKey<Zap>({
      repository,
      getKey: zap => zap.response.id,
-      filters: [{kinds: [ZAP_RESPONSE], "#e": eventIds}],
-      eventToItem: (response: TrustedEvent) => {
-        const zap = getValidZap(response, event)
-
-        if (zap) {
-          return zap
-        }
-
-        if (innerEvent) {
-          return getValidZap(response, innerEvent)
-        }
-      },
+      filters: [{kinds: [ZAP_RESPONSE], "#e": [event.id]}],
+      eventToItem: (response: TrustedEvent) => getValidZap(response, event),
    }),
  )

@@ -121,6 +121,6 @@
    </div>
  </ModalBody>
  <ModalFooter>
-    <Button class="btn btn-primary grow" onclick={back}>Done</Button>
+    <Button class="btn btn-primary flex-grow" onclick={back}>Done</Button>
  </ModalFooter>
 </Modal>
@@ -26,8 +26,8 @@
  type="button"
  class="btn font-normal flex h-[unset] w-full flex-nowrap py-4 text-left items-start justify-between"
  {onclick}>
-  <div class="flex grow flex-row items-start gap-4">
-    <div class="flex h-7 w-7 shrink-0 items-center justify-center">
+  <div class="flex flex-grow flex-row items-start gap-4">
+    <div class="flex h-7 w-7 flex-shrink-0 items-center justify-center">
      <Icon {icon} />
    </div>
    <div class="flex flex-col gap-1">
@@ -23,7 +23,7 @@
      <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">
+            class="center !flex h-12 w-12 min-w-12 rounded-full border-2 border-solid border-base-300 bg-base-300">
            <RelayIcon {url} />
          </div>
        </div>
@@ -132,7 +132,7 @@
      </Button>
    </Tippy>
  </div>
-  <div class="chat-editor grow overflow-hidden">
+  <div class="chat-editor flex-grow overflow-hidden">
    <EditorContent {autofocus} {editor} />
  </div>
  <Button
@@ -243,7 +243,7 @@
        {/if}
      </div>
    </div>
-    {#if $members !== undefined && $members.length > 0}
+    {#if $members.length > 0}
      <div class="card2 card2-sm bg-alt flex items-center justify-between gap-4">
        <div class="flex items-center gap-4">
          <span>Members:</span>
@@ -251,10 +251,6 @@
        </div>
        <Button class="btn btn-neutral btn-sm" onclick={showMembers}>View All</Button>
      </div>
-    {:else if $members === undefined}
-      <div class="card2 card2-sm bg-base-200 flex items-center gap-4">
-        <span class="text-error">Member list not available from this relay</span>
-      </div>
    {/if}
    <div class="card2 card2-sm bg-alt col-4">
      <strong class="text-lg">Room Settings</strong>
@@ -131,7 +131,7 @@
        <p>Icon</p>
      {/snippet}
      {#snippet input()}
-        <div class="flex grow items-center justify-between gap-4">
+        <div class="flex flex-grow items-center justify-between gap-4">
          {#if imagePreview}
            <div class="flex items-center gap-2">
              <span class="text-sm opacity-75">Selected:</span>
@@ -1,16 +1,8 @@
 <script lang="ts">
  import cx from "classnames"
-  import {readable} from "svelte/store"
-  import {
-    hash,
-    gte,
-    now,
-    displayList,
-    formatTimestampAsTime,
-    formatTimestampAsDate,
-  } from "@welshman/lib"
+  import {hash, now, displayList, formatTimestampAsTime, formatTimestampAsDate} from "@welshman/lib"
  import type {TrustedEvent, EventContent} from "@welshman/util"
-  import {MESSAGE, COMMENT, getTag} from "@welshman/util"
+  import {MESSAGE, COMMENT} from "@welshman/util"
  import {
    thunks,
    pubkey,
@@ -35,7 +27,7 @@
  import RoomItemMenuButton from "@app/components/RoomItemMenuButton.svelte"
  import RoomItemMenuMobile from "@app/components/RoomItemMenuMobile.svelte"
  import RoomItemContent from "@app/components/RoomItemContent.svelte"
-  import {colors, ENABLE_ZAPS, deriveEventsForUrl, deriveEvent} from "@app/core/state"
+  import {colors, ENABLE_ZAPS, deriveEventsForUrl} from "@app/core/state"
  import {publishDelete, publishReaction, canEnforceNip70} from "@app/core/commands"
  import {getRoomItemPath} from "@app/util/routes"
  import {pushModal} from "@app/util/modal"
@@ -46,6 +38,7 @@
    replyTo?: (event: TrustedEvent) => void
    showPubkey?: boolean
    addSpaceBelow?: boolean
+    inert?: boolean
    canEdit: (event: TrustedEvent) => boolean
    onEdit: (event: TrustedEvent) => void
  }
@@ -56,6 +49,7 @@
    replyTo = undefined,
    showPubkey = false,
    addSpaceBelow = false,
+    inert = false,
    canEdit,
    onEdit,
  }: Props = $props()
@@ -66,15 +60,7 @@
  const profileDisplay = deriveProfileDisplay(event.pubkey, [url])
  const thunk = mergeThunks($thunks.filter(t => t.event.id === event.id))
  const [_, colorValue] = colors[hash(event.pubkey) % colors.length]
-
-  const qTag = getTag("q", event.tags)
-  const isQuoteOnly = Boolean(
-    gte(qTag?.length, 2) && event.content.trim().match(/^nostr:n(event|addr)1\w+\s*$/),
-  )
-  const innerComments = isQuoteOnly
-    ? deriveEventsForUrl(url, [{kinds: [COMMENT], "#e": [qTag![1]]}])
-    : readable([])
-  const innerEvent = isQuoteOnly ? deriveEvent(qTag![1], [url]) : readable(undefined)
+  const comments = deriveEventsForUrl(url, [{kinds: [COMMENT], "#e": [event.id]}])

  const reply = () => replyTo!(event)
  const edit = canEdit(event) ? () => onEdit(event) : undefined
@@ -92,7 +78,7 @@

 <TapTarget
  data-event={event.id}
-  {onTap}
+  onTap={inert ? null : onTap}
  class={cx(
    "group relative flex w-full cursor-default flex-col px-2 py-0.5 text-left hover:bg-base-100/50",
    {"mt-1.5": showPubkey, "mb-1.5": addSpaceBelow},
@@ -108,7 +94,7 @@
    {:else}
      <div class="w-8 shrink-0"></div>
    {/if}
-    <div class="min-w-0 grow pr-1">
+    <div class="min-w-0 flex-grow pr-1">
      {#if showPubkey}
        <div class="flex items-center gap-2">
          <Button onclick={openProfile} class="text-sm font-bold" style="color: {colorValue}">
@@ -125,7 +111,7 @@
        </div>
      {/if}
      <div class:mt-2={showPubkey && event.kind !== MESSAGE}>
-        <RoomItemContent {url} event={$innerEvent ?? event} />
+        <RoomItemContent {url} {event} />
        {#if thunk}
          <ThunkFailure showToastOnRetry {thunk} class="mt-2 text-sm" />
        {/if}
@@ -138,10 +124,9 @@
      {event}
      {deleteReaction}
      {createReaction}
-      reactionClass="tooltip-right"
-      innerEvent={$innerEvent} />
-    {#if path && $innerComments.length > 0}
-      {@const pubkeys = $innerComments.map(e => e.pubkey)}
+      reactionClass="tooltip-right" />
+    {#if path && $comments.length > 0}
+      {@const pubkeys = $comments.map(e => e.pubkey)}
      {@const isOwn = $pubkey && pubkeys.includes($pubkey)}
      {@const info = displayList(pubkeys.map(pubkey => displayProfileByPubkey(pubkey)))}
      {@const tooltip = `${info} commented`}
@@ -153,7 +138,7 @@
            "btn-primary": isOwn,
          })}>
          <Icon icon={ReplyAlt} />
-          <span>{$innerComments.length} comment{$innerComments.length === 1 ? "" : "s"}</span>
+          <span>{$comments.length} comment{$comments.length === 1 ? "" : "s"}</span>
        </Link>
      </div>
    {/if}
@@ -8,17 +8,16 @@
  import {getRoomItemPath} from "@app/util/routes"

  const props: ComponentProps<typeof NoteContent> = $props()
+
  const path = getRoomItemPath(props.url!, props.event)
-  const minLength = 5000
-  const maxLength = 5500
 </script>

 <div class={cx("text-sm", {"card2 card2-sm bg-alt": props.event.kind !== MESSAGE})}>
  {#if path && !isMobile}
    <Link href={path}>
-      <NoteContent {...props} {minLength} {maxLength} />
+      <NoteContent {...props} />
    </Link>
  {:else}
-    <NoteContent {...props} {minLength} {maxLength} />
+    <NoteContent {...props} />
  {/if}
 </div>
@@ -73,44 +73,34 @@
      </ModalSubtitle>
    </ModalHeader>
    <div class="flex flex-col gap-2">
-      {#if $members === undefined}
-        <div class="card2 bg-base-200 p-4">
-          <span class="text-error">Member list not available from this relay</span>
-        </div>
-      {:else if $members.length === 0}
-        <div class="card2 bg-base-200 p-4">
-          <span class="text-base-content/70">No members yet</span>
-        </div>
-      {:else}
-        {#each $members as pubkey (pubkey)}
-          <div class="card2 bg-alt relative">
-            <div class="flex items-center justify-between gap-2">
-              <div class="min-w-0 flex-1">
-                <Profile {pubkey} {url} />
-              </div>
-              <div class="relative">
-                <Button class="btn btn-circle btn-ghost btn-sm" onclick={() => toggleMenu(pubkey)}>
-                  <Icon icon={MenuDots} />
-                </Button>
-                {#if menuPubkey === pubkey}
-                  <Popover hideOnClick onClose={closeMenu}>
-                    <ul
-                      transition:fly
-                      class="menu absolute right-0 z-popover mt-2 w-48 gap-1 rounded-box bg-base-100 p-2 shadow-md">
-                      <li>
-                        <Button class="text-error" onclick={() => removeMember(pubkey)}>
-                          <Icon icon={MinusCircle} />
-                          Remove Member
-                        </Button>
-                      </li>
-                    </ul>
-                  </Popover>
-                {/if}
-              </div>
+      {#each $members as pubkey (pubkey)}
+        <div class="card2 bg-alt relative">
+          <div class="flex items-center justify-between gap-2">
+            <div class="min-w-0 flex-1">
+              <Profile {pubkey} {url} />
+            </div>
+            <div class="relative">
+              <Button class="btn btn-circle btn-ghost btn-sm" onclick={() => toggleMenu(pubkey)}>
+                <Icon icon={MenuDots} />
+              </Button>
+              {#if menuPubkey === pubkey}
+                <Popover hideOnClick onClose={closeMenu}>
+                  <ul
+                    transition:fly
+                    class="menu absolute right-0 z-popover mt-2 w-48 gap-1 rounded-box bg-base-100 p-2 shadow-md">
+                    <li>
+                      <Button class="text-error" onclick={() => removeMember(pubkey)}>
+                        <Icon icon={MinusCircle} />
+                        Remove Member
+                      </Button>
+                    </li>
+                  </ul>
+                </Popover>
+              {/if}
            </div>
          </div>
-        {/each}
-      {/if}
+        </div>
+      {/each}
    </div>
  </ModalBody>
  <ModalFooter>
@@ -56,11 +56,6 @@
  }

  const onSubmit = async () => {
-    if (!$spaceMembers) {
-      addMembers()
-      return
-    }
-
    const pubkeysSnapshot = $state.snapshot(pubkeys)
    const nonSpaceMembers = pubkeysSnapshot.filter(pubkey => !$spaceMembers.includes(pubkey))

@@ -11,8 +11,8 @@
  const {url, h, ...props}: Props = $props()
 </script>

-<div class="flex grow items-center justify-between gap-4 {props.class}">
-  <div class="flex items-center gap-2">
+<div class="flex flex-grow items-center justify-between gap-4 {props.class}">
+  <div class="flex items-center gap-3">
    <RoomImage {url} {h} />
    <div class="min-w-0 overflow-hidden text-ellipsis">
      <RoomName {url} {h} />
@@ -17,7 +17,7 @@

  const profile = getKey<Profile>("signup.profile")!

-  const initialValues = {profile}
+  const initialValues = {profile, shouldBroadcast: false}

  const back = () => history.back()

@@ -27,7 +27,7 @@
    <Button onclick={back} class="place-self-start pr-3 md:hidden">
      <Icon icon={ArrowLeft} size={7} />
    </Button>
-    <div class="ellipsize whitespace-nowrap flex grow items-center justify-between gap-4">
+    <div class="ellipsize whitespace-nowrap flex flex-grow items-center justify-between gap-4">
      <div class="flex flex-col">
        <div class="flex gap-2 items-center">
          {@render title?.()}
@@ -42,7 +42,7 @@
        <div class="relative">
          <div class="avatar relative">
            <div
-              class="center flex! h-16 w-16 min-w-16 rounded-full border-2 border-solid border-base-300 bg-base-300">
+              class="center !flex h-16 w-16 min-w-16 rounded-full border-2 border-solid border-base-300 bg-base-300">
              <RelayIcon {url} size={10} />
            </div>
          </div>
@@ -134,7 +134,7 @@
        <p>Icon</p>
      {/snippet}
      {#snippet input()}
-        <div class="flex items-center gap-4 justify-between grow">
+        <div class="flex items-center gap-4 justify-between flex-grow">
          {#if imagePreview}
            <div class="flex items-center gap-2">
              <span class="text-sm opacity-75">Selected:</span>
@@ -3,9 +3,7 @@
  import {sleep} from "@welshman/lib"
  import {request} from "@welshman/net"
  import {displayRelayUrl, getTagValue, RELAY_INVITE} from "@welshman/util"
-  import {Share} from "@capacitor/share"
  import LinkRound from "@assets/icons/link-round.svg?dataurl"
-  import Upload from "@assets/icons/upload.svg?dataurl"
  import Copy from "@assets/icons/copy.svg?dataurl"
  import Spinner from "@lib/components/Spinner.svelte"
  import Field from "@lib/components/Field.svelte"
@@ -27,54 +25,34 @@
  const authError = deriveRelayAuthError(url)

  const back = () => history.back()
+
  const copyInvite = () => clip(invite)

-  const shareInvite = async () => {
-    if (!canShare) return
-
-    try {
-      await Share.share({url: invite})
-    } catch (e) {
-      console.error(e)
-    }
-  }
-
-  let canShare = $state(false)
  let claim = $state("")
  let loading = $state(true)
+
  let invite = $state("")

  $effect(() => {
    const relay = displayRelayUrl(url)
    const params = new URLSearchParams({r: relay, c: claim}).toString()
+
    invite = PLATFORM_URL + "/join?" + params
  })

  onMount(async () => {
-    try {
-      const {value} = await Share.canShare()
-      canShare = value
-    } catch {
-      canShare = false
-    }
+    const [[event]] = await Promise.all([
+      request({
+        relays: [url],
+        autoClose: true,
+        signal: AbortSignal.timeout(3000),
+        filters: [{kinds: [RELAY_INVITE]}],
+      }),
+      sleep(2000),
+    ])

-    try {
-      const [[event]] = await Promise.all([
-        request({
-          relays: [url],
-          autoClose: true,
-          signal: AbortSignal.timeout(10000),
-          filters: [{kinds: [RELAY_INVITE]}],
-        }),
-        sleep(2000),
-      ])
-
-      claim = getTagValue("claim", event?.tags || []) || ""
-    } catch {
-      claim = ""
-    } finally {
-      loading = false
-    }
+    claim = getTagValue("claim", event?.tags || []) || ""
+    loading = false
  })
 </script>

@@ -96,28 +74,16 @@
        <p class="center">Oops! It looks like you're not a member of this relay.</p>
      {:else}
        <div class="flex flex-col items-center gap-6">
-          <div class="w-48">
-            <QRCode code={invite} />
-          </div>
+          <QRCode code={invite} />
          <Field>
            {#snippet input()}
-              <div class="flex w-full gap-2">
-                {#if canShare}
-                  <Button
-                    class="input input-bordered flex shrink-0 w-12 items-center justify-center p-0"
-                    onclick={shareInvite}>
-                    <Icon icon={Upload} />
-                  </Button>
-                {/if}
-
-                <label class="input input-bordered flex min-w-0 flex-1 items-center gap-2">
-                  <Icon icon={LinkRound} class="shrink-0" />
-                  <input bind:value={invite} class="min-w-0 flex-1 truncate" type="text" readonly />
-                  <Button class="shrink-0" onclick={copyInvite}>
-                    <Icon icon={Copy} />
-                  </Button>
-                </label>
-              </div>
+              <label class="input input-bordered flex w-full items-center gap-2">
+                <Icon icon={LinkRound} />
+                <input bind:value={invite} class="grow" type="text" />
+                <Button onclick={copyInvite}>
+                  <Icon icon={Copy} />
+                </Button>
+              </label>
            {/snippet}
            {#snippet info()}
              <p>
@@ -134,6 +100,6 @@
    </div>
  </ModalBody>
  <ModalFooter>
-    <Button class="btn btn-primary grow" onclick={back}>Done</Button>
+    <Button class="btn btn-primary flex-grow" onclick={back}>Done</Button>
  </ModalFooter>
 </Modal>
@@ -112,58 +112,46 @@
      {/if}
    {/if}
    <div class="flex flex-col gap-2">
-      {#if $members === undefined}
-        <div class="card2 bg-base-200 p-4">
-          <span class="text-error">Member list not available from this space</span>
-        </div>
-      {:else if $members.length === 0}
-        <div class="card2 bg-base-200 p-4">
-          <span class="text-base-content/70">No members yet</span>
-        </div>
-      {:else}
-        {#each $members as pubkey (pubkey)}
-          <div class="card2 card2-sm bg-alt relative">
-            <div class="flex items-center justify-between gap-2">
-              <div class="min-w-0 flex-1">
-                <Profile {pubkey} {url} />
-              </div>
-              {#if canBan || canUnallow}
-                <div class="relative">
-                  <Button
-                    class="btn btn-circle btn-ghost btn-sm"
-                    onclick={() => toggleMenu(pubkey)}>
-                    <Icon icon={MenuDots} />
-                  </Button>
-                  {#if menuPubkey === pubkey}
-                    <Popover hideOnClick onClose={closeMenu}>
-                      <ul
-                        transition:fly
-                        class="menu absolute right-0 z-popover mt-2 w-48 gap-1 rounded-box bg-base-100 p-2 shadow-md">
-                        {#if canUnallow}
-                          <li>
-                            <Button onclick={() => unallowMember(pubkey)}>
-                              <Icon icon={UserMinus} />
-                              Remove User
-                            </Button>
-                          </li>
-                        {/if}
-                        {#if canBan}
-                          <li>
-                            <Button class="text-error" onclick={() => banMember(pubkey)}>
-                              <Icon icon={MinusCircle} />
-                              Ban User
-                            </Button>
-                          </li>
-                        {/if}
-                      </ul>
-                    </Popover>
-                  {/if}
-                </div>
-              {/if}
+      {#each $members as pubkey (pubkey)}
+        <div class="card2 card2-sm bg-alt relative">
+          <div class="flex items-center justify-between gap-2">
+            <div class="min-w-0 flex-1">
+              <Profile {pubkey} {url} />
            </div>
+            {#if canBan || canUnallow}
+              <div class="relative">
+                <Button class="btn btn-circle btn-ghost btn-sm" onclick={() => toggleMenu(pubkey)}>
+                  <Icon icon={MenuDots} />
+                </Button>
+                {#if menuPubkey === pubkey}
+                  <Popover hideOnClick onClose={closeMenu}>
+                    <ul
+                      transition:fly
+                      class="menu absolute right-0 z-popover mt-2 w-48 gap-1 rounded-box bg-base-100 p-2 shadow-md">
+                      {#if canUnallow}
+                        <li>
+                          <Button onclick={() => unallowMember(pubkey)}>
+                            <Icon icon={UserMinus} />
+                            Remove User
+                          </Button>
+                        </li>
+                      {/if}
+                      {#if canBan}
+                        <li>
+                          <Button class="text-error" onclick={() => banMember(pubkey)}>
+                            <Icon icon={MinusCircle} />
+                            Ban User
+                          </Button>
+                        </li>
+                      {/if}
+                    </ul>
+                  </Popover>
+                {/if}
+              </div>
+            {/if}
          </div>
-        {/each}
-      {/if}
+        </div>
+      {/each}
    </div>
  </ModalBody>
  <ModalFooter>
@@ -1,6 +1,7 @@
 <script lang="ts">
  import {derived} from "svelte/store"
-  import {displayRelayUrl, EVENT_TIME, ZAP_GOAL, THREAD, CLASSIFIED, POLL} from "@welshman/util"
+  import {displayRelayUrl, EVENT_TIME, ZAP_GOAL, THREAD, CLASSIFIED} from "@welshman/util"
+  import {Poll} from "nostr-tools/kinds"
  import {deriveRelay, deriveRelayDisplay, createSearch, pubkey} from "@welshman/app"
  import {fly} from "@lib/transition"
  import Magnifier from "@assets/icons/magnifier.svg?dataurl"
@@ -139,7 +140,7 @@

 <div bind:this={element} class="flex min-h-0 flex-1 flex-col">
  <SecondaryNavSection class="min-h-0 flex-1 flex flex-col overflow-hidden pb-0">
-    <div class="shrink-0">
+    <div class="flex-shrink-0">
      <Button
        class="relative flex w-full flex-col rounded-xl p-3 transition-all hover:bg-base-100"
        onclick={openMenu}>
@@ -180,11 +181,7 @@
            <li>
              <Button onclick={showMembers}>
                <Icon icon={UserRounded} />
-                {#if $members === undefined}
-                  View Members
-                {:else}
-                  View Members ({$members.length})
-                {/if}
+                View Members ({$members.length})
              </Button>
            </li>
            {#if $userIsAdmin}
@@ -266,21 +263,21 @@
          <Icon icon={CalendarMinimalistic} /> Calendar
        </SecondaryNavItem>
      {/if}
-      {#if $spaceKinds.has(POLL)}
+      {#if $spaceKinds.has(Poll)}
        <SecondaryNavItem href={pollsPath}>
          <Icon icon={Revote} /> Polls
        </SecondaryNavItem>
      {/if}
      {#if hasNip29($relay)}
        {#if $userRooms.length > 0}
-          <div class="h-2 shrink-0"></div>
+          <div class="h-2 flex-shrink-0"></div>
          <SecondaryNavHeader>Your Rooms</SecondaryNavHeader>
        {/if}
        {#each $userRooms as h (h)}
          <SpaceMenuRoomItem {url} {h} />
        {/each}
        {#if $otherRooms.length > 0}
-          <div class="h-2 shrink-0"></div>
+          <div class="h-2 flex-shrink-0"></div>
          <SecondaryNavHeader>
            {#if $userRooms.length > 0}
              Other Rooms
@@ -299,7 +296,7 @@
          <SpaceMenuRoomItem {url} {h} />
        {/each}
        {#if $otherVoiceRooms.length > 0}
-          <div class="h-2 shrink-0"></div>
+          <div class="h-2 flex-shrink-0"></div>
          <SecondaryNavHeader>Voice Rooms</SecondaryNavHeader>
          {#each $otherVoiceRooms as h (h)}
            <SpaceMenuRoomItem {url} {h} />
@@ -312,11 +309,11 @@
          </SecondaryNavItem>
        {/if}
      {/if}
-      <div class="h-5 shrink-0"></div>
+      <div class="h-5 flex-shrink-0"></div>
    </div>
  </SecondaryNavSection>
  <div
-    class="flex shrink-0 flex-col gap-2 p-2 pt-0 -mt-4 pb-[calc(var(--saib)+0.25rem)] md:pb-2 z-nav">
+    class="flex flex-shrink-0 flex-col gap-2 p-2 pt-0 -mt-4 pb-[calc(var(--saib)+0.25rem)] md:pb-2 z-nav">
    <VoiceWidget />
    <Button class="btn btn-neutral btn-sm h-10" onclick={showDetail}>
      <SocketStatusIndicator {url} />
@@ -30,7 +30,7 @@
    publishReaction({...template, event, relays: [url], protect: await shouldProtect})
 </script>

-<div class="flex grow flex-wrap justify-end gap-2">
+<div class="flex flex-grow flex-wrap justify-end gap-2">
  {#if h && showRoom}
    <Link href={makeSpacePath(url, h)} class="btn btn-neutral btn-xs rounded-full">
      Posted in #<RoomName {h} {url} />
@@ -1,14 +1,13 @@
 <script lang="ts">
  import {writable} from "svelte/store"
  import {makeEvent, THREAD} from "@welshman/util"
-  import {publishThunk, waitForThunkError} from "@welshman/app"
+  import {publishThunk} from "@welshman/app"
  import {isMobile, preventDefault} from "@lib/html"
  import Paperclip from "@assets/icons/paperclip-2.svg?dataurl"
  import AltArrowLeft from "@assets/icons/alt-arrow-left.svg?dataurl"
  import Icon from "@lib/components/Icon.svelte"
  import Field from "@lib/components/Field.svelte"
  import Button from "@lib/components/Button.svelte"
-  import Spinner from "@lib/components/Spinner.svelte"
  import ModalHeader from "@lib/components/ModalHeader.svelte"
  import ModalTitle from "@lib/components/ModalTitle.svelte"
  import ModalSubtitle from "@lib/components/ModalSubtitle.svelte"
@@ -20,7 +19,7 @@
  import {PROTECTED} from "@app/core/state"
  import {makeEditor} from "@app/editor"
  import {DraftKey} from "@app/util/drafts"
-  import {canEnforceNip70, publishRoomQuote} from "@app/core/commands"
+  import {canEnforceNip70} from "@app/core/commands"

  type Values = {
    content?: string | object
@@ -30,10 +29,9 @@
  type Props = {
    url: string
    h?: string
-    shareToChat?: boolean
  }

-  const {url, h, shareToChat = false}: Props = $props()
+  const {url, h}: Props = $props()
  const draftKey = new DraftKey<Values>(`thread:${url}:${h ?? ""}`)
  const initialValues = draftKey.get()
  const shouldProtect = canEnforceNip70(url)
@@ -45,7 +43,7 @@
  const selectFiles = () => editor.then(ed => ed.commands.selectFiles())

  const submit = async () => {
-    if ($uploading || loading) return
+    if ($uploading) return

    if (!title) {
      return pushToast({
@@ -66,42 +64,22 @@

    const tags = [...ed.storage.nostr.getEditorTags(), ["title", title]]

-    loading = true
-
-    try {
-      const protect = await shouldProtect
-
-      if (protect) {
-        tags.push(PROTECTED)
-      }
-
-      if (h) {
-        tags.push(["h", h])
-      }
-
-      const threadThunk = publishThunk({
-        relays: [url],
-        event: makeEvent(THREAD, {content, tags}),
-      })
-
-      const error = await waitForThunkError(threadThunk)
-
-      if (error) {
-        return pushToast({theme: "error", message: error})
-      }
-
-      draftKey.clear()
-      history.back()
-
-      if (shareToChat) {
-        publishRoomQuote({url, h, parent: threadThunk.event, protect})
-      }
-    } finally {
-      loading = false
+    if (await shouldProtect) {
+      tags.push(PROTECTED)
    }
-  }

-  let loading = $state(false)
+    if (h) {
+      tags.push(["h", h])
+    }
+
+    publishThunk({
+      relays: [url],
+      event: makeEvent(THREAD, {content, tags}),
+    })
+
+    draftKey.clear()
+    history.back()
+  }

  let title = $state(initialValues?.title ?? "")
  let content = $state(initialValues?.content ?? "")
@@ -152,7 +130,7 @@
          <p>Message*</p>
        {/snippet}
        {#snippet input()}
-          <div class="note-editor grow overflow-hidden">
+          <div class="note-editor flex-grow overflow-hidden">
            <EditorContent {editor} />
          </div>
        {/snippet}
@@ -160,8 +138,7 @@
      <Button
        data-tip="Add an image"
        class="tooltip tooltip-left absolute bottom-1 right-2"
-        onclick={selectFiles}
-        disabled={loading}>
+        onclick={selectFiles}>
        {#if $uploading}
          <span class="loading loading-spinner loading-xs"></span>
        {:else}
@@ -171,12 +148,10 @@
    </div>
  </ModalBody>
  <ModalFooter>
-    <Button class="btn btn-link" onclick={back} disabled={loading}>
+    <Button class="btn btn-link" onclick={back}>
      <Icon icon={AltArrowLeft} />
      Go back
    </Button>
-    <Button type="submit" class="btn btn-primary" disabled={$uploading || loading}>
-      <Spinner {loading}>Create Thread</Spinner>
-    </Button>
+    <Button type="submit" class="btn btn-primary">Create Thread</Button>
  </ModalFooter>
 </Modal>
@@ -6,7 +6,7 @@
  import Button from "@lib/components/Button.svelte"
  import Icon from "@lib/components/Icon.svelte"
  import ProfileCircle from "@app/components/ProfileCircle.svelte"
-  import VideoCallTile from "@app/components/VideoCallTile.svelte"
+  import VideoCallVideo from "@app/components/VideoCallVideo.svelte"
  import VoiceWidget from "@app/components/VoiceWidget.svelte"
  import {get} from "svelte/store"
  import {
@@ -28,11 +28,11 @@
    class?: string
  }

-  type VideoTileData = {
+  type VideoTile = {
    identity: string
    isLocal: boolean
    trackSid: string
-    track: Track | undefined
+    attachable: Track | undefined
    source: Track.Source.Camera | Track.Source.ScreenShare
  }

@@ -75,7 +75,7 @@
    }

    const room = session.room
-    const videoTiles: VideoTileData[] = []
+    const videoTiles: VideoTile[] = []
    const user = room.localParticipant

    if (session.cameraOn) {
@@ -84,7 +84,7 @@
        identity: user.identity,
        isLocal: true,
        trackSid: localPub?.trackSid ?? "local-camera",
-        track: localPub?.track,
+        attachable: localPub?.track,
        source: Track.Source.Camera,
      })
    }
@@ -95,7 +95,7 @@
        identity: user.identity,
        isLocal: true,
        trackSid: localPub?.trackSid ?? "local-screen",
-        track: localPub?.track,
+        attachable: localPub?.track,
        source: Track.Source.ScreenShare,
      })
    }
@@ -107,7 +107,7 @@
          identity: rp.identity,
          isLocal: false,
          trackSid: camPub.trackSid,
-          track: camPub.track,
+          attachable: camPub.track,
          source: Track.Source.Camera,
        })
      }
@@ -117,7 +117,7 @@
          identity: rp.identity,
          isLocal: false,
          trackSid: screenPub.trackSid,
-          track: screenPub.track,
+          attachable: screenPub.track,
          source: Track.Source.ScreenShare,
        })
      }
@@ -127,7 +127,7 @@
  })

  /** Identity + source only — LiveKit can change trackSid after publish, which broke spotlight + stale-key effect. */
-  const tileKey = (t: VideoTileData) => `${t.identity}\x1f${t.source}`
+  const tileKey = (t: VideoTile) => `${t.identity}\x1f${t.source}`

  const primaryTile = $derived.by(() => {
    const k = $videoPrimaryTileKey
@@ -160,7 +160,7 @@
    }
  })

-  const labelFor = (identity: string, source: VideoTileData["source"]) => {
+  const labelFor = (identity: string, source: VideoTile["source"]) => {
    const pk = pubkeyFromLiveKitIdentity(identity)
    const name = pk ? displayProfileByPubkey(pk) : "Unknown"
    return source === Track.Source.ScreenShare ? `${name} · screen` : name
@@ -183,7 +183,7 @@
  )
 </script>

-{#snippet videoTile(tile: VideoTileData, layout: TileLayout)}
+{#snippet videoTile(tile: VideoTile, layout: TileLayout)}
  <div
    class={cx(
      "relative isolate overflow-hidden rounded-box shadow-sm",
@@ -192,9 +192,9 @@
      layout === "strip" && "aspect-video w-44 shrink-0",
      tile.source === Track.Source.ScreenShare ? "bg-black" : "bg-base-100",
    )}>
-    {#if tile.track}
-      <VideoCallTile
-        track={tile.track}
+    {#if tile.attachable}
+      <VideoCallVideo
+        track={tile.attachable}
        muted={tile.isLocal}
        fit={tile.source === Track.Source.ScreenShare ? "contain" : "cover"}
        class="pointer-events-none absolute inset-0" />
@@ -11,21 +11,21 @@

  const {track, muted = true, fit = "cover", class: className = ""}: Props = $props()

-  let videoElement = $state<HTMLVideoElement | undefined>()
+  let el = $state<HTMLVideoElement | undefined>()

  $effect(() => {
-    const element = videoElement
-    const activeTrack = track
-    if (!element) return
-    activeTrack.attach(element)
+    const v = el
+    const t = track
+    if (!v) return
+    t.attach(v)
    return () => {
-      activeTrack.detach(element)
+      t.detach(v)
    }
  })
 </script>

 <video
-  bind:this={videoElement}
+  bind:this={el}
  class={cx("h-full w-full", fit === "contain" ? "object-contain" : "object-cover", className)}
  playsinline
  {muted}></video>
@@ -41,9 +41,16 @@
  }

  $effect(() => {
-    loadDevices()
-    navigator.mediaDevices?.addEventListener?.("devicechange", loadDevices)
-    return () => navigator.mediaDevices?.removeEventListener?.("devicechange", loadDevices)
+    void loadDevices()
+    const md = navigator.mediaDevices
+    if (!md?.addEventListener) return
+    const onDeviceChange = () => {
+      void loadDevices()
+    }
+    md.addEventListener("devicechange", onDeviceChange)
+    return () => {
+      md.removeEventListener("devicechange", onDeviceChange)
+    }
  })

  $effect(() => {
@@ -63,7 +63,7 @@
  {replaceState}
  {notification}
  onclick={handleClick}
-  class={cx("items-start!", isActive && "bg-base-100! text-base-content!")}>
+  class={cx("!items-start", isActive && "!bg-base-100 !text-base-content")}>
  <div class="flex w-full min-w-0 flex-col gap-2">
    <div class="flex gap-2 items-center">
      {#if isJoining}
@@ -53,14 +53,6 @@
  )
  const routeDisplayedRoom = $derived($displayedRoomStore)

-  const isViewingCurrentVoiceRoom = $derived(
-    $currentVoiceRoom !== undefined &&
-      url !== undefined &&
-      typeof h === "string" &&
-      $currentVoiceRoom.url === url &&
-      $currentVoiceRoom.h === h,
-  )
-
  const targetRoom = $derived.by((): Room | undefined => {
    if ($voiceState === VoiceState.Joining || $voiceState === VoiceState.Connected) {
      return $currentVoiceRoom
@@ -98,17 +90,26 @@
    pushModal(VoiceCallAudioSettingsDialog)
  }

-  const showChatButton = $derived($voiceState === VoiceState.Connected && isViewingCurrentVoiceRoom)
+  const showVoiceLayoutToggle = $derived(
+    $voiceState === VoiceState.Connected &&
+      targetRoom !== undefined &&
+      getRoomType(targetRoom) === RoomType.Voice &&
+      typeof h === "string" &&
+      relay !== undefined &&
+      decodeRelay(relay) === targetRoom.url &&
+      h === targetRoom.h,
+  )

  const isChatPanelActive = $derived(
-    showChatButton &&
-      (isDesktopLayout.current
-        ? $videoCallLayout === VideoCallLayout.Split
-        : $videoCallLayout === VideoCallLayout.Chat),
+    showVoiceLayoutToggle &&
+      ((!isDesktopLayout.current &&
+        ($videoCallLayout === VideoCallLayout.Chat ||
+          $videoCallLayout === VideoCallLayout.Split)) ||
+        (isDesktopLayout.current && $videoCallLayout === VideoCallLayout.Split)),
  )

  const onChatToggle = () => {
-    if (!showChatButton) return
+    if (!showVoiceLayoutToggle) return
    if (isDesktopLayout.current) {
      videoCallLayout.update(p =>
        p === VideoCallLayout.Split ? VideoCallLayout.Video : VideoCallLayout.Split,
@@ -127,6 +128,17 @@
  const mediaToggleClass = "center tooltip tooltip-top btn btn-sm btn-square btn-ghost"
 </script>

+{#snippet mutedSlash(show: boolean)}
+  {#if show}
+    <span
+      class="pointer-events-none absolute inset-0 flex items-center justify-center overflow-visible"
+      aria-hidden="true">
+      <span class="h-[1.3px] w-[150%] max-w-none shrink-0 -rotate-45 rounded-full bg-current"
+      ></span>
+    </span>
+  {/if}
+{/snippet}
+
 {#if targetRoom}
  <div
    in:fly={{y: 60, duration: 350}}
@@ -151,7 +163,7 @@
          </span>
        </div>
      </button>
-      {#if showChatButton}
+      {#if showVoiceLayoutToggle}
        <Button
          data-tip="Toggle Chat"
          class={cx(
@@ -194,15 +206,7 @@
          onclick={toggleMute}>
          <span class="relative inline-flex items-center justify-center overflow-visible">
            <Icon icon={Microphone} size={4} />
-            {#if $currentVoiceSession.muted}
-              <span
-                class="pointer-events-none absolute inset-0 flex items-center justify-center overflow-visible"
-                aria-hidden="true">
-                <span
-                  class="h-[1.3px] w-[150%] max-w-none shrink-0 -rotate-45 rounded-full bg-current"
-                ></span>
-              </span>
-            {/if}
+            {@render mutedSlash($currentVoiceSession.muted)}
          </span>
        </Button>
        <Button
@@ -70,7 +70,7 @@
            Amount (satoshis)
          {/snippet}
          {#snippet input()}
-            <div class="flex grow justify-end">
+            <div class="flex flex-grow justify-end">
              <label class="input input-bordered flex items-center gap-2">
                <Icon icon={Bolt} />
                <input
@@ -80,7 +80,7 @@
            Amount (satoshis)
          {/snippet}
          {#snippet input()}
-            <div class="flex grow justify-end">
+            <div class="flex flex-grow justify-end">
              <label class="input input-bordered flex items-center gap-2">
                <Icon icon={Bolt} />
                <input bind:value={sats} type="number" class="w-14" placeholder="0" />
@@ -1,7 +1,7 @@
 <style>
  .wot-background {
    fill: transparent;
-    stroke: var(--color-base-content);
+    stroke: var(--base-content);
    opacity: 30%;
  }

@@ -32,7 +32,7 @@
  const normalizedScore = $derived(clamp([0, max], $score) / max)
  const dashOffset = $derived(100 - 44 * normalizedScore)
  const style = $derived(`transform: rotate(${135 - normalizedScore * 180}deg)`)
-  const stroke = $derived(active ? "var(--color-primary)" : "var(--color-base-content)")
+  const stroke = $derived(active ? "var(--primary)" : "var(--base-content)")
 </script>

 <div class="relative h-[14px] w-[14px]">
@@ -118,26 +118,26 @@
  <ModalBody>
    <ModalHeader>
      <ModalTitle>Send a Zap</ModalTitle>
-      <ModalSubtitle>To <ProfileLink {pubkey} class="text-primary!" /></ModalSubtitle>
+      <ModalSubtitle>To <ProfileLink {pubkey} class="!text-primary" /></ModalSubtitle>
    </ModalHeader>
-    <FieldInline class="grid-cols-3!">
+    <FieldInline class="!grid-cols-3">
      {#snippet label()}
        Emoji Reaction
      {/snippet}
      {#snippet input()}
-        <div class="flex grow items-center justify-end gap-4">
+        <div class="flex flex-grow items-center justify-end gap-4">
          <EmojiButton {onEmoji} class="btn btn-neutral">
            {content}
          </EmojiButton>
        </div>
      {/snippet}
    </FieldInline>
-    <FieldInline class="grid-cols-3!">
+    <FieldInline class="!grid-cols-3">
      {#snippet label()}
        Amount
      {/snippet}
      {#snippet input()}
-        <div class="flex grow justify-end">
+        <div class="flex flex-grow justify-end">
          <label class="input input-bordered flex items-center gap-2">
            <Icon icon={Bolt} />
            <input bind:value={amount} type="number" class="w-24" />
@@ -147,7 +147,7 @@
  <ModalBody>
    <ModalHeader>
      <ModalTitle>Send a Zap</ModalTitle>
-      <ModalSubtitle>To <ProfileLink {pubkey} class="text-primary!" /></ModalSubtitle>
+      <ModalSubtitle>To <ProfileLink {pubkey} class="!text-primary" /></ModalSubtitle>
    </ModalHeader>

    {#if invoice}
@@ -158,30 +158,30 @@
        </p>
      </div>
      <label class="input input-bordered flex w-full items-center justify-between gap-2">
-        <input readonly class="ellipsize grow" value={invoice} />
+        <input readonly class="ellipsize flex-grow" value={invoice} />
        <Button class="flex items-center" onclick={copyInvoice}>
          <Icon icon={Copy} />
        </Button>
      </label>
    {:else}
-      <FieldInline class="grid-cols-3!">
+      <FieldInline class="!grid-cols-3">
        {#snippet label()}
          Emoji Reaction
        {/snippet}
        {#snippet input()}
-          <div class="flex grow items-center justify-end gap-4">
+          <div class="flex flex-grow items-center justify-end gap-4">
            <EmojiButton {onEmoji} class="btn btn-neutral">
              {content}
            </EmojiButton>
          </div>
        {/snippet}
      </FieldInline>
-      <FieldInline class="grid-cols-3!">
+      <FieldInline class="!grid-cols-3">
        {#snippet label()}
          Amount
        {/snippet}
        {#snippet input()}
-          <div class="flex grow justify-end">
+          <div class="flex flex-grow justify-end">
            <label class="input input-bordered flex items-center gap-2">
              <Icon icon={Bolt} />
              <input bind:value={amount} type="number" class="w-24" />
@@ -18,10 +18,10 @@ import {
 import {Nip01Signer} from "@welshman/signer"
 import type {UploadTask} from "@welshman/editor"
 import type {TrustedEvent, EventContent, Profile, PublishedRoomMeta} from "@welshman/util"
+import {PollResponse} from "nostr-tools/kinds"
 import {
  DELETE,
  REPORT,
-  MESSAGE,
  PROFILE,
  MESSAGING_RELAYS,
  RELAYS,
@@ -32,7 +32,6 @@ import {
  ROOMS,
  COMMENT,
  APP_DATA,
-  POLL_RESPONSE,
  isSignedEvent,
  makeEvent,
  normalizeRelayUrl,
@@ -53,6 +52,7 @@ import {
  isPublishedProfile,
  editProfile,
  createProfile,
+  uniqTags,
  ManagementMethod,
 } from "@welshman/util"
 import {Pool, AuthStatus, SocketStatus} from "@welshman/net"
@@ -84,7 +84,6 @@ import {
  SETTINGS,
  PROTECTED,
  INDEXER_RELAYS,
-  DEFAULT_RELAYS,
  DEFAULT_BLOSSOM_SERVERS,
  userSpaceUrls,
  userSettingsValues,
@@ -123,34 +122,6 @@ export const prependParent = (
  return {content, tags}
 }

-export const publishRoomQuote = ({
-  url,
-  h,
-  parent,
-  protect,
-  delay,
-}: {
-  url: string
-  h?: string
-  parent: TrustedEvent
-  protect: boolean
-  delay?: number
-}) => {
-  const tags: string[][] = []
-
-  if (h) {
-    tags.push(["h", h])
-  }
-
-  if (protect) {
-    tags.push(PROTECTED)
-  }
-
-  const event = makeEvent(MESSAGE, prependParent(parent, {content: "", tags}, url))
-
-  return publishThunk({relays: [url], event, delay})
-}
-
 // Synchronization

 export const broadcastUserData = async (relays: string[]) => {
@@ -389,7 +360,7 @@ export type PollResponseParams = {
 }

 export const makePollResponse = ({event, selectedIds}: PollResponseParams) =>
-  makeEvent(POLL_RESPONSE, {
+  makeEvent(PollResponse, {
    content: "",
    tags: [["e", event.id], ...selectedIds.map(selectedId => ["response", selectedId])],
  })
@@ -724,18 +695,34 @@ export const uploadFile = async (file: File, options: UploadFileOptions = {}) =>
 // Update Profile

 export const initProfile = (profile: Profile) => {
-  const event = makeEvent(PROFILE, createProfile(profile))
+  const template = createProfile(profile)

-  return publishThunk({event, relays: DEFAULT_RELAYS})
+  // Start out protected by default
+  template.tags.push(PROTECTED)
+
+  const event = makeEvent(PROFILE, template)
+
+  // Don't publish anywhere yet, wait until they join a space
+  return publishThunk({event, relays: []})
 }

-export const updateProfile = ({profile}: {profile: Profile}) => {
+export const updateProfile = ({
+  profile,
+  shouldBroadcast = !getTag(PROTECTED, profile.event?.tags || []),
+}: {
+  profile: Profile
+  shouldBroadcast?: boolean
+}) => {
  const router = Router.get()
  const template = isPublishedProfile(profile) ? editProfile(profile) : createProfile(profile)
-  const scenarios = [router.FromRelays(get(userSpaceUrls)), router.FromUser(), router.Index()]
+  const scenarios = [router.FromRelays(get(userSpaceUrls))]

-  // Remove protected tag, we used to add it
-  template.tags = template.tags.filter(nthNe(0, "-"))
+  if (shouldBroadcast) {
+    scenarios.push(router.FromUser(), router.Index())
+    template.tags = template.tags.filter(nthNe(0, "-"))
+  } else {
+    template.tags = uniqTags([...template.tags, PROTECTED])
+  }

  const event = makeEvent(template.kind, template)
  const relays = router.merge(scenarios).getUrls()
@@ -750,10 +737,9 @@ export const addSpaceMembers = async (
  pubkeys: string[],
 ): Promise<string | undefined> => {
  const spaceMembers = get(deriveSpaceMembers(url))
-
  const results = await Promise.all(
    pubkeys
-      .filter(pubkey => !spaceMembers || !spaceMembers.includes(pubkey))
+      .filter(pubkey => !spaceMembers.includes(pubkey))
      .map(pubkey =>
        manageRelay(url, {
          method: ManagementMethod.AllowPubkey,
@@ -1,6 +1,5 @@
-import {writable} from "svelte/store"
+import {get, writable} from "svelte/store"
 import {
-  batch,
  call,
  uniq,
  int,
@@ -26,8 +25,7 @@ import {
  sortEventsDesc,
 } from "@welshman/util"
 import type {TrustedEvent, Filter, List} from "@welshman/util"
-import {load, request, mergeRepositoryUpdates} from "@welshman/net"
-import type {RepositoryUpdate} from "@welshman/net"
+import {load, request} from "@welshman/net"
 import {repository, loadRelay, tracker} from "@welshman/app"
 import {createScroller} from "@lib/html"
 import {daysBetween} from "@lib/util"
@@ -58,75 +56,57 @@ export const makeFeed = ({
  let backwardWindow = [at - interval, at]
  let forwardWindow = [at, at + interval]

-  const insertIntoBuffer = (event: TrustedEvent) => {
-    for (let i = 0; i < buffer.length; i++) {
-      if (buffer[i].created_at < event.created_at) {
-        buffer.splice(i, 0, event)
-        return
-      }
-    }
-    buffer.push(event)
-  }
+  const insertEvent = (event: TrustedEvent) => {
+    let handled = false

-  // Batch-insert events into the visible store with a single update
-  const insertEvents = (newEvents: TrustedEvent[]) => {
-    const visible: TrustedEvent[] = []
+    if (between([backwardWindow[0], forwardWindow[1]], event.created_at)) {
+      const $events = get(events)

-    for (const event of newEvents) {
-      if (between([backwardWindow[0], forwardWindow[1]], event.created_at)) {
-        visible.push(event)
-      } else {
-        insertIntoBuffer(event)
-      }
-    }
-
-    if (visible.length > 0) {
-      events.update($events => {
-        for (const event of visible) {
-          let inserted = false
-          for (let i = 0; i < $events.length; i++) {
-            if ($events[i].created_at > event.created_at) {
-              $events = insertAt(i, event, $events)
-              inserted = true
-              break
-            }
-          }
-          if (!inserted) {
-            $events = [...$events, event]
-          }
+      for (let i = 0; i < $events.length; i++) {
+        if ($events[i].created_at > event.created_at) {
+          events.set(insertAt(i, event, $events))
+          handled = true
+          break
        }
-        return $events
-      })
+      }
+
+      if (!handled) {
+        events.set([...$events, event])
+      }
+    } else {
+      for (let i = 0; i < buffer.length; i++) {
+        if (buffer[i].created_at > event.created_at) {
+          buffer.splice(i, 0, event)
+          handled = true
+          break
+        }
+      }
+
+      if (!handled) {
+        buffer.push(event)
+      }
    }
  }

  const unsubscribers = [
-    on(
-      repository,
-      "update",
-      batch(150, (updates: RepositoryUpdate[]) => {
-        const {added, removed} = mergeRepositoryUpdates(updates)
+    on(repository, "update", ({added, removed}) => {
+      if (removed.size > 0) {
+        buffer = buffer.filter(e => !removed.has(e.id))
+        events.update($events => $events.filter(e => !removed.has(e.id)))
+      }

-        if (removed.size > 0) {
-          buffer = buffer.filter(e => !removed.has(e.id))
-          events.update($events => $events.filter(e => !removed.has(e.id)))
+      for (const event of added) {
+        if (matchFilters(filters, event) && tracker.getRelays(event.id).has(url)) {
+          insertEvent(event)
        }
-
-        const matching = added.filter(
-          event => matchFilters(filters, event) && tracker.getRelays(event.id).has(url),
-        )
-
-        if (matching.length > 0) {
-          insertEvents(matching)
-        }
-      }),
-    ),
+      }
+    }),
    on(tracker, "add", (id: string, trackerUrl: string) => {
      if (trackerUrl === url) {
        const event = repository.getEvent(id)

        if (event && matchFilters(filters, event)) {
-          insertEvents([event])
+          insertEvent(event)
        }
      }
    }),
@@ -152,15 +132,17 @@ export const makeFeed = ({
    element,
    delay: 300,
    threshold: 5000,
-    onScroll: async () => {
+    onScroll: () => {
      const [since, until] = backwardWindow

      backwardWindow = [since - interval, since]

-      insertEvents(buffer.splice(0, 30))
+      for (const event of buffer.splice(0, 30)) {
+        insertEvent(event)
+      }

      if (until > now() - int(2, YEAR)) {
-        await loadTimeframe(since, until)
+        loadTimeframe(since, until)
      } else if (!buffer.some(e => e.created_at < at)) {
        backwardScroller.stop()
        onBackwardExhausted?.()
@@ -173,15 +155,17 @@ export const makeFeed = ({
    reverse: true,
    delay: 300,
    threshold: 5000,
-    onScroll: async () => {
+    onScroll: () => {
      const [since, until] = forwardWindow

      forwardWindow = [until, until + interval]

-      insertEvents(buffer.splice(0, 30))
+      for (const event of buffer.splice(0, 30)) {
+        insertEvent(event)
+      }

      if (until < now()) {
-        await loadTimeframe(since, until)
+        loadTimeframe(since, until)
      } else if (!buffer.some(e => e.created_at > at)) {
        forwardScroller.stop()
        onForwardExhausted?.()
@@ -224,61 +208,40 @@ export const makeCalendarFeed = ({

  const events = writable(sortBy(getStart, getEventsForUrl(url, filters)))

-  // Batch-insert calendar events into the store with a single update
-  const insertEvents = (newEvents: TrustedEvent[]) => {
-    const valid = newEvents.filter(e => !isNaN(getStart(e)) && !isNaN(getEnd(e)))
-    if (valid.length === 0) return
+  const insertEvent = (event: TrustedEvent) => {
+    const start = getStart(event)
+    const address = getAddress(event)
+
+    if (isNaN(start) || isNaN(getEnd(event))) return

    events.update($events => {
-      for (const event of valid) {
-        const start = getStart(event)
-        const address = getAddress(event)
-
-        let handled = false
-        for (let i = 0; i < $events.length; i++) {
-          if ($events[i].id === event.id) {
-            handled = true
-            break
-          }
-          if (getStart($events[i]) > start) {
-            $events = insertAt(i, event, $events)
-            handled = true
-            break
-          }
-        }
-
-        if (!handled) {
-          $events = [...$events.filter(e => getAddress(e) !== address), event]
-        }
+      for (let i = 0; i < $events.length; i++) {
+        if ($events[i].id === event.id) return $events
+        if (getStart($events[i]) > start) return insertAt(i, event, $events)
      }
-      return $events
+
+      return [...$events.filter(e => getAddress(e) !== address), event]
    })
  }

  const unsubscribers = [
-    on(
-      repository,
-      "update",
-      batch(150, (updates: RepositoryUpdate[]) => {
-        const {added, removed} = mergeRepositoryUpdates(updates)
+    on(repository, "update", ({added, removed}) => {
+      if (removed.size > 0) {
+        events.update($events => $events.filter(e => !removed.has(e.id)))
+      }

-        if (removed.size > 0) {
-          events.update($events => $events.filter(e => !removed.has(e.id)))
+      for (const event of added) {
+        if (matchFilters(filters, event)) {
+          insertEvent(event)
        }
-
-        const matching = added.filter(event => matchFilters(filters, event))
-
-        if (matching.length > 0) {
-          insertEvents(matching)
-        }
-      }),
-    ),
+      }
+    }),
    on(tracker, "add", (id: string, trackerUrl: string) => {
      if (trackerUrl === url) {
        const event = repository.getEvent(id)

        if (event && matchFilters(filters, event)) {
-          insertEvents([event])
+          insertEvent(event)
        }
      }
    }),
@@ -3,10 +3,12 @@ import {context as pomadeContext} from "@pomade/core"
 import {Capacitor} from "@capacitor/core"
 import {derived, readable, writable} from "svelte/store"
 import * as nip19 from "nostr-tools/nip19"
+import {Poll} from "nostr-tools/kinds"
 import {
  on,
  gt,
  max,
+  find,
  spec,
  call,
  first,
@@ -92,7 +94,6 @@ import {
  THREAD,
  CLASSIFIED,
  WRAP,
-  POLL,
  PROFILE,
  ZAP_GOAL,
  ZAP_REQUEST,
@@ -209,8 +210,6 @@ export const DEFAULT_PUBKEYS = import.meta.env.VITE_DEFAULT_PUBKEYS

 export const DUFFLEPUD_URL = "https://dufflepud.onrender.com"

-export const THUMBNAIL_URL = import.meta.env.VITE_THUMBNAIL_URL
-
 export const NIP46_PERMS =
  "nip44_encrypt,nip44_decrypt," +
  [
@@ -327,7 +326,9 @@ if (ENABLE_ZAPS) {
  REACTION_KINDS.push(ZAP_RESPONSE)
 }

-export const CONTENT_KINDS = [ZAP_GOAL, EVENT_TIME, THREAD, CLASSIFIED, POLL]
+export const CONTENT_KINDS = [ZAP_GOAL, EVENT_TIME, THREAD, CLASSIFIED, Poll]
+
+export const MESSAGE_KINDS = [...CONTENT_KINDS, MESSAGE]

 export const DM_KINDS = [DIRECT_MESSAGE, DIRECT_MESSAGE_FILE]

@@ -552,7 +553,7 @@ export const chatsById = call(() => {
        setTimeout(() => {
          addEvents(added)
          removeEvents(removed)
-        }, 200)
+        }, 50)
      }),
    ]

@@ -566,7 +567,7 @@ export const deriveChat = call(() => {
  return (pubkeys: string[]) => _deriveChat(makeChatId(pubkeys))
 })

-export const chatSearch = derived(throttled(1500, chatsById), $chatsByPubkey => {
+export const chatSearch = derived(throttled(800, chatsById), $chatsByPubkey => {
  return createSearch(
    sortBy(c => -c.last_activity, Array.from($chatsByPubkey.values())),
    {
@@ -593,8 +594,6 @@ export const getRoomType = (room: RoomMeta): RoomType =>

 export const makeRoomId = (url: string, h: string) => `${url}'${h}`

-export const isRoomId = (id: string) => id.includes("'")
-
 export const splitRoomId = (id: string) => id.split("'")

 export const hasNip29 = (relay?: RelayProfile) =>
@@ -607,7 +606,7 @@ export const roomMetaEventsByIdByUrl = deriveEventsByIdByUrl({
 })

 export const roomsByUrl = derived(roomMetaEventsByIdByUrl, roomMetaEventsByIdByUrl => {
-  const result = new Map<string, Room[]>()
+  const metaByIdByUrl = new Map<string, Map<string, Room>>()

  for (const [url, events] of roomMetaEventsByIdByUrl.entries()) {
    const [metaEvents, deleteEvents] = partition(spec({kind: ROOM_META}), events.values())
@@ -619,8 +618,6 @@ export const roomsByUrl = derived(roomMetaEventsByIdByUrl, roomMetaEventsByIdByU
      }
    }

-    const metaById = new Map<string, Room>()
-
    for (const event of metaEvents) {
      const meta = tryCatch(() => readRoomMeta(event))

@@ -628,14 +625,22 @@ export const roomsByUrl = derived(roomMetaEventsByIdByUrl, roomMetaEventsByIdByU
        continue
      }

+      let metaById = metaByIdByUrl.get(url)
+      if (!metaById) {
+        metaById = new Map()
+        metaByIdByUrl.set(url, metaById)
+      }
+
      const id = makeRoomId(url, meta.h)

      metaById.set(id, {...meta, url, id})
    }
+  }

-    if (metaById.size > 0) {
-      result.set(url, Array.from(metaById.values()))
-    }
+  const result = new Map<string, Room[]>()
+
+  for (const [url, metaById] of metaByIdByUrl.entries()) {
+    result.set(url, Array.from(metaById.values()))
  }

  return result
@@ -809,17 +814,36 @@ export const deriveOtherRooms = (url: string) =>
 // Space/room memberships

 export const deriveSpaceMembers = (url: string) =>
-  derived(deriveRelaySignedEvents(url, [{kinds: [RELAY_MEMBERS]}]), ([event]) =>
-    uniq(getTagValues("member", event?.tags ?? [])),
-  )
+  derived(
+    deriveRelaySignedEvents(url, [{kinds: [RELAY_ADD_MEMBER, RELAY_REMOVE_MEMBER, RELAY_MEMBERS]}]),
+    $events => {
+      const membersEvent = $events.find(spec({kind: RELAY_MEMBERS}))

-export const deriveRoomMembers = (url: string, h: string) => {
-  const filters: Filter[] = [{kinds: [ROOM_MEMBERS], "#d": [h]}]
+      if (membersEvent) {
+        return uniq(getTagValues("member", membersEvent.tags))
+      }

-  return derived(deriveEventsForUrl(url, filters), ([event]) =>
-    uniq(getPubkeyTagValues(event?.tags ?? [])),
+      const members = new Set<string>()
+
+      for (const event of sortBy(e => e.created_at, $events)) {
+        const pubkeys = getPubkeyTagValues(event.tags)
+
+        if (event.kind === RELAY_ADD_MEMBER) {
+          for (const pubkey of pubkeys) {
+            members.add(pubkey)
+          }
+        }
+
+        if (event.kind === RELAY_REMOVE_MEMBER) {
+          for (const pubkey of pubkeys) {
+            members.delete(pubkey)
+          }
+        }
+      }
+
+      return Array.from(members)
+    },
  )
-}

 export type BannedPubkeyItem = {
  pubkey: string
@@ -839,6 +863,41 @@ export const deriveSpaceBannedPubkeyItems = (url: string) => {
  return store
 }

+export const deriveRoomMembers = (url: string, h: string) => {
+  const filters: Filter[] = [
+    {kinds: [ROOM_MEMBERS], "#d": [h]},
+    {kinds: [ROOM_ADD_MEMBER, ROOM_REMOVE_MEMBER], "#h": [h]},
+  ]
+
+  return derived(deriveEventsForUrl(url, filters), $events => {
+    const membersEvent = find(spec({kind: ROOM_MEMBERS}), $events)
+
+    if (membersEvent) {
+      return uniq(getPubkeyTagValues(membersEvent.tags))
+    }
+
+    const members = new Set<string>()
+
+    for (const event of sortEventsAsc($events)) {
+      const pubkeys = getPubkeyTagValues(event.tags)
+
+      if (event.kind === ROOM_ADD_MEMBER) {
+        for (const pubkey of pubkeys) {
+          members.add(pubkey)
+        }
+      }
+
+      if (event.kind === ROOM_REMOVE_MEMBER) {
+        for (const pubkey of pubkeys) {
+          members.delete(pubkey)
+        }
+      }
+    }
+
+    return Array.from(members)
+  })
+}
+
 export const deriveRoomAdmins = (url: string, h: string) => {
  const filters: Filter[] = [{kinds: [ROOM_ADMINS], "#d": [h]}]

@@ -853,42 +912,6 @@ export const deriveRoomAdmins = (url: string, h: string) => {
  })
 }

-const getRoomMembers = (_url: string, h: string, events: TrustedEvent[]) => {
-  const members = new Set<string>()
-
-  for (const event of sortEventsAsc(events)) {
-    if (event.kind === ROOM_MEMBERS && getTagValue("d", event.tags) === h) {
-      members.clear()
-
-      for (const pubkey of uniq(getPubkeyTagValues(event.tags))) {
-        members.add(pubkey)
-      }
-
-      continue
-    }
-
-    if (getTagValue("h", event.tags) !== h) {
-      continue
-    }
-
-    const pubkeys = getPubkeyTagValues(event.tags)
-
-    if (event.kind === ROOM_ADD_MEMBER) {
-      for (const pubkey of pubkeys) {
-        members.add(pubkey)
-      }
-    }
-
-    if (event.kind === ROOM_REMOVE_MEMBER) {
-      for (const pubkey of pubkeys) {
-        members.delete(pubkey)
-      }
-    }
-  }
-
-  return Array.from(members)
-}
-
 // Action items (admin review queue)
 // const pendingJoins: TrustedEvent[] = []

@@ -896,7 +919,7 @@ export const deriveSpaceActionItems = (url: string) =>
  derived(
    deriveEventsForUrl(url, [
      {
-        kinds: [REPORT, ROOM_JOIN, ROOM_LEAVE, ROOM_MEMBERS, ROOM_ADD_MEMBER, ROOM_REMOVE_MEMBER],
+        kinds: [REPORT, ROOM_JOIN, ROOM_LEAVE, ROOM_MEMBERS],
      },
    ]),
    $events => {
@@ -909,50 +932,19 @@ export const deriveSpaceActionItems = (url: string) =>
      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))
+        const roomJoins = roomEvents.filter(spec({kind: ROOM_JOIN}))
+        const roomLeaves = roomEvents.filter(spec({kind: ROOM_LEAVE}))
+        const roomMembersEvent = roomEvents.find(spec({kind: ROOM_MEMBERS}))
+        const roomMembers = getTagValues("p", roomMembersEvent?.tags ?? [])

        pendingJoins.push(
          ...removeUndefined(
-            Array.from(groupBy(e => e.pubkey, roomJoins).values()).map(events =>
-              first(sortEventsDesc(events)),
-            ),
+            Array.from(groupBy(e => e.pubkey, roomJoins).values())
+              .map(sortEventsDesc)
+              .map(first),
          ).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 (roomMembers.includes(pubkey)) return false
+            if (gt(roomMembersEvent?.created_at, created_at)) return false
            if (roomLeaves.some(e => e.pubkey === pubkey && e.created_at > created_at)) return false

            return true
@@ -985,49 +977,19 @@ export const deriveUserIsSpaceAdmin = memoize((url?: string) => {
 })

 export const deriveUserSpaceMembershipStatus = (url: string) => {
-  // Fetch member list and user add/remove events directly in this derivation.
-  const memberListFilters: Filter[] = [{kinds: [RELAY_MEMBERS]}]
-  const userEventFilters: Filter[] = [{kinds: [RELAY_ADD_MEMBER, RELAY_REMOVE_MEMBER]}]
+  const filters: Filter[] = [{kinds: [RELAY_JOIN, RELAY_LEAVE]}]

  return derived(
    [
      pubkey,
-      deriveRelaySignedEvents(url, memberListFilters),
-      deriveRelaySignedEvents(url, userEventFilters),
-      deriveEventsForUrl(url, [{kinds: [RELAY_JOIN, RELAY_LEAVE]}]),
+      deriveSpaceMembers(url),
+      deriveEventsForUrl(url, filters),
      deriveUserIsSpaceAdmin(url),
    ],
-    ([$pubkey, $memberListEvents, $userAddRemoveEvents, $joinLeaveEvents, $isAdmin]) => {
-      // If admin, always granted.
-      if ($isAdmin) {
-        return MembershipStatus.Granted
-      }
+    ([$pubkey, $members, $events, $isAdmin]) => {
+      const isMember = $members.includes($pubkey!) || $isAdmin

-      const membersEvent = $memberListEvents.find(spec({kind: RELAY_MEMBERS}))
-      const memberList = membersEvent ? uniq(getTagValues("member", membersEvent.tags)) : undefined
-
-      let isMember = false
-
-      if (memberList) {
-        // Member list exists - check if user is in it.
-        isMember = memberList.includes($pubkey!)
-      } else {
-        // No member list available - replay the user's add/remove history.
-        for (const event of sortBy(e => e.created_at, $userAddRemoveEvents)) {
-          if (event.pubkey !== $pubkey) {
-            continue
-          }
-
-          if (event.kind === RELAY_ADD_MEMBER) {
-            isMember = true
-          } else if (event.kind === RELAY_REMOVE_MEMBER) {
-            isMember = false
-          }
-        }
-      }
-
-      for (const event of $joinLeaveEvents) {
-        // Join events indicate pending or granted status, leave resets to initial.
+      for (const event of $events) {
        if (event.pubkey !== $pubkey) {
          continue
        }
@@ -1053,46 +1015,19 @@ export const deriveUserIsRoomAdmin = (url: string, h: string) =>
  )

 export const deriveUserRoomMembershipStatus = (url: string, h: string) => {
-  // Fetch the room member list and the current user's add/remove events.
-  const userEventFilters: Filter[] = [{kinds: [ROOM_ADD_MEMBER, ROOM_REMOVE_MEMBER], "#h": [h]}]
-  const joinLeaveFilters: Filter[] = [{kinds: [ROOM_JOIN, ROOM_LEAVE], "#h": [h]}]
+  const filters: Filter[] = [{kinds: [ROOM_JOIN, ROOM_LEAVE], "#h": [h]}]

  return derived(
    [
      pubkey,
      deriveRoomMembers(url, h),
-      deriveEventsForUrl(url, userEventFilters),
-      deriveEventsForUrl(url, joinLeaveFilters),
+      deriveEventsForUrl(url, filters),
      deriveUserIsRoomAdmin(url, h),
    ],
-    ([$pubkey, $memberList, $userAddRemoveEvents, $joinLeaveEvents, $isAdmin]) => {
-      // If admin of this room's space, always granted.
-      if ($isAdmin) {
-        return MembershipStatus.Granted
-      }
+    ([$pubkey, $members, $events, $isAdmin]) => {
+      const isMember = $members.includes($pubkey!) || $isAdmin

-      let isMember = false
-
-      if ($memberList) {
-        // Member list exists - check if user is in it.
-        isMember = $memberList.includes($pubkey!)
-      } else {
-        // No member list available - replay the user's add/remove history.
-        for (const event of sortEventsAsc($userAddRemoveEvents)) {
-          if (event.pubkey !== $pubkey) {
-            continue
-          }
-
-          if (event.kind === ROOM_ADD_MEMBER) {
-            isMember = true
-          } else if (event.kind === ROOM_REMOVE_MEMBER) {
-            isMember = false
-          }
-        }
-      }
-
-      for (const event of $joinLeaveEvents) {
-        // Join events indicate pending or granted status, leave resets to initial.
+      for (const event of $events) {
        if (event.pubkey !== $pubkey) {
          continue
        }
@@ -1,7 +1,8 @@
 import {page} from "$app/stores"
 import type {Unsubscriber} from "svelte/store"
-import {last, call, assoc, chunk, WEEK, ago} from "@welshman/lib"
-import {merged} from "@welshman/store"
+import {derived, get} from "svelte/store"
+import {last, call, ifLet, assoc, chunk, sleep, identity, WEEK, ago} from "@welshman/lib"
+import {PollResponse} from "nostr-tools/kinds"
 import {
  getListTags,
  getRelayTagValues,
@@ -12,22 +13,20 @@ import {
  ROOM_MEMBERS,
  ROOM_ADD_MEMBER,
  ROOM_REMOVE_MEMBER,
-  ROOM_JOIN,
-  ROOM_LEAVE,
  ROOM_CREATE_PERMISSION,
  RELAY_MEMBERS,
  RELAY_ADD_MEMBER,
  RELAY_REMOVE_MEMBER,
-  MESSAGE,
-  POLL_RESPONSE,
  isSignedEvent,
  unionFilters,
+  getTagValue,
 } from "@welshman/util"
-import type {Filter, List, PublishedList, TrustedEvent} from "@welshman/util"
+import type {Filter, TrustedEvent} from "@welshman/util"
 import {request, requestOne, Difference, DifferenceEvent} from "@welshman/net"
 import {
  pubkey,
  loadRelay,
+  userFollowList,
  userRelayList,
  userMessagingRelayList,
  loadRelayList,
@@ -43,12 +42,14 @@ import {
 } from "@welshman/app"
 import {
  REACTION_KINDS,
+  MESSAGE_KINDS,
  CONTENT_KINDS,
  INDEXER_RELAYS,
  loadSettings,
  loadGroupList,
  userSpaceUrls,
  userGroupList,
+  bootstrapPubkeys,
  decodeRelay,
  getSpaceUrlsFromGroupList,
  getSpaceRoomsFromGroupList,
@@ -73,8 +74,6 @@ const pullOneWithFallback = async (
  signal: AbortSignal,
  onEvent?: (event: TrustedEvent) => void,
 ) => {
-  if (signal.aborted) return
-
  const cachedEvents = repository.query([filter]).filter(isSignedEvent)
  const since = last(cachedEvents.slice(10))?.created_at || 0

@@ -87,12 +86,6 @@ const pullOneWithFallback = async (
  const shouldFallback =
    !hasNegentropy(url) ||
    (await new Promise(resolve => {
-      if (signal.aborted) {
-        resolve(false)
-        return
-      }
-
-      // If teardown wins while the diff is opening, skip the fallback path and let cleanup stay in control.
      const diff = new Difference({relay: url, filter, events: cachedEvents, signal})

      diff.on(DifferenceEvent.Error, () => {
@@ -118,7 +111,9 @@ export const pullWithFallback = async ({url, signal, filters, onEvent}: SyncOpts

  if (signal.aborted) return

-  await Promise.all(filters.map(filter => pullOneWithFallback(url, filter, signal, onEvent)))
+  for (const filter of filters) {
+    pullOneWithFallback(url, filter, signal, onEvent)
+  }
 }

 const listen = ({url, signal, filters, onEvent}: SyncOpts) => {
@@ -128,8 +123,6 @@ const listen = ({url, signal, filters, onEvent}: SyncOpts) => {
 }

 const pullAndListen = (options: SyncOpts) => {
-  if (options.signal.aborted) return
-
  pullWithFallback(options)
  listen(options)
 }
@@ -204,7 +197,7 @@ const syncUserRoomMembership = (url: string, h: string) => {
 const syncUserData = () => {
  const unsubscribersByKey = new Map<string, Unsubscriber>()

-  const syncGroupList = ($userGroupList: List | undefined) => {
+  const unsubscribeGroupList = userGroupList.subscribe($userGroupList => {
    if ($userGroupList) {
      const keys = new Set<string>()

@@ -233,85 +226,133 @@ const syncUserData = () => {
        }
      }
    }
-  }
-
-  const syncRelayList = ($userRelayList: PublishedList | undefined) => {
-    const pubkey = $userRelayList?.event?.pubkey
-
-    if (!pubkey) return
-
-    loadBlossomServerList(pubkey)
-    loadBlockedRelayList(pubkey)
-    loadFollowList(pubkey)
-    loadGroupList(pubkey)
-    loadMuteList(pubkey)
-    loadProfile(pubkey)
-    loadSettings(pubkey)
-    loadFeedsForPubkey(pubkey)
-  }
-
-  const unsubscribeGroupList = merged([userGroupList]).subscribe(([$userGroupList]) => {
-    syncGroupList($userGroupList)
  })

-  const unsubscribeRelayList = merged([userRelayList]).subscribe(([$userRelayList]) => {
-    syncRelayList($userRelayList)
+  const unsubscribeRelayList = userRelayList.subscribe($userRelayList => {
+    if ($userRelayList) {
+      loadBlossomServerList($userRelayList.event.pubkey)
+      loadBlockedRelayList($userRelayList.event.pubkey)
+      loadFollowList($userRelayList.event.pubkey)
+      loadGroupList($userRelayList.event.pubkey)
+      loadMuteList($userRelayList.event.pubkey)
+      loadProfile($userRelayList.event.pubkey)
+      loadSettings($userRelayList.event.pubkey)
+      loadFeedsForPubkey($userRelayList.event.pubkey)
+    }
+  })
+
+  const unsubscribeFollows = userFollowList.subscribe(async $userFollowList => {
+    for (const pubkeys of chunk(10, get(bootstrapPubkeys))) {
+      // This isn't urgent, avoid clogging other stuff up
+      await sleep(1000)
+
+      await Promise.all(
+        pubkeys.flatMap(pk => [
+          loadRelayList(pk),
+          loadGroupList(pk),
+          loadProfile(pk),
+          loadFollowList(pk),
+          loadMuteList(pk),
+        ]),
+      )
+    }
  })

  return () => {
    unsubscribersByKey.forEach(call)
    unsubscribeGroupList()
    unsubscribeRelayList()
+    unsubscribeFollows()
  }
 }

 // Spaces

-const syncSpace = (url: string) => {
+const syncSpace = (url: string, rooms: string[]) => {
  const since = ago(WEEK)
+  const seen = new Set<string>()
  const controller = new AbortController()
-  const relayKinds = [RELAY_MEMBERS]
+
+  const pullRoomContent = (room: string) => {
+    if (!seen.has(room)) {
+      seen.add(room)
+      pullAndListen({
+        url,
+        signal: controller.signal,
+        filters: [
+          {kinds: MESSAGE_KINDS, since, "#h": [room]},
+          makeCommentFilter(CONTENT_KINDS, {since, "#h": [room]}),
+          {kinds: [PollResponse], since},
+        ],
+      })
+    }
+  }
+
+  for (const room of rooms) {
+    pullRoomContent(room)
+  }
+
+  const relayKinds = [RELAY_MEMBERS, RELAY_ADD_MEMBER, RELAY_REMOVE_MEMBER]
  const roomMetaKinds = [ROOM_META, ROOM_ADMINS, ROOM_MEMBERS, LIVEKIT_PARTICIPANTS]
-  const roomDeleteKinds = [ROOM_DELETE, ROOM_JOIN, ROOM_LEAVE]
+  const roomMemberKinds = [ROOM_DELETE, ROOM_ADD_MEMBER, ROOM_REMOVE_MEMBER]

  pullAndListen({
    url,
    signal: controller.signal,
    filters: [
-      {kinds: [...relayKinds, ...roomMetaKinds, ...roomDeleteKinds, ...CONTENT_KINDS, MESSAGE]},
+      {kinds: [...relayKinds, ...roomMetaKinds, ...roomMemberKinds, ...MESSAGE_KINDS]},
      makeCommentFilter(CONTENT_KINDS, {since}),
-      {kinds: [...REACTION_KINDS, POLL_RESPONSE], since},
+      {kinds: [PollResponse], since},
    ],
+    onEvent: event => {
+      if (event.kind === ROOM_META) {
+        ifLet(getTagValue("d", event.tags), pullRoomContent)
+      }
+    },
+  })
+
+  listen({
+    url,
+    signal: controller.signal,
+    filters: [{kinds: REACTION_KINDS}, {kinds: [PollResponse]}],
  })

  return () => controller.abort()
 }

 const syncSpaces = () => {
-  const store = merged([userGroupList, page])
+  const store = derived([userGroupList, page], identity)
  const unsubscribersByUrl = new Map<string, Unsubscriber>()
+  const roomsByUrl = new Map<string, string>()

  const unsubscribe = store.subscribe(([$userGroupList, $page]) => {
    const urls = new Set(getSpaceUrlsFromGroupList($userGroupList))
-    const currentUrl = $page.params.relay ? decodeRelay($page.params.relay) : undefined

-    if (currentUrl) {
-      urls.add(currentUrl)
+    if ($page.params.relay) {
+      urls.add(decodeRelay($page.params.relay))
    }

    // Stop syncing removed spaces
    for (const [url, unsubscribe] of unsubscribersByUrl.entries()) {
      if (!urls.has(url)) {
        unsubscribersByUrl.delete(url)
+        roomsByUrl.delete(url)
        unsubscribe()
      }
    }

-    // Start syncing for new spaces
+    // Start or restart syncing for each space
    for (const url of urls) {
-      if (!unsubscribersByUrl.has(url)) {
-        unsubscribersByUrl.set(url, syncSpace(url))
-      }
+      const rooms = getSpaceRoomsFromGroupList(url, $userGroupList)
+      const roomsKey = rooms.join(",")
+
+      if (unsubscribersByUrl.has(url) && roomsByUrl.get(url) === roomsKey) continue
+
+      // Tear down existing sync if rooms changed
+      unsubscribersByUrl.get(url)?.()
+
+      roomsByUrl.set(url, roomsKey)
+      unsubscribersByUrl.set(url, syncSpace(url, rooms))
    }
  })

@@ -342,7 +383,6 @@ const syncDMs = () => {
  const unsubscribersByUrl = new Map<string, Unsubscriber>()

  let currentPubkey: string | undefined
-  let currentShouldUnwrap = false

  const unsubscribeAll = () => {
    for (const [url, unsubscribe] of unsubscribersByUrl.entries()) {
@@ -351,34 +391,6 @@ const syncDMs = () => {
    }
  }

-  const syncPubkey = ($pubkey: string | undefined, $shouldUnwrap: boolean) => {
-    if ($pubkey !== currentPubkey) {
-      unsubscribeAll()
-    }
-
-    if ($pubkey && $shouldUnwrap) {
-      loadRelayList($pubkey)
-        .then(() => loadMessagingRelayList($pubkey))
-        .then($l => {
-          if ($l && currentPubkey === $pubkey && currentShouldUnwrap === $shouldUnwrap) {
-            subscribeAll($pubkey, getRelayTagValues(getListTags($l)))
-          }
-        })
-    }
-
-    currentPubkey = $pubkey
-    currentShouldUnwrap = $shouldUnwrap
-  }
-
-  const syncList = ($userMessagingRelayList: List | undefined) => {
-    const $pubkey = pubkey.get()
-    const $shouldUnwrap = shouldUnwrap.get()
-
-    if ($pubkey && $shouldUnwrap) {
-      subscribeAll($pubkey, getRelayTagValues(getListTags($userMessagingRelayList)))
-    }
-  }
-
  const subscribeAll = (pubkey: string, urls: string[]) => {
    // Start syncing newly added relays
    for (const url of urls) {
@@ -396,17 +408,34 @@ const syncDMs = () => {
    }
  }

-  const unsubscribePubkey = merged([pubkey, shouldUnwrap]).subscribe(([$pubkey, $shouldUnwrap]) => {
-    syncPubkey($pubkey, $shouldUnwrap)
-  })
+  // When pubkey changes, re-sync
+  const unsubscribePubkey = derived([pubkey, shouldUnwrap], identity).subscribe(
+    ([$pubkey, $shouldUnwrap]) => {
+      if ($pubkey !== currentPubkey) {
+        unsubscribeAll()
+      }

-  // When user messaging relays change, update synchronization
-  const unsubscribeList = merged([userMessagingRelayList]).subscribe(
-    ([$userMessagingRelayList]) => {
-      syncList($userMessagingRelayList)
+      // If we have a pubkey, refresh our user's relay list then sync our subscriptions
+      if ($pubkey && $shouldUnwrap) {
+        loadRelayList($pubkey)
+          .then(() => loadMessagingRelayList($pubkey))
+          .then($l => subscribeAll($pubkey, getRelayTagValues(getListTags($l))))
+      }
+
+      currentPubkey = $pubkey
    },
  )

+  // When user messaging relays change, update synchronization
+  const unsubscribeList = userMessagingRelayList.subscribe($userMessagingRelayList => {
+    const $pubkey = pubkey.get()
+    const $shouldUnwrap = shouldUnwrap.get()
+
+    if ($pubkey && $shouldUnwrap) {
+      subscribeAll($pubkey, getRelayTagValues(getListTags($userMessagingRelayList)))
+    }
+  })
+
  return () => {
    unsubscribeAll()
    unsubscribePubkey()
@@ -1,42 +0,0 @@
-import {mergeAttributes, Node} from "@tiptap/core"
-import {RoomReferenceNodeView} from "@app/editor/RoomReferenceNodeView"
-
-export const RoomReferenceExtension = Node.create({
-  name: "roomref",
-
-  atom: true,
-
-  inline: true,
-
-  group: "inline",
-
-  selectable: true,
-
-  priority: 1000,
-
-  addAttributes() {
-    return {
-      url: {default: undefined},
-      h: {default: undefined},
-    }
-  },
-
-  parseHTML() {
-    return [{tag: `span[data-type="${this.name}"]`}]
-  },
-
-  renderHTML({HTMLAttributes}) {
-    return ["span", mergeAttributes(HTMLAttributes, {"data-type": this.name}), "~"]
-  },
-
-  renderText({node}) {
-    const url = typeof node.attrs.url === "string" ? node.attrs.url : ""
-    const h = typeof node.attrs.h === "string" ? node.attrs.h : ""
-
-    return `${url}'${h}`
-  },
-
-  addNodeView() {
-    return RoomReferenceNodeView
-  },
-})
@@ -1,29 +0,0 @@
-import type {NodeViewRendererProps} from "@tiptap/core"
-import {displayRelayUrl} from "@welshman/util"
-import {deriveRoom} from "@app/core/state"
-
-export const RoomReferenceNodeView = ({node}: NodeViewRendererProps) => {
-  const dom = document.createElement("span")
-  const url = typeof node.attrs.url === "string" ? node.attrs.url : ""
-  const h = typeof node.attrs.h === "string" ? node.attrs.h : ""
-  const room = deriveRoom(url, h)
-
-  dom.classList.add("tiptap-object")
-
-  const unsubRoom = room.subscribe($room => {
-    dom.textContent = `~${displayRelayUrl(url)} / ${$room.name || h}`
-  })
-
-  return {
-    dom,
-    destroy: () => {
-      unsubRoom()
-    },
-    selectNode() {
-      dom.classList.add("tiptap-active")
-    },
-    deselectNode() {
-      dom.classList.remove("tiptap-active")
-    },
-  }
-}
@@ -1,17 +0,0 @@
-<script lang="ts">
-  import {displayRelayUrl} from "@welshman/util"
-  import RoomNameWithImage from "@app/components/RoomNameWithImage.svelte"
-  import {splitRoomId} from "@app/core/state"
-
-  type Props = {
-    value: string
-  }
-
-  const {value}: Props = $props()
-  const [url = "", h = ""] = splitRoomId(value)
-</script>
-
-<div class="max-w-full overflow-hidden text-ellipsis flex flex-col">
-  <RoomNameWithImage {url} {h} />
-  <span class="text-primary text-sm">{displayRelayUrl(url)}<span> </span></span>
-</div>
@@ -1,81 +0,0 @@
-import {Clipboard} from "@capacitor/clipboard"
-import {Capacitor} from "@capacitor/core"
-import {Extension} from "@tiptap/core"
-import {Plugin, PluginKey} from "@tiptap/pm/state"
-
-const nativeClipboardAvailable = () =>
-  Capacitor.isNativePlatform() && Capacitor.isPluginAvailable("Clipboard")
-
-const hasStandardPastePayload = (event: ClipboardEvent) => {
-  const clipboardData = event.clipboardData
-
-  if (!clipboardData) {
-    return false
-  }
-
-  if (Array.from(clipboardData.items).some(item => item.kind === "file")) {
-    return true
-  }
-
-  if (clipboardData.types.includes("text/html")) {
-    return true
-  }
-
-  return clipboardData.getData("text/plain") !== ""
-}
-
-const getNativeClipboardImage = async () => {
-  try {
-    const {type, value} = await Clipboard.read()
-
-    if (!type.startsWith("image/") || value === "") {
-      return undefined
-    }
-
-    const imageData = value.startsWith("data:") ? value : `data:${type};base64,${value}`
-    const blob = await fetch(imageData).then(res => res.blob())
-
-    if (!blob.type.startsWith("image/")) {
-      return undefined
-    }
-
-    const extension = type.split("/")[1]?.split("+")[0] || "png"
-
-    return new File([blob], `clipboard-image.${extension}`, {type: blob.type || type})
-  } catch {
-    return undefined
-  }
-}
-
-export const NativeClipboardPasteExtension = Extension.create({
-  name: "nativeClipboardPaste",
-
-  addProseMirrorPlugins() {
-    const editor = this.editor
-
-    return [
-      new Plugin({
-        key: new PluginKey("nativeClipboardPaste"),
-        props: {
-          handlePaste: (_view, event) => {
-            if (!nativeClipboardAvailable() || hasStandardPastePayload(event)) {
-              return false
-            }
-
-            event.preventDefault()
-
-            void getNativeClipboardImage().then(file => {
-              if (!file) {
-                return
-              }
-
-              editor.commands.addFile(file, editor.state.selection.from + 1)
-            })
-
-            return true
-          },
-        },
-      }),
-    ]
-  },
-})
@@ -4,7 +4,7 @@ import {get, derived} from "svelte/store"
 import {Router} from "@welshman/router"
 import {dec, inc} from "@welshman/lib"
 import {throttled} from "@welshman/store"
-import type {PublishedProfile, RoomMeta} from "@welshman/util"
+import type {PublishedProfile} from "@welshman/util"
 import {
  createSearch,
  profiles,
@@ -14,27 +14,12 @@ import {
  getWotGraph,
 } from "@welshman/app"
 import type {FileAttributes} from "@welshman/editor"
-import {
-  Editor,
-  MentionSuggestion,
-  TippySuggestion,
-  WelshmanExtension,
-  editorProps,
-} from "@welshman/editor"
+import {Editor, MentionSuggestion, WelshmanExtension, editorProps} from "@welshman/editor"
 import {escapeHtml} from "@lib/html"
 import {makeMentionNodeView} from "@app/editor/MentionNodeView"
 import ProfileSuggestion from "@app/editor/ProfileSuggestion.svelte"
-import {RoomReferenceExtension} from "@app/editor/RoomReferenceExtension"
-import RoomSuggestion from "@app/editor/RoomSuggestion.svelte"
-import {NativeClipboardPasteExtension} from "@app/editor/clipboard"
 import {uploadFile} from "@app/core/commands"
-import {
-  deriveSpaceMembers,
-  makeRoomId,
-  splitRoomId,
-  userSpaceUrls,
-  roomsByUrl,
-} from "@app/core/state"
+import {deriveSpaceMembers} from "@app/core/state"
 import {pushToast} from "@app/util/toast"

 export const makeEditor = async ({
@@ -79,7 +64,7 @@ export const makeEditor = async ({
        getValue: (profile: PublishedProfile) => profile.event.pubkey,
        sortFn: ({score = 1, item}) => {
          const wotScore = getWotGraph().get(item.event.pubkey) || 0
-          const membershipScale = $spaceMembers?.includes(item.event.pubkey) ? 2 : 1
+          const membershipScale = $spaceMembers.includes(item.event.pubkey) ? 2 : 1

          return dec(score) * inc(wotScore / getMaxWot()) * membershipScale
        },
@@ -97,36 +82,11 @@ export const makeEditor = async ({
    },
  )

-  const roomReferenceSearch = derived(
-    [throttled(800, userSpaceUrls), throttled(800, roomsByUrl)],
-    ([$userSpaceUrls, $roomsByUrl]) => {
-      const roomIdByMeta = new WeakMap<RoomMeta, string>()
-      const options: RoomMeta[] = []
-
-      for (const roomUrl of $userSpaceUrls) {
-        for (const room of $roomsByUrl.get(roomUrl) || []) {
-          roomIdByMeta.set(room, makeRoomId(roomUrl, room.h))
-          options.push(room)
-        }
-      }
-
-      return createSearch(options, {
-        getValue: item => roomIdByMeta.get(item) || item.h,
-        fuseOptions: {
-          keys: ["name", "h"],
-          threshold: 0.3,
-          shouldSort: false,
-        },
-      })
-    },
-  )
-
  const ed = new Editor({
    content: typeof content === "string" ? escapeHtml(content) : content,
    editorProps,
    element: document.createElement("div"),
    extensions: [
-      RoomReferenceExtension,
      WelshmanExtension.configure({
        submit,
        extensions: {
@@ -168,29 +128,6 @@ export const makeEditor = async ({

                      mount(ProfileSuggestion, {target, props: {value, url}})

-                      return target
-                    },
-                  }),
-                  TippySuggestion({
-                    char: "~",
-                    name: "roomref",
-                    editor: (this as any).editor,
-                    search: (term: string) => get(roomReferenceSearch).searchValues(term),
-                    updateSignal: roomReferenceSearch,
-                    select: (id: string, props) => {
-                      const [roomUrl, h] = splitRoomId(id)
-
-                      if (!roomUrl || !h) {
-                        return
-                      }
-
-                      return props.command({url: roomUrl, h})
-                    },
-                    createSuggestion: (value: string) => {
-                      const target = document.createElement("div")
-
-                      mount(RoomSuggestion, {target, props: {value}})
-
                      return target
                    },
                  }),
@@ -200,7 +137,6 @@ export const makeEditor = async ({
          },
        },
      }),
-      NativeClipboardPasteExtension,
    ],
    onUpdate({editor}) {
      wordCount?.set(editor.storage.wordCount.words)
@@ -1,4 +1,4 @@
-import {get, writable} from "svelte/store"
+import {writable} from "svelte/store"
 import type {Nip46ResponseWithResult} from "@welshman/signer"
 import {Nip46Broker} from "@welshman/signer"
 import {makeSecret} from "@welshman/util"
@@ -11,22 +11,6 @@ import {
 } from "@app/core/state"
 import {pushToast} from "@app/util/toast"

-const APP_SCHEME = "social.flotilla"
-
-const makeSignerCallbackUrl = (path: string) => `${APP_SCHEME}://x-callback-url/${path}`
-
-const makeSignerLaunchUrl = (nostrconnectUrl: string) => {
-  const params = new URLSearchParams({
-    method: "connect",
-    nostrconnect: nostrconnectUrl,
-    "x-source": APP_SCHEME,
-    "x-success": makeSignerCallbackUrl("authSuccess"),
-    "x-error": makeSignerCallbackUrl("authError"),
-  })
-
-  return `nostrsigner://x-callback-url/auth/nip46?${params.toString()}`
-}
-
 export class Nip46Controller {
  url = writable("")
  bunker = writable("")
@@ -70,22 +54,6 @@ export class Nip46Controller {
    }
  }

-  launchSigner() {
-    const nostrconnectUrl = get(this.url)
-    const signerUrl = nostrconnectUrl && makeSignerLaunchUrl(nostrconnectUrl)
-
-    if (!signerUrl) {
-      pushToast({
-        theme: "error",
-        message: "Unable to open signer app right now. Please try again.",
-      })
-
-      return
-    }
-
-    window.location.href = signerUrl
-  }
-
  stop() {
    this.broker.cleanup()
    this.abortController.abort()
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
mplorentz	b3d49f2327	Factor video code and stores out of voice.ts	2026-04-08 10:30:22 -04:00
mplorentz	3f64db0f0d	Clean up VideoCallContent	2026-04-08 09:46:33 -04:00
mplorentz	8d10d1700c	Simplify how video call layout is stored	2026-04-07 14:57:24 -04:00
mplorentz	ff83fbd61f	incorporate page layout changes from dev and other cleanup	2026-04-07 13:51:51 -04:00
mplorentz	54829d96a6	Add permissions for cameras on mobile	2026-04-07 13:51:09 -04:00
mplorentz	fc3100193d	Hide screen share button on ios and android	2026-04-07 13:51:09 -04:00
mplorentz	9c69f2272b	Show unread indicator on chat icon in VoiceWidget	2026-04-07 13:51:09 -04:00
mplorentz	0241cd2d1d	Allow clicking voice widget to go back to call	2026-04-07 13:51:09 -04:00
mplorentz	8e2fde8ae7	rework video + text chat display controls	2026-04-07 13:51:09 -04:00
mplorentz	453e4e9b22	Style pin icon more better	2026-04-07 13:50:39 -04:00
mplorentz	97aa9408b6	Style voice widget icons to be less red	2026-04-07 13:50:39 -04:00
mplorentz	2e01d4783c	Add video settings to VoiceCallAudioSettingsDialog	2026-04-07 13:50:39 -04:00
mplorentz	5766826905	Fix merge artifacts	2026-04-07 13:50:39 -04:00
mplorentz	bdaa8b3450	Add settings button to configure audio devices in call	2026-04-07 13:50:39 -04:00
mplorentz	2e31cf0bd5	Change screen sharing icon	2026-04-07 13:50:39 -04:00
mplorentz	a9cfc9f19f	Improve pinned video layout	2026-04-07 13:50:39 -04:00
mplorentz	28d867bece	Add a button to spotlight a video feed	2026-04-07 13:50:24 -04:00
mplorentz	ee4fa066ee	Add basic screen sharing	2026-04-07 13:50:24 -04:00
mplorentz	d596d8ba49	add video to livekit calls	2026-04-07 13:50:24 -04:00