refactor: simplify ContentLinkUrl rendering

refactor: extract shared ContentLinkUrl renderer
refactor: align room mention labels with link rendering
2026-04-11 18:56:23 +05:30 · 2026-04-09 00:10:59 +05:30 · 2026-04-08 22:26:04 +05:30 · 2026-04-08 22:24:56 +05:30 · 2026-04-08 22:21:51 +05:30
102 changed files with 1045 additions and 3017 deletions
@@ -19,6 +19,6 @@ 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_THUMBNAIL_URL=
 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
+
@@ -70,7 +70,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')
@@ -44,7 +44,4 @@
    <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
    <uses-permission android:name="android.permission.RECORD_AUDIO" />
    <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
-    <uses-permission android:name="android.permission.CAMERA" />
-
-    <uses-feature android:name="android.hardware.camera.any" android:required="false" />
 </manifest>
@@ -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 = "";
@@ -24,10 +24,8 @@
 	<false/>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
-	<key>NSCameraUsageDescription</key>
-	<string>Flotilla uses the camera when you enable it in a voice room.</string>
 	<key>NSMicrophoneUsageDescription</key>
-	<string>Flotilla uses the microphone when you enable it in a voice room.</string>
+	<string>Flotilla uses the microphone for voice chat in rooms.</string>
 	<key>UIBackgroundModes</key>
 	<array>
 		<string>remote-notification</string>
@@ -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",
@@ -48,38 +48,35 @@
    "@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",
    "date-picker-svelte": "^2.17.0",
@@ -108,6 +105,5 @@
    "overrides": {
      "sharp": "0.35.0-rc.0"
    }
-  },
-  "packageManager": "pnpm@10.33.0+sha512.10568bb4a6afb58c9eb3630da90cc9516417abebd3fabbe6739f0ae795728da1491e9db5a544c76ad8eb7570f5c4bb3d6c637b2cb41bfdcdb47fa823c8649319"
+  }
 }
@@ -26,9 +26,6 @@ importers:
      '@capacitor/cli':
        specifier: ^8.0.1
        version: 8.0.1
-      '@capacitor/clipboard':
-        specifier: ^8.0.1
-        version: 8.0.1(@capacitor/core@8.0.1)
      '@capacitor/core':
        specifier: ^8.0.1
        version: 8.0.1
@@ -47,9 +44,6 @@ importers:
      '@capacitor/push-notifications':
        specifier: ^8.0.0
        version: 8.0.0(@capacitor/core@8.0.1)
-      '@capacitor/share':
-        specifier: ^8.0.1
-        version: 8.0.1(@capacitor/core@8.0.1)
      '@capawesome/capacitor-android-dark-mode-support':
        specifier: ^8.0.0
        version: 8.0.0(@capacitor/core@8.0.1)
@@ -66,8 +60,8 @@ importers:
        specifier: ^1.9.7
        version: 1.9.7
      '@pomade/core':
