fix: safari chat regressions

fix: include MESSAGE kind and local matches in space search
feat: rework hosting page to 2+1 architecture (#231 )
2026-05-03 15:24:33 +05:45 · 2026-04-28 14:44:16 -07:00 · 2026-04-28 14:42:09 -07:00 · 2026-04-28 14:15:12 -07:00 · 2026-04-23 15:35:59 +00:00 · 2026-04-20 16:26:44 +00:00
107 changed files with 2001 additions and 1018 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=
+VITE_THUMBNAIL_URL=https://vthumbs.coracle.social
 VITE_GLITCHTIP_API_KEY=
 GLITCHTIP_AUTH_TOKEN=
@@ -1,4 +1,5 @@
 src/assets
 .claude
 target
 build
 .idea
@@ -13,4 +14,4 @@ ios/App/Pods/
 android/capacitor-cordova-android-plugins
 android/app/src/androidTest
 android/app/src/test
-
+node_modules
@@ -70,6 +70,7 @@ GoogleService-Info.plist
 .roo
 .idea/
 .vscode/
 .claude/
 # OS generated
 .DS_Store
@@ -1,5 +1,36 @@
 # 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 44
+        versionCode 46
-        versionName "1.7.2"
+        versionName "1.7.4"
        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
        aaptOptions {
             // Files and dirs to omit from the packaged assets dir, modified to accommodate modern web apps.
@@ -12,10 +12,12 @@ dependencies {
    implementation project(':aparajita-capacitor-secure-storage')
    implementation project(':capacitor-community-safe-area')
    implementation project(':capacitor-app')
    implementation project(':capacitor-clipboard')
    implementation project(':capacitor-filesystem')
    implementation project(':capacitor-keyboard')
    implementation project(':capacitor-preferences')
    implementation project(':capacitor-push-notifications')
    implementation project(':capacitor-share')
    implementation project(':capawesome-capacitor-android-dark-mode-support')
    implementation project(':capawesome-capacitor-badge')
    implementation project(':nostr-signer-capacitor-plugin')
@@ -7,6 +7,7 @@ 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
@@ -76,6 +77,7 @@ 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 = 20L
+    private const val SOCKET_TIMEOUT_SECONDS = 30L
    private const val REJECTED = "__REJECTED__"
    private const val KIND_RELAY_AUTH = 22242
    private const val KIND_NIP46_RPC = 24133
@@ -72,6 +72,8 @@ class AndroidPushFallbackWorker(context: Context, params: WorkerParameters) : Wo
  }
  override fun doWork(): Result {
    Log.i(TAG, "doWork() started")
    if (isAppInForeground()) {
      return Result.success()
    }
@@ -88,7 +90,7 @@ class AndroidPushFallbackWorker(context: Context, params: WorkerParameters) : Wo
      val activeSince = state.optLong("activeSince", 0L)
      val seen = mutableSetOf<String>()
-      var latestPair: Pair<String, JSONObject>? = null
+      val newEvents = mutableListOf<Pair<String, JSONObject>>()
      for (sub in subscriptions) {
        val cursorKey = CURSOR_PREFIX + sub.relay + ":" + sub.key
@@ -102,23 +104,19 @@ class AndroidPushFallbackWorker(context: Context, params: WorkerParameters) : Wo
        for (event in result.events) {
          val id = event.optString("id", "")
          if (id.isNotEmpty() && seen.add(id)) {
-            val createdAt = event.optLong("created_at", 0L)
+            newEvents.add(Pair(sub.relay, event))
            if (latestPair == null || createdAt > latestPair!!.second.optLong("created_at", 0L)) {
              latestPair = Pair(sub.relay, event)
            }
          }
        }
      }
-      if (latestPair != null) {
+      for ((relay, event) in newEvents) {
        val (relay, event) = latestPair!!
        postNotification(relay, event)
      }
      return Result.success()
    } catch (e: Exception) {
      Log.e(TAG, "Worker failed", e)
-      return Result.success()
+      return Result.retry()
    } finally {
      pool.closeAll()
      client.dispatcher.executorService.shutdown()
@@ -214,7 +212,8 @@ class AndroidPushFallbackWorker(context: Context, params: WorkerParameters) : Wo
      .setContentIntent(pendingIntent)
      .build()
-    NotificationManagerCompat.from(context).notify(1, notification)
+    val notificationId = id.hashCode().let { if (it == 0) 1 else it }
    NotificationManagerCompat.from(context).notify(notificationId, notification)
  }
  private fun matchesFilter(filter: JSONObject, event: JSONObject): Boolean {
@@ -11,6 +11,9 @@ 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')
@@ -23,6 +26,9 @@ 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 = 35;
+				CURRENT_PROJECT_VERSION = 37;
 				DEVELOPMENT_TEAM = S26U9DYW3A;
 				INFOPLIST_FILE = App/Info.plist;
 				INFOPLIST_KEY_CFBundleDisplayName = "Flotilla Chat";
 				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.social-networking";
 				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				MARKETING_VERSION = 1.7.2;
+				MARKETING_VERSION = 1.7.4;
 				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 = 35;
+				CURRENT_PROJECT_VERSION = 37;
 				DEVELOPMENT_TEAM = S26U9DYW3A;
 				INFOPLIST_FILE = App/Info.plist;
 				INFOPLIST_KEY_CFBundleDisplayName = "Flotilla Chat";
 				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.social-networking";
 				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				MARKETING_VERSION = 1.7.2;
+				MARKETING_VERSION = 1.7.4;
 				PRODUCT_BUNDLE_IDENTIFIER = social.flotilla;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -14,10 +14,12 @@ 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.2",
+  "version": "1.7.4",
  "private": true,
  "scripts": {
    "dev": "vite dev",
@@ -48,40 +48,44 @@
    "@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.2",
+    "@pomade/core": "^0.2.3",
    "@poppanator/sveltekit-svg": "^4.2.1",
    "@sveltejs/adapter-static": "^3.0.10",
    "@tiptap/core": "^2.27.2",
    "@tiptap/pm": "^2.27.2",
    "@types/qrcode": "^1.5.6",
    "@types/throttle-debounce": "^5.0.2",
    "@vite-pwa/assets-generator": "^0.2.6",
    "@vite-pwa/sveltekit": "^0.6.8",
-    "@welshman/app": "^0.8.12",
+    "@welshman/app": "^0.8.13",
-    "@welshman/content": "^0.8.12",
+    "@welshman/content": "^0.8.13",
-    "@welshman/editor": "^0.8.12",
+    "@welshman/editor": "^0.8.13",
-    "@welshman/feeds": "^0.8.12",
+    "@welshman/feeds": "^0.8.13",
-    "@welshman/lib": "^0.8.12",
+    "@welshman/lib": "^0.8.13",
-    "@welshman/net": "^0.8.12",
+    "@welshman/net": "^0.8.13",
-    "@welshman/router": "^0.8.12",
+    "@welshman/router": "^0.8.13",
-    "@welshman/signer": "^0.8.12",
+    "@welshman/signer": "^0.8.13",
-    "@welshman/store": "^0.8.12",
+    "@welshman/store": "^0.8.13",
-    "@welshman/util": "^0.8.12",
+    "@welshman/util": "^0.8.13",
    "compressorjs-next": "^1.1.2",
    "daisyui": "^5.5.19",
    "date-picker-svelte": "^2.17.0",
    "dotenv": "^16.6.1",
    "emoji-picker-element": "^1.28.1",
    "emoji-picker-element-data": "^1.8.0",
    "fuse.js": "^7.1.0",
    "husky": "^9.1.7",
    "idb": "^8.0.3",
@@ -105,5 +109,6 @@
    "overrides": {
      "sharp": "0.35.0-rc.0"
    }
-  }
+  },
  "packageManager": "pnpm@10.33.0+sha512.10568bb4a6afb58c9eb3630da90cc9516417abebd3fabbe6739f0ae795728da1491e9db5a544c76ad8eb7570f5c4bb3d6c637b2cb41bfdcdb47fa823c8649319"
 }
@@ -26,6 +26,9 @@ 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
@@ -44,6 +47,9 @@ 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)
@@ -60,8 +66,8 @@ importers:
        specifier: ^1.9.7
        version: 1.9.7
      '@pomade/core':
-        specifier: ^0.2.2
+        specifier: ^0.2.3
-        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))
+        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))
      '@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))
@@ -71,6 +77,9 @@ 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
@@ -84,35 +93,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.12
+        specifier: ^0.8.13
-        version: 0.8.12(3074ef6691f94dc03952d8dbc98013a7)
+        version: 0.8.13(ed9ee8a79a580bcb9fa9bb6eb1a69558)
      '@welshman/content':
-        specifier: ^0.8.12
+        specifier: ^0.8.13
-        version: 0.8.12(nostr-tools@2.20.0(typescript@5.9.3))
+        version: 0.8.13(nostr-tools@2.20.0(typescript@5.9.3))
      '@welshman/editor':
-        specifier: ^0.8.12
+        specifier: ^0.8.13
-        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))
+        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))
      '@welshman/feeds':
-        specifier: ^0.8.12
+        specifier: ^0.8.13
-        version: 0.8.12(d5b74f0c83250e052e0b96f7ff5804e8)
+        version: 0.8.13(29451a19e278ea4a9cf66616f05d5557)
      '@welshman/lib':
-        specifier: ^0.8.12
+        specifier: ^0.8.13
-        version: 0.8.12
+        version: 0.8.13
      '@welshman/net':
-        specifier: ^0.8.12
+        specifier: ^0.8.13
-        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)
+        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)
      '@welshman/router':
-        specifier: ^0.8.12
+        specifier: ^0.8.13
-        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)))
+        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)))
      '@welshman/signer':
-        specifier: ^0.8.12
+        specifier: ^0.8.13
-        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))
+        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))
      '@welshman/store':
-        specifier: ^0.8.12
+        specifier: ^0.8.13
-        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)
+        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)
      '@welshman/util':
-        specifier: ^0.8.12
+        specifier: ^0.8.13
-        version: 0.8.12(@noble/curves@1.9.7)(@welshman/lib@0.8.12)(nostr-tools@2.20.0(typescript@5.9.3))
+        version: 0.8.13(@noble/curves@1.9.7)(@welshman/lib@0.8.13)(nostr-tools@2.20.0(typescript@5.9.3))
      compressorjs-next:
        specifier: ^1.1.2
        version: 1.1.2
@@ -128,6 +137,9 @@ importers:
      emoji-picker-element:
        specifier: ^1.28.1
        version: 1.28.1
      emoji-picker-element-data:
        specifier: ^1.8.0
        version: 1.8.0
      fuse.js:
        specifier: ^7.1.0
        version: 7.1.0
@@ -791,6 +803,11 @@ 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==}
@@ -827,6 +844,11 @@ 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==}
@@ -1427,9 +1449,9 @@ packages:
  '@polka/url@1.0.0-next.29':
    resolution: {integrity: sha512-wwQAWhWSuHaag8c4q/KN/vCoeOJYshAIvMQwD4GpSb3OiZklFfvAgmj0VCBBImRpuF/aFgIRzllXlVX93Jevww==}
-  '@pomade/core@0.2.2':
+  '@pomade/core@0.2.3':
-    resolution: {integrity: sha512-FoilLsO0gVjiKMW3LV63pmXU7x3gh8YVGVulyR6QJr4h47XrsBg8vPkZtKWr4+sH3sW31e2tNIPUb3ptiuhrMA==}
+    resolution: {integrity: sha512-36+abWfMH1Mif9FjBO7xICCkGZE4IqQpy7Csxlauyt0bhYQ9GsB07LqK5Qm3GgEHNwF9rFXdSZawkM+E6BeIfg==}
-    version: 0.2.2
+    version: 0.2.3
    engines: {node: '>=12.0.0'}
    peerDependencies:
      '@frostr/bifrost': ^1.0.7
@@ -2131,83 +2153,83 @@ packages:
      '@vite-pwa/assets-generator':
        optional: true
-  '@welshman/app@0.8.12':
+  '@welshman/app@0.8.13':
-    resolution: {integrity: sha512-kRp+AVzn4i3FvZmdlyMknFUAb/5SnUz9A/cFKkDqWHsd+N3PbNcL2ZOlV9v5NI77GtsDF2ez6PEQfsZxWvkS/g==}
+    resolution: {integrity: sha512-+mUMtt5ibotBk/susPFKXnb9jRjqvIQgWMF28poCIzse08V4kfVClJJlzepvgjqRn6Ma/takr6tNkL6eV4rlRQ==}
    peerDependencies:
      '@pomade/core': ^0.2.1
-      '@welshman/feeds': 0.8.12
+      '@welshman/feeds': 0.8.13
-      '@welshman/lib': 0.8.12
+      '@welshman/lib': 0.8.13
-      '@welshman/net': 0.8.12
+      '@welshman/net': 0.8.13
-      '@welshman/router': 0.8.12
+      '@welshman/router': 0.8.13
-      '@welshman/signer': 0.8.12
+      '@welshman/signer': 0.8.13
-      '@welshman/store': 0.8.12
+      '@welshman/store': 0.8.13
-      '@welshman/util': 0.8.12
+      '@welshman/util': 0.8.13
      svelte: ^4.0.0 || ^5.0.0
-  '@welshman/content@0.8.12':
+  '@welshman/content@0.8.13':
-    resolution: {integrity: sha512-hviVTXdyGf04Xq7mGo/82fq6lnbyuUYOGPkf8pJqPkfGh0f3i9nKof6gkzPvjZeEYSczneI2GpLIxkaZ3w1/tw==}
+    resolution: {integrity: sha512-6ZDKCJ2GKczAULD7P7NZ5DmxFYKw6vfxJ1jpwbQj+0l7alr2IBh8kmaQ8wM1r6n0qOhfcNqeGaaREQxC4VnuHA==}
    peerDependencies:
      nostr-tools: ^2.19.4
-  '@welshman/editor@0.8.12':
+  '@welshman/editor@0.8.13':
-    resolution: {integrity: sha512-CEXszH6pfM1kZHU9WnB6Z97YlxEOtgao6R3hhnBL/kRXy2tUTLpmFWyMONg2vu8Uzxtwz665eZhucLsju60U6w==}
+    resolution: {integrity: sha512-kr4pSjQ/TZnlyIeGo0UNNAQrTGpp0yMRUFD/LwORVLnC8UGNLwGRmFwOz0WNtCxGxFGquTlX1AkNfViWdkfXHw==}
    peerDependencies:
-      '@welshman/lib': 0.8.12
+      '@welshman/lib': 0.8.13
-      '@welshman/util': 0.8.12
+      '@welshman/util': 0.8.13
      nostr-editor: ^1.1.1
      nostr-tools: ^2.19.4
-  '@welshman/feeds@0.8.12':
+  '@welshman/feeds@0.8.13':
-    resolution: {integrity: sha512-Dp/063qdrbe096z6IpIneazsqscfzSwsg09ZNHB6c3OsVb6iLEXLe7mEpATGcRsZ8memuFNLVLIP51eVkBqPcQ==}
+    resolution: {integrity: sha512-zjjKbGG8wQyyuTtm7/7lAGEFbreTp7IO5Y+DZXwBBu/h2/TP/C/v0J0XrshFBqs/wOOURv7vYZlf/bs2En8UIg==}
    peerDependencies:
-      '@welshman/lib': 0.8.12
+      '@welshman/lib': 0.8.13
-      '@welshman/net': 0.8.12
+      '@welshman/net': 0.8.13
-      '@welshman/router': 0.8.12
+      '@welshman/router': 0.8.13
-      '@welshman/signer': 0.8.12
+      '@welshman/signer': 0.8.13
-      '@welshman/util': 0.8.12
+      '@welshman/util': 0.8.13
-  '@welshman/lib@0.8.12':
+  '@welshman/lib@0.8.13':
-    resolution: {integrity: sha512-7Y1GjAcABquWF47A1Jni5JdP+k0GH2yRmEbVhIU+0R0TubCwPAKS38J2LTvtuE9CJMX6hPS9IKEZS6qTOAaVuw==}
+    resolution: {integrity: sha512-fXVoe7zx+jPnqZdRMXLNOJvW+N6E708HSpNGfyBGlu1/OXg70wkEK3r9E67HsBg7pLxnl22tcOYq7r11GhpeFA==}
    engines: {node: '>=12.0.0'}
-  '@welshman/net@0.8.12':
+  '@welshman/net@0.8.13':
-    resolution: {integrity: sha512-Ba71jwb8BBwUfPPtWHKYLB0HqeDYK64oqwxfo5bYldtPfGYrlD+a7lHFSZvNyOhvyXygCaIMnaye1QxWAHP8ng==}
+    resolution: {integrity: sha512-k9BQA2lJI1mnQrf3pR8e3QhCluPtWSSPz2ywTDKq+/pdVXXIjrnsblHA/62d6SjCCSV/n5fONQ08YMivPzgtGA==}
    peerDependencies:
-      '@welshman/lib': 0.8.12
+      '@welshman/lib': 0.8.13
-      '@welshman/util': 0.8.12
+      '@welshman/util': 0.8.13
-  '@welshman/router@0.8.12':
+  '@welshman/router@0.8.13':
-    resolution: {integrity: sha512-Rr7ryBNTvTvjoLsDRMKPuoNJbBv2MgyqN2338p4vVhPMK6MOGM3Nx1og0LpHDGiLlCFuPM8RpParpIWfNnWbKw==}
+    resolution: {integrity: sha512-MJh8YfHpoSsRUI96OnqxnBDoQwjqIMh8N57US0id9cd6iOlkYlVPEUeicJK8Kcl5oT0zmN13UT/4o3d7nZrqcA==}
    peerDependencies:
-      '@welshman/lib': 0.8.12
+      '@welshman/lib': 0.8.13
-      '@welshman/net': 0.8.12
+      '@welshman/net': 0.8.13
-      '@welshman/util': 0.8.12
+      '@welshman/util': 0.8.13
-  '@welshman/signer@0.8.12':
+  '@welshman/signer@0.8.13':
-    resolution: {integrity: sha512-eO4mw2QOR2d2oCS4zgptkCgjC1s8X+1vNnXfWDbtlEwhk7PD4ySSCkpNVMeElq+uluLOugmKvgDc4gfnIH3p2A==}
+    resolution: {integrity: sha512-VgyKxZhJ/Br0q4H8KPfRWAa8WC0EVUc69dxq/Bt1cl7MTBg1EbzolUJhgOgGDOVO0gAKmWYMCnjNochaQy/Wpg==}
-    version: 0.8.12
+    version: 0.8.13
    peerDependencies:
      '@noble/curves': ^1.9.7
      '@noble/hashes': ^2.0.1
-      '@welshman/lib': 0.8.12
+      '@welshman/lib': 0.8.13
-      '@welshman/net': 0.8.12
+      '@welshman/net': 0.8.13
-      '@welshman/util': 0.8.12
+      '@welshman/util': 0.8.13
      nostr-signer-capacitor-plugin: '*'
      nostr-tools: ^2.19.4
