Cleanup remaining files

Factor video code and stores out of voice.ts
Clean up VideoCallContent
2026-04-08 17:10:12 +00:00 · 2026-04-08 17:10:12 +00:00 · 2026-04-08 17:10:12 +00:00 · 2026-04-08 17:10:12 +00:00 · 2026-04-08 17:10:12 +00:00 · 2026-04-08 17:10:12 +00:00
123 changed files with 1164 additions and 2665 deletions
@@ -4,6 +4,7 @@ ios
 build

 # Git
+.git
 .gitignore

 # Env files (keep .env for build; exclude local overrides)
@@ -19,6 +19,6 @@ VITE_DEFAULT_SEARCH_RELAYS=relay.ditto.pub,antiprimal.net,relay.vertexlab.io
 VITE_DEFAULT_MESSAGING_RELAYS=auth.nostr1.com,relay.keychat.io,relay.ditto.pub
 VITE_SIGNER_RELAYS=relay.nsec.app,ephemeral.snowflare.cc,bucket.coracle.social
 VITE_VAPID_PUBLIC_KEY=BIt2D4BdgdbCowD_0d3Np6GbrIGHxd7aIEUeZNe3hQuRlHz02OhzvDaai0XSFoJYVzSzdMjdyW-QhvW9_yq8j4Y
-VITE_THUMBNAIL_URL=https://vthumbs.coracle.social
+VITE_THUMBNAIL_URL=
 VITE_GLITCHTIP_API_KEY=
 GLITCHTIP_AUTH_TOKEN=
@@ -1,5 +1,4 @@
 src/assets
-.claude
 target
 build
 .idea
@@ -14,4 +13,4 @@ ios/App/Pods/
 android/capacitor-cordova-android-plugins
 android/app/src/androidTest
 android/app/src/test
-node_modules
+
@@ -5,8 +5,8 @@ on:
    branches: [master]

 env:
-  REGISTRY: gitea.coracle.social
-  IMAGE_NAME: coracle/flotilla
+  REGISTRY: ghcr.io
+  IMAGE_NAME: coracle-social/flotilla

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

      - name: Extract metadata (tags, labels) for Docker
        id: meta
@@ -70,7 +70,6 @@ GoogleService-Info.plist
 .roo
 .idea/
 .vscode/
-.claude/

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

-# 1.8.0
-
-* Fix relay badge overflow
-* Suppress programmatic scroll when user is scrolling
-* Fix vertical alignment of emoji and overflow buttons in shared event action row
-* Use type=email for signup/login email inputs, validate password
-* Improve toggle switch placement on settings screens
-* Fix relay auth privacy toggle
-* Improve field layout
-* Add progress bar to signup flow
-* Bundle emojis properly
-* Rework hosting page
-* Fix padding on pages on small screens
-* Add richer link preview support
-* Fix pasting into event summary
-* Publish fewer join/claim requests
-* Fix new messages not rendering in safari
-* Avoid capturing stale cleanup function in chat
-* Hide keyboard on app resume
-* Add email rendering support
-* Fix bunker login
-* Fix undefined chat draft key
-* Allow sharing to chat without a message
-* Make sure to show date on calendar events when embedded
-* Improve space search
-
-# 1.7.4
-
-* Fix safe area inset for FAB
-
-# 1.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
@@ -1,27 +1,32 @@
-# Build and run the Flotilla web server.
-#
-#   docker build -t flotilla .
-#   docker run -p 3000:3000 flotilla
-#
-# Pass --build-arg VITE_BUILD_HASH=$(git rev-parse --short HEAD) to stamp the build.
-# A .env in the build context is picked up by build.sh for branding config.
+# Stage 1: Build
+# Uses .env from build context for config (logo, branding, etc.)
+# Optional: docker build --build-arg VITE_BUILD_HASH=$(git rev-parse --short HEAD) -t flotilla .

-FROM node:22-bookworm
+FROM node:20-bookworm AS builder

-RUN npm install -g pnpm@10.33.0
+RUN apt-get update && apt-get install -y --no-install-recommends curl
+
+RUN npm install -g pnpm@latest

 WORKDIR /app

 COPY package.json pnpm-lock.yaml ./
+RUN pnpm i

-RUN pnpm i --frozen-lockfile
-
-ENV NODE_OPTIONS=--max_old_space_size=16384
-
+# Copy everything (including .env when present) - build.sh will source it
 COPY . .

+ARG VITE_BUILD_HASH
+ENV VITE_BUILD_HASH=${VITE_BUILD_HASH}
+
+ENV NODE_OPTIONS=--max_old_space_size=16384
 RUN pnpm run build

-EXPOSE 3000
+FROM node:20-alpine

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

 Or, if you prefer to use a container:

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

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

 ```sh
 mkdir ./mount
-docker run -v ./mount:/app/mount gitea.coracle.social/coracle/flotilla:latest bash -c 'cp -r build/* mount'
+podman run -v ./mount:/app/mount ghcr.io/coracle-social/flotilla:latest bash -c 'cp -r build/* mount'
 ```