-        specifier: ^0.2.3
-        version: 0.2.3(@frostr/bifrost@1.0.7(typescript@5.9.3))(@noble/hashes@2.0.1)(@welshman/lib@0.8.13)(@welshman/net@0.8.13(@welshman/lib@0.8.13)(@welshman/util@0.8.13(@noble/curves@1.9.7)(@welshman/lib@0.8.13)(nostr-tools@2.20.0(typescript@5.9.3)))(ws@8.18.3))(@welshman/signer@0.8.13(@noble/curves@1.9.7)(@noble/hashes@2.0.1)(@welshman/lib@0.8.13)(@welshman/net@0.8.13(@welshman/lib@0.8.13)(@welshman/util@0.8.13(@noble/curves@1.9.7)(@welshman/lib@0.8.13)(nostr-tools@2.20.0(typescript@5.9.3)))(ws@8.18.3))(@welshman/util@0.8.13(@noble/curves@1.9.7)(@welshman/lib@0.8.13)(nostr-tools@2.20.0(typescript@5.9.3)))(nostr-signer-capacitor-plugin@https://codeload.github.com/coracle-social/nostr-signer-capacitor-plugin/tar.gz/be4bb90a1a15c8eec0934f2f66ce9e82ecc72d51(@capacitor/core@8.0.1))(nostr-tools@2.20.0(typescript@5.9.3)))(@welshman/util@0.8.13(@noble/curves@1.9.7)(@welshman/lib@0.8.13)(nostr-tools@2.20.0(typescript@5.9.3)))(nostr-tools@2.20.0(typescript@5.9.3))
+        specifier: ^0.2.2
+        version: 0.2.2(@frostr/bifrost@1.0.7(typescript@5.9.3))(@noble/hashes@2.0.1)(@welshman/lib@0.8.12)(@welshman/net@0.8.12(@welshman/lib@0.8.12)(@welshman/util@0.8.12(@noble/curves@1.9.7)(@welshman/lib@0.8.12)(nostr-tools@2.20.0(typescript@5.9.3)))(ws@8.18.3))(@welshman/signer@0.8.12(@noble/curves@1.9.7)(@noble/hashes@2.0.1)(@welshman/lib@0.8.12)(@welshman/net@0.8.12(@welshman/lib@0.8.12)(@welshman/util@0.8.12(@noble/curves@1.9.7)(@welshman/lib@0.8.12)(nostr-tools@2.20.0(typescript@5.9.3)))(ws@8.18.3))(@welshman/util@0.8.12(@noble/curves@1.9.7)(@welshman/lib@0.8.12)(nostr-tools@2.20.0(typescript@5.9.3)))(nostr-signer-capacitor-plugin@https://codeload.github.com/coracle-social/nostr-signer-capacitor-plugin/tar.gz/be4bb90a1a15c8eec0934f2f66ce9e82ecc72d51(@capacitor/core@8.0.1))(nostr-tools@2.20.0(typescript@5.9.3)))(@welshman/util@0.8.12(@noble/curves@1.9.7)(@welshman/lib@0.8.12)(nostr-tools@2.20.0(typescript@5.9.3)))(nostr-tools@2.20.0(typescript@5.9.3))
      '@poppanator/sveltekit-svg':
        specifier: ^4.2.1
        version: 4.2.1(rollup@2.80.0)(svelte@5.48.0)(svgo@3.3.2)(vite@5.4.21(@types/node@25.0.10)(lightningcss@1.32.0)(terser@5.46.0))
@@ -77,9 +71,6 @@ importers:
      '@tiptap/core':
        specifier: ^2.27.2
        version: 2.27.2(@tiptap/pm@2.27.2)
-      '@tiptap/pm':
-        specifier: ^2.27.2
-        version: 2.27.2
      '@types/qrcode':
        specifier: ^1.5.6
        version: 1.5.6
@@ -93,35 +84,35 @@ importers:
        specifier: ^0.6.8
        version: 0.6.8(@sveltejs/kit@2.50.1(@sveltejs/vite-plugin-svelte@4.0.4(svelte@5.48.0)(vite@5.4.21(@types/node@25.0.10)(lightningcss@1.32.0)(terser@5.46.0)))(svelte@5.48.0)(typescript@5.9.3)(vite@5.4.21(@types/node@25.0.10)(lightningcss@1.32.0)(terser@5.46.0)))(@vite-pwa/assets-generator@0.2.6)(vite-plugin-pwa@0.21.2(@vite-pwa/assets-generator@0.2.6)(vite@5.4.21(@types/node@25.0.10)(lightningcss@1.32.0)(terser@5.46.0))(workbox-build@7.3.0)(workbox-window@7.3.0))
      '@welshman/app':
-        specifier: ^0.8.13
-        version: 0.8.13(ed9ee8a79a580bcb9fa9bb6eb1a69558)
+        specifier: ^0.8.12
+        version: 0.8.12(3074ef6691f94dc03952d8dbc98013a7)
      '@welshman/content':
-        specifier: ^0.8.13
-        version: 0.8.13(nostr-tools@2.20.0(typescript@5.9.3))
+        specifier: ^0.8.12
+        version: 0.8.12(nostr-tools@2.20.0(typescript@5.9.3))
      '@welshman/editor':
-        specifier: ^0.8.13
-        version: 0.8.13(@welshman/lib@0.8.13)(@welshman/util@0.8.13(@noble/curves@1.9.7)(@welshman/lib@0.8.13)(nostr-tools@2.20.0(typescript@5.9.3)))(nostr-editor@1.1.1(@tiptap/core@2.27.2(@tiptap/pm@2.27.2))(@tiptap/extension-image@2.27.1(@tiptap/core@2.27.2(@tiptap/pm@2.27.2)))(@tiptap/extension-link@2.27.1(@tiptap/core@2.27.2(@tiptap/pm@2.27.2))(@tiptap/pm@2.27.2))(@tiptap/pm@2.27.2)(linkifyjs@4.3.2)(nostr-tools@2.20.0(typescript@5.9.3))(prosemirror-markdown@1.13.3)(prosemirror-model@1.25.4)(prosemirror-state@1.4.4)(prosemirror-view@1.41.5)(tiptap-markdown@0.8.10(@tiptap/core@2.27.2(@tiptap/pm@2.27.2))))(nostr-tools@2.20.0(typescript@5.9.3))
+        specifier: ^0.8.12
+        version: 0.8.12(@welshman/lib@0.8.12)(@welshman/util@0.8.12(@noble/curves@1.9.7)(@welshman/lib@0.8.12)(nostr-tools@2.20.0(typescript@5.9.3)))(nostr-editor@1.1.1(@tiptap/core@2.27.2(@tiptap/pm@2.27.2))(@tiptap/extension-image@2.27.1(@tiptap/core@2.27.2(@tiptap/pm@2.27.2)))(@tiptap/extension-link@2.27.1(@tiptap/core@2.27.2(@tiptap/pm@2.27.2))(@tiptap/pm@2.27.2))(@tiptap/pm@2.27.2)(linkifyjs@4.3.2)(nostr-tools@2.20.0(typescript@5.9.3))(prosemirror-markdown@1.13.3)(prosemirror-model@1.25.4)(prosemirror-state@1.4.4)(prosemirror-view@1.41.5)(tiptap-markdown@0.8.10(@tiptap/core@2.27.2(@tiptap/pm@2.27.2))))(nostr-tools@2.20.0(typescript@5.9.3))
      '@welshman/feeds':
-        specifier: ^0.8.13
-        version: 0.8.13(29451a19e278ea4a9cf66616f05d5557)
+        specifier: ^0.8.12
+        version: 0.8.12(d5b74f0c83250e052e0b96f7ff5804e8)
      '@welshman/lib':
-        specifier: ^0.8.13
-        version: 0.8.13
+        specifier: ^0.8.12
+        version: 0.8.12
      '@welshman/net':
-        specifier: ^0.8.13
-        version: 0.8.13(@welshman/lib@0.8.13)(@welshman/util@0.8.13(@noble/curves@1.9.7)(@welshman/lib@0.8.13)(nostr-tools@2.20.0(typescript@5.9.3)))(ws@8.18.3)
+        specifier: ^0.8.12
+        version: 0.8.12(@welshman/lib@0.8.12)(@welshman/util@0.8.12(@noble/curves@1.9.7)(@welshman/lib@0.8.12)(nostr-tools@2.20.0(typescript@5.9.3)))(ws@8.18.3)
      '@welshman/router':
-        specifier: ^0.8.13
-        version: 0.8.13(@welshman/lib@0.8.13)(@welshman/net@0.8.13(@welshman/lib@0.8.13)(@welshman/util@0.8.13(@noble/curves@1.9.7)(@welshman/lib@0.8.13)(nostr-tools@2.20.0(typescript@5.9.3)))(ws@8.18.3))(@welshman/util@0.8.13(@noble/curves@1.9.7)(@welshman/lib@0.8.13)(nostr-tools@2.20.0(typescript@5.9.3)))
+        specifier: ^0.8.12
+        version: 0.8.12(@welshman/lib@0.8.12)(@welshman/net@0.8.12(@welshman/lib@0.8.12)(@welshman/util@0.8.12(@noble/curves@1.9.7)(@welshman/lib@0.8.12)(nostr-tools@2.20.0(typescript@5.9.3)))(ws@8.18.3))(@welshman/util@0.8.12(@noble/curves@1.9.7)(@welshman/lib@0.8.12)(nostr-tools@2.20.0(typescript@5.9.3)))
      '@welshman/signer':
-        specifier: ^0.8.13
-        version: 0.8.13(@noble/curves@1.9.7)(@noble/hashes@2.0.1)(@welshman/lib@0.8.13)(@welshman/net@0.8.13(@welshman/lib@0.8.13)(@welshman/util@0.8.13(@noble/curves@1.9.7)(@welshman/lib@0.8.13)(nostr-tools@2.20.0(typescript@5.9.3)))(ws@8.18.3))(@welshman/util@0.8.13(@noble/curves@1.9.7)(@welshman/lib@0.8.13)(nostr-tools@2.20.0(typescript@5.9.3)))(nostr-signer-capacitor-plugin@https://codeload.github.com/coracle-social/nostr-signer-capacitor-plugin/tar.gz/be4bb90a1a15c8eec0934f2f66ce9e82ecc72d51(@capacitor/core@8.0.1))(nostr-tools@2.20.0(typescript@5.9.3))
+        specifier: ^0.8.12
+        version: 0.8.12(@noble/curves@1.9.7)(@noble/hashes@2.0.1)(@welshman/lib@0.8.12)(@welshman/net@0.8.12(@welshman/lib@0.8.12)(@welshman/util@0.8.12(@noble/curves@1.9.7)(@welshman/lib@0.8.12)(nostr-tools@2.20.0(typescript@5.9.3)))(ws@8.18.3))(@welshman/util@0.8.12(@noble/curves@1.9.7)(@welshman/lib@0.8.12)(nostr-tools@2.20.0(typescript@5.9.3)))(nostr-signer-capacitor-plugin@https://codeload.github.com/coracle-social/nostr-signer-capacitor-plugin/tar.gz/be4bb90a1a15c8eec0934f2f66ce9e82ecc72d51(@capacitor/core@8.0.1))(nostr-tools@2.20.0(typescript@5.9.3))
      '@welshman/store':
-        specifier: ^0.8.13
-        version: 0.8.13(@welshman/lib@0.8.13)(@welshman/net@0.8.13(@welshman/lib@0.8.13)(@welshman/util@0.8.13(@noble/curves@1.9.7)(@welshman/lib@0.8.13)(nostr-tools@2.20.0(typescript@5.9.3)))(ws@8.18.3))(@welshman/util@0.8.13(@noble/curves@1.9.7)(@welshman/lib@0.8.13)(nostr-tools@2.20.0(typescript@5.9.3)))(svelte@5.48.0)
+        specifier: ^0.8.12
+        version: 0.8.12(@welshman/lib@0.8.12)(@welshman/net@0.8.12(@welshman/lib@0.8.12)(@welshman/util@0.8.12(@noble/curves@1.9.7)(@welshman/lib@0.8.12)(nostr-tools@2.20.0(typescript@5.9.3)))(ws@8.18.3))(@welshman/util@0.8.12(@noble/curves@1.9.7)(@welshman/lib@0.8.12)(nostr-tools@2.20.0(typescript@5.9.3)))(svelte@5.48.0)
      '@welshman/util':
-        specifier: ^0.8.13
-        version: 0.8.13(@noble/curves@1.9.7)(@welshman/lib@0.8.13)(nostr-tools@2.20.0(typescript@5.9.3))
+        specifier: ^0.8.12
+        version: 0.8.12(@noble/curves@1.9.7)(@welshman/lib@0.8.12)(nostr-tools@2.20.0(typescript@5.9.3))
      compressorjs-next:
        specifier: ^1.1.2
        version: 1.1.2
@@ -800,11 +791,6 @@ packages:
    engines: {node: '>=22.0.0'}
    hasBin: true

-  '@capacitor/clipboard@8.0.1':
-    resolution: {integrity: sha512-iOlbTi8MojKyLnYE+M27priXid7vHd0PlDwyHohPzkuQ8Rkp6q7ykwZmPEUD+OnU/Ink7Qw/pUOfKgraKmA6Eg==}
-    peerDependencies:
-      '@capacitor/core': '>=8.0.0'
-
  '@capacitor/core@8.0.1':
    resolution: {integrity: sha512-5UqSWxGMp/B8KhYu7rAijqNtYslhcLh+TrbfU48PfdMDsPfaU/VY48sMNzC22xL8BmoFoql/3SKyP+pavTOvOA==}

@@ -841,11 +827,6 @@ packages:
    peerDependencies:
      '@capacitor/core': '>=8.0.0'

-  '@capacitor/share@8.0.1':
-    resolution: {integrity: sha512-3cSBKBCJVon54rKDROP2rqGyeGks4pBh9TbaEk9S375Kbek/ZHe72N50zIa0Vn9Eac/SuhwgehO/mmA4CsUOiw==}
-    peerDependencies:
-      '@capacitor/core': '>=8.0.0'
-
  '@capacitor/synapse@1.0.4':
    resolution: {integrity: sha512-/C1FUo8/OkKuAT4nCIu/34ny9siNHr9qtFezu4kxm6GY1wNFxrCFWjfYx5C1tUhVGz3fxBABegupkpjXvjCHrw==}

@@ -1446,9 +1427,9 @@ packages:
  '@polka/url@1.0.0-next.29':
    resolution: {integrity: sha512-wwQAWhWSuHaag8c4q/KN/vCoeOJYshAIvMQwD4GpSb3OiZklFfvAgmj0VCBBImRpuF/aFgIRzllXlVX93Jevww==}

-  '@pomade/core@0.2.3':
-    resolution: {integrity: sha512-36+abWfMH1Mif9FjBO7xICCkGZE4IqQpy7Csxlauyt0bhYQ9GsB07LqK5Qm3GgEHNwF9rFXdSZawkM+E6BeIfg==}
-    version: 0.2.3
+  '@pomade/core@0.2.2':
+    resolution: {integrity: sha512-FoilLsO0gVjiKMW3LV63pmXU7x3gh8YVGVulyR6QJr4h47XrsBg8vPkZtKWr4+sH3sW31e2tNIPUb3ptiuhrMA==}
+    version: 0.2.2
    engines: {node: '>=12.0.0'}
    peerDependencies:
      '@frostr/bifrost': ^1.0.7
@@ -2150,83 +2131,83 @@ packages:
      '@vite-pwa/assets-generator':
        optional: true

-  '@welshman/app@0.8.13':
-    resolution: {integrity: sha512-+mUMtt5ibotBk/susPFKXnb9jRjqvIQgWMF28poCIzse08V4kfVClJJlzepvgjqRn6Ma/takr6tNkL6eV4rlRQ==}
+  '@welshman/app@0.8.12':
+    resolution: {integrity: sha512-kRp+AVzn4i3FvZmdlyMknFUAb/5SnUz9A/cFKkDqWHsd+N3PbNcL2ZOlV9v5NI77GtsDF2ez6PEQfsZxWvkS/g==}
    peerDependencies:
      '@pomade/core': ^0.2.1
-      '@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/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
      svelte: ^4.0.0 || ^5.0.0

-  '@welshman/content@0.8.13':
-    resolution: {integrity: sha512-6ZDKCJ2GKczAULD7P7NZ5DmxFYKw6vfxJ1jpwbQj+0l7alr2IBh8kmaQ8wM1r6n0qOhfcNqeGaaREQxC4VnuHA==}
+  '@welshman/content@0.8.12':
+    resolution: {integrity: sha512-hviVTXdyGf04Xq7mGo/82fq6lnbyuUYOGPkf8pJqPkfGh0f3i9nKof6gkzPvjZeEYSczneI2GpLIxkaZ3w1/tw==}
    peerDependencies:
      nostr-tools: ^2.19.4

-  '@welshman/editor@0.8.13':
-    resolution: {integrity: sha512-kr4pSjQ/TZnlyIeGo0UNNAQrTGpp0yMRUFD/LwORVLnC8UGNLwGRmFwOz0WNtCxGxFGquTlX1AkNfViWdkfXHw==}
+  '@welshman/editor@0.8.12':
+    resolution: {integrity: sha512-CEXszH6pfM1kZHU9WnB6Z97YlxEOtgao6R3hhnBL/kRXy2tUTLpmFWyMONg2vu8Uzxtwz665eZhucLsju60U6w==}
    peerDependencies:
-      '@welshman/lib': 0.8.13
-      '@welshman/util': 0.8.13
+      '@welshman/lib': 0.8.12
+      '@welshman/util': 0.8.12
      nostr-editor: ^1.1.1
      nostr-tools: ^2.19.4

-  '@welshman/feeds@0.8.13':
-    resolution: {integrity: sha512-zjjKbGG8wQyyuTtm7/7lAGEFbreTp7IO5Y+DZXwBBu/h2/TP/C/v0J0XrshFBqs/wOOURv7vYZlf/bs2En8UIg==}
+  '@welshman/feeds@0.8.12':
+    resolution: {integrity: sha512-Dp/063qdrbe096z6IpIneazsqscfzSwsg09ZNHB6c3OsVb6iLEXLe7mEpATGcRsZ8memuFNLVLIP51eVkBqPcQ==}
    peerDependencies:
-      '@welshman/lib': 0.8.13
-      '@welshman/net': 0.8.13
-      '@welshman/router': 0.8.13
-      '@welshman/signer': 0.8.13
-      '@welshman/util': 0.8.13
+      '@welshman/lib': 0.8.12
+      '@welshman/net': 0.8.12
+      '@welshman/router': 0.8.12
+      '@welshman/signer': 0.8.12
+      '@welshman/util': 0.8.12

-  '@welshman/lib@0.8.13':
-    resolution: {integrity: sha512-fXVoe7zx+jPnqZdRMXLNOJvW+N6E708HSpNGfyBGlu1/OXg70wkEK3r9E67HsBg7pLxnl22tcOYq7r11GhpeFA==}
+  '@welshman/lib@0.8.12':
+    resolution: {integrity: sha512-7Y1GjAcABquWF47A1Jni5JdP+k0GH2yRmEbVhIU+0R0TubCwPAKS38J2LTvtuE9CJMX6hPS9IKEZS6qTOAaVuw==}
    engines: {node: '>=12.0.0'}

-  '@welshman/net@0.8.13':
-    resolution: {integrity: sha512-k9BQA2lJI1mnQrf3pR8e3QhCluPtWSSPz2ywTDKq+/pdVXXIjrnsblHA/62d6SjCCSV/n5fONQ08YMivPzgtGA==}
+  '@welshman/net@0.8.12':
+    resolution: {integrity: sha512-Ba71jwb8BBwUfPPtWHKYLB0HqeDYK64oqwxfo5bYldtPfGYrlD+a7lHFSZvNyOhvyXygCaIMnaye1QxWAHP8ng==}
    peerDependencies:
-      '@welshman/lib': 0.8.13
-      '@welshman/util': 0.8.13
+      '@welshman/lib': 0.8.12
+      '@welshman/util': 0.8.12

-  '@welshman/router@0.8.13':
-    resolution: {integrity: sha512-MJh8YfHpoSsRUI96OnqxnBDoQwjqIMh8N57US0id9cd6iOlkYlVPEUeicJK8Kcl5oT0zmN13UT/4o3d7nZrqcA==}
+  '@welshman/router@0.8.12':
+    resolution: {integrity: sha512-Rr7ryBNTvTvjoLsDRMKPuoNJbBv2MgyqN2338p4vVhPMK6MOGM3Nx1og0LpHDGiLlCFuPM8RpParpIWfNnWbKw==}
    peerDependencies:
-      '@welshman/lib': 0.8.13
-      '@welshman/net': 0.8.13
-      '@welshman/util': 0.8.13
+      '@welshman/lib': 0.8.12
+      '@welshman/net': 0.8.12
+      '@welshman/util': 0.8.12

-  '@welshman/signer@0.8.13':
-    resolution: {integrity: sha512-VgyKxZhJ/Br0q4H8KPfRWAa8WC0EVUc69dxq/Bt1cl7MTBg1EbzolUJhgOgGDOVO0gAKmWYMCnjNochaQy/Wpg==}
-    version: 0.8.13
+  '@welshman/signer@0.8.12':
+    resolution: {integrity: sha512-eO4mw2QOR2d2oCS4zgptkCgjC1s8X+1vNnXfWDbtlEwhk7PD4ySSCkpNVMeElq+uluLOugmKvgDc4gfnIH3p2A==}
+    version: 0.8.12
    peerDependencies:
      '@noble/curves': ^1.9.7
      '@noble/hashes': ^2.0.1
-      '@welshman/lib': 0.8.13
-      '@welshman/net': 0.8.13
-      '@welshman/util': 0.8.13
+      '@welshman/lib': 0.8.12
+      '@welshman/net': 0.8.12
+      '@welshman/util': 0.8.12
      nostr-signer-capacitor-plugin: '*'
      nostr-tools: ^2.19.4

-  '@welshman/store@0.8.13':
-    resolution: {integrity: sha512-tnmbaNa8aqFVbklsMZ5y4h9xlHnbwo7o1l6xxJI0hqZnTuXD3IvN5/V58qhfZveUN/Y5Gz2MWQHFWyRBQ71ANg==}
+  '@welshman/store@0.8.12':
+    resolution: {integrity: sha512-3IUzPRMMVF6Pcw3DaKkfJ4S6bYzVtk6Ze3FnaHs1xJIxkQj9GyBO9VreiovULPW0djsnrP5+1UEN4mKZsG3hXg==}
    peerDependencies:
-      '@welshman/lib': 0.8.13
-      '@welshman/net': 0.8.13
-      '@welshman/util': 0.8.13
+      '@welshman/lib': 0.8.12
+      '@welshman/net': 0.8.12
+      '@welshman/util': 0.8.12
      svelte: ^4.0.0 || ^5.0.0

-  '@welshman/util@0.8.13':
-    resolution: {integrity: sha512-3+CNqJjiHGXKzLOniDqAN4Oe038fV1RRjKiVP0++FDVbq8lShtdcliR7FDg/NTjhhmzivhYqdflNvqjAqOxekA==}
+  '@welshman/util@0.8.12':
+    resolution: {integrity: sha512-lgftFt2moXZdN5fuL0RoAnAARV0n0d2+Q56gt7KrBSevjoCbtJgBVX5idvxL5PCEfh81veovJtty6eHxrhQv5A==}
    peerDependencies:
      '@noble/curves': ^1.9.7
-      '@welshman/lib': 0.8.13
+      '@welshman/lib': 0.8.12
      nostr-tools: ^2.19.4

  '@xml-tools/parser@1.0.11':
@@ -5988,10 +5969,6 @@ snapshots:
    transitivePeerDependencies:
      - supports-color

-  '@capacitor/clipboard@8.0.1(@capacitor/core@8.0.1)':
-    dependencies:
-      '@capacitor/core': 8.0.1
-
  '@capacitor/core@8.0.1':
    dependencies:
      tslib: 2.8.1
@@ -6029,10 +6006,6 @@ snapshots:
    dependencies:
      '@capacitor/core': 8.0.1

-  '@capacitor/share@8.0.1(@capacitor/core@8.0.1)':
-    dependencies:
-      '@capacitor/core': 8.0.1
-
  '@capacitor/synapse@1.0.4': {}

  '@capawesome/capacitor-android-dark-mode-support@8.0.0(@capacitor/core@8.0.1)':
@@ -6637,15 +6610,15 @@ snapshots:

  '@polka/url@1.0.0-next.29': {}

-  '@pomade/core@0.2.3(@frostr/bifrost@1.0.7(typescript@5.9.3))(@noble/hashes@2.0.1)(@welshman/lib@0.8.13)(@welshman/net@0.8.13(@welshman/lib@0.8.13)(@welshman/util@0.8.13(@noble/curves@1.9.7)(@welshman/lib@0.8.13)(nostr-tools@2.20.0(typescript@5.9.3)))(ws@8.18.3))(@welshman/signer@0.8.13(@noble/curves@1.9.7)(@noble/hashes@2.0.1)(@welshman/lib@0.8.13)(@welshman/net@0.8.13(@welshman/lib@0.8.13)(@welshman/util@0.8.13(@noble/curves@1.9.7)(@welshman/lib@0.8.13)(nostr-tools@2.20.0(typescript@5.9.3)))(ws@8.18.3))(@welshman/util@0.8.13(@noble/curves@1.9.7)(@welshman/lib@0.8.13)(nostr-tools@2.20.0(typescript@5.9.3)))(nostr-signer-capacitor-plugin@https://codeload.github.com/coracle-social/nostr-signer-capacitor-plugin/tar.gz/be4bb90a1a15c8eec0934f2f66ce9e82ecc72d51(@capacitor/core@8.0.1))(nostr-tools@2.20.0(typescript@5.9.3)))(@welshman/util@0.8.13(@noble/curves@1.9.7)(@welshman/lib@0.8.13)(nostr-tools@2.20.0(typescript@5.9.3)))(nostr-tools@2.20.0(typescript@5.9.3))':
+  '@pomade/core@0.2.2(@frostr/bifrost@1.0.7(typescript@5.9.3))(@noble/hashes@2.0.1)(@welshman/lib@0.8.12)(@welshman/net@0.8.12(@welshman/lib@0.8.12)(@welshman/util@0.8.12(@noble/curves@1.9.7)(@welshman/lib@0.8.12)(nostr-tools@2.20.0(typescript@5.9.3)))(ws@8.18.3))(@welshman/signer@0.8.12(@noble/curves@1.9.7)(@noble/hashes@2.0.1)(@welshman/lib@0.8.12)(@welshman/net@0.8.12(@welshman/lib@0.8.12)(@welshman/util@0.8.12(@noble/curves@1.9.7)(@welshman/lib@0.8.12)(nostr-tools@2.20.0(typescript@5.9.3)))(ws@8.18.3))(@welshman/util@0.8.12(@noble/curves@1.9.7)(@welshman/lib@0.8.12)(nostr-tools@2.20.0(typescript@5.9.3)))(nostr-signer-capacitor-plugin@https://codeload.github.com/coracle-social/nostr-signer-capacitor-plugin/tar.gz/be4bb90a1a15c8eec0934f2f66ce9e82ecc72d51(@capacitor/core@8.0.1))(nostr-tools@2.20.0(typescript@5.9.3)))(@welshman/util@0.8.12(@noble/curves@1.9.7)(@welshman/lib@0.8.12)(nostr-tools@2.20.0(typescript@5.9.3)))(nostr-tools@2.20.0(typescript@5.9.3))':
    dependencies:
      '@frostr/bifrost': 1.0.7(typescript@5.9.3)
      '@noble/hashes': 2.0.1
      '@peculiar/x509': 1.14.3
-      '@welshman/lib': 0.8.13
-      '@welshman/net': 0.8.13(@welshman/lib@0.8.13)(@welshman/util@0.8.13(@noble/curves@1.9.7)(@welshman/lib@0.8.13)(nostr-tools@2.20.0(typescript@5.9.3)))(ws@8.18.3)
-      '@welshman/signer': 0.8.13(@noble/curves@1.9.7)(@noble/hashes@2.0.1)(@welshman/lib@0.8.13)(@welshman/net@0.8.13(@welshman/lib@0.8.13)(@welshman/util@0.8.13(@noble/curves@1.9.7)(@welshman/lib@0.8.13)(nostr-tools@2.20.0(typescript@5.9.3)))(ws@8.18.3))(@welshman/util@0.8.13(@noble/curves@1.9.7)(@welshman/lib@0.8.13)(nostr-tools@2.20.0(typescript@5.9.3)))(nostr-signer-capacitor-plugin@https://codeload.github.com/coracle-social/nostr-signer-capacitor-plugin/tar.gz/be4bb90a1a15c8eec0934f2f66ce9e82ecc72d51(@capacitor/core@8.0.1))(nostr-tools@2.20.0(typescript@5.9.3))
-      '@welshman/util': 0.8.13(@noble/curves@1.9.7)(@welshman/lib@0.8.13)(nostr-tools@2.20.0(typescript@5.9.3))
+      '@welshman/lib': 0.8.12
+      '@welshman/net': 0.8.12(@welshman/lib@0.8.12)(@welshman/util@0.8.12(@noble/curves@1.9.7)(@welshman/lib@0.8.12)(nostr-tools@2.20.0(typescript@5.9.3)))(ws@8.18.3)
+      '@welshman/signer': 0.8.12(@noble/curves@1.9.7)(@noble/hashes@2.0.1)(@welshman/lib@0.8.12)(@welshman/net@0.8.12(@welshman/lib@0.8.12)(@welshman/util@0.8.12(@noble/curves@1.9.7)(@welshman/lib@0.8.12)(nostr-tools@2.20.0(typescript@5.9.3)))(ws@8.18.3))(@welshman/util@0.8.12(@noble/curves@1.9.7)(@welshman/lib@0.8.12)(nostr-tools@2.20.0(typescript@5.9.3)))(nostr-signer-capacitor-plugin@https://codeload.github.com/coracle-social/nostr-signer-capacitor-plugin/tar.gz/be4bb90a1a15c8eec0934f2f66ce9e82ecc72d51(@capacitor/core@8.0.1))(nostr-tools@2.20.0(typescript@5.9.3))
+      '@welshman/util': 0.8.12(@noble/curves@1.9.7)(@welshman/lib@0.8.12)(nostr-tools@2.20.0(typescript@5.9.3))
      cbor-x: 1.6.0
      hash-wasm: 4.12.0
      nostr-tools: 2.20.0(typescript@5.9.3)
@@ -7303,26 +7276,26 @@ snapshots:
    optionalDependencies:
      '@vite-pwa/assets-generator': 0.2.6

-  '@welshman/app@0.8.13(ed9ee8a79a580bcb9fa9bb6eb1a69558)':
+  '@welshman/app@0.8.12(3074ef6691f94dc03952d8dbc98013a7)':
    dependencies:
-      '@pomade/core': 0.2.3(@frostr/bifrost@1.0.7(typescript@5.9.3))(@noble/hashes@2.0.1)(@welshman/lib@0.8.13)(@welshman/net@0.8.13(@welshman/lib@0.8.13)(@welshman/util@0.8.13(@noble/curves@1.9.7)(@welshman/lib@0.8.13)(nostr-tools@2.20.0(typescript@5.9.3)))(ws@8.18.3))(@welshman/signer@0.8.13(@noble/curves@1.9.7)(@noble/hashes@2.0.1)(@welshman/lib@0.8.13)(@welshman/net@0.8.13(@welshman/lib@0.8.13)(@welshman/util@0.8.13(@noble/curves@1.9.7)(@welshman/lib@0.8.13)(nostr-tools@2.20.0(typescript@5.9.3)))(ws@8.18.3))(@welshman/util@0.8.13(@noble/curves@1.9.7)(@welshman/lib@0.8.13)(nostr-tools@2.20.0(typescript@5.9.3)))(nostr-signer-capacitor-plugin@https://codeload.github.com/coracle-social/nostr-signer-capacitor-plugin/tar.gz/be4bb90a1a15c8eec0934f2f66ce9e82ecc72d51(@capacitor/core@8.0.1))(nostr-tools@2.20.0(typescript@5.9.3)))(@welshman/util@0.8.13(@noble/curves@1.9.7)(@welshman/lib@0.8.13)(nostr-tools@2.20.0(typescript@5.9.3)))(nostr-tools@2.20.0(typescript@5.9.3))
-      '@welshman/feeds': 0.8.13(29451a19e278ea4a9cf66616f05d5557)
-      '@welshman/lib': 0.8.13
-      '@welshman/net': 0.8.13(@welshman/lib@0.8.13)(@welshman/util@0.8.13(@noble/curves@1.9.7)(@welshman/lib@0.8.13)(nostr-tools@2.20.0(typescript@5.9.3)))(ws@8.18.3)
-      '@welshman/router': 0.8.13(@welshman/lib@0.8.13)(@welshman/net@0.8.13(@welshman/lib@0.8.13)(@welshman/util@0.8.13(@noble/curves@1.9.7)(@welshman/lib@0.8.13)(nostr-tools@2.20.0(typescript@5.9.3)))(ws@8.18.3))(@welshman/util@0.8.13(@noble/curves@1.9.7)(@welshman/lib@0.8.13)(nostr-tools@2.20.0(typescript@5.9.3)))
-      '@welshman/signer': 0.8.13(@noble/curves@1.9.7)(@noble/hashes@2.0.1)(@welshman/lib@0.8.13)(@welshman/net@0.8.13(@welshman/lib@0.8.13)(@welshman/util@0.8.13(@noble/curves@1.9.7)(@welshman/lib@0.8.13)(nostr-tools@2.20.0(typescript@5.9.3)))(ws@8.18.3))(@welshman/util@0.8.13(@noble/curves@1.9.7)(@welshman/lib@0.8.13)(nostr-tools@2.20.0(typescript@5.9.3)))(nostr-signer-capacitor-plugin@https://codeload.github.com/coracle-social/nostr-signer-capacitor-plugin/tar.gz/be4bb90a1a15c8eec0934f2f66ce9e82ecc72d51(@capacitor/core@8.0.1))(nostr-tools@2.20.0(typescript@5.9.3))
-      '@welshman/store': 0.8.13(@welshman/lib@0.8.13)(@welshman/net@0.8.13(@welshman/lib@0.8.13)(@welshman/util@0.8.13(@noble/curves@1.9.7)(@welshman/lib@0.8.13)(nostr-tools@2.20.0(typescript@5.9.3)))(ws@8.18.3))(@welshman/util@0.8.13(@noble/curves@1.9.7)(@welshman/lib@0.8.13)(nostr-tools@2.20.0(typescript@5.9.3)))(svelte@5.48.0)
-      '@welshman/util': 0.8.13(@noble/curves@1.9.7)(@welshman/lib@0.8.13)(nostr-tools@2.20.0(typescript@5.9.3))
+      '@pomade/core': 0.2.2(@frostr/bifrost@1.0.7(typescript@5.9.3))(@noble/hashes@2.0.1)(@welshman/lib@0.8.12)(@welshman/net@0.8.12(@welshman/lib@0.8.12)(@welshman/util@0.8.12(@noble/curves@1.9.7)(@welshman/lib@0.8.12)(nostr-tools@2.20.0(typescript@5.9.3)))(ws@8.18.3))(@welshman/signer@0.8.12(@noble/curves@1.9.7)(@noble/hashes@2.0.1)(@welshman/lib@0.8.12)(@welshman/net@0.8.12(@welshman/lib@0.8.12)(@welshman/util@0.8.12(@noble/curves@1.9.7)(@welshman/lib@0.8.12)(nostr-tools@2.20.0(typescript@5.9.3)))(ws@8.18.3))(@welshman/util@0.8.12(@noble/curves@1.9.7)(@welshman/lib@0.8.12)(nostr-tools@2.20.0(typescript@5.9.3)))(nostr-signer-capacitor-plugin@https://codeload.github.com/coracle-social/nostr-signer-capacitor-plugin/tar.gz/be4bb90a1a15c8eec0934f2f66ce9e82ecc72d51(@capacitor/core@8.0.1))(nostr-tools@2.20.0(typescript@5.9.3)))(@welshman/util@0.8.12(@noble/curves@1.9.7)(@welshman/lib@0.8.12)(nostr-tools@2.20.0(typescript@5.9.3)))(nostr-tools@2.20.0(typescript@5.9.3))
+      '@welshman/feeds': 0.8.12(d5b74f0c83250e052e0b96f7ff5804e8)
+      '@welshman/lib': 0.8.12
+      '@welshman/net': 0.8.12(@welshman/lib@0.8.12)(@welshman/util@0.8.12(@noble/curves@1.9.7)(@welshman/lib@0.8.12)(nostr-tools@2.20.0(typescript@5.9.3)))(ws@8.18.3)
+      '@welshman/router': 0.8.12(@welshman/lib@0.8.12)(@welshman/net@0.8.12(@welshman/lib@0.8.12)(@welshman/util@0.8.12(@noble/curves@1.9.7)(@welshman/lib@0.8.12)(nostr-tools@2.20.0(typescript@5.9.3)))(ws@8.18.3))(@welshman/util@0.8.12(@noble/curves@1.9.7)(@welshman/lib@0.8.12)(nostr-tools@2.20.0(typescript@5.9.3)))
+      '@welshman/signer': 0.8.12(@noble/curves@1.9.7)(@noble/hashes@2.0.1)(@welshman/lib@0.8.12)(@welshman/net@0.8.12(@welshman/lib@0.8.12)(@welshman/util@0.8.12(@noble/curves@1.9.7)(@welshman/lib@0.8.12)(nostr-tools@2.20.0(typescript@5.9.3)))(ws@8.18.3))(@welshman/util@0.8.12(@noble/curves@1.9.7)(@welshman/lib@0.8.12)(nostr-tools@2.20.0(typescript@5.9.3)))(nostr-signer-capacitor-plugin@https://codeload.github.com/coracle-social/nostr-signer-capacitor-plugin/tar.gz/be4bb90a1a15c8eec0934f2f66ce9e82ecc72d51(@capacitor/core@8.0.1))(nostr-tools@2.20.0(typescript@5.9.3))
+      '@welshman/store': 0.8.12(@welshman/lib@0.8.12)(@welshman/net@0.8.12(@welshman/lib@0.8.12)(@welshman/util@0.8.12(@noble/curves@1.9.7)(@welshman/lib@0.8.12)(nostr-tools@2.20.0(typescript@5.9.3)))(ws@8.18.3))(@welshman/util@0.8.12(@noble/curves@1.9.7)(@welshman/lib@0.8.12)(nostr-tools@2.20.0(typescript@5.9.3)))(svelte@5.48.0)
+      '@welshman/util': 0.8.12(@noble/curves@1.9.7)(@welshman/lib@0.8.12)(nostr-tools@2.20.0(typescript@5.9.3))
      fuse.js: 7.1.0
      svelte: 5.48.0
      throttle-debounce: 5.0.2

-  '@welshman/content@0.8.13(nostr-tools@2.20.0(typescript@5.9.3))':
+  '@welshman/content@0.8.12(nostr-tools@2.20.0(typescript@5.9.3))':
    dependencies:
      '@braintree/sanitize-url': 7.1.1
      nostr-tools: 2.20.0(typescript@5.9.3)

-  '@welshman/editor@0.8.13(@welshman/lib@0.8.13)(@welshman/util@0.8.13(@noble/curves@1.9.7)(@welshman/lib@0.8.13)(nostr-tools@2.20.0(typescript@5.9.3)))(nostr-editor@1.1.1(@tiptap/core@2.27.2(@tiptap/pm@2.27.2))(@tiptap/extension-image@2.27.1(@tiptap/core@2.27.2(@tiptap/pm@2.27.2)))(@tiptap/extension-link@2.27.1(@tiptap/core@2.27.2(@tiptap/pm@2.27.2))(@tiptap/pm@2.27.2))(@tiptap/pm@2.27.2)(linkifyjs@4.3.2)(nostr-tools@2.20.0(typescript@5.9.3))(prosemirror-markdown@1.13.3)(prosemirror-model@1.25.4)(prosemirror-state@1.4.4)(prosemirror-view@1.41.5)(tiptap-markdown@0.8.10(@tiptap/core@2.27.2(@tiptap/pm@2.27.2))))(nostr-tools@2.20.0(typescript@5.9.3))':
+  '@welshman/editor@0.8.12(@welshman/lib@0.8.12)(@welshman/util@0.8.12(@noble/curves@1.9.7)(@welshman/lib@0.8.12)(nostr-tools@2.20.0(typescript@5.9.3)))(nostr-editor@1.1.1(@tiptap/core@2.27.2(@tiptap/pm@2.27.2))(@tiptap/extension-image@2.27.1(@tiptap/core@2.27.2(@tiptap/pm@2.27.2)))(@tiptap/extension-link@2.27.1(@tiptap/core@2.27.2(@tiptap/pm@2.27.2))(@tiptap/pm@2.27.2))(@tiptap/pm@2.27.2)(linkifyjs@4.3.2)(nostr-tools@2.20.0(typescript@5.9.3))(prosemirror-markdown@1.13.3)(prosemirror-model@1.25.4)(prosemirror-state@1.4.4)(prosemirror-view@1.41.5)(tiptap-markdown@0.8.10(@tiptap/core@2.27.2(@tiptap/pm@2.27.2))))(nostr-tools@2.20.0(typescript@5.9.3))':
    dependencies:
      '@tiptap/core': 2.27.2(@tiptap/pm@2.27.2)
      '@tiptap/extension-code': 2.27.2(@tiptap/core@2.27.2(@tiptap/pm@2.27.2))
@@ -7337,64 +7310,64 @@ snapshots:
      '@tiptap/extension-text': 2.27.2(@tiptap/core@2.27.2(@tiptap/pm@2.27.2))
      '@tiptap/pm': 2.27.2
      '@tiptap/suggestion': 2.27.2(@tiptap/core@2.27.2(@tiptap/pm@2.27.2))(@tiptap/pm@2.27.2)
-      '@welshman/lib': 0.8.13
-      '@welshman/util': 0.8.13(@noble/curves@1.9.7)(@welshman/lib@0.8.13)(nostr-tools@2.20.0(typescript@5.9.3))
+      '@welshman/lib': 0.8.12
+      '@welshman/util': 0.8.12(@noble/curves@1.9.7)(@welshman/lib@0.8.12)(nostr-tools@2.20.0(typescript@5.9.3))
      nostr-editor: 1.1.1(@tiptap/core@2.27.2(@tiptap/pm@2.27.2))(@tiptap/extension-image@2.27.1(@tiptap/core@2.27.2(@tiptap/pm@2.27.2)))(@tiptap/extension-link@2.27.1(@tiptap/core@2.27.2(@tiptap/pm@2.27.2))(@tiptap/pm@2.27.2))(@tiptap/pm@2.27.2)(linkifyjs@4.3.2)(nostr-tools@2.20.0(typescript@5.9.3))(prosemirror-markdown@1.13.3)(prosemirror-model@1.25.4)(prosemirror-state@1.4.4)(prosemirror-view@1.41.5)(tiptap-markdown@0.8.10(@tiptap/core@2.27.2(@tiptap/pm@2.27.2)))
      nostr-tools: 2.20.0(typescript@5.9.3)
      tippy.js: 6.3.7

-  '@welshman/feeds@0.8.13(29451a19e278ea4a9cf66616f05d5557)':
+  '@welshman/feeds@0.8.12(d5b74f0c83250e052e0b96f7ff5804e8)':
    dependencies:
-      '@welshman/lib': 0.8.13
-      '@welshman/net': 0.8.13(@welshman/lib@0.8.13)(@welshman/util@0.8.13(@noble/curves@1.9.7)(@welshman/lib@0.8.13)(nostr-tools@2.20.0(typescript@5.9.3)))(ws@8.18.3)
-      '@welshman/router': 0.8.13(@welshman/lib@0.8.13)(@welshman/net@0.8.13(@welshman/lib@0.8.13)(@welshman/util@0.8.13(@noble/curves@1.9.7)(@welshman/lib@0.8.13)(nostr-tools@2.20.0(typescript@5.9.3)))(ws@8.18.3))(@welshman/util@0.8.13(@noble/curves@1.9.7)(@welshman/lib@0.8.13)(nostr-tools@2.20.0(typescript@5.9.3)))
-      '@welshman/signer': 0.8.13(@noble/curves@1.9.7)(@noble/hashes@2.0.1)(@welshman/lib@0.8.13)(@welshman/net@0.8.13(@welshman/lib@0.8.13)(@welshman/util@0.8.13(@noble/curves@1.9.7)(@welshman/lib@0.8.13)(nostr-tools@2.20.0(typescript@5.9.3)))(ws@8.18.3))(@welshman/util@0.8.13(@noble/curves@1.9.7)(@welshman/lib@0.8.13)(nostr-tools@2.20.0(typescript@5.9.3)))(nostr-signer-capacitor-plugin@https://codeload.github.com/coracle-social/nostr-signer-capacitor-plugin/tar.gz/be4bb90a1a15c8eec0934f2f66ce9e82ecc72d51(@capacitor/core@8.0.1))(nostr-tools@2.20.0(typescript@5.9.3))
-      '@welshman/util': 0.8.13(@noble/curves@1.9.7)(@welshman/lib@0.8.13)(nostr-tools@2.20.0(typescript@5.9.3))
+      '@welshman/lib': 0.8.12
+      '@welshman/net': 0.8.12(@welshman/lib@0.8.12)(@welshman/util@0.8.12(@noble/curves@1.9.7)(@welshman/lib@0.8.12)(nostr-tools@2.20.0(typescript@5.9.3)))(ws@8.18.3)
+      '@welshman/router': 0.8.12(@welshman/lib@0.8.12)(@welshman/net@0.8.12(@welshman/lib@0.8.12)(@welshman/util@0.8.12(@noble/curves@1.9.7)(@welshman/lib@0.8.12)(nostr-tools@2.20.0(typescript@5.9.3)))(ws@8.18.3))(@welshman/util@0.8.12(@noble/curves@1.9.7)(@welshman/lib@0.8.12)(nostr-tools@2.20.0(typescript@5.9.3)))
+      '@welshman/signer': 0.8.12(@noble/curves@1.9.7)(@noble/hashes@2.0.1)(@welshman/lib@0.8.12)(@welshman/net@0.8.12(@welshman/lib@0.8.12)(@welshman/util@0.8.12(@noble/curves@1.9.7)(@welshman/lib@0.8.12)(nostr-tools@2.20.0(typescript@5.9.3)))(ws@8.18.3))(@welshman/util@0.8.12(@noble/curves@1.9.7)(@welshman/lib@0.8.12)(nostr-tools@2.20.0(typescript@5.9.3)))(nostr-signer-capacitor-plugin@https://codeload.github.com/coracle-social/nostr-signer-capacitor-plugin/tar.gz/be4bb90a1a15c8eec0934f2f66ce9e82ecc72d51(@capacitor/core@8.0.1))(nostr-tools@2.20.0(typescript@5.9.3))
+      '@welshman/util': 0.8.12(@noble/curves@1.9.7)(@welshman/lib@0.8.12)(nostr-tools@2.20.0(typescript@5.9.3))
      trava: 1.2.1

-  '@welshman/lib@0.8.13':
+  '@welshman/lib@0.8.12':
    dependencies:
      '@scure/base': 1.2.6
      '@types/events': 3.0.3
      events: 3.3.0

-  '@welshman/net@0.8.13(@welshman/lib@0.8.13)(@welshman/util@0.8.13(@noble/curves@1.9.7)(@welshman/lib@0.8.13)(nostr-tools@2.20.0(typescript@5.9.3)))(ws@8.18.3)':
+  '@welshman/net@0.8.12(@welshman/lib@0.8.12)(@welshman/util@0.8.12(@noble/curves@1.9.7)(@welshman/lib@0.8.12)(nostr-tools@2.20.0(typescript@5.9.3)))(ws@8.18.3)':
    dependencies:
-      '@welshman/lib': 0.8.13
-      '@welshman/util': 0.8.13(@noble/curves@1.9.7)(@welshman/lib@0.8.13)(nostr-tools@2.20.0(typescript@5.9.3))
+      '@welshman/lib': 0.8.12
+      '@welshman/util': 0.8.12(@noble/curves@1.9.7)(@welshman/lib@0.8.12)(nostr-tools@2.20.0(typescript@5.9.3))
      events: 3.3.0
      isomorphic-ws: 5.0.0(ws@8.18.3)
    transitivePeerDependencies:
      - ws

-  '@welshman/router@0.8.13(@welshman/lib@0.8.13)(@welshman/net@0.8.13(@welshman/lib@0.8.13)(@welshman/util@0.8.13(@noble/curves@1.9.7)(@welshman/lib@0.8.13)(nostr-tools@2.20.0(typescript@5.9.3)))(ws@8.18.3))(@welshman/util@0.8.13(@noble/curves@1.9.7)(@welshman/lib@0.8.13)(nostr-tools@2.20.0(typescript@5.9.3)))':
+  '@welshman/router@0.8.12(@welshman/lib@0.8.12)(@welshman/net@0.8.12(@welshman/lib@0.8.12)(@welshman/util@0.8.12(@noble/curves@1.9.7)(@welshman/lib@0.8.12)(nostr-tools@2.20.0(typescript@5.9.3)))(ws@8.18.3))(@welshman/util@0.8.12(@noble/curves@1.9.7)(@welshman/lib@0.8.12)(nostr-tools@2.20.0(typescript@5.9.3)))':
    dependencies:
-      '@welshman/lib': 0.8.13
-      '@welshman/net': 0.8.13(@welshman/lib@0.8.13)(@welshman/util@0.8.13(@noble/curves@1.9.7)(@welshman/lib@0.8.13)(nostr-tools@2.20.0(typescript@5.9.3)))(ws@8.18.3)
-      '@welshman/util': 0.8.13(@noble/curves@1.9.7)(@welshman/lib@0.8.13)(nostr-tools@2.20.0(typescript@5.9.3))
+      '@welshman/lib': 0.8.12
+      '@welshman/net': 0.8.12(@welshman/lib@0.8.12)(@welshman/util@0.8.12(@noble/curves@1.9.7)(@welshman/lib@0.8.12)(nostr-tools@2.20.0(typescript@5.9.3)))(ws@8.18.3)
+      '@welshman/util': 0.8.12(@noble/curves@1.9.7)(@welshman/lib@0.8.12)(nostr-tools@2.20.0(typescript@5.9.3))

-  '@welshman/signer@0.8.13(@noble/curves@1.9.7)(@noble/hashes@2.0.1)(@welshman/lib@0.8.13)(@welshman/net@0.8.13(@welshman/lib@0.8.13)(@welshman/util@0.8.13(@noble/curves@1.9.7)(@welshman/lib@0.8.13)(nostr-tools@2.20.0(typescript@5.9.3)))(ws@8.18.3))(@welshman/util@0.8.13(@noble/curves@1.9.7)(@welshman/lib@0.8.13)(nostr-tools@2.20.0(typescript@5.9.3)))(nostr-signer-capacitor-plugin@https://codeload.github.com/coracle-social/nostr-signer-capacitor-plugin/tar.gz/be4bb90a1a15c8eec0934f2f66ce9e82ecc72d51(@capacitor/core@8.0.1))(nostr-tools@2.20.0(typescript@5.9.3))':
+  '@welshman/signer@0.8.12(@noble/curves@1.9.7)(@noble/hashes@2.0.1)(@welshman/lib@0.8.12)(@welshman/net@0.8.12(@welshman/lib@0.8.12)(@welshman/util@0.8.12(@noble/curves@1.9.7)(@welshman/lib@0.8.12)(nostr-tools@2.20.0(typescript@5.9.3)))(ws@8.18.3))(@welshman/util@0.8.12(@noble/curves@1.9.7)(@welshman/lib@0.8.12)(nostr-tools@2.20.0(typescript@5.9.3)))(nostr-signer-capacitor-plugin@https://codeload.github.com/coracle-social/nostr-signer-capacitor-plugin/tar.gz/be4bb90a1a15c8eec0934f2f66ce9e82ecc72d51(@capacitor/core@8.0.1))(nostr-tools@2.20.0(typescript@5.9.3))':
    dependencies:
      '@noble/curves': 1.9.7
      '@noble/hashes': 2.0.1
-      '@welshman/lib': 0.8.13
-      '@welshman/net': 0.8.13(@welshman/lib@0.8.13)(@welshman/util@0.8.13(@noble/curves@1.9.7)(@welshman/lib@0.8.13)(nostr-tools@2.20.0(typescript@5.9.3)))(ws@8.18.3)
-      '@welshman/util': 0.8.13(@noble/curves@1.9.7)(@welshman/lib@0.8.13)(nostr-tools@2.20.0(typescript@5.9.3))
+      '@welshman/lib': 0.8.12
+      '@welshman/net': 0.8.12(@welshman/lib@0.8.12)(@welshman/util@0.8.12(@noble/curves@1.9.7)(@welshman/lib@0.8.12)(nostr-tools@2.20.0(typescript@5.9.3)))(ws@8.18.3)
+      '@welshman/util': 0.8.12(@noble/curves@1.9.7)(@welshman/lib@0.8.12)(nostr-tools@2.20.0(typescript@5.9.3))
      nostr-signer-capacitor-plugin: https://codeload.github.com/coracle-social/nostr-signer-capacitor-plugin/tar.gz/be4bb90a1a15c8eec0934f2f66ce9e82ecc72d51(@capacitor/core@8.0.1)
      nostr-tools: 2.20.0(typescript@5.9.3)

-  '@welshman/store@0.8.13(@welshman/lib@0.8.13)(@welshman/net@0.8.13(@welshman/lib@0.8.13)(@welshman/util@0.8.13(@noble/curves@1.9.7)(@welshman/lib@0.8.13)(nostr-tools@2.20.0(typescript@5.9.3)))(ws@8.18.3))(@welshman/util@0.8.13(@noble/curves@1.9.7)(@welshman/lib@0.8.13)(nostr-tools@2.20.0(typescript@5.9.3)))(svelte@5.48.0)':
+  '@welshman/store@0.8.12(@welshman/lib@0.8.12)(@welshman/net@0.8.12(@welshman/lib@0.8.12)(@welshman/util@0.8.12(@noble/curves@1.9.7)(@welshman/lib@0.8.12)(nostr-tools@2.20.0(typescript@5.9.3)))(ws@8.18.3))(@welshman/util@0.8.12(@noble/curves@1.9.7)(@welshman/lib@0.8.12)(nostr-tools@2.20.0(typescript@5.9.3)))(svelte@5.48.0)':
    dependencies:
-      '@welshman/lib': 0.8.13
-      '@welshman/net': 0.8.13(@welshman/lib@0.8.13)(@welshman/util@0.8.13(@noble/curves@1.9.7)(@welshman/lib@0.8.13)(nostr-tools@2.20.0(typescript@5.9.3)))(ws@8.18.3)
-      '@welshman/util': 0.8.13(@noble/curves@1.9.7)(@welshman/lib@0.8.13)(nostr-tools@2.20.0(typescript@5.9.3))
+      '@welshman/lib': 0.8.12
+      '@welshman/net': 0.8.12(@welshman/lib@0.8.12)(@welshman/util@0.8.12(@noble/curves@1.9.7)(@welshman/lib@0.8.12)(nostr-tools@2.20.0(typescript@5.9.3)))(ws@8.18.3)
+      '@welshman/util': 0.8.12(@noble/curves@1.9.7)(@welshman/lib@0.8.12)(nostr-tools@2.20.0(typescript@5.9.3))
      svelte: 5.48.0

-  '@welshman/util@0.8.13(@noble/curves@1.9.7)(@welshman/lib@0.8.13)(nostr-tools@2.20.0(typescript@5.9.3))':
+  '@welshman/util@0.8.12(@noble/curves@1.9.7)(@welshman/lib@0.8.12)(nostr-tools@2.20.0(typescript@5.9.3))':
    dependencies:
      '@noble/curves': 1.9.7
      '@types/ws': 8.18.1
-      '@welshman/lib': 0.8.13
+      '@welshman/lib': 0.8.12
      js-base64: 3.7.8
      nostr-tools: 2.20.0(typescript@5.9.3)
      nostr-wasm: 0.1.0
@@ -2,16 +2,6 @@

@config "../tailwind.config.js";

-/* 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));
-}
-
@utility pt-sai {
  padding-top: var(--sait);
 }
@@ -327,7 +317,7 @@

 .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;
+  @apply input rounded-box h-auto min-h-32 p-[.65rem] pb-6;
 }

 .input-editor .tiptap {
@@ -425,7 +415,7 @@ body.keyboard-open .hide-on-keyboard {
 /* chat view */

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

 .chat__compose .chat__compose-inner {
@@ -1,57 +0,0 @@
-import {Room as LiveKitRoom} from "livekit-client"
-import {derived, writable} from "svelte/store"
-import {type Room} from "@app/core/state"
-
-export type VoiceSession = {
-  url: string
-  h: string
-  room: LiveKitRoom
-  muted: boolean
-  cameraOn: boolean
-  screenShareOn: boolean
-}
-
-export type Pubkey = string
-
-export type VoiceParticipant = {pubkey?: Pubkey; identity: string}
-
-export enum VoiceState {
-  Joining = "joining",
-  Connected = "connected",
-  Disconnected = "disconnected",
-}
-
-export const currentVoiceSession = writable<VoiceSession | undefined>(undefined)
-
-export const voiceState = writable<VoiceState>(VoiceState.Disconnected)
-
-export const currentVoiceRoom = writable<Room | undefined>(undefined)
-
-export const participantPubkeyMap = writable<Map<string, Pubkey>>(new Map())
-
-export const pubkeyFromLiveKitIdentity = (identity: string): string | undefined =>
-  /^[a-f0-9]{64}$/.test(identity.slice(0, 64)) ? identity.slice(0, 64) : undefined
-
-export const participantFromLiveKitIdentity = (identity: string): VoiceParticipant => {
-  const pk = pubkeyFromLiveKitIdentity(identity)
-  return pk ? {pubkey: pk, identity} : {identity}
-}
-
-export const participantKey = (p: VoiceParticipant) => p.pubkey ?? p.identity
-
-export const speakingParticipants = writable<VoiceParticipant[]>([])
-
-export const isParticipantSpeaking = derived(
-  speakingParticipants,
-  $participants => (p: VoiceParticipant) =>
-    $participants.some(sp => participantKey(sp) === participantKey(p)),
-)
-
-export const isLocalSpeaking = derived(
-  [currentVoiceSession, speakingParticipants],
-  ([$session, $speaking]) => {
-    if (!$session?.room) return false
-    const local = participantFromLiveKitIdentity($session.room.localParticipant.identity)
-    return $speaking.some(sp => participantKey(sp) === participantKey(local))
-  },
-)
@@ -1,99 +0,0 @@
-import {Track} from "livekit-client"
-import {MediaQuery} from "svelte/reactivity"
-import {derived, get, writable} from "svelte/store"
-import {currentVoiceSession, VoiceState, type VoiceSession, voiceState} from "@app/call/stores"
-import {pushToast} from "@app/util/toast"
-
-export enum VideoCallLayout {
-  Chat = "chat",
-  Video = "video",
-  Split = "split",
-}
-
-export const isDesktopLayout = new MediaQuery("min-width: 768px", false)
-
-export enum ViewportSize {
-  Desktop = "desktop",
-  Mobile = "mobile",
-}
-
-export const videoCallViewportSync = {
-  previousLayout: undefined as ViewportSize | undefined,
-}
-
-export const videoCallLayout = writable<VideoCallLayout>(VideoCallLayout.Split)
-
-export const resetVideoCallLayout = () => {
-  videoCallViewportSync.previousLayout = undefined
-  videoCallLayout.set(VideoCallLayout.Chat)
-}
-
-export const videoPrimaryTileKey = writable<string | undefined>(undefined)
-
-export const toggleVideoPrimaryTile = (key: string) => {
-  videoPrimaryTileKey.update(k => (k === key ? undefined : key))
-}
-
-const VISUAL_SOURCES = [Track.Source.Camera, Track.Source.ScreenShare] as const
-
-const countLiveVisualFeeds = (session: VoiceSession): number => {
-  const room = session.room
-  let n = 0
-  const lp = room.localParticipant
-  if (session.cameraOn) {
-    const pub = lp.getTrackPublication(Track.Source.Camera)
-    if (pub?.track) n += 1
-  }
-  if (session.screenShareOn) {
-    const pub = lp.getTrackPublication(Track.Source.ScreenShare)
-    if (pub?.track) n += 1
-  }
-  for (const rp of room.remoteParticipants.values()) {
-    for (const source of VISUAL_SOURCES) {
-      const pub = rp.getTrackPublication(source)
-      if (pub?.isSubscribed && pub.track) n += 1
-    }
-  }
-  return n
-}
-
-export const triggerVideoFeedCount = () => {
-  currentVoiceSession.update(s => (s ? {...s} : s))
-}
-
-export const videoTileCount = derived([currentVoiceSession, voiceState], ([$session, $state]) => {
-  if ($state !== VoiceState.Connected || !$session) return 0
-  return countLiveVisualFeeds($session)
-})
-
-export const toggleCamera = async () => {
-  const session = get(currentVoiceSession)
-  if (!session) return
-
-  const cameraOn = !session.cameraOn
-  try {
-    await session.room.localParticipant.setCameraEnabled(cameraOn)
-    currentVoiceSession.set({...session, cameraOn})
-  } catch {
-    pushToast({
-      theme: "error",
-      message: cameraOn ? "Could not access camera" : "Could not turn off camera",
-    })
-  }
-}
-
-export const toggleScreenShare = async () => {
-  const session = get(currentVoiceSession)
-  if (!session) return
-
-  const screenShareOn = !session.screenShareOn
-  try {
-    await session.room.localParticipant.setScreenShareEnabled(screenShareOn)
-    currentVoiceSession.set({...session, screenShareOn})
-  } catch {
-    pushToast({
-      theme: "error",
-      message: screenShareOn ? "Could not start screen sharing" : "Could not stop screen sharing",
-    })
-  }
-}
@@ -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 ?? "")
@@ -179,11 +158,7 @@
          <div class="input-editor 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>
@@ -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">
@@ -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
    }
@@ -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

@@ -57,9 +57,7 @@
 </script>

 {#if isRoomOrRelay}
-  <div>
-    <ContentLinkUrl {url} class="link-content whitespace-nowrap" />
-  </div>
+  <ContentLinkUrl {url} class="bg-alt my-2 block p-4 leading-normal whitespace-nowrap" />
 {:else}
  <Link {external} {href} class="my-2 block">
    <div class="overflow-hidden rounded-box">
@@ -37,6 +37,21 @@
    return normalizeRelayUrl(url)
  })

+  const label = call(() => {
+    if (roomReference) {
+      const spaceName = displayRelayUrl(roomReference.url)
+      const roomName = displayRoom(roomReference.url, roomReference.h)
+
+      return `~${spaceName} / ${roomName}`
+    }
+
+    if (relayReference) {
+      return `~${displayRelayUrl(relayReference)}`
+    }
+
+    return displayUrl(url)
+  })
+
  const [href, external] = call(() => {
    if (roomReference) return [makeRoomPath(roomReference.url, roomReference.h), false]
    if (relayReference) return [makeSpacePath(relayReference), false]
@@ -47,13 +62,6 @@
 </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}
+  <Icon icon={LinkRound} size={3} class="inline-block" />
+  <span class="ml-2">{label}</span>
 </Link>
@@ -49,7 +49,7 @@
        <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}
@@ -3,7 +3,7 @@
  import type {Snippet} from "svelte"
  import {goto} from "$app/navigation"
  import type {TrustedEvent} from "@welshman/util"
-  import {COMMENT, ManagementMethod, getTagValue} from "@welshman/util"
+  import {COMMENT, ManagementMethod} from "@welshman/util"
  import {pubkey, repository, relaysByUrl, manageRelay} from "@welshman/app"
  import ShareCircle from "@assets/icons/share-circle.svg?dataurl"
  import Code2 from "@assets/icons/code-2.svg?dataurl"
@@ -17,8 +17,7 @@
  import Report from "@app/components/Report.svelte"
  import EventShare from "@app/components/EventShare.svelte"
  import EventDeleteConfirm from "@app/components/EventDeleteConfirm.svelte"
-  import {deriveHasPermission, ROOM_PERMISSION_DELETE_EVENT} from "@app/core/roles"
-  import {hasNip29} from "@app/core/state"
+  import {hasNip29, deriveUserIsSpaceAdmin} from "@app/core/state"
  import {pushModal} from "@app/util/modal"
  import {pushToast} from "@app/util/toast"
  import {makeSpaceChatPath} from "@app/util/routes"
@@ -34,8 +33,7 @@
  const {url, noun, event, onClick, customActions}: Props = $props()

  const isRoot = event.kind !== COMMENT
-  const h = getTagValue("h", event.tags)
-  const canDelete = deriveHasPermission(url, h, ROOM_PERMISSION_DELETE_EVENT)
+  const userIsAdmin = deriveUserIsSpaceAdmin(url)

  const report = () => pushModal(Report, {url, event})

@@ -109,7 +107,7 @@
        Report Content
      </Button>
    </li>
-    {#if $canDelete}
+    {#if $userIsAdmin}
      <li>
        <Button class="text-error" onclick={showAdminDelete}>
          <Icon size={4} icon={TrashBin2} />
@@ -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,7 +84,7 @@
  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">
@@ -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)
@@ -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}
@@ -192,16 +169,16 @@
          {/snippet}
          {#snippet input()}
            <div class="flex grow justify-end">
-              <label class="input input-bordered flex w-auto items-center gap-2">
+              <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>
@@ -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} />
@@ -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} />
@@ -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>
@@ -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)
@@ -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,5 @@
 <script lang="ts">
  import {onMount} from "svelte"
-  import {readable} from "svelte/store"
  import {removeUndefined} from "@welshman/lib"
  import {ManagementMethod} from "@welshman/util"
  import {
@@ -29,14 +28,7 @@
  import ProfileInfo from "@app/components/ProfileInfo.svelte"
  import EventInfo from "@app/components/EventInfo.svelte"
  import ProfileBadges from "@app/components/ProfileBadges.svelte"
-  import RoleBadge from "@app/components/RoleBadge.svelte"
-  import {pubkeyLink, deriveSpaceBannedPubkeyItems} from "@app/core/state"
-  import {
-    deriveUserHasSpacePermission,
-    deriveSpaceMemberRoles,
-    ROOM_PERMISSION_ADD_MEMBER,
-    ROOM_PERMISSION_BAN_USER,
-  } from "@app/core/roles"
+  import {pubkeyLink, deriveUserIsSpaceAdmin, deriveSpaceBannedPubkeyItems} from "@app/core/state"
  import {addSpaceMembers} from "@app/core/commands"
  import {pushModal} from "@app/util/modal"
  import {pushToast} from "@app/util/toast"
@@ -51,16 +43,10 @@

  const profile = deriveProfile(pubkey, removeUndefined([url]))

-  const canBan = url ? deriveUserHasSpacePermission(url, ROOM_PERMISSION_BAN_USER) : readable(false)
-
-  const canRestore = url
-    ? deriveUserHasSpacePermission(url, ROOM_PERMISSION_ADD_MEMBER)
-    : readable(false)
+  const userIsAdmin = deriveUserIsSpaceAdmin(url)

  const bannedPubkeys = url ? deriveSpaceBannedPubkeyItems(url) : undefined

-  const assignedRoles = url ? deriveSpaceMemberRoles(url, pubkey) : readable([])
-
  const isBanned = $derived($bannedPubkeys?.some(item => item.pubkey === pubkey) ?? false)

  const back = () => history.back()
@@ -119,7 +105,7 @@
    <div class="flex flex-col gap-4">
      <div class="flex justify-between">
        <Profile showPubkey avatarSize={14} {pubkey} {url} />
-        {#if $profile || $canBan || $canRestore}
+        {#if $profile || $userIsAdmin}
          <div class="relative">
            <Button class="btn btn-circle btn-ghost btn-sm" onclick={() => toggleMenu(pubkey)}>
              <Icon icon={MenuDots} />
@@ -137,22 +123,22 @@
                      </Button>
                    </li>
                  {/if}
-                  {#if isBanned}
-                    {#if $canRestore}
+                  {#if $userIsAdmin}
+                    {#if isBanned}
                      <li>
                        <Button onclick={restoreMember}>
                          <Icon icon={Restart} />
                          Restore User
                        </Button>
                      </li>
+                    {:else}
+                      <li>
+                        <Button class="text-error" onclick={banMember}>
+                          <Icon icon={MinusCircle} />
+                          Ban User
+                        </Button>
+                      </li>
                    {/if}
-                  {:else if $canBan}
-                    <li>
-                      <Button class="text-error" onclick={banMember}>
-                        <Icon icon={MinusCircle} />
-                        Ban User
-                      </Button>
-                    </li>
                  {/if}
                </ul>
              </Popover>
@@ -161,16 +147,6 @@
        {/if}
      </div>
      <ProfileInfo {pubkey} {url} />
-      {#if $assignedRoles.length > 0}
-        <div class="card2 card2-sm bg-alt col-3">
-          <h3 class="text-lg font-semibold">Roles</h3>
-          <div class="flex flex-wrap gap-2">
-            {#each $assignedRoles as role (role.name)}
-              <RoleBadge {role} class="badge-md" />
-            {/each}
-          </div>
-        </div>
-      {/if}
      <ProfileBadges {pubkey} {url} />
    </div>
  </ModalBody>
@@ -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()}
@@ -23,8 +23,7 @@
  import Icon from "@lib/components/Icon.svelte"
  import Reaction from "@app/components/Reaction.svelte"
  import ReportDetails from "@app/components/ReportDetails.svelte"
-  import {deriveUserIsSpaceAdmin} from "@app/core/roles"
-  import {REACTION_KINDS} from "@app/core/state"
+  import {REACTION_KINDS, deriveUserIsSpaceAdmin} from "@app/core/state"
  import {pushModal} from "@app/util/modal"

  interface Props {
@@ -34,7 +33,6 @@
    url?: string
    reactionClass?: string
    noTooltip?: boolean
-    innerEvent?: TrustedEvent
    children?: Snippet
  }

@@ -45,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),
    }),
  )

@@ -12,7 +12,7 @@
  import Popover from "@lib/components/Popover.svelte"
  import Button from "@lib/components/Button.svelte"
  import Confirm from "@lib/components/Confirm.svelte"
-  import {deriveUserIsSpaceAdmin} from "@app/core/roles"
+  import {deriveUserIsSpaceAdmin} from "@app/core/state"
  import {publishDelete, canEnforceNip70} from "@app/core/commands"
  import {pushToast} from "@app/util/toast"
  import {pushModal} from "@app/util/modal"
@@ -1,24 +0,0 @@
-<script lang="ts">
-  import cx from "classnames"
-  import type {RoleDefinition} from "@app/core/roles"
-  import {roleColorToCSS} from "@app/core/roles"
-
-  type Props = {
-    role: RoleDefinition
-    class?: string
-  }
-
-  const {role, ...props}: Props = $props()
-
-  const style = $derived(
-    role.color === undefined
-      ? ""
-      : `color: ${roleColorToCSS(role.color)}; border-color: ${roleColorToCSS(role.color)};`,
-  )
-
-  const className = $derived(cx("badge badge-outline badge-sm", props.class))
-</script>
-
-<span class={className} {style}>
-  {role.label || role.name}
-</span>
@@ -27,22 +27,14 @@
  import ModalBody from "@lib/components/ModalBody.svelte"
  import ModalFooter from "@lib/components/ModalFooter.svelte"
  import ProfileCircles from "@app/components/ProfileCircles.svelte"
-  import RoleBadge from "@app/components/RoleBadge.svelte"
  import RoomMembers from "@app/components/RoomMembers.svelte"
  import RoomEdit from "@app/components/RoomEdit.svelte"
  import RoomName from "@app/components/RoomName.svelte"
  import RoomImage from "@app/components/RoomImage.svelte"
-  import {
-    deriveRoomMembers,
-    deriveRoomRoleDefinitions,
-    deriveUserIsRoomAdmin,
-    deriveHasPermission,
-    getRolePermissionsLabel,
-    getRoleAccessLabel,
-    ROOM_PERMISSION_EDIT_META,
-  } from "@app/core/roles"
  import {
    deriveRoom,
+    deriveRoomMembers,
+    deriveUserIsRoomAdmin,
    deriveUserRoomMembershipStatus,
    deriveUserRooms,
    deriveShouldNotify,
@@ -66,9 +58,7 @@

  const room = deriveRoom(url, h)
  const members = deriveRoomMembers(url, h)
-  const roleDefinitions = deriveRoomRoleDefinitions(url, h)
  const userIsAdmin = deriveUserIsRoomAdmin(url, h)
-  const canEditMetadata = deriveHasPermission(url, h, ROOM_PERMISSION_EDIT_META)
  const membershipStatus = deriveUserRoomMembershipStatus(url, h)
  const userRooms = deriveUserRooms(url)

@@ -162,7 +152,7 @@
            <ul
              transition:fly
              class="bg-alt menu absolute right-0 z-popover w-48 gap-1 rounded-box p-2 shadow-md">
-              {#if $canEditMetadata}
+              {#if $userIsAdmin}
                <li>
                  <Button onclick={startEdit}>
                    <Icon icon={Pen} />
@@ -257,34 +247,11 @@
      <div class="card2 card2-sm bg-alt flex items-center justify-between gap-4">
        <div class="flex items-center gap-4">
          <span>Members:</span>
-          <ProfileCircles pubkeys={$members.map(member => member.pubkey)} />
+          <ProfileCircles pubkeys={$members} />
        </div>
        <Button class="btn btn-neutral btn-sm" onclick={showMembers}>View All</Button>
      </div>
    {/if}
-    {#if $userIsAdmin && $roleDefinitions.length > 0}
-      <div class="card2 card2-sm bg-alt col-4">
-        <strong class="text-lg">Role Definitions</strong>
-        <div class="flex flex-col gap-2">
-          {#each $roleDefinitions as role (role.name)}
-            <div class="rounded-box bg-base-300 p-3 flex flex-col gap-2">
-              <div class="flex items-center gap-2">
-                <RoleBadge {role} class="badge-md" />
-                {#if role.order !== undefined}
-                  <span class="text-xs opacity-70">Order {role.order}</span>
-                {/if}
-              </div>
-              {#if role.permissions.length > 0}
-                <p class="text-xs opacity-75">Permissions: {getRolePermissionsLabel(role)}</p>
-              {/if}
-              {#if role.access.size > 0}
-                <p class="text-xs opacity-75">Access: {getRoleAccessLabel(role)}</p>
-              {/if}
-            </div>
-          {/each}
-        </div>
-      </div>
-    {/if}
    <div class="card2 card2-sm bg-alt col-4">
      <strong class="text-lg">Room Settings</strong>
      <div class="flex items-center justify-between">
@@ -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},
@@ -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>
@@ -13,7 +13,7 @@
  import EventDeleteConfirm from "@app/components/EventDeleteConfirm.svelte"
  import {pushModal} from "@app/util/modal"
  import {pushToast} from "@app/util/toast"
-  import {deriveUserIsSpaceAdmin} from "@app/core/roles"
+  import {deriveUserIsSpaceAdmin} from "@app/core/state"

  type Props = {
    url: string
@@ -16,17 +16,9 @@
  import ModalTitle from "@lib/components/ModalTitle.svelte"
  import ModalSubtitle from "@lib/components/ModalSubtitle.svelte"
  import Profile from "@app/components/Profile.svelte"
-  import RoleBadge from "@app/components/RoleBadge.svelte"
  import RoomName from "@app/components/RoomName.svelte"
  import RoomMembersAdd from "@app/components/RoomMembersAdd.svelte"
-  import {
-    deriveRoomMembers,
-    deriveGroupedRoomMembers,
-    deriveHasPermission,
-    ROOM_PERMISSION_ADD_MEMBER,
-    ROOM_PERMISSION_REMOVE_MEMBER,
-  } from "@app/core/roles"
-  import {deriveRoom} from "@app/core/state"
+  import {deriveRoom, deriveRoomMembers, deriveUserIsRoomAdmin} from "@app/core/state"
  import {pushModal} from "@app/util/modal"
  import {pushToast} from "@app/util/toast"

@@ -39,9 +31,7 @@

  const room = deriveRoom(url, h)
  const members = deriveRoomMembers(url, h)
-  const memberGroups = deriveGroupedRoomMembers(url, h)
-  const canAddMembers = deriveHasPermission(url, h, ROOM_PERMISSION_ADD_MEMBER)
-  const canRemoveMembers = deriveHasPermission(url, h, ROOM_PERMISSION_REMOVE_MEMBER)
+  const userIsAdmin = deriveUserIsRoomAdmin(url, h)

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

@@ -83,60 +73,34 @@
      </ModalSubtitle>
    </ModalHeader>
    <div class="flex flex-col gap-2">
-      {#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 $memberGroups as group (group.key)}
-          <div class="pt-2 pb-1">
-            {#if group.role}
-              <RoleBadge role={group.role} class="badge-md" />
-            {:else}
-              <span class="text-sm font-semibold opacity-75">Members</span>
-            {/if}
-          </div>
-          {#each group.members as member (member.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={member.pubkey} {url} />
-                  {#if member.roles.length > 0}
-                    <div class="mt-1 flex flex-wrap gap-1">
-                      {#each member.roles as role (role.name)}
-                        <RoleBadge {role} />
-                      {/each}
-                    </div>
-                  {/if}
-                </div>
-                {#if $canRemoveMembers}
-                  <div class="relative">
-                    <Button
-                      class="btn btn-circle btn-ghost btn-sm"
-                      onclick={() => toggleMenu(member.pubkey)}>
-                      <Icon icon={MenuDots} />
-                    </Button>
-                    {#if menuPubkey === member.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(member.pubkey)}>
-                              <Icon icon={MinusCircle} />
-                              Remove Member
-                            </Button>
-                          </li>
-                        </ul>
-                      </Popover>
-                    {/if}
-                  </div>
-                {/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>
-          {/each}
-        {/each}
-      {/if}
+            <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>
+        </div>
+      {/each}
    </div>
  </ModalBody>
  <ModalFooter>
@@ -144,7 +108,7 @@
      <Icon icon={AltArrowLeft} />
      Go back
    </Button>
-    {#if $canAddMembers}
+    {#if $userIsAdmin}
      <Button class="btn btn-primary" onclick={addMember}>
        <Icon icon={AddCircle} />
        Add members
@@ -56,11 +56,6 @@
  }

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

@@ -12,7 +12,7 @@
 </script>

 <div class="flex grow items-center justify-between gap-4 {props.class}">
-  <div class="flex items-center gap-2">
+  <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()

@@ -18,7 +18,7 @@
  import SpaceRelayStatus from "@app/components/SpaceRelayStatus.svelte"
  import RelayDescription from "@app/components/RelayDescription.svelte"
  import ProfileLatest from "@app/components/ProfileLatest.svelte"
-  import {deriveUserHasSpacePermission, ROOM_PERMISSION_EDIT_META} from "@app/core/roles"
+  import {deriveUserIsSpaceAdmin} from "@app/core/state"
  import {pushModal} from "@app/util/modal"

  type Props = {
@@ -28,7 +28,7 @@
  const {url}: Props = $props()
  const relay = deriveRelay(url)
  const owner = $derived($relay?.pubkey)
-  const canEdit = deriveUserHasSpacePermission(url, ROOM_PERMISSION_EDIT_META)
+  const userIsAdmin = deriveUserIsSpaceAdmin(url)

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

@@ -54,7 +54,7 @@
          <p class="ellipsize text-sm opacity-75">{displayRelayUrl(url)}</p>
        </div>
      </div>
-      {#if $canEdit}
+      {#if $userIsAdmin}
        <Button class="btn btn-primary" onclick={startEdit}>
          <Icon icon={Pen} />
          Edit
@@ -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>
@@ -17,20 +17,16 @@
  import ModalTitle from "@lib/components/ModalTitle.svelte"
  import ModalSubtitle from "@lib/components/ModalSubtitle.svelte"
  import ModalFooter from "@lib/components/ModalFooter.svelte"
-  import RoleBadge from "@app/components/RoleBadge.svelte"
  import RelayName from "@app/components/RelayName.svelte"
  import Profile from "@app/components/Profile.svelte"
  import SpaceMembersAdd from "@app/components/SpaceMembersAdd.svelte"
  import SpaceMembersBanned from "@app/components/SpaceMembersBanned.svelte"
-  import {deriveSpaceMembers, deriveSpaceBannedPubkeyItems} from "@app/core/state"
  import {
-    deriveGroupedSpaceMembers,
+    deriveSpaceMembers,
+    deriveSpaceBannedPubkeyItems,
+    deriveUserIsSpaceAdmin,
    deriveSupportedMethods,
-    deriveUserHasSpacePermission,
-    ROOM_PERMISSION_ADD_MEMBER,
-    ROOM_PERMISSION_REMOVE_MEMBER,
-    ROOM_PERMISSION_BAN_USER,
-  } from "@app/core/roles"
+  } from "@app/core/state"
  import {pushModal} from "@app/util/modal"
  import {pushToast} from "@app/util/toast"

@@ -42,17 +38,10 @@

  const members = deriveSpaceMembers(url)
  const bans = deriveSpaceBannedPubkeyItems(url)
-  const memberGroups = deriveGroupedSpaceMembers(url, members)
-  const canAddMember = deriveUserHasSpacePermission(url, ROOM_PERMISSION_ADD_MEMBER)
-  const canBanByPermission = deriveUserHasSpacePermission(url, ROOM_PERMISSION_BAN_USER)
-  const canUnallowByPermission = deriveUserHasSpacePermission(url, ROOM_PERMISSION_REMOVE_MEMBER)
+  const userIsAdmin = deriveUserIsSpaceAdmin(url)
  const supportedMethods = deriveSupportedMethods(url)
-  const canBan = $derived(
-    $canBanByPermission && $supportedMethods.includes(ManagementMethod.BanPubkey),
-  )
-  const canUnallow = $derived(
-    $canUnallowByPermission && $supportedMethods.includes(ManagementMethod.UnallowPubkey),
-  )
+  const canBan = $derived($supportedMethods.includes(ManagementMethod.BanPubkey))
+  const canUnallow = $derived($supportedMethods.includes(ManagementMethod.UnallowPubkey))

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

@@ -115,7 +104,7 @@
      <ModalTitle>Members</ModalTitle>
      <ModalSubtitle>of <RelayName {url} class="text-primary" /></ModalSubtitle>
    </ModalHeader>
-    {#if canBan || canUnallow}
+    {#if $userIsAdmin}
      {#if $bans.length > 0}
        <Button class="btn btn-neutral" onclick={showBannedPubkeyItems}>
          Banned users ({$bans.length})
@@ -123,70 +112,46 @@
      {/if}
    {/if}
    <div class="flex flex-col gap-2">
-      {#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 $memberGroups as group (group.key)}
-          <div class="pt-2 pb-1">
-            {#if group.role}
-              <RoleBadge role={group.role} class="badge-md" />
-            {:else}
-              <span class="text-sm font-semibold opacity-75">Members</span>
-            {/if}
-          </div>
-          {#each group.members as member (member.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={member.pubkey} {url} />
-                  {#if member.roles.length > 0}
-                    <div class="mt-1 flex flex-wrap gap-1">
-                      {#each member.roles as role (role.name)}
-                        <RoleBadge {role} />
-                      {/each}
-                    </div>
-                  {/if}
-                </div>
-                {#if canBan || canUnallow}
-                  <div class="relative">
-                    <Button
-                      class="btn btn-circle btn-ghost btn-sm"
-                      onclick={() => toggleMenu(member.pubkey)}>
-                      <Icon icon={MenuDots} />
-                    </Button>
-                    {#if menuPubkey === member.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(member.pubkey)}>
-                                <Icon icon={UserMinus} />
-                                Remove User
-                              </Button>
-                            </li>
-                          {/if}
-                          {#if canBan}
-                            <li>
-                              <Button class="text-error" onclick={() => banMember(member.pubkey)}>
-                                <Icon icon={MinusCircle} />
-                                Ban User
-                              </Button>
-                            </li>
-                          {/if}
-                        </ul>
-                      </Popover>
-                    {/if}
-                  </div>
+      {#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>
-            </div>
-          {/each}
-        {/each}
-      {/if}
+            {/if}
+          </div>
+        </div>
+      {/each}
    </div>
  </ModalBody>
  <ModalFooter>
@@ -194,7 +159,7 @@
      <Icon icon={AltArrowLeft} />
      Go back
    </Button>
-    {#if $canAddMember}
+    {#if $userIsAdmin}
      <Button class="btn btn-primary" onclick={addMember}>
        <Icon icon={AddCircle} />
        Add members
@@ -16,8 +16,7 @@
  import ModalSubtitle from "@lib/components/ModalSubtitle.svelte"
  import ModalFooter from "@lib/components/ModalFooter.svelte"
  import Profile from "@app/components/Profile.svelte"
-  import {deriveSupportedMethods} from "@app/core/roles"
-  import {deriveSpaceBannedPubkeyItems} from "@app/core/state"
+  import {deriveSpaceBannedPubkeyItems, deriveSupportedMethods} from "@app/core/state"
  import {addSpaceMembers} from "@app/core/commands"
  import {pushToast} from "@app/util/toast"

@@ -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"
@@ -40,7 +41,6 @@
  import SpaceMenuRoomItem from "@app/components/SpaceMenuRoomItem.svelte"
  import VoiceWidget from "@app/components/VoiceWidget.svelte"
  import SocketStatusIndicator from "@app/components/SocketStatusIndicator.svelte"
-  import {deriveUserIsSpaceAdmin} from "@app/core/roles"
  import {
    ENABLE_ZAPS,
    CONTENT_KINDS,
@@ -51,6 +51,7 @@
    userSpaceUrls,
    hasNip29,
    deriveUserCanCreateRoom,
+    deriveUserIsSpaceAdmin,
    deriveEventsForUrl,
    deriveSpaceActionItems,
    notificationSettings,
@@ -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,7 +263,7 @@
          <Icon icon={CalendarMinimalistic} /> Calendar
        </SecondaryNavItem>
      {/if}
-      {#if $spaceKinds.has(POLL)}
+      {#if $spaceKinds.has(Poll)}
        <SecondaryNavItem href={pollsPath}>
          <Icon icon={Revote} /> Polls
        </SecondaryNavItem>
@@ -46,7 +46,7 @@
        </div>
      {/if}
      {#if Array.isArray(supported_nips)}
-        <p class="badge badge-neutral text-wrap h-auto">
+        <p class="badge badge-neutral">
          <span class="ellipsize">Supported NIPs: {supported_nips.join(", ")}</span>
        </p>
      {/if}
@@ -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 ?? "")
@@ -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>
@@ -1,278 +0,0 @@
-<script lang="ts">
-  import cx from "classnames"
-  import {Track} from "livekit-client"
-  import {displayProfileByPubkey, loadProfile} from "@welshman/app"
-  import Pin from "@assets/icons/pin.svg?dataurl"
-  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 VoiceWidget from "@app/components/VoiceWidget.svelte"
-  import {get} from "svelte/store"
-  import {
-    VideoCallLayout,
-    isDesktopLayout,
-    toggleVideoPrimaryTile,
-    videoCallLayout,
-    videoCallViewportSync,
-    ViewportSize,
-    videoPrimaryTileKey,
-  } from "@app/call/video"
-  import {currentVoiceSession, currentVoiceRoom, pubkeyFromLiveKitIdentity} from "@app/call/stores"
-
-  type Props = {
-    layout: VideoCallLayout
-    mobile?: boolean
-    url: string
-    h: string
-    class?: string
-  }
-
-  type VideoTileData = {
-    identity: string
-    isLocal: boolean
-    trackSid: string
-    track: Track | undefined
-    source: Track.Source.Camera | Track.Source.ScreenShare
-  }
-
-  type TileLayout = "spotlight" | "default" | "strip"
-
-  const {layout, mobile = false, url, h, class: className = ""}: Props = $props()
-
-  $effect(() => {
-    const currentLayout = isDesktopLayout.current ? ViewportSize.Desktop : ViewportSize.Mobile
-    const {previousLayout} = videoCallViewportSync
-    if (previousLayout === undefined) {
-      videoCallViewportSync.previousLayout = currentLayout
-      return
-    }
-    if (previousLayout === currentLayout) return
-    const p = get(videoCallLayout)
-    if (previousLayout === ViewportSize.Desktop && currentLayout === ViewportSize.Mobile) {
-      if (p === VideoCallLayout.Split) videoCallLayout.set(VideoCallLayout.Video)
-    } else if (previousLayout === ViewportSize.Mobile && currentLayout === ViewportSize.Desktop) {
-      if (p === VideoCallLayout.Chat) videoCallLayout.set(VideoCallLayout.Split)
-    }
-    videoCallViewportSync.previousLayout = currentLayout
-  })
-
-  const isViewingCurrentCallRoom = $derived(
-    $currentVoiceRoom?.url === url && $currentVoiceRoom?.h === h,
-  )
-
-  const showVideoContent = $derived(
-    isViewingCurrentCallRoom &&
-      (mobile
-        ? layout === VideoCallLayout.Video
-        : layout === VideoCallLayout.Split || layout === VideoCallLayout.Video),
-  )
-
-  const videoTiles = $derived.by(() => {
-    const session = $currentVoiceSession
-    if (!session || $currentVoiceRoom?.url !== url || $currentVoiceRoom?.h !== h) {
-      return []
-    }
-
-    const room = session.room
-    const videoTiles: VideoTileData[] = []
-    const user = room.localParticipant
-
-    if (session.cameraOn) {
-      const localPub = user.getTrackPublication(Track.Source.Camera)
-      videoTiles.push({
-        identity: user.identity,
-        isLocal: true,
-        trackSid: localPub?.trackSid ?? "local-camera",
-        track: localPub?.track,
-        source: Track.Source.Camera,
-      })
-    }
-
-    if (session.screenShareOn) {
-      const localPub = user.getTrackPublication(Track.Source.ScreenShare)
-      videoTiles.push({
-        identity: user.identity,
-        isLocal: true,
-        trackSid: localPub?.trackSid ?? "local-screen",
-        track: localPub?.track,
-        source: Track.Source.ScreenShare,
-      })
-    }
-
-    for (const rp of room.remoteParticipants.values()) {
-      const camPub = rp.getTrackPublication(Track.Source.Camera)
-      if (camPub?.isSubscribed && camPub.track) {
-        videoTiles.push({
-          identity: rp.identity,
-          isLocal: false,
-          trackSid: camPub.trackSid,
-          track: camPub.track,
-          source: Track.Source.Camera,
-        })
-      }
-      const screenPub = rp.getTrackPublication(Track.Source.ScreenShare)
-      if (screenPub?.isSubscribed && screenPub.track) {
-        videoTiles.push({
-          identity: rp.identity,
-          isLocal: false,
-          trackSid: screenPub.trackSid,
-          track: screenPub.track,
-          source: Track.Source.ScreenShare,
-        })
-      }
-    }
-
-    return videoTiles
-  })
-
-  /** 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 primaryTile = $derived.by(() => {
-    const k = $videoPrimaryTileKey
-    if (k === undefined) return undefined
-    return videoTiles.find(t => tileKey(t) === k)
-  })
-
-  const secondaryTiles = $derived.by(() => {
-    const p = primaryTile
-    if (p === undefined) return videoTiles
-    const pk = tileKey(p)
-    return videoTiles.filter(t => tileKey(t) !== pk)
-  })
-
-  const useSpotlightLayout = $derived(primaryTile !== undefined)
-  const useMultiGrid = $derived(!useSpotlightLayout && videoTiles.length > 2)
-
-  $effect(() => {
-    const k = $videoPrimaryTileKey
-    if (k === undefined) return
-    if (!videoTiles.some(t => tileKey(t) === k)) {
-      videoPrimaryTileKey.set(undefined)
-    }
-  })
-
-  $effect(() => {
-    for (const t of videoTiles) {
-      const pk = pubkeyFromLiveKitIdentity(t.identity)
-      if (pk) loadProfile(pk)
-    }
-  })
-
-  const labelFor = (identity: string, source: VideoTileData["source"]) => {
-    const pk = pubkeyFromLiveKitIdentity(identity)
-    const name = pk ? displayProfileByPubkey(pk) : "Unknown"
-    return source === Track.Source.ScreenShare ? `${name} · screen` : name
-  }
-
-  const showTileGrid = $derived(videoTiles.length > 0)
-
-  const spotlightHandlerFor = (key: string) => () => {
-    toggleVideoPrimaryTile(key)
-  }
-
-  const panelChrome = $derived(
-    cx(
-      mobile &&
-        "flex min-h-0 w-full flex-1 flex-col gap-2 overflow-y-auto overflow-x-hidden bg-base-200 px-2 pt-4 md:hidden pb-[calc(3.5rem+var(--saib))]",
-      !mobile &&
-        "flex min-h-0 w-full min-w-0 flex-1 flex-col gap-2 overflow-hidden bg-base-200 px-2 pb-2 pt-4",
-      className,
-    ),
-  )
-</script>
-
-{#snippet videoTile(tile: VideoTileData, layout: TileLayout)}
-  <div
-    class={cx(
-      "relative isolate overflow-hidden rounded-box shadow-sm",
-      layout === "spotlight" && "min-h-0 flex-1",
-      layout === "default" && "aspect-video w-full min-h-0",
-      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}
-        muted={tile.isLocal}
-        fit={tile.source === Track.Source.ScreenShare ? "contain" : "cover"}
-        class="pointer-events-none absolute inset-0" />
-    {:else}
-      <div class="absolute inset-0 flex items-center justify-center">
-        <ProfileCircle pubkey={pubkeyFromLiveKitIdentity(tile.identity)} {url} size={14} />
-      </div>
-    {/if}
-    <span
-      class="pointer-events-none absolute bottom-1 left-1 max-w-[calc(100%-0.5rem)] truncate rounded bg-base-100/80 px-1.5 py-0.5 text-xs">
-      {labelFor(tile.identity, tile.source)}{tile.isLocal ? " (you)" : ""}
-    </span>
-    {#if videoTiles.length > 1}
-      {@const pinned = $videoPrimaryTileKey === tileKey(tile)}
-      <Button
-        data-tip={pinned ? "Exit spotlight" : "Spotlight"}
-        aria-pressed={pinned}
-        class={cx(
-          "absolute right-1 top-1 z-20 btn btn-xs btn-square btn-ghost",
-          pinned ? "btn-active bg-primary/25 text-primary" : "bg-base-100/70",
-        )}
-        onclick={spotlightHandlerFor(tileKey(tile))}>
-        <Icon icon={Pin} size={3} />
-      </Button>
-    {/if}
-  </div>
-{/snippet}
-
-{#snippet videoPanelBody()}
-  {#if showTileGrid}
-    {#if useSpotlightLayout && primaryTile}
-      <div class="flex min-h-0 flex-1 flex-col gap-2 overflow-hidden">
-        {@render videoTile(primaryTile, "spotlight")}
-        {#if secondaryTiles.length > 0}
-          <div
-            class="flex max-h-40 shrink-0 flex-row gap-2 overflow-x-auto overflow-y-hidden py-0.5">
-            {#each secondaryTiles as tile (tileKey(tile))}
-              {@render videoTile(tile, "strip")}
-            {/each}
-          </div>
-        {/if}
-      </div>
-    {:else if useMultiGrid}
-      <div
-        class="grid min-h-0 flex-1 grid-cols-1 content-start gap-2 overflow-y-auto sm:grid-cols-2">
-        {#each videoTiles as tile (tileKey(tile))}
-          {@render videoTile(tile, "default")}
-        {/each}
-      </div>
-    {:else}
-      <div class="flex min-h-0 flex-1 flex-col gap-2 overflow-y-auto">
-        {#each videoTiles as tile (tileKey(tile))}
-          {@render videoTile(tile, "default")}
-        {/each}
-      </div>
-    {/if}
-  {:else}
-    <div
-      class="flex min-h-[12rem] flex-1 flex-col items-center justify-center gap-2 rounded-box bg-base-200/50 p-4 text-center text-sm opacity-80">
-      <p>No camera or screen share yet.</p>
-      <p class="text-xs">Use the camera or screen share control to share video.</p>
-    </div>
-  {/if}
-{/snippet}
-
-{#if showVideoContent}
-  <div class={panelChrome}>
-    {#if mobile}
-      <div class="flex min-h-0 flex-1 flex-col gap-2">
-        <div class="min-h-0 flex-1 overflow-hidden">
-          {@render videoPanelBody()}
-        </div>
-        <div class="shrink-0 pb-2">
-          <VoiceWidget />
-        </div>
-      </div>
-    {:else}
-      {@render videoPanelBody()}
-    {/if}
-  </div>
-{/if}
@@ -1,31 +0,0 @@
-<script lang="ts">
-  import type {Track} from "livekit-client"
-  import cx from "classnames"
-
-  type Props = {
-    track: Track
-    muted?: boolean
-    fit?: "cover" | "contain"
-    class?: string
-  }
-
-  const {track, muted = true, fit = "cover", class: className = ""}: Props = $props()
-
-  let videoElement = $state<HTMLVideoElement | undefined>()
-
-  $effect(() => {
-    const element = videoElement
-    const activeTrack = track
-    if (!element) return
-    activeTrack.attach(element)
-    return () => {
-      activeTrack.detach(element)
-    }
-  })
-</script>
-
-<video
-  bind:this={videoElement}
-  class={cx("h-full w-full", fit === "contain" ? "object-contain" : "object-cover", className)}
-  playsinline
-  {muted}></video>
@@ -7,8 +7,13 @@
  import ModalHeader from "@lib/components/ModalHeader.svelte"
  import ModalSubtitle from "@lib/components/ModalSubtitle.svelte"
  import ModalTitle from "@lib/components/ModalTitle.svelte"
-  import {currentVoiceSession, type VoiceSession} from "@app/call/stores"
-  import {DeviceKind, supportsAudioOutputSelection, switchVoiceActiveDevice} from "@app/call/voice"
+  import {
+    currentVoiceSession,
+    DeviceKind,
+    supportsAudioOutputSelection,
+    switchVoiceActiveDevice,
+    type VoiceSession,
+  } from "@app/voice"
  import {popModal} from "@app/util/modal"

  const selectValueForActiveDevice = (session: VoiceSession, kind: DeviceKind): string => {
@@ -21,10 +26,8 @@

  let audioInputs = $state<MediaDeviceInfo[]>([])
  let audioOutputs = $state<MediaDeviceInfo[]>([])
-  let videoInputs = $state<MediaDeviceInfo[]>([])
  let selectedInput = $state("")
  let selectedOutput = $state("")
-  let selectedVideo = $state("")

  const loadDevices = async () => {
    if (!navigator.mediaDevices?.enumerateDevices) return
@@ -32,11 +35,9 @@
      const devices = await navigator.mediaDevices.enumerateDevices()
      audioInputs = devices.filter(d => d.kind === "audioinput")
      audioOutputs = devices.filter(d => d.kind === "audiooutput")
-      videoInputs = devices.filter(d => d.kind === "videoinput")
    } catch {
      audioInputs = []
      audioOutputs = []
-      videoInputs = []
    }
  }

@@ -54,7 +55,6 @@
    }
    selectedInput = selectValueForActiveDevice(session, DeviceKind.AudioInput)
    selectedOutput = selectValueForActiveDevice(session, DeviceKind.AudioOutput)
-    selectedVideo = selectValueForActiveDevice(session, DeviceKind.VideoInput)
  })

  const onInputChange = () => {
@@ -65,10 +65,6 @@
    void switchVoiceActiveDevice(DeviceKind.AudioOutput, selectedOutput)
  }

-  const onVideoChange = () => {
-    void switchVoiceActiveDevice(DeviceKind.VideoInput, selectedVideo)
-  }
-
  const onDone = () => {
    popModal()
  }
@@ -80,8 +76,8 @@
 <Modal>
  <ModalBody>
    <ModalHeader>
-      <ModalTitle>Call settings</ModalTitle>
-      <ModalSubtitle>Microphone, speaker, and camera for this call.</ModalSubtitle>
+      <ModalTitle>Audio settings</ModalTitle>
+      <ModalSubtitle>Choose microphone and speaker for this call.</ModalSubtitle>
    </ModalHeader>
    <div class="flex flex-col gap-4 pt-2">
      <FieldInline>
@@ -124,25 +120,6 @@
          {/snippet}
        </FieldInline>
      {/if}
-      <FieldInline>
-        {#snippet label()}
-          <p>Camera</p>
-        {/snippet}
-        {#snippet input()}
-          <select
-            class="select select-bordered w-full"
-            bind:value={selectedVideo}
-            onchange={onVideoChange}
-            aria-label="Camera">
-            <option value="">Default camera</option>
-            {#each videoInputs as d (d.deviceId)}
-              <option value={d.deviceId}>
-                {d.label || `Camera ${d.deviceId.slice(0, 8)}…`}
-              </option>
-            {/each}
-          </select>
-        {/snippet}
-      </FieldInline>
    </div>
  </ModalBody>
  <ModalFooter>
@@ -12,13 +12,14 @@
  import {makeRoomId} from "@app/core/state"
  import {
    VoiceState,
+    deriveVoiceParticipants,
+    cancelJoinVoiceRoom,
    currentVoiceRoom,
+    voiceState,
    isParticipantSpeaking,
    participantKey,
-    voiceState,
    type VoiceParticipant,
-  } from "@app/call/stores"
-  import {cancelJoinVoiceRoom, deriveVoiceParticipants} from "@app/call/voice"
+  } from "@app/voice"

  interface Props {
    url: string
@@ -14,7 +14,7 @@
  import ModalTitle from "@lib/components/ModalTitle.svelte"
  import {AbortError, TimeoutError} from "$lib/util"
  import {displayRoom} from "@app/core/state"
-  import {joinVoiceRoom} from "@app/call/voice"
+  import {joinVoiceRoom} from "@app/voice"
  import {popModal} from "@app/util/modal"
  import {pushToast} from "@app/util/toast"

@@ -1,20 +1,15 @@
 <script lang="ts">
  import {readable} from "svelte/store"
-  import {fade, fly} from "svelte/transition"
+  import {fly} from "svelte/transition"
  import {goto} from "$app/navigation"
  import {page} from "$app/stores"
-  import cx from "classnames"
  import {displayRelayUrl} from "@welshman/util"
  import Microphone from "@assets/icons/microphone.svg?dataurl"
-  import Videocamera from "@assets/icons/videocamera.svg?dataurl"
-  import VideocameraRecord from "@assets/icons/videocamera-record.svg?dataurl"
-  import Monitor from "@assets/icons/monitor.svg?dataurl"
+  import MicrophoneOff from "@assets/icons/microphone-off.svg?dataurl"
  import PhoneRounded from "@assets/icons/phone-rounded.svg?dataurl"
  import PhoneCallingRounded from "@assets/icons/phone-calling-rounded.svg?dataurl"
-  import ChatRound from "@assets/icons/chat-round.svg?dataurl"
  import CloseCircle from "@assets/icons/close-circle.svg?dataurl"
  import Settings from "@assets/icons/settings.svg?dataurl"
-  import {Capacitor} from "@capacitor/core"
  import Icon from "@lib/components/Icon.svelte"
  import Button from "@lib/components/Button.svelte"
  import VoiceCallAudioSettingsDialog from "@app/components/VoiceCallAudioSettingsDialog.svelte"
@@ -28,23 +23,16 @@
    type Room,
  } from "@app/core/state"
  import {pushModal} from "@app/util/modal"
-  import {notifications} from "@app/util/notifications"
  import {makeRoomPath} from "@app/util/routes"
-  import {
-    VideoCallLayout,
-    isDesktopLayout,
-    toggleCamera,
-    toggleScreenShare,
-    videoCallLayout,
-  } from "@app/call/video"
  import {
    VoiceState,
    currentVoiceSession,
    currentVoiceRoom,
    voiceState,
-    isLocalSpeaking,
-  } from "@app/call/stores"
-  import {cancelJoinVoiceRoom, leaveVoiceRoom, toggleMute} from "@app/call/voice"
+    leaveVoiceRoom,
+    toggleMute,
+    cancelJoinVoiceRoom,
+  } from "@app/voice"

  const {relay, h} = $derived($page.params)
  const url = $derived(relay ? decodeRelay(relay) : undefined)
@@ -53,14 +41,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
@@ -86,45 +66,9 @@
    pushModal(VoiceRoomJoinDialog, {url: targetRoom.url, h: targetRoom.h})
  }

-  const goToRoom = () => {
-    if (!targetRoom) return
-    const path = makeRoomPath(targetRoom.url, targetRoom.h)
-    if ($page.url.pathname !== path) {
-      void goto(path)
-    }
-  }
-
-  const openCallSettings = () => {
+  const openAudioSettings = () => {
    pushModal(VoiceCallAudioSettingsDialog)
  }
-
-  const showChatButton = $derived($voiceState === VoiceState.Connected && isViewingCurrentVoiceRoom)
-
-  const isChatPanelActive = $derived(
-    showChatButton &&
-      (isDesktopLayout.current
-        ? $videoCallLayout === VideoCallLayout.Split
-        : $videoCallLayout === VideoCallLayout.Chat),
-  )
-
-  const onChatToggle = () => {
-    if (!showChatButton) return
-    if (isDesktopLayout.current) {
-      videoCallLayout.update(p =>
-        p === VideoCallLayout.Split ? VideoCallLayout.Video : VideoCallLayout.Split,
-      )
-    } else {
-      videoCallLayout.update(p =>
-        p === VideoCallLayout.Video ? VideoCallLayout.Chat : VideoCallLayout.Video,
-      )
-    }
-  }
-
-  const chatUnread = $derived(
-    targetRoom !== undefined && $notifications.has(makeRoomPath(targetRoom.url, targetRoom.h)),
-  )
-
-  const mediaToggleClass = "center tooltip tooltip-top btn btn-sm btn-square btn-ghost"
 </script>

 {#if targetRoom}
@@ -132,47 +76,19 @@
    in:fly={{y: 60, duration: 350}}
    out:fly={{y: 60, duration: 250}}
    class="flex flex-col gap-2 rounded-box bg-base-100 p-3">
-    <div class="flex items-start justify-between gap-2">
-      <button
-        type="button"
-        class="min-w-0 flex-1 rounded-lg px-1 py-0.5 text-left outline-none hover:bg-base-200/60 focus-visible:ring-2 focus-visible:ring-primary focus-visible:ring-offset-2 focus-visible:ring-offset-base-100"
-        onclick={goToRoom}
-        aria-label="Open room {roomName}">
-        <div class="flex flex-col gap-0.5">
-          {#if $voiceState === VoiceState.Joining}
-            <span class="text-sm font-semibold text-warning">Joining...</span>
-          {:else if $voiceState === VoiceState.Connected}
-            <span class="text-sm font-semibold text-success">Voice Connected</span>
-          {:else}
-            <span class="text-sm font-semibold text-neutral-content">Disconnected</span>
-          {/if}
-          <span class="ellipsize text-xs opacity-70">
-            {roomName} / {spaceName}
-          </span>
-        </div>
-      </button>
-      {#if showChatButton}
-        <Button
-          data-tip="Toggle Chat"
-          class={cx(
-            mediaToggleClass,
-            "relative shrink-0 overflow-visible",
-            isChatPanelActive && "text-primary",
-          )}
-          onclick={onChatToggle}>
-          <span class="relative inline-flex">
-            <Icon icon={ChatRound} size={4} />
-            {#if chatUnread}
-              <span
-                transition:fade={{duration: 150}}
-                class="absolute -right-0.5 -top-0.5 h-2 w-2 rounded-full bg-primary ring-2 ring-base-100"
-                aria-hidden="true"></span>
-            {/if}
-          </span>
-        </Button>
+    <div class="flex flex-col gap-0.5">
+      {#if $voiceState === VoiceState.Joining}
+        <span class="text-sm font-semibold text-warning">Joining...</span>
+      {:else if $voiceState === VoiceState.Connected}
+        <span class="text-sm font-semibold text-success">Voice Connected</span>
+      {:else}
+        <span class="text-sm font-semibold text-neutral-content">Disconnected</span>
      {/if}
+      <span class="ellipsize text-xs opacity-70">
+        {roomName} / {spaceName}
+      </span>
    </div>
-    <div class="flex flex-wrap items-center gap-2">
+    <div class="flex items-center gap-1">
      {#if $voiceState === VoiceState.Joining}
        <span class="loading loading-spinner loading-sm"></span>
        <Button
@@ -184,45 +100,16 @@
      {:else if $voiceState === VoiceState.Connected && $currentVoiceSession}
        <Button
          data-tip={$currentVoiceSession.muted ? "Unmute" : "Mute"}
-          class={cx(
-            mediaToggleClass,
-            "overflow-visible",
-            !$currentVoiceSession.muted && $isLocalSpeaking && "text-primary",
-            $currentVoiceSession.muted &&
-              "text-error ring-1 ring-error/50 ring-offset-0 ring-offset-base-100",
-          )}
+          class="center tooltip tooltip-top btn btn-sm btn-square {$currentVoiceSession.muted
+            ? 'btn-error'
+            : 'btn-ghost'}"
          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}
-          </span>
+          <Icon icon={$currentVoiceSession.muted ? MicrophoneOff : Microphone} size={4} />
        </Button>
        <Button
-          data-tip={$currentVoiceSession.cameraOn ? "Turn off camera" : "Turn on camera"}
-          class={cx(mediaToggleClass, $currentVoiceSession.cameraOn && "text-primary")}
-          onclick={toggleCamera}>
-          <Icon icon={$currentVoiceSession.cameraOn ? VideocameraRecord : Videocamera} size={4} />
-        </Button>
-        {#if !Capacitor.isNativePlatform()}
-          <Button
-            data-tip={$currentVoiceSession.screenShareOn ? "Stop sharing" : "Share screen"}
-            class={cx(mediaToggleClass, $currentVoiceSession.screenShareOn && "text-primary")}
-            onclick={toggleScreenShare}>
-            <Icon icon={Monitor} size={4} />
-          </Button>
-        {/if}
-        <Button
-          data-tip="Call settings"
+          data-tip="Audio settings"
          class="center tooltip tooltip-top btn btn-sm btn-square btn-ghost"
-          onclick={openCallSettings}>
+          onclick={openAudioSettings}>
          <Icon icon={Settings} size={4} />
        </Button>
        <Button
@@ -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)
        }
      }
    }),
@@ -1,576 +0,0 @@
-import {derived, readable, type Readable} from "svelte/store"
-import {first, memoize, removeUndefined, simpleCache, sortBy, uniq} from "@welshman/lib"
-import {pubkey, manageRelay} from "@welshman/app"
-import {deriveEventsForUrl} from "@app/core/state"
-import {
-  ManagementMethod,
-  ROOM_ADD_MEMBER,
-  ROOM_REMOVE_MEMBER,
-  ROOM_EDIT_META,
-  ROOM_DELETE_EVENT,
-  ROOM_ADMINS,
-  ROOM_MEMBERS,
-  getTagValue,
-  isRelayUrl,
-} from "@welshman/util"
-import type {TrustedEvent} from "@welshman/util"
-
-export const ROOM_ROLES = 39003
-
-export const ROOM_PERMISSION_ADD_MEMBER = ROOM_ADD_MEMBER
-export const ROOM_PERMISSION_REMOVE_MEMBER = ROOM_REMOVE_MEMBER
-export const ROOM_PERMISSION_EDIT_META = ROOM_EDIT_META
-export const ROOM_PERMISSION_DELETE_EVENT = ROOM_DELETE_EVENT
-export const ROOM_PERMISSION_BAN_USER = 9009
-
-const ALL_ROOM_PERMISSIONS = [
-  ROOM_PERMISSION_ADD_MEMBER,
-  ROOM_PERMISSION_REMOVE_MEMBER,
-  ROOM_PERMISSION_EDIT_META,
-  ROOM_PERMISSION_DELETE_EVENT,
-  ROOM_PERMISSION_BAN_USER,
-]
-
-export const deriveSupportedMethods = simpleCache(([url]: [string]) =>
-  readable<ManagementMethod[]>([], set => {
-    manageRelay(url, {
-      method: ManagementMethod.SupportedMethods,
-      params: [],
-    }).then(({result = []}) => set(result))
-  }),
-)
-
-export type RoleAccess = "read" | "write" | "join"
-
-export type RoleDefinition = {
-  name: string
-  label?: string
-  color?: number
-  order?: number
-  permissions: number[]
-  access: Set<RoleAccess>
-}
-
-export type RoomRoles = {
-  url: string
-  h: string
-  roles: Map<string, RoleDefinition>
-}
-
-export type RoomMember = {
-  pubkey: string
-  roles: string[]
-}
-
-type MemberRoleInfo = {
-  pubkey: string
-  roles: RoleDefinition[]
-  primaryRole?: RoleDefinition
-}
-
-type MemberRoleGroup = {
-  key: string
-  role?: RoleDefinition
-  members: MemberRoleInfo[]
-}
-
-type ParsedRoleState = {
-  roles: Map<string, RoleDefinition>
-  hasPermissionTags: boolean
-}
-
-type SpaceRoleState = {
-  hasPermissionTags: boolean
-  userPermissions: Set<number>
-  memberRoles: Map<string, RoleDefinition[]>
-}
-
-const makeRoleDefinition = (name: string): RoleDefinition => ({
-  name,
-  permissions: [],
-  access: new Set<RoleAccess>(),
-})
-
-const ensureRole = (roles: Map<string, RoleDefinition>, roleName: string) => {
-  if (!roles.has(roleName)) {
-    roles.set(roleName, makeRoleDefinition(roleName))
-  }
-
-  return roles.get(roleName)!
-}
-
-const asNumber = (value: string | undefined) => {
-  const n = parseInt(value || "")
-
-  return isNaN(n) ? undefined : n
-}
-
-const asAccess = (value: string | undefined): RoleAccess | undefined => {
-  if (value === "read" || value === "write" || value === "join") {
-    return value
-  }
-}
-
-const parseRoleState = (event?: TrustedEvent): ParsedRoleState => {
-  const roles = new Map<string, RoleDefinition>()
-  let hasPermissionTags = false
-  let activeRoleName: string | undefined
-
-  for (const tag of event?.tags || []) {
-    const [name, firstValue, secondValue] = tag
-
-    if (name === "role") {
-      if (firstValue) {
-        activeRoleName = firstValue
-        ensureRole(roles, firstValue)
-      }
-
-      continue
-    }
-
-    if (
-      !["role-label", "role-color", "role-order", "role-permission", "role-access"].includes(name)
-    ) {
-      continue
-    }
-
-    const hasExplicitRole = Boolean(firstValue && secondValue !== undefined)
-    const roleName = hasExplicitRole ? firstValue : activeRoleName
-    const value = hasExplicitRole ? secondValue : firstValue
-
-    if (!roleName || !value) {
-      continue
-    }
-
-    const role = ensureRole(roles, roleName)
-
-    if (name === "role-label") {
-      role.label = value
-      continue
-    }
-
-    if (name === "role-color") {
-      const color = asNumber(value)
-
-      if (color !== undefined && color >= 0 && color <= 255) {
-        role.color = color
-      }
-
-      continue
-    }
-
-    if (name === "role-order") {
-      const order = asNumber(value)
-
-      if (order !== undefined) {
-        role.order = order
-      }
-
-      continue
-    }
-
-    if (name === "role-permission") {
-      const permission = asNumber(value)
-
-      hasPermissionTags = true
-
-      if (permission !== undefined && !role.permissions.includes(permission)) {
-        role.permissions.push(permission)
-      }
-
-      continue
-    }
-
-    if (name === "role-access") {
-      const access = asAccess(value)
-
-      if (access) {
-        role.access.add(access)
-      }
-    }
-  }
-
-  return {roles, hasPermissionTags}
-}
-
-const getRoleTokens = (tag: string[]) => {
-  const roles: string[] = []
-
-  for (const value of tag.slice(2)) {
-    if (!value || isRelayUrl(value)) {
-      continue
-    }
-
-    roles.push(value)
-  }
-
-  return uniq(roles)
-}
-
-export const parseRoomMembers = (tags: string[][]) => {
-  const byPubkey = new Map<string, Set<string>>()
-
-  for (const tag of tags) {
-    if (tag[0] !== "p" || !tag[1]) {
-      continue
-    }
-
-    if (!byPubkey.has(tag[1])) {
-      byPubkey.set(tag[1], new Set<string>())
-    }
-
-    const roles = byPubkey.get(tag[1])!
-
-    for (const role of getRoleTokens(tag)) {
-      roles.add(role)
-    }
-  }
-
-  return Array.from(byPubkey.entries()).map(([pubkey, roles]) => ({
-    pubkey,
-    roles: Array.from(roles),
-  }))
-}
-
-export const deriveRoomMembers = (url: string, h: string) =>
-  derived(deriveEventsForUrl(url, [{kinds: [ROOM_MEMBERS], "#d": [h]}]), ([event]) =>
-    parseRoomMembers(event?.tags || []),
-  )
-
-export const deriveRoomAdmins = (url: string, h: string) =>
-  derived(deriveEventsForUrl(url, [{kinds: [ROOM_ADMINS], "#d": [h]}]), ([event]) =>
-    parseRoomMembers(event?.tags || []),
-  )
-
-const deriveRoomRoleState = simpleCache(([url, h]: [string, string]) =>
-  derived(deriveEventsForUrl(url, [{kinds: [ROOM_ROLES], "#d": [h]}]), ([event]) =>
-    parseRoleState(event),
-  ),
-)
-
-export const deriveRoomRoles = (url: string, h: string) =>
-  derived(deriveRoomRoleState(url, h), $state => ({
-    url,
-    h,
-    roles: $state.roles,
-  }))
-
-const getMember = (members: RoomMember[], targetPubkey: string) =>
-  members.find(member => member.pubkey === targetPubkey)
-
-const getResolvedRoles = (rolesByName: Map<string, RoleDefinition>, roleNames: string[]) =>
-  removeUndefined(roleNames.map(name => rolesByName.get(name)))
-
-export const sortRolesDesc = <T extends {order?: number}>(items: T[]) =>
-  sortBy(item => -(item.order ?? -Infinity), items)
-
-export const getRolePermissionsLabel = (role: RoleDefinition) => role.permissions.join(", ")
-
-export const getRoleAccessLabel = (role: RoleDefinition) => Array.from(role.access).join(", ")
-
-const toMemberRoleInfo = (pubkey: string, roles: RoleDefinition[]): MemberRoleInfo => {
-  const sortedRoles = sortRolesDesc(roles)
-
-  return {
-    pubkey,
-    roles: sortedRoles,
-    primaryRole: first(sortedRoles),
-  }
-}
-
-const sortMemberRoleInfos = (members: MemberRoleInfo[]) =>
-  sortBy(member => -(member.primaryRole?.order ?? -Infinity), members)
-
-const groupMemberRoleInfos = (members: MemberRoleInfo[]) => {
-  const byRole = new Map<string, MemberRoleGroup>()
-  const ungrouped: MemberRoleGroup = {
-    key: "members",
-    members: [],
-  }
-
-  for (const member of sortMemberRoleInfos(members)) {
-    if (!member.primaryRole) {
-      ungrouped.members.push(member)
-      continue
-    }
-
-    const key = member.primaryRole.name
-
-    if (!byRole.has(key)) {
-      byRole.set(key, {
-        key,
-        role: member.primaryRole,
-        members: [],
-      })
-    }
-
-    byRole.get(key)!.members.push(member)
-  }
-
-  const groups = sortBy(group => -(group.role?.order ?? -Infinity), Array.from(byRole.values()))
-
-  if (ungrouped.members.length > 0) {
-    groups.push(ungrouped)
-  }
-
-  return groups
-}
-
-const deriveRoomRoleAssignments = simpleCache(([url, h]: [string, string]) =>
-  derived(
-    [deriveRoomRoleState(url, h), deriveRoomMembers(url, h), deriveRoomAdmins(url, h)],
-    ([$rolesState, $members, $admins]) => ({
-      rolesState: $rolesState,
-      members: $members,
-      admins: $admins,
-    }),
-  ),
-)
-
-export const deriveUserRoles = (url: string, h: string, targetPubkey: string) =>
-  derived(deriveRoomRoleAssignments(url, h), ({members, admins}) => {
-    const member = getMember(members, targetPubkey)
-    const admin = getMember(admins, targetPubkey)
-
-    return uniq([...(member?.roles || []), ...(admin?.roles || [])])
-  })
-
-export const deriveUserPermissions = (url: string, h: string) =>
-  derived(
-    [pubkey, deriveRoomRoleAssignments(url, h)],
-    ([$pubkey, {rolesState, members, admins}]) => {
-      const permissions = new Set<number>()
-
-      if (!$pubkey) {
-        return permissions
-      }
-
-      const member = getMember(members, $pubkey)
-      const admin = getMember(admins, $pubkey)
-      const assignedRoleNames = uniq([...(member?.roles || []), ...(admin?.roles || [])])
-
-      if (!rolesState.hasPermissionTags) {
-        if (admin) {
-          for (const permission of ALL_ROOM_PERMISSIONS) {
-            permissions.add(permission)
-          }
-        }
-
-        return permissions
-      }
-
-      for (const role of getResolvedRoles(rolesState.roles, assignedRoleNames)) {
-        for (const permission of role.permissions) {
-          permissions.add(permission)
-        }
-      }
-
-      return permissions
-    },
-  )
-
-const mergeRoleDefinitions = (left: RoleDefinition[], right: RoleDefinition[]) => {
-  const merged = new Map<string, RoleDefinition>()
-
-  for (const role of [...left, ...right]) {
-    if (!merged.has(role.name)) {
-      merged.set(role.name, {
-        name: role.name,
-        label: role.label,
-        color: role.color,
-        order: role.order,
-        permissions: [...role.permissions],
-        access: new Set(role.access),
-      })
-
-      continue
-    }
-
-    const existing = merged.get(role.name)!
-
-    if (existing.label === undefined) {
-      existing.label = role.label
-    }
-
-    if (existing.color === undefined) {
-      existing.color = role.color
-    }
-
-    if (existing.order === undefined) {
-      existing.order = role.order
-    }
-
-    existing.permissions = uniq([...existing.permissions, ...role.permissions])
-
-    for (const access of role.access) {
-      existing.access.add(access)
-    }
-  }
-
-  return sortBy(role => role.name, Array.from(merged.values()))
-}
-
-const deriveSpaceRoleState = simpleCache(([url]: [string]) =>
-  derived(
-    [pubkey, deriveEventsForUrl(url, [{kinds: [ROOM_ROLES, ROOM_MEMBERS, ROOM_ADMINS]}])],
-    ([$pubkey, $events]): SpaceRoleState => {
-      const userPermissions = new Set<number>()
-      const memberRoles = new Map<string, RoleDefinition[]>()
-      const rolesByH = new Map<string, ReturnType<typeof parseRoleState>>()
-      let hasPermissionTags = false
-
-      for (const event of $events) {
-        if (event.kind === ROOM_ROLES) {
-          const h = getTagValue("d", event.tags)
-          if (h) {
-            const parsed = parseRoleState(event)
-            rolesByH.set(h, parsed)
-            if (parsed.hasPermissionTags) {
-              hasPermissionTags = true
-            }
-          }
-        }
-      }
-
-      for (const event of $events) {
-        if (event.kind === ROOM_MEMBERS || event.kind === ROOM_ADMINS) {
-          const h = getTagValue("d", event.tags)
-          if (!h) continue
-
-          const rolesState = rolesByH.get(h)
-          if (!rolesState) continue
-
-          const members = parseRoomMembers(event.tags)
-          for (const member of members) {
-            const resolvedRoles = getResolvedRoles(rolesState.roles, member.roles)
-
-            if (resolvedRoles.length === 0) {
-              continue
-            }
-
-            memberRoles.set(
-              member.pubkey,
-              mergeRoleDefinitions(memberRoles.get(member.pubkey) || [], resolvedRoles),
-            )
-
-            if ($pubkey === member.pubkey && rolesState.hasPermissionTags) {
-              for (const role of resolvedRoles) {
-                for (const permission of role.permissions) {
-                  userPermissions.add(permission)
-                }
-              }
-            }
-          }
-        }
-      }
-
-      return {
-        hasPermissionTags,
-        userPermissions,
-        memberRoles,
-      }
-    },
-  ),
-)
-
-export const deriveUserIsSpaceAdmin = memoize((url?: string) => {
-  if (!url) {
-    return readable(false)
-  }
-
-  return derived(
-    [deriveSpaceRoleState(url), deriveSupportedMethods(url)],
-    ([$spaceRoleState, $supportedMethods]) => {
-      if ($spaceRoleState.hasPermissionTags) {
-        return $spaceRoleState.userPermissions.size > 0
-      }
-
-      return $supportedMethods.length > 0
-    },
-  )
-})
-
-export const deriveUserSpacePermissions = (url: string) =>
-  derived(
-    [deriveSpaceRoleState(url), deriveUserIsSpaceAdmin(url)],
-    ([$spaceRoleState, $isAdmin]) => {
-      const permissions = new Set<number>()
-
-      if ($spaceRoleState.hasPermissionTags) {
-        for (const permission of $spaceRoleState.userPermissions) {
-          permissions.add(permission)
-        }
-
-        return permissions
-      }
-
-      if ($isAdmin) {
-        for (const permission of ALL_ROOM_PERMISSIONS) {
-          permissions.add(permission)
-        }
-      }
-
-      return permissions
-    },
-  )
-
-export const deriveUserHasSpacePermission = (url: string, kind: number) =>
-  derived(deriveUserSpacePermissions(url), $permissions => $permissions.has(kind))
-
-export const deriveUserIsRoomAdmin = (url: string, h: string) =>
-  derived(
-    [deriveUserPermissions(url, h), deriveUserIsSpaceAdmin(url)],
-    ([$permissions, $isSpaceAdmin]) => $isSpaceAdmin || $permissions.size > 0,
-  )
-
-export const deriveHasPermission = (url: string, h: string | undefined, kind: number) => {
-  if (!h) return deriveUserIsSpaceAdmin(url)
-
-  return derived(
-    [deriveUserPermissions(url, h), deriveUserIsSpaceAdmin(url)],
-    ([$permissions, $isSpaceAdmin]) => $isSpaceAdmin || $permissions.has(kind),
-  )
-}
-
-export const deriveRoomRoleDefinitions = (url: string, h: string) =>
-  derived(deriveRoomRoles(url, h), $roomRoles =>
-    sortRolesDesc(Array.from($roomRoles.roles.values())),
-  )
-
-const deriveRoomMemberRoleInfo = (url: string, h: string) =>
-  derived([deriveRoomMembers(url, h), deriveRoomRoles(url, h)], ([$members, $roomRoles]) =>
-    sortMemberRoleInfos(
-      $members.map(member =>
-        toMemberRoleInfo(member.pubkey, getResolvedRoles($roomRoles.roles, member.roles)),
-      ),
-    ),
-  )
-
-export const deriveGroupedRoomMembers = (url: string, h: string) =>
-  derived(deriveRoomMemberRoleInfo(url, h), $members => groupMemberRoleInfos($members))
-
-const deriveSpaceMemberRoleInfo = (url: string) =>
-  derived(deriveSpaceRoleState(url), $spaceRoleState => {
-    const roleInfoByPubkey = new Map<string, MemberRoleInfo>()
-
-    for (const [pubkey, roles] of $spaceRoleState.memberRoles.entries()) {
-      roleInfoByPubkey.set(pubkey, toMemberRoleInfo(pubkey, roles))
-    }
-
-    return roleInfoByPubkey
-  })
-
-export const deriveSpaceMemberRoles = (url: string, targetPubkey: string) =>
-  derived(
-    deriveSpaceMemberRoleInfo(url),
-    $spaceMemberRoles => $spaceMemberRoles.get(targetPubkey)?.roles || [],
-  )
-
-export const deriveGroupedSpaceMembers = (url: string, members: Readable<string[]>) =>
-  derived([members, deriveSpaceMemberRoleInfo(url)], ([$members, $spaceMemberRoles]) =>
-    groupMemberRoleInfos(
-      $members.map(pubkey => $spaceMemberRoles.get(pubkey) || toMemberRoleInfo(pubkey, [])),
-    ),
-  )
-
-export const roleColorToCSS = (hue: number) => `oklch(0.75 0.15 ${(hue * 360) / 255})`
@@ -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,
@@ -20,6 +22,7 @@ import {
  partition,
  shuffle,
  parseJson,
+  memoize,
  addToMapKey,
  identity,
  always,
@@ -83,6 +86,7 @@ import {
  ROOM_JOIN,
  ROOM_LEAVE,
  ROOM_MEMBERS,
+  ROOM_ADMINS,
  ROOM_META,
  ROOM_DELETE,
  ROOM_REMOVE_MEMBER,
@@ -90,7 +94,6 @@ import {
  THREAD,
  CLASSIFIED,
  WRAP,
-  POLL,
  PROFILE,
  ZAP_GOAL,
  ZAP_REQUEST,
@@ -150,18 +153,6 @@ import {
 } from "@welshman/app"
 import {checkRelayHasLivekit} from "$lib/livekit"
 import {readFeed} from "@lib/feeds"
-import {
-  parseRoomMembers,
-  deriveRoomMembers,
-  deriveUserIsSpaceAdmin,
-  deriveUserIsRoomAdmin,
-  deriveUserSpacePermissions,
-  ROOM_PERMISSION_ADD_MEMBER,
-  ROOM_PERMISSION_REMOVE_MEMBER,
-  ROOM_PERMISSION_DELETE_EVENT,
-  ROOM_PERMISSION_BAN_USER,
-} from "@app/core/roles"
-import type {RoomMember} from "@app/core/roles"

 export const fromCsv = (s: string) => (s || "").split(",").filter(identity)

@@ -337,7 +328,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]

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

@@ -576,7 +569,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())),
    {
@@ -617,7 +610,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())
@@ -629,8 +622,6 @@ export const roomsByUrl = derived(roomMetaEventsByIdByUrl, roomMetaEventsByIdByU
      }
    }

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

@@ -638,14 +629,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
@@ -819,8 +818,35 @@ 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}))
+
+      if (membersEvent) {
+        return uniq(getTagValues("member", membersEvent.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 = {
@@ -841,40 +867,53 @@ export const deriveSpaceBannedPubkeyItems = (url: string) => {
  return store
 }

-const getRoomMembers = (_url: string, h: string, events: TrustedEvent[]) => {
-  const members = new Set<string>()
+export const deriveRoomMembers = (url: string, h: string) => {
+  const filters: Filter[] = [
+    {kinds: [ROOM_MEMBERS], "#d": [h]},
+    {kinds: [ROOM_ADD_MEMBER, ROOM_REMOVE_MEMBER], "#h": [h]},
+  ]

-  for (const event of sortEventsAsc(events)) {
-    if (event.kind === ROOM_MEMBERS && getTagValue("d", event.tags) === h) {
-      members.clear()
+  return derived(deriveEventsForUrl(url, filters), $events => {
+    const membersEvent = find(spec({kind: ROOM_MEMBERS}), $events)

-      for (const member of parseRoomMembers(event.tags)) {
-        members.add(member.pubkey)
+    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)
+        }
      }

-      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)
+        }
      }
    }

-    if (event.kind === ROOM_REMOVE_MEMBER) {
-      for (const pubkey of pubkeys) {
-        members.delete(pubkey)
-      }
-    }
-  }
+    return Array.from(members)
+  })
+}

-  return Array.from(members)
+export const deriveRoomAdmins = (url: string, h: string) => {
+  const filters: Filter[] = [{kinds: [ROOM_ADMINS], "#d": [h]}]
+
+  return derived(deriveEventsForUrl(url, filters), $events => {
+    const adminsEvent = first($events)
+
+    if (adminsEvent) {
+      return getPubkeyTagValues(adminsEvent.tags)
+    }
+
+    return []
+  })
 }

 // Action items (admin review queue)
@@ -882,80 +921,34 @@ const getRoomMembers = (_url: string, h: string, events: TrustedEvent[]) => {

 export const deriveSpaceActionItems = (url: string) =>
  derived(
-    [
-      deriveEventsForUrl(url, [
-        {
-          kinds: [REPORT, ROOM_JOIN, ROOM_LEAVE, ROOM_MEMBERS, ROOM_ADD_MEMBER, ROOM_REMOVE_MEMBER],
-        },
-      ]),
-      deriveUserIsSpaceAdmin(url),
-      deriveUserSpacePermissions(url),
-    ],
-    ([$events, $isAdmin, $permissions]) => {
-      if (!$isAdmin) {
-        return []
-      }
-
+    deriveEventsForUrl(url, [
+      {
+        kinds: [REPORT, ROOM_JOIN, ROOM_LEAVE, ROOM_MEMBERS],
+      },
+    ]),
+    $events => {
      const getRoomId = (e: TrustedEvent) =>
        getTagValue(e.kind === ROOM_MEMBERS ? "d" : "h", e.tags)
      const reports = $events.filter(e => e.kind === REPORT)
      const pendingJoins: TrustedEvent[] = []
-      const canReviewReports =
-        $permissions.has(ROOM_PERMISSION_DELETE_EVENT) || $permissions.size === 0
-      const canReviewJoins =
-        $permissions.has(ROOM_PERMISSION_ADD_MEMBER) ||
-        $permissions.has(ROOM_PERMISSION_REMOVE_MEMBER) ||
-        $permissions.has(ROOM_PERMISSION_BAN_USER) ||
-        $permissions.size === 0

      // Room-level join requests — most recent per pubkey+h
      for (const [h, roomEvents] of groupBy(getRoomId, $events)) {
        if (!h) continue

-        const roomJoins: TrustedEvent[] = []
-        const roomLeaves: TrustedEvent[] = []
-        const roomMembershipEvents: TrustedEvent[] = []
-
-        for (const event of roomEvents) {
-          switch (event.kind) {
-            case ROOM_JOIN:
-              roomJoins.push(event)
-              break
-            case ROOM_LEAVE:
-              roomLeaves.push(event)
-              break
-            case ROOM_MEMBERS:
-            case ROOM_ADD_MEMBER:
-            case ROOM_REMOVE_MEMBER:
-              roomMembershipEvents.push(event)
-              break
-          }
-        }
-
-        const roomMembers = new Set(getRoomMembers(url, h, roomMembershipEvents))
+        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
@@ -963,10 +956,7 @@ export const deriveSpaceActionItems = (url: string) =>
        )
      }

-      return sortEventsDesc([
-        ...(canReviewReports ? reports : []),
-        ...(canReviewJoins ? pendingJoins : []),
-      ])
+      return sortEventsDesc([...reports, ...pendingJoins])
    },
  )

@@ -978,50 +968,32 @@ export enum MembershipStatus {
  Granted,
 }

+export const deriveUserIsSpaceAdmin = memoize((url?: string) => {
+  const store = writable(false)
+
+  if (url) {
+    manageRelay(url, {method: ManagementMethod.SupportedMethods, params: []}).then(res =>
+      store.set(Boolean(res.result?.length)),
+    )
+  }
+
+  return store
+})
+
 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
        }
@@ -1040,47 +1012,26 @@ export const deriveUserSpaceMembershipStatus = (url: string) => {
  )
 }

+export const deriveUserIsRoomAdmin = (url: string, h: string) =>
+  derived(
+    [pubkey, deriveRoomAdmins(url, h), deriveUserIsSpaceAdmin(url)],
+    ([$pubkey, $admins, $isSpaceAdmin]) => $isSpaceAdmin || $admins.includes($pubkey!),
+  )
+
 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.some((member: RoomMember) => member.pubkey === $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
        }
@@ -1300,6 +1251,15 @@ export const deriveSocketStatus = (url: string) =>
    }),
  )

+export const deriveSupportedMethods = simpleCache(([url]: [string]) => {
+  return readable<ManagementMethod[]>([], set => {
+    manageRelay(url, {
+      method: ManagementMethod.SupportedMethods,
+      params: [],
+    }).then(({result = []}) => set(result))
+  })
+})
+
 export const deriveHasLivekit = simpleCache(([url]: [string]) =>
  readable<boolean | undefined>(undefined, set => {
    checkRelayHasLivekit(url).then(has => set(has))
@@ -1,6 +1,7 @@
 import {page} from "$app/stores"
 import type {Unsubscriber} from "svelte/store"
-import {last, call, assoc, chunk, WEEK, ago} from "@welshman/lib"
+import {last, call, ifLet, assoc, chunk, WEEK, ago} from "@welshman/lib"
+import {PollResponse} from "nostr-tools/kinds"
 import {merged} from "@welshman/store"
 import {
  getListTags,
@@ -12,16 +13,13 @@ 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 {request, requestOne, Difference, DifferenceEvent} from "@welshman/net"
@@ -43,6 +41,7 @@ import {
 } from "@welshman/app"
 import {
  REACTION_KINDS,
+  MESSAGE_KINDS,
  CONTENT_KINDS,
  INDEXER_RELAYS,
  loadSettings,
@@ -55,9 +54,8 @@ import {
  makeCommentFilter,
  loadFeedsForPubkey,
 } from "@app/core/state"
-import {ROOM_ROLES} from "@app/core/roles"
 import {hasBlossomSupport} from "@app/core/commands"
-import {LIVEKIT_PARTICIPANTS} from "@app/call/voice"
+import {LIVEKIT_PARTICIPANTS} from "@app/voice"

 // Utils

@@ -268,21 +266,53 @@ const syncUserData = () => {

 // 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 roomMetaKinds = [ROOM_META, ROOM_ROLES, ROOM_ADMINS, ROOM_MEMBERS, LIVEKIT_PARTICIPANTS]
-  const roomDeleteKinds = [ROOM_DELETE, ROOM_JOIN, ROOM_LEAVE]
+
+  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 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()
@@ -291,28 +321,36 @@ const syncSpace = (url: string) => {
 const syncSpaces = () => {
  const store = merged([userGroupList, page])
  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))
    }
  })

@@ -1,7 +1,6 @@
 <script lang="ts">
  import {displayRelayUrl} from "@welshman/util"
-  import RoomNameWithImage from "@app/components/RoomNameWithImage.svelte"
-  import {splitRoomId} from "@app/core/state"
+  import {deriveRoom, splitRoomId} from "@app/core/state"

  type Props = {
    value: string
@@ -9,9 +8,11 @@

  const {value}: Props = $props()
  const [url = "", h = ""] = splitRoomId(value)
+  const room = deriveRoom(url, h)
+
+  const label = $derived(`~${displayRelayUrl(url)} / ${$room.name || h}`)
 </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 class="max-w-full overflow-hidden text-ellipsis text-base font-semibold">
+  {label}
 </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
-          },
-        },
-      }),
-    ]
-  },
-})
@@ -26,7 +26,6 @@ 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,
@@ -79,7 +78,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
        },
@@ -200,7 +199,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()
@@ -5,10 +5,10 @@ import {pubkey, tracker, repository, relaysByUrl} from "@welshman/app"
 import {assoc, prop, first, identity, groupBy, now} from "@welshman/lib"
 import type {TrustedEvent} from "@welshman/util"
 import {deriveEventsByIdByUrl} from "@welshman/store"
-import {sortEventsDesc, getTagValue, MESSAGE} from "@welshman/util"
+import {sortEventsDesc, getTagValue} from "@welshman/util"
 import {makeSpacePath, makeRoomPath, makeSpaceChatPath, makeChatPath} from "@app/util/routes"
 import {
-  CONTENT_KINDS,
+  MESSAGE_KINDS,
  notificationSettings,
  chatsById,
  userGroupList,
@@ -85,7 +85,7 @@ export const allNotifications = derived(
        deriveEventsByIdByUrl({
          tracker,
          repository,
-          filters: [{kinds: [MESSAGE, ...CONTENT_KINDS]}, makeCommentFilter(CONTENT_KINDS)],
+          filters: [{kinds: MESSAGE_KINDS}, makeCommentFilter(MESSAGE_KINDS)],
        }),
      ],
      identity,
@@ -17,13 +17,13 @@ import {
  getRelaysFromList,
  getTagValue,
  matchFilters,
-  MESSAGE,
  type Filter,
  type TrustedEvent,
 } from "@welshman/util"
 import {
  DM_KINDS,
  CONTENT_KINDS,
+  MESSAGE_KINDS,
  notificationSettings,
  pushState,
  shouldNotify,
@@ -45,10 +45,7 @@ export type PushPermissionResult = {
 }

 export const onNotification = call(() => {
-  const allFilters = [
-    {kinds: [MESSAGE, ...CONTENT_KINDS, ...DM_KINDS]},
-    makeCommentFilter(CONTENT_KINDS),
-  ]
+  const allFilters = [{kinds: [...MESSAGE_KINDS, ...DM_KINDS]}, makeCommentFilter(MESSAGE_KINDS)]
  const filters = allFilters.map(assoc("since", now()))
  const subscribers: Subscriber<TrustedEvent>[] = []

@@ -161,7 +158,7 @@ export const syncRelaySubscriptions = (
    userSettingsValues,
  ]).subscribe(
    throttle(3000, ([$userSpaceUrls, {spaces, mentions}, {alerts}]) => {
-      const baseFilters = [{kinds: [MESSAGE, ...CONTENT_KINDS]}, makeCommentFilter(CONTENT_KINDS)]
+      const baseFilters = [{kinds: MESSAGE_KINDS}, makeCommentFilter(CONTENT_KINDS)]

      for (const url of $userSpaceUrls) {
        const {notify = true, exceptions = []} = alerts.find(spec({url})) || {}
@@ -6,6 +6,7 @@ import {page} from "$app/stores"
 import {nthEq} from "@welshman/lib"
 import type {TrustedEvent} from "@welshman/util"
 import {getAddress} from "@welshman/util"
+import {Poll} from "nostr-tools/kinds"
 import {tracker, userMessagingRelayList} from "@welshman/app"
 import {identity} from "@welshman/lib"
 import {
@@ -15,7 +16,6 @@ import {
  CLASSIFIED,
  ZAP_GOAL,
  EVENT_TIME,
-  POLL,
  getPubkeyTagValues,
  getRelaysFromList,
 } from "@welshman/util"
@@ -63,11 +63,11 @@ export const goToSpace = async (url: string) => {
  const prevPath = lastPageBySpaceUrl.get(encodeRelay(url))

  if (prevPath && prevPath !== makeSpacePath(url)) {
-    goto(prevPath, {replaceState: true})
+    goto(prevPath)
  } else if (window.matchMedia(`(min-width: ${theme.screens.md})`).matches) {
-    goto(makeSpacePath(url, "recent"), {replaceState: true})
+    goto(makeSpacePath(url, "recent"))
  } else {
-    goto(makeSpacePath(url), {replaceState: true})
+    goto(makeSpacePath(url))
  }
 }

@@ -149,7 +149,7 @@ export const getEventPath = (event: TrustedEvent, urls: string[]) => {
      return makeCalendarPath(url, getAddress(event))
    }

-    if (event.kind === POLL) {
+    if (event.kind === Poll) {
      return makePollPath(url, event.id)
    }

@@ -199,7 +199,7 @@ export const getRoomItemPath = (url: string, event: TrustedEvent) => {
      return makeGoalPath(url, event.id)
    case EVENT_TIME:
      return makeCalendarPath(url, getAddress(event))
-    case POLL:
+    case Poll:
      return makePollPath(url, event.id)
  }
 }
@@ -47,26 +47,12 @@ import {
 } from "@welshman/app"
 import type {Unsubscriber} from "svelte/store"
 import {db} from "@app/core/storage"
-import {ROOM_ROLES} from "@app/core/roles"
-
-// Shared interval for all non-critical store flushes, so they batch on the same cadence
-const FLUSH_INTERVAL = 3000
-
-// Wraps a write callback to run during idle time (non-critical persistence)
-const idleWrite = <T>(f: (xs: T[]) => void): ((xs: T[]) => void) => {
-  if (typeof requestIdleCallback !== "undefined") {
-    return (xs: T[]) => requestIdleCallback(() => f(xs))
-  }
-
-  return f
-}

 const kinds = {
  meta: [PROFILE, FOLLOWS, MUTES, RELAYS, BLOSSOM_SERVERS, MESSAGING_RELAYS, APP_DATA, ROOMS],
  alert: [ALERT_STATUS, ALERT_EMAIL, ALERT_WEB, ALERT_IOS, ALERT_ANDROID],
  space: [RELAY_ADD_MEMBER, RELAY_REMOVE_MEMBER, RELAY_MEMBERS, RELAY_JOIN, RELAY_LEAVE],
  room: [
-    ROOM_ROLES,
    ROOM_META,
    ROOM_DELETE,
    ROOM_ADMINS,
@@ -213,15 +199,14 @@ const loadCriticalRelays = async () => {
  relaysByUrl.set(indexBy(r => r.url, await table.getAll()))
 }

-const syncRelays = () =>
-  onRelay(batch(FLUSH_INTERVAL, idleWrite(db.table<RelayProfile>("relays").bulkPut)))
+const syncRelays = () => onRelay(batch(1000, db.table<RelayProfile>("relays").bulkPut))

 const initRelayStats = async () => {
  const table = db.table<RelayStats>("relayStats")

  relayStatsByUrl.set(indexBy(r => r.url, await table.getAll()))

-  return onRelayStats(batch(FLUSH_INTERVAL, idleWrite(table.bulkPut)))
+  return onRelayStats(batch(1000, table.bulkPut))
 }

 const initHandles = async () => {
@@ -229,7 +214,7 @@ const initHandles = async () => {

  handlesByNip05.set(indexBy(r => r.nip05, await table.getAll()))

-  return onHandle(batch(FLUSH_INTERVAL, idleWrite(table.bulkPut)))
+  return onHandle(batch(1000, table.bulkPut))
 }

 const initZappers = async () => {
@@ -237,7 +222,7 @@ const initZappers = async () => {

  zappersByLnurl.set(indexBy(z => z.lnurl, await table.getAll()))

-  return onZapper(batch(FLUSH_INTERVAL, idleWrite(table.bulkPut)))
+  return onZapper(batch(3000, table.bulkPut))
 }

 const initPlaintext = async () => {
@@ -4,35 +4,21 @@
 */
 import {
  DisconnectReason,
-  LocalParticipant,
-  LocalTrackPublication,
  Room as LiveKitRoom,
  RoomEvent,
  Track,
  supportsAudioOutputSelection,
  type AudioCaptureOptions,
+  type LocalParticipant,
 } from "livekit-client"
-import {derived, get} from "svelte/store"
+import {derived, get, writable} from "svelte/store"
 import {map, removeUndefined, uniqBy} from "@welshman/lib"
 import type {TrustedEvent} from "@welshman/util"
 import {makeHttpAuth, makeHttpAuthHeader, getTags} from "@welshman/util"
 import {signer} from "@welshman/app"
 import {getLivekitEndpoint} from "$lib/livekit"
 import {AbortError, whenAborted, whenTimeout} from "$lib/util"
-import {
-  currentVoiceRoom,
-  currentVoiceSession,
-  participantFromLiveKitIdentity,
-  participantKey,
-  participantPubkeyMap,
-  pubkeyFromLiveKitIdentity,
-  speakingParticipants,
-  VoiceState,
-  type VoiceParticipant,
-  voiceState,
-} from "@app/call/stores"
-import {resetVideoCallLayout, triggerVideoFeedCount, videoPrimaryTileKey} from "@app/call/video"
-import {deriveLatestEventForUrl, deriveRoom, makeRoomId} from "@app/core/state"
+import {deriveLatestEventForUrl, deriveRoom, makeRoomId, type Room} from "@app/core/state"
 import {pushToast} from "@app/util/toast"

 export const LIVEKIT_PARTICIPANTS = 39004
@@ -41,12 +27,30 @@ export {checkRelayHasLivekit} from "$lib/livekit"

 export {supportsAudioOutputSelection}

+export type VoiceSession = {
+  url: string
+  h: string
+  room: LiveKitRoom
+  muted: boolean
+}
+
+export type Pubkey = string
+
+export type VoiceParticipant = {pubkey?: Pubkey; identity: string}
+
+export enum VoiceState {
+  Joining = "joining",
+  Connected = "connected",
+  Disconnected = "disconnected",
+}
+
+export const currentVoiceSession = writable<VoiceSession | undefined>(undefined)
+
 const LIVEKIT_DEFAULT_DEVICE_ID = "default"

 export enum DeviceKind {
  AudioInput = "audioinput",
  AudioOutput = "audiooutput",
-  VideoInput = "videoinput",
 }

 export const switchVoiceActiveDevice = async (
@@ -67,14 +71,17 @@ export const switchVoiceActiveDevice = async (
      case DeviceKind.AudioOutput:
        label = "speaker"
        break
-      case DeviceKind.VideoInput:
-        label = "camera"
-        break
    }
    pushToast({theme: "error", message: `Error changing ${label}`})
  }
 }

+export const voiceState = writable<VoiceState>(VoiceState.Disconnected)
+
+export const currentVoiceRoom = writable<Room | undefined>(undefined)
+
+export const participantPubkeyMap = writable<Map<string, Pubkey>>(new Map())
+
 const addParticipant = (identity: string) => {
  participantPubkeyMap.update(m => {
    const next = new Map(m)
@@ -91,6 +98,24 @@ const deleteParticipant = (identity: string) => {
  })
 }

+export const pubkeyFromLiveKitIdentity = (identity: string): string | undefined =>
+  /^[a-f0-9]{64}$/.test(identity.slice(0, 64)) ? identity.slice(0, 64) : undefined
+
+export const participantFromLiveKitIdentity = (identity: string): VoiceParticipant => {
+  const pk = pubkeyFromLiveKitIdentity(identity)
+  return pk ? {pubkey: pk, identity} : {identity}
+}
+
+export const participantKey = (p: VoiceParticipant) => p.pubkey ?? p.identity
+
+export const speakingParticipants = writable<VoiceParticipant[]>([])
+
+export const isParticipantSpeaking = derived(
+  speakingParticipants,
+  $participants => (p: VoiceParticipant) =>
+    $participants.some(sp => participantKey(sp) === participantKey(p)),
+)
+
 const fetchLivekitToken = async (
  url: string,
  groupId: string,
@@ -172,9 +197,7 @@ const setUpMicrophone = async (
 }

 const onRoomDisconnected = (reason?: DisconnectReason) => {
-  videoPrimaryTileKey.set(undefined)
  currentVoiceSession.set(undefined)
-  resetVideoCallLayout()
  if (reason !== undefined && reason !== DisconnectReason.CLIENT_INITIATED) {
    voiceState.set(VoiceState.Disconnected)
    const message =
@@ -193,16 +216,11 @@ const onTrackSubscribed = (track: Track) => {
    element.style.display = "none"
    document.body.appendChild(element)
    element.play().catch(() => {})
-  } else if (track.kind === Track.Kind.Video) {
-    triggerVideoFeedCount()
  }
 }

 const onTrackUnsubscribed = (track: Track) => {
  track.detach().forEach(el => el.remove())
-  if (track.kind === Track.Kind.Video) {
-    triggerVideoFeedCount()
-  }
 }

 const onActiveSpeakersChanged = (participants: {identity: string}[]) => {
@@ -223,17 +241,6 @@ const onParticipantDisconnected = (participant: {identity: string}) => {
  deleteParticipant(participant.identity)
 }

-const onLocalTrackUnpublished = (
-  publication: LocalTrackPublication,
-  participant: LocalParticipant,
-) => {
-  if (publication.source !== Track.Source.ScreenShare) return
-  const session = get(currentVoiceSession)
-  if (!session || participant.identity !== session.room.localParticipant.identity) return
-  if (!session.screenShareOn) return
-  currentVoiceSession.set({...session, screenShareOn: false})
-}
-
 let joinAbortController: AbortController | undefined

 export const cancelJoinVoiceRoom = () => {
@@ -271,13 +278,12 @@ export const joinVoiceRoom = async (
    liveKitRoom.on(RoomEvent.ParticipantDisconnected, onParticipantDisconnected)
    liveKitRoom.on(RoomEvent.TrackSubscribed, onTrackSubscribed)
    liveKitRoom.on(RoomEvent.TrackUnsubscribed, onTrackUnsubscribed)
-    liveKitRoom.on(RoomEvent.LocalTrackUnpublished, onLocalTrackUnpublished)
    liveKitRoom.on(RoomEvent.ActiveSpeakersChanged, onActiveSpeakersChanged)

    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),
@@ -295,14 +301,7 @@ export const joinVoiceRoom = async (

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

-    currentVoiceSession.set({
-      url,
-      h,
-      room: liveKitRoom,
-      muted,
-      cameraOn: false,
-      screenShareOn: false,
-    })
+    currentVoiceSession.set({url, h, room: liveKitRoom, muted})
    voiceState.set(VoiceState.Connected)
    playJoinSound()
  } catch (e) {
@@ -321,26 +320,8 @@ export const leaveVoiceRoom = async () => {
  const audio = new Audio("/leave-voice-room.mp3")
  audio.play().catch(() => {})

-  if (session.cameraOn) {
-    try {
-      await session.room.localParticipant.setCameraEnabled(false)
-    } catch {
-      pushToast({theme: "error", message: "Error turning off camera."})
-    }
-  }
-
-  if (session.screenShareOn) {
-    try {
-      await session.room.localParticipant.setScreenShareEnabled(false)
-    } catch {
-      pushToast({theme: "error", message: "Error turning off screen sharing."})
-    }
-  }
-
  voiceState.set(VoiceState.Disconnected)
-  videoPrimaryTileKey.set(undefined)
  currentVoiceSession.set(undefined)
-  resetVideoCallLayout()
  session.room.disconnect()
  speakingParticipants.set([])
  participantPubkeyMap.set(new Map())
@@ -1,8 +0,0 @@
-<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-<circle cx="9" cy="6" r="1.5" fill="#000000"/>
-<circle cx="15" cy="6" r="1.5" fill="#000000"/>
-<circle cx="9" cy="12" r="1.5" fill="#000000"/>
-<circle cx="15" cy="12" r="1.5" fill="#000000"/>
-<circle cx="9" cy="18" r="1.5" fill="#000000"/>
-<circle cx="15" cy="18" r="1.5" fill="#000000"/>
-</svg>
@@ -14,10 +14,9 @@
    style?: string
    disabled?: boolean
    "data-tip"?: string
-    "aria-pressed"?: boolean
  } = $props()

-  const className = $derived(`text-left cursor-pointer ${restProps.class}`)
+  const className = $derived(`text-left ${restProps.class}`)

  const onClick = (e: Event) => {
    e.preventDefault()
@@ -68,23 +68,22 @@
  })
 </script>

-<div class="relative focus-within:z-modal grid grid-cols-2 gap-2" bind:this={element}>
-  <div class="relative group z-popover">
+<div class="relative grid grid-cols-2 gap-2" bind:this={element}>
+  <div class="relative">
    <DateInput format="yyyy-MM-dd" placeholder="" bind:value={date} />
-    <div
-      class="absolute right-2 top-0 flex h-12 cursor-pointer items-center gap-2 opacity-100 group-focus-within:opacity-0 group-focus-within:pointer-events-none transition-opacity pointer-events-none">
+    <div class="absolute right-2 top-0 flex h-12 cursor-pointer items-center gap-2">
      {#if date}
-        <Button onclick={clear} class="h-5 pointer-events-auto">
+        <Button onclick={clear} class="h-5">
          <Icon icon={CloseCircle} />
        </Button>
      {:else}
-        <Button onclick={focusDate} class="h-5 pointer-events-auto">
+        <Button onclick={focusDate} class="h-5">
          <Icon icon={CalendarMinimalistic} />
        </Button>
      {/if}
    </div>
  </div>
-  <label class="input input-bordered flex items-center relative">
+  <label class="input input-bordered flex items-center">
    <input
      list="time-options"
      class="grow"
@@ -6,6 +6,7 @@
  import Close from "@assets/icons/close.svg?dataurl"
  import Icon from "@lib/components/Icon.svelte"
  import Button from "@lib/components/Button.svelte"
+  import {clearModals} from "@app/util/modal"

  type Props = {
    onClose?: any
@@ -37,9 +38,9 @@
  )

  const buttonClass = $derived(
-    cx("absolute right-3 z-tooltip btn btn-circle btn-neutral btn-sm", {
+    cx("absolute right-3 btn btn-circle btn-neutral btn-sm", {
      "top-3": fullscreen,
-      "-top-4 mr-sai": !fullscreen,
+      "-top-4": !fullscreen,
    }),
  )
 </script>
@@ -55,7 +56,7 @@
  <div class={wrapperClass}>
    <div class={innerClass} transition:fly>
      {#if !noEscape}
-        <Button class={buttonClass} onclick={onClose}>
+        <Button class={buttonClass} onclick={clearModals}>
          <Icon icon={Close} size={6} />
        </Button>
      {/if}
@@ -14,7 +14,7 @@
  } = $props()
 </script>

-<div class={cx("fixed bottom-20 mb-sai right-4 z-nav hide-on-keyboard md:hidden", className)}>
+<div class={cx("fixed bottom-20 right-4 z-nav hide-on-keyboard md:hidden", className)}>
  <Button
    class="btn btn-primary border-none shadow-xl hover:opacity-90 transition-all size-[50px] rounded-xl p-0"
    {onclick}>
@@ -10,12 +10,7 @@

  let {children, element = $bindable(), ...props}: Props = $props()

-  const className = $derived(
-    cx(
-      props.class,
-      "scroll-container z-feature flex min-h-0 w-full min-w-0 flex-1 flex-col overflow-y-auto overflow-x-hidden",
-    ),
-  )
+  const className = cx(props.class, "scroll-container z-feature overflow-y-auto overflow-x-hidden")
 </script>

 <div {...props} bind:this={element} data-component="PageContent" class={className}>
@@ -4,17 +4,15 @@

  interface Props {
    class?: string
-    visible?: boolean
    children?: Snippet
  }

-  const {children, visible = false, ...props}: Props = $props()
+  const {children, ...props}: Props = $props()
 </script>

 <div
  class={cx(
-    "mt-sai mb-sai max-h-screen w-60 min-h-0 shrink-0 flex-col gap-1 bg-base-300 z-nav",
-    visible ? "flex" : "hidden md:flex",
+    "mt-sai mb-sai max-h-screen w-60 min-h-0 shrink-0 flex-col gap-1 bg-base-300 z-nav hidden md:flex",
    props.class,
  )}>
  {@render children?.()}
@@ -46,9 +46,7 @@ export const whenAborted = (signal?: AbortSignal) => {

 /** Returns a promise that rejects with TimeoutError after ms. Use with Promise.race. */
 export const whenTimeout = (ms: number, opts: {message?: string} = {}) => {
-  return new Promise<never>((_, reject) =>
-    setTimeout(() => reject(new TimeoutError(opts.message)), ms),
-  )
+  return new Promise<never>((_, reject) => setTimeout(() => reject(new TimeoutError()), ms))
 }

 export const buildUrl = (base: string | URL, ...pathname: string[]) => {
@@ -78,21 +78,6 @@
      return
    }

-    if (url.host === "x-callback-url") {
-      if (url.pathname === "/authError") {
-        const errorMessage = url.searchParams.get("errorMessage")
-
-        pushToast({
-          theme: "error",
-          message: errorMessage || "Signer authorization failed.",
-        })
-      }
-
-      if (["/authSuccess", "/authError"].includes(url.pathname)) {
-        return
-      }
-    }
-
    const target = `${url.pathname}${url.search}${url.hash}`
    goto(target, {replaceState: false, noScroll: false})
  })
@@ -4,15 +4,13 @@
  import Dialog from "@lib/components/Dialog.svelte"
  import SpaceInviteAccept from "@app/components/SpaceInviteAccept.svelte"

-  const close = () => goto("/home")
-
  const children = {
    component: SpaceInviteAccept,
    props: {
      invite: $page.url.href,
-      back: close,
+      back: () => goto("/home"),
    },
  }
 </script>

-<Dialog {children} onClose={close} />
+<Dialog {children} />
@@ -40,7 +40,7 @@
 <Page>
  <ContentSearch>
    {#snippet input()}
-      <label class="row-2 input input-bordered w-full">
+      <label class="row-2 input input-bordered">
        <Icon icon={Magnifier} />
        <!-- svelte-ignore a11y_autofocus -->
        <input
@@ -172,9 +172,9 @@
      </strong>
      <Button onclick={() => (showAdvanced = !showAdvanced)}>
        {#if showAdvanced}
-          <Icon icon={AltArrowUp} />
-        {:else}
          <Icon icon={AltArrowDown} />
+        {:else}
+          <Icon icon={AltArrowUp} />
        {/if}
      </Button>
    </div>
@@ -58,14 +58,14 @@
    <RelaySettingsItem
      icon={Inbox}
      title="Inbox Relays"
-      subtitle="Where other people should send notes intended for you. Be sure to select relays that will accept notes that tag you."
+      subtitle="Where you send your public notes. Be sure to select relays that will accept your notes, and which will let people who follow you read them."
      relays={readRelayUrls}
      addRelay={addReadRelay}
      removeRelay={removeReadRelay} />
    <RelaySettingsItem
      icon={Plane}
      title="Outbox Relays"
-      subtitle="Where you send your public notes. Be sure to select relays that will accept your notes, and which will let people who follow you read them."
+      subtitle="Where other people should send notes intended for you. Be sure to select relays that will accept notes that tag you."
      relays={writeRelayUrls}
      addRelay={addWriteRelay}
      removeRelay={removeWriteRelay} />
@@ -1,7 +1,5 @@
 <script lang="ts">
  import {onMount, tick} from "svelte"
-  import {flip} from "svelte/animate"
-  import {cubicOut} from "svelte/easing"
  import {derived as _derived} from "svelte/store"
  import {dec, insertAt, removeAt, sleep} from "@welshman/lib"
  import type {RelayProfile} from "@welshman/util"
@@ -9,7 +7,6 @@
  import {relays, createSearch} from "@welshman/app"
  import {createScroller} from "@lib/html"
  import {fly} from "@lib/transition"
-  import DragHandle from "@assets/icons/drag-handle.svg?dataurl"
  import Widget from "@assets/icons/widget-4.svg?dataurl"
  import AddCircle from "@assets/icons/add-circle.svg?dataurl"
  import Magnifier from "@assets/icons/magnifier.svg?dataurl"
@@ -101,8 +98,6 @@
  const onDragStart = (e: DragEvent, url: string) => {
    draggedUrl = url
    dragStartOrder = [...orderedSpaceUrls]
-    lastDragTarget = undefined
-    didDrop = false

    if (e.dataTransfer) {
      e.dataTransfer.effectAllowed = "move"
@@ -110,25 +105,15 @@
    }
  }

-  const onDragOver = (e: DragEvent) => {
+  const onDragOver = (e: DragEvent, targetUrl: string) => {
    e.preventDefault()
-  }
-
-  const onDragEnter = (e: DragEvent, targetUrl: string) => {
-    e.preventDefault()
-
-    if (lastDragTarget === targetUrl) return
-
-    lastDragTarget = targetUrl
    reorderSpaceUrls(targetUrl)
  }

  const onDrop = (e: DragEvent, targetUrl: string) => {
    e.preventDefault()
    reorderSpaceUrls(targetUrl)
-    didDrop = true
    draggedUrl = undefined
-    lastDragTarget = undefined

    if (dragStartOrder && !isSameOrder(dragStartOrder, orderedSpaceUrls)) {
      void setSpaceMembershipOrder(orderedSpaceUrls).catch(console.error)
@@ -138,14 +123,8 @@
  }

  const onDragEnd = () => {
-    if (!didDrop && dragStartOrder && !isSameOrder(dragStartOrder, orderedSpaceUrls)) {
-      orderedSpaceUrls = dragStartOrder
-    }
-
    draggedUrl = undefined
    dragStartOrder = undefined
-    lastDragTarget = undefined
-    didDrop = false
  }

  $effect(() => {
@@ -164,8 +143,6 @@
  let orderedSpaceUrls = $state<string[]>([])
  let draggedUrl = $state<string | undefined>()
  let dragStartOrder = $state<string[] | undefined>()
-  let lastDragTarget = $state<string | undefined>()
-  let didDrop = $state(false)

  const openSearch = () => {
    showSearch = true
@@ -270,25 +247,17 @@
            <Divider>Your spaces</Divider>
            {#each filteredUserUrls as url (url)}
              <div
-                animate:flip={{duration: 300, easing: cubicOut}}
-                class="transition-opacity duration-200 {draggedUrl === url ? 'opacity-50' : ''}"
+                class:opacity-60={draggedUrl === url}
                draggable="true"
                role="listitem"
                ondragstart={e => onDragStart(e, url)}
-                ondragover={onDragOver}
-                ondragenter={e => onDragEnter(e, url)}
+                ondragover={e => onDragOver(e, url)}
                ondrop={e => onDrop(e, url)}
                ondragend={onDragEnd}>
                <Button
-                  class="group card2 bg-alt shadow-md transition-all hover:shadow-lg hover:dark:brightness-[1.1] w-full relative min-w-0"
+                  class="card2 bg-alt shadow-md transition-all hover:shadow-lg hover:dark:brightness-[1.1] w-full relative"
                  onclick={() => openSpace(url)}>
-                  <div class="flex w-full items-start gap-2">
-                    <div
-                      class="mt-4 flex cursor-grab p-1 text-base-content/30 transition-colors group-hover:text-base-content/60">
-                      <Icon icon={DragHandle} />
-                    </div>
-                    <RelaySummary hideFavorites {url} />
-                  </div>
+                  <RelaySummary hideFavorites {url} />
                  {#if $notifications.has(makeSpacePath(url))}
                    <div class="absolute right-3 top-3 h-2 w-2 rounded-full bg-primary"></div>
                  {/if}
@@ -8,7 +8,7 @@
  import SpaceMenu from "@app/components/SpaceMenu.svelte"

  const url = decodeRelay($page.params.relay!)
-  const md = parseFloat(theme.screens.md) * 16
+  const md = parseInt(theme.screens.md, 10)

  let width = $state(0)

@@ -25,7 +25,7 @@
  <div class="ml-sai mt-sai mb-sai relative z-nav w-14 shrink-0 bg-base-200 pt-2">
    <PrimaryNavSpaces />
  </div>
-  <SecondaryNav visible class="w-auto grow pb-16">
+  <SecondaryNav class="flex! w-auto! grow pb-16">
    <SpaceMenu {url} />
  </SecondaryNav>
 {/if}
@@ -1,14 +1,7 @@
-<script lang="ts">
-  import type {Snippet} from "svelte"
+<script>
  import {page} from "$app/stores"
-
-  type Props = {
-    children?: Snippet
-  }
-
-  const {children}: Props = $props()
 </script>

 {#key $page.url.searchParams.get("at")}
-  {@render children?.()}
+  <slot />
 {/key}
@@ -4,7 +4,6 @@
  import {page} from "$app/stores"
  import {goto} from "$app/navigation"
  import type {Readable} from "svelte/store"
-  import {debounce} from "throttle-debounce"
  import {pubkey, publishThunk, waitForThunkError, joinRoom, leaveRoom} from "@welshman/app"
  import {now, ifLet, int, formatTimestampAsDate, ago, MINUTE} from "@welshman/lib"
  import type {MakeNonOptional} from "@welshman/lib"
@@ -14,7 +13,6 @@
  import ClockCircle from "@assets/icons/clock-circle.svg?dataurl"
  import InfoCircle from "@assets/icons/info-circle.svg?dataurl"
  import Login2 from "@assets/icons/login-3.svg?dataurl"
-  import cx from "classnames"
  import {slide, fade, fly} from "@lib/transition"
  import Button from "@lib/components/Button.svelte"
  import Divider from "@lib/components/Divider.svelte"
@@ -38,15 +36,14 @@
    deriveRoom,
    deriveUserRoomMembershipStatus,
    getRoomType,
+    MESSAGE_KINDS,
    MembershipStatus,
    PROTECTED,
    RoomType,
    userSettingsValues,
  } from "@app/core/state"
  import VoiceWidget from "@app/components/VoiceWidget.svelte"
-  import VideoCallContent from "@app/components/VideoCallContent.svelte"
-  import {VoiceState, currentVoiceRoom, voiceState} from "@app/call/stores"
-  import {VideoCallLayout, videoCallLayout, videoTileCount} from "@app/call/video"
+  import {VoiceState, voiceState} from "@app/voice"
  import {makeFeed} from "@app/core/requests"
  import {popKey} from "@lib/implicit"
  import {checked} from "@app/util/notifications"
@@ -59,49 +56,6 @@
  const url = decodeRelay(relay)
  const room = deriveRoom(url, h)
  const isVoiceRoom = $derived(getRoomType($room) === RoomType.Voice)
-
-  const voiceConnectedHere = $derived(
-    isVoiceRoom &&
-      $voiceState === VoiceState.Connected &&
-      $currentVoiceRoom?.url === url &&
-      $currentVoiceRoom?.h === h,
-  )
-
-  const showMobileVideoPanel = $derived(
-    isVoiceRoom &&
-      $voiceState === VoiceState.Connected &&
-      $videoCallLayout === VideoCallLayout.Video,
-  )
-
-  const pageContentHiddenDesktopVideoOnly = $derived(
-    voiceConnectedHere && $videoCallLayout === VideoCallLayout.Video,
-  )
-
-  let prevVideoTileCount = $state(0)
-
-  $effect(() => {
-    if ($voiceState !== VoiceState.Connected) {
-      videoCallLayout.set(VideoCallLayout.Chat)
-      prevVideoTileCount = 0
-      return
-    }
-
-    const here = isVoiceRoom && $currentVoiceRoom?.url === url && $currentVoiceRoom?.h === h
-    const n = $videoTileCount
-
-    if (!here) {
-      prevVideoTileCount = 0
-      return
-    }
-
-    if (prevVideoTileCount === 0 && n >= 1) {
-      videoCallLayout.set(VideoCallLayout.Video)
-    }
-    if (prevVideoTileCount >= 1 && n === 0 && $videoCallLayout === VideoCallLayout.Split) {
-      videoCallLayout.set(VideoCallLayout.Chat)
-    }
-    prevVideoTileCount = n
-  })
  const shouldProtect = canEnforceNip70(url)
  const membershipStatus = deriveUserRoomMembershipStatus(url, h)
  const at = $derived(parseInt($page.url.searchParams.get("at")!))
@@ -245,8 +199,6 @@
  const onScroll = () => {
    if (!isProgrammaticScroll) {
      userHasScrolled = true
-      isUserScrolling = true
-      clearIsUserScrolling()
      manageScrollPosition()
    }

@@ -268,7 +220,6 @@
  let leaving = $state(false)
  let userHasScrolled = $state(false)
  let isProgrammaticScroll = $state(false)
-  let isUserScrolling = $state(false)
  let loadingBackward = $state(true)
  let loadingForward = $state(true)
  let share = $state(popKey<TrustedEvent | undefined>("share"))
@@ -282,10 +233,6 @@
  let compose: RoomCompose | undefined = $state()
  let eventToEdit: TrustedEvent | undefined = $state()

-  const clearIsUserScrolling = debounce(150, () => {
-    isUserScrolling = false
-  })
-
  const elements = $derived.by(() => {
    const elements = []
    const seen = new Set()
@@ -355,13 +302,9 @@

    elements.reverse()

-    return elements
-  })
+    requestAnimationFrame(manageScrollPosition)

-  $effect(() => {
-    if (elements.length > 0 && !isUserScrolling) {
-      requestAnimationFrame(manageScrollPosition)
-    }
+    return elements
  })

  const start = () => {
@@ -371,7 +314,7 @@
      url,
      at: at || now(),
      element: element!,
-      filters: [{kinds: [MESSAGE, ROOM_ADD_MEMBER], "#h": [h]}],
+      filters: [{kinds: [...MESSAGE_KINDS, ROOM_ADD_MEMBER], "#h": [h]}],
      onBackwardExhausted: () => {
        loadingBackward = false
      },
@@ -421,168 +364,127 @@
  {/snippet}
 </SpaceBar>

-<div
-  class={cx(
-    "flex min-h-0 flex-1 flex-col",
-    voiceConnectedHere && $videoCallLayout === VideoCallLayout.Split && "md:flex-row",
-  )}>
-  {#if voiceConnectedHere}
-    <VideoCallContent
-      layout={$videoCallLayout}
-      {url}
-      {h}
-      class="hidden min-h-0 w-full min-w-0 flex-1 flex-col md:flex" />
-  {/if}
-
-  <div
-    class={cx(
-      "flex min-h-0 min-w-0 flex-1 flex-col",
-      voiceConnectedHere && $videoCallLayout === VideoCallLayout.Video && "md:hidden",
-    )}>
-    {#if isVoiceRoom && $voiceState === VoiceState.Connected}
-      <VideoCallContent layout={$videoCallLayout} mobile {url} {h} class="md:hidden" />
-    {/if}
-
-    <PageContent
-      bind:element
-      onscroll={onScroll}
-      class={cx(
-        showMobileVideoPanel
-          ? "hidden flex-col-reverse pt-4 md:flex md:flex-col-reverse"
-          : "flex flex-col-reverse pt-4",
-        pageContentHiddenDesktopVideoOnly && "md:hidden",
-      )}>
-      {#if $room.isPrivate && $membershipStatus !== MembershipStatus.Granted}
-        <div class="py-20">
-          <div class="card2 col-8 m-auto max-w-md items-center text-center">
-            <p class="opacity-75">You aren't currently a member of this room.</p>
-            {#if $membershipStatus === MembershipStatus.Pending}
-              <Button class="btn btn-neutral btn-sm" disabled={leaving} onclick={leave}>
-                <Icon icon={ClockCircle} />
-                Access Pending
-              </Button>
-            {:else}
-              <Button class="btn btn-neutral btn-sm" disabled={joining} onclick={join}>
-                {#if joining}
-                  <span class="loading loading-spinner loading-sm"></span>
-                {:else}
-                  <Icon icon={Login2} />
-                {/if}
-                Join Room
-              </Button>
-            {/if}
-          </div>
-        </div>
-      {:else}
-        {#if loadingForward}
-          <p class="py-20 flex justify-center">
-            <Spinner loading={loadingForward}>Looking for messages...</Spinner>
-          </p>
-        {/if}
-        {#each elements as { type, id, value, showPubkey, addSpaceBelow }, i (id)}
-          {#if type === "new-messages"}
-            <div
-              {id}
-              class="flex items-center py-2 text-xs transition-colors"
-              class:opacity-0={showFixedNewMessages}>
-              <div class="h-px flex-grow bg-primary"></div>
-              <p class="rounded-full bg-primary px-2 py-1 text-primary-content">New Messages</p>
-              <div class="h-px flex-grow bg-primary"></div>
-            </div>
-          {:else if type === "date"}
-            <Divider>{value}</Divider>
-          {:else}
-            {@const event = value as TrustedEvent}
-            {#if event.kind === ROOM_ADD_MEMBER}
-              <RoomItemAddMember {url} {event} />
-            {:else}
-              <div in:slide class="cv">
-                <RoomItem
-                  {url}
-                  {event}
-                  {replyTo}
-                  {showPubkey}
-                  {addSpaceBelow}
-                  canEdit={canEditEvent}
-                  onEdit={onEditEvent} />
-              </div>
-            {/if}
-          {/if}
-        {/each}
-        <p class="flex h-10 items-center justify-center py-20">
-          {#if loadingBackward}
-            <Spinner loading={loadingBackward}>Looking for messages...</Spinner>
-          {:else}
-            <Spinner>End of message history</Spinner>
-          {/if}
-        </p>
-      {/if}
-      <div class="h-screen"></div>
-    </PageContent>
-
-    <div
-      class={cx(
-        "chat__compose-zone chat__compose flex flex-col gap-1 bg-base-200 md:flex-row md:gap-0",
-        pageContentHiddenDesktopVideoOnly && "md:hidden",
-        showMobileVideoPanel && "max-md:hidden",
-      )}>
-      <div class="chat__compose-inner min-w-0 flex-1">
-        {#if $room.isPrivate && $membershipStatus !== MembershipStatus.Granted}
-          <!-- pass -->
-        {:else if $room.isRestricted && $membershipStatus !== MembershipStatus.Granted}
-          <div class="bg-alt card m-4 flex flex-row items-center justify-between px-4 py-3">
-            <p class="opacity-75">Only members are allowed to post to this room.</p>
-            {#if $membershipStatus === MembershipStatus.Pending}
-              <Button class="btn btn-neutral btn-sm" disabled={leaving} onclick={leave}>
-                <Icon icon={ClockCircle} />
-                Access Pending
-              </Button>
-            {:else}
-              <Button class="btn btn-neutral btn-sm" disabled={joining} onclick={join}>
-                {#if joining}
-                  <span class="loading loading-spinner loading-sm"></span>
-                {:else}
-                  <Icon icon={Login2} />
-                {/if}
-                Ask to Join
-              </Button>
-            {/if}
-          </div>
+<PageContent bind:element onscroll={onScroll} class="flex flex-col-reverse pt-4">
+  {#if $room.isPrivate && $membershipStatus !== MembershipStatus.Granted}
+    <div class="py-20">
+      <div class="card2 col-8 m-auto max-w-md items-center text-center">
+        <p class="opacity-75">You aren't currently a member of this room.</p>
+        {#if $membershipStatus === MembershipStatus.Pending}
+          <Button class="btn btn-neutral btn-sm" disabled={leaving} onclick={leave}>
+            <Icon icon={ClockCircle} />
+            Access Pending
+          </Button>
        {:else}
-          <div>
-            {#if parent}
-              <RoomComposeParent event={parent} clear={clearParent} verb="Replying to" />
+          <Button class="btn btn-neutral btn-sm" disabled={joining} onclick={join}>
+            {#if joining}
+              <span class="loading loading-spinner loading-sm"></span>
+            {:else}
+              <Icon icon={Login2} />
            {/if}
-            {#if share}
-              <RoomComposeParent event={share} clear={clearShare} verb="Sharing" />
-            {/if}
-            {#if eventToEdit}
-              <RoomComposeEdit clear={clearEventToEdit} />
-            {/if}
-          </div>
-          {#key eventToEdit}
-            <RoomCompose
-              {url}
-              {h}
-              {onSubmit}
-              {onEscape}
-              {onEditPrevious}
-              initialValues={eventToEdit}
-              bind:this={compose} />
-          {/key}
+            Join Room
+          </Button>
        {/if}
      </div>
-      {#if isVoiceRoom || $voiceState === VoiceState.Joining || $voiceState === VoiceState.Connected}
-        <div
-          class={cx(
-            "hide-on-keyboard flex-shrink-0 p-2 md:hidden",
-            showMobileVideoPanel && "hidden",
-          )}>
-          <VoiceWidget />
-        </div>
-      {/if}
    </div>
+  {:else}
+    {#if loadingForward}
+      <p class="py-20 flex justify-center">
+        <Spinner loading={loadingForward}>Looking for messages...</Spinner>
+      </p>
+    {/if}
+    {#each elements as { type, id, value, showPubkey, addSpaceBelow } (id)}
+      {#if type === "new-messages"}
+        <div
+          {id}
+          class="flex items-center py-2 text-xs transition-colors"
+          class:opacity-0={showFixedNewMessages}>
+          <div class="h-px grow bg-primary"></div>
+          <p class="rounded-full bg-primary px-2 py-1 text-primary-content">New Messages</p>
+          <div class="h-px grow bg-primary"></div>
+        </div>
+      {:else if type === "date"}
+        <Divider>{value}</Divider>
+      {:else}
+        {@const event = $state.snapshot(value as TrustedEvent)}
+        {#if event.kind === ROOM_ADD_MEMBER}
+          <RoomItemAddMember {url} {event} />
+        {:else}
+          <div in:slide class="cv">
+            <RoomItem
+              {url}
+              {event}
+              {replyTo}
+              {showPubkey}
+              {addSpaceBelow}
+              canEdit={canEditEvent}
+              onEdit={onEditEvent} />
+          </div>
+        {/if}
+      {/if}
+    {/each}
+    <p class="flex h-10 items-center justify-center py-20">
+      {#if loadingBackward}
+        <Spinner loading={loadingBackward}>Looking for messages...</Spinner>
+      {:else}
+        <Spinner>End of message history</Spinner>
+      {/if}
+    </p>
+  {/if}
+  <div class="h-screen"></div>
+</PageContent>
+
+<div class="chat__compose flex flex-col gap-1 bg-base-200 md:flex-row md:gap-0">
+  <div class="chat__compose-inner min-w-0 flex-1">
+    {#if $room.isPrivate && $membershipStatus !== MembershipStatus.Granted}
+      <!-- pass -->
+    {:else if $room.isRestricted && $membershipStatus !== MembershipStatus.Granted}
+      <div class="bg-alt card m-4 flex flex-row items-center justify-between px-4 py-3">
+        <p class="opacity-75">Only members are allowed to post to this room.</p>
+        {#if $membershipStatus === MembershipStatus.Pending}
+          <Button class="btn btn-neutral btn-sm" disabled={leaving} onclick={leave}>
+            <Icon icon={ClockCircle} />
+            Access Pending
+          </Button>
+        {:else}
+          <Button class="btn btn-neutral btn-sm" disabled={joining} onclick={join}>
+            {#if joining}
+              <span class="loading loading-spinner loading-sm"></span>
+            {:else}
+              <Icon icon={Login2} />
+            {/if}
+            Ask to Join
+          </Button>
+        {/if}
+      </div>
+    {:else}
+      <div>
+        {#if parent}
+          <RoomComposeParent event={parent} clear={clearParent} verb="Replying to" />
+        {/if}
+        {#if share}
+          <RoomComposeParent event={share} clear={clearShare} verb="Sharing" />
+        {/if}
+        {#if eventToEdit}
+          <RoomComposeEdit clear={clearEventToEdit} />
+        {/if}
+      </div>
+      {#key eventToEdit}
+        <RoomCompose
+          {url}
+          {h}
+          {onSubmit}
+          {onEscape}
+          {onEditPrevious}
+          initialValues={eventToEdit}
+          bind:this={compose} />
+      {/key}
+    {/if}
  </div>
+  {#if isVoiceRoom || $voiceState === VoiceState.Joining || $voiceState === VoiceState.Connected}
+    <div class="hide-on-keyboard shrink-0 p-2 md:hidden">
+      <VoiceWidget />
+    </div>
+  {/if}
 </div>

 {#if showScrollButton}
@@ -4,7 +4,6 @@
  import {goto} from "$app/navigation"
  import type {Readable} from "svelte/store"
  import {readable} from "svelte/store"
-  import {debounce} from "throttle-debounce"
  import {now, int, ifLet, formatTimestampAsDate, MINUTE, ago} from "@welshman/lib"
  import type {TrustedEvent, EventContent} from "@welshman/util"
  import {makeEvent, MESSAGE, RELAY_ADD_MEMBER} from "@welshman/util"
@@ -26,7 +25,7 @@
  import RoomCompose from "@app/components/RoomCompose.svelte"
  import RoomComposeEdit from "@src/app/components/RoomComposeEdit.svelte"
  import RoomComposeParent from "@app/components/RoomComposeParent.svelte"
-  import {userSettingsValues, decodeRelay, PROTECTED} from "@app/core/state"
+  import {userSettingsValues, decodeRelay, PROTECTED, MESSAGE_KINDS} from "@app/core/state"
  import {prependParent, canEnforceNip70, publishDelete} from "@app/core/commands"
  import {checked} from "@app/util/notifications"
  import {pushToast} from "@app/util/toast"
@@ -140,8 +139,6 @@
  const onScroll = () => {
    if (!isProgrammaticScroll) {
      userHasScrolled = true
-      isUserScrolling = true
-      clearIsUserScrolling()
      manageScrollPosition()
    }

@@ -163,7 +160,6 @@
  let loadingForward = $state(true)
  let userHasScrolled = $state(false)
  let isProgrammaticScroll = $state(false)
-  let isUserScrolling = $state(false)
  let share = $state(popKey<TrustedEvent | undefined>("share"))
  let parent: TrustedEvent | undefined = $state()
  let element: HTMLElement | undefined = $state()
@@ -175,10 +171,6 @@
  let compose: RoomCompose | undefined = $state()
  let eventToEdit: TrustedEvent | undefined = $state()

-  const clearIsUserScrolling = debounce(150, () => {
-    isUserScrolling = false
-  })
-
  const elements = $derived.by(() => {
    const elements = []
    const seen = new Set()
@@ -248,13 +240,9 @@

    elements.reverse()

-    return elements
-  })
+    requestAnimationFrame(manageScrollPosition)

-  $effect(() => {
-    if (elements.length > 0 && !isUserScrolling) {
-      requestAnimationFrame(manageScrollPosition)
-    }
+    return elements
  })

  const start = () => {
@@ -264,7 +252,7 @@
      url,
      at: at || now(),
      element: element!,
-      filters: [{kinds: [MESSAGE, RELAY_ADD_MEMBER]}],
+      filters: [{kinds: [...MESSAGE_KINDS, RELAY_ADD_MEMBER]}],
      onBackwardExhausted: () => {
        loadingBackward = false
      },
@@ -317,7 +305,7 @@
      <Spinner loading={loadingForward}>Looking for messages...</Spinner>
    </p>
  {/if}
-  {#each elements as { type, id, value, showPubkey, addSpaceBelow }, i (id)}
+  {#each elements as { type, id, value, showPubkey, addSpaceBelow } (id)}
    {#if type === "new-messages"}
      <div
        {id}
@@ -330,7 +318,7 @@
    {:else if type === "date"}
      <Divider>{value}</Divider>
    {:else}
-      {@const event = value as TrustedEvent}
+      {@const event = $state.snapshot(value as TrustedEvent)}
      {#if event.kind === RELAY_ADD_MEMBER}
        <RoomItemAddMember {url} {event} />
      {:else}
@@ -5,7 +5,7 @@
  import {page} from "$app/stores"
  import {sortBy, partition, spec, pushToMapKey, max} from "@welshman/lib"
  import type {TrustedEvent} from "@welshman/util"
-  import {getTagValue, POLL} from "@welshman/util"
+  import {getTagValue} from "@welshman/util"
  import {fly} from "@lib/transition"
  import PollIcon from "@assets/icons/revote.svg?dataurl"
  import Add from "@assets/icons/add.svg?dataurl"
@@ -16,6 +16,7 @@
  import SpaceBar from "@app/components/SpaceBar.svelte"
  import PollItem from "@app/components/PollItem.svelte"
  import PollCreate from "@app/components/PollCreate.svelte"
+  import {Poll} from "nostr-tools/kinds"
  import {decodeRelay, makeCommentFilter} from "@app/core/state"
  import {makeFeed} from "@app/core/requests"
  import {pushModal} from "@app/util/modal"
@@ -30,7 +31,7 @@

  const items = $derived.by(() => {
    const scores = new Map<string, number[]>()
-    const [polls, comments] = partition(spec({kind: POLL}), $events)
+    const [polls, comments] = partition(spec({kind: Poll}), $events)

    for (const comment of comments) {
      const id = getTagValue("E", comment.tags)
@@ -47,7 +48,7 @@
    const feed = makeFeed({
      url,
      element: element!,
-      filters: [{kinds: [POLL]}, makeCommentFilter([POLL])],
+      filters: [{kinds: [Poll]}, makeCommentFilter([Poll])],
      onBackwardExhausted: () => {
        loading = false
      },
@@ -3,7 +3,7 @@
  import {page} from "$app/stores"
  import {sleep} from "@welshman/lib"
  import type {MakeNonOptional} from "@welshman/lib"
-  import {COMMENT, POLL, POLL_RESPONSE} from "@welshman/util"
+  import {COMMENT} from "@welshman/util"
  import {repository} from "@welshman/app"
  import {request} from "@welshman/net"
  import {deriveEventsById, deriveEventsAsc} from "@welshman/store"
@@ -18,6 +18,7 @@
  import CommentActions from "@app/components/CommentActions.svelte"
  import EventReply from "@app/components/EventReply.svelte"
  import {deriveEvent, decodeRelay} from "@app/core/state"
+  import {Poll, PollResponse} from "nostr-tools/kinds"

  const {relay, id} = $page.params as MakeNonOptional<typeof $page.params>
  const url = decodeRelay(relay)
@@ -47,7 +48,7 @@

    request({
      relays: [url],
-      filters: [{kinds: [POLL], ids: [id]}, {kinds: [POLL_RESPONSE], "#e": [id]}, ...filters],
+      filters: [{kinds: [Poll], ids: [id]}, {kinds: [PollResponse], "#e": [id]}, ...filters],
      signal: controller.signal,
    })

--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Khushvendra	bdc7d9e070	refactor: simplify ContentLinkUrl rendering	2026-04-11 18:56:23 +05:30
Khushvendra	ebc1e72b28	refactor: extract shared ContentLinkUrl renderer	2026-04-09 00:10:59 +05:30
Khushvendra	540e9abe3d	refactor: align room mention labels with link rendering	2026-04-08 22:26:04 +05:30
Khushvendra	ddb8391b02	refactor: move room and space mention rendering into link components	2026-04-08 22:24:56 +05:30
Khushvendra	12fd552e1b	feat: add room mentions and clickable room/relay refs	2026-04-08 22:21:51 +05:30