-  '@welshman/store@0.8.12':
+  '@welshman/store@0.8.13':
-    resolution: {integrity: sha512-3IUzPRMMVF6Pcw3DaKkfJ4S6bYzVtk6Ze3FnaHs1xJIxkQj9GyBO9VreiovULPW0djsnrP5+1UEN4mKZsG3hXg==}
+    resolution: {integrity: sha512-tnmbaNa8aqFVbklsMZ5y4h9xlHnbwo7o1l6xxJI0hqZnTuXD3IvN5/V58qhfZveUN/Y5Gz2MWQHFWyRBQ71ANg==}
    peerDependencies:
-      '@welshman/lib': 0.8.12
+      '@welshman/lib': 0.8.13
-      '@welshman/net': 0.8.12
+      '@welshman/net': 0.8.13
-      '@welshman/util': 0.8.12
+      '@welshman/util': 0.8.13
      svelte: ^4.0.0 || ^5.0.0
-  '@welshman/util@0.8.12':
+  '@welshman/util@0.8.13':
-    resolution: {integrity: sha512-lgftFt2moXZdN5fuL0RoAnAARV0n0d2+Q56gt7KrBSevjoCbtJgBVX5idvxL5PCEfh81veovJtty6eHxrhQv5A==}
+    resolution: {integrity: sha512-3+CNqJjiHGXKzLOniDqAN4Oe038fV1RRjKiVP0++FDVbq8lShtdcliR7FDg/NTjhhmzivhYqdflNvqjAqOxekA==}
    peerDependencies:
      '@noble/curves': ^1.9.7
-      '@welshman/lib': 0.8.12
+      '@welshman/lib': 0.8.13
      nostr-tools: ^2.19.4
  '@xml-tools/parser@1.0.11':
@@ -2805,6 +2827,9 @@ packages:
    resolution: {integrity: sha512-wkgGT6kugeQk/P6VZ/f4T+4HB41BVgNBq5CDIZVbQ02nvTVqAiVTbskxxu3eA/X96lMlfYOwnLQpN2v5E1zDEg==}
    engines: {node: '>= 0.4.0'}
  emoji-picker-element-data@1.8.0:
    resolution: {integrity: sha512-VfRuRJNEDLS1JKlNS4olaqhjX5S1nnZ+ZHG73b/dV8QeZyi0yPruTPEE72EmF6XO3k/9hj3lybMIYMOYXb/57A==}
  emoji-picker-element@1.28.1:
    resolution: {integrity: sha512-8c64IPish2PWoV9oYCo2pvuPHwIv+uK9bO0dfpPyMupDAvaWL9ZvYhWNTAR+2sx7BhfRjciImqP6CIUgNX+DMg==}
@@ -5969,6 +5994,10 @@ 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
@@ -6006,6 +6035,10 @@ 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)':
@@ -6610,15 +6643,15 @@ snapshots:
  '@polka/url@1.0.0-next.29': {}
-  '@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))':
+  '@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))':
    dependencies:
      '@frostr/bifrost': 1.0.7(typescript@5.9.3)
      '@noble/hashes': 2.0.1
      '@peculiar/x509': 1.14.3
-      '@welshman/lib': 0.8.12
+      '@welshman/lib': 0.8.13
-      '@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/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.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/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.12(@noble/curves@1.9.7)(@welshman/lib@0.8.12)(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))
      cbor-x: 1.6.0
      hash-wasm: 4.12.0
      nostr-tools: 2.20.0(typescript@5.9.3)
@@ -7276,26 +7309,26 @@ snapshots:
    optionalDependencies:
      '@vite-pwa/assets-generator': 0.2.6
-  '@welshman/app@0.8.12(3074ef6691f94dc03952d8dbc98013a7)':
+  '@welshman/app@0.8.13(ed9ee8a79a580bcb9fa9bb6eb1a69558)':
    dependencies:
-      '@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))
+      '@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.12(d5b74f0c83250e052e0b96f7ff5804e8)
+      '@welshman/feeds': 0.8.13(29451a19e278ea4a9cf66616f05d5557)
-      '@welshman/lib': 0.8.12
+      '@welshman/lib': 0.8.13
-      '@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/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.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/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.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/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.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/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.12(@noble/curves@1.9.7)(@welshman/lib@0.8.12)(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))
      fuse.js: 7.1.0
      svelte: 5.48.0
      throttle-debounce: 5.0.2
-  '@welshman/content@0.8.12(nostr-tools@2.20.0(typescript@5.9.3))':
+  '@welshman/content@0.8.13(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.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/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))':
    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))
@@ -7310,64 +7343,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.12
+      '@welshman/lib': 0.8.13
-      '@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/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)
      tippy.js: 6.3.7
-  '@welshman/feeds@0.8.12(d5b74f0c83250e052e0b96f7ff5804e8)':
+  '@welshman/feeds@0.8.13(29451a19e278ea4a9cf66616f05d5557)':
    dependencies:
-      '@welshman/lib': 0.8.12
+      '@welshman/lib': 0.8.13
-      '@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/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.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/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.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/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.12(@noble/curves@1.9.7)(@welshman/lib@0.8.12)(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))
      trava: 1.2.1
-  '@welshman/lib@0.8.12':
+  '@welshman/lib@0.8.13':
    dependencies:
      '@scure/base': 1.2.6
      '@types/events': 3.0.3
      events: 3.3.0
-  '@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/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)':
    dependencies:
-      '@welshman/lib': 0.8.12
+      '@welshman/lib': 0.8.13
-      '@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/util': 0.8.13(@noble/curves@1.9.7)(@welshman/lib@0.8.13)(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.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/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)))':
    dependencies:
-      '@welshman/lib': 0.8.12
+      '@welshman/lib': 0.8.13
-      '@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/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.12(@noble/curves@1.9.7)(@welshman/lib@0.8.12)(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/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/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))':
    dependencies:
      '@noble/curves': 1.9.7
      '@noble/hashes': 2.0.1
-      '@welshman/lib': 0.8.12
+      '@welshman/lib': 0.8.13
-      '@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/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.12(@noble/curves@1.9.7)(@welshman/lib@0.8.12)(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-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/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)':
    dependencies:
-      '@welshman/lib': 0.8.12
+      '@welshman/lib': 0.8.13
-      '@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/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.12(@noble/curves@1.9.7)(@welshman/lib@0.8.12)(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))
      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))':
+  '@welshman/util@0.8.13(@noble/curves@1.9.7)(@welshman/lib@0.8.13)(nostr-tools@2.20.0(typescript@5.9.3))':
    dependencies:
      '@noble/curves': 1.9.7
      '@types/ws': 8.18.1
-      '@welshman/lib': 0.8.12
+      '@welshman/lib': 0.8.13
      js-base64: 3.7.8
      nostr-tools: 2.20.0(typescript@5.9.3)
      nostr-wasm: 0.1.0
@@ -8001,6 +8034,8 @@ snapshots:
    dependencies:
      sax: 1.1.4
  emoji-picker-element-data@1.8.0: {}
  emoji-picker-element@1.28.1: {}
  emoji-regex@8.0.0: {}
@@ -2,6 +2,16 @@
@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);
 }