@@ -8,8 +8,8 @@ android {
        applicationId "social.flotilla"
        minSdk rootProject.ext.minSdkVersion
        targetSdk rootProject.ext.targetSdkVersion
-        versionCode 47
-        versionName "1.8.0"
+        versionCode 44
+        versionName "1.7.2"
        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
        aaptOptions {
             // Files and dirs to omit from the packaged assets dir, modified to accommodate modern web apps.
@@ -12,12 +12,10 @@ dependencies {
    implementation project(':aparajita-capacitor-secure-storage')
    implementation project(':capacitor-community-safe-area')
    implementation project(':capacitor-app')
-    implementation project(':capacitor-clipboard')
    implementation project(':capacitor-filesystem')
    implementation project(':capacitor-keyboard')
    implementation project(':capacitor-preferences')
    implementation project(':capacitor-push-notifications')
-    implementation project(':capacitor-share')
    implementation project(':capawesome-capacitor-android-dark-mode-support')
    implementation project(':capawesome-capacitor-badge')
    implementation project(':nostr-signer-capacitor-plugin')
@@ -7,7 +7,6 @@ import androidx.work.ExistingPeriodicWorkPolicy
 import androidx.work.ExistingWorkPolicy
 import androidx.work.NetworkType
 import androidx.work.OneTimeWorkRequest
-import androidx.work.OutOfQuotaPolicy
 import androidx.work.PeriodicWorkRequest
 import androidx.work.WorkManager
 import com.getcapacitor.JSObject
@@ -77,7 +76,6 @@ class AndroidPushFallbackPlugin : Plugin() {

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

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

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

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

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

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

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

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

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

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

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

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

@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 54;
+	objectVersion = 48;
 	objects = {

 /* Begin PBXBuildFile section */
@@ -131,9 +131,8 @@
 		504EC2FC1FED79650016851F /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				BuildIndependentTargetsInParallel = YES;
 				LastSwiftUpdateCheck = 920;
-				LastUpgradeCheck = 2630;
+				LastUpgradeCheck = 920;
 				TargetAttributes = {
 					504EC3031FED79650016851F = {
 						CreatedOnToolsVersion = 9.2;
@@ -258,7 +257,6 @@
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
-				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
 				CLANG_WARN_EMPTY_BODY = YES;
@@ -266,10 +264,8 @@
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
-				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
-				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
 				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -279,10 +275,8 @@
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				COPY_PHASE_STRIP = NO;
 				DEBUG_INFORMATION_FORMAT = dwarf;
-				DEVELOPMENT_TEAM = S26U9DYW3A;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
-				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_NO_COMMON_BLOCKS = YES;
@@ -301,7 +295,6 @@
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
-				STRING_CATALOG_GENERATE_SYMBOLS = YES;
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 			};
@@ -321,7 +314,6 @@
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
-				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
 				CLANG_WARN_EMPTY_BODY = YES;
@@ -329,10 +321,8 @@
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
-				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
-				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
 				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -342,10 +332,8 @@
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				COPY_PHASE_STRIP = NO;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
-				DEVELOPMENT_TEAM = S26U9DYW3A;
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
-				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
@@ -357,9 +345,7 @@
 				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
-				STRING_CATALOG_GENERATE_SYMBOLS = YES;
-				SWIFT_COMPILATION_MODE = wholemodule;
-				SWIFT_OPTIMIZATION_LEVEL = "-O";
+				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
 				VALIDATE_PRODUCT = YES;
 			};
 			name = Release;
@@ -372,16 +358,14 @@
 				CODE_SIGN_ENTITLEMENTS = "Flotilla Chat.entitlements";
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 38;
+				CURRENT_PROJECT_VERSION = 35;
+				DEVELOPMENT_TEAM = S26U9DYW3A;
 				INFOPLIST_FILE = App/Info.plist;
 				INFOPLIST_KEY_CFBundleDisplayName = "Flotilla Chat";
 				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.social-networking";
 				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
-				LD_RUNPATH_SEARCH_PATHS = (
-					"$(inherited)",
-					"@executable_path/Frameworks",
-				);
-				MARKETING_VERSION = 1.8.0;
+				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
+				MARKETING_VERSION = 1.7.2;
 				OTHER_SWIFT_FLAGS = "$(inherited) \"-D\" \"COCOAPODS\" \"-DDEBUG\"";
 				PRODUCT_BUNDLE_IDENTIFIER = social.flotilla;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -401,16 +385,14 @@
 				CODE_SIGN_ENTITLEMENTS = "Flotilla Chat.entitlements";
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 38;
+				CURRENT_PROJECT_VERSION = 35;
+				DEVELOPMENT_TEAM = S26U9DYW3A;
 				INFOPLIST_FILE = App/Info.plist;
 				INFOPLIST_KEY_CFBundleDisplayName = "Flotilla Chat";
 				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.social-networking";
 				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
-				LD_RUNPATH_SEARCH_PATHS = (
-					"$(inherited)",
-					"@executable_path/Frameworks",
-				);
-				MARKETING_VERSION = 1.8.0;
+				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
+				MARKETING_VERSION = 1.7.2;
 				PRODUCT_BUNDLE_IDENTIFIER = social.flotilla;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -14,12 +14,10 @@ def capacitor_pods
  pod 'AparajitaCapacitorSecureStorage', :path => '../../node_modules/.pnpm/@aparajita+capacitor-secure-storage@8.0.0/node_modules/@aparajita/capacitor-secure-storage'
  pod 'CapacitorCommunitySafeArea', :path => '../../node_modules/.pnpm/@capacitor-community+safe-area@8.0.1_@capacitor+core@8.0.1/node_modules/@capacitor-community/safe-area'
  pod 'CapacitorApp', :path => '../../node_modules/.pnpm/@capacitor+app@8.0.0_@capacitor+core@8.0.1/node_modules/@capacitor/app'
-  pod 'CapacitorClipboard', :path => '../../node_modules/.pnpm/@capacitor+clipboard@8.0.1_@capacitor+core@8.0.1/node_modules/@capacitor/clipboard'
  pod 'CapacitorFilesystem', :path => '../../node_modules/.pnpm/@capacitor+filesystem@8.1.0_@capacitor+core@8.0.1/node_modules/@capacitor/filesystem'
  pod 'CapacitorKeyboard', :path => '../../node_modules/.pnpm/@capacitor+keyboard@8.0.0_@capacitor+core@8.0.1/node_modules/@capacitor/keyboard'
  pod 'CapacitorPreferences', :path => '../../node_modules/.pnpm/@capacitor+preferences@8.0.0_@capacitor+core@8.0.1/node_modules/@capacitor/preferences'
  pod 'CapacitorPushNotifications', :path => '../../node_modules/.pnpm/@capacitor+push-notifications@8.0.0_@capacitor+core@8.0.1/node_modules/@capacitor/push-notifications'
-  pod 'CapacitorShare', :path => '../../node_modules/.pnpm/@capacitor+share@8.0.1_@capacitor+core@8.0.1/node_modules/@capacitor/share'
  pod 'CapawesomeCapacitorBadge', :path => '../../node_modules/.pnpm/@capawesome+capacitor-badge@8.0.0_@capacitor+core@8.0.1/node_modules/@capawesome/capacitor-badge'
  pod 'NostrSignerCapacitorPlugin', :path => '../../node_modules/.pnpm/nostr-signer-capacitor-plugin@https+++codeload.github.com+coracle-social+nostr-signer-c_2704ecccfd05fcfb1ad8852744422b7c/node_modules/nostr-signer-capacitor-plugin'
 end
@@ -1,11 +1,10 @@
 {
  "name": "flotilla",
-  "version": "1.8.0",
+  "version": "1.7.2",
  "private": true,
  "scripts": {
    "dev": "vite dev",
    "build": "./build.sh",
-    "start": "node server.js",
    "release:android": "./build.sh && cap build android --androidreleasetype APK --signing-type apksigner",
    "tauri:dev": "tauri dev",
    "tauri:build": "tauri build",
@@ -49,48 +48,41 @@
    "@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",
-    "@hono/node-server": "^2.0.0",
    "@noble/curves": "^1.9.7",
-    "@pomade/core": "^0.2.3",
+    "@pomade/core": "^0.2.2",
    "@poppanator/sveltekit-svg": "^4.2.1",
    "@sveltejs/adapter-static": "^3.0.10",
    "@tiptap/core": "^2.27.2",
-    "@tiptap/pm": "^2.27.2",
    "@types/qrcode": "^1.5.6",
    "@types/throttle-debounce": "^5.0.2",
    "@vite-pwa/assets-generator": "^0.2.6",
    "@vite-pwa/sveltekit": "^0.6.8",
-    "@welshman/app": "^0.8.15",
-    "@welshman/content": "^0.8.15",
-    "@welshman/editor": "^0.8.15",
-    "@welshman/feeds": "^0.8.15",
-    "@welshman/lib": "^0.8.15",
-    "@welshman/net": "^0.8.15",
-    "@welshman/router": "^0.8.15",
-    "@welshman/signer": "^0.8.15",
-    "@welshman/store": "^0.8.15",
-    "@welshman/util": "^0.8.15",
-    "cheerio": "^1.2.0",
+    "@welshman/app": "^0.8.12",
+    "@welshman/content": "^0.8.12",
+    "@welshman/editor": "^0.8.12",
+    "@welshman/feeds": "^0.8.12",
+    "@welshman/lib": "^0.8.12",
+    "@welshman/net": "^0.8.12",
+    "@welshman/router": "^0.8.12",
+    "@welshman/signer": "^0.8.12",
+    "@welshman/store": "^0.8.12",
+    "@welshman/util": "^0.8.12",
    "compressorjs-next": "^1.1.2",
    "daisyui": "^5.5.19",
    "date-picker-svelte": "^2.17.0",
    "dotenv": "^16.6.1",
    "emoji-picker-element": "^1.28.1",
-    "emoji-picker-element-data": "^1.8.0",
    "fuse.js": "^7.1.0",
-    "hono": "^4.12.15",
    "husky": "^9.1.7",
    "idb": "^8.0.3",
    "livekit-client": "^2.17.2",
@@ -113,6 +105,5 @@
    "overrides": {
      "sharp": "0.35.0-rc.0"
    }
-  },
-  "packageManager": "pnpm@10.33.0+sha512.10568bb4a6afb58c9eb3630da90cc9516417abebd3fabbe6739f0ae795728da1491e9db5a544c76ad8eb7570f5c4bb3d6c637b2cb41bfdcdb47fa823c8649319"
+  }
 }
@@ -26,9 +26,6 @@ importers:
      '@capacitor/cli':
        specifier: ^8.0.1
        version: 8.0.1
-      '@capacitor/clipboard':
-        specifier: ^8.0.1
-        version: 8.0.1(@capacitor/core@8.0.1)
      '@capacitor/core':
        specifier: ^8.0.1
        version: 8.0.1
@@ -47,9 +44,6 @@ importers:
      '@capacitor/push-notifications':
        specifier: ^8.0.0
        version: 8.0.0(@capacitor/core@8.0.1)
-      '@capacitor/share':
-        specifier: ^8.0.1
-        version: 8.0.1(@capacitor/core@8.0.1)
      '@capawesome/capacitor-android-dark-mode-support':
        specifier: ^8.0.0
        version: 8.0.0(@capacitor/core@8.0.1)
@@ -62,15 +56,12 @@ importers:
      '@getalby/sdk':
        specifier: ^5.1.2
        version: 5.1.2(typescript@5.9.3)
-      '@hono/node-server':
-        specifier: ^2.0.0
-        version: 2.0.0(hono@4.12.15)
      '@noble/curves':
        specifier: ^1.9.7
        version: 1.9.7
      '@pomade/core':
-        specifier: ^0.2.3
-        version: 0.2.3(@frostr/bifrost@1.0.7(typescript@5.9.3))(@noble/hashes@2.0.1)(@welshman/lib@0.8.15)(@welshman/net@0.8.15(@welshman/lib@0.8.15)(@welshman/util@0.8.15(@noble/curves@1.9.7)(@welshman/lib@0.8.15)(nostr-tools@2.20.0(typescript@5.9.3)))(ws@8.18.3))(@welshman/signer@0.8.15(@noble/curves@1.9.7)(@noble/hashes@2.0.1)(@welshman/lib@0.8.15)(@welshman/net@0.8.15(@welshman/lib@0.8.15)(@welshman/util@0.8.15(@noble/curves@1.9.7)(@welshman/lib@0.8.15)(nostr-tools@2.20.0(typescript@5.9.3)))(ws@8.18.3))(@welshman/util@0.8.15(@noble/curves@1.9.7)(@welshman/lib@0.8.15)(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.15(@noble/curves@1.9.7)(@welshman/lib@0.8.15)(nostr-tools@2.20.0(typescript@5.9.3)))(nostr-tools@2.20.0(typescript@5.9.3))
+        specifier: ^0.2.2
+        version: 0.2.2(@frostr/bifrost@1.0.7(typescript@5.9.3))(@noble/hashes@2.0.1)(@welshman/lib@0.8.12)(@welshman/net@0.8.12(@welshman/lib@0.8.12)(@welshman/util@0.8.12(@noble/curves@1.9.7)(@welshman/lib@0.8.12)(nostr-tools@2.20.0(typescript@5.9.3)))(ws@8.18.3))(@welshman/signer@0.8.12(@noble/curves@1.9.7)(@noble/hashes@2.0.1)(@welshman/lib@0.8.12)(@welshman/net@0.8.12(@welshman/lib@0.8.12)(@welshman/util@0.8.12(@noble/curves@1.9.7)(@welshman/lib@0.8.12)(nostr-tools@2.20.0(typescript@5.9.3)))(ws@8.18.3))(@welshman/util@0.8.12(@noble/curves@1.9.7)(@welshman/lib@0.8.12)(nostr-tools@2.20.0(typescript@5.9.3)))(nostr-signer-capacitor-plugin@https://codeload.github.com/coracle-social/nostr-signer-capacitor-plugin/tar.gz/be4bb90a1a15c8eec0934f2f66ce9e82ecc72d51(@capacitor/core@8.0.1))(nostr-tools@2.20.0(typescript@5.9.3)))(@welshman/util@0.8.12(@noble/curves@1.9.7)(@welshman/lib@0.8.12)(nostr-tools@2.20.0(typescript@5.9.3)))(nostr-tools@2.20.0(typescript@5.9.3))
      '@poppanator/sveltekit-svg':
        specifier: ^4.2.1
        version: 4.2.1(rollup@2.80.0)(svelte@5.48.0)(svgo@3.3.2)(vite@5.4.21(@types/node@25.0.10)(lightningcss@1.32.0)(terser@5.46.0))
@@ -80,9 +71,6 @@ importers:
      '@tiptap/core':
        specifier: ^2.27.2
        version: 2.27.2(@tiptap/pm@2.27.2)
-      '@tiptap/pm':
-        specifier: ^2.27.2
-        version: 2.27.2
      '@types/qrcode':
        specifier: ^1.5.6
        version: 1.5.6
@@ -96,38 +84,35 @@ importers:
        specifier: ^0.6.8
        version: 0.6.8(@sveltejs/kit@2.50.1(@sveltejs/vite-plugin-svelte@4.0.4(svelte@5.48.0)(vite@5.4.21(@types/node@25.0.10)(lightningcss@1.32.0)(terser@5.46.0)))(svelte@5.48.0)(typescript@5.9.3)(vite@5.4.21(@types/node@25.0.10)(lightningcss@1.32.0)(terser@5.46.0)))(@vite-pwa/assets-generator@0.2.6)(vite-plugin-pwa@0.21.2(@vite-pwa/assets-generator@0.2.6)(vite@5.4.21(@types/node@25.0.10)(lightningcss@1.32.0)(terser@5.46.0))(workbox-build@7.3.0)(workbox-window@7.3.0))
      '@welshman/app':
-        specifier: ^0.8.15
-        version: 0.8.15(ff026297546a8274624eb18a0ea86191)
+        specifier: ^0.8.12
+        version: 0.8.12(3074ef6691f94dc03952d8dbc98013a7)
      '@welshman/content':
-        specifier: ^0.8.15
-        version: 0.8.15(nostr-tools@2.20.0(typescript@5.9.3))
+        specifier: ^0.8.12
+        version: 0.8.12(nostr-tools@2.20.0(typescript@5.9.3))
      '@welshman/editor':
-        specifier: ^0.8.15
-        version: 0.8.15(@welshman/lib@0.8.15)(@welshman/util@0.8.15(@noble/curves@1.9.7)(@welshman/lib@0.8.15)(nostr-tools@2.20.0(typescript@5.9.3)))(nostr-editor@1.1.1(@tiptap/core@2.27.2(@tiptap/pm@2.27.2))(@tiptap/extension-image@2.27.1(@tiptap/core@2.27.2(@tiptap/pm@2.27.2)))(@tiptap/extension-link@2.27.1(@tiptap/core@2.27.2(@tiptap/pm@2.27.2))(@tiptap/pm@2.27.2))(@tiptap/pm@2.27.2)(linkifyjs@4.3.2)(nostr-tools@2.20.0(typescript@5.9.3))(prosemirror-markdown@1.13.3)(prosemirror-model@1.25.4)(prosemirror-state@1.4.4)(prosemirror-view@1.41.5)(tiptap-markdown@0.8.10(@tiptap/core@2.27.2(@tiptap/pm@2.27.2))))(nostr-tools@2.20.0(typescript@5.9.3))
+        specifier: ^0.8.12
+        version: 0.8.12(@welshman/lib@0.8.12)(@welshman/util@0.8.12(@noble/curves@1.9.7)(@welshman/lib@0.8.12)(nostr-tools@2.20.0(typescript@5.9.3)))(nostr-editor@1.1.1(@tiptap/core@2.27.2(@tiptap/pm@2.27.2))(@tiptap/extension-image@2.27.1(@tiptap/core@2.27.2(@tiptap/pm@2.27.2)))(@tiptap/extension-link@2.27.1(@tiptap/core@2.27.2(@tiptap/pm@2.27.2))(@tiptap/pm@2.27.2))(@tiptap/pm@2.27.2)(linkifyjs@4.3.2)(nostr-tools@2.20.0(typescript@5.9.3))(prosemirror-markdown@1.13.3)(prosemirror-model@1.25.4)(prosemirror-state@1.4.4)(prosemirror-view@1.41.5)(tiptap-markdown@0.8.10(@tiptap/core@2.27.2(@tiptap/pm@2.27.2))))(nostr-tools@2.20.0(typescript@5.9.3))
      '@welshman/feeds':
-        specifier: ^0.8.15
-        version: 0.8.15(6e55dcd4e7516745e7b0228620d35545)
+        specifier: ^0.8.12
+        version: 0.8.12(d5b74f0c83250e052e0b96f7ff5804e8)
      '@welshman/lib':
-        specifier: ^0.8.15
-        version: 0.8.15
+        specifier: ^0.8.12
+        version: 0.8.12
      '@welshman/net':
-        specifier: ^0.8.15
-        version: 0.8.15(@welshman/lib@0.8.15)(@welshman/util@0.8.15(@noble/curves@1.9.7)(@welshman/lib@0.8.15)(nostr-tools@2.20.0(typescript@5.9.3)))(ws@8.18.3)
+        specifier: ^0.8.12
+        version: 0.8.12(@welshman/lib@0.8.12)(@welshman/util@0.8.12(@noble/curves@1.9.7)(@welshman/lib@0.8.12)(nostr-tools@2.20.0(typescript@5.9.3)))(ws@8.18.3)
      '@welshman/router':
-        specifier: ^0.8.15
-        version: 0.8.15(@welshman/lib@0.8.15)(@welshman/net@0.8.15(@welshman/lib@0.8.15)(@welshman/util@0.8.15(@noble/curves@1.9.7)(@welshman/lib@0.8.15)(nostr-tools@2.20.0(typescript@5.9.3)))(ws@8.18.3))(@welshman/util@0.8.15(@noble/curves@1.9.7)(@welshman/lib@0.8.15)(nostr-tools@2.20.0(typescript@5.9.3)))
+        specifier: ^0.8.12
+        version: 0.8.12(@welshman/lib@0.8.12)(@welshman/net@0.8.12(@welshman/lib@0.8.12)(@welshman/util@0.8.12(@noble/curves@1.9.7)(@welshman/lib@0.8.12)(nostr-tools@2.20.0(typescript@5.9.3)))(ws@8.18.3))(@welshman/util@0.8.12(@noble/curves@1.9.7)(@welshman/lib@0.8.12)(nostr-tools@2.20.0(typescript@5.9.3)))
      '@welshman/signer':
-        specifier: ^0.8.15
-        version: 0.8.15(@noble/curves@1.9.7)(@noble/hashes@2.0.1)(@welshman/lib@0.8.15)(@welshman/net@0.8.15(@welshman/lib@0.8.15)(@welshman/util@0.8.15(@noble/curves@1.9.7)(@welshman/lib@0.8.15)(nostr-tools@2.20.0(typescript@5.9.3)))(ws@8.18.3))(@welshman/util@0.8.15(@noble/curves@1.9.7)(@welshman/lib@0.8.15)(nostr-tools@2.20.0(typescript@5.9.3)))(nostr-signer-capacitor-plugin@https://codeload.github.com/coracle-social/nostr-signer-capacitor-plugin/tar.gz/be4bb90a1a15c8eec0934f2f66ce9e82ecc72d51(@capacitor/core@8.0.1))(nostr-tools@2.20.0(typescript@5.9.3))
+        specifier: ^0.8.12
+        version: 0.8.12(@noble/curves@1.9.7)(@noble/hashes@2.0.1)(@welshman/lib@0.8.12)(@welshman/net@0.8.12(@welshman/lib@0.8.12)(@welshman/util@0.8.12(@noble/curves@1.9.7)(@welshman/lib@0.8.12)(nostr-tools@2.20.0(typescript@5.9.3)))(ws@8.18.3))(@welshman/util@0.8.12(@noble/curves@1.9.7)(@welshman/lib@0.8.12)(nostr-tools@2.20.0(typescript@5.9.3)))(nostr-signer-capacitor-plugin@https://codeload.github.com/coracle-social/nostr-signer-capacitor-plugin/tar.gz/be4bb90a1a15c8eec0934f2f66ce9e82ecc72d51(@capacitor/core@8.0.1))(nostr-tools@2.20.0(typescript@5.9.3))
      '@welshman/store':
-        specifier: ^0.8.15
-        version: 0.8.15(@welshman/lib@0.8.15)(@welshman/net@0.8.15(@welshman/lib@0.8.15)(@welshman/util@0.8.15(@noble/curves@1.9.7)(@welshman/lib@0.8.15)(nostr-tools@2.20.0(typescript@5.9.3)))(ws@8.18.3))(@welshman/util@0.8.15(@noble/curves@1.9.7)(@welshman/lib@0.8.15)(nostr-tools@2.20.0(typescript@5.9.3)))(svelte@5.48.0)
+        specifier: ^0.8.12
+        version: 0.8.12(@welshman/lib@0.8.12)(@welshman/net@0.8.12(@welshman/lib@0.8.12)(@welshman/util@0.8.12(@noble/curves@1.9.7)(@welshman/lib@0.8.12)(nostr-tools@2.20.0(typescript@5.9.3)))(ws@8.18.3))(@welshman/util@0.8.12(@noble/curves@1.9.7)(@welshman/lib@0.8.12)(nostr-tools@2.20.0(typescript@5.9.3)))(svelte@5.48.0)
      '@welshman/util':
-        specifier: ^0.8.15
-        version: 0.8.15(@noble/curves@1.9.7)(@welshman/lib@0.8.15)(nostr-tools@2.20.0(typescript@5.9.3))
-      cheerio:
-        specifier: ^1.2.0
-        version: 1.2.0
+        specifier: ^0.8.12
+        version: 0.8.12(@noble/curves@1.9.7)(@welshman/lib@0.8.12)(nostr-tools@2.20.0(typescript@5.9.3))
      compressorjs-next:
        specifier: ^1.1.2
        version: 1.1.2
@@ -143,15 +128,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
-      hono:
-        specifier: ^4.12.15
-        version: 4.12.15
      husky:
        specifier: ^9.1.7
        version: 9.1.7
@@ -812,11 +791,6 @@ packages:
    engines: {node: '>=22.0.0'}
    hasBin: true

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

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

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

@@ -1108,12 +1077,6 @@ packages:
    resolution: {integrity: sha512-yUF9LhuvdIFOwjV1aG0ryzfwDiGBFk/CRLkRvrrM9dsE38SUjKsf1FDga5jxsKMu80nWcPZR9TiGGASWedoYPA==}
    engines: {node: '>=14'}

-  '@hono/node-server@2.0.0':
-    resolution: {integrity: sha512-n3GfHwwCvHCkGmOwKfxUPOlbfzuO64Sbc5XC4NGPIXxkuOnJrdgExdRKmHfF924r914WRJPT397GdqLvdYTeyQ==}
-    engines: {node: '>=20'}
-    peerDependencies:
-      hono: ^4
-
  '@humanfs/core@0.19.1':
    resolution: {integrity: sha512-5DyQ4+1JEUzejeK1JGICcideyfUbGixgS9jNgex5nqkW+cY7WZhxBigmieN5Qnw9ZosSNVC9KQKyb+GUaGyKUA==}
    engines: {node: '>=18.18.0'}
@@ -1464,9 +1427,9 @@ packages:
  '@polka/url@1.0.0-next.29':
    resolution: {integrity: sha512-wwQAWhWSuHaag8c4q/KN/vCoeOJYshAIvMQwD4GpSb3OiZklFfvAgmj0VCBBImRpuF/aFgIRzllXlVX93Jevww==}

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

-  '@welshman/app@0.8.15':
-    resolution: {integrity: sha512-GDo6w+UI/ldnh47c5IEDYWw8nbiyhnH4abJNy/q/jLBUwJ9SuiJ7GVVvhZ+t4XEo5NEMq+y4OLZs08+abf85MQ==}
+  '@welshman/app@0.8.12':
+    resolution: {integrity: sha512-kRp+AVzn4i3FvZmdlyMknFUAb/5SnUz9A/cFKkDqWHsd+N3PbNcL2ZOlV9v5NI77GtsDF2ez6PEQfsZxWvkS/g==}
    peerDependencies:
      '@pomade/core': ^0.2.1
-      '@welshman/feeds': 0.8.15
-      '@welshman/lib': 0.8.15
-      '@welshman/net': 0.8.15
-      '@welshman/router': 0.8.15
-      '@welshman/signer': 0.8.15
-      '@welshman/store': 0.8.15
-      '@welshman/util': 0.8.15
+      '@welshman/feeds': 0.8.12
+      '@welshman/lib': 0.8.12
+      '@welshman/net': 0.8.12
+      '@welshman/router': 0.8.12
+      '@welshman/signer': 0.8.12
+      '@welshman/store': 0.8.12
+      '@welshman/util': 0.8.12
      svelte: ^4.0.0 || ^5.0.0

-  '@welshman/content@0.8.15':
-    resolution: {integrity: sha512-5qe+6Es1r62HkVdeHJPsWkOpLjhdxBTtw3d4+Or1JXl8BgpUE2JV7e+5HQQqnPRVHt3nt14YPt0oirar5p1Fvg==}
+  '@welshman/content@0.8.12':
+    resolution: {integrity: sha512-hviVTXdyGf04Xq7mGo/82fq6lnbyuUYOGPkf8pJqPkfGh0f3i9nKof6gkzPvjZeEYSczneI2GpLIxkaZ3w1/tw==}
    peerDependencies:
      nostr-tools: ^2.19.4

-  '@welshman/editor@0.8.15':
-    resolution: {integrity: sha512-lqTLQGf54yPioBn2KQsF7F5ExWM6Co31wgGaUAhCSeUGiTzUQgMEut4/N8VB1rFZ0wqU6zyPG5jgeuhFhRJWSw==}
+  '@welshman/editor@0.8.12':
+    resolution: {integrity: sha512-CEXszH6pfM1kZHU9WnB6Z97YlxEOtgao6R3hhnBL/kRXy2tUTLpmFWyMONg2vu8Uzxtwz665eZhucLsju60U6w==}
    peerDependencies:
-      '@welshman/lib': 0.8.15
-      '@welshman/util': 0.8.15
+      '@welshman/lib': 0.8.12
+      '@welshman/util': 0.8.12
      nostr-editor: ^1.1.1
      nostr-tools: ^2.19.4

-  '@welshman/feeds@0.8.15':
-    resolution: {integrity: sha512-xIQDKdV6uLxOz5qJUbc/2HC6qnikgH1GPoHQwBpwKH7Lga6a7IGLOR6kvghUaPpulKcuF4MxG9gmvEHqgsQkJw==}
+  '@welshman/feeds@0.8.12':
+    resolution: {integrity: sha512-Dp/063qdrbe096z6IpIneazsqscfzSwsg09ZNHB6c3OsVb6iLEXLe7mEpATGcRsZ8memuFNLVLIP51eVkBqPcQ==}
    peerDependencies:
-      '@welshman/lib': 0.8.15
-      '@welshman/net': 0.8.15
-      '@welshman/router': 0.8.15
-      '@welshman/signer': 0.8.15
-      '@welshman/util': 0.8.15
+      '@welshman/lib': 0.8.12
+      '@welshman/net': 0.8.12
+      '@welshman/router': 0.8.12
+      '@welshman/signer': 0.8.12
+      '@welshman/util': 0.8.12

-  '@welshman/lib@0.8.15':
-    resolution: {integrity: sha512-d7o6WUSVYXOstpWTqOBDfkSyr3GOBm/UMbgFx3RXCxzib0cWm7z0w1oLWvy1N7fjHc/Jp65G2KRpT6//B9yAww==}
+  '@welshman/lib@0.8.12':
+    resolution: {integrity: sha512-7Y1GjAcABquWF47A1Jni5JdP+k0GH2yRmEbVhIU+0R0TubCwPAKS38J2LTvtuE9CJMX6hPS9IKEZS6qTOAaVuw==}
    engines: {node: '>=12.0.0'}

-  '@welshman/net@0.8.15':
-    resolution: {integrity: sha512-AeJ/Vy7T6ruf1mjzzEUdH+aX5JriQKBzRn1zWZ4l8VEgxwc4w2bVte9a6aPnNJWc7JZT8ws8z+wOi4ECb6NPNA==}
+  '@welshman/net@0.8.12':
+    resolution: {integrity: sha512-Ba71jwb8BBwUfPPtWHKYLB0HqeDYK64oqwxfo5bYldtPfGYrlD+a7lHFSZvNyOhvyXygCaIMnaye1QxWAHP8ng==}
    peerDependencies:
-      '@welshman/lib': 0.8.15
-      '@welshman/util': 0.8.15
+      '@welshman/lib': 0.8.12
+      '@welshman/util': 0.8.12

-  '@welshman/router@0.8.15':
-    resolution: {integrity: sha512-3lxcCYMaPX0gFaoM1GjBRvXr4UrnPA3o/mBII2Zm3gJeFuXN3XG+REwIN6QNhvTB7syTCTwx+dRdHgvqHl9N6g==}
+  '@welshman/router@0.8.12':
+    resolution: {integrity: sha512-Rr7ryBNTvTvjoLsDRMKPuoNJbBv2MgyqN2338p4vVhPMK6MOGM3Nx1og0LpHDGiLlCFuPM8RpParpIWfNnWbKw==}
    peerDependencies:
-      '@welshman/lib': 0.8.15
-      '@welshman/net': 0.8.15
-      '@welshman/util': 0.8.15
+      '@welshman/lib': 0.8.12
+      '@welshman/net': 0.8.12
+      '@welshman/util': 0.8.12

-  '@welshman/signer@0.8.15':
-    resolution: {integrity: sha512-Y96XZtsCHz8h7NK28sSi3CX+8lGG6WhLyVNyhlEhfypAxxx8Zpfr4GlSPApvp4tvm1//YfDtXHIIZTPXbmnqvA==}
-    version: 0.8.15
+  '@welshman/signer@0.8.12':
+    resolution: {integrity: sha512-eO4mw2QOR2d2oCS4zgptkCgjC1s8X+1vNnXfWDbtlEwhk7PD4ySSCkpNVMeElq+uluLOugmKvgDc4gfnIH3p2A==}
+    version: 0.8.12
    peerDependencies:
      '@noble/curves': ^1.9.7
      '@noble/hashes': ^2.0.1
-      '@welshman/lib': 0.8.15
-      '@welshman/net': 0.8.15
-      '@welshman/util': 0.8.15
+      '@welshman/lib': 0.8.12
+      '@welshman/net': 0.8.12
+      '@welshman/util': 0.8.12
      nostr-signer-capacitor-plugin: '*'
      nostr-tools: ^2.19.4

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

-  '@welshman/util@0.8.15':
-    resolution: {integrity: sha512-zeNWMyOtIpOqj9/hBAT8qWvnp5w/IyrcT7CmDKLkWt6NU6ZoZ3pF5duTwtOYZqcftYJaHXgohOt0RsHVPR3M7w==}
+  '@welshman/util@0.8.12':
+    resolution: {integrity: sha512-lgftFt2moXZdN5fuL0RoAnAARV0n0d2+Q56gt7KrBSevjoCbtJgBVX5idvxL5PCEfh81veovJtty6eHxrhQv5A==}
    peerDependencies:
      '@noble/curves': ^1.9.7
-      '@welshman/lib': 0.8.15
+      '@welshman/lib': 0.8.12
      nostr-tools: ^2.19.4

  '@xml-tools/parser@1.0.11':
@@ -2483,13 +2446,6 @@ packages:
    resolution: {integrity: sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==}
    engines: {node: '>=10'}

-  cheerio-select@2.1.0:
-    resolution: {integrity: sha512-9v9kG0LvzrlcungtnJtpGNxY+fzECQKhK4EGJX2vByejiMX84MFNQw4UxPJl3bFbTMw+Dfs37XaIkCwTZfLh4g==}
-
-  cheerio@1.2.0:
-    resolution: {integrity: sha512-WDrybc/gKFpTYQutKIK6UvfcuxijIZfMfXaYm8NMsPQxSYvf+13fXUJ4rztGGbJcBQ/GF55gvrZ0Bc0bj/mqvg==}
-    engines: {node: '>=20.18.1'}
-
  chevrotain@7.1.1:
    resolution: {integrity: sha512-wy3mC1x4ye+O+QkEinVJkPf5u2vsrDIYW9G7ZuwFl6v/Yu0LwUuT2POsb+NUWApebyxfkQq6+yDfRExbnI5rcw==}

@@ -2849,18 +2805,12 @@ 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==}

  emoji-regex@8.0.0:
    resolution: {integrity: sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==}

-  encoding-sniffer@0.2.1:
-    resolution: {integrity: sha512-5gvq20T6vfpekVtqrYQsSCFZ1wEg5+wW0/QaZMWkFr6BqD3NfKs0rLCx4rrVlSWJeZb5NBJgVLswK/w2MWU+Gw==}
-
  enhanced-resolve@5.20.1:
    resolution: {integrity: sha512-Qohcme7V1inbAfvjItgw0EaxVX5q2rdVEZHRBrEQdRZTssLDGsL8Lwrznl8oQ/6kuTJONLaDcGjkNP247XEhcA==}
    engines: {node: '>=10.13.0'}
@@ -2872,14 +2822,6 @@ packages:
    resolution: {integrity: sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==}
    engines: {node: '>=0.12'}

-  entities@6.0.1:
-    resolution: {integrity: sha512-aN97NXWF6AWBTahfVOIrB/NShkzi5H7F9r1s9mD3cDj4Ko5f2qhhVoYMibXF7GlLveb/D2ioWay8lxI97Ven3g==}
-    engines: {node: '>=0.12'}
-
-  entities@7.0.1:
-    resolution: {integrity: sha512-TWrgLOFUQTH994YUyl1yT4uyavY5nNB5muff+RtWaqNVCAK408b5ZnnbNAUEWLTCpum9w6arT70i1XdQ4UeOPA==}
-    engines: {node: '>=0.12'}
-
  env-paths@2.2.1:
    resolution: {integrity: sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==}
    engines: {node: '>=6'}
@@ -3273,10 +3215,6 @@ packages:
    resolution: {integrity: sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==}
    hasBin: true

-  hono@4.12.15:
-    resolution: {integrity: sha512-qM0jDhFEaCBb4TxoW7f53Qrpv9RBiayUHo0S52JudprkhvpjIrGoU1mnnr29Fvd1U335ZFPZQY1wlkqgfGXyLg==}
-    engines: {node: '>=16.9.0'}
-
  hosted-git-info@2.8.9:
    resolution: {integrity: sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==}

@@ -3284,9 +3222,6 @@ packages:
    resolution: {integrity: sha512-kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA==}
    engines: {node: '>=10'}

-  htmlparser2@10.1.0:
-    resolution: {integrity: sha512-VTZkM9GWRAtEpveh7MSF6SjjrpNVNNVJfFup7xTY3UpFtm67foy9HDVXneLtFVt4pMz5kZtgNcvCniNFb1hlEQ==}
-
  husky@9.1.7:
    resolution: {integrity: sha512-5gs5ytaNjBrh5Ow3zrvdUUY+0VxIuWVL4i9irt6friV+BqdCfmV11CQTWMiBYWHbXhco+J1kHfTOUkePhCDvMA==}
    engines: {node: '>=18'}
@@ -3295,10 +3230,6 @@ packages:
  ico-endec@0.1.6:
    resolution: {integrity: sha512-ZdLU38ZoED3g1j3iEyzcQj+wAkY2xfWNkymszfJPoxucIUhK7NayQ+/C4Kv0nDFMIsbtbEHldv3V8PU494/ueQ==}

-  iconv-lite@0.6.3:
-    resolution: {integrity: sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==}
-    engines: {node: '>=0.10.0'}
-
  idb@7.1.1:
    resolution: {integrity: sha512-gchesWBzyvGHRO9W8tzUWFDycow5gwjvFKfyV9FF32Y7F50yZMp7mP+T2mJIWFx49zicqyC4uefHM17o6xKIVQ==}

@@ -4065,15 +3996,6 @@ packages:
    resolution: {integrity: sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==}
    engines: {node: '>=8'}

-  parse5-htmlparser2-tree-adapter@7.1.0:
-    resolution: {integrity: sha512-ruw5xyKs6lrpo9x9rCZqZZnIUntICjQAd0Wsmp396Ul9lN/h+ifgVV1x1gZHi8euej6wTfpqX8j+BFQxF0NS/g==}
-
-  parse5-parser-stream@7.1.2:
-    resolution: {integrity: sha512-JyeQc9iwFLn5TbvvqACIF/VXG6abODeB3Fwmv/TGdLk2LfbWkaySGY72at4+Ty7EkPZj854u4CrICqNk2qIbow==}
-
-  parse5@7.3.0:
-    resolution: {integrity: sha512-IInvU7fabl34qmi9gY8XOVxhYyMyuH2xUNpb2q8/Y+7552KlejkRvqvD19nMoUW/uQGGbqNpA6Tufu5FL5BZgw==}
-
  path-exists@3.0.0:
    resolution: {integrity: sha512-bpC7GYwiDYQ4wYLe+FA8lhRjhQCMcQGuSgGGqDkg/QerRWw9CmGRT0iSOVRSZJ29NMLZgIzqaljJ63oaL4NIJQ==}
    engines: {node: '>=4'}
@@ -4515,9 +4437,6 @@ packages:
    resolution: {integrity: sha512-x/+Cz4YrimQxQccJf5mKEbIa1NzeCRNI5Ecl/ekmlYaampdNLPalVyIcCZNNH3MvmqBugV5TMYZXv0ljslUlaw==}
    engines: {node: '>= 0.4'}

-  safer-buffer@2.1.2:
-    resolution: {integrity: sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==}
-
  sax@1.1.4:
    resolution: {integrity: sha512-5f3k2PbGGp+YtKJjOItpg3P99IMD84E4HOvcfleTb5joCHNXYLsR9yWFPOYGgaeMPDubQILTCMdsFb2OMeOjtg==}

@@ -4953,10 +4872,6 @@ packages:
  undici-types@7.16.0:
    resolution: {integrity: sha512-Zz+aZWSj8LE6zoxD+xrjh4VfkIG8Ya6LvYkZqtUQGJPZjYl53ypCaUwWqo7eI0x66KBGeRo+mlBEkMSeSZ38Nw==}

-  undici@7.25.0:
-    resolution: {integrity: sha512-xXnp4kTyor2Zq+J1FfPI6Eq3ew5h6Vl0F/8d9XU5zZQf1tX9s2Su1/3PiMmUANFULpmksxkClamIZcaUqryHsQ==}
-    engines: {node: '>=20.18.1'}
-
  unicode-canonical-property-names-ecmascript@2.0.1:
    resolution: {integrity: sha512-dA8WbNeb2a6oQzAQ55YlT5vQAWGV9WXOsi3SskE3bcCdM0P4SDd+24zS/OCacdRq5BkdsRj9q3Pg6YyQoxIGqg==}
    engines: {node: '>=4'}
@@ -5075,15 +4990,6 @@ packages:
    resolution: {integrity: sha512-5ZZY1+lGq8LEKuDlg9M2RPJHlH3R7OVwyHqMcUsLKCgd9Wvf+QrFTCItkXXYPmrJn8H6gRLXbSgxLLdexiqHxw==}
    engines: {node: '>=6.0.0', npm: '>=3.10.0'}

-  whatwg-encoding@3.1.1:
-    resolution: {integrity: sha512-6qN4hJdMwfYBtE3YBTTHhoeuUrDBPZmbQaxWAqSALV/MeEnR5z1xd8UKud2RAkFoPkmB+hli1TZSnyi84xz1vQ==}
-    engines: {node: '>=18'}
-    deprecated: Use @exodus/bytes instead for a more spec-conformant and faster implementation
-
-  whatwg-mimetype@4.0.0:
-    resolution: {integrity: sha512-QaKxh0eNIi2mE9p2vEdzfagOKHCcj1pJ56EEHGQOVxp8r9/iszLUUV7v89x9O1p/T+NlTM5W7jW6+cz4Fq1YVg==}
-    engines: {node: '>=18'}
-
  whatwg-url@5.0.0:
    resolution: {integrity: sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==}

@@ -6063,10 +5969,6 @@ snapshots:
    transitivePeerDependencies:
      - supports-color

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

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

  '@capawesome/capacitor-android-dark-mode-support@8.0.0(@capacitor/core@8.0.1)':
@@ -6303,10 +6201,6 @@ snapshots:
    transitivePeerDependencies:
      - typescript

-  '@hono/node-server@2.0.0(hono@4.12.15)':
-    dependencies:
-      hono: 4.12.15
-
  '@humanfs/core@0.19.1': {}

  '@humanfs/node@0.16.7':
@@ -6716,15 +6610,15 @@ snapshots:

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

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

-  '@welshman/app@0.8.15(ff026297546a8274624eb18a0ea86191)':
+  '@welshman/app@0.8.12(3074ef6691f94dc03952d8dbc98013a7)':
    dependencies:
-      '@pomade/core': 0.2.3(@frostr/bifrost@1.0.7(typescript@5.9.3))(@noble/hashes@2.0.1)(@welshman/lib@0.8.15)(@welshman/net@0.8.15(@welshman/lib@0.8.15)(@welshman/util@0.8.15(@noble/curves@1.9.7)(@welshman/lib@0.8.15)(nostr-tools@2.20.0(typescript@5.9.3)))(ws@8.18.3))(@welshman/signer@0.8.15(@noble/curves@1.9.7)(@noble/hashes@2.0.1)(@welshman/lib@0.8.15)(@welshman/net@0.8.15(@welshman/lib@0.8.15)(@welshman/util@0.8.15(@noble/curves@1.9.7)(@welshman/lib@0.8.15)(nostr-tools@2.20.0(typescript@5.9.3)))(ws@8.18.3))(@welshman/util@0.8.15(@noble/curves@1.9.7)(@welshman/lib@0.8.15)(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.15(@noble/curves@1.9.7)(@welshman/lib@0.8.15)(nostr-tools@2.20.0(typescript@5.9.3)))(nostr-tools@2.20.0(typescript@5.9.3))
-      '@welshman/feeds': 0.8.15(6e55dcd4e7516745e7b0228620d35545)
-      '@welshman/lib': 0.8.15
-      '@welshman/net': 0.8.15(@welshman/lib@0.8.15)(@welshman/util@0.8.15(@noble/curves@1.9.7)(@welshman/lib@0.8.15)(nostr-tools@2.20.0(typescript@5.9.3)))(ws@8.18.3)
-      '@welshman/router': 0.8.15(@welshman/lib@0.8.15)(@welshman/net@0.8.15(@welshman/lib@0.8.15)(@welshman/util@0.8.15(@noble/curves@1.9.7)(@welshman/lib@0.8.15)(nostr-tools@2.20.0(typescript@5.9.3)))(ws@8.18.3))(@welshman/util@0.8.15(@noble/curves@1.9.7)(@welshman/lib@0.8.15)(nostr-tools@2.20.0(typescript@5.9.3)))
-      '@welshman/signer': 0.8.15(@noble/curves@1.9.7)(@noble/hashes@2.0.1)(@welshman/lib@0.8.15)(@welshman/net@0.8.15(@welshman/lib@0.8.15)(@welshman/util@0.8.15(@noble/curves@1.9.7)(@welshman/lib@0.8.15)(nostr-tools@2.20.0(typescript@5.9.3)))(ws@8.18.3))(@welshman/util@0.8.15(@noble/curves@1.9.7)(@welshman/lib@0.8.15)(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.15(@welshman/lib@0.8.15)(@welshman/net@0.8.15(@welshman/lib@0.8.15)(@welshman/util@0.8.15(@noble/curves@1.9.7)(@welshman/lib@0.8.15)(nostr-tools@2.20.0(typescript@5.9.3)))(ws@8.18.3))(@welshman/util@0.8.15(@noble/curves@1.9.7)(@welshman/lib@0.8.15)(nostr-tools@2.20.0(typescript@5.9.3)))(svelte@5.48.0)
-      '@welshman/util': 0.8.15(@noble/curves@1.9.7)(@welshman/lib@0.8.15)(nostr-tools@2.20.0(typescript@5.9.3))
+      '@pomade/core': 0.2.2(@frostr/bifrost@1.0.7(typescript@5.9.3))(@noble/hashes@2.0.1)(@welshman/lib@0.8.12)(@welshman/net@0.8.12(@welshman/lib@0.8.12)(@welshman/util@0.8.12(@noble/curves@1.9.7)(@welshman/lib@0.8.12)(nostr-tools@2.20.0(typescript@5.9.3)))(ws@8.18.3))(@welshman/signer@0.8.12(@noble/curves@1.9.7)(@noble/hashes@2.0.1)(@welshman/lib@0.8.12)(@welshman/net@0.8.12(@welshman/lib@0.8.12)(@welshman/util@0.8.12(@noble/curves@1.9.7)(@welshman/lib@0.8.12)(nostr-tools@2.20.0(typescript@5.9.3)))(ws@8.18.3))(@welshman/util@0.8.12(@noble/curves@1.9.7)(@welshman/lib@0.8.12)(nostr-tools@2.20.0(typescript@5.9.3)))(nostr-signer-capacitor-plugin@https://codeload.github.com/coracle-social/nostr-signer-capacitor-plugin/tar.gz/be4bb90a1a15c8eec0934f2f66ce9e82ecc72d51(@capacitor/core@8.0.1))(nostr-tools@2.20.0(typescript@5.9.3)))(@welshman/util@0.8.12(@noble/curves@1.9.7)(@welshman/lib@0.8.12)(nostr-tools@2.20.0(typescript@5.9.3)))(nostr-tools@2.20.0(typescript@5.9.3))
+      '@welshman/feeds': 0.8.12(d5b74f0c83250e052e0b96f7ff5804e8)
+      '@welshman/lib': 0.8.12
+      '@welshman/net': 0.8.12(@welshman/lib@0.8.12)(@welshman/util@0.8.12(@noble/curves@1.9.7)(@welshman/lib@0.8.12)(nostr-tools@2.20.0(typescript@5.9.3)))(ws@8.18.3)
+      '@welshman/router': 0.8.12(@welshman/lib@0.8.12)(@welshman/net@0.8.12(@welshman/lib@0.8.12)(@welshman/util@0.8.12(@noble/curves@1.9.7)(@welshman/lib@0.8.12)(nostr-tools@2.20.0(typescript@5.9.3)))(ws@8.18.3))(@welshman/util@0.8.12(@noble/curves@1.9.7)(@welshman/lib@0.8.12)(nostr-tools@2.20.0(typescript@5.9.3)))
+      '@welshman/signer': 0.8.12(@noble/curves@1.9.7)(@noble/hashes@2.0.1)(@welshman/lib@0.8.12)(@welshman/net@0.8.12(@welshman/lib@0.8.12)(@welshman/util@0.8.12(@noble/curves@1.9.7)(@welshman/lib@0.8.12)(nostr-tools@2.20.0(typescript@5.9.3)))(ws@8.18.3))(@welshman/util@0.8.12(@noble/curves@1.9.7)(@welshman/lib@0.8.12)(nostr-tools@2.20.0(typescript@5.9.3)))(nostr-signer-capacitor-plugin@https://codeload.github.com/coracle-social/nostr-signer-capacitor-plugin/tar.gz/be4bb90a1a15c8eec0934f2f66ce9e82ecc72d51(@capacitor/core@8.0.1))(nostr-tools@2.20.0(typescript@5.9.3))
+      '@welshman/store': 0.8.12(@welshman/lib@0.8.12)(@welshman/net@0.8.12(@welshman/lib@0.8.12)(@welshman/util@0.8.12(@noble/curves@1.9.7)(@welshman/lib@0.8.12)(nostr-tools@2.20.0(typescript@5.9.3)))(ws@8.18.3))(@welshman/util@0.8.12(@noble/curves@1.9.7)(@welshman/lib@0.8.12)(nostr-tools@2.20.0(typescript@5.9.3)))(svelte@5.48.0)
+      '@welshman/util': 0.8.12(@noble/curves@1.9.7)(@welshman/lib@0.8.12)(nostr-tools@2.20.0(typescript@5.9.3))
      fuse.js: 7.1.0
      svelte: 5.48.0
      throttle-debounce: 5.0.2

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

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

-  '@welshman/feeds@0.8.15(6e55dcd4e7516745e7b0228620d35545)':
+  '@welshman/feeds@0.8.12(d5b74f0c83250e052e0b96f7ff5804e8)':
    dependencies:
-      '@welshman/lib': 0.8.15
-      '@welshman/net': 0.8.15(@welshman/lib@0.8.15)(@welshman/util@0.8.15(@noble/curves@1.9.7)(@welshman/lib@0.8.15)(nostr-tools@2.20.0(typescript@5.9.3)))(ws@8.18.3)
-      '@welshman/router': 0.8.15(@welshman/lib@0.8.15)(@welshman/net@0.8.15(@welshman/lib@0.8.15)(@welshman/util@0.8.15(@noble/curves@1.9.7)(@welshman/lib@0.8.15)(nostr-tools@2.20.0(typescript@5.9.3)))(ws@8.18.3))(@welshman/util@0.8.15(@noble/curves@1.9.7)(@welshman/lib@0.8.15)(nostr-tools@2.20.0(typescript@5.9.3)))
-      '@welshman/signer': 0.8.15(@noble/curves@1.9.7)(@noble/hashes@2.0.1)(@welshman/lib@0.8.15)(@welshman/net@0.8.15(@welshman/lib@0.8.15)(@welshman/util@0.8.15(@noble/curves@1.9.7)(@welshman/lib@0.8.15)(nostr-tools@2.20.0(typescript@5.9.3)))(ws@8.18.3))(@welshman/util@0.8.15(@noble/curves@1.9.7)(@welshman/lib@0.8.15)(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.15(@noble/curves@1.9.7)(@welshman/lib@0.8.15)(nostr-tools@2.20.0(typescript@5.9.3))
+      '@welshman/lib': 0.8.12
+      '@welshman/net': 0.8.12(@welshman/lib@0.8.12)(@welshman/util@0.8.12(@noble/curves@1.9.7)(@welshman/lib@0.8.12)(nostr-tools@2.20.0(typescript@5.9.3)))(ws@8.18.3)
+      '@welshman/router': 0.8.12(@welshman/lib@0.8.12)(@welshman/net@0.8.12(@welshman/lib@0.8.12)(@welshman/util@0.8.12(@noble/curves@1.9.7)(@welshman/lib@0.8.12)(nostr-tools@2.20.0(typescript@5.9.3)))(ws@8.18.3))(@welshman/util@0.8.12(@noble/curves@1.9.7)(@welshman/lib@0.8.12)(nostr-tools@2.20.0(typescript@5.9.3)))
+      '@welshman/signer': 0.8.12(@noble/curves@1.9.7)(@noble/hashes@2.0.1)(@welshman/lib@0.8.12)(@welshman/net@0.8.12(@welshman/lib@0.8.12)(@welshman/util@0.8.12(@noble/curves@1.9.7)(@welshman/lib@0.8.12)(nostr-tools@2.20.0(typescript@5.9.3)))(ws@8.18.3))(@welshman/util@0.8.12(@noble/curves@1.9.7)(@welshman/lib@0.8.12)(nostr-tools@2.20.0(typescript@5.9.3)))(nostr-signer-capacitor-plugin@https://codeload.github.com/coracle-social/nostr-signer-capacitor-plugin/tar.gz/be4bb90a1a15c8eec0934f2f66ce9e82ecc72d51(@capacitor/core@8.0.1))(nostr-tools@2.20.0(typescript@5.9.3))
+      '@welshman/util': 0.8.12(@noble/curves@1.9.7)(@welshman/lib@0.8.12)(nostr-tools@2.20.0(typescript@5.9.3))
      trava: 1.2.1

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

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

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

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

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

-  '@welshman/util@0.8.15(@noble/curves@1.9.7)(@welshman/lib@0.8.15)(nostr-tools@2.20.0(typescript@5.9.3))':
+  '@welshman/util@0.8.12(@noble/curves@1.9.7)(@welshman/lib@0.8.12)(nostr-tools@2.20.0(typescript@5.9.3))':
    dependencies:
      '@noble/curves': 1.9.7
      '@types/ws': 8.18.1
-      '@welshman/lib': 0.8.15
+      '@welshman/lib': 0.8.12
      js-base64: 3.7.8
      nostr-tools: 2.20.0(typescript@5.9.3)
      nostr-wasm: 0.1.0
@@ -7721,29 +7615,6 @@ snapshots:
      ansi-styles: 4.3.0
      supports-color: 7.2.0

-  cheerio-select@2.1.0:
-    dependencies:
-      boolbase: 1.0.0
-      css-select: 5.2.2
-      css-what: 6.2.2
-      domelementtype: 2.3.0
-      domhandler: 5.0.3
-      domutils: 3.2.2
-
-  cheerio@1.2.0:
-    dependencies:
-      cheerio-select: 2.1.0
-      dom-serializer: 2.0.0
-      domhandler: 5.0.3
-      domutils: 3.2.2
-      encoding-sniffer: 0.2.1
-      htmlparser2: 10.1.0
-      parse5: 7.3.0
-      parse5-htmlparser2-tree-adapter: 7.1.0
-      parse5-parser-stream: 7.1.2
-      undici: 7.25.0
-      whatwg-mimetype: 4.0.0
-
  chevrotain@7.1.1:
    dependencies:
      regexp-to-ast: 0.5.0
@@ -8130,17 +8001,10 @@ snapshots:
    dependencies:
      sax: 1.1.4

-  emoji-picker-element-data@1.8.0: {}
-
  emoji-picker-element@1.28.1: {}

  emoji-regex@8.0.0: {}

-  encoding-sniffer@0.2.1:
-    dependencies:
-      iconv-lite: 0.6.3
-      whatwg-encoding: 3.1.1
-
  enhanced-resolve@5.20.1:
    dependencies:
      graceful-fs: 4.2.11
@@ -8150,10 +8014,6 @@ snapshots:

  entities@4.5.0: {}

-  entities@6.0.1: {}
-
-  entities@7.0.1: {}
-
  env-paths@2.2.1: {}

  env-paths@3.0.0: {}
@@ -8663,29 +8523,16 @@ snapshots:

  he@1.2.0: {}

-  hono@4.12.15: {}
-
  hosted-git-info@2.8.9: {}

  hosted-git-info@4.1.0:
    dependencies:
      lru-cache: 6.0.0

-  htmlparser2@10.1.0:
-    dependencies:
-      domelementtype: 2.3.0
-      domhandler: 5.0.3
-      domutils: 3.2.2
-      entities: 7.0.1
-
  husky@9.1.7: {}

  ico-endec@0.1.6: {}

-  iconv-lite@0.6.3:
-    dependencies:
-      safer-buffer: 2.1.2
-
  idb@7.1.1: {}

  idb@8.0.3: {}
@@ -9392,19 +9239,6 @@ snapshots:
      json-parse-even-better-errors: 2.3.1
      lines-and-columns: 1.2.4

-  parse5-htmlparser2-tree-adapter@7.1.0:
-    dependencies:
-      domhandler: 5.0.3
-      parse5: 7.3.0
-
-  parse5-parser-stream@7.1.2:
-    dependencies:
-      parse5: 7.3.0
-
-  parse5@7.3.0:
-    dependencies:
-      entities: 6.0.1
-
  path-exists@3.0.0: {}

  path-exists@4.0.0: {}
@@ -9843,8 +9677,6 @@ snapshots:
      es-errors: 1.3.0
      is-regex: 1.2.1

-  safer-buffer@2.1.2: {}
-
  sax@1.1.4: {}

  sax@1.4.4: {}
@@ -10370,8 +10202,6 @@ snapshots:

  undici-types@7.16.0: {}

-  undici@7.25.0: {}
-
  unicode-canonical-property-names-ecmascript@2.0.1: {}

  unicode-match-property-ecmascript@2.0.0:
@@ -10452,12 +10282,6 @@ snapshots:
    dependencies:
      sdp: 3.2.1

-  whatwg-encoding@3.1.1:
-    dependencies:
-      iconv-lite: 0.6.3
-
-  whatwg-mimetype@4.0.0: {}
-
  whatwg-url@5.0.0:
    dependencies:
      tr46: 0.0.3
@@ -1,288 +0,0 @@
-import path from "node:path"
-import {promises as fs} from "node:fs"
-import {fileURLToPath} from "node:url"
-
-import "dotenv/config"
-import {serve} from "@hono/node-server"
-import {serveStatic} from "@hono/node-server/serve-static"
-import {loadRelay} from "@welshman/app"
-import {displayRelayUrl, normalizeRelayUrl} from "@welshman/util"
-import {load} from "cheerio"
-import {Hono} from "hono"
-
-const __filename = fileURLToPath(import.meta.url)
-const __dirname = path.dirname(__filename)
-
-const BUILD_DIR = path.join(__dirname, "build")
-const INDEX_PATH = path.join(BUILD_DIR, "index.html")
-
-const PORT = parseInt(process.env.PORT || "", 10) || 3000
-const HOST = process.env.HOST || "0.0.0.0"
-
-let TEMPLATE_HTML = ""
-try {
-  TEMPLATE_HTML = await fs.readFile(INDEX_PATH, "utf8")
-} catch (error) {
-  console.error(`Unable to read ${INDEX_PATH}. Run "pnpm run build" first.`)
-  process.exit(1)
-}
-
-const PLATFORM_NAME = process.env.VITE_PLATFORM_NAME
-const PLATFORM_DESCRIPTION = process.env.VITE_PLATFORM_DESCRIPTION
-
-// Match client-side decode logic
-const decodeRelay = url => {
-  try {
-    return normalizeRelayUrl(decodeURIComponent(url))
-  } catch {
-    return undefined
-  }
-}
-
-const requestUrlFromContext = context => {
-  const requestUrl = new URL(context.req.url)
-  const forwardedProto = context.req.header("x-forwarded-proto")?.split(",")[0]?.trim()
-  const forwardedHost = context.req.header("x-forwarded-host")?.split(",")[0]?.trim()
-
-  if (forwardedProto === "http" || forwardedProto === "https") {
-    requestUrl.protocol = `${forwardedProto}:`
-  }
-
-  if (forwardedHost) {
-    requestUrl.host = forwardedHost
-  }
-
-  return requestUrl
-}
-
-const fetchRelayMeta = async relayUrl => {
-  if (!relayUrl) return undefined
-  try {
-    return await loadRelay(normalizeRelayUrl(relayUrl))
-  } catch (err) {
-    console.error(`Failed to fetch relay metadata for ${relayUrl}:`, err)
-    return undefined
-  }
-}
-
-const buildDefaultImage = requestUrl => {
-  return new URL("/maskable-icon-512x512.png", requestUrl.origin).toString()
-}
-
-const getMetadataForInvite = async (url, match) => {
-  const relayParam = url.searchParams.get("r")
-  if (!relayParam) return undefined
-
-  const relayMetadata = await fetchRelayMeta(relayParam)
-  if (!relayMetadata) return undefined
-
-  const relayDisplay = displayRelayUrl(relayParam)
-  const spaceName = relayMetadata.name
-  const relayDescription = relayMetadata.description
-
-  const title = spaceName
-    ? `Invite to ${spaceName} on ${PLATFORM_NAME}`
-    : `Invite to a Space on ${PLATFORM_NAME}`
-
-  const parts = []
-  if (spaceName) {
-    parts.push(`You are invited to join ${spaceName} on ${PLATFORM_NAME}.`)
-  } else {
-    parts.push(`You are invited to join a space on ${PLATFORM_NAME}.`)
-  }
-
-  if (relayDisplay) parts.push(`Relay: ${relayDisplay}.`)
-  if (relayDescription) parts.push(relayDescription)
-  else parts.push(PLATFORM_DESCRIPTION)
-
-  const description = parts.join(" ")
-  const image =
-    relayMetadata.icon ||
-    relayMetadata.picture ||
-    relayMetadata.image ||
-    buildDefaultImage(url)
-
-  return {
-    title,
-    description,
-    image,
-    url: url.toString(),
-    site: url.origin,
-  }
-}
-
-const getMetadataForSpace = async (url, match) => {
-  const relayParam = decodeRelay(match[1])
-  if (!relayParam) return undefined
-
-  const relayMetadata = await fetchRelayMeta(relayParam)
-  if (!relayMetadata) return undefined
-
-  const spaceName = relayMetadata.name || displayRelayUrl(relayParam)
-
-  return {
-    title: `${spaceName} on ${PLATFORM_NAME}`,
-    description: relayMetadata.description || PLATFORM_DESCRIPTION,
-    image:
-      relayMetadata.icon ||
-      relayMetadata.picture ||
-      relayMetadata.image ||
-      buildDefaultImage(url),
-    url: url.toString(),
-    site: url.origin,
-  }
-}
-
-const getMetadataForSpaceSection = async (url, match) => {
-  const spaceMeta = await getMetadataForSpace(url, match)
-  if (!spaceMeta) return undefined
-
-  const section = match[2]
-  const sectionName = section.charAt(0).toUpperCase() + section.slice(1)
-  spaceMeta.title = `${sectionName} on ${spaceMeta.title}`
-  return spaceMeta
-}
-
-const getMetadataForSpaceItem = async (url, match) => {
-  const spaceMeta = await getMetadataForSpace(url, match)
-  if (!spaceMeta) return undefined
-
-  const section = match[2]
-  let itemType = "Item"
-  if (section === "calendar") itemType = "Event"
-  if (section === "threads") itemType = "Thread"
-  if (section === "polls") itemType = "Poll"
-  if (section === "goals") itemType = "Goal"
-  if (section === "classifieds") itemType = "Listing"
-
-  spaceMeta.title = `${itemType} on ${spaceMeta.title}`
-  return spaceMeta
-}
-
-const getMetadataForRoom = async (url, match) => {
-  const spaceMeta = await getMetadataForSpace(url, match)
-  if (!spaceMeta) return undefined
-
-  // Room metadata requires fetching from Nostr, which can be added later.
-  spaceMeta.title = `Room on ${spaceMeta.title}`
-  return spaceMeta
-}
-
-const routes = [
-  [/^\/join\/?$/, getMetadataForInvite],
-  [/^\/spaces\/([^/]+)\/(calendar|chat|threads|polls|goals|classifieds|recent)\/?$/, getMetadataForSpaceSection],
-  [/^\/spaces\/([^/]+)\/(calendar|threads|polls|goals|classifieds)\/([^/]+)\/?$/, getMetadataForSpaceItem],
-  [/^\/spaces\/([^/]+)\/([^/]+)\/?$/, getMetadataForRoom],
-  [/^\/spaces\/([^/]+)\/?$/, getMetadataForSpace],
-]
-
-const getMetadataForRoute = async url => {
-  for (const [regex, getMetadata] of routes) {
-    const match = url.pathname.match(regex)
-    if (match) {
-      try {
-        return await getMetadata(url, match)
-      } catch (err) {
-        console.error(`Error generating metadata for route ${url.pathname}:`, err)
-        return undefined
-      }
-    }
-  }
-  return undefined
-}
-
-const injectMeta = metadata => {
-  const $ = load(TEMPLATE_HTML)
-
-  if (metadata.title) {
-    $("title").text(metadata.title)
-    $('meta[property="og:title"]').attr("content", metadata.title)
-    $('meta[name="twitter:title"]').attr("content", metadata.title)
-  }
-
-  if (metadata.description) {
-    $('meta[name="description"]').attr("content", metadata.description)
-    $('meta[property="og:description"]').attr("content", metadata.description)
-    $('meta[name="twitter:description"]').attr("content", metadata.description)
-  }
-
-  if (metadata.image) {
-    $('meta[property="og:image"]').attr("content", metadata.image)
-    $('meta[name="twitter:image"]').attr("content", metadata.image)
-  }
-
-  if (metadata.url) {
-    $('meta[property="og:url"]').attr("content", metadata.url)
-    $('meta[name="twitter:site"]').attr("content", metadata.site)
-    $('meta[name="twitter:url"]').attr("content", metadata.url)
-    $('link[rel="canonical"]').attr("href", metadata.url)
-  }
-
-  return $.html()
-}
-
-const app = new Hono()
-
-// Only allow GET and HEAD requests
-app.use("*", async (context, next) => {
-  const method = context.req.method
-  if (method !== "GET" && method !== "HEAD") {
-    return context.text("Method Not Allowed", 405, {Allow: "GET, HEAD"})
-  }
-  await next()
-})
-
-// Serve static assets with appropriate caching
-app.use(
-  "*",
-  serveStatic({
-    root: BUILD_DIR,
-    onFound: (filePath, context) => {
-      const isImmutable = filePath.split(path.sep).join("/").includes("/_app/immutable/")
-      const cacheControl =
-        path.basename(filePath) === "index.html"
-          ? "no-cache"
-          : isImmutable
-            ? "public, max-age=31536000, immutable"
-            : "public, max-age=3600"
-
-      context.header("Cache-Control", cacheControl)
-
-      // Immutable assets are content-hashed by Vite, so the filename is itself a
-      // stable content identifier. Exposing it as an ETag lets clients that
-      // revalidate explicitly (e.g. emoji-picker-element checks its data source
-      // on every load) skip re-downloading large files when nothing changed.
-      if (isImmutable) {
-        context.header("ETag", `"${path.basename(filePath)}"`)
-      }
-    },
-  }),
-)
-
-// SPA fallback for routes that don't match static files
-app.get("*", async context => {
-  const requestUrl = requestUrlFromContext(context)
-
-  // If the path has an extension, it's likely a missing static asset, not an SPA route
-  if (path.extname(requestUrl.pathname)) {
-    return context.text("Not found", 404)
-  }
-
-  const metadata = await getMetadataForRoute(requestUrl)
-  const html = metadata ? injectMeta(metadata) : TEMPLATE_HTML
-
-  return context.html(html, 200, {
-    "Cache-Control": metadata ? "no-store" : "no-cache",
-  })
-})
-
-serve(
-  {
-    fetch: app.fetch,
-    hostname: HOST,
-    port: PORT,
-  },
-  () => {
-    console.log(`Flotilla server running on http://${HOST}:${PORT}`)
-  },
-)
@@ -2,16 +2,6 @@

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

-/* root */
-
-:root {
-  font-family: Lato;
-  --sait: var(--safe-area-inset-top, env(safe-area-inset-top));
-  --saib: var(--safe-area-inset-bottom, env(safe-area-inset-bottom));
-  --sail: var(--safe-area-inset-left, env(safe-area-inset-left));
-  --sair: var(--safe-area-inset-right, env(safe-area-inset-right));
-}
-
@utility pt-sai {
  padding-top: var(--sait);
 }
@@ -32,6 +22,16 @@
  @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;
 }
@@ -235,7 +235,6 @@

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

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

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

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

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

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

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

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

 .chat__compose .chat__compose-inner {
@@ -2,18 +2,15 @@
 <html lang="en">
  <head>
    <meta charset="utf-8" />
-    <title>{NAME}</title>
-    <link rel="canonical" href="{URL}" />
    <meta
      name="viewport"
      content="width=device-width, initial-scale=1.0, viewport-fit=cover, interactive-widget=resizes-content" />
    <meta name="theme-color" content="{ACCENT}" />
    <meta name="description" content="{DESCRIPTION}" />
-    <meta property="og:url" content="{URL}" />
-    <meta property="og:type" content="website" />
-    <meta property="og:title" content="{NAME}" />
-    <meta property="og:description" content="{DESCRIPTION}" />
-    <meta property="og:image" content="" />
+    <meta name="og:url" content="{URL}" />
+    <meta name="og:type" content="website" />
+    <meta name="og:title" content="{NAME}" />
+    <meta name="og:description" content="{DESCRIPTION}" />
    <meta name="twitter:card" content="summary" />
    <meta name="twitter:site" content="{URL}" />
    <meta name="twitter:title" content="{NAME}" />
@@ -277,7 +277,7 @@ export const joinVoiceRoom = async (
    try {
      await Promise.race([
        liveKitRoom.connect(server_url, participant_token, {maxRetries: 0}),
-        whenTimeout(15_000, {
+        whenTimeout(5_000, {
          message: "Connection timed out. Please check your network and try again.",
        }),
        whenAborted(signal),
@@ -7,13 +7,12 @@
  type Props = {
    url: string
    h?: string
-    shareToChat?: boolean
  }

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

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

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

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

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

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

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

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

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

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

  const d = $state(initialValues?.d ?? randomId())
  let title = $state(initialValues?.title ?? "")
@@ -179,11 +158,7 @@
          <div class="input-editor grow overflow-hidden">
            <EditorContent {editor} />
          </div>
-          <Button
-            data-tip="Add an image"
-            class="center btn tooltip"
-            onclick={selectFiles}
-            disabled={loading}>
+          <Button data-tip="Add an image" class="center btn tooltip" onclick={selectFiles}>
            {#if $uploading}
              <span class="loading loading-spinner loading-xs"></span>
            {:else}
@@ -222,12 +197,12 @@
    </Field>
  </ModalBody>
  <ModalFooter>
-    <Button class="btn btn-link" onclick={back} disabled={loading}>
+    <Button class="btn btn-link" onclick={back}>
      <Icon icon={AltArrowLeft} />
      Go back
    </Button>
-    <Button type="submit" class="btn btn-primary" disabled={$uploading || loading}>
-      <Spinner loading={$uploading || loading}>Save Event</Spinner>
+    <Button type="submit" class="btn btn-primary" disabled={$uploading}>
+      <Spinner loading={$uploading}>Save Event</Spinner>
    </Button>
  </ModalFooter>
 </Modal>
@@ -19,17 +19,15 @@
  const end = $derived(parseInt(meta.end))
 </script>

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

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

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

@@ -280,7 +279,7 @@
  </div>
 </PageBar>

-<PageContent class="flex flex-col-reverse gap-2 py-4">
+<PageContent class="flex flex-col-reverse gap-2 pt-4">
  {#if missingRelayLists.length > 0}
    <div class="py-12">
      <div class="card2 col-2 m-auto max-w-md items-center text-center">
@@ -7,13 +7,12 @@
  type Props = {
    url: string
    h?: string
-    shareToChat?: boolean
  }

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

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

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

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

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

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

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

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

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

-      const error = await waitForThunkError(classifiedThunk)
-
-      if (error) {
-        return pushToast({theme: "error", message: error})
-      }
-
      draftKey.clear()
      history.back()
-
-      if (shareToChat) {
-        publishRoomQuote({url, h, parent: classifiedThunk.event, protect})
-      }
    } finally {
      loading = false
    }
@@ -22,15 +22,15 @@

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

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

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

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

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

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

  let ul: Element

@@ -6,7 +6,6 @@
    truncate,
    renderAsHtml,
    isText,
-    isEmail,
    isEmoji,
    isTopic,
    isCode,
@@ -27,7 +26,6 @@
  import Button from "@lib/components/Button.svelte"
  import ContentToken from "@app/components/ContentToken.svelte"
  import ContentEmoji from "@app/components/ContentEmoji.svelte"
-  import ContentEmail from "@app/components/ContentEmail.svelte"
  import ContentCode from "@app/components/ContentCode.svelte"
  import ContentLinkInline from "@app/components/ContentLinkInline.svelte"
  import ContentLinkBlock from "@app/components/ContentLinkBlock.svelte"
@@ -161,8 +159,6 @@
          <ContentTopic value={parsed.value} />
        {:else if isEmoji(parsed)}
          <ContentEmoji value={parsed.value} />
-        {:else if isEmail(parsed)}
-          <ContentEmail value={parsed.value} />
        {:else if isCode(parsed)}
          <ContentCode
            value={parsed.value}
@@ -1,12 +0,0 @@
-<script lang="ts">
-  import LinkRound from "@assets/icons/link-round.svg?dataurl"
-  import Icon from "@lib/components/Icon.svelte"
-  import Link from "@lib/components/Link.svelte"
-
-  export let value: string
-</script>
-
-<Link external href="mailto:{value}">
-  <Icon icon={LinkRound} size={3} />
-  {value}
-</Link>
@@ -5,32 +5,30 @@
  import {preventDefault, stopPropagation} from "@lib/html"
  import Link from "@lib/components/Link.svelte"
  import ContentLinkDetail from "@app/components/ContentLinkDetail.svelte"
-  import ContentLinkUrl from "@app/components/ContentLinkUrl.svelte"
  import ContentLinkBlockImage from "@app/components/ContentLinkBlockImage.svelte"
  import {pushModal} from "@app/util/modal"
  import {
    dufflepud,
-    IMAGE_CONTENT_TYPES,
    PLATFORM_URL,
+    IMAGE_CONTENT_TYPES,
    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 isRoomOrRelay = isRoomId(url) || isRelayUrl(url)
+  const fileType = getTagValue("file-type", event.tags) || ""
  const [href, external] = call(() => {
+    if (isRelayUrl(url)) return [makeSpacePath(url), false]
    if (url.startsWith(PLATFORM_URL)) return [url.replace(PLATFORM_URL, ""), false]

    return [url, true]
  })

-  const fileType = getTagValue("file-type", event.tags) || ""
-
  const getVideoPoster = (videoUrl: string): string | undefined => {
    if (Capacitor.getPlatform() === "android" && THUMBNAIL_URL) {
      return `${THUMBNAIL_URL}/thumbnail?url=${encodeURIComponent(videoUrl)}`
@@ -56,52 +54,46 @@
  const expand = () => pushModal(ContentLinkDetail, {value, event}, {fullscreen: true})
 </script>

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

  const {value, event} = $props()

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

  const expand = () => pushModal(ContentLinkDetail, {value, event}, {fullscreen: true})
 </script>
@@ -27,5 +34,8 @@
    {displayUrl(url)}
  </a>
 {:else}
-  <ContentLinkUrl {url} class="link-content whitespace-nowrap" />
+  <Link {external} {href} class="link-content whitespace-nowrap">
+    <Icon icon={LinkRound} size={3} class="inline-block" />
+    {displayUrl(url)}
+  </Link>
 {/if}
@@ -1,59 +0,0 @@
-<script lang="ts">
-  import {call, displayUrl} from "@welshman/lib"
-  import {displayRelayUrl, isRelayUrl, normalizeRelayUrl} from "@welshman/util"
-  import LinkRound from "@assets/icons/link-round.svg?dataurl"
-  import Icon from "@lib/components/Icon.svelte"
-  import Link from "@lib/components/Link.svelte"
-  import {PLATFORM_URL, displayRoom, isRoomId, splitRoomId} from "@app/core/state"
-  import {makeRoomPath, makeSpacePath} from "@app/util/routes"
-
-  const {
-    url,
-    class: className = "",
-  }: {
-    url: string
-    class?: string
-  } = $props()
-
-  const roomReference = call(() => {
-    if (!isRoomId(url)) {
-      return undefined
-    }
-
-    const [roomUrl, h] = splitRoomId(url)
-
-    if (!roomUrl || !h || !isRelayUrl(roomUrl)) {
-      return undefined
-    }
-
-    return {url: normalizeRelayUrl(roomUrl), h}
-  })
-
-  const relayReference = call(() => {
-    if (roomReference || !isRelayUrl(url)) {
-      return undefined
-    }
-
-    return normalizeRelayUrl(url)
-  })
-
-  const [href, external] = call(() => {
-    if (roomReference) return [makeRoomPath(roomReference.url, roomReference.h), false]
-    if (relayReference) return [makeSpacePath(relayReference), false]
-    if (url.startsWith(PLATFORM_URL)) return [url.replace(PLATFORM_URL, ""), false]
-
-    return [url, true]
-  })
-</script>
-
-<Link {external} {href} class={className}>
-  {#if roomReference}
-    ~<span class="text-primary">{displayRelayUrl(roomReference.url)}</span> /
-    {displayRoom(roomReference.url, roomReference.h)}
-  {:else if relayReference}
-    <span class="text-primary">{displayRelayUrl(relayReference)}</span>
-  {:else}
-    <Icon icon={LinkRound} size={3} class="inline-block" />
-    {displayUrl(url)}
-  {/if}
-</Link>
@@ -7,7 +7,6 @@
    renderAsHtml,
    isText,
    isEmoji,
-    isEmail,
    isTopic,
    isCode,
    isCashu,
@@ -25,7 +24,6 @@
  import Button from "@lib/components/Button.svelte"
  import ContentToken from "@app/components/ContentToken.svelte"
  import ContentEmoji from "@app/components/ContentEmoji.svelte"
-  import ContentEmail from "@app/components/ContentEmail.svelte"
  import ContentCode from "@app/components/ContentCode.svelte"
  import ContentLinkInline from "@app/components/ContentLinkInline.svelte"
  import ContentNewline from "@app/components/ContentNewline.svelte"
@@ -111,8 +109,6 @@
          <ContentTopic value={parsed.value} />
        {:else if isEmoji(parsed)}
          <ContentEmoji value={parsed.value} />
-        {:else if isEmail(parsed)}
-          <ContentEmail value={parsed.value} />
        {:else if isCode(parsed)}
          <ContentCode
            value={parsed.value}
@@ -49,7 +49,7 @@
        <NoteContentMinimal trimParent {url} event={$quote} />
      </div>
    {:else}
-      <NoteCard noShadow event={$quote} {url} class="bg-alt rounded-box p-4">
+      <NoteCard event={$quote} {url} class="bg-alt rounded-box p-4">
        <NoteContentMinimal {url} event={$quote} />
      </NoteCard>
    {/if}
@@ -42,7 +42,7 @@
  let popover: Instance | undefined = $state()
 </script>

-<div class="join items-center rounded-full">
+<Button class="join rounded-full">
  {#if ENABLE_ZAPS && !hideZap}
    <ZapButton {url} {event} class="btn join-item btn-neutral btn-xs">
      <Icon icon={Bolt} size={4} />
@@ -52,7 +52,6 @@
    <Icon icon={SmileCircle} size={4} />
  </EmojiButton>
  <Tippy
-    class="flex"
    bind:popover
    component={EventMenu}
    props={{url, noun, event, customActions, onClick: hidePopover}}
@@ -61,4 +60,4 @@
      <Icon icon={MenuDots} size={4} />
    </Button>
  </Tippy>
-</div>
+</Button>
@@ -68,7 +68,7 @@
    })

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

    observer.observe(form!)
@@ -84,7 +84,7 @@
  in:fly
  bind:this={form}
  onsubmit={preventDefault(submit)}
-  class="left-content bottom-sai right-sai fixed z-feature mb-14 md:mb-0 w-full md:w-auto pr-2">
+  class="left-content bottom-sai right-sai ml-2 pl-2 fixed z-feature">
  <div class="card2 mx-2 my-2 bg-alt shadow-md">
    <div class="relative">
      <div class="note-editor grow overflow-hidden">
@@ -1,7 +1,7 @@
 <script lang="ts">
  import {writable} from "svelte/store"
  import {makeEvent, ZAP_GOAL} from "@welshman/util"
-  import {publishThunk, waitForThunkError} from "@welshman/app"
+  import {publishThunk} from "@welshman/app"
  import {isMobile, preventDefault} from "@lib/html"
  import Paperclip from "@assets/icons/paperclip-2.svg?dataurl"
  import Bolt from "@assets/icons/bolt.svg?dataurl"
@@ -10,7 +10,6 @@
  import Field from "@lib/components/Field.svelte"
  import FieldInline from "@lib/components/FieldInline.svelte"
  import Button from "@lib/components/Button.svelte"
-  import Spinner from "@lib/components/Spinner.svelte"
  import ModalHeader from "@lib/components/ModalHeader.svelte"
  import ModalTitle from "@lib/components/ModalTitle.svelte"
  import ModalSubtitle from "@lib/components/ModalSubtitle.svelte"
@@ -22,7 +21,7 @@
  import {PROTECTED} from "@app/core/state"
  import {makeEditor} from "@app/editor"
  import {DraftKey} from "@app/util/drafts"
-  import {canEnforceNip70, publishRoomQuote} from "@app/core/commands"
+  import {canEnforceNip70} from "@app/core/commands"

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

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

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

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

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

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

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

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

  let title = $state(initialValues?.title ?? "")
  let amount = $state(initialValues?.amount ?? 1000)
@@ -176,8 +154,7 @@
        <Button
          data-tip="Add an image"
          class="tooltip tooltip-left absolute bottom-1 right-2"
-          onclick={selectFiles}
-          disabled={loading}>
+          onclick={selectFiles}>
          {#if $uploading}
            <span class="loading loading-spinner loading-xs"></span>
          {:else}
@@ -192,16 +169,16 @@
          {/snippet}
          {#snippet input()}
            <div class="flex grow justify-end">
-              <label class="input input-bordered flex w-auto items-center gap-2">
+              <label class="input input-bordered flex items-center gap-2">
                <Icon icon={Bolt} />
-                <input bind:value={amount} type="number" class="w-28 grow" />
-                <p class="shrink-0 opacity-50">sats</p>
+                <input bind:value={amount} type="number" class="w-28" />
+                <p class="opacity-50">sats</p>
              </label>
            </div>
          {/snippet}
        </FieldInline>
        <input
-          class="range range-primary -mt-2 w-full"
+          class="range range-primary -mt-2"
          type="range"
          min="1000"
          max="100000"
@@ -211,12 +188,10 @@
    </div>
  </ModalBody>
  <ModalFooter>
-    <Button class="btn btn-link" onclick={back} disabled={loading}>
+    <Button class="btn btn-link" onclick={back}>
      <Icon icon={AltArrowLeft} />
      Go back
    </Button>
-    <Button type="submit" class="btn btn-primary" disabled={$uploading || loading}>
-      <Spinner {loading}>Create Goal</Spinner>
-    </Button>
+    <Button type="submit" class="btn btn-primary">Create Goal</Button>
  </ModalFooter>
 </Modal>
@@ -15,7 +15,6 @@
  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"

@@ -23,11 +22,9 @@
    secret: string
    next: () => unknown
    submitText?: string
-    step?: number
-    totalSteps?: number
  }

-  const {secret, next, submitText = "Continue", step, totalSteps}: Props = $props()
+  const {secret, next, submitText = "Continue"}: Props = $props()

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

@@ -153,9 +150,6 @@
      </Button>
    </div>
  </ModalBody>
-  {#if step && totalSteps}
-    <ProgressBar current={step} total={totalSteps} />
-  {/if}
  <ModalFooter>
    <Button class="btn btn-link" onclick={back}>
      <Icon icon={AltArrowLeft} />
@@ -1,5 +1,4 @@
 <script lang="ts">
-  import {Capacitor} from "@capacitor/core"
  import {onMount, onDestroy} from "svelte"
  import type {Nip46ResponseWithResult} from "@welshman/signer"
  import {Nip46Broker} from "@welshman/signer"
@@ -104,16 +103,10 @@
    mode = "connect"
  }

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

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

  $effect(() => {
@@ -145,9 +138,6 @@
      <BunkerUrl {controller} />
      <Button class="btn {$bunker ? 'btn-neutral' : 'btn-primary'}" onclick={selectConnect}
        >Log in with a QR code instead</Button>
-      {#if isIos}
-        <Button class="btn btn-neutral" onclick={openSigner}>Open in Signer</Button>
-      {/if}
    {/if}
  </ModalBody>
  <ModalFooter>
@@ -19,7 +19,6 @@
  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"
@@ -45,7 +44,7 @@

        return pushToast({
          theme: "error",
-          message: getPomadeLoginFailureMessage(messages),
+          message: "Sorry, we were unable to log you in.",
        })
      }

@@ -65,17 +64,10 @@

          pushToast({
            theme: "error",
-            message: getPomadeLoginFailureMessage(res.messages),
+            message: "Sorry, we were unable to log you in.",
          })
        }
      }
-    } catch (error) {
-      console.error("Login error:", error)
-
-      pushToast({
-        theme: "error",
-        message: POMADE_NETWORK_ERROR_MESSAGE,
-      })
    } finally {
      loading = false
    }
@@ -98,7 +90,7 @@
      {#snippet input()}
        <label class="input input-bordered flex w-full items-center gap-2">
          <Icon icon={Letter} />
-          <input type="email" bind:value={email} />
+          <input bind:value={email} />
        </label>
      {/snippet}
    </FieldInline>
@@ -15,7 +15,6 @@
  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"

@@ -36,20 +35,11 @@
      if (ok) {
        pushModal(LogInOTPConfirm, {email, peersByPrefix})
      } else {
-        console.error("Pomade challenge request failed during OTP login")
-
        pushToast({
          theme: "error",
-          message: POMADE_NETWORK_ERROR_MESSAGE,
+          message: "Sorry, we were unable to request a login code.",
        })
      }
-    } catch (error) {
-      console.error(error)
-
-      pushToast({
-        theme: "error",
-        message: POMADE_NETWORK_ERROR_MESSAGE,
-      })
    } finally {
      loading = false
    }
@@ -71,7 +61,7 @@
      {#snippet input()}
        <label class="input input-bordered flex w-full items-center gap-2">
          <Icon icon={Letter} />
-          <input type="email" bind:value={email} />
+          <input bind:value={email} />
        </label>
      {/snippet}
    </FieldInline>
@@ -15,11 +15,10 @@
  import ModalFooter from "@lib/components/ModalFooter.svelte"
  import StringMultiInput from "@lib/components/StringMultiInput.svelte"
  import LogInSelect from "@app/components/LogInSelect.svelte"
-  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"
+  import {setChecked} from "@app/util/notifications"
+  import {pushModal, clearModals} from "@app/util/modal"
+  import {deleteDeactivatedPomadeSessions, loginWithPomade} from "@app/util/pomade"

  type Props = {
    email: string
@@ -45,7 +44,7 @@

        return pushToast({
          theme: "error",
-          message: getPomadeLoginFailureMessage(messages),
+          message: "Sorry, we were unable to log you in.",
        })
      }

@@ -65,17 +64,10 @@

          pushToast({
            theme: "error",
-            message: getPomadeLoginFailureMessage(res.messages),
+            message: "Sorry, we were unable to log you in.",
          })
        }
      }
-    } catch (error) {
-      console.error("Login error:", error)
-
-      pushToast({
-        theme: "error",
-        message: POMADE_NETWORK_ERROR_MESSAGE,
-      })
    } finally {
      loading = false
    }
@@ -14,7 +14,6 @@
  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"
@@ -47,16 +46,9 @@

        pushToast({
          theme: "error",
-          message: getPomadeLoginFailureMessage(res.messages),
+          message: "Sorry, we were unable to log you in.",
        })
      }
-    } catch (error) {
-      console.error("Login error:", error)
-
-      pushToast({
-        theme: "error",
-        message: POMADE_NETWORK_ERROR_MESSAGE,
-      })
    } finally {
      loading = false
    }
@@ -16,7 +16,6 @@
    children,
    minimal = false,
    hideProfile = false,
-    noShadow = false,
    url,
    ...restProps
  }: {
@@ -24,7 +23,6 @@
    children: Snippet
    minimal?: boolean
    hideProfile?: boolean
-    noShadow?: boolean
    url?: string
    class?: string
  } = $props()
@@ -36,7 +34,7 @@
  let muted = $state($isEventMuted(event))
 </script>

-<div class="flex flex-col gap-2 {restProps.class}" class:shadow-md={!noShadow}>
+<div class="flex flex-col gap-2 shadow-md {restProps.class}">
  {#if muted}
    <div class="flex items-center justify-between">
      <div class="row-2 relative">
@@ -1,6 +1,7 @@
 <script lang="ts">
  import type {ComponentProps} from "svelte"
-  import {EVENT_TIME, ZAP_GOAL, THREAD, CLASSIFIED, POLL} from "@welshman/util"
+  import {EVENT_TIME, ZAP_GOAL, THREAD, CLASSIFIED} from "@welshman/util"
+  import {Poll} from "nostr-tools/kinds"
  import NoteContentEventTime from "@app/components/NoteContentEventTime.svelte"
  import NoteContentThread from "@app/components/NoteContentThread.svelte"
  import NoteContentClassified from "@app/components/NoteContentClassified.svelte"
@@ -20,7 +21,7 @@
    <NoteContentClassified {...props} />
  {:else if props.event.kind === ZAP_GOAL}
    <NoteContentGoal {...props} />
-  {:else if props.event.kind === POLL}
+  {:else if props.event.kind === Poll}
    <NoteContentPoll {...props} />
  {:else}
    <Content {...props} />
@@ -1,6 +1,7 @@
 <script lang="ts">
  import type {ComponentProps} from "svelte"
-  import {EVENT_TIME, ZAP_GOAL, THREAD, CLASSIFIED, POLL} from "@welshman/util"
+  import {EVENT_TIME, ZAP_GOAL, THREAD, CLASSIFIED} from "@welshman/util"
+  import {Poll} from "nostr-tools/kinds"
  import NoteContentMinimalEventTime from "@app/components/NoteContentMinimalEventTime.svelte"
  import NoteContentMinimalThread from "@app/components/NoteContentMinimalThread.svelte"
  import NoteContentMinimalClassified from "@app/components/NoteContentMinimalClassified.svelte"
@@ -20,7 +21,7 @@
    <NoteContentMinimalClassified {...props} />
  {:else if props.event.kind === ZAP_GOAL}
    <NoteContentMinimalGoal {...props} />
-  {:else if props.event.kind === POLL}
+  {:else if props.event.kind === Poll}
    <NoteContentMinimalPoll {...props} />
  {:else}
    <ContentMinimal {...props} />
@@ -1,14 +1,14 @@
 <script lang="ts">
  import type {ComponentProps} from "svelte"
  import {derived} from "svelte/store"
-  import {POLL_RESPONSE} from "@welshman/util"
+  import {PollResponse} from "nostr-tools/kinds"
  import ContentMinimal from "@app/components/ContentMinimal.svelte"
  import {deriveEvents} from "@app/core/state"
  import {getPollResults} from "@app/util/polls"

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

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

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

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

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

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

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

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

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

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

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

  let draggedOptionId = $state<string | undefined>()
  let title = $state(initialValues?.title ?? "")
@@ -269,12 +246,10 @@
    </div>
  </ModalBody>
  <ModalFooter>
-    <Button class="btn btn-link" onclick={back} disabled={loading}>
+    <Button class="btn btn-link" onclick={back}>
      <Icon icon={AltArrowLeft} />
      Go back
    </Button>
-    <Button type="submit" class="btn btn-primary" disabled={loading}>
-      <Spinner {loading}>Create Poll</Spinner>
-    </Button>
+    <Button type="submit" class="btn btn-primary">Create Poll</Button>
  </ModalFooter>
 </Modal>
@@ -1,8 +1,8 @@
 <script lang="ts">
  import {onDestroy} from "svelte"
  import type {TrustedEvent} from "@welshman/util"
-  import {POLL_RESPONSE} from "@welshman/util"
  import {pubkey, publishThunk, abortThunk} from "@welshman/app"
+  import {PollResponse} from "nostr-tools/kinds"
  import {formatTimestampRelative} from "@welshman/lib"
  import {deriveEvents} from "@app/core/state"
  import {pushToast} from "@app/util/toast"
@@ -24,7 +24,7 @@

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

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

  const pollType = getPollType(event)
  const options = getPollOptions(event)
@@ -13,16 +13,13 @@

  const onClick = () => goToSpace(url)

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

 <PrimaryNavItem
-  href={path}
  onclick={onClick}
  title={$display}
  class="tooltip-right"
-  notification={$notifications.has(path)}>
+  notification={$notifications.has(makeSpacePath(url))}>
  <RelayIcon {url} size={10} class="rounded-full" />
 </PrimaryNavItem>
@@ -5,11 +5,11 @@
  import type {Filter} from "@welshman/util"
  import {deriveEventsDesc, deriveEventsById} from "@welshman/store"
  import {formatTimestampRelative} from "@welshman/lib"
-  import {NOTE, ROOMS, COMMENT, MESSAGE} from "@welshman/util"
+  import {NOTE, ROOMS, COMMENT} from "@welshman/util"
  import {repository, loadRelayList} from "@welshman/app"
  import Button from "@lib/components/Button.svelte"
  import ProfileSpaces from "@app/components/ProfileSpaces.svelte"
-  import {deriveGroupList, getSpaceUrlsFromGroupList} from "@app/core/state"
+  import {deriveGroupList, getSpaceUrlsFromGroupList, MESSAGE_KINDS} from "@app/core/state"
  import {goToEvent} from "@app/util/routes"
  import {pushModal} from "@app/util/modal"

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

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

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

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

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

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

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

  type Props = {
@@ -23,10 +25,9 @@
    onsubmit: (values: Values) => void
    isSignup?: boolean
    footer: Snippet
-    progressBar?: Snippet
  }

-  const {initialValues, isSignup, onsubmit, footer, progressBar}: Props = $props()
+  const {initialValues, isSignup, onsubmit, footer}: Props = $props()

  const values = $state(initialValues)

@@ -76,7 +77,7 @@
      {/snippet}
      {#snippet input()}
        <textarea
-          class="textarea textarea-bordered leading-4 w-full"
+          class="textarea textarea-bordered leading-4"
          rows="5"
          bind:value={values.profile.about}></textarea>
      {/snippet}
@@ -103,10 +104,26 @@
        {/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>
@@ -1,9 +0,0 @@
-<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,7 +33,6 @@
    url?: string
    reactionClass?: string
    noTooltip?: boolean
-    innerEvent?: TrustedEvent
    children?: Snippet
  }

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

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

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

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

@@ -19,12 +19,12 @@

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

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

    draftKey?.clear()
@@ -243,7 +243,7 @@
        {/if}
      </div>
    </div>
-    {#if $members !== undefined && $members.length > 0}
+    {#if $members.length > 0}
      <div class="card2 card2-sm bg-alt flex items-center justify-between gap-4">
        <div class="flex items-center gap-4">
          <span>Members:</span>
@@ -251,10 +251,6 @@
        </div>
        <Button class="btn btn-neutral btn-sm" onclick={showMembers}>View All</Button>
      </div>
-    {:else if $members === undefined}
-      <div class="card2 card2-sm bg-base-200 flex items-center gap-4">
-        <span class="text-error">Member list not available from this relay</span>
-      </div>
    {/if}
    <div class="card2 card2-sm bg-alt col-4">
      <strong class="text-lg">Room Settings</strong>
@@ -1,16 +1,8 @@
 <script lang="ts">
  import cx from "classnames"
-  import {readable} from "svelte/store"
-  import {
-    hash,
-    gte,
-    now,
-    displayList,
-    formatTimestampAsTime,
-    formatTimestampAsDate,
-  } from "@welshman/lib"
+  import {hash, now, displayList, formatTimestampAsTime, formatTimestampAsDate} from "@welshman/lib"
  import type {TrustedEvent, EventContent} from "@welshman/util"
-  import {MESSAGE, COMMENT, getTag} from "@welshman/util"
+  import {MESSAGE, COMMENT} from "@welshman/util"
  import {
    thunks,
    pubkey,
@@ -35,7 +27,7 @@
  import RoomItemMenuButton from "@app/components/RoomItemMenuButton.svelte"
  import RoomItemMenuMobile from "@app/components/RoomItemMenuMobile.svelte"
  import RoomItemContent from "@app/components/RoomItemContent.svelte"
-  import {colors, ENABLE_ZAPS, deriveEventsForUrl, deriveEvent} from "@app/core/state"
+  import {colors, ENABLE_ZAPS, deriveEventsForUrl} from "@app/core/state"
  import {publishDelete, publishReaction, canEnforceNip70} from "@app/core/commands"
  import {getRoomItemPath} from "@app/util/routes"
  import {pushModal} from "@app/util/modal"
@@ -46,6 +38,7 @@
    replyTo?: (event: TrustedEvent) => void
    showPubkey?: boolean
    addSpaceBelow?: boolean
+    inert?: boolean
    canEdit: (event: TrustedEvent) => boolean
    onEdit: (event: TrustedEvent) => void
  }
@@ -56,6 +49,7 @@
    replyTo = undefined,
    showPubkey = false,
    addSpaceBelow = false,
+    inert = false,
    canEdit,
    onEdit,
  }: Props = $props()
@@ -66,15 +60,7 @@
  const profileDisplay = deriveProfileDisplay(event.pubkey, [url])
  const thunk = mergeThunks($thunks.filter(t => t.event.id === event.id))
  const [_, colorValue] = colors[hash(event.pubkey) % colors.length]
-
-  const qTag = getTag("q", event.tags)
-  const isQuoteOnly = Boolean(
-    gte(qTag?.length, 2) && event.content.trim().match(/^nostr:n(event|addr)1\w+\s*$/),
-  )
-  const innerComments = isQuoteOnly
-    ? deriveEventsForUrl(url, [{kinds: [COMMENT], "#e": [qTag![1]]}])
-    : readable([])
-  const innerEvent = isQuoteOnly ? deriveEvent(qTag![1], [url]) : readable(undefined)
+  const comments = deriveEventsForUrl(url, [{kinds: [COMMENT], "#e": [event.id]}])

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

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

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

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

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

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

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

  const flows = {
    email: {
-      start: () => pushModal(SignUpEmail, {next: flows.email.profile, step: 1, totalSteps: 3}),
-      profile: () => pushModal(SignUpProfile, {next: flows.email.complete, step: 2, totalSteps: 3}),
-      complete: () =>
-        pushModal(SignUpComplete, {next: flows.email.finalize, step: 3, totalSteps: 3}),
+      start: () => pushModal(SignUpEmail, {next: flows.email.profile}),
+      profile: () => pushModal(SignUpProfile, {next: flows.email.complete}),
+      complete: () => pushModal(SignUpComplete, {next: flows.email.finalize}),
      finalize: () => {
        const email = getKey<string>("signup.email")!
        const clientOptions = getKey<ClientOptions>("signup.clientOptions")!
@@ -75,10 +74,9 @@
      },
    },
    nostr: {
-      start: () => pushModal(SignUpProfile, {next: flows.nostr.key, step: 1, totalSteps: 3}),
-      key: () => pushModal(SignUpKey, {next: flows.nostr.complete, step: 2, totalSteps: 3}),
-      complete: () =>
-        pushModal(SignUpComplete, {next: flows.nostr.finalize, step: 3, totalSteps: 3}),
+      start: () => pushModal(SignUpProfile, {next: flows.nostr.key}),
+      key: () => pushModal(SignUpKey, {next: flows.nostr.complete}),
+      complete: () => pushModal(SignUpComplete, {next: flows.nostr.finalize}),
      finalize: () => {
        const secret = getKey<string>("signup.secret")!

@@ -9,15 +9,12 @@
  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, step, totalSteps}: Props = $props()
+  const {next}: Props = $props()

  const back = () => history.back()
 </script>
@@ -36,9 +33,6 @@
      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,17 +18,14 @@
  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, step, totalSteps}: Props = $props()
+  const {next}: Props = $props()

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

@@ -84,7 +81,7 @@
      setKey("signup.clientOptions", clientOptions)

      popToast(toastId)
-      pushModal(SignUpEmailConfirm, {next, step, totalSteps})
+      pushModal(SignUpEmailConfirm, {next})
    } catch (e) {
      console.error(e)

@@ -123,7 +120,7 @@
      {#snippet input()}
        <label class="input input-bordered flex w-full items-center gap-2">
          <Icon icon={Letter} />
-          <input type="email" bind:value={email} />
+          <input bind:value={email} />
        </label>
      {/snippet}
    </FieldInline>
@@ -137,14 +134,8 @@
          <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,15 +15,12 @@
  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, step, totalSteps}: Props = $props()
+  const {next}: Props = $props()

  const email = getKey<string>("signup.email")

@@ -64,9 +61,6 @@
      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,13 +4,11 @@

  type Props = {
    next: () => void
-    step?: number
-    totalSteps?: number
  }

-  const {next, step, totalSteps}: Props = $props()
+  const {next}: Props = $props()

  const secret = getKey<string>("signup.secret")!
 </script>

-<KeyDownload {secret} {next} {step} {totalSteps} />
+<KeyDownload {secret} {next} />
@@ -5,20 +5,19 @@
  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, step, totalSteps}: Props = $props()
+  const {next}: Props = $props()

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

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

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

@@ -28,20 +27,19 @@
  }
 </script>

-<ProfileEditForm isSignup {initialValues} {onsubmit}>
-  {#snippet footer()}
-    <Button class="btn btn-link" onclick={back}>
-      <Icon icon={AltArrowLeft} />
-      Go back
-    </Button>
-    <Button class="btn btn-primary" type="submit">
-      Create Account
-      <Icon icon={AltArrowRight} />
-    </Button>
-  {/snippet}
-  {#snippet progressBar()}
-    {#if step && totalSteps}
-      <ProgressBar current={step} total={totalSteps} />
-    {/if}
-  {/snippet}
-</ProfileEditForm>
+<Modal>
+  <ModalBody>
+    <ProfileEditForm isSignup {initialValues} {onsubmit}>
+      {#snippet footer()}
+        <Button class="btn btn-link" onclick={back}>
+          <Icon icon={AltArrowLeft} />
+          Go back
+        </Button>
+        <Button class="btn btn-primary" type="submit">
+          Create Account
+          <Icon icon={AltArrowRight} />
+        </Button>
+      {/snippet}
+    </ProfileEditForm>
+  </ModalBody>
+</Modal>
@@ -3,9 +3,7 @@
  import {sleep} from "@welshman/lib"
  import {request} from "@welshman/net"
  import {displayRelayUrl, getTagValue, RELAY_INVITE} from "@welshman/util"
-  import {Share} from "@capacitor/share"
  import LinkRound from "@assets/icons/link-round.svg?dataurl"
-  import Upload from "@assets/icons/upload.svg?dataurl"
  import Copy from "@assets/icons/copy.svg?dataurl"
  import Spinner from "@lib/components/Spinner.svelte"
  import Field from "@lib/components/Field.svelte"
@@ -25,72 +23,36 @@
  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 () => {
-    try {
-      const {value} = await Share.canShare()
-      canShare = value
-    } catch {
-      canShare = false
-    }
+    const [[event]] = await Promise.all([
+      request({
+        relays: [url],
+        autoClose: true,
+        signal: AbortSignal.timeout(3000),
+        filters: [{kinds: [RELAY_INVITE]}],
+      }),
+      sleep(2000),
+    ])

-    try {
-      const [[event]] = await Promise.all([
-        request({
-          relays: [url],
-          autoClose: true,
-          signal: AbortSignal.timeout(10000),
-          filters: [{kinds: [RELAY_INVITE]}],
-        }),
-        sleep(2000),
-      ])
-
-      claim = getTagValue("claim", event?.tags || []) || ""
-    } catch (err) {
-      claim = ""
-      if (
-        (err instanceof Error && (err.name === "AbortError" || err.name === "TimeoutError")) ||
-        !navigator.onLine
-      ) {
-        networkError = true
-      }
-    } finally {
-      loading = false
-    }
+    claim = getTagValue("claim", event?.tags || []) || ""
+    loading = false
  })
 </script>

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

  const relay = deriveRelay(url)
+  const display = deriveRelayDisplay(url)
  const chatPath = makeSpacePath(url, "chat")
  const goalsPath = makeSpacePath(url, "goals")
  const threadsPath = makeSpacePath(url, "threads")
@@ -143,7 +145,9 @@
        class="relative flex w-full flex-col rounded-xl p-3 transition-all hover:bg-base-100"
        onclick={openMenu}>
        <div class="flex items-center justify-between">
-          <strong class="flex items-center gap-1 relative">
+          <strong
+            class="flex items-center gap-1 relative tooltip tooltip-right"
+            data-tip={$display}>
            <RelayName {url} class="ellipsize" />
            <div
              class="absolute -right-3 top-0 h-2 w-2 rounded-full bg-primary transition-all opacity-0"
@@ -177,11 +181,7 @@
            <li>
              <Button onclick={showMembers}>
                <Icon icon={UserRounded} />
-                {#if $members === undefined}
-                  View Members
-                {:else}
-                  View Members ({$members.length})
-                {/if}
+                View Members ({$members.length})
              </Button>
            </li>
            {#if $userIsAdmin}
@@ -263,7 +263,7 @@
          <Icon icon={CalendarMinimalistic} /> Calendar
        </SecondaryNavItem>
      {/if}
-      {#if $spaceKinds.has(POLL)}
+      {#if $spaceKinds.has(Poll)}
        <SecondaryNavItem href={pollsPath}>
          <Icon icon={Revote} /> Polls
        </SecondaryNavItem>
@@ -26,27 +26,27 @@
    {@const {pubkey, software, version, supported_nips, limitation} = $relay}
    <div class="flex flex-wrap gap-1">
      {#if pubkey}
-        <div class="badge badge-neutral text-wrap h-auto">
+        <div class="badge badge-neutral">
          <span class="ellipsize">Administrator: <ProfileLink unstyled {pubkey} /></span>
        </div>
      {/if}
      {#if $relay?.contact}
-        <div class="badge badge-neutral text-wrap h-auto">
+        <div class="badge badge-neutral">
          <span class="ellipsize">Contact: {$relay.contact}</span>
        </div>
      {/if}
      {#if software}
-        <div class="badge badge-neutral text-wrap h-auto">
+        <div class="badge badge-neutral">
          <span class="ellipsize">Software: {software}</span>
        </div>
      {/if}
      {#if version}
-        <div class="badge badge-neutral text-wrap h-auto">
+        <div class="badge badge-neutral">
          <span class="ellipsize">Version: {version}</span>
        </div>
      {/if}
      {#if Array.isArray(supported_nips)}
-        <p class="badge badge-neutral text-wrap h-auto">
+        <p class="badge badge-neutral">
          <span class="ellipsize">Supported NIPs: {supported_nips.join(", ")}</span>
        </p>
      {/if}
@@ -61,7 +61,7 @@
        </p>
      {/if}
      {#if limitation?.min_pow_difficulty}
-        <p class="badge badge-warning text-wrap h-auto">
+        <p class="badge badge-warning">
          <span class="ellipsize">Min PoW: {limitation?.min_pow_difficulty}</span>
        </p>
      {/if}
@@ -2,10 +2,9 @@
  import {tick} from "svelte"
  import {debounce} from "throttle-debounce"
  import {request} from "@welshman/net"
-  import {repository, tracker} from "@welshman/app"
-  import {formatTimestampAsDate, groupBy, uniqBy, now, MINUTE, HOUR, DAY, WEEK} from "@welshman/lib"
+  import {formatTimestampAsDate, groupBy, now, MINUTE, HOUR, DAY, WEEK} from "@welshman/lib"
  import type {TrustedEvent, Filter} from "@welshman/util"
-  import {MESSAGE, sortEventsDesc} from "@welshman/util"
+  import {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"
@@ -54,11 +53,8 @@

  const getFilter = (searchTerm: string): Filter =>
    h
-      ? {kinds: [MESSAGE, ...CONTENT_KINDS], "#h": [h], search: searchTerm}
-      : {kinds: [MESSAGE, ...CONTENT_KINDS], search: searchTerm}
-
-  const getLocalResults = (filter: Filter) =>
-    repository.query([filter]).filter(event => tracker.getRelays(event.id).has(url))
+      ? {kinds: CONTENT_KINDS, "#h": [h], search: searchTerm}
+      : {kinds: CONTENT_KINDS, search: searchTerm}

  const search = debounce(300, async (searchTerm: string) => {
    controller?.abort()
@@ -72,23 +68,18 @@
    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: [filter],
+        filters: [getFilter(searchTerm.trim())],
      })

-      results = sortEventsDesc(uniqBy((e: TrustedEvent) => e.id, [...events, ...localResults]))
+      results = sortEventsDesc(events)
    } catch (error) {
      if (!(error instanceof DOMException && error.name === "AbortError")) {
-        results = sortEventsDesc(localResults)
+        results = []
      }
    } finally {
      loading = false
@@ -1,14 +1,13 @@
 <script lang="ts">
  import {writable} from "svelte/store"
  import {makeEvent, THREAD} from "@welshman/util"
-  import {publishThunk, waitForThunkError} from "@welshman/app"
+  import {publishThunk} from "@welshman/app"
  import {isMobile, preventDefault} from "@lib/html"
  import Paperclip from "@assets/icons/paperclip-2.svg?dataurl"
  import AltArrowLeft from "@assets/icons/alt-arrow-left.svg?dataurl"
  import Icon from "@lib/components/Icon.svelte"
  import Field from "@lib/components/Field.svelte"
  import Button from "@lib/components/Button.svelte"
-  import Spinner from "@lib/components/Spinner.svelte"
  import ModalHeader from "@lib/components/ModalHeader.svelte"
  import ModalTitle from "@lib/components/ModalTitle.svelte"
  import ModalSubtitle from "@lib/components/ModalSubtitle.svelte"
@@ -20,7 +19,7 @@
  import {PROTECTED} from "@app/core/state"
  import {makeEditor} from "@app/editor"
  import {DraftKey} from "@app/util/drafts"
-  import {canEnforceNip70, publishRoomQuote} from "@app/core/commands"
+  import {canEnforceNip70} from "@app/core/commands"

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

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

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

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

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

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

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

  let title = $state(initialValues?.title ?? "")
  let content = $state(initialValues?.content ?? "")
@@ -160,8 +138,7 @@
      <Button
        data-tip="Add an image"
        class="tooltip tooltip-left absolute bottom-1 right-2"
-        onclick={selectFiles}
-        disabled={loading}>
+        onclick={selectFiles}>
        {#if $uploading}
          <span class="loading loading-spinner loading-xs"></span>
        {:else}
@@ -171,12 +148,10 @@
    </div>
  </ModalBody>
  <ModalFooter>
-    <Button class="btn btn-link" onclick={back} disabled={loading}>
+    <Button class="btn btn-link" onclick={back}>
      <Icon icon={AltArrowLeft} />
      Go back
    </Button>
-    <Button type="submit" class="btn btn-primary" disabled={$uploading || loading}>
-      <Spinner {loading}>Create Thread</Spinner>
-    </Button>
+    <Button type="submit" class="btn btn-primary">Create Thread</Button>
  </ModalFooter>
 </Modal>
@@ -18,10 +18,10 @@ import {
 import {Nip01Signer} from "@welshman/signer"
 import type {UploadTask} from "@welshman/editor"
 import type {TrustedEvent, EventContent, Profile, PublishedRoomMeta} from "@welshman/util"
+import {PollResponse} from "nostr-tools/kinds"
 import {
  DELETE,
  REPORT,
-  MESSAGE,
  PROFILE,
  MESSAGING_RELAYS,
  RELAYS,
@@ -32,7 +32,6 @@ import {
  ROOMS,
  COMMENT,
  APP_DATA,
-  POLL_RESPONSE,
  isSignedEvent,
  makeEvent,
  normalizeRelayUrl,
@@ -53,6 +52,7 @@ import {
  isPublishedProfile,
  editProfile,
  createProfile,
+  uniqTags,
  ManagementMethod,
 } from "@welshman/util"
 import {Pool, AuthStatus, SocketStatus} from "@welshman/net"
@@ -73,6 +73,7 @@ import {
  waitForThunkError,
  getPubkeyRelays,
  userBlossomServerList,
+  getThunkError,
  addRoomMember,
  manageRelay,
  getRelay,
@@ -83,7 +84,6 @@ import {
  SETTINGS,
  PROTECTED,
  INDEXER_RELAYS,
-  DEFAULT_RELAYS,
  DEFAULT_BLOSSOM_SERVERS,
  userSpaceUrls,
  userSettingsValues,
@@ -122,34 +122,6 @@ export const prependParent = (
  return {content, tags}
 }

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

 export const broadcastUserData = async (relays: string[]) => {
@@ -263,12 +235,16 @@ export const attemptRelayAccess = async (url: string, claim = "") => {
  return stripPrefix(error)
 }

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

+  // Attempt to join the relay
+  const thunk = publishJoinRequest({url, claim})
+
  return derived(
-    [relaysMostlyRestricted, deriveSocket(url)],
-    ([$relaysMostlyRestricted, $socket]) => {
+    [thunk, relaysMostlyRestricted, deriveSocket(url)],
+    ([$thunk, $relaysMostlyRestricted, $socket]) => {
      if ($socket.auth.status === AuthStatus.Forbidden && $socket.auth.details) {
        return stripPrefix($socket.auth.details)
      }
@@ -276,6 +252,16 @@ export const deriveRelayAuthError = (url: string) => {
      if ($relaysMostlyRestricted[url]) {
        return stripPrefix($relaysMostlyRestricted[url])
      }
+
+      const error = getThunkError($thunk)
+
+      if (error) {
+        const isEmptyInvite = !claim && error.includes("invite code")
+
+        if (!shouldIgnoreError(error) && !isEmptyInvite) {
+          return stripPrefix(error) || "join request rejected"
+        }
+      }
    },
  )
 }
@@ -374,7 +360,7 @@ export type PollResponseParams = {
 }

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

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

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

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

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

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

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

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

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

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

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

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

      backwardWindow = [since - interval, since]

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

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

      forwardWindow = [until, until + interval]

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

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

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

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

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

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

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

        if (event && matchFilters(filters, event)) {
-          insertEvents([event])
+          insertEvent(event)
        }
      }
    }),
@@ -3,10 +3,12 @@ import {context as pomadeContext} from "@pomade/core"
 import {Capacitor} from "@capacitor/core"
 import {derived, readable, writable} from "svelte/store"
 import * as nip19 from "nostr-tools/nip19"
+import {Poll} from "nostr-tools/kinds"
 import {
  on,
  gt,
  max,
+  find,
  spec,
  call,
  first,
@@ -92,7 +94,6 @@ import {
  THREAD,
  CLASSIFIED,
  WRAP,
-  POLL,
  PROFILE,
  ZAP_GOAL,
  ZAP_REQUEST,
@@ -327,7 +328,9 @@ if (ENABLE_ZAPS) {
  REACTION_KINDS.push(ZAP_RESPONSE)
 }

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

 export const DM_KINDS = [DIRECT_MESSAGE, DIRECT_MESSAGE_FILE]

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

@@ -560,9 +563,13 @@ export const chatsById = call(() => {
  })
 })

-export const deriveChat = makeDeriveItem(chatsById)
+export const deriveChat = call(() => {
+  const _deriveChat = makeDeriveItem(chatsById)

-export const chatSearch = derived(throttled(1500, chatsById), $chatsByPubkey => {
+  return (pubkeys: string[]) => _deriveChat(makeChatId(pubkeys))
+})
+
+export const chatSearch = derived(throttled(800, chatsById), $chatsByPubkey => {
  return createSearch(
    sortBy(c => -c.last_activity, Array.from($chatsByPubkey.values())),
    {
@@ -589,8 +596,6 @@ export const getRoomType = (room: RoomMeta): RoomType =>

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -892,7 +921,7 @@ export const deriveSpaceActionItems = (url: string) =>
  derived(
    deriveEventsForUrl(url, [
      {
-        kinds: [REPORT, ROOM_JOIN, ROOM_LEAVE, ROOM_MEMBERS, ROOM_ADD_MEMBER, ROOM_REMOVE_MEMBER],
+        kinds: [REPORT, ROOM_JOIN, ROOM_LEAVE, ROOM_MEMBERS],
      },
    ]),
    $events => {
@@ -905,50 +934,19 @@ export const deriveSpaceActionItems = (url: string) =>
      for (const [h, roomEvents] of groupBy(getRoomId, $events)) {
        if (!h) continue

-        const roomJoins: TrustedEvent[] = []
-        const roomLeaves: TrustedEvent[] = []
-        const roomMembershipEvents: TrustedEvent[] = []
-
-        for (const event of roomEvents) {
-          switch (event.kind) {
-            case ROOM_JOIN:
-              roomJoins.push(event)
-              break
-            case ROOM_LEAVE:
-              roomLeaves.push(event)
-              break
-            case ROOM_MEMBERS:
-            case ROOM_ADD_MEMBER:
-            case ROOM_REMOVE_MEMBER:
-              roomMembershipEvents.push(event)
-              break
-          }
-        }
-
-        const roomMembers = new Set(getRoomMembers(url, h, roomMembershipEvents))
+        const roomJoins = roomEvents.filter(spec({kind: ROOM_JOIN}))
+        const roomLeaves = roomEvents.filter(spec({kind: ROOM_LEAVE}))
+        const roomMembersEvent = roomEvents.find(spec({kind: ROOM_MEMBERS}))
+        const roomMembers = getTagValues("p", roomMembersEvent?.tags ?? [])

        pendingJoins.push(
          ...removeUndefined(
-            Array.from(groupBy(e => e.pubkey, roomJoins).values()).map(events =>
-              first(sortEventsDesc(events)),
-            ),
+            Array.from(groupBy(e => e.pubkey, roomJoins).values())
+              .map(sortEventsDesc)
+              .map(first),
          ).filter(({pubkey, created_at}) => {
-            if (roomMembers.has(pubkey)) return false
-            if (
-              roomMembershipEvents.some(event => {
-                if (event.created_at <= created_at) {
-                  return false
-                }
-
-                if (event.kind === ROOM_MEMBERS) {
-                  return true
-                }
-
-                return getPubkeyTagValues(event.tags).includes(pubkey)
-              })
-            ) {
-              return false
-            }
+            if (roomMembers.includes(pubkey)) return false
+            if (gt(roomMembersEvent?.created_at, created_at)) return false
            if (roomLeaves.some(e => e.pubkey === pubkey && e.created_at > created_at)) return false

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

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

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

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

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

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

-      let isMember = false
-
-      if ($memberList) {
-        // Member list exists - check if user is in it.
-        isMember = $memberList.includes($pubkey!)
-      } else {
-        // No member list available - replay the user's add/remove history.
-        for (const event of sortEventsAsc($userAddRemoveEvents)) {
-          if (event.pubkey !== $pubkey) {
-            continue
-          }
-
-          if (event.kind === ROOM_ADD_MEMBER) {
-            isMember = true
-          } else if (event.kind === ROOM_REMOVE_MEMBER) {
-            isMember = false
-          }
-        }
-      }
-
-      for (const event of $joinLeaveEvents) {
-        // Join events indicate pending or granted status, leave resets to initial.
+      for (const event of $events) {
        if (event.pubkey !== $pubkey) {
          continue
        }
@@ -1,6 +1,7 @@
 import {page} from "$app/stores"
 import type {Unsubscriber} from "svelte/store"
-import {last, call, assoc, chunk, WEEK, ago} from "@welshman/lib"
+import {last, call, ifLet, assoc, chunk, WEEK, ago} from "@welshman/lib"
+import {PollResponse} from "nostr-tools/kinds"
 import {merged} from "@welshman/store"
 import {
  getListTags,
@@ -12,16 +13,13 @@ import {
  ROOM_MEMBERS,
  ROOM_ADD_MEMBER,
  ROOM_REMOVE_MEMBER,
-  ROOM_JOIN,
-  ROOM_LEAVE,
  ROOM_CREATE_PERMISSION,
  RELAY_MEMBERS,
  RELAY_ADD_MEMBER,
  RELAY_REMOVE_MEMBER,
-  MESSAGE,
-  POLL_RESPONSE,
  isSignedEvent,
  unionFilters,
+  getTagValue,
 } from "@welshman/util"
 import type {Filter, List, PublishedList, TrustedEvent} from "@welshman/util"
 import {request, requestOne, Difference, DifferenceEvent} from "@welshman/net"
@@ -43,6 +41,7 @@ import {
 } from "@welshman/app"
 import {
  REACTION_KINDS,
+  MESSAGE_KINDS,
  CONTENT_KINDS,
  INDEXER_RELAYS,
  loadSettings,
@@ -267,21 +266,53 @@ const syncUserData = () => {

 // Spaces

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

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

  return () => controller.abort()
@@ -290,28 +321,36 @@ const syncSpace = (url: string) => {
 const syncSpaces = () => {
  const store = merged([userGroupList, page])
  const unsubscribersByUrl = new Map<string, Unsubscriber>()
+  const roomsByUrl = new Map<string, string>()

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

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

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

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

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

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

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

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

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

-                      return target
-                    },
-                  }),
-                  TippySuggestion({
-                    char: "~",
-                    name: "roomref",
-                    editor: (this as any).editor,
-                    search: (term: string) => get(roomReferenceSearch).searchValues(term),
-                    updateSignal: roomReferenceSearch,
-                    select: (id: string, props) => {
-                      const [roomUrl, h] = splitRoomId(id)
-
-                      if (!roomUrl || !h) {
-                        return
-                      }
-
-                      return props.command({url: roomUrl, h})
-                    },
-                    createSuggestion: (value: string) => {
-                      const target = document.createElement("div")
-
-                      mount(RoomSuggestion, {target, props: {value}})
-
                      return target
                    },
                  }),
@@ -200,7 +137,6 @@ export const makeEditor = async ({
          },
        },
      }),
-      NativeClipboardPasteExtension,
    ],
    onUpdate({editor}) {
      wordCount?.set(editor.storage.wordCount.words)
@@ -1,4 +1,3 @@
-import {App} from "@capacitor/app"
 import {Capacitor} from "@capacitor/core"
 import {Keyboard} from "@capacitor/keyboard"
 import {noop} from "@welshman/lib"
@@ -14,16 +13,9 @@ export const syncKeyboard = () => {
    document.body.classList.remove("keyboard-open")
  })

-  // On Android, system-dismissing the IME during pause doesn't fire keyboardWillHide,
-  // so on resume we force a hide to re-sync native insets and clear our CSS state.
-  const resumeListener = App.addListener("appStateChange", ({isActive}) => {
-    if (isActive) Keyboard.hide()
-  })
-
  return () => {
    showListener.then(listener => listener.remove())
    hideListener.then(listener => listener.remove())
-    resumeListener.then(listener => listener.remove())
    document.body.classList.remove("keyboard-open")
  }
 }
@@ -1,4 +1,4 @@
-import {get, writable} from "svelte/store"
+import {writable} from "svelte/store"
 import type {Nip46ResponseWithResult} from "@welshman/signer"
 import {Nip46Broker} from "@welshman/signer"
 import {makeSecret} from "@welshman/util"
@@ -11,22 +11,6 @@ import {
 } from "@app/core/state"
 import {pushToast} from "@app/util/toast"

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

-  launchSigner() {
-    const nostrconnectUrl = get(this.url)
-    const signerUrl = nostrconnectUrl && makeSignerLaunchUrl(nostrconnectUrl)
-
-    if (!signerUrl) {
-      pushToast({
-        theme: "error",
-        message: "Unable to open signer app right now. Please try again.",
-      })
-
-      return
-    }
-
-    window.location.href = signerUrl
-  }
-
  stop() {
    this.broker.cleanup()
    this.abortController.abort()
@@ -5,10 +5,10 @@ import {pubkey, tracker, repository, relaysByUrl} from "@welshman/app"
 import {assoc, prop, first, identity, groupBy, now} from "@welshman/lib"
 import type {TrustedEvent} from "@welshman/util"
 import {deriveEventsByIdByUrl} from "@welshman/store"
-import {sortEventsDesc, getTagValue, MESSAGE} from "@welshman/util"
+import {sortEventsDesc, getTagValue} from "@welshman/util"
 import {makeSpacePath, makeRoomPath, makeSpaceChatPath, makeChatPath} from "@app/util/routes"
 import {
-  CONTENT_KINDS,
+  MESSAGE_KINDS,
  notificationSettings,
  chatsById,
  userGroupList,
@@ -85,7 +85,7 @@ export const allNotifications = derived(
        deriveEventsByIdByUrl({
          tracker,
          repository,
-          filters: [{kinds: [MESSAGE, ...CONTENT_KINDS]}, makeCommentFilter(CONTENT_KINDS)],
+          filters: [{kinds: MESSAGE_KINDS}, makeCommentFilter(MESSAGE_KINDS)],
        }),
      ],
      identity,
@@ -1,11 +0,0 @@
-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,10 +45,7 @@ export type PushPermissionResult = {
 }

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

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

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

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

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

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

@@ -199,7 +199,7 @@ export const getRoomItemPath = (url: string, event: TrustedEvent) => {
      return makeGoalPath(url, event.id)
    case EVENT_TIME:
      return makeCalendarPath(url, getAddress(event))
-    case POLL:
+    case Poll:
      return makePollPath(url, event.id)
  }
 }
@@ -48,18 +48,6 @@ 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],
@@ -211,15 +199,14 @@ const loadCriticalRelays = async () => {
  relaysByUrl.set(indexBy(r => r.url, await table.getAll()))
 }

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

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

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

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

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

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

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

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

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

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

 const initPlaintext = async () => {
@@ -1,8 +0,0 @@
-<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-<circle cx="9" cy="6" r="1.5" fill="#000000"/>
-<circle cx="15" cy="6" r="1.5" fill="#000000"/>
-<circle cx="9" cy="12" r="1.5" fill="#000000"/>
-<circle cx="15" cy="12" r="1.5" fill="#000000"/>
-<circle cx="9" cy="18" r="1.5" fill="#000000"/>
-<circle cx="15" cy="18" r="1.5" fill="#000000"/>
-</svg>
@@ -17,7 +17,7 @@
    "aria-pressed"?: boolean
  } = $props()

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

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

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

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

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

 <Tippy
-  class="flex"
  bind:popover
  component={EmojiPicker}
  props={{onClick}}
@@ -10,7 +10,6 @@

 <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"

@@ -27,4 +26,4 @@
  })
 </script>

-<emoji-picker bind:this={element} data-source={emojiDataUrl} class="m-auto"></emoji-picker>
+<emoji-picker bind:this={element} class="m-auto"></emoji-picker>
@@ -14,7 +14,7 @@
  } = $props()
 </script>

-<div class={cx("fixed bottom-20 mb-sai right-4 z-nav hide-on-keyboard md:hidden", className)}>
+<div class={cx("fixed bottom-20 right-4 z-nav hide-on-keyboard md:hidden", className)}>
  <Button
    class="btn btn-primary border-none shadow-xl hover:opacity-90 transition-all size-[50px] rounded-xl p-0"
    {onclick}>
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
mplorentz	81ab03311a	Cleanup remaining files	2026-04-08 17:10:12 +00:00
mplorentz	11fa8fd720	Factor video code and stores out of voice.ts	2026-04-08 17:10:12 +00:00
mplorentz	3cff8271e6	Clean up VideoCallContent	2026-04-08 17:10:12 +00:00
mplorentz	2c4fe7bcf3	Simplify how video call layout is stored	2026-04-08 17:10:12 +00:00
mplorentz	fb60d493b9	incorporate page layout changes from dev and other cleanup	2026-04-08 17:10:12 +00:00
mplorentz	39ce62d903	Add permissions for cameras on mobile	2026-04-08 17:10:12 +00:00
mplorentz	4d90092f4b	Hide screen share button on ios and android	2026-04-08 17:10:12 +00:00
mplorentz	ceca21e867	Show unread indicator on chat icon in VoiceWidget	2026-04-08 17:10:12 +00:00
mplorentz	7353dab8c2	Allow clicking voice widget to go back to call	2026-04-08 17:10:12 +00:00
mplorentz	31d7041e5c	rework video + text chat display controls	2026-04-08 17:10:12 +00:00
mplorentz	b545f225a5	Style pin icon more better	2026-04-08 17:10:12 +00:00
mplorentz	1ccd6070df	Style voice widget icons to be less red	2026-04-08 17:10:12 +00:00
mplorentz	2661f449dd	Add video settings to VoiceCallAudioSettingsDialog	2026-04-08 17:10:12 +00:00
mplorentz	9e4ac16673	Fix merge artifacts	2026-04-08 17:10:12 +00:00
mplorentz	236b9e011e	Add settings button to configure audio devices in call	2026-04-08 17:10:12 +00:00
mplorentz	8f6f628bd7	Change screen sharing icon	2026-04-08 17:10:12 +00:00
mplorentz	7c27846d0d	Improve pinned video layout	2026-04-08 17:10:12 +00:00
mplorentz	9b080996d0	Add a button to spotlight a video feed	2026-04-08 17:10:12 +00:00
mplorentz	4e23fb3bba	Add basic screen sharing	2026-04-08 17:10:12 +00:00
mplorentz	9f6b16089b	add video to livekit calls	2026-04-08 17:10:12 +00:00