@@ -22,16 +32,6 @@
  @apply pl-sai pr-sai;
 }
 /* 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 py-sai {
  @apply pt-sai pb-sai;
 }
@@ -327,7 +327,7 @@
 .note-editor .tiptap {
  --tiptap-object-bg: var(--color-base-200);
-  @apply input rounded-box h-auto min-h-32 p-[.65rem] pb-6;
+  @apply input rounded-box block h-auto min-h-32 w-full p-[.65rem] pb-6;
 }
 .input-editor .tiptap {
@@ -425,7 +425,7 @@ body.keyboard-open .hide-on-keyboard {
 /* chat view */
 .chat__compose {
-  @apply relative z-compose mb-14 shrink-0 md:mb-0;
+  @apply z-compose relative mb-14 shrink-0 md:mb-0;
 }
 .chat__compose .chat__compose-inner {
@@ -277,7 +277,7 @@ export const joinVoiceRoom = async (
    try {
      await Promise.race([
        liveKitRoom.connect(server_url, participant_token, {maxRetries: 0}),
-        whenTimeout(5_000, {
+        whenTimeout(15_000, {
          message: "Connection timed out. Please check your network and try again.",
        }),
        whenAborted(signal),
@@ -7,12 +7,13 @@
  type Props = {
    url: string
    h?: string
    shareToChat?: boolean
  }
-  const {url, h}: Props = $props()
+  const {url, h, shareToChat = false}: Props = $props()
 </script>
-<CalendarEventForm {url} {h}>
+<CalendarEventForm {url} {h} {shareToChat}>
  {#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} from "@welshman/app"
+  import {publishThunk, waitForThunkError} 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} from "@app/core/commands"
+  import {canEnforceNip70, publishRoomQuote} from "@app/core/commands"
  type Values = {
    d: string
@@ -36,11 +36,12 @@
  type Props = {
    url: string
    h?: string
    shareToChat?: boolean
    header: Snippet
    initialValues?: Values
  }
-  let {url, h, header, initialValues}: Props = $props()
+  let {url, h, shareToChat = false, header, initialValues}: Props = $props()
  const draftKey = new DraftKey<Values>(`calendar:${url}:${h ?? ""}`)
@@ -57,7 +58,7 @@
  const selectFiles = () => editor.then(ed => ed.chain().selectFiles().run())
  const submit = async () => {
-    if ($uploading) return
+    if ($uploading || loading) return
    if (!title) {
      return pushToast({
@@ -92,22 +93,42 @@
      ...ed.storage.nostr.getEditorTags(),
    ]
-    if (await shouldProtect) {
+    loading = true
-      tags.push(PROTECTED)
+
    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 (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()
  }
  let loading = $state(false)
  const d = $state(initialValues?.d ?? randomId())
  let title = $state(initialValues?.title ?? "")
  let location = $state(initialValues?.location ?? "")
@@ -158,7 +179,11 @@
          <div class="input-editor grow overflow-hidden">
            <EditorContent {editor} />
          </div>
-          <Button data-tip="Add an image" class="center btn tooltip" onclick={selectFiles}>
+          <Button
            data-tip="Add an image"
            class="center btn tooltip"
            onclick={selectFiles}
            disabled={loading}>
            {#if $uploading}
              <span class="loading loading-spinner loading-xs"></span>
            {:else}
@@ -197,12 +222,12 @@
    </Field>
  </ModalBody>
  <ModalFooter>
-    <Button class="btn btn-link" onclick={back}>
+    <Button class="btn btn-link" onclick={back} disabled={loading}>
      <Icon icon={AltArrowLeft} />
      Go back
    </Button>
-    <Button type="submit" class="btn btn-primary" disabled={$uploading}>
+    <Button type="submit" class="btn btn-primary" disabled={$uploading || loading}>
-      <Spinner loading={$uploading}>Save Event</Spinner>
+      <Spinner loading={$uploading || loading}>Save Event</Spinner>
    </Button>
  </ModalFooter>
 </Modal>
@@ -279,7 +279,7 @@
  </div>
 </PageBar>
-<PageContent class="flex flex-col-reverse gap-2 pt-4">
+<PageContent class="flex flex-col-reverse gap-2 py-4">
  {#if missingRelayLists.length > 0}
    <div class="py-12">
      <div class="card2 col-2 m-auto max-w-md items-center text-center">
@@ -7,12 +7,13 @@
  type Props = {
    url: string
    h?: string
    shareToChat?: boolean
  }
-  const {url, h}: Props = $props()
+  const {url, h, shareToChat = false}: Props = $props()
 </script>
-<ClassifiedForm {url} {h}>
+<ClassifiedForm {url} {h} {shareToChat}>
  {#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} from "@welshman/app"
+  import {publishThunk, waitForThunkError} 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, uploadFile} from "@app/core/commands"
+  import {canEnforceNip70, publishRoomQuote, uploadFile} from "@app/core/commands"
  type Values = {
    d: string
@@ -37,11 +37,12 @@
  type Props = {
    url: string
    h?: string
    shareToChat?: boolean
    header: Snippet
    initialValues?: Values
  }
-  let {url, h, header, initialValues}: Props = $props()
+  let {url, h, shareToChat = false, header, initialValues}: Props = $props()
  const draftKey = new DraftKey<Values>(`classified:${url}:${h ?? ""}`)
@@ -87,7 +88,9 @@
        tags.push(["t", topic])
      }
-      if (await shouldProtect) {
+      const protect = await shouldProtect
      if (protect) {
        tags.push(PROTECTED)
      }
@@ -114,13 +117,23 @@
        }
      }
-      publishThunk({
+      const classifiedThunk = 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})
+  const createGoal = () => pushModal(GoalCreate, {url, h, shareToChat: true})
-  const createCalendarEvent = () => pushModal(CalendarEventCreate, {url, h})
+  const createCalendarEvent = () => pushModal(CalendarEventCreate, {url, h, shareToChat: true})
-  const createThread = () => pushModal(ThreadCreate, {url, h})
+  const createThread = () => pushModal(ThreadCreate, {url, h, shareToChat: true})
-  const createClassified = () => pushModal(ClassifiedCreate, {url, h})
+  const createClassified = () => pushModal(ClassifiedCreate, {url, h, shareToChat: true})
-  const createPoll = () => pushModal(PollCreate, {url, h})
+  const createPoll = () => pushModal(PollCreate, {url, h, shareToChat: true})
  let ul: Element
@@ -5,30 +5,32 @@
  import {preventDefault, stopPropagation} from "@lib/html"
  import Link from "@lib/components/Link.svelte"
  import ContentLinkDetail from "@app/components/ContentLinkDetail.svelte"
  import ContentLinkUrl from "@app/components/ContentLinkUrl.svelte"
  import ContentLinkBlockImage from "@app/components/ContentLinkBlockImage.svelte"
  import {pushModal} from "@app/util/modal"
  import {
    dufflepud,
    PLATFORM_URL,
    IMAGE_CONTENT_TYPES,
    PLATFORM_URL,
    VIDEO_CONTENT_TYPES,
    THUMBNAIL_URL,
    isRoomId,
  } from "@app/core/state"
  import {makeSpacePath} from "@app/util/routes"
  const {value, event} = $props()
  let hideImage = $state(false)
  const url = value.url.toString()
-  const fileType = getTagValue("file-type", event.tags) || ""
+  const isRoomOrRelay = isRoomId(url) || isRelayUrl(url)
  const [href, external] = call(() => {
    if (isRelayUrl(url)) return [makeSpacePath(url), false]
    if (url.startsWith(PLATFORM_URL)) return [url.replace(PLATFORM_URL, ""), false]
    return [url, true]
  })
  const fileType = getTagValue("file-type", event.tags) || ""
  const getVideoPoster = (videoUrl: string): string | undefined => {
    if (Capacitor.getPlatform() === "android" && THUMBNAIL_URL) {
      return `${THUMBNAIL_URL}/thumbnail?url=${encodeURIComponent(videoUrl)}`
@@ -54,46 +56,52 @@
  const expand = () => pushModal(ContentLinkDetail, {value, event}, {fullscreen: true})
 </script>
-<Link {external} {href} class="my-2 block">
+{#if isRoomOrRelay}
-  <div class="overflow-hidden rounded-box">
+  <div>
-    {#if url.match(/\.(mov|webm|mp4)$/) || VIDEO_CONTENT_TYPES.includes(fileType)}
+    <ContentLinkUrl {url} class="link-content whitespace-nowrap" />
      <video
        controls
        src={url}
        poster={getVideoPoster(url)}
        preload="metadata"
        class="max-h-96 rounded-box object-contain object-center">
        <track kind="captions" />
      </video>
    {:else if url.match(/\.(jpe?g|png|gif|webp)$/) || IMAGE_CONTENT_TYPES.includes(fileType)}
      <button type="button" onclick={stopPropagation(preventDefault(expand))}>
        <ContentLinkBlockImage {value} {event} class="m-auto max-h-96 rounded-box" />
      </button>
    {:else}
      {#await loadPreview()}
        <div class="center my-12 w-full">
          <span class="loading loading-spinner"></span>
        </div>
      {:then preview}
        <div class="bg-alt flex max-w-xl flex-col leading-normal">
          {#if preview.image && !hideImage}
            <img
              alt=""
              onerror={onError}
              src={preview.image}
              class="bg-alt max-h-72 rounded-t-box object-contain object-center" />
          {/if}
          <div class="flex flex-col gap-2 p-4">
            <strong class="overflow-hidden text-ellipsis whitespace-nowrap"
              >{preview.title || displayUrl(url)}</strong>
            <p>{ellipsize(preview.description, 140)}</p>
          </div>
        </div>
      {:catch}
        <p class="bg-alt p-12 text-center leading-normal">
          Unable to load a preview for {url}
        </p>
      {/await}
    {/if}
  </div>
-</Link>
+{:else}
  <Link {external} {href} class="my-2 block">
    <div class="overflow-hidden rounded-box">
      {#if url.match(/\.(mov|webm|mp4)$/) || VIDEO_CONTENT_TYPES.includes(fileType)}
        <video
          controls
          src={url}
          poster={getVideoPoster(url)}
          preload="metadata"
          class="max-h-96 rounded-box object-contain object-center">
          <track kind="captions" />
        </video>
      {:else if url.match(/\.(jpe?g|png|gif|webp)$/) || IMAGE_CONTENT_TYPES.includes(fileType)}
        <button type="button" onclick={stopPropagation(preventDefault(expand))}>
          <ContentLinkBlockImage {value} {event} class="m-auto max-h-96 rounded-box" />
        </button>
      {:else}
        {#await loadPreview()}
          <div class="center my-12 w-full">
            <span class="loading loading-spinner"></span>
          </div>
        {:then preview}
          <div class="bg-alt flex max-w-xl flex-col leading-normal">
            {#if preview.image && !hideImage}
              <img
                alt=""
                onerror={onError}
                src={preview.image}
                class="bg-alt max-h-72 rounded-t-box object-contain object-center" />
            {/if}
            <div class="flex flex-col gap-2 p-4">
              <strong class="overflow-hidden text-ellipsis whitespace-nowrap"
                >{preview.title || displayUrl(url)}</strong>
              <p>{ellipsize(preview.description, 140)}</p>
            </div>
          </div>
        {:catch}
          <p class="bg-alt p-12 text-center leading-normal">
            Unable to load a preview for {url}
          </p>
        {/await}
      {/if}
    </div>
  </Link>
 {/if}
@@ -1,25 +1,18 @@
 <script lang="ts">
-  import {call, displayUrl} from "@welshman/lib"
+  import {displayUrl} from "@welshman/lib"
-  import {isRelayUrl, getTagValue} from "@welshman/util"
+  import {getTagValue} from "@welshman/util"
  import {preventDefault, stopPropagation} from "@lib/html"
  import LinkRound from "@assets/icons/link-round.svg?dataurl"
  import Icon from "@lib/components/Icon.svelte"
  import Link from "@lib/components/Link.svelte"
  import ContentLinkDetail from "@app/components/ContentLinkDetail.svelte"
  import ContentLinkUrl from "@app/components/ContentLinkUrl.svelte"
  import {pushModal} from "@app/util/modal"
-  import {PLATFORM_URL, IMAGE_CONTENT_TYPES} from "@app/core/state"
+  import {IMAGE_CONTENT_TYPES} from "@app/core/state"
  import {makeSpacePath} from "@app/util/routes"
  const {value, event} = $props()
  const url = value.url.toString()
  const fileType = getTagValue("file-type", event.tags) || ""
  const [href, external] = call(() => {
    if (isRelayUrl(url)) return [makeSpacePath(url), false]
    if (url.startsWith(PLATFORM_URL)) return [url.replace(PLATFORM_URL, ""), false]
    return [url, true]
  })
  const expand = () => pushModal(ContentLinkDetail, {value, event}, {fullscreen: true})
 </script>
@@ -34,8 +27,5 @@
    {displayUrl(url)}
  </a>
 {:else}
-  <Link {external} {href} class="link-content whitespace-nowrap">
+  <ContentLinkUrl {url} class="link-content whitespace-nowrap" />
    <Icon icon={LinkRound} size={3} class="inline-block" />
    {displayUrl(url)}
  </Link>
 {/if}
@@ -0,0 +1,59 @@
 <script lang="ts">
  import {call, displayUrl} from "@welshman/lib"
  import {displayRelayUrl, isRelayUrl, normalizeRelayUrl} from "@welshman/util"
  import LinkRound from "@assets/icons/link-round.svg?dataurl"
  import Icon from "@lib/components/Icon.svelte"
  import Link from "@lib/components/Link.svelte"
  import {PLATFORM_URL, displayRoom, isRoomId, splitRoomId} from "@app/core/state"
  import {makeRoomPath, makeSpacePath} from "@app/util/routes"
  const {
    url,
    class: className = "",
  }: {
    url: string
    class?: string
  } = $props()
  const roomReference = call(() => {
    if (!isRoomId(url)) {
      return undefined
    }
    const [roomUrl, h] = splitRoomId(url)
    if (!roomUrl || !h || !isRelayUrl(roomUrl)) {
      return undefined
    }
    return {url: normalizeRelayUrl(roomUrl), h}
  })
  const relayReference = call(() => {
    if (roomReference || !isRelayUrl(url)) {
      return undefined
    }
    return normalizeRelayUrl(url)
  })
  const [href, external] = call(() => {
    if (roomReference) return [makeRoomPath(roomReference.url, roomReference.h), false]
    if (relayReference) return [makeSpacePath(relayReference), false]
    if (url.startsWith(PLATFORM_URL)) return [url.replace(PLATFORM_URL, ""), false]
    return [url, true]
  })
 </script>
 <Link {external} {href} class={className}>
  {#if roomReference}
    ~<span class="text-primary">{displayRelayUrl(roomReference.url)}</span> /
    {displayRoom(roomReference.url, roomReference.h)}
  {:else if relayReference}
    <span class="text-primary">{displayRelayUrl(relayReference)}</span>
  {:else}
    <Icon icon={LinkRound} size={3} class="inline-block" />
    {displayUrl(url)}
  {/if}
 </Link>
@@ -49,7 +49,7 @@
        <NoteContentMinimal trimParent {url} event={$quote} />
      </div>
    {:else}
-      <NoteCard event={$quote} {url} class="bg-alt rounded-box p-4">
+      <NoteCard noShadow event={$quote} {url} class="bg-alt rounded-box p-4">
        <NoteContentMinimal {url} event={$quote} />
      </NoteCard>
    {/if}
@@ -42,7 +42,7 @@
  let popover: Instance | undefined = $state()
 </script>
-<Button class="join rounded-full">
+<div class="join items-center rounded-full">
  {#if ENABLE_ZAPS && !hideZap}
    <ZapButton {url} {event} class="btn join-item btn-neutral btn-xs">
      <Icon icon={Bolt} size={4} />
@@ -52,6 +52,7 @@
    <Icon icon={SmileCircle} size={4} />
  </EmojiButton>
  <Tippy
    class="flex"
    bind:popover
    component={EventMenu}
    props={{url, noun, event, customActions, onClick: hidePopover}}
@@ -60,4 +61,4 @@
      <Icon icon={MenuDots} size={4} />
    </Button>
  </Tippy>
-</Button>
+</div>
@@ -68,7 +68,7 @@
    })
    const observer = new ResizeObserver(() => {
-      spacer!.style.minHeight = `${form!.offsetHeight}px`
+      spacer!.style.minHeight = `${form!.offsetHeight + 60}px`
    })
    observer.observe(form!)
@@ -84,7 +84,7 @@
  in:fly
  bind:this={form}
  onsubmit={preventDefault(submit)}
-  class="left-content bottom-sai right-sai ml-2 pl-2 fixed z-feature">
+  class="left-content bottom-sai right-sai fixed z-feature mb-14 md:mb-0 w-full md:w-auto pr-2">
  <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} from "@welshman/app"
+  import {publishThunk, waitForThunkError} 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,6 +10,7 @@
  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"
@@ -21,7 +22,7 @@
  import {PROTECTED} from "@app/core/state"
  import {makeEditor} from "@app/editor"
  import {DraftKey} from "@app/util/drafts"
-  import {canEnforceNip70} from "@app/core/commands"
+  import {canEnforceNip70, publishRoomQuote} from "@app/core/commands"
  type Values = {
    title: string
@@ -33,9 +34,10 @@
    url: string
    h?: string
    initialValues?: Values
    shareToChat?: boolean
  }
-  let {url, h, initialValues}: Props = $props()
+  let {url, h, initialValues, shareToChat = false}: Props = $props()
  const draftKey = new DraftKey<Values>(`goal:${url}:${h ?? ""}`)
@@ -52,7 +54,7 @@
  const selectFiles = () => editor.then(ed => ed.commands.selectFiles())
  const submit = async () => {
-    if ($uploading) return
+    if ($uploading || loading) return
    if (!title) {
      return pushToast({
@@ -78,23 +80,43 @@
      ["relays", url],
    ]
-    if (await shouldProtect) {
+    loading = true
-      tags.push(PROTECTED)
+
    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 (h) {
      tags.push(["h", h])
    }
    publishThunk({
      relays: [url],
      event: makeEvent(ZAP_GOAL, {content: title, tags}),
    })
    draftKey.clear()
    history.back()
  }
  let loading = $state(false)
  let title = $state(initialValues?.title ?? "")
  let amount = $state(initialValues?.amount ?? 1000)
  let content = $state(initialValues?.content ?? "")
@@ -154,7 +176,8 @@
        <Button
          data-tip="Add an image"
          class="tooltip tooltip-left absolute bottom-1 right-2"
-          onclick={selectFiles}>
+          onclick={selectFiles}
          disabled={loading}>
          {#if $uploading}
            <span class="loading loading-spinner loading-xs"></span>
          {:else}
@@ -169,16 +192,16 @@
          {/snippet}
          {#snippet input()}
            <div class="flex grow justify-end">
-              <label class="input input-bordered flex items-center gap-2">
+              <label class="input input-bordered flex w-auto items-center gap-2">
                <Icon icon={Bolt} />
-                <input bind:value={amount} type="number" class="w-28" />
+                <input bind:value={amount} type="number" class="w-28 grow" />
-                <p class="opacity-50">sats</p>
+                <p class="shrink-0 opacity-50">sats</p>
              </label>
            </div>
          {/snippet}
        </FieldInline>
        <input
-          class="range range-primary -mt-2"
+          class="range range-primary -mt-2 w-full"
          type="range"
          min="1000"
          max="100000"
@@ -188,10 +211,12 @@
    </div>
  </ModalBody>
  <ModalFooter>
-    <Button class="btn btn-link" onclick={back}>
+    <Button class="btn btn-link" onclick={back} disabled={loading}>
      <Icon icon={AltArrowLeft} />
      Go back
    </Button>
-    <Button type="submit" class="btn btn-primary">Create Goal</Button>
+    <Button type="submit" class="btn btn-primary" disabled={$uploading || loading}>
      <Spinner {loading}>Create Goal</Spinner>
    </Button>
  </ModalFooter>
 </Modal>
@@ -15,6 +15,7 @@
  import ModalHeader from "@lib/components/ModalHeader.svelte"
  import ModalTitle from "@lib/components/ModalTitle.svelte"
  import ModalFooter from "@lib/components/ModalFooter.svelte"
  import ProgressBar from "@app/components/ProgressBar.svelte"
  import {pushToast} from "@app/util/toast"
  import {PLATFORM_NAME} from "@app/core/state"
@@ -22,9 +23,11 @@
    secret: string
    next: () => unknown
    submitText?: string
    step?: number
    totalSteps?: number
  }
-  const {secret, next, submitText = "Continue"}: Props = $props()
+  const {secret, next, submitText = "Continue", step, totalSteps}: Props = $props()
  const back = () => history.back()
@@ -150,6 +153,9 @@
      </Button>
    </div>
  </ModalBody>
  {#if step && totalSteps}
    <ProgressBar current={step} total={totalSteps} />
  {/if}
  <ModalFooter>
    <Button class="btn btn-link" onclick={back}>
      <Icon icon={AltArrowLeft} />
@@ -1,4 +1,5 @@
 <script lang="ts">
  import {Capacitor} from "@capacitor/core"
  import {onMount, onDestroy} from "svelte"
  import type {Nip46ResponseWithResult} from "@welshman/signer"
  import {Nip46Broker} from "@welshman/signer"
@@ -103,10 +104,16 @@
    mode = "connect"
  }
  const openSigner = () => {
    controller.launchSigner()
  }
  const selectBunker = () => {
    mode = "bunker"
  }
  const isIos = Capacitor.getPlatform() === "ios"
  let mode: string = $state("bunker")
  $effect(() => {
@@ -138,6 +145,9 @@
      <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>
@@ -19,6 +19,7 @@
  import LogInOTP from "@app/components/LogInOTP.svelte"
  import LogInSelect from "@app/components/LogInSelect.svelte"
  import {deleteDeactivatedPomadeSessions, loginWithPomade} from "@app/util/pomade"
  import {getPomadeLoginFailureMessage, POMADE_NETWORK_ERROR_MESSAGE} from "@app/util/pomadeErrors"
  import {pushModal, clearModals} from "@app/util/modal"
  import {setChecked} from "@app/util/notifications"
  import {pushToast} from "@app/util/toast"
@@ -44,7 +45,7 @@
        return pushToast({
          theme: "error",
-          message: "Sorry, we were unable to log you in.",
+          message: getPomadeLoginFailureMessage(messages),
        })
      }
@@ -64,10 +65,17 @@
          pushToast({
            theme: "error",
-            message: "Sorry, we were unable to log you in.",
+            message: getPomadeLoginFailureMessage(res.messages),
          })
        }
      }
    } catch (error) {
      console.error("Login error:", error)
      pushToast({
        theme: "error",
        message: POMADE_NETWORK_ERROR_MESSAGE,
      })
    } finally {
      loading = false
    }
@@ -90,7 +98,7 @@
      {#snippet input()}
        <label class="input input-bordered flex w-full items-center gap-2">
          <Icon icon={Letter} />
-          <input bind:value={email} />
+          <input type="email" bind:value={email} />
        </label>
      {/snippet}
    </FieldInline>
@@ -15,6 +15,7 @@
  import ModalSubtitle from "@lib/components/ModalSubtitle.svelte"
  import ModalFooter from "@lib/components/ModalFooter.svelte"
  import LogInOTPConfirm from "@app/components/LogInOTPConfirm.svelte"
  import {POMADE_NETWORK_ERROR_MESSAGE} from "@app/util/pomadeErrors"
  import {pushModal} from "@app/util/modal"
  import {pushToast} from "@app/util/toast"
@@ -35,11 +36,20 @@
      if (ok) {
        pushModal(LogInOTPConfirm, {email, peersByPrefix})
      } else {
        console.error("Pomade challenge request failed during OTP login")
        pushToast({
          theme: "error",
-          message: "Sorry, we were unable to request a login code.",
+          message: POMADE_NETWORK_ERROR_MESSAGE,
        })
      }
    } catch (error) {
      console.error(error)
      pushToast({
        theme: "error",
        message: POMADE_NETWORK_ERROR_MESSAGE,
      })
    } finally {
      loading = false
    }
@@ -61,7 +71,7 @@
      {#snippet input()}
        <label class="input input-bordered flex w-full items-center gap-2">
          <Icon icon={Letter} />
-          <input bind:value={email} />
+          <input type="email" bind:value={email} />
        </label>
      {/snippet}
    </FieldInline>
@@ -15,10 +15,11 @@
  import ModalFooter from "@lib/components/ModalFooter.svelte"
  import StringMultiInput from "@lib/components/StringMultiInput.svelte"
  import LogInSelect from "@app/components/LogInSelect.svelte"
  import {pushToast} from "@app/util/toast"
  import {setChecked} from "@app/util/notifications"
  import {pushModal, clearModals} from "@app/util/modal"
  import {setChecked} from "@app/util/notifications"
  import {deleteDeactivatedPomadeSessions, loginWithPomade} from "@app/util/pomade"
  import {getPomadeLoginFailureMessage, POMADE_NETWORK_ERROR_MESSAGE} from "@app/util/pomadeErrors"
  import {pushToast} from "@app/util/toast"
  type Props = {
    email: string
@@ -44,7 +45,7 @@
        return pushToast({
          theme: "error",
-          message: "Sorry, we were unable to log you in.",
+          message: getPomadeLoginFailureMessage(messages),
        })
      }
@@ -64,10 +65,17 @@
          pushToast({
            theme: "error",
-            message: "Sorry, we were unable to log you in.",
+            message: getPomadeLoginFailureMessage(res.messages),
          })
        }
      }
    } catch (error) {
      console.error("Login error:", error)
      pushToast({
        theme: "error",
        message: POMADE_NETWORK_ERROR_MESSAGE,
      })
    } finally {
      loading = false
    }
@@ -14,6 +14,7 @@
  import ModalFooter from "@lib/components/ModalFooter.svelte"
  import Profile from "@app/components/Profile.svelte"
  import {deleteDeactivatedPomadeSessions, loginWithPomade} from "@app/util/pomade"
  import {getPomadeLoginFailureMessage, POMADE_NETWORK_ERROR_MESSAGE} from "@app/util/pomadeErrors"
  import {setChecked} from "@app/util/notifications"
  import {clearModals} from "@app/util/modal"
  import {pushToast} from "@app/util/toast"
@@ -46,9 +47,16 @@
        pushToast({
          theme: "error",
-          message: "Sorry, we were unable to log you in.",
+          message: getPomadeLoginFailureMessage(res.messages),
        })
      }
    } catch (error) {
      console.error("Login error:", error)
      pushToast({
        theme: "error",
        message: POMADE_NETWORK_ERROR_MESSAGE,
      })
    } finally {
      loading = false
    }
@@ -16,6 +16,7 @@
    children,
    minimal = false,
    hideProfile = false,
    noShadow = false,
    url,
    ...restProps
  }: {
@@ -23,6 +24,7 @@
    children: Snippet
    minimal?: boolean
    hideProfile?: boolean
    noShadow?: boolean
    url?: string
    class?: string
  } = $props()
@@ -34,7 +36,7 @@
  let muted = $state($isEventMuted(event))
 </script>
-<div class="flex flex-col gap-2 shadow-md {restProps.class}">
+<div class="flex flex-col gap-2 {restProps.class}" class:shadow-md={!noShadow}>
  {#if muted}
    <div class="flex items-center justify-between">
      <div class="row-2 relative">
@@ -1,7 +1,6 @@
 <script lang="ts">
  import type {ComponentProps} from "svelte"
-  import {EVENT_TIME, ZAP_GOAL, THREAD, CLASSIFIED} from "@welshman/util"
+  import {EVENT_TIME, ZAP_GOAL, THREAD, CLASSIFIED, POLL} 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"
@@ -21,7 +20,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,7 +1,6 @@
 <script lang="ts">
  import type {ComponentProps} from "svelte"
-  import {EVENT_TIME, ZAP_GOAL, THREAD, CLASSIFIED} from "@welshman/util"
+  import {EVENT_TIME, ZAP_GOAL, THREAD, CLASSIFIED, POLL} 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"
@@ -21,7 +20,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 {PollResponse} from "nostr-tools/kinds"
+  import {POLL_RESPONSE} from "@welshman/util"
  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: [PollResponse], "#e": [props.event.id]}])
+  const responses = deriveEvents([{kinds: [POLL_RESPONSE], "#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 {PollResponse} from "nostr-tools/kinds"
+  import {POLL_RESPONSE} from "@welshman/util"
  import PollVotes from "@app/components/PollVotes.svelte"
  import Content from "@app/components/Content.svelte"
@@ -15,7 +15,7 @@
    request({
      relays: [props.url],
-      filters: [{kinds: [PollResponse], "#e": [props.event.id]}],
+      filters: [{kinds: [POLL_RESPONSE], "#e": [props.event.id]}],
    })
  })
 </script>
@@ -1,8 +1,7 @@
 <script lang="ts">
  import {insertAt, now, randomId, removeAt, removeUndefined} from "@welshman/lib"
-  import {makeEvent} from "@welshman/util"
+  import {makeEvent, POLL} from "@welshman/util"
-  import {publishThunk} from "@welshman/app"
+  import {publishThunk, waitForThunkError} 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"
@@ -13,6 +12,7 @@
  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} from "@app/core/commands"
+  import {canEnforceNip70, publishRoomQuote} from "@app/core/commands"
  import {DraftKey} from "@app/util/drafts"
  import type {PollType} from "@app/util/polls"
@@ -40,9 +40,10 @@
  type Props = {
    url: string
    h?: string
    shareToChat?: boolean
  }
-  const {url, h}: Props = $props()
+  const {url, h, shareToChat = false}: Props = $props()
  const draftKey = new DraftKey<Values>(`poll:${url}:${h ?? ""}`)
  const initialValues = draftKey.get()
@@ -102,6 +103,8 @@
  }
  const submit = async () => {
    if (loading) return
    if (!title.trim()) {
      return pushToast({theme: "error", message: "Please provide a title for your poll."})
    }
@@ -130,19 +133,39 @@
      tags.push(["h", h])
    }
-    if (await shouldProtect) {
+    loading = true
-      tags.push(PROTECTED)
+
    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
    }
    publishThunk({
      relays: [url],
      event: makeEvent(Poll, {content: title.trim(), tags}),
    })
    draftKey.clear()
    history.back()
  }
  let loading = $state(false)
  let draggedOptionId = $state<string | undefined>()
  let title = $state(initialValues?.title ?? "")
  let pollType = $state<PollType>(initialValues?.pollType ?? "singlechoice")
@@ -246,10 +269,12 @@
    </div>
  </ModalBody>
  <ModalFooter>
-    <Button class="btn btn-link" onclick={back}>
+    <Button class="btn btn-link" onclick={back} disabled={loading}>
      <Icon icon={AltArrowLeft} />
      Go back
    </Button>
-    <Button type="submit" class="btn btn-primary">Create Poll</Button>
+    <Button type="submit" class="btn btn-primary" disabled={loading}>
      <Spinner {loading}>Create Poll</Spinner>
    </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: [PollResponse], "#e": [event.id]}])
+  const responses = deriveEvents([{kinds: [POLL_RESPONSE], "#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} from "@welshman/util"
+  import {NOTE, ROOMS, COMMENT, MESSAGE} 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, MESSAGE_KINDS} from "@app/core/state"
+  import {deriveGroupList, getSpaceUrlsFromGroupList} 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_KINDS]},
+        {authors: [pubkey], limit: 1, kinds: [NOTE, COMMENT, MESSAGE]},
      ],
      relays: Router.get().FromPubkeys([pubkey]).getUrls(),
    })
@@ -1,6 +1,6 @@
 <script lang="ts">
  import type {Profile} from "@welshman/util"
-  import {getTag, makeProfile} from "@welshman/util"
+  import {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,26 +10,18 @@
  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 shouldBroadcast = !getTag(PROTECTED, profile.event?.tags || [])
+  const initialValues = {profile}
  const initialValues = {profile, shouldBroadcast}
  const back = () => history.back()
-  const onsubmit = async ({
+  const onsubmit = async ({profile}: {profile: Profile}) => {
    profile,
    shouldBroadcast,
  }: {
    profile: Profile
    shouldBroadcast: boolean
  }) => {
    loading = true
    try {
-      const error = await waitForThunkError(updateProfile({profile, shouldBroadcast}))
+      const error = await waitForThunkError(updateProfile({profile}))
      if (error) {
        pushToast({
@@ -6,7 +6,6 @@
  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"
@@ -17,7 +16,6 @@
  type Values = {
    profile: Profile
    shouldBroadcast: boolean
  }
  type Props = {
@@ -25,9 +23,10 @@
    onsubmit: (values: Values) => void
    isSignup?: boolean
    footer: Snippet
    progressBar?: Snippet
  }
-  const {initialValues, isSignup, onsubmit, footer}: Props = $props()
+  const {initialValues, isSignup, onsubmit, footer, progressBar}: Props = $props()
  const values = $state(initialValues)
@@ -77,7 +76,7 @@
      {/snippet}
      {#snippet input()}
        <textarea
-          class="textarea textarea-bordered leading-4"
+          class="textarea textarea-bordered leading-4 w-full"
          rows="5"
          bind:value={values.profile.about}></textarea>
      {/snippet}
@@ -104,26 +103,10 @@
        {/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>
  {#if progressBar}
    {@render progressBar()}
  {/if}
  <ModalFooter>
    {@render footer()}
  </ModalFooter>
@@ -0,0 +1,9 @@
 <script lang="ts">
  const {current, total}: {current: number; total: number} = $props()
 </script>
 <div class="flex w-full">
  {#each Array(total) as _, i}
    <div class="h-1 flex-1 transition-colors {i < current ? 'bg-primary' : 'bg-base-300'}"></div>
  {/each}
 </div>
@@ -33,6 +33,7 @@
    url?: string
    reactionClass?: string
    noTooltip?: boolean
    innerEvent?: TrustedEvent
    children?: Snippet
  }
@@ -43,23 +44,36 @@
    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": [event.id]}]}),
+    deriveEventsById({repository, filters: [{kinds: [REACTION], "#e": eventIds}]}),
  )
  const zaps = deriveArray(
    deriveItemsByKey<Zap>({
      repository,
      getKey: zap => zap.response.id,
-      filters: [{kinds: [ZAP_RESPONSE], "#e": [event.id]}],
+      filters: [{kinds: [ZAP_RESPONSE], "#e": eventIds}],
-      eventToItem: (response: TrustedEvent) => getValidZap(response, event),
+      eventToItem: (response: TrustedEvent) => {
        const zap = getValidZap(response, event)
        if (zap) {
          return zap
        }
        if (innerEvent) {
          return getValidZap(response, innerEvent)
        }
      },
    }),
  )
@@ -243,7 +243,7 @@
        {/if}
      </div>
    </div>
-    {#if $members.length > 0}
+    {#if $members !== undefined && $members.length > 0}
      <div class="card2 card2-sm bg-alt flex items-center justify-between gap-4">
        <div class="flex items-center gap-4">
          <span>Members:</span>
@@ -251,6 +251,10 @@
        </div>
        <Button class="btn btn-neutral btn-sm" onclick={showMembers}>View All</Button>
      </div>
    {:else if $members === undefined}
      <div class="card2 card2-sm bg-base-200 flex items-center gap-4">
        <span class="text-error">Member list not available from this relay</span>
      </div>
    {/if}
    <div class="card2 card2-sm bg-alt col-4">
      <strong class="text-lg">Room Settings</strong>
@@ -1,8 +1,16 @@
 <script lang="ts">
  import cx from "classnames"
-  import {hash, now, displayList, formatTimestampAsTime, formatTimestampAsDate} from "@welshman/lib"
+  import {readable} from "svelte/store"
  import {
    hash,
    gte,
    now,
    displayList,
    formatTimestampAsTime,
    formatTimestampAsDate,
  } from "@welshman/lib"
  import type {TrustedEvent, EventContent} from "@welshman/util"
-  import {MESSAGE, COMMENT} from "@welshman/util"
+  import {MESSAGE, COMMENT, getTag} from "@welshman/util"
  import {
    thunks,
    pubkey,
@@ -27,7 +35,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} from "@app/core/state"
+  import {colors, ENABLE_ZAPS, deriveEventsForUrl, deriveEvent} from "@app/core/state"
  import {publishDelete, publishReaction, canEnforceNip70} from "@app/core/commands"
  import {getRoomItemPath} from "@app/util/routes"
  import {pushModal} from "@app/util/modal"
@@ -38,7 +46,6 @@
    replyTo?: (event: TrustedEvent) => void
    showPubkey?: boolean
    addSpaceBelow?: boolean
    inert?: boolean
    canEdit: (event: TrustedEvent) => boolean
    onEdit: (event: TrustedEvent) => void
  }
@@ -49,7 +56,6 @@
    replyTo = undefined,
    showPubkey = false,
    addSpaceBelow = false,
    inert = false,
    canEdit,
    onEdit,
  }: Props = $props()
@@ -60,7 +66,15 @@
  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 comments = deriveEventsForUrl(url, [{kinds: [COMMENT], "#e": [event.id]}])
+
  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 reply = () => replyTo!(event)
  const edit = canEdit(event) ? () => onEdit(event) : undefined
@@ -78,7 +92,7 @@
 <TapTarget
  data-event={event.id}
-  onTap={inert ? null : onTap}
+  {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},
@@ -111,7 +125,7 @@
        </div>
      {/if}
      <div class:mt-2={showPubkey && event.kind !== MESSAGE}>
-        <RoomItemContent {url} {event} />
+        <RoomItemContent {url} event={$innerEvent ?? event} />
        {#if thunk}
          <ThunkFailure showToastOnRetry {thunk} class="mt-2 text-sm" />
        {/if}
@@ -124,9 +138,10 @@
      {event}
      {deleteReaction}
      {createReaction}
-      reactionClass="tooltip-right" />
+      reactionClass="tooltip-right"
-    {#if path && $comments.length > 0}
+      innerEvent={$innerEvent} />
-      {@const pubkeys = $comments.map(e => e.pubkey)}
+    {#if path && $innerComments.length > 0}
      {@const pubkeys = $innerComments.map(e => e.pubkey)}
      {@const isOwn = $pubkey && pubkeys.includes($pubkey)}
      {@const info = displayList(pubkeys.map(pubkey => displayProfileByPubkey(pubkey)))}
      {@const tooltip = `${info} commented`}
@@ -138,7 +153,7 @@
            "btn-primary": isOwn,
          })}>
          <Icon icon={ReplyAlt} />
-          <span>{$comments.length} comment{$comments.length === 1 ? "" : "s"}</span>
+          <span>{$innerComments.length} comment{$innerComments.length === 1 ? "" : "s"}</span>
        </Link>
      </div>
    {/if}
@@ -8,16 +8,17 @@
  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} />
+      <NoteContent {...props} {minLength} {maxLength} />
    </Link>
  {:else}
-    <NoteContent {...props} />
+    <NoteContent {...props} {minLength} {maxLength} />
  {/if}
 </div>
@@ -73,34 +73,44 @@
      </ModalSubtitle>
    </ModalHeader>
    <div class="flex flex-col gap-2">
-      {#each $members as pubkey (pubkey)}
+      {#if $members === undefined}
-        <div class="card2 bg-alt relative">
+        <div class="card2 bg-base-200 p-4">
-          <div class="flex items-center justify-between gap-2">
+          <span class="text-error">Member list not available from this relay</span>
-            <div class="min-w-0 flex-1">
+        </div>
-              <Profile {pubkey} {url} />
+      {:else if $members.length === 0}
-            </div>
+        <div class="card2 bg-base-200 p-4">
-            <div class="relative">
+          <span class="text-base-content/70">No members yet</span>
-              <Button class="btn btn-circle btn-ghost btn-sm" onclick={() => toggleMenu(pubkey)}>
+        </div>
-                <Icon icon={MenuDots} />
+      {:else}
-              </Button>
+        {#each $members as pubkey (pubkey)}
-              {#if menuPubkey === pubkey}
+          <div class="card2 bg-alt relative">
-                <Popover hideOnClick onClose={closeMenu}>
+            <div class="flex items-center justify-between gap-2">
-                  <ul
+              <div class="min-w-0 flex-1">
-                    transition:fly
+                <Profile {pubkey} {url} />
-                    class="menu absolute right-0 z-popover mt-2 w-48 gap-1 rounded-box bg-base-100 p-2 shadow-md">
+              </div>
-                    <li>
+              <div class="relative">
-                      <Button class="text-error" onclick={() => removeMember(pubkey)}>
+                <Button class="btn btn-circle btn-ghost btn-sm" onclick={() => toggleMenu(pubkey)}>
-                        <Icon icon={MinusCircle} />
+                  <Icon icon={MenuDots} />
-                        Remove Member
+                </Button>
-                      </Button>
+                {#if menuPubkey === pubkey}
-                    </li>
+                  <Popover hideOnClick onClose={closeMenu}>
-                  </ul>
+                    <ul
-                </Popover>
+                      transition:fly
-              {/if}
+                      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>
-        </div>
+        {/each}
-      {/each}
+      {/if}
    </div>
  </ModalBody>
  <ModalFooter>
@@ -56,6 +56,11 @@
  }
  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-3">
+  <div class="flex items-center gap-2">
    <RoomImage {url} {h} />
    <div class="min-w-0 overflow-hidden text-ellipsis">
      <RoomName {url} {h} />
@@ -62,9 +62,10 @@
  const flows = {
    email: {
-      start: () => pushModal(SignUpEmail, {next: flows.email.profile}),
+      start: () => pushModal(SignUpEmail, {next: flows.email.profile, step: 1, totalSteps: 3}),
-      profile: () => pushModal(SignUpProfile, {next: flows.email.complete}),
+      profile: () => pushModal(SignUpProfile, {next: flows.email.complete, step: 2, totalSteps: 3}),
-      complete: () => pushModal(SignUpComplete, {next: flows.email.finalize}),
+      complete: () =>
        pushModal(SignUpComplete, {next: flows.email.finalize, step: 3, totalSteps: 3}),
      finalize: () => {
        const email = getKey<string>("signup.email")!
        const clientOptions = getKey<ClientOptions>("signup.clientOptions")!
@@ -74,9 +75,10 @@
      },
    },
    nostr: {
-      start: () => pushModal(SignUpProfile, {next: flows.nostr.key}),
+      start: () => pushModal(SignUpProfile, {next: flows.nostr.key, step: 1, totalSteps: 3}),
-      key: () => pushModal(SignUpKey, {next: flows.nostr.complete}),
+      key: () => pushModal(SignUpKey, {next: flows.nostr.complete, step: 2, totalSteps: 3}),
-      complete: () => pushModal(SignUpComplete, {next: flows.nostr.finalize}),
+      complete: () =>
        pushModal(SignUpComplete, {next: flows.nostr.finalize, step: 3, totalSteps: 3}),
      finalize: () => {
        const secret = getKey<string>("signup.secret")!
@@ -9,12 +9,15 @@
  import ModalHeader from "@lib/components/ModalHeader.svelte"
  import ModalTitle from "@lib/components/ModalTitle.svelte"
  import ModalFooter from "@lib/components/ModalFooter.svelte"
  import ProgressBar from "@app/components/ProgressBar.svelte"
  type Props = {
    next: () => void
    step?: number
    totalSteps?: number
  }
-  const {next}: Props = $props()
+  const {next, step, totalSteps}: Props = $props()
  const back = () => history.back()
 </script>
@@ -33,6 +36,9 @@
      on groups you've already joined. Click below to get started!
    </p>
  </ModalBody>
  {#if step && totalSteps}
    <ProgressBar current={step} total={totalSteps} />
  {/if}
  <ModalFooter>
    <Button class="btn btn-link" onclick={back}>
      <Icon icon={AltArrowLeft} />
@@ -18,14 +18,17 @@
  import ModalSubtitle from "@lib/components/ModalSubtitle.svelte"
  import ModalFooter from "@lib/components/ModalFooter.svelte"
  import SignUpEmailConfirm from "@app/components/SignUpEmailConfirm.svelte"
  import ProgressBar from "@app/components/ProgressBar.svelte"
  import {pushToast, popToast} from "@app/util/toast"
  import {pushModal} from "@app/util/modal"
  type Props = {
    next: () => void
    step?: number
    totalSteps?: number
  }
-  const {next}: Props = $props()
+  const {next, step, totalSteps}: Props = $props()
  const back = () => history.back()
@@ -81,7 +84,7 @@
      setKey("signup.clientOptions", clientOptions)
      popToast(toastId)
-      pushModal(SignUpEmailConfirm, {next})
+      pushModal(SignUpEmailConfirm, {next, step, totalSteps})
    } catch (e) {
      console.error(e)
@@ -120,7 +123,7 @@
      {#snippet input()}
        <label class="input input-bordered flex w-full items-center gap-2">
          <Icon icon={Letter} />
-          <input bind:value={email} />
+          <input type="email" bind:value={email} />
        </label>
      {/snippet}
    </FieldInline>
@@ -134,8 +137,14 @@
          <input type="password" bind:value={password} />
        </label>
      {/snippet}
      {#snippet info()}
        Must be at least 12 characters long.
      {/snippet}
    </FieldInline>
  </ModalBody>
  {#if step && totalSteps}
    <ProgressBar current={step} total={totalSteps} />
  {/if}
  <ModalFooter>
    <Button class="btn btn-link" onclick={back}>
      <Icon icon={AltArrowLeft} />
@@ -15,12 +15,15 @@
  import ModalTitle from "@lib/components/ModalTitle.svelte"
  import ModalSubtitle from "@lib/components/ModalSubtitle.svelte"
  import ModalFooter from "@lib/components/ModalFooter.svelte"
  import ProgressBar from "@app/components/ProgressBar.svelte"
  type Props = {
    next: () => void
    step?: number
    totalSteps?: number
  }
-  const {next}: Props = $props()
+  const {next, step, totalSteps}: Props = $props()
  const email = getKey<string>("signup.email")
@@ -61,6 +64,9 @@
      above.
    </p>
  </ModalBody>
  {#if step && totalSteps}
    <ProgressBar current={step} total={totalSteps} />
  {/if}
  <ModalFooter>
    <Button class="btn btn-link" onclick={back} disabled={loading}>
      <Icon icon={AltArrowLeft} />
@@ -4,11 +4,13 @@
  type Props = {
    next: () => void
    step?: number
    totalSteps?: number
  }
-  const {next}: Props = $props()
+  const {next, step, totalSteps}: Props = $props()
  const secret = getKey<string>("signup.secret")!
 </script>
-<KeyDownload {secret} {next} />
+<KeyDownload {secret} {next} {step} {totalSteps} />
@@ -5,19 +5,20 @@
  import {getKey, setKey} from "@lib/implicit"
  import Icon from "@lib/components/Icon.svelte"
  import Button from "@lib/components/Button.svelte"
  import Modal from "@lib/components/Modal.svelte"
  import ModalBody from "@lib/components/ModalBody.svelte"
  import ProfileEditForm from "@app/components/ProfileEditForm.svelte"
  import ProgressBar from "@app/components/ProgressBar.svelte"
  type Props = {
    next: () => void
    step?: number
    totalSteps?: number
  }
-  const {next}: Props = $props()
+  const {next, step, totalSteps}: Props = $props()
  const profile = getKey<Profile>("signup.profile")!
-  const initialValues = {profile, shouldBroadcast: false}
+  const initialValues = {profile}
  const back = () => history.back()
@@ -27,19 +28,20 @@
  }
 </script>
-<Modal>
+<ProfileEditForm isSignup {initialValues} {onsubmit}>
-  <ModalBody>
+  {#snippet footer()}
-    <ProfileEditForm isSignup {initialValues} {onsubmit}>
+    <Button class="btn btn-link" onclick={back}>
-      {#snippet footer()}
+      <Icon icon={AltArrowLeft} />
-        <Button class="btn btn-link" onclick={back}>
+      Go back
-          <Icon icon={AltArrowLeft} />
+    </Button>
-          Go back
+    <Button class="btn btn-primary" type="submit">
-        </Button>
+      Create Account
-        <Button class="btn btn-primary" type="submit">
+      <Icon icon={AltArrowRight} />
-          Create Account
+    </Button>
-          <Icon icon={AltArrowRight} />
+  {/snippet}
-        </Button>
+  {#snippet progressBar()}
-      {/snippet}
+    {#if step && totalSteps}
-    </ProfileEditForm>
+      <ProgressBar current={step} total={totalSteps} />
-  </ModalBody>
+    {/if}
-</Modal>
+  {/snippet}
 </ProfileEditForm>
@@ -3,7 +3,9 @@
  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"
@@ -23,36 +25,72 @@
  const {url} = $props()
  const authError = deriveRelayAuthError(url)
  let networkError = $state(false)
  const isExplicitAuthError = $derived(
    $authError &&
      !(
        $authError.toLowerCase().includes("failed") ||
        $authError.toLowerCase().includes("timeout") ||
        $authError.toLowerCase().includes("network")
      ),
  )
  const isGenericError = $derived(networkError || ($authError && !isExplicitAuthError))
  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 () => {
-    const [[event]] = await Promise.all([
+    try {
-      request({
+      const {value} = await Share.canShare()
-        relays: [url],
+      canShare = value
-        autoClose: true,
+    } catch {
-        signal: AbortSignal.timeout(3000),
+      canShare = false
-        filters: [{kinds: [RELAY_INVITE]}],
+    }
      }),
      sleep(2000),
    ])
-    claim = getTagValue("claim", event?.tags || []) || ""
+    try {
-    loading = false
+      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 (err) {
      claim = ""
      if (
        (err instanceof Error && (err.name === "AbortError" || err.name === "TimeoutError")) ||
        !navigator.onLine
      ) {
        networkError = true
      }
    } finally {
      loading = false
    }
  })
 </script>
@@ -70,20 +108,36 @@
        <p class="center">
          <Spinner {loading}>Requesting an invite link...</Spinner>
        </p>
-      {:else if $authError}
+      {:else if isGenericError}
        <p class="center text-center">
          Unable to reach the relay. Please check your connection and try again.
        </p>
      {:else if isExplicitAuthError}
        <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">
-          <QRCode code={invite} />
+          <div class="w-48">
            <QRCode code={invite} />
          </div>
          <Field>
            {#snippet input()}
-              <label class="input input-bordered flex w-full items-center gap-2">
+              <div class="flex w-full gap-2">
-                <Icon icon={LinkRound} />
+                {#if canShare}
-                <input bind:value={invite} class="grow" type="text" />
+                  <Button
-                <Button onclick={copyInvite}>
+                    class="input input-bordered flex shrink-0 w-12 items-center justify-center p-0"
-                  <Icon icon={Copy} />
+                    onclick={shareInvite}>
-                </Button>
+                    <Icon icon={Upload} />
-              </label>
+                  </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>
            {/snippet}
            {#snippet info()}
              <p>
@@ -112,46 +112,58 @@
      {/if}
    {/if}
    <div class="flex flex-col gap-2">
-      {#each $members as pubkey (pubkey)}
+      {#if $members === undefined}
-        <div class="card2 card2-sm bg-alt relative">
+        <div class="card2 bg-base-200 p-4">
-          <div class="flex items-center justify-between gap-2">
+          <span class="text-error">Member list not available from this space</span>
            <div class="min-w-0 flex-1">
              <Profile {pubkey} {url} />
            </div>
            {#if canBan || canUnallow}
              <div class="relative">
                <Button class="btn btn-circle btn-ghost btn-sm" onclick={() => toggleMenu(pubkey)}>
                  <Icon icon={MenuDots} />
                </Button>
                {#if menuPubkey === pubkey}
                  <Popover hideOnClick onClose={closeMenu}>
                    <ul
                      transition:fly
                      class="menu absolute right-0 z-popover mt-2 w-48 gap-1 rounded-box bg-base-100 p-2 shadow-md">
                      {#if canUnallow}
                        <li>
                          <Button onclick={() => unallowMember(pubkey)}>
                            <Icon icon={UserMinus} />
                            Remove User
                          </Button>
                        </li>
                      {/if}
                      {#if canBan}
                        <li>
                          <Button class="text-error" onclick={() => banMember(pubkey)}>
                            <Icon icon={MinusCircle} />
                            Ban User
                          </Button>
                        </li>
                      {/if}
                    </ul>
                  </Popover>
                {/if}
              </div>
            {/if}
          </div>
        </div>
-      {/each}
+      {:else if $members.length === 0}
        <div class="card2 bg-base-200 p-4">
          <span class="text-base-content/70">No members yet</span>
        </div>
      {:else}
        {#each $members as pubkey (pubkey)}
          <div class="card2 card2-sm bg-alt relative">
            <div class="flex items-center justify-between gap-2">
              <div class="min-w-0 flex-1">
                <Profile {pubkey} {url} />
              </div>
              {#if canBan || canUnallow}
                <div class="relative">
                  <Button
                    class="btn btn-circle btn-ghost btn-sm"
                    onclick={() => toggleMenu(pubkey)}>
                    <Icon icon={MenuDots} />
                  </Button>
                  {#if menuPubkey === pubkey}
                    <Popover hideOnClick onClose={closeMenu}>
                      <ul
                        transition:fly
                        class="menu absolute right-0 z-popover mt-2 w-48 gap-1 rounded-box bg-base-100 p-2 shadow-md">
                        {#if canUnallow}
                          <li>
                            <Button onclick={() => unallowMember(pubkey)}>
                              <Icon icon={UserMinus} />
                              Remove User
                            </Button>
                          </li>
                        {/if}
                        {#if canBan}
                          <li>
                            <Button class="text-error" onclick={() => banMember(pubkey)}>
                              <Icon icon={MinusCircle} />
                              Ban User
                            </Button>
                          </li>
                        {/if}
                      </ul>
                    </Popover>
                  {/if}
                </div>
              {/if}
            </div>
          </div>
        {/each}
      {/if}
    </div>
  </ModalBody>
  <ModalFooter>
@@ -1,7 +1,6 @@
 <script lang="ts">
  import {derived} from "svelte/store"
-  import {displayRelayUrl, EVENT_TIME, ZAP_GOAL, THREAD, CLASSIFIED} from "@welshman/util"
+  import {displayRelayUrl, EVENT_TIME, ZAP_GOAL, THREAD, CLASSIFIED, POLL} 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"
@@ -181,7 +180,11 @@
            <li>
              <Button onclick={showMembers}>
                <Icon icon={UserRounded} />
-                View Members ({$members.length})
+                {#if $members === undefined}
                  View Members
                {:else}
                  View Members ({$members.length})
                {/if}
              </Button>
            </li>
            {#if $userIsAdmin}
@@ -263,7 +266,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">
+        <p class="badge badge-neutral text-wrap h-auto">
          <span class="ellipsize">Supported NIPs: {supported_nips.join(", ")}</span>
        </p>
      {/if}
@@ -2,9 +2,10 @@
  import {tick} from "svelte"
  import {debounce} from "throttle-debounce"
  import {request} from "@welshman/net"
-  import {formatTimestampAsDate, groupBy, now, MINUTE, HOUR, DAY, WEEK} from "@welshman/lib"
+  import {repository, tracker} from "@welshman/app"
  import {formatTimestampAsDate, groupBy, uniqBy, now, MINUTE, HOUR, DAY, WEEK} from "@welshman/lib"
  import type {TrustedEvent, Filter} from "@welshman/util"
-  import {sortEventsDesc} from "@welshman/util"
+  import {MESSAGE, sortEventsDesc} from "@welshman/util"
  import CloseCircle from "@assets/icons/close-circle.svg?dataurl"
  import Magnifier from "@assets/icons/magnifier.svg?dataurl"
  import {fly} from "@lib/transition"
@@ -53,8 +54,11 @@
  const getFilter = (searchTerm: string): Filter =>
    h
-      ? {kinds: CONTENT_KINDS, "#h": [h], search: searchTerm}
+      ? {kinds: [MESSAGE, ...CONTENT_KINDS], "#h": [h], search: searchTerm}
-      : {kinds: CONTENT_KINDS, search: searchTerm}
+      : {kinds: [MESSAGE, ...CONTENT_KINDS], search: searchTerm}
  const getLocalResults = (filter: Filter) =>
    repository.query([filter]).filter(event => tracker.getRelays(event.id).has(url))
  const search = debounce(300, async (searchTerm: string) => {
    controller?.abort()
@@ -68,18 +72,23 @@
    controller = new AbortController()
    loading = true
    const filter = getFilter(searchTerm.trim())
    const localResults = getLocalResults(filter)
    results = sortEventsDesc(localResults)
    try {
      const events = await request({
        relays: getRelayUrls(),
        autoClose: true,
        signal: controller.signal,
-        filters: [getFilter(searchTerm.trim())],
+        filters: [filter],
      })
-      results = sortEventsDesc(events)
+      results = sortEventsDesc(uniqBy((e: TrustedEvent) => e.id, [...events, ...localResults]))
    } catch (error) {
      if (!(error instanceof DOMException && error.name === "AbortError")) {
-        results = []
+        results = sortEventsDesc(localResults)
      }
    } finally {
      loading = false
@@ -1,13 +1,14 @@
 <script lang="ts">
  import {writable} from "svelte/store"
  import {makeEvent, THREAD} from "@welshman/util"
-  import {publishThunk} from "@welshman/app"
+  import {publishThunk, waitForThunkError} 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"
@@ -19,7 +20,7 @@
  import {PROTECTED} from "@app/core/state"
  import {makeEditor} from "@app/editor"
  import {DraftKey} from "@app/util/drafts"
-  import {canEnforceNip70} from "@app/core/commands"
+  import {canEnforceNip70, publishRoomQuote} from "@app/core/commands"
  type Values = {
    content?: string | object
@@ -29,9 +30,10 @@
  type Props = {
    url: string
    h?: string
    shareToChat?: boolean
  }
-  const {url, h}: Props = $props()
+  const {url, h, shareToChat = false}: Props = $props()
  const draftKey = new DraftKey<Values>(`thread:${url}:${h ?? ""}`)
  const initialValues = draftKey.get()
  const shouldProtect = canEnforceNip70(url)
@@ -43,7 +45,7 @@
  const selectFiles = () => editor.then(ed => ed.commands.selectFiles())
  const submit = async () => {
-    if ($uploading) return
+    if ($uploading || loading) return
    if (!title) {
      return pushToast({
@@ -64,23 +66,43 @@
    const tags = [...ed.storage.nostr.getEditorTags(), ["title", title]]
-    if (await shouldProtect) {
+    loading = true
-      tags.push(PROTECTED)
+
    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 (h) {
      tags.push(["h", h])
    }
    publishThunk({
      relays: [url],
      event: makeEvent(THREAD, {content, tags}),
    })
    draftKey.clear()
    history.back()
  }
  let loading = $state(false)
  let title = $state(initialValues?.title ?? "")
  let content = $state(initialValues?.content ?? "")
@@ -138,7 +160,8 @@
      <Button
        data-tip="Add an image"
        class="tooltip tooltip-left absolute bottom-1 right-2"
-        onclick={selectFiles}>
+        onclick={selectFiles}
        disabled={loading}>
        {#if $uploading}
          <span class="loading loading-spinner loading-xs"></span>
        {:else}
@@ -148,10 +171,12 @@
    </div>
  </ModalBody>
  <ModalFooter>
-    <Button class="btn btn-link" onclick={back}>
+    <Button class="btn btn-link" onclick={back} disabled={loading}>
      <Icon icon={AltArrowLeft} />
      Go back
    </Button>
-    <Button type="submit" class="btn btn-primary">Create Thread</Button>
+    <Button type="submit" class="btn btn-primary" disabled={$uploading || loading}>
      <Spinner {loading}>Create Thread</Spinner>
    </Button>
  </ModalFooter>
 </Modal>
@@ -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,6 +32,7 @@ import {
  ROOMS,
  COMMENT,
  APP_DATA,
  POLL_RESPONSE,
  isSignedEvent,
  makeEvent,
  normalizeRelayUrl,
@@ -52,7 +53,6 @@ import {
  isPublishedProfile,
  editProfile,
  createProfile,
  uniqTags,
  ManagementMethod,
 } from "@welshman/util"
 import {Pool, AuthStatus, SocketStatus} from "@welshman/net"
@@ -84,6 +84,7 @@ import {
  SETTINGS,
  PROTECTED,
  INDEXER_RELAYS,
  DEFAULT_RELAYS,
  DEFAULT_BLOSSOM_SERVERS,
  userSpaceUrls,
  userSettingsValues,
@@ -122,6 +123,34 @@ 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[]) => {
@@ -360,7 +389,7 @@ export type PollResponseParams = {
 }
 export const makePollResponse = ({event, selectedIds}: PollResponseParams) =>
-  makeEvent(PollResponse, {
+  makeEvent(POLL_RESPONSE, {
    content: "",
    tags: [["e", event.id], ...selectedIds.map(selectedId => ["response", selectedId])],
  })
@@ -695,34 +724,18 @@ export const uploadFile = async (file: File, options: UploadFileOptions = {}) =>
 // Update Profile
 export const initProfile = (profile: Profile) => {
-  const template = createProfile(profile)
+  const event = makeEvent(PROFILE, createProfile(profile))
-  // Start out protected by default
+  return publishThunk({event, relays: DEFAULT_RELAYS})
  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 = ({
+export const updateProfile = ({profile}: {profile: Profile}) => {
  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))]
+  const scenarios = [router.FromRelays(get(userSpaceUrls)), router.FromUser(), router.Index()]
-  if (shouldBroadcast) {
+  // Remove protected tag, we used to add it
-    scenarios.push(router.FromUser(), router.Index())
+  template.tags = template.tags.filter(nthNe(0, "-"))
    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()
@@ -737,9 +750,10 @@ export const addSpaceMembers = async (
  pubkeys: string[],
 ): Promise<string | undefined> => {
  const spaceMembers = get(deriveSpaceMembers(url))
  const results = await Promise.all(
    pubkeys
-      .filter(pubkey => !spaceMembers.includes(pubkey))
+      .filter(pubkey => !spaceMembers || !spaceMembers.includes(pubkey))
      .map(pubkey =>
        manageRelay(url, {
          method: ManagementMethod.AllowPubkey,
@@ -1,5 +1,6 @@
-import {get, writable} from "svelte/store"
+import {writable} from "svelte/store"
 import {
  batch,
  call,
  uniq,
  int,
@@ -25,8 +26,9 @@ import {
  sortEventsDesc,
 } from "@welshman/util"
 import type {TrustedEvent, Filter, List} from "@welshman/util"
-import {load, request} from "@welshman/net"
+import {load, request, mergeRepositoryUpdates} from "@welshman/net"
-import {repository, loadRelay, tracker} from "@welshman/app"
+import type {RepositoryUpdate} from "@welshman/net"
 import {pubkey, repository, loadRelay, tracker} from "@welshman/app"
 import {createScroller} from "@lib/html"
 import {daysBetween} from "@lib/util"
 import {getEventsForUrl} from "@app/core/state"
@@ -39,6 +41,7 @@ export const makeFeed = ({
  element,
  onBackwardExhausted,
  onForwardExhausted,
  allowOptimisticSelfEvents = false,
  at = now(),
 }: {
  url: string
@@ -46,6 +49,7 @@ export const makeFeed = ({
  element: HTMLElement
  onBackwardExhausted?: () => void
  onForwardExhausted?: () => void
  allowOptimisticSelfEvents?: boolean
  at?: number
 }) => {
  const controller = new AbortController()
@@ -56,57 +60,83 @@ export const makeFeed = ({
  let backwardWindow = [at - interval, at]
  let forwardWindow = [at, at + interval]
-  const insertEvent = (event: TrustedEvent) => {
+  const insertIntoBuffer = (event: TrustedEvent) => {
-    let handled = false
+    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)
  }
-    if (between([backwardWindow[0], forwardWindow[1]], event.created_at)) {
+  // Batch-insert events into the visible store with a single update
-      const $events = get(events)
+  const insertEvents = (newEvents: TrustedEvent[]) => {
    const visible: TrustedEvent[] = []
-      for (let i = 0; i < $events.length; i++) {
+    for (const event of newEvents) {
-        if ($events[i].created_at > event.created_at) {
+      if (between([backwardWindow[0], forwardWindow[1]], event.created_at)) {
-          events.set(insertAt(i, event, $events))
+        visible.push(event)
-          handled = true
+      } else {
-          break
+        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]
          }
        }
-      }
+        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", ({added, removed}) => {
+    on(
-      if (removed.size > 0) {
+      repository,
-        buffer = buffer.filter(e => !removed.has(e.id))
+      "update",
-        events.update($events => $events.filter(e => !removed.has(e.id)))
+      batch(150, (updates: RepositoryUpdate[]) => {
-      }
+        const {added, removed} = mergeRepositoryUpdates(updates)
-      for (const event of added) {
+        if (removed.size > 0) {
-        if (matchFilters(filters, event) && tracker.getRelays(event.id).has(url)) {
+          buffer = buffer.filter(e => !removed.has(e.id))
-          insertEvent(event)
+          events.update($events => $events.filter(e => !removed.has(e.id)))
        }
-      }
+
-    }),
+        const matching = added.filter(
          event =>
            matchFilters(filters, event) &&
            (tracker.getRelays(event.id).has(url) ||
              // In Safari, relay confirmation can lag behind local repository updates.
              // Only enable this for chat-like feeds that explicitly opt in.
              (allowOptimisticSelfEvents &&
                event.pubkey === pubkey.get() &&
                tracker.getRelays(event.id).size === 0 &&
                event.created_at >= now() - 60)),
        )
        if (matching.length > 0) {
          insertEvents(matching)
        }
      }),
    ),
    on(tracker, "add", (id: string, trackerUrl: string) => {
      if (trackerUrl === url) {
        const event = repository.getEvent(id)
        if (event && matchFilters(filters, event)) {
-          insertEvent(event)
+          insertEvents([event])
        }
      }
    }),
@@ -132,17 +162,15 @@ export const makeFeed = ({
    element,
    delay: 300,
    threshold: 5000,
-    onScroll: () => {
+    onScroll: async () => {
      const [since, until] = backwardWindow
      backwardWindow = [since - interval, since]
-      for (const event of buffer.splice(0, 30)) {
+      insertEvents(buffer.splice(0, 30))
        insertEvent(event)
      }
      if (until > now() - int(2, YEAR)) {
-        loadTimeframe(since, until)
+        await loadTimeframe(since, until)
      } else if (!buffer.some(e => e.created_at < at)) {
        backwardScroller.stop()
        onBackwardExhausted?.()
@@ -155,17 +183,15 @@ export const makeFeed = ({
    reverse: true,
    delay: 300,
    threshold: 5000,
-    onScroll: () => {
+    onScroll: async () => {
      const [since, until] = forwardWindow
      forwardWindow = [until, until + interval]
-      for (const event of buffer.splice(0, 30)) {
+      insertEvents(buffer.splice(0, 30))
        insertEvent(event)
      }
      if (until < now()) {
-        loadTimeframe(since, until)
+        await loadTimeframe(since, until)
      } else if (!buffer.some(e => e.created_at > at)) {
        forwardScroller.stop()
        onForwardExhausted?.()
@@ -208,40 +234,61 @@ export const makeCalendarFeed = ({
  const events = writable(sortBy(getStart, getEventsForUrl(url, filters)))
-  const insertEvent = (event: TrustedEvent) => {
+  // Batch-insert calendar events into the store with a single update
-    const start = getStart(event)
+  const insertEvents = (newEvents: TrustedEvent[]) => {
-    const address = getAddress(event)
+    const valid = newEvents.filter(e => !isNaN(getStart(e)) && !isNaN(getEnd(e)))
-
+    if (valid.length === 0) return
    if (isNaN(start) || isNaN(getEnd(event))) return
    events.update($events => {
-      for (let i = 0; i < $events.length; i++) {
+      for (const event of valid) {
-        if ($events[i].id === event.id) return $events
+        const start = getStart(event)
-        if (getStart($events[i]) > start) return insertAt(i, event, $events)
+        const address = getAddress(event)
      }
-      return [...$events.filter(e => getAddress(e) !== address), 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]
        }
      }
      return $events
    })
  }
  const unsubscribers = [
-    on(repository, "update", ({added, removed}) => {
+    on(
-      if (removed.size > 0) {
+      repository,
-        events.update($events => $events.filter(e => !removed.has(e.id)))
+      "update",
-      }
+      batch(150, (updates: RepositoryUpdate[]) => {
        const {added, removed} = mergeRepositoryUpdates(updates)
-      for (const event of added) {
+        if (removed.size > 0) {
-        if (matchFilters(filters, event)) {
+          events.update($events => $events.filter(e => !removed.has(e.id)))
          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)) {
-          insertEvent(event)
+          insertEvents([event])
        }
      }
    }),
@@ -3,7 +3,6 @@ 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,
@@ -93,6 +92,7 @@ import {
  THREAD,
  CLASSIFIED,
  WRAP,
  POLL,
  PROFILE,
  ZAP_GOAL,
  ZAP_REQUEST,
@@ -327,9 +327,7 @@ 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]
@@ -554,7 +552,7 @@ export const chatsById = call(() => {
        setTimeout(() => {
          addEvents(added)
          removeEvents(removed)
-        }, 50)
+        }, 200)
      }),
    ]
@@ -568,7 +566,7 @@ export const deriveChat = call(() => {
  return (pubkeys: string[]) => _deriveChat(makeChatId(pubkeys))
 })
-export const chatSearch = derived(throttled(800, chatsById), $chatsByPubkey => {
+export const chatSearch = derived(throttled(1500, chatsById), $chatsByPubkey => {
  return createSearch(
    sortBy(c => -c.last_activity, Array.from($chatsByPubkey.values())),
    {
@@ -595,6 +593,8 @@ export const getRoomType = (room: RoomMeta): RoomType =>
 export const makeRoomId = (url: string, h: string) => `${url}'${h}`
 export const isRoomId = (id: string) => id.includes("'")
 export const splitRoomId = (id: string) => id.split("'")
 export const hasNip29 = (relay?: RelayProfile) =>
@@ -607,7 +607,7 @@ export const roomMetaEventsByIdByUrl = deriveEventsByIdByUrl({
 })
 export const roomsByUrl = derived(roomMetaEventsByIdByUrl, roomMetaEventsByIdByUrl => {
-  const metaByIdByUrl = new Map<string, Map<string, Room>>()
+  const result = new Map<string, Room[]>()
  for (const [url, events] of roomMetaEventsByIdByUrl.entries()) {
    const [metaEvents, deleteEvents] = partition(spec({kind: ROOM_META}), events.values())
@@ -619,6 +619,8 @@ export const roomsByUrl = derived(roomMetaEventsByIdByUrl, roomMetaEventsByIdByU
      }
    }
    const metaById = new Map<string, Room>()
    for (const event of metaEvents) {
      const meta = tryCatch(() => readRoomMeta(event))
@@ -626,22 +628,14 @@ 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})
    }
  }
-  const result = new Map<string, Room[]>()
+    if (metaById.size > 0) {
-
+      result.set(url, Array.from(metaById.values()))
-  for (const [url, metaById] of metaByIdByUrl.entries()) {
+    }
    result.set(url, Array.from(metaById.values()))
  }
  return result
@@ -814,36 +808,49 @@ export const deriveOtherRooms = (url: string) =>
 // Space/room memberships
-const getSpaceMembers = (_url: string, events: TrustedEvent[]) => {
+export const deriveSpaceMembers = (url: string) =>
-  const members = new Set<string>()
+  derived(deriveRelaySignedEvents(url, [{kinds: [RELAY_MEMBERS]}]), ([event]) =>
    uniq(getTagValues("member", event?.tags ?? [])),
  )
-  for (const event of sortEventsAsc(events)) {
+export const deriveRoomMembers = (url: string, h: string) => {
-    if (event.kind === RELAY_MEMBERS) {
+  const filters: Filter[] = [{kinds: [ROOM_MEMBERS], "#d": [h]}]
      members.clear()
-      for (const pubkey of uniq(getTagValues("member", event.tags))) {
+  return derived(deriveEventsForUrl(url, filters), ([event]) =>
-        members.add(pubkey)
+    uniq(getPubkeyTagValues(event?.tags ?? [])),
-      }
+  )
 }
-      continue
+export type BannedPubkeyItem = {
  pubkey: string
  reason: string
 }
 export const spaceBannedPubkeyItems = new Map<string, BannedPubkeyItem[]>()
 export const deriveSpaceBannedPubkeyItems = (url: string) => {
  const store = writable(spaceBannedPubkeyItems.get(url) || [])
  manageRelay(url, {method: ManagementMethod.ListBannedPubkeys, params: []}).then(res => {
    spaceBannedPubkeyItems.set(url, res.result)
    store.set(res.result)
  })
  return store
 }
 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)
    }
-    const pubkeys = getPubkeyTagValues(event.tags)
+    return []
-
+  })
    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)
 }
 const getRoomMembers = (_url: string, h: string, events: TrustedEvent[]) => {
@@ -882,53 +889,6 @@ const getRoomMembers = (_url: string, h: string, events: TrustedEvent[]) => {
  return Array.from(members)
 }
 export const deriveSpaceMembers = (url: string) =>
  derived(
    deriveRelaySignedEvents(url, [{kinds: [RELAY_ADD_MEMBER, RELAY_REMOVE_MEMBER, RELAY_MEMBERS]}]),
    $events => getSpaceMembers(url, $events),
  )
 export type BannedPubkeyItem = {
  pubkey: string
  reason: string
 }
 export const spaceBannedPubkeyItems = new Map<string, BannedPubkeyItem[]>()
 export const deriveSpaceBannedPubkeyItems = (url: string) => {
  const store = writable(spaceBannedPubkeyItems.get(url) || [])
  manageRelay(url, {method: ManagementMethod.ListBannedPubkeys, params: []}).then(res => {
    spaceBannedPubkeyItems.set(url, res.result)
    store.set(res.result)
  })
  return store
 }
 export const deriveRoomMembers = (url: string, h: string) => {
  const filters: Filter[] = [
    {kinds: [ROOM_MEMBERS], "#d": [h]},
    {kinds: [ROOM_ADD_MEMBER, ROOM_REMOVE_MEMBER], "#h": [h]},
  ]
  return derived(deriveEventsForUrl(url, filters), $events => getRoomMembers(url, h, $events))
 }
 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)
 // const pendingJoins: TrustedEvent[] = []
@@ -949,18 +909,33 @@ export const deriveSpaceActionItems = (url: string) =>
      for (const [h, roomEvents] of groupBy(getRoomId, $events)) {
        if (!h) continue
-        const roomJoins = roomEvents.filter(spec({kind: ROOM_JOIN}))
+        const roomJoins: TrustedEvent[] = []
-        const roomLeaves = roomEvents.filter(spec({kind: ROOM_LEAVE}))
+        const roomLeaves: TrustedEvent[] = []
-        const roomMembershipEvents = roomEvents.filter(event =>
+        const roomMembershipEvents: TrustedEvent[] = []
-          [ROOM_MEMBERS, ROOM_ADD_MEMBER, ROOM_REMOVE_MEMBER].includes(event.kind),
+
-        )
+        for (const event of roomEvents) {
          switch (event.kind) {
            case ROOM_JOIN:
              roomJoins.push(event)
              break
            case ROOM_LEAVE:
              roomLeaves.push(event)
              break
            case ROOM_MEMBERS:
            case ROOM_ADD_MEMBER:
            case ROOM_REMOVE_MEMBER:
              roomMembershipEvents.push(event)
              break
          }
        }
        const roomMembers = new Set(getRoomMembers(url, h, roomMembershipEvents))
        pendingJoins.push(
          ...removeUndefined(
-            Array.from(groupBy(e => e.pubkey, roomJoins).values())
+            Array.from(groupBy(e => e.pubkey, roomJoins).values()).map(events =>
-              .map(sortEventsDesc)
+              first(sortEventsDesc(events)),
-              .map(first),
+            ),
          ).filter(({pubkey, created_at}) => {
            if (roomMembers.has(pubkey)) return false
            if (
@@ -1010,19 +985,49 @@ export const deriveUserIsSpaceAdmin = memoize((url?: string) => {
 })
 export const deriveUserSpaceMembershipStatus = (url: string) => {
-  const filters: Filter[] = [{kinds: [RELAY_JOIN, RELAY_LEAVE]}]
+  // 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]}]
  return derived(
    [
      pubkey,
-      deriveSpaceMembers(url),
+      deriveRelaySignedEvents(url, memberListFilters),
-      deriveEventsForUrl(url, filters),
+      deriveRelaySignedEvents(url, userEventFilters),
      deriveEventsForUrl(url, [{kinds: [RELAY_JOIN, RELAY_LEAVE]}]),
      deriveUserIsSpaceAdmin(url),
    ],
-    ([$pubkey, $members, $events, $isAdmin]) => {
+    ([$pubkey, $memberListEvents, $userAddRemoveEvents, $joinLeaveEvents, $isAdmin]) => {
-      const isMember = $members.includes($pubkey!) || $isAdmin
+      // If admin, always granted.
      if ($isAdmin) {
        return MembershipStatus.Granted
      }
-      for (const event of $events) {
+      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.
        if (event.pubkey !== $pubkey) {
          continue
        }
@@ -1048,19 +1053,46 @@ export const deriveUserIsRoomAdmin = (url: string, h: string) =>
  )
 export const deriveUserRoomMembershipStatus = (url: string, h: string) => {
-  const filters: Filter[] = [{kinds: [ROOM_JOIN, ROOM_LEAVE], "#h": [h]}]
+  // 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]}]
  return derived(
    [
      pubkey,
      deriveRoomMembers(url, h),
-      deriveEventsForUrl(url, filters),
+      deriveEventsForUrl(url, userEventFilters),
      deriveEventsForUrl(url, joinLeaveFilters),
      deriveUserIsRoomAdmin(url, h),
    ],
-    ([$pubkey, $members, $events, $isAdmin]) => {
+    ([$pubkey, $memberList, $userAddRemoveEvents, $joinLeaveEvents, $isAdmin]) => {
-      const isMember = $members.includes($pubkey!) || $isAdmin
+      // If admin of this room's space, always granted.
      if ($isAdmin) {
        return MembershipStatus.Granted
      }
-      for (const event of $events) {
+      let isMember = false
      if ($memberList) {
        // Member list exists - check if user is in it.
        isMember = $memberList.includes($pubkey!)
      } else {
        // No member list available - replay the user's add/remove history.
        for (const event of sortEventsAsc($userAddRemoveEvents)) {
          if (event.pubkey !== $pubkey) {
            continue
          }
          if (event.kind === ROOM_ADD_MEMBER) {
            isMember = true
          } else if (event.kind === ROOM_REMOVE_MEMBER) {
            isMember = false
          }
        }
      }
      for (const event of $joinLeaveEvents) {
        // Join events indicate pending or granted status, leave resets to initial.
        if (event.pubkey !== $pubkey) {
          continue
        }
@@ -1,7 +1,6 @@
 import {page} from "$app/stores"
 import type {Unsubscriber} from "svelte/store"
-import {last, call, ifLet, assoc, chunk, WEEK, ago} from "@welshman/lib"
+import {last, call, assoc, chunk, WEEK, ago} from "@welshman/lib"
 import {PollResponse} from "nostr-tools/kinds"
 import {merged} from "@welshman/store"
 import {
  getListTags,
@@ -19,9 +18,10 @@ import {
  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,7 +43,6 @@ import {
 } from "@welshman/app"
 import {
  REACTION_KINDS,
  MESSAGE_KINDS,
  CONTENT_KINDS,
  INDEXER_RELAYS,
  loadSettings,
@@ -268,58 +267,21 @@ const syncUserData = () => {
 // Spaces
-const syncSpace = (url: string, rooms: string[]) => {
+const syncSpace = (url: string) => {
  const since = ago(WEEK)
  const seen = new Set<string>()
  const controller = new AbortController()
-
+  const relayKinds = [RELAY_MEMBERS]
  const pullRoomContent = (room: string) => {
    if (!seen.has(room)) {
      seen.add(room)
      pullAndListen({
        url,
        signal: controller.signal,
        filters: [
          {kinds: [ROOM_META, ROOM_ADMINS, ROOM_MEMBERS], "#d": [room]},
          {kinds: MESSAGE_KINDS, since, "#h": [room]},
          makeCommentFilter(CONTENT_KINDS, {since, "#h": [room]}),
          {
            kinds: [ROOM_DELETE, ROOM_JOIN, ROOM_LEAVE, ROOM_ADD_MEMBER, ROOM_REMOVE_MEMBER],
            "#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_JOIN, ROOM_LEAVE, ROOM_ADD_MEMBER, ROOM_REMOVE_MEMBER]
+  const roomDeleteKinds = [ROOM_DELETE, ROOM_JOIN, ROOM_LEAVE]
  pullAndListen({
    url,
    signal: controller.signal,
    filters: [
-      {kinds: [...relayKinds, ...roomMetaKinds, ...roomMemberKinds, ...MESSAGE_KINDS]},
+      {kinds: [...relayKinds, ...roomMetaKinds, ...roomDeleteKinds, ...CONTENT_KINDS, MESSAGE]},
      makeCommentFilter(CONTENT_KINDS, {since}),
-      {kinds: [PollResponse], since},
+      {kinds: [...REACTION_KINDS, POLL_RESPONSE], 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()
@@ -328,7 +290,6 @@ const syncSpace = (url: string, rooms: 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))
@@ -342,28 +303,15 @@ const syncSpaces = () => {
    for (const [url, unsubscribe] of unsubscribersByUrl.entries()) {
      if (!urls.has(url)) {
        unsubscribersByUrl.delete(url)
        roomsByUrl.delete(url)
        unsubscribe()
      }
    }
-    // Start or restart syncing for each space
+    // Start syncing for new spaces
    for (const url of urls) {
-      const rooms = getSpaceRoomsFromGroupList(url, $userGroupList)
+      if (!unsubscribersByUrl.has(url)) {
-
+        unsubscribersByUrl.set(url, syncSpace(url))
      if (currentUrl === url && $page.params.h && !rooms.includes($page.params.h)) {
        rooms.push($page.params.h)
      }
      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))
    }
  })
@@ -0,0 +1,42 @@
 import {mergeAttributes, Node} from "@tiptap/core"
 import {RoomReferenceNodeView} from "@app/editor/RoomReferenceNodeView"
 export const RoomReferenceExtension = Node.create({
  name: "roomref",
  atom: true,
  inline: true,
  group: "inline",
  selectable: true,
  priority: 1000,
  addAttributes() {
    return {
      url: {default: undefined},
      h: {default: undefined},
    }
  },
  parseHTML() {
    return [{tag: `span[data-type="${this.name}"]`}]
  },
  renderHTML({HTMLAttributes}) {
    return ["span", mergeAttributes(HTMLAttributes, {"data-type": this.name}), "~"]
  },
  renderText({node}) {
    const url = typeof node.attrs.url === "string" ? node.attrs.url : ""
    const h = typeof node.attrs.h === "string" ? node.attrs.h : ""
    return `${url}'${h}`
  },
  addNodeView() {
    return RoomReferenceNodeView
  },
 })
@@ -0,0 +1,29 @@
 import type {NodeViewRendererProps} from "@tiptap/core"
 import {displayRelayUrl} from "@welshman/util"
 import {deriveRoom} from "@app/core/state"
 export const RoomReferenceNodeView = ({node}: NodeViewRendererProps) => {
  const dom = document.createElement("span")
  const url = typeof node.attrs.url === "string" ? node.attrs.url : ""
  const h = typeof node.attrs.h === "string" ? node.attrs.h : ""
  const room = deriveRoom(url, h)
  dom.classList.add("tiptap-object")
  const unsubRoom = room.subscribe($room => {
    dom.textContent = `~${displayRelayUrl(url)} / ${$room.name || h}`
  })
  return {
    dom,
    destroy: () => {
      unsubRoom()
    },
    selectNode() {
      dom.classList.add("tiptap-active")
    },
    deselectNode() {
      dom.classList.remove("tiptap-active")
    },
  }
 }
@@ -0,0 +1,17 @@
 <script lang="ts">
  import {displayRelayUrl} from "@welshman/util"
  import RoomNameWithImage from "@app/components/RoomNameWithImage.svelte"
  import {splitRoomId} from "@app/core/state"
  type Props = {
    value: string
  }
  const {value}: Props = $props()
  const [url = "", h = ""] = splitRoomId(value)
 </script>
 <div class="max-w-full overflow-hidden text-ellipsis flex flex-col">
  <RoomNameWithImage {url} {h} />
  <span class="text-primary text-sm">{displayRelayUrl(url)}<span> </span></span>
 </div>
@@ -0,0 +1,81 @@
 import {Clipboard} from "@capacitor/clipboard"
 import {Capacitor} from "@capacitor/core"
 import {Extension} from "@tiptap/core"
 import {Plugin, PluginKey} from "@tiptap/pm/state"
 const nativeClipboardAvailable = () =>
  Capacitor.isNativePlatform() && Capacitor.isPluginAvailable("Clipboard")
 const hasStandardPastePayload = (event: ClipboardEvent) => {
  const clipboardData = event.clipboardData
  if (!clipboardData) {
    return false
  }
  if (Array.from(clipboardData.items).some(item => item.kind === "file")) {
    return true
  }
  if (clipboardData.types.includes("text/html")) {
    return true
  }
  return clipboardData.getData("text/plain") !== ""
 }
 const getNativeClipboardImage = async () => {
  try {
    const {type, value} = await Clipboard.read()
    if (!type.startsWith("image/") || value === "") {
      return undefined
    }
    const imageData = value.startsWith("data:") ? value : `data:${type};base64,${value}`
    const blob = await fetch(imageData).then(res => res.blob())
    if (!blob.type.startsWith("image/")) {
      return undefined
    }
    const extension = type.split("/")[1]?.split("+")[0] || "png"
    return new File([blob], `clipboard-image.${extension}`, {type: blob.type || type})
  } catch {
    return undefined
  }
 }
 export const NativeClipboardPasteExtension = Extension.create({
  name: "nativeClipboardPaste",
  addProseMirrorPlugins() {
    const editor = this.editor
    return [
      new Plugin({
        key: new PluginKey("nativeClipboardPaste"),
        props: {
          handlePaste: (_view, event) => {
            if (!nativeClipboardAvailable() || hasStandardPastePayload(event)) {
              return false
            }
            event.preventDefault()
            void getNativeClipboardImage().then(file => {
              if (!file) {
                return
              }
              editor.commands.addFile(file, editor.state.selection.from + 1)
            })
            return true
          },
        },
      }),
    ]
  },
 })
@@ -4,7 +4,7 @@ import {get, derived} from "svelte/store"
 import {Router} from "@welshman/router"
 import {dec, inc} from "@welshman/lib"
 import {throttled} from "@welshman/store"
-import type {PublishedProfile} from "@welshman/util"
+import type {PublishedProfile, RoomMeta} from "@welshman/util"
 import {
  createSearch,
  profiles,
@@ -14,12 +14,27 @@ import {
  getWotGraph,
 } from "@welshman/app"
 import type {FileAttributes} from "@welshman/editor"
-import {Editor, MentionSuggestion, WelshmanExtension, editorProps} from "@welshman/editor"
+import {
  Editor,
  MentionSuggestion,
  TippySuggestion,
  WelshmanExtension,
  editorProps,
 } from "@welshman/editor"
 import {escapeHtml} from "@lib/html"
 import {makeMentionNodeView} from "@app/editor/MentionNodeView"
 import ProfileSuggestion from "@app/editor/ProfileSuggestion.svelte"
 import {RoomReferenceExtension} from "@app/editor/RoomReferenceExtension"
 import RoomSuggestion from "@app/editor/RoomSuggestion.svelte"
 import {NativeClipboardPasteExtension} from "@app/editor/clipboard"
 import {uploadFile} from "@app/core/commands"
-import {deriveSpaceMembers} from "@app/core/state"
+import {
  deriveSpaceMembers,
  makeRoomId,
  splitRoomId,
  userSpaceUrls,
  roomsByUrl,
 } from "@app/core/state"
 import {pushToast} from "@app/util/toast"
 export const makeEditor = async ({
@@ -64,7 +79,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
        },
@@ -82,11 +97,36 @@ export const makeEditor = async ({
    },
  )
  const roomReferenceSearch = derived(
    [throttled(800, userSpaceUrls), throttled(800, roomsByUrl)],
    ([$userSpaceUrls, $roomsByUrl]) => {
      const roomIdByMeta = new WeakMap<RoomMeta, string>()
      const options: RoomMeta[] = []
      for (const roomUrl of $userSpaceUrls) {
        for (const room of $roomsByUrl.get(roomUrl) || []) {
          roomIdByMeta.set(room, makeRoomId(roomUrl, room.h))
          options.push(room)
        }
      }
      return createSearch(options, {
        getValue: item => roomIdByMeta.get(item) || item.h,
        fuseOptions: {
          keys: ["name", "h"],
          threshold: 0.3,
          shouldSort: false,
        },
      })
    },
  )
  const ed = new Editor({
    content: typeof content === "string" ? escapeHtml(content) : content,
    editorProps,
    element: document.createElement("div"),
    extensions: [
      RoomReferenceExtension,
      WelshmanExtension.configure({
        submit,
        extensions: {
@@ -128,6 +168,29 @@ export const makeEditor = async ({
                      mount(ProfileSuggestion, {target, props: {value, url}})
                      return target
                    },
                  }),
                  TippySuggestion({
                    char: "~",
                    name: "roomref",
                    editor: (this as any).editor,
                    search: (term: string) => get(roomReferenceSearch).searchValues(term),
                    updateSignal: roomReferenceSearch,
                    select: (id: string, props) => {
                      const [roomUrl, h] = splitRoomId(id)
                      if (!roomUrl || !h) {
                        return
                      }
                      return props.command({url: roomUrl, h})
                    },
                    createSuggestion: (value: string) => {
                      const target = document.createElement("div")
                      mount(RoomSuggestion, {target, props: {value}})
                      return target
                    },
                  }),
@@ -137,6 +200,7 @@ export const makeEditor = async ({
          },
        },
      }),
      NativeClipboardPasteExtension,
    ],
    onUpdate({editor}) {
      wordCount?.set(editor.storage.wordCount.words)
@@ -1,4 +1,4 @@
-import {writable} from "svelte/store"
+import {get, writable} from "svelte/store"
 import type {Nip46ResponseWithResult} from "@welshman/signer"
 import {Nip46Broker} from "@welshman/signer"
 import {makeSecret} from "@welshman/util"
@@ -11,6 +11,22 @@ 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("")
@@ -54,6 +70,22 @@ 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} from "@welshman/util"
+import {sortEventsDesc, getTagValue, MESSAGE} from "@welshman/util"
 import {makeSpacePath, makeRoomPath, makeSpaceChatPath, makeChatPath} from "@app/util/routes"
 import {
-  MESSAGE_KINDS,
+  CONTENT_KINDS,
  notificationSettings,
  chatsById,
  userGroupList,
@@ -85,7 +85,7 @@ export const allNotifications = derived(
        deriveEventsByIdByUrl({
          tracker,
          repository,
-          filters: [{kinds: MESSAGE_KINDS}, makeCommentFilter(MESSAGE_KINDS)],
+          filters: [{kinds: [MESSAGE, ...CONTENT_KINDS]}, makeCommentFilter(CONTENT_KINDS)],
        }),
      ],
      identity,
@@ -0,0 +1,11 @@
 export const POMADE_INVALID_LOGIN_MESSAGE = "Invalid login information"
 export const POMADE_NETWORK_ERROR_MESSAGE = "Network error, please try again"
 type PomadeMessage = {
  res?: unknown
 }
 export const getPomadeLoginFailureMessage = (messages: PomadeMessage[]) =>
  messages.some(message => message.res !== undefined)
    ? POMADE_INVALID_LOGIN_MESSAGE
    : POMADE_NETWORK_ERROR_MESSAGE
@@ -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,7 +45,10 @@ export type PushPermissionResult = {
 }
 export const onNotification = call(() => {
-  const allFilters = [{kinds: [...MESSAGE_KINDS, ...DM_KINDS]}, makeCommentFilter(MESSAGE_KINDS)]
+  const allFilters = [
    {kinds: [MESSAGE, ...CONTENT_KINDS, ...DM_KINDS]},
    makeCommentFilter(CONTENT_KINDS),
  ]
  const filters = allFilters.map(assoc("since", now()))
  const subscribers: Subscriber<TrustedEvent>[] = []
@@ -158,7 +161,7 @@ export const syncRelaySubscriptions = (
    userSettingsValues,
  ]).subscribe(
    throttle(3000, ([$userSpaceUrls, {spaces, mentions}, {alerts}]) => {
-      const baseFilters = [{kinds: MESSAGE_KINDS}, makeCommentFilter(CONTENT_KINDS)]
+      const baseFilters = [{kinds: [MESSAGE, ...CONTENT_KINDS]}, makeCommentFilter(CONTENT_KINDS)]
      for (const url of $userSpaceUrls) {
        const {notify = true, exceptions = []} = alerts.find(spec({url})) || {}
@@ -6,7 +6,6 @@ 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 {
@@ -16,6 +15,7 @@ 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)
+    goto(prevPath, {replaceState: true})
  } else if (window.matchMedia(`(min-width: ${theme.screens.md})`).matches) {
-    goto(makeSpacePath(url, "recent"))
+    goto(makeSpacePath(url, "recent"), {replaceState: true})
  } else {
-    goto(makeSpacePath(url))
+    goto(makeSpacePath(url), {replaceState: true})
  }
 }
@@ -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)
  }
 }
@@ -48,6 +48,18 @@ import {
 import type {Unsubscriber} from "svelte/store"
 import {db} from "@app/core/storage"
 // 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],
@@ -199,14 +211,15 @@ const loadCriticalRelays = async () => {
  relaysByUrl.set(indexBy(r => r.url, await table.getAll()))
 }
-const syncRelays = () => onRelay(batch(1000, db.table<RelayProfile>("relays").bulkPut))
+const syncRelays = () =>
  onRelay(batch(FLUSH_INTERVAL, idleWrite(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(1000, table.bulkPut))
+  return onRelayStats(batch(FLUSH_INTERVAL, idleWrite(table.bulkPut)))
 }
 const initHandles = async () => {
@@ -214,7 +227,7 @@ const initHandles = async () => {
  handlesByNip05.set(indexBy(r => r.nip05, await table.getAll()))
-  return onHandle(batch(1000, table.bulkPut))
+  return onHandle(batch(FLUSH_INTERVAL, idleWrite(table.bulkPut)))
 }
 const initZappers = async () => {
@@ -222,7 +235,7 @@ const initZappers = async () => {
  zappersByLnurl.set(indexBy(z => z.lnurl, await table.getAll()))
-  return onZapper(batch(3000, table.bulkPut))
+  return onZapper(batch(FLUSH_INTERVAL, idleWrite(table.bulkPut)))
 }
 const initPlaintext = async () => {
@@ -0,0 +1,8 @@
 <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>
@@ -17,7 +17,7 @@
    "aria-pressed"?: boolean
  } = $props()
-  const className = $derived(`text-left ${restProps.class}`)
+  const className = $derived(`text-left cursor-pointer ${restProps.class}`)
  const onClick = (e: Event) => {
    e.preventDefault()
@@ -68,22 +68,23 @@
  })
 </script>
-<div class="relative grid grid-cols-2 gap-2" bind:this={element}>
+<div class="relative focus-within:z-modal grid grid-cols-2 gap-2" bind:this={element}>
-  <div class="relative">
+  <div class="relative group z-popover">
    <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">
+    <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">
      {#if date}
-        <Button onclick={clear} class="h-5">
+        <Button onclick={clear} class="h-5 pointer-events-auto">
          <Icon icon={CloseCircle} />
        </Button>
      {:else}
-        <Button onclick={focusDate} class="h-5">
+        <Button onclick={focusDate} class="h-5 pointer-events-auto">
          <Icon icon={CalendarMinimalistic} />
        </Button>
      {/if}
    </div>
  </div>
-  <label class="input input-bordered flex items-center">
+  <label class="input input-bordered flex items-center relative">
    <input
      list="time-options"
      class="grow"
@@ -37,9 +37,9 @@
  )
  const buttonClass = $derived(
-    cx("absolute right-3 btn btn-circle btn-neutral btn-sm", {
+    cx("absolute right-3 z-tooltip btn btn-circle btn-neutral btn-sm", {
      "top-3": fullscreen,
-      "-top-4": !fullscreen,
+      "-top-4 mr-sai": !fullscreen,
    }),
  )
 </script>
@@ -31,6 +31,7 @@
 <svelte:document onmousemove={onMouseMove} />
 <Tippy
  class="flex"
  bind:popover
  component={EmojiPicker}
  props={{onClick}}
@@ -10,6 +10,7 @@
 <script lang="ts">
  import "emoji-picker-element"
  import emojiDataUrl from "emoji-picker-element-data/en/emojibase/data.json?url"
  import type {Emoji} from "emoji-picker-element/shared"
  import {onMount} from "svelte"
@@ -26,4 +27,4 @@
  })
 </script>
-<emoji-picker bind:this={element} class="m-auto"></emoji-picker>
+<emoji-picker bind:this={element} data-source={emojiDataUrl} class="m-auto"></emoji-picker>
@@ -14,7 +14,7 @@
  } = $props()
 </script>
-<div class={cx("fixed bottom-20 right-4 z-nav hide-on-keyboard md:hidden", className)}>
+<div class={cx("fixed bottom-20 mb-sai 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}>
@@ -9,16 +9,22 @@
  const {...props}: Props = $props()
 </script>
-<div class="grid grid-cols-1 gap-2 lg:gap-6 lg:grid-cols-3 {props.class}">
+<div class="flex flex-col gap-2 {props.class}">
-  <label class="flex items-center gap-2 font-bold">
+  <div class="flex items-center justify-between w-full gap-2">
-    {@render props.label?.()}
+    {#if props.label}
-  </label>
+      <label class="flex items-center gap-2 min-w-[30%] max-w-[80%] md:max-w-none">
-  <div class="col-span-2 flex items-center gap-2">
+        {@render props.label()}
-    {@render props.input?.()}
+      </label>
  </div>
  <p class="flex-end text-sm opacity-50 lg:col-span-3">
    {#if props.info}
      {@render props.info?.()}
    {/if}
-  </p>
+    <div class="flex items-center gap-2 justify-end grow">
      {#if props.input}
        {@render props.input()}
      {/if}
    </div>
  </div>
  {#if props.info}
    <p class="text-sm opacity-50">
      {@render props.info()}
    </p>
  {/if}
 </div>
@@ -13,7 +13,12 @@
    placeholder?: string
  }
-  let {value = $bindable(), addLabel, placeholder = "Enter text..."}: Props = $props()
+  let {
    value = $bindable(),
    addLabel,
    placeholder = "Enter text...",
    allowAdd = true,
  }: Props & {allowAdd?: boolean} = $props()
  let draggedIndex: number | null = $state(null)
  const onChange = (newValue: string[]) => {
@@ -72,12 +77,14 @@
      </div>
    </div>
  {/each}
-  <Button onclick={addItem} class="btn btn-link w-fit px-0">
+  {#if allowAdd}
-    <Icon icon={AddCircle} size={5} />
+    <Button onclick={addItem} class="btn btn-link w-fit px-0">
-    {#if addLabel}
+      <Icon icon={AddCircle} size={5} />
-      {@render addLabel?.()}
+      {#if addLabel}
-    {:else}
+        {@render addLabel?.()}
-      Add Item
+      {:else}
-    {/if}
+        Add Item
-  </Button>
+      {/if}
    </Button>
  {/if}
 </div>
@@ -13,7 +13,7 @@
  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",
+      "scroll-container z-feature flex min-h-0 w-full min-w-0 flex-col overflow-y-auto overflow-x-hidden",
    ),
  )
 </script>
@@ -4,15 +4,17 @@
  interface Props {
    class?: string
    visible?: boolean
    children?: Snippet
  }
-  const {children, ...props}: Props = $props()
+  const {children, visible = false, ...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 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",
    visible ? "flex" : "hidden md:flex",
    props.class,
  )}>
  {@render children?.()}
@@ -46,7 +46,9 @@ 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()), ms))
+  return new Promise<never>((_, reject) =>
    setTimeout(() => reject(new TimeoutError(opts.message)), ms),
  )
 }
 export const buildUrl = (base: string | URL, ...pathname: string[]) => {
@@ -78,6 +78,21 @@
      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})
  })
@@ -40,7 +40,7 @@
 <Page>
  <ContentSearch>
    {#snippet input()}
-      <label class="row-2 input input-bordered">
+      <label class="row-2 input input-bordered w-full">
        <Icon icon={Magnifier} />
        <!-- svelte-ignore a11y_autofocus -->
        <input
@@ -5,6 +5,7 @@
  import {Badge} from "@capawesome/capacitor-badge"
  import Bell from "@assets/icons/bell.svg?dataurl"
  import {preventDefault} from "@lib/html"
  import FieldInline from "@lib/components/FieldInline.svelte"
  import Spinner from "@lib/components/Spinner.svelte"
  import Icon from "@lib/components/Icon.svelte"
  import Button from "@lib/components/Button.svelte"
@@ -63,40 +64,64 @@
      <!-- pass -->
    {:then { isSupported }}
      {#if isSupported}
-        <div class="flex justify-between">
+        <FieldInline>
-          <p>Show badge for unread alerts</p>
+          {#snippet label()}
-          <input type="checkbox" class="toggle toggle-primary" bind:checked={settings.badge} />
+            <p>Show badge for unread alerts</p>
-        </div>
+          {/snippet}
          {#snippet input()}
            <input type="checkbox" class="toggle toggle-primary" bind:checked={settings.badge} />
          {/snippet}
        </FieldInline>
      {/if}
    {/await}
    {#if !Capacitor.isNativePlatform()}
-      <div class="flex justify-between">
+      <FieldInline>
-        <p>Play sound for new activity</p>
+        {#snippet label()}
-        <input type="checkbox" class="toggle toggle-primary" bind:checked={settings.sound} />
+          <p>Play sound for new activity</p>
-      </div>
+        {/snippet}
        {#snippet input()}
          <input type="checkbox" class="toggle toggle-primary" bind:checked={settings.sound} />
        {/snippet}
      </FieldInline>
    {/if}
-    <div class="flex justify-between">
+    <FieldInline>
-      <p>Enable push notifications</p>
+      {#snippet label()}
-      <input type="checkbox" class="toggle toggle-primary" bind:checked={settings.push} />
+        <p>Enable push notifications</p>
-    </div>
+      {/snippet}
      {#snippet input()}
        <input type="checkbox" class="toggle toggle-primary" bind:checked={settings.push} />
      {/snippet}
    </FieldInline>
  </div>
  <div
    class={cx("card2 bg-alt col-4 shadow-md", {
      "pointer-events-none opacity-50": !settings.badge && !settings.sound && !settings.push,
    })}>
    <strong class="text-lg">Alert Types</strong>
-    <div class="flex justify-between">
+    <FieldInline>
-      <p>Notify me about new activity</p>
+      {#snippet label()}
-      <input type="checkbox" class="toggle toggle-primary" bind:checked={settings.spaces} />
+        <p>Notify me about new activity</p>
-    </div>
+      {/snippet}
-    <div class="flex justify-between">
+      {#snippet input()}
-      <p>Always notify me when mentioned</p>
+        <input type="checkbox" class="toggle toggle-primary" bind:checked={settings.spaces} />
-      <input type="checkbox" class="toggle toggle-primary" checked={settings.mentions} />
+      {/snippet}
-    </div>
+    </FieldInline>
-    <div class="flex justify-between">
+    <FieldInline>
-      <p>Notify me about new messages</p>
+      {#snippet label()}
-      <input type="checkbox" class="toggle toggle-primary" bind:checked={settings.messages} />
+        <p>Always notify me when mentioned</p>
-    </div>
+      {/snippet}
      {#snippet input()}
        <input type="checkbox" class="toggle toggle-primary" checked={settings.mentions} />
      {/snippet}
    </FieldInline>
    <FieldInline>
      {#snippet label()}
        <p>Notify me about new messages</p>
      {/snippet}
      {#snippet input()}
        <input type="checkbox" class="toggle toggle-primary" bind:checked={settings.messages} />
      {/snippet}
    </FieldInline>
  </div>
  <div
    class="card2 bg-alt sticky -bottom-3 shadow-md flex flex-row items-center justify-between gap-4">
@@ -11,6 +11,7 @@
  import {Router} from "@welshman/router"
  import {userMuteList, tagPubkey, publishThunk, userBlossomServerList} from "@welshman/app"
  import NotesMinimalistic from "@assets/icons/notes-minimalistic.svg?dataurl"
  import AddCircle from "@assets/icons/add-circle.svg?dataurl"
  import {preventDefault} from "@lib/html"
  import Field from "@lib/components/Field.svelte"
  import FieldInline from "@lib/components/FieldInline.svelte"
@@ -28,6 +29,10 @@
    blossomServers = getTagValues("server", getListTags($userBlossomServerList))
  }
  const addServer = () => {
    blossomServers = [...blossomServers, ""]
  }
  const onsubmit = preventDefault(async () => {
    await publishSettings($state.snapshot(settings))
@@ -104,7 +109,7 @@
      {/snippet}
      {#snippet input()}
        <input
-          class="range range-primary"
+          class="range range-primary w-full"
          type="range"
          min="0.8"
          max="1.3"
@@ -115,13 +120,13 @@
  </div>
  <div class="card2 bg-alt col-4 shadow-md">
    <strong class="text-lg">Editor Settings</strong>
-    <FieldInline>
+    <Field>
      {#snippet label()}
        <p>Send Delay</p>
      {/snippet}
      {#snippet input()}
        <input
-          class="range range-primary"
+          class="range range-primary w-full"
          type="range"
          min="0"
          max="10000"
@@ -134,17 +139,19 @@
          {settings.send_delay === 1000 ? "second" : "seconds"}.
        </p>
      {/snippet}
-    </FieldInline>
+    </Field>
    <Field>
      {#snippet label()}
        <p>Media Server</p>
      {/snippet}
      {#snippet secondary()}
        <Button class="link text-sm underline flex items-center gap-1" onclick={addServer}>
          <Icon icon={AddCircle} size={4} />
          Add Server
        </Button>
      {/snippet}
      {#snippet input()}
-        <InputList bind:value={blossomServers}>
+        <InputList allowAdd={false} bind:value={blossomServers} />
          {#snippet addLabel()}
            Add Server
          {/snippet}
        </InputList>
      {/snippet}
      {#snippet info()}
        <p>Choose a media server type and url for files you upload to {PLATFORM_NAME}.</p>
@@ -1,6 +1,7 @@
 <script lang="ts">
  import ShieldMinimalistic from "@assets/icons/shield-minimalistic.svg?dataurl"
  import {preventDefault} from "@lib/html"
  import FieldInline from "@lib/components/FieldInline.svelte"
  import Icon from "@lib/components/Icon.svelte"
  import Button from "@lib/components/Button.svelte"
  import {pushToast} from "@app/util/toast"
@@ -11,8 +12,10 @@
    settings = {...$userSettingsValues}
  }
-  const onAuthModeChange = (e: any) => {
+  const onAuthModeChange = (e: Event) => {
-    settings.auth_mode = e.target.checked ? RelayAuthMode.Aggressive : RelayAuthMode.Conservative
+    const target = e.currentTarget as HTMLInputElement
    settings.relay_auth = target.checked ? RelayAuthMode.Aggressive : RelayAuthMode.Conservative
  }
  const onsubmit = preventDefault(async () => {
@@ -30,31 +33,46 @@
      <Icon icon={ShieldMinimalistic} />
      Privacy Settings
    </strong>
-    <div class="grid grid-cols-2 gap-2">
+    <FieldInline>
-      <p>Authenticate with unknown relays?</p>
+      {#snippet label()}
-      <input
+        <p>Authenticate with unknown relays?</p>
-        type="checkbox"
+      {/snippet}
-        class="toggle toggle-primary"
+      {#snippet input()}
-        onchange={onAuthModeChange}
+        <input
-        checked={settings.auth_mode === RelayAuthMode.Aggressive} />
+          type="checkbox"
-      <p class="col-span-2 text-sm opacity-70">
+          class="toggle toggle-primary"
-        Controls whether {PLATFORM_NAME} will identify you to relays not in your lists.
+          onchange={onAuthModeChange}
-      </p>
+          checked={settings.relay_auth === RelayAuthMode.Aggressive} />
-    </div>
+      {/snippet}
-    <div class="grid grid-cols-2 gap-2">
+      {#snippet info()}
-      <p>Report errors?</p>
+        <p>Controls whether {PLATFORM_NAME} will identify you to relays not in your lists.</p>
-      <input type="checkbox" class="toggle toggle-primary" bind:checked={settings.report_errors} />
+      {/snippet}
-      <p class="col-span-2 text-sm opacity-70">
+    </FieldInline>
-        Allow {PLATFORM_NAME} to send error reports to help improve the app.
+    <FieldInline>
-      </p>
+      {#snippet label()}
-    </div>
+        <p>Report errors?</p>
-    <div class="grid grid-cols-2 gap-2">
+      {/snippet}
-      <p>Report usage?</p>
+      {#snippet input()}
-      <input type="checkbox" class="toggle toggle-primary" bind:checked={settings.report_usage} />
+        <input
-      <p class="col-span-2 text-sm opacity-70">
+          type="checkbox"
-        Allow {PLATFORM_NAME} to collect anonymous usage data.
+          class="toggle toggle-primary"
-      </p>
+          bind:checked={settings.report_errors} />
-    </div>
+      {/snippet}
      {#snippet info()}
        <p>Allow {PLATFORM_NAME} to send error reports to help improve the app.</p>
      {/snippet}
    </FieldInline>
    <FieldInline>
      {#snippet label()}
        <p>Report usage?</p>
      {/snippet}
      {#snippet input()}
        <input type="checkbox" class="toggle toggle-primary" bind:checked={settings.report_usage} />
      {/snippet}
      {#snippet info()}
        <p>Allow {PLATFORM_NAME} to collect anonymous usage data.</p>
      {/snippet}
    </FieldInline>
  </div>
  <div
    class="card2 bg-alt sticky -bottom-3 shadow-md flex flex-row items-center justify-between gap-4">
@@ -27,6 +27,7 @@
  import PasswordReset from "@app/components/PasswordReset.svelte"
  import InfoKeys from "@app/components/InfoKeys.svelte"
  import {pushModal} from "@app/util/modal"
  import {POMADE_NETWORK_ERROR_MESSAGE} from "@app/util/pomadeErrors"
  import {clip, pushToast} from "@app/util/toast"
  const npub = nip19.npubEncode($pubkey!)
@@ -48,13 +49,24 @@
      const {ok, peersByPrefix} = await Client.requestChallenge($session!.email)
      if (!ok) {
        console.error("Pomade challenge request failed during password reset initiation")
        pushToast({
          theme: "error",
-          message: "Failed to initiate password reset!",
+          message: POMADE_NETWORK_ERROR_MESSAGE,
        })
        return
      }
      pushModal(PasswordReset, {peersByPrefix})
    } catch (error) {
      console.error(error)
      pushToast({
        theme: "error",
        message: POMADE_NETWORK_ERROR_MESSAGE,
      })
    } finally {
      loading = false
    }
@@ -58,14 +58,14 @@
    <RelaySettingsItem
      icon={Inbox}
      title="Inbox 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={readRelayUrls}
      addRelay={addReadRelay}
      removeRelay={removeReadRelay} />
    <RelaySettingsItem
      icon={Plane}
      title="Outbox 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={writeRelayUrls}
      addRelay={addWriteRelay}
      removeRelay={removeWriteRelay} />
@@ -1,5 +1,7 @@
 <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"
@@ -7,6 +9,7 @@
  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"
@@ -98,6 +101,8 @@
  const onDragStart = (e: DragEvent, url: string) => {
    draggedUrl = url
    dragStartOrder = [...orderedSpaceUrls]
    lastDragTarget = undefined
    didDrop = false
    if (e.dataTransfer) {
      e.dataTransfer.effectAllowed = "move"
@@ -105,15 +110,25 @@
    }
  }
-  const onDragOver = (e: DragEvent, targetUrl: string) => {
+  const onDragOver = (e: DragEvent) => {
    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)
@@ -123,8 +138,14 @@
  }
  const onDragEnd = () => {
    if (!didDrop && dragStartOrder && !isSameOrder(dragStartOrder, orderedSpaceUrls)) {
      orderedSpaceUrls = dragStartOrder
    }
    draggedUrl = undefined
    dragStartOrder = undefined
    lastDragTarget = undefined
    didDrop = false
  }
  $effect(() => {
@@ -143,6 +164,8 @@
  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
@@ -247,17 +270,25 @@
            <Divider>Your spaces</Divider>
            {#each filteredUserUrls as url (url)}
              <div
-                class:opacity-60={draggedUrl === url}
+                animate:flip={{duration: 300, easing: cubicOut}}
                class="transition-opacity duration-200 {draggedUrl === url ? 'opacity-50' : ''}"
                draggable="true"
                role="listitem"
                ondragstart={e => onDragStart(e, url)}
-                ondragover={e => onDragOver(e, url)}
+                ondragover={onDragOver}
                ondragenter={e => onDragEnter(e, url)}
                ondrop={e => onDrop(e, url)}
                ondragend={onDragEnd}>
                <Button
-                  class="card2 bg-alt shadow-md transition-all hover:shadow-lg hover:dark:brightness-[1.1] w-full relative"
+                  class="group card2 bg-alt shadow-md transition-all hover:shadow-lg hover:dark:brightness-[1.1] w-full relative min-w-0"
                  onclick={() => openSpace(url)}>
-                  <RelaySummary hideFavorites {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>
                  {#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 = parseInt(theme.screens.md, 10)
+  const md = parseFloat(theme.screens.md) * 16
  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 class="flex! w-auto! grow pb-16">
+  <SecondaryNav visible class="w-auto grow pb-16">
    <SpaceMenu {url} />
  </SecondaryNav>
 {/if}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
userAdityaa	7a915eb71c	fix: safari chat regressions	2026-05-03 15:24:33 +05:45
Jon Staab	976ccdabd4	fix: include MESSAGE kind and local matches in space search	2026-04-28 14:44:16 -07:00
Jon Staab	99b26680b6	feat: rework hosting page to 2+1 architecture (#231 )	2026-04-28 14:42:09 -07:00
Jon Staab	c5be477855	fix: bundle emoji-picker data locally for Capacitor Android The emoji grid wasn't rendering on Android because emoji-picker-element defaults to fetching its data.json from jsdelivr, and CapacitorHttp's patched fetch breaks the library's ETag-based revalidation flow. Bundle emoji-picker-element-data via Vite's ?url import so the JSON ships as a same-origin asset. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>	2026-04-28 14:15:12 -07:00
DeveshSingh	32c1501e9c	feat: add progress bar to signup flow (#234 ) Co-authored-by: deveshanim3 <deveshsingh6986@gmail.com> Co-committed-by: deveshanim3 <deveshsingh6986@gmail.com>	2026-04-23 15:35:59 +00:00
DeveshSingh	463837e7d4	fix: restore consistent input field sizing and alignment in FieldInline (#235 ) (#238 ) Co-authored-by: deveshanim3 <deveshsingh6986@gmail.com> Co-committed-by: deveshanim3 <deveshsingh6986@gmail.com>	2026-04-20 16:26:44 +00:00
Shreyas2004wagh	d74f142cdd	Fix relay auth privacy toggle (#240 ) Co-authored-by: Shreyas2004wagh <shreyaswagh2004@gmail.com> Co-committed-by: Shreyas2004wagh <shreyaswagh2004@gmail.com>	2026-04-20 16:25:52 +00:00
Jon Staab	53954aae89	classnames tweak	2026-04-17 16:06:00 -07:00
userAdityaa	24aa62a503	chore: carify Pomade login errors with actionable invalid vs network messaging (#233 ) Co-authored-by: userAdityaa <aditya.chaudhary1558@gmail.com> Co-committed-by: userAdityaa <aditya.chaudhary1558@gmail.com>	2026-04-17 23:00:03 +00:00
Jon Staab	2618bb9c63	Fix centered layout	2026-04-17 14:58:59 -07:00
Prat_09	32a31045ef	fix: Improve toggle switch placement in settings screen (#208 ) (#232 ) Co-authored-by: Pratyush Mohanty <prat_09@noreply.coracle.social> Co-committed-by: Pratyush Mohanty <prat_09@noreply.coracle.social>	2026-04-17 21:58:52 +00:00
DeveshSingh	56edad77a8	fix: added logic for password requirements on signup (#230 ) Co-authored-by: deveshanim3 <deveshsingh6986@gmail.com> Co-committed-by: deveshanim3 <deveshsingh6986@gmail.com>	2026-04-17 19:43:27 +00:00
priyanshu_bharti	fdb604e350	Use type=email for signup/login email inputs (#225 ) (#228 ) Co-authored-by: Priyanshubhartistm <bhartipriyanshustm@gmail.com> Co-committed-by: Priyanshubhartistm <bhartipriyanshustm@gmail.com>	2026-04-17 18:55:04 +00:00
DeveshSingh	3c66dfd83c	fix/wrong-message-offline (#222 ) Co-authored-by: deveshanim3 <deveshsingh6986@gmail.com> Co-committed-by: deveshanim3 <deveshsingh6986@gmail.com>	2026-04-17 18:24:55 +00:00
userAdityaa	81633b0a1e	fix: vertical alignment of emoji and overflow buttons in shared event action row (#219 ) Co-authored-by: userAdityaa <aditya.chaudhary1558@gmail.com> Co-committed-by: userAdityaa <aditya.chaudhary1558@gmail.com>	2026-04-17 15:22:40 +00:00
Khushvendra	4a967de184	fix(chat): suppress programmatic scroll while user is scrolling (#132 ) (#216 ) Co-authored-by: 1amKhush <khushvendras99@gmail.com> Co-committed-by: 1amKhush <khushvendras99@gmail.com>	2026-04-16 23:20:17 +00:00
DeveshSingh	59961cbdb5	fix: supported nip overflow in SpaceRelayStatus.svelte (#215 ) Co-authored-by: deveshanim3 <deveshsingh6986@gmail.com> Co-committed-by: deveshanim3 <deveshsingh6986@gmail.com>	2026-04-16 21:36:14 +00:00
Jon Staab	95d9d8bf23	Bump version	2026-04-16 14:10:50 -07:00
Jon Staab	2fd9741a2b	Fix safe area inset for chat fab	2026-04-16 14:08:25 -07:00
Jon Staab	fe9c325580	Update universal links	2026-04-16 13:50:13 -07:00
Jon Staab	61e93d4071	Update changelog, bump version	2026-04-16 11:40:24 -07:00
Jon Staab	1e4a4e43dc	remove dead virtualization code	2026-04-16 11:39:11 -07:00
Jon Staab	e1a7b051bd	Use welshman kinds	2026-04-16 11:34:59 -07:00
sakshamjain	7a7af58f5c	feat: add native share support for space invites	2026-04-16 10:16:12 -07:00
Jon Staab	016ae86d50	Stop sending duplicate requests per room	2026-04-16 10:03:01 -07:00
Jon Staab	2bff060a5e	Add thumbnail url	2026-04-16 10:03:01 -07:00
userAdityaa	68231504d0	fix: modal close button stacking above emoji picker on mobile (#211 ) Co-authored-by: userAdityaa <aditya.chaudhary1558@gmail.com> Co-committed-by: userAdityaa <aditya.chaudhary1558@gmail.com>	2026-04-16 15:38:25 +00:00
DeveshSingh	0658a8ee44	bug: fixed calender modal stacking issue (#209 ) Co-authored-by: deveshanim3 <deveshsingh6986@gmail.com> Co-committed-by: deveshanim3 <deveshsingh6986@gmail.com>	2026-04-16 14:55:37 +00:00
priyanshu_bharti	43fb3d35e6	Fix #202 slow-network invite timeout handling (#207 ) Co-authored-by: Priyanshubhartistm <bhartipriyanshustm@gmail.com> Co-committed-by: Priyanshubhartistm <bhartipriyanshustm@gmail.com>	2026-04-15 22:01:00 +00:00
Khushvendra	4cc1cc95ca	Fix voice call cold-start timeout and preserve custom timeout message (#174 ) (#203 ) Co-authored-by: 1amKhush <khushvendras99@gmail.com> Co-committed-by: 1amKhush <khushvendras99@gmail.com>	2026-04-15 20:37:03 +00:00
Prat_09	964ef441ec	Update relay description (#195 ) (#197 ) Co-authored-by: Pratyush Mohanty <prat_09@noreply.coracle.social> Co-committed-by: Pratyush Mohanty <prat_09@noreply.coracle.social>	2026-04-14 15:09:46 +00:00
priyanshu_bharti	796f37d320	Make space reordering discoverable with smoother drag animation (#171 ) Co-authored-by: Priyanshu Bharti <bhartipriyanshustm@gmail.com> Co-committed-by: Priyanshu Bharti <bhartipriyanshustm@gmail.com>	2026-04-13 22:38:02 +00:00
nayan9617	b46fd94578	Use relay-provided member lists as source of truth (#191 ) Co-authored-by: Nayan Patidar <nayan9617@noreply.coracle.social> Co-committed-by: Nayan Patidar <nayan9617@noreply.coracle.social>	2026-04-13 21:12:49 +00:00
Jon Staab	bdc8e75640	Fix search input width	2026-04-13 12:08:11 -07:00
Jon Staab	ef08821796	remove VirtualItem	2026-04-13 10:35:26 -07:00
Jon Staab	9f386f6968	remove redundant room syncing logic	2026-04-11 10:20:50 -07:00
Khushvendra	ec0b6a99e2	add room mentions and clickable room/relay refs	2026-04-11 10:13:23 -07:00
Khushvendra	f6d9e52c6e	fix: support native clipboard image paste on mobile (#181 ) Co-authored-by: Khushvendra <khushvendras99@gmail.com> Co-committed-by: Khushvendra <khushvendras99@gmail.com>	2026-04-11 16:38:06 +00:00
Jon Staab	90f86b833d	Handle quotes in RoomItem. Fixes #188	2026-04-10 15:27:36 -07:00
userAdityaa	29bb33c26c	publish kind 9 quote after room content creation for cross-client interoperability	2026-04-10 14:20:24 -07:00
Jon Staab	c740bd21d4	Fix space page layout on Android by adding visible prop to SecondaryNav	2026-04-10 13:26:14 -07:00
Jon Staab	1d92709c76	perf: task-fix-list-virtualization changes	2026-04-10 12:44:01 -07:00
Jon Staab	a42e1df1a7	Fix feed pagination logic	2026-04-10 12:40:28 -07:00
Jon Staab	e33beee17d	perf: task-fix-raf-derived-to-effect changes	2026-04-10 12:30:25 -07:00
Jon Staab	b10ea04cb3	Fix Android push fallback: show all notifications, retry on failure	2026-04-10 12:23:32 -07:00
priyanshu_bharti	e8c94177ca	Support Aegis URL scheme for NIP-46 login (#161 ) Co-authored-by: Priyanshubhartistm <bhartipriyanshustm@gmail.com> Co-committed-by: Priyanshubhartistm <bhartipriyanshustm@gmail.com>	2026-04-10 19:04:34 +00:00
Jon Staab	f1f2083c88	Remove unnecessary snapshots, format	2026-04-10 11:09:26 -07:00
Jon Staab	f42889c3c2	Improve performance #182 : increase profile timer and chat search throttle delays reduce GC pressure in derived stores use requestIdleCallback for non-critical storage writes batch repository update processing in feeds	2026-04-10 10:39:38 -07:00
Jon Staab	a75e1f96eb	Add .claude to gitignore	2026-04-10 10:14:01 -07:00
priyanshu_bharti	85c5293082	Raise message size limit in chat (#186 ) Co-authored-by: Priyanshubhartistm <bhartipriyanshustm@gmail.com> Co-committed-by: Priyanshubhartistm <bhartipriyanshustm@gmail.com>	2026-04-10 16:37:23 +00:00
Jon Staab	37efa6a62c	Bump pomade	2026-04-10 09:24:22 -07:00