merge upstream

fix: stabilize list loading and show correct list count
merge upstream
2026-04-14 15:38:42 +00:00 · 2026-04-14 19:45:38 +05:30 · 2026-04-14 13:42:38 +00:00 · 2026-04-13 21:19:44 +00:00 · 2026-04-14 01:21:27 +05:30
95 changed files with 2590 additions and 1468 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
@@ -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
@@ -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')
@@ -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",
@@ -56,12 +55,10 @@
    "@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",
    "@poppanator/sveltekit-svg": "^4.2.1",
@@ -72,25 +69,22 @@
    "@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 +107,5 @@
    "overrides": {
      "sharp": "0.35.0-rc.0"
    }
-  },
-  "packageManager": "pnpm@10.33.0+sha512.10568bb4a6afb58c9eb3630da90cc9516417abebd3fabbe6739f0ae795728da1491e9db5a544c76ad8eb7570f5c4bb3d6c637b2cb41bfdcdb47fa823c8649319"
+  }
 }
@@ -47,9 +47,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 +59,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))
+        version: 0.2.3(@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))
@@ -96,38 +90,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(2f5bd20a84c8c39e26176b5a5db083ae)
      '@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 +134,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
@@ -853,11 +838,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 +1088,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'}
@@ -2168,83 +2142,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 +2457,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 +2816,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 +2833,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 +3226,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 +3233,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 +3241,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 +4007,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 +4448,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 +4883,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 +5001,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==}

@@ -6104,10 +6021,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 +6216,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 +6625,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.3(@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 +7291,26 @@ snapshots:
    optionalDependencies:
      '@vite-pwa/assets-generator': 0.2.6

-  '@welshman/app@0.8.15(ff026297546a8274624eb18a0ea86191)':
+  '@welshman/app@0.8.12(2f5bd20a84c8c39e26176b5a5db083ae)':
    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.3(@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 +7325,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 +7630,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 +8016,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 +8029,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 +8538,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 +9254,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 +9692,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 +10217,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 +10297,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,24 +416,12 @@ progress[value]::-webkit-progress-value {
  @apply md:left-[calc(18.5rem+var(--sail))];
 }

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

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

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

 .chat__compose {
@@ -2,18 +2,15 @@
 <html lang="en">
  <head>
    <meta charset="utf-8" />
-    <title>{NAME}</title>
-    <link rel="canonical" href="{URL}" />
    <meta
      name="viewport"
      content="width=device-width, initial-scale=1.0, viewport-fit=cover, interactive-widget=resizes-content" />
    <meta name="theme-color" content="{ACCENT}" />
    <meta name="description" content="{DESCRIPTION}" />
-    <meta property="og:url" content="{URL}" />
-    <meta property="og:type" content="website" />
-    <meta property="og:title" content="{NAME}" />
-    <meta property="og:description" content="{DESCRIPTION}" />
-    <meta property="og:image" content="" />
+    <meta name="og:url" content="{URL}" />
+    <meta name="og:type" content="website" />
+    <meta name="og:title" content="{NAME}" />
+    <meta name="og:description" content="{DESCRIPTION}" />
    <meta name="twitter:card" content="summary" />
    <meta name="twitter:site" content="{URL}" />
    <meta name="twitter:title" content="{NAME}" />
@@ -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),
@@ -0,0 +1,142 @@
+<script lang="ts">
+  import type {TrustedEvent} from "@welshman/util"
+  import {displayPubkey} from "@welshman/util"
+  import {formatTimestamp} from "@welshman/lib"
+  import {displayProfileByPubkey} from "@welshman/app"
+  import Button from "@lib/components/Button.svelte"
+  import Icon from "@lib/components/Icon.svelte"
+  import Link from "@lib/components/Link.svelte"
+  import ProfileCircle from "@app/components/ProfileCircle.svelte"
+  import NoteContentMinimal from "@app/components/NoteContentMinimal.svelte"
+  import ContentLinkBlockImage from "@app/components/ContentLinkBlockImage.svelte"
+  import MenuDots from "@assets/icons/menu-dots.svg?dataurl"
+
+  type BookmarkItem = {
+    key: string
+    event: TrustedEvent
+    href: string
+    external: boolean
+    image: string | undefined
+    video: string | undefined
+    contentType: "image" | "video" | "text"
+    preview: string
+    pollOptions: string[]
+    searchable: string
+  }
+
+  type Props = {
+    item: BookmarkItem
+    showAddToSaved: boolean
+    onOpen: (item: BookmarkItem) => Promise<void> | void
+    onCopyLink: (item: BookmarkItem) => Promise<void> | void
+    onAddToSaved: (item: BookmarkItem) => Promise<void> | void
+    onRemove: (item: BookmarkItem) => Promise<void> | void
+  }
+
+  const {item, showAddToSaved, onOpen, onCopyLink, onAddToSaved, onRemove}: Props = $props()
+
+  let openMenu = $state(false)
+
+  const closeMenu = () => {
+    openMenu = false
+  }
+
+  const toggleMenu = (event: Event) => {
+    event.preventDefault()
+    event.stopPropagation()
+    openMenu = !openMenu
+  }
+
+  const openItem = async (event: Event) => {
+    event.preventDefault()
+    event.stopPropagation()
+    closeMenu()
+    await onOpen(item)
+  }
+
+  const copyLink = async (event: Event) => {
+    event.preventDefault()
+    event.stopPropagation()
+    closeMenu()
+    await onCopyLink(item)
+  }
+
+  const addToSaved = async (event: Event) => {
+    event.preventDefault()
+    event.stopPropagation()
+    closeMenu()
+    await onAddToSaved(item)
+  }
+
+  const removeFromList = async (event: Event) => {
+    event.preventDefault()
+    event.stopPropagation()
+    closeMenu()
+    await onRemove(item)
+  }
+</script>
+
+<svelte:window onclick={closeMenu} />
+
+<Link
+  href={item.href}
+  external={item.external}
+  class="card2 bg-alt col-2 w-full gap-3 p-3 transition-colors hover:bg-base-100 md:w-[calc(50%-0.375rem)] xl:w-[calc(33.333%-0.5rem)]">
+  <div class="flex items-start justify-between gap-2">
+    <div class="flex min-w-0 items-center gap-2">
+      <ProfileCircle pubkey={item.event.pubkey} size={5} />
+      <div class="min-w-0">
+        <p class="truncate text-sm font-semibold text-primary">
+          {displayProfileByPubkey(item.event.pubkey)}
+        </p>
+        <p class="truncate text-[11px] opacity-60">
+          {displayPubkey(item.event.pubkey)} · {formatTimestamp(item.event.created_at)}
+        </p>
+      </div>
+    </div>
+
+    <div class="relative" role="presentation">
+      <Button class="btn btn-ghost btn-xs btn-square" onclick={toggleMenu}>
+        <Icon size={4} icon={MenuDots} />
+      </Button>
+
+      {#if openMenu}
+        <ul
+          class="menu absolute right-0 top-7 z-popover w-44 rounded-box bg-base-100 p-2 shadow-xl"
+          role="menu">
+          <li>
+            <Button class="justify-start" onclick={openItem}>Open bookmark</Button>
+          </li>
+          <li>
+            <Button class="justify-start" onclick={copyLink}>Copy link</Button>
+          </li>
+          {#if showAddToSaved}
+            <li>
+              <Button class="justify-start" onclick={addToSaved}>Add to Saved Items</Button>
+            </li>
+          {/if}
+          <li>
+            <Button class="justify-start text-error" onclick={removeFromList}
+              >Remove from this list</Button>
+          </li>
+        </ul>
+      {/if}
+    </div>
+  </div>
+
+  {#if item.image}
+    <ContentLinkBlockImage
+      value={{url: item.image}}
+      event={item.event}
+      class="max-h-[28rem] w-full rounded-lg object-contain" />
+  {:else if item.video}
+    <video
+      src={item.video}
+      class="max-h-[28rem] w-full rounded-lg object-contain"
+      muted
+      playsinline
+      preload="metadata"></video>
+  {/if}
+
+  <NoteContentMinimal event={item.event} />
+</Link>
@@ -0,0 +1,23 @@
+<script lang="ts">
+  import type {TrustedEvent} from "@welshman/util"
+  import Button from "@lib/components/Button.svelte"
+  import Icon from "@lib/components/Icon.svelte"
+  import Bookmark from "@assets/icons/bookmark.svg?dataurl"
+  import BookmarkListPicker from "@app/components/BookmarkListPicker.svelte"
+  import {pushModal} from "@app/util/modal"
+
+  type Props = {
+    event: TrustedEvent
+  }
+
+  const {event}: Props = $props()
+
+  const bookmark = () => pushModal(BookmarkListPicker, {event})
+</script>
+
+<li>
+  <Button onclick={bookmark}>
+    <Icon size={4} icon={Bookmark} />
+    Bookmark
+  </Button>
+</li>
@@ -0,0 +1,38 @@
+<script lang="ts">
+  import type {TrustedEvent} from "@welshman/util"
+  import BookmarkCard from "@app/components/BookmarkCard.svelte"
+
+  type BookmarkItem = {
+    key: string
+    event: TrustedEvent
+    href: string
+    external: boolean
+    image: string | undefined
+    video: string | undefined
+    contentType: "image" | "video" | "text"
+    preview: string
+    pollOptions: string[]
+    searchable: string
+  }
+
+  type Props = {
+    items: BookmarkItem[]
+    showAddToSaved: boolean
+    onOpen: (item: BookmarkItem) => Promise<void> | void
+    onCopyLink: (item: BookmarkItem) => Promise<void> | void
+    onAddToSaved: (item: BookmarkItem) => Promise<void> | void
+    onRemove: (item: BookmarkItem) => Promise<void> | void
+  }
+
+  const {items, showAddToSaved, onOpen, onCopyLink, onAddToSaved, onRemove}: Props = $props()
+</script>
+
+<div class="flex w-full flex-wrap content-start items-stretch gap-3">
+  {#each items as item (item.key)}
+    <BookmarkCard {item} {showAddToSaved} {onOpen} {onCopyLink} {onAddToSaved} {onRemove} />
+  {:else}
+    <div class="card2 bg-alt col-2 max-w-lg p-5 text-sm opacity-80">
+      No items match your current filters.
+    </div>
+  {/each}
+</div>
@@ -0,0 +1,304 @@
+<script lang="ts">
+  import {onMount} from "svelte"
+  import {first, uniqBy} from "@welshman/lib"
+  import type {TrustedEvent} from "@welshman/util"
+  import {
+    Address,
+    DELETE,
+    getAddress,
+    getTagValue,
+    getTagValues,
+    sortEventsDesc,
+  } from "@welshman/util"
+  import {load} from "@welshman/net"
+  import {pubkey, waitForThunkError} from "@welshman/app"
+  import Bookmark from "@assets/icons/bookmark.svg?dataurl"
+  import Folder from "@assets/icons/folder.svg?dataurl"
+  import Add from "@assets/icons/add.svg?dataurl"
+  import TrashBinMinimalistic from "@assets/icons/trash-bin-minimalistic.svg?dataurl"
+  import Icon from "@lib/components/Icon.svelte"
+  import Button from "@lib/components/Button.svelte"
+  import Field from "@lib/components/Field.svelte"
+  import Modal from "@lib/components/Modal.svelte"
+  import ModalBody from "@lib/components/ModalBody.svelte"
+  import ModalHeader from "@lib/components/ModalHeader.svelte"
+  import ModalTitle from "@lib/components/ModalTitle.svelte"
+  import ModalFooter from "@lib/components/ModalFooter.svelte"
+  import {createBookmarkList, addEventBookmark, deleteBookmarkList} from "@app/core/commands"
+  import {
+    BOOKMARKS,
+    BOOKMARK_LISTS,
+    deriveEvents,
+    INDEXER_RELAYS,
+    shouldIgnoreError,
+  } from "@app/core/state"
+  import {pushToast} from "@app/util/toast"
+
+  type Props = {
+    event?: TrustedEvent
+  }
+
+  type BookmarkList = {
+    key: string
+    label: string
+    count: number
+  }
+
+  const {event}: Props = $props()
+
+  const listEvents = deriveEvents([{kinds: [10003, 30003, DELETE]}])
+
+  const getListKey = (listEvent: TrustedEvent) =>
+    listEvent.kind === BOOKMARKS
+      ? new Address(BOOKMARKS, listEvent.pubkey, "").toString()
+      : getAddress(listEvent)
+
+  const getListLabel = (listEvent: TrustedEvent) =>
+    getTagValue("title", listEvent.tags) ||
+    getTagValue("d", listEvent.tags) ||
+    (listEvent.kind === BOOKMARKS ? "Saved Items" : "Untitled List")
+
+  const userLists = $derived(
+    sortEventsDesc($listEvents).filter(
+      listEvent => listEvent.pubkey === $pubkey && listEvent.kind !== DELETE,
+    ),
+  )
+
+  const userDeletes = $derived(
+    sortEventsDesc($listEvents).filter(
+      listEvent => listEvent.pubkey === $pubkey && listEvent.kind === DELETE,
+    ),
+  )
+
+  const isDeletedList = (listEvent: TrustedEvent) => {
+    const address = getListKey(listEvent)
+
+    return userDeletes.some(deleteEvent => {
+      if (deleteEvent.created_at < listEvent.created_at) {
+        return false
+      }
+
+      return (
+        getTagValues("e", deleteEvent.tags).includes(listEvent.id) ||
+        getTagValues("a", deleteEvent.tags).includes(address)
+      )
+    })
+  }
+
+  const lists = $derived.by(() => {
+    const uniqueEvents = uniqBy(getListKey, userLists).filter(
+      listEvent => !isDeletedList(listEvent),
+    )
+
+    const mapped = uniqueEvents.map(
+      (listEvent): BookmarkList => ({
+        key: getListKey(listEvent),
+        label: getListLabel(listEvent),
+        count: getTagValues(["e", "a", "p", "r"], listEvent.tags).length,
+      }),
+    )
+
+    const savedItems = first(mapped.filter(list => Address.from(list.key).kind === BOOKMARKS)) || {
+      key: $pubkey ? new Address(BOOKMARKS, $pubkey, "").toString() : "10003:",
+      label: "Saved Items",
+      count: 0,
+    }
+
+    return [savedItems, ...mapped.filter(list => Address.from(list.key).kind !== BOOKMARKS)]
+  })
+
+  let listName = $state("")
+  let creating = $state(false)
+  let selecting = $state(false)
+  let deleting = $state(false)
+  let loadedListPubkey: string | undefined = $state()
+
+  const close = () => history.back()
+
+  const isIgnorableBookmarkListError = (error: string) =>
+    shouldIgnoreError(error) || error.includes("only accepts kind 10002 events")
+
+  const createList = async () => {
+    if (!listName.trim() || creating) {
+      return
+    }
+
+    creating = true
+
+    try {
+      const thunk = await createBookmarkList(listName)
+
+      if (!thunk) {
+        pushToast({message: "List already exists"})
+        return
+      }
+
+      const error = await waitForThunkError(thunk)
+
+      if (error) {
+        pushToast({theme: "error", message: error})
+      } else {
+        pushToast({message: "List created"})
+        listName = ""
+      }
+    } finally {
+      creating = false
+    }
+  }
+
+  const addToList = async (key: string, label: string) => {
+    if (!event || selecting) {
+      return
+    }
+
+    selecting = true
+
+    try {
+      const thunk = await addEventBookmark(event, key)
+
+      if (!thunk) {
+        pushToast({message: "Already bookmarked"})
+        return
+      }
+
+      const error = await waitForThunkError(thunk)
+
+      if (error) {
+        pushToast({theme: "error", message: error})
+      } else {
+        pushToast({message: `Saved to ${label}`})
+        close()
+      }
+    } finally {
+      selecting = false
+    }
+  }
+
+  const deleteList = async (key: string, label: string) => {
+    if (deleting || Address.from(key).kind === BOOKMARKS) {
+      return
+    }
+
+    if (!confirm(`Delete \"${label}\"? This cannot be undone.`)) {
+      return
+    }
+
+    deleting = true
+
+    try {
+      const thunk = await deleteBookmarkList(key)
+
+      if (!thunk) {
+        pushToast({theme: "error", message: "Unable to delete this list"})
+        return
+      }
+
+      const error = await waitForThunkError(thunk)
+
+      if (error && !isIgnorableBookmarkListError(error)) {
+        pushToast({theme: "error", message: error})
+      } else {
+        pushToast({message: `Deleted ${label}`})
+      }
+    } finally {
+      deleting = false
+    }
+  }
+
+  const loadBookmarkLists = async () => {
+    if (!$pubkey || loadedListPubkey === $pubkey) {
+      return
+    }
+
+    loadedListPubkey = $pubkey
+
+    await load({
+      relays: INDEXER_RELAYS,
+      filters: [{kinds: [BOOKMARKS, BOOKMARK_LISTS, DELETE], authors: [$pubkey]}],
+    })
+  }
+
+  onMount(() => {
+    void loadBookmarkLists()
+  })
+
+  $effect(() => {
+    if ($pubkey && loadedListPubkey !== $pubkey) {
+      void loadBookmarkLists()
+    }
+  })
+</script>
+
+<Modal>
+  <ModalBody>
+    <ModalHeader>
+      <ModalTitle>{event ? "Add to Bookmark List" : "Manage Bookmark Lists"}</ModalTitle>
+    </ModalHeader>
+
+    <div class="col-2 gap-3">
+      <Field>
+        {#snippet label()}
+          New list name
+        {/snippet}
+        {#snippet input()}
+          <div class="row-2 min-w-0 grow gap-2">
+            <label class="input input-bordered flex grow items-center gap-2">
+              <Icon icon={Folder} />
+              <input bind:value={listName} class="grow" type="text" placeholder="e.g. AI threads" />
+            </label>
+            <Button
+              class="btn btn-neutral"
+              onclick={createList}
+              disabled={creating || !listName.trim()}>
+              <Icon icon={Add} />
+              Create
+            </Button>
+          </div>
+        {/snippet}
+      </Field>
+
+      <div class="col-2 gap-2">
+        {#each lists as list (list.key)}
+          {#if event}
+            <Button
+              class="card2 card2-sm bg-alt flex items-center justify-between"
+              onclick={() => addToList(list.key, list.label)}
+              disabled={selecting}>
+              <span class="inline-flex items-center gap-2">
+                <Icon
+                  size={4}
+                  icon={Address.from(list.key).kind === BOOKMARKS ? Bookmark : Folder} />
+                {list.label}
+              </span>
+              <span class="badge badge-sm badge-neutral">{list.count}</span>
+            </Button>
+          {:else}
+            <div class="card2 card2-sm bg-alt flex items-center justify-between gap-2">
+              <span class="min-w-0 truncate inline-flex items-center gap-2">
+                <Icon
+                  size={4}
+                  icon={Address.from(list.key).kind === BOOKMARKS ? Bookmark : Folder} />
+                {list.label}
+              </span>
+              <div class="flex items-center gap-2">
+                <span class="badge badge-sm badge-neutral">{list.count}</span>
+                {#if Address.from(list.key).kind !== BOOKMARKS}
+                  <Button
+                    class="btn btn-ghost btn-xs btn-square text-error"
+                    onclick={() => deleteList(list.key, list.label)}
+                    disabled={deleting}>
+                    <Icon size={4} icon={TrashBinMinimalistic} />
+                  </Button>
+                {/if}
+              </div>
+            </div>
+          {/if}
+        {/each}
+      </div>
+    </div>
+  </ModalBody>
+
+  <ModalFooter>
+    <Button class="btn btn-link" onclick={close}>Close</Button>
+  </ModalFooter>
+</Modal>
@@ -0,0 +1,247 @@
+<script lang="ts">
+  import {type TrustedEvent} from "@welshman/util"
+  import Button from "@lib/components/Button.svelte"
+  import Icon from "@lib/components/Icon.svelte"
+  import Link from "@lib/components/Link.svelte"
+  import SecondaryNav from "@lib/components/SecondaryNav.svelte"
+  import SecondaryNavHeader from "@lib/components/SecondaryNavHeader.svelte"
+  import SecondaryNavSection from "@lib/components/SecondaryNavSection.svelte"
+  import Bookmark from "@assets/icons/bookmark.svg?dataurl"
+  import Folder from "@assets/icons/folder.svg?dataurl"
+  import Add from "@assets/icons/add.svg?dataurl"
+
+  type BookmarkList = {
+    key: string
+    label: string
+    count: number
+    event?: TrustedEvent
+  }
+
+  type Props = {
+    lists: BookmarkList[]
+    selectedKey: string
+    totalCount: number
+    onOpenManager: () => void
+    onSelect: (key: string) => void
+    onRename: (key: string, label: string, nextLabel: string) => Promise<void>
+    onDelete: (key: string, label: string) => Promise<void>
+  }
+
+  const {lists, selectedKey, totalCount, onOpenManager, onSelect, onRename, onDelete}: Props =
+    $props()
+
+  let menuOpen = $state(false)
+  let menuX = $state(0)
+  let menuY = $state(0)
+  let menuListKey = $state("")
+  let menuListLabel = $state("")
+  let listDialogMode: "rename" | "delete" | undefined = $state()
+  let dialogListKey = $state("")
+  let dialogListLabel = $state("")
+  let nextListLabel = $state("")
+  let dialogPending = $state(false)
+
+  const closeMenu = () => {
+    menuOpen = false
+  }
+
+  const openListMenu = (event: MouseEvent, key: string, label: string) => {
+    event.preventDefault()
+    menuOpen = true
+    menuX = event.clientX
+    menuY = event.clientY
+    menuListKey = key
+    menuListLabel = label
+  }
+
+  const openMenuList = () => {
+    closeMenu()
+    onSelect(menuListKey)
+  }
+
+  const openRenameDialog = () => {
+    closeMenu()
+    listDialogMode = "rename"
+    dialogListKey = menuListKey
+    dialogListLabel = menuListLabel
+    nextListLabel = menuListLabel
+  }
+
+  const openDeleteDialog = () => {
+    closeMenu()
+    listDialogMode = "delete"
+    dialogListKey = menuListKey
+    dialogListLabel = menuListLabel
+    nextListLabel = menuListLabel
+  }
+
+  const closeDialog = (force = false) => {
+    if (!force && dialogPending) {
+      return
+    }
+
+    listDialogMode = undefined
+    dialogListKey = ""
+    dialogListLabel = ""
+    nextListLabel = ""
+  }
+
+  const submitRename = async () => {
+    if (listDialogMode !== "rename") {
+      return
+    }
+
+    dialogPending = true
+
+    try {
+      await onRename(dialogListKey, dialogListLabel, nextListLabel)
+      closeDialog(true)
+    } finally {
+      dialogPending = false
+    }
+  }
+
+  const submitDelete = async () => {
+    if (listDialogMode !== "delete") {
+      return
+    }
+
+    dialogPending = true
+
+    try {
+      await onDelete(dialogListKey, dialogListLabel)
+      closeDialog(true)
+    } finally {
+      dialogPending = false
+    }
+  }
+
+  const handleWindowKeydown = (event: KeyboardEvent) => {
+    if (event.key === "Escape") {
+      closeMenu()
+      closeDialog()
+    }
+  }
+</script>
+
+<svelte:window onclick={closeMenu} onkeydown={handleWindowKeydown} />
+
+<SecondaryNav class="relative">
+  <SecondaryNavSection>
+    <SecondaryNavHeader>
+      <span class="flex items-center gap-2 uppercase tracking-wide">
+        <Icon icon={Bookmark} />
+        Bookmarks
+      </span>
+      <span class="badge badge-sm badge-neutral">{totalCount}</span>
+    </SecondaryNavHeader>
+    <div
+      class="flex items-center justify-between px-1 pt-1 text-xs uppercase tracking-wide opacity-70">
+      <span>My Lists</span>
+      <Button class="btn btn-ghost btn-xs btn-square" onclick={onOpenManager}>
+        <Icon size={3.5} icon={Add} />
+      </Button>
+    </div>
+  </SecondaryNavSection>
+
+  <div class="col-2 gap-2 overflow-y-auto px-2 pb-2">
+    {#each lists as list (list.key)}
+      <div
+        role="button"
+        tabindex="-1"
+        oncontextmenu={event => openListMenu(event, list.key, list.label)}>
+        <Link href={`/bookmarks?list=${encodeURIComponent(list.key)}`}>
+          <div
+            class={`card2 card2-sm bg-alt col-2 gap-1 transition-colors hover:bg-base-100 ${selectedKey === list.key ? "bg-base-100" : ""}`}>
+            <div class="flex items-center justify-between gap-2">
+              <p class="truncate font-medium">
+                <span class="inline-flex items-center gap-2">
+                  <Icon size={4} icon={list.key.startsWith("10003:") ? Bookmark : Folder} />
+                  {list.label}
+                </span>
+              </p>
+              <span class="badge badge-sm badge-neutral">{list.count}</span>
+            </div>
+          </div>
+        </Link>
+      </div>
+    {:else}
+      <div class="card2 card2-sm bg-alt text-sm opacity-70">No lists found yet.</div>
+    {/each}
+  </div>
+
+  {#if menuOpen}
+    <div class="fixed inset-0 z-popover" role="presentation">
+      <div
+        class="menu rounded-box bg-base-100 shadow-xl"
+        role="menu"
+        style={`position: fixed; left: ${menuX}px; top: ${menuY}px; min-width: 11rem;`}>
+        <li>
+          <Button class="justify-start" onclick={openMenuList}>Open List</Button>
+        </li>
+        {#if menuListKey !== selectedKey}
+          <li>
+            <Button class="justify-start" onclick={openRenameDialog}>Rename List</Button>
+          </li>
+          <li>
+            <Button class="justify-start text-error" onclick={openDeleteDialog}>Delete List</Button>
+          </li>
+        {/if}
+      </div>
+    </div>
+  {/if}
+
+  {#if listDialogMode}
+    <div class="fixed inset-0 z-modal bg-black/45 p-4 md:p-6">
+      <button
+        type="button"
+        class="absolute inset-0"
+        aria-label="Close dialog"
+        onclick={() => closeDialog()}></button>
+      <div class="center relative h-full w-full">
+        <div
+          class="card2 bg-base-100 w-full max-w-md gap-4 p-5 shadow-2xl"
+          role="dialog"
+          aria-modal="true"
+          tabindex="-1">
+          {#if listDialogMode === "rename"}
+            <div class="col-2 gap-1">
+              <h3 class="text-lg font-semibold">Rename List</h3>
+              <p class="text-sm opacity-70">Choose a new name for "{dialogListLabel}".</p>
+            </div>
+
+            <label class="input input-bordered flex items-center gap-2">
+              <Icon icon={Folder} />
+              <input bind:value={nextListLabel} class="grow" type="text" placeholder="List name" />
+            </label>
+
+            <div class="flex items-center justify-end gap-2">
+              <Button class="btn btn-ghost" onclick={() => closeDialog()} disabled={dialogPending}
+                >Cancel</Button>
+              <Button
+                class="btn btn-neutral"
+                onclick={submitRename}
+                disabled={dialogPending || !nextListLabel.trim()}>
+                Save
+              </Button>
+            </div>
+          {:else}
+            <div class="col-2 gap-1">
+              <h3 class="text-lg font-semibold">Delete List?</h3>
+              <p class="text-sm opacity-70">
+                This will remove "{dialogListLabel}" and cannot be undone.
+              </p>
+            </div>
+
+            <div class="flex items-center justify-end gap-2">
+              <Button class="btn btn-ghost" onclick={() => closeDialog()} disabled={dialogPending}
+                >Cancel</Button>
+              <Button class="btn btn-error" onclick={submitDelete} disabled={dialogPending}
+                >Delete</Button>
+            </div>
+          {/if}
+        </div>
+      </div>
+    </div>
+  {/if}
+</SecondaryNav>
@@ -12,6 +12,7 @@
  import EventActivity from "@app/components/EventActivity.svelte"
  import EventActions from "@app/components/EventActions.svelte"
  import CalendarEventEdit from "@app/components/CalendarEventEdit.svelte"
+  import BookmarkEventMenuItem from "@app/components/BookmarkEventMenuItem.svelte"
  import {publishDelete, publishReaction, canEnforceNip70} from "@app/core/commands"
  import {makeCalendarPath, makeSpacePath} from "@app/util/routes"
  import {pushModal} from "@app/util/modal"
@@ -51,6 +52,7 @@
  {/if}
  <EventActions {url} {event} noun="Event">
    {#snippet customActions()}
+      <BookmarkEventMenuItem {event} />
      {#if event.pubkey === $pubkey}
        <li>
          <Button onclick={editEvent}>
@@ -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)}
@@ -1,6 +1,7 @@
 <script lang="ts">
  import type {Snippet} from "svelte"
-  import {onMount} from "svelte"
+  import {onMount, tick} from "svelte"
+  import {page} from "$app/stores"
  import {goto} from "$app/navigation"
  import {
    ago,
@@ -53,7 +54,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 +67,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)))

@@ -199,6 +199,71 @@
  let compose: ChatCompose | undefined = $state()
  let parent: TrustedEvent | undefined = $state()
  let eventToEdit: TrustedEvent | undefined = $state()
+  let userHasScrolled = $state(false)
+  let isProgrammaticScroll = $state(false)
+  let programmaticScrollTimeout: ReturnType<typeof setTimeout>
+
+  const at = $derived(parseInt($page.url.searchParams.get("at")!))
+  const targetId = $derived($page.url.searchParams.get("e"))
+
+  $effect(() => {
+    void at
+    void targetId
+    userHasScrolled = false
+  })
+
+  const manageScrollPosition = () => {
+    if (!userHasScrolled && (!isNaN(at) || targetId)) {
+      const targetEvent = targetId
+        ? ($chat?.messages || []).find(event => event.id === targetId)
+        : sortBy(e => -e.created_at, $chat?.messages || []).find(event => event.created_at <= at)
+
+      if (targetEvent) {
+        const target = document.querySelector(`[data-event="${targetEvent.id}"]`)
+
+        if (target instanceof HTMLElement) {
+          isProgrammaticScroll = true
+          clearTimeout(programmaticScrollTimeout)
+          programmaticScrollTimeout = setTimeout(() => {
+            isProgrammaticScroll = false
+          }, 300)
+
+          target.scrollIntoView({block: "center"})
+
+          if (target.dataset.highlighted !== "true") {
+            target.dataset.highlighted = "true"
+            target.style.filter = "brightness(1.5)"
+            target.style.transitionProperty = "all"
+            target.style.transitionDuration = "400ms"
+
+            setTimeout(() => {
+              target.style.transitionDuration = "300ms"
+              target.style.filter = ""
+            }, 800)
+          }
+        }
+      }
+    }
+  }
+
+  let isInteracting = false
+  let interactionTimeout: ReturnType<typeof setTimeout>
+  const markInteraction = () => {
+    isInteracting = true
+    clearTimeout(interactionTimeout)
+    interactionTimeout = setTimeout(() => {
+      isInteracting = false
+    }, 500)
+  }
+
+  const onScroll = () => {
+    if (!isProgrammaticScroll) {
+      if (isInteracting) {
+        userHasScrolled = true
+      }
+      manageScrollPosition()
+    }
+  }

  const elements = $derived.by(() => {
    const elements = []
@@ -230,6 +295,11 @@
    return elements.reverse()
  })

+  $effect(() => {
+    void elements
+    tick().then(manageScrollPosition)
+  })
+
  onMount(() => {
    for (const pubkey of others) {
      loadMessagingRelayList(pubkey)
@@ -280,7 +350,20 @@
  </div>
 </PageBar>

-<PageContent class="flex flex-col-reverse gap-2 py-4">
+<PageContent
+  onscroll={onScroll}
+  onwheel={markInteraction}
+  ontouchmove={markInteraction}
+  onpointerdown={markInteraction}
+  onpointermove={(e: PointerEvent) => {
+    if (e.buttons > 0) markInteraction()
+  }}
+  onkeydown={(e: KeyboardEvent) => {
+    if (["ArrowUp", "ArrowDown", "PageUp", "PageDown", "Home", "End", " "].includes(e.key)) {
+      markInteraction()
+    }
+  }}
+  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">
@@ -2,8 +2,10 @@
  import Icon from "@lib/components/Icon.svelte"
  import Button from "@lib/components/Button.svelte"
  import ChatMessageEmojiButton from "@app/components/ChatMessageEmojiButton.svelte"
+  import BookmarkListPicker from "@app/components/BookmarkListPicker.svelte"
  import EventInfo from "@app/components/EventInfo.svelte"
  import {pushModal} from "@app/util/modal"
+  import Bookmark from "@assets/icons/bookmark.svg?dataurl"
  import Pen from "@assets/icons/pen.svg?dataurl"
  import Reply from "@assets/icons/reply-2.svg?dataurl"
  import Code2 from "@assets/icons/code-2.svg?dataurl"
@@ -17,6 +19,11 @@
    popover.hide()
    pushModal(EventInfo, {event})
  }
+
+  const bookmark = () => {
+    popover.hide()
+    pushModal(BookmarkListPicker, {event})
+  }
 </script>

 <div class="join border border-solid border-neutral text-xs">
@@ -31,6 +38,9 @@
      <Icon size={4} icon={Pen} />
    </Button>
  {/if}
+  <Button class="btn join-item btn-xs" onclick={bookmark}>
+    <Icon size={4} icon={Bookmark} />
+  </Button>
  <Button class="btn join-item btn-xs" onclick={showInfo}>
    <Icon size={4} icon={Code2} />
  </Button>
@@ -12,10 +12,12 @@
  import ModalBody from "@lib/components/ModalBody.svelte"
  import Button from "@lib/components/Button.svelte"
  import EmojiPicker from "@lib/components/EmojiPicker.svelte"
+  import BookmarkListPicker from "@app/components/BookmarkListPicker.svelte"
  import EventInfo from "@app/components/EventInfo.svelte"
  import {makeReaction} from "@app/core/commands"
  import {pushModal} from "@app/util/modal"
  import {clip} from "@app/util/toast"
+  import Bookmark from "@assets/icons/bookmark.svg?dataurl"

  type Props = {
    pubkeys: string[]
@@ -52,6 +54,11 @@
    clip(event.content)
  }

+  const bookmarkMessage = () => {
+    history.back()
+    pushModal(BookmarkListPicker, {event}, {replaceState: true})
+  }
+
  const showInfo = () => pushModal(EventInfo, {event}, {replaceState: true})
 </script>

@@ -66,6 +73,10 @@
        <Icon size={4} icon={Copy} />
        Copy Text
      </Button>
+      <Button class="btn btn-neutral w-full" onclick={bookmarkMessage}>
+        <Icon size={4} icon={Bookmark} />
+        Bookmark Message
+      </Button>
      <Button class="btn btn-neutral w-full" onclick={sendReply}>
        <Icon size={4} icon={Reply} />
        Send Reply
@@ -15,6 +15,7 @@
  import EventActivity from "@app/components/EventActivity.svelte"
  import EventActions from "@app/components/EventActions.svelte"
  import ClassifiedEdit from "@app/components/ClassifiedEdit.svelte"
+  import BookmarkEventMenuItem from "@app/components/BookmarkEventMenuItem.svelte"
  import {publishDelete, publishReaction, canEnforceNip70} from "@app/core/commands"
  import {makeClassifiedPath, makeSpacePath} from "@app/util/routes"
  import {pushModal} from "@app/util/modal"
@@ -64,6 +65,7 @@
  {/if}
  <EventActions {url} {event} noun="Listing">
    {#snippet customActions()}
+      <BookmarkEventMenuItem {event} />
      {#if event.pubkey === $pubkey}
        <li>
          <Button onclick={editClassified}>
@@ -4,6 +4,7 @@
  import ThunkStatusOrDeleted from "@app/components/ThunkStatusOrDeleted.svelte"
  import EventActivity from "@app/components/EventActivity.svelte"
  import EventActions from "@app/components/EventActions.svelte"
+  import BookmarkEventMenuItem from "@app/components/BookmarkEventMenuItem.svelte"
  import {publishDelete, publishReaction, canEnforceNip70} from "@app/core/commands"
  import {makeSpacePath} from "@app/util/routes"

@@ -34,6 +35,10 @@
    {#if showActivity}
      <EventActivity {url} {path} {event} />
    {/if}
-    <EventActions {url} {event} noun="Comment" />
+    <EventActions {url} {event} noun="Comment">
+      {#snippet customActions()}
+        <BookmarkEventMenuItem {event} />
+      {/snippet}
+    </EventActions>
  </div>
 </div>
@@ -6,7 +6,6 @@
    truncate,
    renderAsHtml,
    isText,
-    isEmail,
    isEmoji,
    isTopic,
    isCode,
@@ -27,7 +26,6 @@
  import Button from "@lib/components/Button.svelte"
  import ContentToken from "@app/components/ContentToken.svelte"
  import ContentEmoji from "@app/components/ContentEmoji.svelte"
-  import ContentEmail from "@app/components/ContentEmail.svelte"
  import ContentCode from "@app/components/ContentCode.svelte"
  import ContentLinkInline from "@app/components/ContentLinkInline.svelte"
  import ContentLinkBlock from "@app/components/ContentLinkBlock.svelte"
@@ -161,8 +159,6 @@
          <ContentTopic value={parsed.value} />
        {:else if isEmoji(parsed)}
          <ContentEmoji value={parsed.value} />
-        {:else if isEmail(parsed)}
-          <ContentEmail value={parsed.value} />
        {:else if isCode(parsed)}
          <ContentCode
            value={parsed.value}
@@ -1,12 +0,0 @@
-<script lang="ts">
-  import LinkRound from "@assets/icons/link-round.svg?dataurl"
-  import Icon from "@lib/components/Icon.svelte"
-  import Link from "@lib/components/Link.svelte"
-
-  export let value: string
-</script>
-
-<Link external href="mailto:{value}">
-  <Icon icon={LinkRound} size={3} />
-  {value}
-</Link>
@@ -7,7 +7,6 @@
    renderAsHtml,
    isText,
    isEmoji,
-    isEmail,
    isTopic,
    isCode,
    isCashu,
@@ -25,7 +24,6 @@
  import Button from "@lib/components/Button.svelte"
  import ContentToken from "@app/components/ContentToken.svelte"
  import ContentEmoji from "@app/components/ContentEmoji.svelte"
-  import ContentEmail from "@app/components/ContentEmail.svelte"
  import ContentCode from "@app/components/ContentCode.svelte"
  import ContentLinkInline from "@app/components/ContentLinkInline.svelte"
  import ContentNewline from "@app/components/ContentNewline.svelte"
@@ -111,8 +109,6 @@
          <ContentTopic value={parsed.value} />
        {:else if isEmoji(parsed)}
          <ContentEmoji value={parsed.value} />
-        {:else if isEmail(parsed)}
-          <ContentEmail value={parsed.value} />
        {:else if isCode(parsed)}
          <ContentCode
            value={parsed.value}
@@ -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>
@@ -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} />
@@ -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
    }
@@ -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 {makeEvent} from "@welshman/util"
  import {publishThunk, waitForThunkError} from "@welshman/app"
+  import {Poll} from "nostr-tools/kinds"
  import {isMobile, preventDefault} from "@lib/html"
  import AltArrowLeft from "@assets/icons/alt-arrow-left.svg?dataurl"
  import HamburgerMenu from "@assets/icons/hamburger-menu.svg?dataurl"
@@ -144,7 +145,7 @@

      const pollThunk = publishThunk({
        relays: [url],
-        event: makeEvent(POLL, {content: title.trim(), tags}),
+        event: makeEvent(Poll, {content: title.trim(), tags}),
      })

      const error = await waitForThunkError(pollThunk)
@@ -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)
@@ -1,17 +1,38 @@
 <script lang="ts">
  import type {Snippet} from "svelte"
-  import {userProfile} from "@welshman/app"
+  import {onMount} from "svelte"
+  import {uniqBy} from "@welshman/lib"
+  import type {TrustedEvent} from "@welshman/util"
+  import {
+    Address,
+    DELETE,
+    getAddress,
+    getTagValue,
+    getTagValues,
+    sortEventsDesc,
+  } from "@welshman/util"
+  import {load} from "@welshman/net"
+  import {pubkey, userProfile} from "@welshman/app"
  import Letter from "@assets/icons/letter.svg?dataurl"
+  import Bookmark from "@assets/icons/bookmark.svg?dataurl"
  import Magnifier from "@assets/icons/magnifier.svg?dataurl"
  import Widget from "@assets/icons/widget-4.svg?dataurl"
  import UserRounded from "@assets/icons/user-rounded.svg?dataurl"
  import Settings from "@assets/icons/settings.svg?dataurl"
  import ImageIcon from "@lib/components/ImageIcon.svelte"
-  import Divider from "@lib/components/Divider.svelte"
  import MenuSettings from "@app/components/MenuSettings.svelte"
  import PrimaryNavItem from "@lib/components/PrimaryNavItem.svelte"
  import PrimaryNavSpaces from "@app/components/PrimaryNavSpaces.svelte"
-  import {userSpaceUrls, PLATFORM_RELAYS} from "@app/core/state"
+  import {
+    BOOKMARKS,
+    BOOKMARK_LISTS,
+    deriveEvents,
+    INDEXER_RELAYS,
+    loadUserBookmarkCollections,
+    loadUserBookmarkList,
+    userSpaceUrls,
+    PLATFORM_RELAYS,
+  } from "@app/core/state"
  import {pushModal} from "@app/util/modal"
  import {notifications} from "@app/util/notifications"
  import {goToChat, makeSpacePath} from "@app/util/routes"
@@ -29,16 +50,91 @@
  const anySpaceNotifications = $derived(
    $userSpaceUrls.some(p => $notifications.has(makeSpacePath(p))),
  )
+
+  const bookmarkListEvents = deriveEvents([{kinds: [BOOKMARKS, BOOKMARK_LISTS, DELETE]}])
+  let loadedBookmarkCountPubkey: string | undefined = $state()
+
+  const getListKey = (event: TrustedEvent) =>
+    event.kind === BOOKMARKS
+      ? new Address(BOOKMARKS, event.pubkey, "").toString()
+      : getAddress(event)
+
+  const isDeletedList = (event: TrustedEvent, deleteEvents: TrustedEvent[]) => {
+    const address =
+      event.kind === BOOKMARKS
+        ? new Address(BOOKMARKS, event.pubkey, "").toString()
+        : `${event.kind}:${event.pubkey}:${getTagValue("d", event.tags) || ""}`
+
+    return deleteEvents.some(deleteEvent => {
+      if (deleteEvent.created_at < event.created_at) {
+        return false
+      }
+
+      return (
+        getTagValues("e", deleteEvent.tags).includes(event.id) ||
+        getTagValues("a", deleteEvent.tags).includes(address)
+      )
+    })
+  }
+
+  const bookmarkListCount = $derived.by(() => {
+    if (!$pubkey) {
+      return 0
+    }
+
+    const ownEvents = sortEventsDesc($bookmarkListEvents).filter(event => event.pubkey === $pubkey)
+    const deleteEvents = ownEvents.filter(event => event.kind === DELETE)
+    const listEvents = ownEvents.filter(
+      event => event.kind === BOOKMARKS || event.kind === BOOKMARK_LISTS,
+    )
+    const visibleLists = uniqBy(getListKey, listEvents).filter(
+      event => !isDeletedList(event, deleteEvents),
+    )
+    const hasSavedItems = visibleLists.some(event => event.kind === BOOKMARKS)
+
+    return visibleLists.length + (hasSavedItems ? 0 : 1)
+  })
+
+  const loadBookmarkCountData = async () => {
+    if (!$pubkey || loadedBookmarkCountPubkey === $pubkey) {
+      return
+    }
+
+    loadedBookmarkCountPubkey = $pubkey
+
+    await Promise.all([
+      loadUserBookmarkList(),
+      loadUserBookmarkCollections(),
+      load({
+        relays: INDEXER_RELAYS,
+        filters: [{kinds: [DELETE], authors: [$pubkey]}],
+      }),
+    ])
+  }
+
+  onMount(() => {
+    void loadBookmarkCountData()
+  })
+
+  $effect(() => {
+    if ($pubkey && loadedBookmarkCountPubkey !== $pubkey) {
+      void loadBookmarkCountData()
+    }
+  })
 </script>

 <div
  class="ml-sai mt-sai mb-sai relative z-popover isolate hidden w-14 shrink-0 bg-base-200 pt-2 md:block">
  <div class="flex h-full flex-col" class:justify-between={PLATFORM_RELAYS.length === 0}>
    <PrimaryNavSpaces />
-    {#if PLATFORM_RELAYS.length > 0}
-      <Divider />
-    {/if}
    <div class="flex flex-col">
+      <PrimaryNavItem title="Bookmarks" href="/bookmarks" prefix="/bookmarks">
+        <div class="relative">
+          <ImageIcon alt="Bookmarks" src={Bookmark} size={8} />
+          <span class="badge badge-xs badge-neutral absolute -right-2 -top-2"
+            >{bookmarkListCount}</span>
+        </div>
+      </PrimaryNavItem>
      <PrimaryNavItem title="Settings" href="/settings/profile" prefix="/settings">
        {#if $userProfile?.picture}
          <ImageIcon alt="Settings" src={$userProfile?.picture} class="rounded-full" size={10} />
@@ -78,6 +174,13 @@
        notification={$notifications.has("/chat")}>
        <ImageIcon alt="Messages" src={Letter} size={8} />
      </PrimaryNavItem>
+      <PrimaryNavItem title="Bookmarks" href="/bookmarks" prefix="/bookmarks">
+        <div class="relative">
+          <ImageIcon alt="Bookmarks" src={Bookmark} size={8} />
+          <span class="badge badge-xs badge-neutral absolute -right-2 -top-2"
+            >{bookmarkListCount}</span>
+        </div>
+      </PrimaryNavItem>
      {#if PLATFORM_RELAYS.length !== 1}
        <PrimaryNavItem title="Spaces" href="/spaces" notification={anySpaceNotifications}>
          <ImageIcon alt="Spaces" src={Widget} size={8} />
@@ -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>
@@ -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>
@@ -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()
@@ -3,14 +3,16 @@
  import {ManagementMethod} from "@welshman/util"
  import {pubkey, manageRelay, repository} from "@welshman/app"
  import Code2 from "@assets/icons/code-2.svg?dataurl"
+  import Bookmark from "@assets/icons/bookmark.svg?dataurl"
  import TrashBin2 from "@assets/icons/trash-bin-2.svg?dataurl"
  import Danger from "@assets/icons/danger.svg?dataurl"
  import Button from "@lib/components/Button.svelte"
  import Icon from "@lib/components/Icon.svelte"
  import Confirm from "@lib/components/Confirm.svelte"
+  import BookmarkListPicker from "@app/components/BookmarkListPicker.svelte"
  import EventInfo from "@app/components/EventInfo.svelte"
-  import Report from "@app/components/Report.svelte"
  import EventDeleteConfirm from "@app/components/EventDeleteConfirm.svelte"
+  import Report from "@app/components/Report.svelte"
  import {pushModal} from "@app/util/modal"
  import {pushToast} from "@app/util/toast"
  import {deriveUserIsSpaceAdmin} from "@app/core/state"
@@ -40,6 +42,11 @@
    pushModal(EventDeleteConfirm, {url, event})
  }

+  const bookmarkMessage = () => {
+    onClick()
+    pushModal(BookmarkListPicker, {event})
+  }
+
  const showAdminDelete = () =>
    pushModal(Confirm, {
      title: `Delete Message`,
@@ -68,6 +75,12 @@
      Show JSON
    </Button>
  </li>
+  <li>
+    <Button onclick={bookmarkMessage}>
+      <Icon size={4} icon={Bookmark} />
+      Bookmark Message
+    </Button>
+  </li>
  {#if event.pubkey === $pubkey}
    <li>
      <Button onclick={showDelete} class="text-error">
@@ -5,6 +5,7 @@
  import Bolt from "@assets/icons/bolt.svg?dataurl"
  import Reply from "@assets/icons/reply-2.svg?dataurl"
  import Code2 from "@assets/icons/code-2.svg?dataurl"
+  import Bookmark from "@assets/icons/bookmark.svg?dataurl"
  import TrashBin2 from "@assets/icons/trash-bin-2.svg?dataurl"
  import SmileCircle from "@assets/icons/smile-circle.svg?dataurl"
  import MenuDots from "@assets/icons/menu-dots.svg?dataurl"
@@ -14,13 +15,14 @@
  import Modal from "@lib/components/Modal.svelte"
  import ModalBody from "@lib/components/ModalBody.svelte"
  import EmojiPicker from "@lib/components/EmojiPicker.svelte"
-  import ZapButton from "@app/components/ZapButton.svelte"
-  import EventInfo from "@app/components/EventInfo.svelte"
+  import BookmarkListPicker from "@app/components/BookmarkListPicker.svelte"
  import EventDeleteConfirm from "@app/components/EventDeleteConfirm.svelte"
+  import EventInfo from "@app/components/EventInfo.svelte"
+  import ZapButton from "@app/components/ZapButton.svelte"
  import {ENABLE_ZAPS} from "@app/core/state"
-  import {publishReaction, canEnforceNip70} from "@app/core/commands"
-  import {getRoomItemPath} from "@app/util/routes"
+  import {canEnforceNip70, publishReaction} from "@app/core/commands"
  import {pushModal} from "@app/util/modal"
+  import {getRoomItemPath} from "@app/util/routes"

  type Props = {
    url: string
@@ -54,6 +56,11 @@
  const showInfo = () => pushModal(EventInfo, {url, event}, {replaceState: true})

  const showDelete = () => pushModal(EventDeleteConfirm, {url, event})
+
+  const bookmarkMessage = () => {
+    history.back()
+    pushModal(BookmarkListPicker, {event}, {replaceState: true})
+  }
 </script>

 <Modal>
@@ -69,6 +76,10 @@
        <Icon size={4} icon={Code2} />
        Message Info
      </Button>
+      <Button class="btn btn-neutral w-full" onclick={bookmarkMessage}>
+        <Icon size={4} icon={Bookmark} />
+        Bookmark Message
+      </Button>
      {#if path}
        <Link class="btn btn-neutral" href={path}>
          <Icon size={4} icon={MenuDots} />
@@ -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>
@@ -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"
@@ -263,7 +267,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
@@ -7,6 +7,7 @@
  import ThunkStatusOrDeleted from "@app/components/ThunkStatusOrDeleted.svelte"
  import EventActivity from "@app/components/EventActivity.svelte"
  import EventActions from "@app/components/EventActions.svelte"
+  import BookmarkEventMenuItem from "@app/components/BookmarkEventMenuItem.svelte"
  import {publishDelete, publishReaction, canEnforceNip70} from "@app/core/commands"
  import {makeThreadPath, makeSpacePath} from "@app/util/routes"

@@ -41,5 +42,9 @@
  {#if showActivity}
    <EventActivity {url} {path} {event} />
  {/if}
-  <EventActions {url} {event} noun="Thread" />
+  <EventActions {url} {event} noun="Thread">
+    {#snippet customActions()}
+      <BookmarkEventMenuItem {event} />
+    {/snippet}
+  </EventActions>
 </div>
@@ -14,10 +14,12 @@ import {
  simpleCache,
  normalizeUrl,
  nthNe,
+  randomId,
 } from "@welshman/lib"
 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,
@@ -32,17 +34,19 @@ import {
  ROOMS,
  COMMENT,
  APP_DATA,
-  POLL_RESPONSE,
  isSignedEvent,
  makeEvent,
  normalizeRelayUrl,
  makeList,
+  Address,
  addToListPublicly,
  removeFromListByPredicate,
  updateList,
  getTag,
+  getTagValue,
  getListTags,
  getRelayTagValues,
+  getEventTagValues,
  toNostrURI,
  RelayMode,
  getTagValues,
@@ -53,6 +57,7 @@ import {
  isPublishedProfile,
  editProfile,
  createProfile,
+  uniqTags,
  ManagementMethod,
 } from "@welshman/util"
 import {Pool, AuthStatus, SocketStatus} from "@welshman/net"
@@ -73,6 +78,7 @@ import {
  waitForThunkError,
  getPubkeyRelays,
  userBlossomServerList,
+  getThunkError,
  addRoomMember,
  manageRelay,
  getRelay,
@@ -80,11 +86,14 @@ import {
 import {compressFile} from "@lib/html"
 import type {SettingsValues, SpaceNotificationSettings} from "@app/core/state"
 import {
+  BOOKMARKS,
+  BOOKMARK_LISTS,
  SETTINGS,
  PROTECTED,
  INDEXER_RELAYS,
-  DEFAULT_RELAYS,
  DEFAULT_BLOSSOM_SERVERS,
+  getBookmarkList,
+  getBookmarkCollection,
  userSpaceUrls,
  userSettingsValues,
  getSetting,
@@ -166,6 +175,135 @@ export const broadcastUserData = async (relays: string[]) => {

 // List updates

+const getSavedItemsList = (owner = pubkey.get() || "") => {
+  if (!owner) {
+    return makeList({kind: BOOKMARKS})
+  }
+
+  return getBookmarkList().get(owner) || makeList({kind: BOOKMARKS})
+}
+
+const getBookmarkListFromAddress = (address: string) => {
+  const parsed = Address.from(address)
+
+  if (parsed.kind === BOOKMARKS) {
+    return getSavedItemsList(parsed.pubkey)
+  }
+
+  if (parsed.kind === BOOKMARK_LISTS) {
+    return getBookmarkCollection().get(address)
+  }
+
+  return undefined
+}
+
+export const createBookmarkList = async (title: string) => {
+  const label = title.trim()
+
+  if (!label) {
+    return
+  }
+
+  const list = makeList({kind: BOOKMARK_LISTS})
+  const event = await updateList(list, {
+    publicTags: [
+      ["d", randomId()],
+      ["title", label],
+    ],
+  }).reconcile(nip44EncryptToSelf)
+  const relays = Router.get().FromUser().getUrls()
+
+  return publishThunk({event, relays})
+}
+
+export const addEventBookmark = async (target: TrustedEvent, address?: string) => {
+  const list = address ? getBookmarkListFromAddress(address) : getSavedItemsList()
+
+  if (!list) {
+    return
+  }
+
+  const existing = new Set(getEventTagValues(getListTags(list)))
+
+  if (existing.has(target.id)) {
+    return
+  }
+
+  const event = await addToListPublicly(list, ["e", target.id]).reconcile(nip44EncryptToSelf)
+  const relays = Router.get().FromUser().getUrls()
+
+  return publishThunk({event, relays})
+}
+
+export const removeEventBookmark = async (target: TrustedEvent, address?: string) => {
+  const list = address ? getBookmarkListFromAddress(address) : getSavedItemsList()
+
+  if (!list) {
+    return
+  }
+
+  const targetD = getTagValue("d", target.tags)
+  const targetAddress = targetD ? `${target.kind}:${target.pubkey}:${targetD}` : undefined
+  const hasMatch = getListTags(list).some(
+    tag =>
+      (tag[0] === "e" && tag[1] === target.id) ||
+      (targetAddress !== undefined && tag[0] === "a" && tag[1] === targetAddress),
+  )
+
+  if (!hasMatch) {
+    return
+  }
+
+  const event = await removeFromListByPredicate(
+    list,
+    tag =>
+      (tag[0] === "e" && tag[1] === target.id) ||
+      (targetAddress !== undefined && tag[0] === "a" && tag[1] === targetAddress),
+  ).reconcile(nip44EncryptToSelf)
+  const relays = Router.get().FromUser().getUrls()
+
+  return publishThunk({event, relays})
+}
+
+export const deleteBookmarkList = async (address: string) => {
+  const list = getBookmarkCollection().get(address)
+  const {kind} = Address.from(address)
+
+  if (kind !== BOOKMARK_LISTS || !list?.event) {
+    return
+  }
+
+  const relays = Router.get().FromUser().getUrls()
+
+  return publishDelete({protect: false, event: list.event, tags: [["a", address]], relays})
+}
+
+export const renameBookmarkList = async (address: string, title: string) => {
+  const list = getBookmarkCollection().get(address)
+  const {kind} = Address.from(address)
+  const nextTitle = title.trim()
+
+  if (kind !== BOOKMARK_LISTS || !nextTitle || !list?.event) {
+    return
+  }
+
+  const currentTitle =
+    getTagValue("title", list.event.tags) || getTagValue("d", list.event.tags) || ""
+
+  if (nextTitle === currentTitle) {
+    return
+  }
+
+  const publicTags = [
+    ["d", getTagValue("d", list.event.tags) || randomId()],
+    ["title", nextTitle],
+  ]
+  const event = await updateList(list, {publicTags}).reconcile(nip44EncryptToSelf)
+  const relays = Router.get().FromUser().getUrls()
+
+  return publishThunk({event, relays})
+}
+
 export const addSpaceMembership = async (url: string) => {
  const list = get(userGroupList) || makeList({kind: ROOMS})
  const event = await addToListPublicly(list, ["r", url]).reconcile(nip44EncryptToSelf)
@@ -263,12 +401,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 +418,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 +526,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 +861,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()
@@ -3,6 +3,7 @@ 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,
@@ -92,7 +93,6 @@ import {
  THREAD,
  CLASSIFIED,
  WRAP,
-  POLL,
  PROFILE,
  ZAP_GOAL,
  ZAP_REQUEST,
@@ -159,6 +159,12 @@ export const ROOM = "h"

 export const PROTECTED = ["-"]

+export const MESSAGE_KINDS = [MESSAGE]
+
+export const BOOKMARKS = 10003
+
+export const BOOKMARK_LISTS = 30003
+
 export const IMAGE_CONTENT_TYPES = ["image/jpeg", "image/png", "image/gif", "image/webp"]

 export const VIDEO_CONTENT_TYPES = ["video/quicktime", "video/webm", "video/mp4"]
@@ -327,7 +333,7 @@ if (ENABLE_ZAPS) {
  REACTION_KINDS.push(ZAP_RESPONSE)
 }

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

 export const DM_KINDS = [DIRECT_MESSAGE, DIRECT_MESSAGE_FILE]

@@ -560,7 +566,11 @@ export const chatsById = call(() => {
  })
 })

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

 export const chatSearch = derived(throttled(1500, chatsById), $chatsByPubkey => {
  return createSearch(
@@ -700,6 +710,50 @@ export const deriveOtherVoiceRooms = (url: string) =>

 // User space/room lists

+export const bookmarkListsByPubkey = deriveItemsByKey({
+  repository,
+  filters: [{kinds: [BOOKMARKS]}],
+  getKey: list => list.event.pubkey,
+  eventToItem: (event: TrustedEvent) => readList(asDecryptedEvent(event)),
+})
+
+export const getBookmarkList = getter(bookmarkListsByPubkey)
+
+export const loadBookmarkList = makeLoadItem(makeOutboxLoader(BOOKMARKS), getBookmarkList)
+
+export const userBookmarkList = makeUserData(bookmarkListsByPubkey, loadBookmarkList)
+
+export const loadUserBookmarkList = makeUserLoader(loadBookmarkList)
+
+export const bookmarkCollectionsByAddress = deriveItemsByKey({
+  repository,
+  filters: [{kinds: [BOOKMARK_LISTS]}],
+  getKey: list => getAddress(list.event),
+  eventToItem: (event: TrustedEvent) => readList(asDecryptedEvent(event)),
+})
+
+export const getBookmarkCollection = getter(bookmarkCollectionsByAddress)
+
+export const bookmarkCollections = deriveItems(bookmarkCollectionsByAddress)
+
+export const bookmarkCollectionsByPubkey = derived(bookmarkCollections, $lists =>
+  groupBy(list => list.event.pubkey, $lists),
+)
+
+export const getBookmarkCollections = getter(bookmarkCollectionsByPubkey)
+
+export const loadBookmarkCollections = makeLoadItem(
+  makeOutboxLoader(BOOKMARK_LISTS),
+  getBookmarkCollections,
+)
+
+export const userBookmarkCollections = makeUserData(
+  bookmarkCollectionsByPubkey,
+  loadBookmarkCollections,
+)
+
+export const loadUserBookmarkCollections = makeUserLoader(loadBookmarkCollections)
+
 export const groupListsByPubkey = deriveItemsByKey({
  repository,
  filters: [{kinds: [ROOMS]}],
@@ -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,
@@ -19,9 +20,9 @@ import {
  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"
@@ -269,7 +270,29 @@ const syncUserData = () => {

 const syncSpace = (url: string) => {
  const since = ago(WEEK)
+  const seen = new Set<string>()
  const controller = new AbortController()
+
+  const pullRoomContent = (room: string) => {
+    if (!seen.has(room)) {
+      seen.add(room)
+      pullAndListen({
+        url,
+        signal: controller.signal,
+        filters: [
+          {kinds: [ROOM_META, ROOM_ADMINS, ROOM_MEMBERS], "#d": [room]},
+          {kinds: [MESSAGE, ...CONTENT_KINDS], since, "#h": [room]},
+          makeCommentFilter(CONTENT_KINDS, {since, "#h": [room]}),
+          {
+            kinds: [ROOM_DELETE, ROOM_JOIN, ROOM_LEAVE],
+            "#h": [room],
+          },
+          {kinds: [PollResponse], since},
+        ],
+      })
+    }
+  }
+
  const relayKinds = [RELAY_MEMBERS]
  const roomMetaKinds = [ROOM_META, ROOM_ADMINS, ROOM_MEMBERS, LIVEKIT_PARTICIPANTS]
  const roomDeleteKinds = [ROOM_DELETE, ROOM_JOIN, ROOM_LEAVE]
@@ -280,8 +303,19 @@ const syncSpace = (url: string) => {
    filters: [
      {kinds: [...relayKinds, ...roomMetaKinds, ...roomDeleteKinds, ...CONTENT_KINDS, MESSAGE]},
      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()
@@ -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,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
@@ -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"
@@ -26,7 +26,16 @@ import ChatEnable from "@app/components/ChatEnable.svelte"

 // Chat

-export const makeChatPath = (pubkeys: string[]) => `/chat/${makeChatId(pubkeys)}`
+export const makeChatPath = (pubkeys: string[], event?: TrustedEvent) => {
+  let path = `/chat/${makeChatId(pubkeys)}`
+
+  if (event) {
+    const qp = new URLSearchParams({at: String(event.created_at), e: event.id})
+    path += "?" + qp.toString()
+  }
+
+  return path
+}

 export const makeRoomPath = (url: string, h: string) => `/spaces/${encodeRelay(url)}/${h}`

@@ -63,11 +72,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))
  }
 }

@@ -76,7 +85,7 @@ export const goToSpace = async (url: string) => {
 export const makeMessagePath = (url: string, event: TrustedEvent) => {
  const h = getTagValue(ROOM, event.tags)
  const path = h ? makeRoomPath(url, h) : makeSpaceChatPath(url)
-  const qp = new URLSearchParams({at: String(event.created_at)})
+  const qp = new URLSearchParams({at: String(event.created_at), e: event.id})

  return path + "?" + qp.toString()
 }
@@ -127,7 +136,7 @@ export const goToEvent = (event: TrustedEvent, options: Record<string, any> = {}

 export const getEventPath = (event: TrustedEvent, urls: string[]) => {
  if (DM_KINDS.includes(event.kind)) {
-    return makeChatPath([event.pubkey, ...getPubkeyTagValues(event.tags)])
+    return makeChatPath([event.pubkey, ...getPubkeyTagValues(event.tags)], event)
  }

  if (urls.length > 0) {
@@ -149,7 +158,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 +208,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)
  }
 }
@@ -19,6 +19,7 @@ const staticTitles = new Map<string, string>([
  ["/spaces/[relay]/goals", "Goals"],
  ["/spaces/[relay]/polls", "Polls"],
  ["/chat", "Messages"],
+  ["/bookmarks", "Bookmarks"],
  ["/join", "Join Space"],
  ["/people", "Find People"],
  ["/settings/about", "About"],
@@ -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"
@@ -37,9 +37,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>
@@ -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}>
@@ -9,22 +9,16 @@
  const {...props}: Props = $props()
 </script>

-<div class="flex flex-col gap-2 {props.class}">
-  <div class="flex items-center justify-between w-full gap-2">
-    {#if props.label}
-      <label class="flex items-center gap-2 min-w-[30%] max-w-[80%] md:max-w-none">
-        {@render props.label()}
-      </label>
-    {/if}
-    <div class="flex items-center gap-2 justify-end grow">
-      {#if props.input}
-        {@render props.input()}
-      {/if}
-    </div>
+<div class="grid grid-cols-1 gap-2 lg:gap-6 lg:grid-cols-3 {props.class}">
+  <label class="flex items-center gap-2 font-bold">
+    {@render props.label?.()}
+  </label>
+  <div class="col-span-2 flex items-center gap-2">
+    {@render props.input?.()}
  </div>
-  {#if props.info}
-    <p class="text-sm opacity-50">
-      {@render props.info()}
-    </p>
-  {/if}
+  <p class="flex-end text-sm opacity-50 lg:col-span-3">
+    {#if props.info}
+      {@render props.info?.()}
+    {/if}
+  </p>
 </div>
@@ -13,12 +13,7 @@
    placeholder?: string
  }

-  let {
-    value = $bindable(),
-    addLabel,
-    placeholder = "Enter text...",
-    allowAdd = true,
-  }: Props & {allowAdd?: boolean} = $props()
+  let {value = $bindable(), addLabel, placeholder = "Enter text..."}: Props = $props()
  let draggedIndex: number | null = $state(null)

  const onChange = (newValue: string[]) => {
@@ -77,14 +72,12 @@
      </div>
    </div>
  {/each}
-  {#if allowAdd}
-    <Button onclick={addItem} class="btn btn-link w-fit px-0">
-      <Icon icon={AddCircle} size={5} />
-      {#if addLabel}
-        {@render addLabel?.()}
-      {:else}
-        Add Item
-      {/if}
-    </Button>
-  {/if}
+  <Button onclick={addItem} class="btn btn-link w-fit px-0">
+    <Icon icon={AddCircle} size={5} />
+    {#if addLabel}
+      {@render addLabel?.()}
+    {:else}
+      Add Item
+    {/if}
+  </Button>
 </div>
@@ -13,7 +13,7 @@
  const className = $derived(
    cx(
      props.class,
-      "scroll-container z-feature flex min-h-0 w-full min-w-0 flex-col overflow-y-auto overflow-x-hidden pb-14 md:pb-0",
+      "scroll-container z-feature flex min-h-0 w-full min-w-0 flex-1 flex-col overflow-y-auto overflow-x-hidden",
    ),
  )
 </script>
@@ -25,7 +25,6 @@
    cx(
      "flex h-full w-full cursor-pointer items-center justify-center rounded-full transition-colors hover:bg-base-300",
      restProps.class,
-      {"bg-base-300 border border-solid border-base-content/20": active},
    ),
  )
 </script>
@@ -46,9 +46,7 @@ export const whenAborted = (signal?: AbortSignal) => {

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

 export const buildUrl = (base: string | URL, ...pathname: string[]) => {
@@ -0,0 +1,589 @@
+<script lang="ts">
+  import {onMount} from "svelte"
+  import {goto} from "$app/navigation"
+  import {page} from "$app/stores"
+  import {first, uniqBy} from "@welshman/lib"
+  import {load} from "@welshman/net"
+  import {
+    DELETE,
+    getIdFilters,
+    getTags,
+    getTagValue,
+    getTagValues,
+    sortEventsDesc,
+    tagsFromIMeta,
+    Address,
+    getAddress,
+  } from "@welshman/util"
+  import type {TrustedEvent} from "@welshman/util"
+  import {loadProfile, pubkey, repository, tracker, waitForThunkError} from "@welshman/app"
+  import Bookmark from "@assets/icons/bookmark.svg?dataurl"
+  import Magnifier from "@assets/icons/magnifier.svg?dataurl"
+  import SliderMinimalisticHorizontal from "@assets/icons/slider-minimalistic-horizontal.svg?dataurl"
+  import Button from "@lib/components/Button.svelte"
+  import Icon from "@lib/components/Icon.svelte"
+  import Page from "@lib/components/Page.svelte"
+  import BookmarkListPicker from "@app/components/BookmarkListPicker.svelte"
+  import BookmarkGrid from "@app/components/BookmarkGrid.svelte"
+  import BookmarkSidebar from "@app/components/BookmarkSidebar.svelte"
+  import {
+    addEventBookmark,
+    deleteBookmarkList,
+    removeEventBookmark,
+    renameBookmarkList,
+  } from "@app/core/commands"
+  import {
+    BOOKMARKS,
+    BOOKMARK_LISTS,
+    deriveEvents,
+    IMAGE_CONTENT_TYPES,
+    INDEXER_RELAYS,
+    loadUserBookmarkCollections,
+    loadUserBookmarkList,
+    shouldIgnoreError,
+    VIDEO_CONTENT_TYPES,
+  } from "@app/core/state"
+  import {pushModal} from "@app/util/modal"
+  import {getEventPath} from "@app/util/routes"
+  import {pushToast} from "@app/util/toast"
+
+  type ContentType = "all" | "image" | "video" | "text"
+
+  type SidebarList = {
+    key: string
+    label: string
+    count: number
+    event: TrustedEvent | undefined
+  }
+
+  type BookmarkItem = {
+    key: string
+    event: TrustedEvent
+    href: string
+    external: boolean
+    image: string | undefined
+    video: string | undefined
+    contentType: "image" | "video" | "text"
+    preview: string
+    pollOptions: string[]
+    searchable: string
+  }
+
+  const savedItemsKey = $derived($pubkey ? new Address(BOOKMARKS, $pubkey, "").toString() : "")
+
+  const listEvents = deriveEvents([{kinds: [BOOKMARKS, BOOKMARK_LISTS, DELETE]}])
+
+  const isImageUrl = (url: string) => /\.(png|jpe?g|gif|webp|avif|svg)(\?|#|$)/i.test(url)
+
+  const isVideoUrl = (url: string) => /\.(mp4|webm|mov|m4v)(\?|#|$)/i.test(url)
+
+  const findUrls = (content: string) => content.match(/https?:\/\/\S+/g) || []
+
+  const findFirstImageUrl = (content: string) => findUrls(content).find(isImageUrl)
+
+  const findFirstVideoUrl = (content: string) => findUrls(content).find(isVideoUrl)
+
+  const isImageMime = (mime: string | undefined) =>
+    !!mime && (IMAGE_CONTENT_TYPES.includes(mime) || mime.startsWith("image/"))
+
+  const isVideoMime = (mime: string | undefined) =>
+    !!mime && (VIDEO_CONTENT_TYPES.includes(mime) || mime.startsWith("video/"))
+
+  const getMediaPreview = (event: TrustedEvent) => {
+    const imageFromContent = findFirstImageUrl(event.content || "")
+    const videoFromContent = findFirstVideoUrl(event.content || "")
+    const imetas = getTags("imeta", event.tags).map(tagsFromIMeta)
+
+    const imageFromImeta = imetas.find(meta => {
+      const url = getTagValue("url", meta)
+      const mime = getTagValue("m", meta)
+
+      return !!url && (isImageMime(mime) || isImageUrl(url))
+    })
+
+    const videoFromImeta = imetas.find(meta => {
+      const url = getTagValue("url", meta)
+      const mime = getTagValue("m", meta)
+
+      return !!url && (isVideoMime(mime) || isVideoUrl(url))
+    })
+
+    const imageFromTags = getTagValues(["image", "thumb"], event.tags).find(isImageUrl)
+    const videoFromTags = getTagValues(["video"], event.tags).find(isVideoUrl)
+
+    return {
+      image: imageFromContent || getTagValue("url", imageFromImeta || []) || imageFromTags,
+      video: videoFromContent || getTagValue("url", videoFromImeta || []) || videoFromTags,
+    }
+  }
+
+  const getPollQuestion = (event: TrustedEvent) => {
+    const lines = (event.content || "")
+      .split("\n")
+      .map(line => line.trim())
+      .filter(Boolean)
+
+    return lines[0] || "Untitled poll"
+  }
+
+  const getPreviewText = (event: TrustedEvent, pollOptions: string[]) => {
+    if (pollOptions.length > 0) {
+      return getPollQuestion(event)
+    }
+
+    const clean = (event.content || "")
+      .replace(/https?:\/\/\S+/g, "")
+      .replace(/\s+/g, " ")
+      .trim()
+
+    if (!clean) {
+      return "(no text content)"
+    }
+
+    return clean.length > 140 ? `${clean.slice(0, 140).trim()}...` : clean
+  }
+
+  const detectContentType = (event: TrustedEvent): "image" | "video" | "text" => {
+    const media = getMediaPreview(event)
+
+    if (media.image) {
+      return "image"
+    }
+
+    if (media.video) {
+      return "video"
+    }
+
+    return "text"
+  }
+
+  const getListKey = (event: TrustedEvent) =>
+    event.kind === BOOKMARKS
+      ? new Address(BOOKMARKS, event.pubkey, "").toString()
+      : getAddress(event)
+
+  const getListLabel = (event: TrustedEvent) =>
+    getTagValue("title", event.tags) ||
+    getTagValue("d", event.tags) ||
+    (event.kind === BOOKMARKS ? "Saved Items" : "Untitled List")
+
+  const userListEvents = $derived(
+    sortEventsDesc($listEvents).filter(event => event.pubkey === $pubkey && event.kind !== DELETE),
+  )
+
+  const userDeleteEvents = $derived(
+    sortEventsDesc($listEvents).filter(event => event.pubkey === $pubkey && event.kind === DELETE),
+  )
+
+  const isDeletedList = (event: TrustedEvent) => {
+    const d = getTagValue("d", event.tags) || ""
+    const address = `${event.kind}:${event.pubkey}:${d}`
+
+    return userDeleteEvents.some(deleteEvent => {
+      if (deleteEvent.created_at < event.created_at) {
+        return false
+      }
+
+      return (
+        getTagValues("e", deleteEvent.tags).includes(event.id) ||
+        getTagValues("a", deleteEvent.tags).includes(address)
+      )
+    })
+  }
+
+  const sidebarLists = $derived.by(() => {
+    const mapped = uniqBy(getListKey, userListEvents)
+      .map(
+        (event): SidebarList => ({
+          key: getListKey(event),
+          label: getListLabel(event),
+          count: getTagValues(["e", "a"], event.tags).length,
+          event,
+        }),
+      )
+      .filter(list => (list.event ? !isDeletedList(list.event) : true))
+
+    const savedItems = first(mapped.filter(list => list.key === savedItemsKey)) || {
+      key: savedItemsKey,
+      label: "Saved Items",
+      count: 0,
+      event: undefined,
+    }
+
+    return [savedItems, ...mapped.filter(list => Address.from(list.key).kind !== BOOKMARKS)]
+  })
+
+  const defaultListKey = $derived(sidebarLists[0]?.key || "")
+  const selectedKey = $derived($page.url.searchParams.get("list") || defaultListKey)
+  const selectedList = $derived(sidebarLists.find(item => item.key === selectedKey))
+
+  const selectedListTags = $derived(selectedList?.event?.tags || [])
+
+  const selectedEventIds = $derived(getTagValues("e", selectedListTags))
+  const selectedAddresses = $derived(getTagValues("a", selectedListTags))
+  const totalListCount = $derived(sidebarLists.length)
+
+  let selectedEvents = $state<TrustedEvent[]>([])
+
+  let searchTerm = $state("")
+  let showSearch = $state(false)
+  let contentType = $state<ContentType>("all")
+  let listsReady = $state(false)
+  let loadedListPubkey: string | undefined = $state()
+  let loadedSelectionKey: string | undefined = $state()
+
+  const setFilterAll = () => {
+    contentType = "all"
+  }
+
+  const setFilterImage = () => {
+    contentType = "image"
+  }
+
+  const setFilterVideo = () => {
+    contentType = "video"
+  }
+
+  const setFilterText = () => {
+    contentType = "text"
+  }
+
+  const toggleSearch = () => {
+    showSearch = !showSearch
+  }
+
+  const openListManager = () => {
+    pushModal(BookmarkListPicker)
+  }
+
+  const isIgnorableBookmarkListError = (error: string) =>
+    shouldIgnoreError(error) || error.includes("only accepts kind 10002 events")
+
+  const openBookmarkFromMenu = async (item: BookmarkItem) => {
+    if (item.external) {
+      window.open(item.href, "_blank", "noopener,noreferrer")
+      return
+    }
+
+    await goto(item.href, {noScroll: true})
+  }
+
+  const copyBookmarkLinkFromMenu = async (item: BookmarkItem) => {
+    try {
+      await navigator.clipboard.writeText(item.href)
+      pushToast({message: "Link copied"})
+    } catch {
+      pushToast({theme: "error", message: "Unable to copy link"})
+    }
+  }
+
+  const addBookmarkToSavedItems = async (item: BookmarkItem) => {
+    if (!savedItemsKey) {
+      return
+    }
+
+    const thunk = await addEventBookmark(item.event, savedItemsKey)
+
+    if (!thunk) {
+      pushToast({message: "Already in Saved Items"})
+      return
+    }
+
+    const error = await waitForThunkError(thunk)
+
+    if (error && !isIgnorableBookmarkListError(error)) {
+      pushToast({theme: "error", message: error})
+      return
+    }
+
+    pushToast({message: "Added to Saved Items"})
+  }
+
+  const removeBookmarkFromCurrentList = async (item: BookmarkItem) => {
+    if (!selectedKey) {
+      return
+    }
+
+    const thunk = await removeEventBookmark(item.event, selectedKey)
+
+    if (!thunk) {
+      selectedEvents = selectedEvents.filter(event => event.id !== item.event.id)
+      pushToast({message: "Bookmark already removed"})
+      return
+    }
+
+    const error = await waitForThunkError(thunk)
+
+    if (error && !isIgnorableBookmarkListError(error)) {
+      pushToast({theme: "error", message: error})
+      return
+    }
+
+    selectedEvents = selectedEvents.filter(event => event.id !== item.event.id)
+    pushToast({message: "Removed from this list"})
+  }
+
+  const deleteListFromSidebar = async (key: string, label: string) => {
+    if (key.startsWith(`${BOOKMARKS}:`)) {
+      return
+    }
+
+    const thunk = await deleteBookmarkList(key)
+
+    if (!thunk) {
+      pushToast({theme: "error", message: "Unable to delete this list"})
+      return
+    }
+
+    const error = await waitForThunkError(thunk)
+
+    if (error && !isIgnorableBookmarkListError(error)) {
+      pushToast({theme: "error", message: error})
+      return
+    }
+
+    pushToast({message: `Deleted ${label}`})
+
+    if (selectedKey === key) {
+      await goto(selectedListHref(savedItemsKey), {replaceState: true, noScroll: true})
+    }
+  }
+
+  const renameListFromSidebar = async (key: string, label: string, nextLabel: string) => {
+    if (key.startsWith(`${BOOKMARKS}:`)) {
+      return
+    }
+
+    const normalized = nextLabel.trim()
+
+    if (!normalized || normalized === label) {
+      return
+    }
+
+    const thunk = await renameBookmarkList(key, normalized)
+
+    if (!thunk) {
+      pushToast({theme: "error", message: "Unable to rename list"})
+      return
+    }
+
+    const error = await waitForThunkError(thunk)
+
+    if (error && !isIgnorableBookmarkListError(error)) {
+      pushToast({theme: "error", message: error})
+      return
+    }
+
+    pushToast({message: `Renamed to ${normalized}`})
+  }
+
+  const normalizedTerm = $derived(searchTerm.trim().toLowerCase())
+
+  const items = $derived.by(() =>
+    selectedEvents.map((event): BookmarkItem => {
+      const href = getEventPath(event, Array.from(tracker.getRelays(event.id)))
+      const pollOptions = getTagValues(["option", "poll_option"], event.tags)
+      const media = getMediaPreview(event)
+
+      return {
+        key: event.id,
+        event,
+        href,
+        external: href.includes("://"),
+        image: media.image,
+        video: media.video,
+        contentType: detectContentType(event),
+        preview: getPreviewText(event, pollOptions),
+        pollOptions,
+        searchable: `${event.content || ""} ${pollOptions.join(" ")}`.toLowerCase(),
+      }
+    }),
+  )
+
+  const filteredItems = $derived(
+    items.filter(item => {
+      const matchesFilter = contentType === "all" || item.contentType === contentType
+      const matchesTerm = !normalizedTerm || item.searchable.includes(normalizedTerm)
+
+      return matchesFilter && matchesTerm
+    }),
+  )
+
+  const sidebarListsWithDisplayCount = $derived(
+    sidebarLists.map(list => ({
+      ...list,
+      displayCount: list.key === selectedKey ? items.length : list.count,
+    })),
+  )
+
+  const selectedListHref = (key: string) => `/bookmarks?list=${encodeURIComponent(key)}`
+
+  const loadBookmarkLists = async () => {
+    if (!$pubkey) {
+      listsReady = false
+      return
+    }
+
+    if (loadedListPubkey === $pubkey && listsReady) {
+      return
+    }
+
+    loadedListPubkey = $pubkey
+    listsReady = false
+
+    try {
+      await Promise.all([
+        loadUserBookmarkList(),
+        loadUserBookmarkCollections(),
+        load({
+          relays: INDEXER_RELAYS,
+          filters: [{kinds: [DELETE], authors: [$pubkey]}],
+        }),
+      ])
+    } finally {
+      listsReady = true
+    }
+
+    // Ensure selected-list references are reloaded once list metadata arrives.
+    loadedSelectionKey = undefined
+  }
+
+  const loadSelectedReferences = async () => {
+    if (!selectedList) {
+      selectedEvents = []
+      return
+    }
+
+    const references = [...selectedEventIds, ...selectedAddresses]
+    const referenceKey = `${selectedList.key}:${references.slice().sort().join("|")}`
+
+    selectedEvents = sortEventsDesc(
+      uniqBy(
+        event => event.id,
+        references
+          .map(id => repository.getEvent(id))
+          .filter((event): event is TrustedEvent => Boolean(event)),
+      ),
+    )
+
+    if (loadedSelectionKey === referenceKey) {
+      return
+    }
+
+    if (references.length > 0) {
+      await load({
+        relays: INDEXER_RELAYS,
+        filters: getIdFilters(references),
+      })
+
+      selectedEvents = sortEventsDesc(
+        uniqBy(
+          event => event.id,
+          references
+            .map(id => repository.getEvent(id))
+            .filter((event): event is TrustedEvent => Boolean(event)),
+        ),
+      )
+    }
+
+    loadedSelectionKey = referenceKey
+
+    for (const event of selectedEvents) {
+      loadProfile(event.pubkey)
+    }
+  }
+
+  onMount(() => {
+    void loadBookmarkLists()
+  })
+
+  $effect(() => {
+    if ($pubkey && loadedListPubkey !== $pubkey) {
+      void loadBookmarkLists()
+    }
+  })
+
+  $effect(() => {
+    if (selectedList) {
+      void loadSelectedReferences()
+    } else {
+      selectedEvents = []
+    }
+  })
+</script>
+
+<BookmarkSidebar
+  lists={listsReady ? sidebarListsWithDisplayCount : []}
+  {selectedKey}
+  totalCount={listsReady ? totalListCount : 0}
+  onOpenManager={openListManager}
+  onSelect={key => goto(selectedListHref(key), {replaceState: true, noScroll: true})}
+  onRename={renameListFromSidebar}
+  onDelete={deleteListFromSidebar} />
+
+<Page class="overflow-hidden">
+  <div class="col-3 gap-3 p-3 md:p-4">
+    <div class="card2 card2-sm bg-alt flex items-center justify-between gap-2 p-2">
+      <div class="flex min-w-0 items-center gap-2">
+        <Icon size={4} icon={Bookmark} />
+        <p class="truncate text-sm font-medium">
+          {#if listsReady}
+            {selectedList?.label || "Saved Items"}
+          {:else}
+            Loading bookmarks...
+          {/if}
+        </p>
+        <span class="badge badge-sm badge-neutral">{filteredItems.length}</span>
+      </div>
+      <div class="flex items-center gap-2">
+        <Button class="btn btn-neutral btn-sm btn-square" onclick={toggleSearch}>
+          <Icon size={4} icon={Magnifier} />
+        </Button>
+        <details class="dropdown dropdown-end">
+          <summary class="btn btn-neutral btn-sm btn-square" aria-label="Filter">
+            <Icon size={4} icon={SliderMinimalisticHorizontal} />
+          </summary>
+          <ul class="menu dropdown-content z-popover mt-2 w-44 rounded-box bg-base-100 p-2 shadow">
+            <li>
+              <Button class="justify-start" onclick={setFilterAll}>All</Button>
+            </li>
+            <li>
+              <Button class="justify-start" onclick={setFilterImage}>Image</Button>
+            </li>
+            <li>
+              <Button class="justify-start" onclick={setFilterVideo}>Video</Button>
+            </li>
+            <li>
+              <Button class="justify-start" onclick={setFilterText}>Text</Button>
+            </li>
+          </ul>
+        </details>
+      </div>
+    </div>
+
+    <div class="flex w-full flex-wrap gap-2 px-1 text-[11px] uppercase tracking-wide opacity-70">
+      <span>{filteredItems.length} items</span>
+      <span>•</span>
+      <span>{listsReady ? selectedList?.label || "Saved Items" : "Loading"}</span>
+    </div>
+
+    {#if showSearch}
+      <label class="input input-bordered flex w-full items-center gap-2">
+        <Icon icon={Magnifier} />
+        <input bind:value={searchTerm} class="grow" type="text" placeholder="Search this list..." />
+      </label>
+    {/if}
+
+    {#if listsReady}
+      <BookmarkGrid
+        items={filteredItems}
+        showAddToSaved={selectedKey !== savedItemsKey}
+        onOpen={openBookmarkFromMenu}
+        onCopyLink={copyBookmarkLinkFromMenu}
+        onAddToSaved={addBookmarkToSavedItems}
+        onRemove={removeBookmarkFromCurrentList} />
+    {:else}
+      <div class="card2 card2-sm bg-alt text-sm opacity-70">Loading bookmark lists...</div>
+    {/if}
+  </div>
+</Page>
@@ -5,7 +5,6 @@
  import {Badge} from "@capawesome/capacitor-badge"
  import Bell from "@assets/icons/bell.svg?dataurl"
  import {preventDefault} from "@lib/html"
-  import FieldInline from "@lib/components/FieldInline.svelte"
  import Spinner from "@lib/components/Spinner.svelte"
  import Icon from "@lib/components/Icon.svelte"
  import Button from "@lib/components/Button.svelte"
@@ -64,64 +63,40 @@
      <!-- pass -->
    {:then { isSupported }}
      {#if isSupported}
-        <FieldInline>
-          {#snippet label()}
-            <p>Show badge for unread alerts</p>
-          {/snippet}
-          {#snippet input()}
-            <input type="checkbox" class="toggle toggle-primary" bind:checked={settings.badge} />
-          {/snippet}
-        </FieldInline>
+        <div class="flex justify-between">
+          <p>Show badge for unread alerts</p>
+          <input type="checkbox" class="toggle toggle-primary" bind:checked={settings.badge} />
+        </div>
      {/if}
    {/await}
    {#if !Capacitor.isNativePlatform()}
-      <FieldInline>
-        {#snippet label()}
-          <p>Play sound for new activity</p>
-        {/snippet}
-        {#snippet input()}
-          <input type="checkbox" class="toggle toggle-primary" bind:checked={settings.sound} />
-        {/snippet}
-      </FieldInline>
+      <div class="flex justify-between">
+        <p>Play sound for new activity</p>
+        <input type="checkbox" class="toggle toggle-primary" bind:checked={settings.sound} />
+      </div>
    {/if}
-    <FieldInline>
-      {#snippet label()}
-        <p>Enable push notifications</p>
-      {/snippet}
-      {#snippet input()}
-        <input type="checkbox" class="toggle toggle-primary" bind:checked={settings.push} />
-      {/snippet}
-    </FieldInline>
+    <div class="flex justify-between">
+      <p>Enable push notifications</p>
+      <input type="checkbox" class="toggle toggle-primary" bind:checked={settings.push} />
+    </div>
  </div>
  <div
    class={cx("card2 bg-alt col-4 shadow-md", {
      "pointer-events-none opacity-50": !settings.badge && !settings.sound && !settings.push,
    })}>
    <strong class="text-lg">Alert Types</strong>
-    <FieldInline>
-      {#snippet label()}
-        <p>Notify me about new activity</p>
-      {/snippet}
-      {#snippet input()}
-        <input type="checkbox" class="toggle toggle-primary" bind:checked={settings.spaces} />
-      {/snippet}
-    </FieldInline>
-    <FieldInline>
-      {#snippet label()}
-        <p>Always notify me when mentioned</p>
-      {/snippet}
-      {#snippet input()}
-        <input type="checkbox" class="toggle toggle-primary" checked={settings.mentions} />
-      {/snippet}
-    </FieldInline>
-    <FieldInline>
-      {#snippet label()}
-        <p>Notify me about new messages</p>
-      {/snippet}
-      {#snippet input()}
-        <input type="checkbox" class="toggle toggle-primary" bind:checked={settings.messages} />
-      {/snippet}
-    </FieldInline>
+    <div class="flex justify-between">
+      <p>Notify me about new activity</p>
+      <input type="checkbox" class="toggle toggle-primary" bind:checked={settings.spaces} />
+    </div>
+    <div class="flex justify-between">
+      <p>Always notify me when mentioned</p>
+      <input type="checkbox" class="toggle toggle-primary" checked={settings.mentions} />
+    </div>
+    <div class="flex justify-between">
+      <p>Notify me about new messages</p>
+      <input type="checkbox" class="toggle toggle-primary" bind:checked={settings.messages} />
+    </div>
  </div>
  <div
    class="card2 bg-alt sticky -bottom-3 shadow-md flex flex-row items-center justify-between gap-4">
@@ -11,7 +11,6 @@
  import {Router} from "@welshman/router"
  import {userMuteList, tagPubkey, publishThunk, userBlossomServerList} from "@welshman/app"
  import NotesMinimalistic from "@assets/icons/notes-minimalistic.svg?dataurl"
-  import AddCircle from "@assets/icons/add-circle.svg?dataurl"
  import {preventDefault} from "@lib/html"
  import Field from "@lib/components/Field.svelte"
  import FieldInline from "@lib/components/FieldInline.svelte"
@@ -29,10 +28,6 @@
    blossomServers = getTagValues("server", getListTags($userBlossomServerList))
  }

-  const addServer = () => {
-    blossomServers = [...blossomServers, ""]
-  }
-
  const onsubmit = preventDefault(async () => {
    await publishSettings($state.snapshot(settings))

@@ -109,7 +104,7 @@
      {/snippet}
      {#snippet input()}
        <input
-          class="range range-primary w-full"
+          class="range range-primary"
          type="range"
          min="0.8"
          max="1.3"
@@ -120,13 +115,13 @@
  </div>
  <div class="card2 bg-alt col-4 shadow-md">
    <strong class="text-lg">Editor Settings</strong>
-    <Field>
+    <FieldInline>
      {#snippet label()}
        <p>Send Delay</p>
      {/snippet}
      {#snippet input()}
        <input
-          class="range range-primary w-full"
+          class="range range-primary"
          type="range"
          min="0"
          max="10000"
@@ -139,19 +134,17 @@
          {settings.send_delay === 1000 ? "second" : "seconds"}.
        </p>
      {/snippet}
-    </Field>
+    </FieldInline>
    <Field>
      {#snippet label()}
        <p>Media Server</p>
      {/snippet}
-      {#snippet secondary()}
-        <Button class="link text-sm underline flex items-center gap-1" onclick={addServer}>
-          <Icon icon={AddCircle} size={4} />
-          Add Server
-        </Button>
-      {/snippet}
      {#snippet input()}
-        <InputList allowAdd={false} bind:value={blossomServers} />
+        <InputList bind:value={blossomServers}>
+          {#snippet addLabel()}
+            Add Server
+          {/snippet}
+        </InputList>
      {/snippet}
      {#snippet info()}
        <p>Choose a media server type and url for files you upload to {PLATFORM_NAME}.</p>
@@ -1,7 +1,6 @@
 <script lang="ts">
  import ShieldMinimalistic from "@assets/icons/shield-minimalistic.svg?dataurl"
  import {preventDefault} from "@lib/html"
-  import FieldInline from "@lib/components/FieldInline.svelte"
  import Icon from "@lib/components/Icon.svelte"
  import Button from "@lib/components/Button.svelte"
  import {pushToast} from "@app/util/toast"
@@ -12,10 +11,8 @@
    settings = {...$userSettingsValues}
  }

-  const onAuthModeChange = (e: Event) => {
-    const target = e.currentTarget as HTMLInputElement
-
-    settings.relay_auth = target.checked ? RelayAuthMode.Aggressive : RelayAuthMode.Conservative
+  const onAuthModeChange = (e: any) => {
+    settings.auth_mode = e.target.checked ? RelayAuthMode.Aggressive : RelayAuthMode.Conservative
  }

  const onsubmit = preventDefault(async () => {
@@ -33,46 +30,31 @@
      <Icon icon={ShieldMinimalistic} />
      Privacy Settings
    </strong>
-    <FieldInline>
-      {#snippet label()}
-        <p>Authenticate with unknown relays?</p>
-      {/snippet}
-      {#snippet input()}
-        <input
-          type="checkbox"
-          class="toggle toggle-primary"
-          onchange={onAuthModeChange}
-          checked={settings.relay_auth === RelayAuthMode.Aggressive} />
-      {/snippet}
-      {#snippet info()}
-        <p>Controls whether {PLATFORM_NAME} will identify you to relays not in your lists.</p>
-      {/snippet}
-    </FieldInline>
-    <FieldInline>
-      {#snippet label()}
-        <p>Report errors?</p>
-      {/snippet}
-      {#snippet input()}
-        <input
-          type="checkbox"
-          class="toggle toggle-primary"
-          bind:checked={settings.report_errors} />
-      {/snippet}
-      {#snippet info()}
-        <p>Allow {PLATFORM_NAME} to send error reports to help improve the app.</p>
-      {/snippet}
-    </FieldInline>
-    <FieldInline>
-      {#snippet label()}
-        <p>Report usage?</p>
-      {/snippet}
-      {#snippet input()}
-        <input type="checkbox" class="toggle toggle-primary" bind:checked={settings.report_usage} />
-      {/snippet}
-      {#snippet info()}
-        <p>Allow {PLATFORM_NAME} to collect anonymous usage data.</p>
-      {/snippet}
-    </FieldInline>
+    <div class="grid grid-cols-2 gap-2">
+      <p>Authenticate with unknown relays?</p>
+      <input
+        type="checkbox"
+        class="toggle toggle-primary"
+        onchange={onAuthModeChange}
+        checked={settings.auth_mode === RelayAuthMode.Aggressive} />
+      <p class="col-span-2 text-sm opacity-70">
+        Controls whether {PLATFORM_NAME} will identify you to relays not in your lists.
+      </p>
+    </div>
+    <div class="grid grid-cols-2 gap-2">
+      <p>Report errors?</p>
+      <input type="checkbox" class="toggle toggle-primary" bind:checked={settings.report_errors} />
+      <p class="col-span-2 text-sm opacity-70">
+        Allow {PLATFORM_NAME} to send error reports to help improve the app.
+      </p>
+    </div>
+    <div class="grid grid-cols-2 gap-2">
+      <p>Report usage?</p>
+      <input type="checkbox" class="toggle toggle-primary" bind:checked={settings.report_usage} />
+      <p class="col-span-2 text-sm opacity-70">
+        Allow {PLATFORM_NAME} to collect anonymous usage data.
+      </p>
+    </div>
  </div>
  <div
    class="card2 bg-alt sticky -bottom-3 shadow-md flex flex-row items-center justify-between gap-4">
@@ -27,7 +27,6 @@
  import PasswordReset from "@app/components/PasswordReset.svelte"
  import InfoKeys from "@app/components/InfoKeys.svelte"
  import {pushModal} from "@app/util/modal"
-  import {POMADE_NETWORK_ERROR_MESSAGE} from "@app/util/pomadeErrors"
  import {clip, pushToast} from "@app/util/toast"

  const npub = nip19.npubEncode($pubkey!)
@@ -49,24 +48,13 @@
      const {ok, peersByPrefix} = await Client.requestChallenge($session!.email)

      if (!ok) {
-        console.error("Pomade challenge request failed during password reset initiation")
-
        pushToast({
          theme: "error",
-          message: POMADE_NETWORK_ERROR_MESSAGE,
+          message: "Failed to initiate password reset!",
        })
-
-        return
      }

      pushModal(PasswordReset, {peersByPrefix})
-    } catch (error) {
-      console.error(error)
-
-      pushToast({
-        theme: "error",
-        message: POMADE_NETWORK_ERROR_MESSAGE,
-      })
    } finally {
      loading = false
    }
@@ -5,9 +5,8 @@
  import {derived as _derived} from "svelte/store"
  import {dec, insertAt, removeAt, sleep} from "@welshman/lib"
  import type {RelayProfile} from "@welshman/util"
-  import {ROOMS} from "@welshman/util"
  import {throttled} from "@welshman/store"
-  import {pull, relays, createSearch} from "@welshman/app"
+  import {relays, createSearch} from "@welshman/app"
  import {createScroller} from "@lib/html"
  import {fly} from "@lib/transition"
  import DragHandle from "@assets/icons/drag-handle.svg?dataurl"
@@ -30,9 +29,7 @@
    userSpaceUrls,
    loadUserGroupList,
    PLATFORM_RELAYS,
-    DEFAULT_RELAYS,
    groupListPubkeysByUrl,
-    bootstrapPubkeys,
    parseInviteLink,
  } from "@app/core/state"
  import {setSpaceMembershipOrder} from "@app/core/commands"
@@ -200,11 +197,6 @@
      },
    })

-    pull({
-      filters: [{kinds: [ROOMS], authors: $bootstrapPubkeys}],
-      relays: DEFAULT_RELAYS,
-    })
-
    return () => {
      scroller.stop()
    }
@@ -213,46 +205,41 @@

 <Page>
  <PageBar>
-    <div class="flex items-center justify-between gap-4" in:fly>
-      <div class="ellipsize flex items-center gap-2 whitespace-nowrap">
-        <Icon icon={Widget} size={6} />
-        <strong>Spaces</strong>
+    {#if showSearch}
+      <label class="input input-bordered input-sm flex flex-1 items-center gap-2" in:fly>
+        <Icon icon={Magnifier} />
+        <input
+          bind:this={searchInput}
+          bind:value={term}
+          class="min-w-0 grow"
+          type="text"
+          placeholder="Search for spaces..." />
+        <Button onclick={closeSearch} class="flex items-center">
+          <Icon icon={CloseCircle} />
+        </Button>
+      </label>
+    {:else}
+      <div class="flex items-center justify-between gap-4" in:fly>
+        <div class="ellipsize flex items-center gap-2 whitespace-nowrap">
+          <Icon icon={Widget} size={6} />
+          <strong>Spaces</strong>
+        </div>
+        <div class="flex items-center gap-2">
+          <button
+            class="btn btn-neutral btn-sm btn-square"
+            aria-label="Search"
+            onclick={openSearch}>
+            <Icon size={4} icon={Magnifier} />
+          </button>
+          {#if PLATFORM_RELAYS.length === 0}
+            <Button class="btn btn-primary btn-sm" onclick={addSpace}>
+              <Icon icon={AddCircle} />
+              Add Space
+            </Button>
+          {/if}
+        </div>
      </div>
-      <div class="flex items-center gap-2">
-        <button class="btn btn-neutral btn-sm btn-square" aria-label="Search" onclick={openSearch}>
-          <Icon size={4} icon={Magnifier} />
-        </button>
-        {#if showSearch}
-          <button class="fixed inset-0 z-feature" aria-label="Close search" onclick={closeSearch}
-          ></button>
-          <div class="fixed top-sai right-sai left-content-full z-feature p-2">
-            <div
-              class="card2 card2-sm p-2! bg-alt flex flex-col shadow-md"
-              transition:fly={{y: -40, duration: 150}}>
-              <label class="input input-sm input-bordered flex w-full items-center gap-2">
-                <Icon size={4} icon={Magnifier} />
-                <input
-                  bind:this={searchInput}
-                  bind:value={term}
-                  class="min-w-0 grow"
-                  type="text"
-                  placeholder="Search for spaces..."
-                  onkeydown={e => e.key === "Escape" && closeSearch()} />
-                <Button onclick={closeSearch} class="flex items-center">
-                  <Icon icon={CloseCircle} />
-                </Button>
-              </label>
-            </div>
-          </div>
-        {/if}
-        {#if PLATFORM_RELAYS.length === 0}
-          <Button class="btn btn-primary btn-sm" onclick={addSpace}>
-            <Icon icon={AddCircle} />
-            Add Space
-          </Button>
-        {/if}
-      </div>
-    </div>
+    {/if}
  </PageBar>
  <PageContent class="flex flex-col gap-2 p-2 pt-4">
    <div class="flex flex-col gap-2" bind:this={element}>
@@ -1,10 +1,9 @@
 <script lang="ts">
-  import {onMount} from "svelte"
+  import {onMount, tick} from "svelte"
  import {readable} from "svelte/store"
  import {page} from "$app/stores"
  import {goto} from "$app/navigation"
  import type {Readable} from "svelte/store"
-  import {debounce} from "throttle-debounce"
  import {pubkey, publishThunk, waitForThunkError, joinRoom, leaveRoom} from "@welshman/app"
  import {now, ifLet, int, formatTimestampAsDate, ago, MINUTE} from "@welshman/lib"
  import type {MakeNonOptional} from "@welshman/lib"
@@ -15,7 +14,7 @@
  import InfoCircle from "@assets/icons/info-circle.svg?dataurl"
  import Login2 from "@assets/icons/login-3.svg?dataurl"
  import cx from "classnames"
-  import {fade, fly} from "@lib/transition"
+  import {slide, fade, fly} from "@lib/transition"
  import Button from "@lib/components/Button.svelte"
  import Divider from "@lib/components/Divider.svelte"
  import Icon from "@lib/components/Icon.svelte"
@@ -38,6 +37,7 @@
    deriveRoom,
    deriveUserRoomMembershipStatus,
    getRoomType,
+    MESSAGE_KINDS,
    MembershipStatus,
    PROTECTED,
    RoomType,
@@ -105,6 +105,13 @@
  const shouldProtect = canEnforceNip70(url)
  const membershipStatus = deriveUserRoomMembershipStatus(url, h)
  const at = $derived(parseInt($page.url.searchParams.get("at")!))
+  const targetId = $derived($page.url.searchParams.get("e"))
+
+  $effect(() => {
+    void at
+    void targetId
+    userHasScrolled = false
+  })

  const showRoomDetail = () => pushModal(RoomDetail, {url, h})

@@ -156,10 +163,6 @@
  }

  const onSubmit = async ({content, tags}: EventContent) => {
-    if (!content && !share) {
-      return
-    }
-
    try {
      tags.push(["h", h])

@@ -232,29 +235,56 @@
      }
    }

-    if (!userHasScrolled && !isNaN(at)) {
-      const targetEvent = $events.find(event => event.created_at >= at)
+    if (!userHasScrolled && (!isNaN(at) || targetId)) {
+      const targetEvent = targetId
+        ? $events.find(event => event.id === targetId)
+        : $events.find(event => event.created_at <= at)

      if (targetEvent) {
        const target = element?.querySelector(`[data-event="${targetEvent.id}"]`)

        if (target instanceof HTMLElement) {
          isProgrammaticScroll = true
+          clearTimeout(programmaticScrollTimeout)
+          programmaticScrollTimeout = setTimeout(() => {
+            isProgrammaticScroll = false
+          }, 300)
+
          target.scrollIntoView({block: "center"})
+
+          if (target.dataset.highlighted !== "true") {
+            target.dataset.highlighted = "true"
+            target.style.filter = "brightness(1.5)"
+            target.style.transitionProperty = "all"
+            target.style.transitionDuration = "400ms"
+
+            setTimeout(() => {
+              target.style.transitionDuration = "300ms"
+              target.style.filter = ""
+            }, 800)
+          }
        }
      }
    }
  }

+  let isInteracting = false
+  let interactionTimeout: ReturnType<typeof setTimeout>
+  const markInteraction = () => {
+    isInteracting = true
+    clearTimeout(interactionTimeout)
+    interactionTimeout = setTimeout(() => {
+      isInteracting = false
+    }, 500)
+  }
+
  const onScroll = () => {
    if (!isProgrammaticScroll) {
-      userHasScrolled = true
-      isUserScrolling = true
-      clearIsUserScrolling()
+      if (isInteracting) {
+        userHasScrolled = true
+      }
      manageScrollPosition()
    }
-
-    isProgrammaticScroll = false
  }

  const scrollToNewMessages = () =>
@@ -272,7 +302,7 @@
  let leaving = $state(false)
  let userHasScrolled = $state(false)
  let isProgrammaticScroll = $state(false)
-  let isUserScrolling = $state(false)
+  let programmaticScrollTimeout: ReturnType<typeof setTimeout>
  let loadingBackward = $state(true)
  let loadingForward = $state(true)
  let share = $state(popKey<TrustedEvent | undefined>("share"))
@@ -286,10 +316,6 @@
  let compose: RoomCompose | undefined = $state()
  let eventToEdit: TrustedEvent | undefined = $state()

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

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

  const start = () => {
@@ -375,7 +400,7 @@
      url,
      at: at || now(),
      element: element!,
-      filters: [{kinds: [MESSAGE, ROOM_ADD_MEMBER], "#h": [h]}],
+      filters: [{kinds: [...MESSAGE_KINDS, ROOM_ADD_MEMBER], "#h": [h]}],
      onBackwardExhausted: () => {
        loadingBackward = false
      },
@@ -408,8 +433,7 @@
  onMount(() => {
    start()

-    // Wrap in a closure to avoid calling a stale cleanup function
-    return () => cleanup?.()
+    return cleanup
  })
 </script>

@@ -451,9 +475,21 @@
    <PageContent
      bind:element
      onscroll={onScroll}
+      onwheel={markInteraction}
+      ontouchmove={markInteraction}
+      onpointerdown={markInteraction}
+      onpointermove={(e: PointerEvent) => {
+        if (e.buttons > 0) markInteraction()
+      }}
+      onkeydown={(e: KeyboardEvent) => {
+        if (["ArrowUp", "ArrowDown", "PageUp", "PageDown", "Home", "End", " "].includes(e.key)) {
+          markInteraction()
+        }
+      }}
      class={cx(
-        "flex-col-reverse pb-0! pt-4",
-        showMobileVideoPanel ? "hidden md:flex md:flex-col-reverse" : "flex",
+        showMobileVideoPanel
+          ? "hidden flex-col-reverse pt-4 md:flex md:flex-col-reverse"
+          : "flex flex-col-reverse pt-4",
        pageContentHiddenDesktopVideoOnly && "md:hidden",
      )}>
      {#if $room.isPrivate && $membershipStatus !== MembershipStatus.Granted}
@@ -483,7 +519,7 @@
            <Spinner loading={loadingForward}>Looking for messages...</Spinner>
          </p>
        {/if}
-        {#each elements as { type, id, value, showPubkey, addSpaceBelow }, i (id)}
+        {#each elements as { type, id, value, showPubkey, addSpaceBelow } (id)}
          {#if type === "new-messages"}
            <div
              {id}
@@ -496,18 +532,20 @@
          {:else if type === "date"}
            <Divider>{value}</Divider>
          {:else}
-            {@const event = value as TrustedEvent}
+            {@const event = $state.snapshot(value as TrustedEvent)}
            {#if event.kind === ROOM_ADD_MEMBER}
              <RoomItemAddMember {url} {event} />
            {:else}
-              <RoomItem
-                {url}
-                {event}
-                {replyTo}
-                {showPubkey}
-                {addSpaceBelow}
-                canEdit={canEditEvent}
-                onEdit={onEditEvent} />
+              <div in:slide class="cv">
+                <RoomItem
+                  {url}
+                  {event}
+                  {replyTo}
+                  {showPubkey}
+                  {addSpaceBelow}
+                  canEdit={canEditEvent}
+                  onEdit={onEditEvent} />
+              </div>
            {/if}
          {/if}
        {/each}
@@ -1,10 +1,9 @@
 <script lang="ts">
-  import {onMount} from "svelte"
+  import {onMount, tick} from "svelte"
  import {page} from "$app/stores"
  import {goto} from "$app/navigation"
  import type {Readable} from "svelte/store"
  import {readable} from "svelte/store"
-  import {debounce} from "throttle-debounce"
  import {now, int, ifLet, formatTimestampAsDate, MINUTE, ago} from "@welshman/lib"
  import type {TrustedEvent, EventContent} from "@welshman/util"
  import {makeEvent, MESSAGE, RELAY_ADD_MEMBER} from "@welshman/util"
@@ -26,7 +25,7 @@
  import RoomCompose from "@app/components/RoomCompose.svelte"
  import RoomComposeEdit from "@src/app/components/RoomComposeEdit.svelte"
  import RoomComposeParent from "@app/components/RoomComposeParent.svelte"
-  import {userSettingsValues, decodeRelay, PROTECTED} from "@app/core/state"
+  import {userSettingsValues, decodeRelay, PROTECTED, MESSAGE_KINDS} from "@app/core/state"
  import {prependParent, canEnforceNip70, publishDelete} from "@app/core/commands"
  import {checked} from "@app/util/notifications"
  import {pushToast} from "@app/util/toast"
@@ -38,6 +37,13 @@
  const url = decodeRelay($page.params.relay!)
  const shouldProtect = canEnforceNip70(url)
  const at = $derived(parseInt($page.url.searchParams.get("at")!))
+  const targetId = $derived($page.url.searchParams.get("e"))
+
+  $effect(() => {
+    void at
+    void targetId
+    userHasScrolled = false
+  })

  const replyTo = (event: TrustedEvent) => {
    parent = event
@@ -57,10 +63,6 @@
  }

  const onSubmit = async ({content, tags}: EventContent) => {
-    if (!content && !share) {
-      return
-    }
-
    try {
      let template: EventContent & {created_at?: number} = {content, tags}

@@ -127,29 +129,56 @@
      }
    }

-    if (!userHasScrolled && !isNaN(at)) {
-      const targetEvent = $events.find(event => event.created_at >= at)
+    if (!userHasScrolled && (!isNaN(at) || targetId)) {
+      const targetEvent = targetId
+        ? $events.find(event => event.id === targetId)
+        : $events.find(event => event.created_at <= at)

      if (targetEvent) {
        const target = element?.querySelector(`[data-event="${targetEvent.id}"]`)

        if (target instanceof HTMLElement) {
          isProgrammaticScroll = true
+          clearTimeout(programmaticScrollTimeout)
+          programmaticScrollTimeout = setTimeout(() => {
+            isProgrammaticScroll = false
+          }, 300)
+
          target.scrollIntoView({block: "center"})
+
+          if (target.dataset.highlighted !== "true") {
+            target.dataset.highlighted = "true"
+            target.style.filter = "brightness(1.5)"
+            target.style.transitionProperty = "all"
+            target.style.transitionDuration = "400ms"
+
+            setTimeout(() => {
+              target.style.transitionDuration = "300ms"
+              target.style.filter = ""
+            }, 800)
+          }
        }
      }
    }
  }

+  let isInteracting = false
+  let interactionTimeout: ReturnType<typeof setTimeout>
+  const markInteraction = () => {
+    isInteracting = true
+    clearTimeout(interactionTimeout)
+    interactionTimeout = setTimeout(() => {
+      isInteracting = false
+    }, 500)
+  }
+
  const onScroll = () => {
    if (!isProgrammaticScroll) {
-      userHasScrolled = true
-      isUserScrolling = true
-      clearIsUserScrolling()
+      if (isInteracting) {
+        userHasScrolled = true
+      }
      manageScrollPosition()
    }
-
-    isProgrammaticScroll = false
  }

  const scrollToNewMessages = () =>
@@ -167,7 +196,7 @@
  let loadingForward = $state(true)
  let userHasScrolled = $state(false)
  let isProgrammaticScroll = $state(false)
-  let isUserScrolling = $state(false)
+  let programmaticScrollTimeout: ReturnType<typeof setTimeout>
  let share = $state(popKey<TrustedEvent | undefined>("share"))
  let parent: TrustedEvent | undefined = $state()
  let element: HTMLElement | undefined = $state()
@@ -179,10 +208,6 @@
  let compose: RoomCompose | undefined = $state()
  let eventToEdit: TrustedEvent | undefined = $state()

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

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

  const start = () => {
@@ -268,7 +292,7 @@
      url,
      at: at || now(),
      element: element!,
-      filters: [{kinds: [MESSAGE, RELAY_ADD_MEMBER]}],
+      filters: [{kinds: [...MESSAGE_KINDS, RELAY_ADD_MEMBER]}],
      onBackwardExhausted: () => {
        loadingBackward = false
      },
@@ -301,8 +325,7 @@
  onMount(() => {
    start()

-    // Wrap in a closure to avoid calling a stale cleanup function
-    return () => cleanup?.()
+    return cleanup
  })
 </script>

@@ -316,13 +339,27 @@
  {/snippet}
 </SpaceBar>

-<PageContent bind:element onscroll={onScroll} class="flex flex-col-reverse pt-4 pb-0!">
+<PageContent
+  bind:element
+  onscroll={onScroll}
+  onwheel={markInteraction}
+  ontouchmove={markInteraction}
+  onpointerdown={markInteraction}
+  onpointermove={(e: PointerEvent) => {
+    if (e.buttons > 0) markInteraction()
+  }}
+  onkeydown={(e: KeyboardEvent) => {
+    if (["ArrowUp", "ArrowDown", "PageUp", "PageDown", "Home", "End", " "].includes(e.key)) {
+      markInteraction()
+    }
+  }}
+  class="flex flex-col-reverse pt-4 mb-14 md:mb-0">
  {#if loadingForward}
    <p class="py-20 flex justify-center">
      <Spinner loading={loadingForward}>Looking for messages...</Spinner>
    </p>
  {/if}
-  {#each elements as { type, id, value, showPubkey, addSpaceBelow }, i (id)}
+  {#each elements as { type, id, value, showPubkey, addSpaceBelow } (id)}
    {#if type === "new-messages"}
      <div
        {id}
@@ -335,18 +372,20 @@
    {:else if type === "date"}
      <Divider>{value}</Divider>
    {:else}
-      {@const event = value as TrustedEvent}
+      {@const event = $state.snapshot(value as TrustedEvent)}
      {#if event.kind === RELAY_ADD_MEMBER}
        <RoomItemAddMember {url} {event} />
      {:else}
-        <RoomItem
-          {url}
-          {event}
-          {replyTo}
-          {showPubkey}
-          canEdit={canEditEvent}
-          onEdit={onEditEvent}
-          {addSpaceBelow} />
+        <div>
+          <RoomItem
+            {url}
+            {event}
+            {replyTo}
+            {showPubkey}
+            canEdit={canEditEvent}
+            onEdit={onEditEvent}
+            {addSpaceBelow} />
+        </div>
      {/if}
    {/if}
  {/each}
@@ -5,7 +5,7 @@
  import {page} from "$app/stores"
  import {sortBy, partition, spec, pushToMapKey, max} from "@welshman/lib"
  import type {TrustedEvent} from "@welshman/util"
-  import {getTagValue, POLL} from "@welshman/util"
+  import {getTagValue} from "@welshman/util"
  import {fly} from "@lib/transition"
  import PollIcon from "@assets/icons/revote.svg?dataurl"
  import Add from "@assets/icons/add.svg?dataurl"
@@ -16,6 +16,7 @@
  import SpaceBar from "@app/components/SpaceBar.svelte"
  import PollItem from "@app/components/PollItem.svelte"
  import PollCreate from "@app/components/PollCreate.svelte"
+  import {Poll} from "nostr-tools/kinds"
  import {decodeRelay, makeCommentFilter} from "@app/core/state"
  import {makeFeed} from "@app/core/requests"
  import {pushModal} from "@app/util/modal"
@@ -30,7 +31,7 @@

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

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

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

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

@@ -25,7 +25,6 @@
    ZAP_GOAL,
    EVENT_TIME,
    COMMENT,
-    POLL,
    getTagValue,
    getTagValues,
    getIdAndAddress,
@@ -51,6 +50,7 @@
  import RecentConversation from "@app/components/RecentConversation.svelte"
  import {decodeRelay, deriveEventsForUrl, CONTENT_KINDS} from "@app/core/state"
  import {goToEvent} from "@app/util/routes"
+  import {Poll} from "nostr-tools/kinds"

  const url = decodeRelay($page.params.relay!)
  const since = ago(3, MONTH)
@@ -305,7 +305,7 @@
        <GoalItem {url} {event} />
      {:else if event.kind === EVENT_TIME}
        <CalendarEventItem {url} {event} />
-      {:else if event.kind === POLL}
+      {:else if event.kind === Poll}
        <PollItem {url} {event} />
      {:else}
        <NoteItem {url} {event} />
@@ -1,6 +1,5 @@
 <script lang="ts">
-  import CloudCheck from "@assets/icons/cloud-check.svg?dataurl"
-  import CheckCircle from "@assets/icons/check-circle.svg?dataurl"
+  import Server from "@assets/icons/server.svg?dataurl"
  import ArrowRight from "@assets/icons/arrow-right.svg?dataurl"
  import Link from "@lib/components/Link.svelte"
  import Icon from "@lib/components/Icon.svelte"
@@ -13,91 +12,78 @@
  <PageContent class="flex flex-col items-center gap-2 p-2 pt-4">
    <PageHeader>
      {#snippet title()}
-        <div>Choose your Hosting Plan</div>
+        <div>Create your own Space</div>
      {/snippet}
      {#snippet info()}
-        <p>
-          Select how you want to deploy and manage your new Space. You can always migrate later.
-        </p>
+        <p>Get started with one of our trusted partners, or learn how to host your own space.</p>
      {/snippet}
    </PageHeader>
-    <div class="flex w-full max-w-lg flex-col gap-4 lg:max-w-4xl">
-      <div class="grid grid-cols-1 gap-2 lg:grid-cols-2">
-        <div class="card2 bg-alt flex flex-col gap-5">
-          <div class="flex flex-col gap-3">
-            <div class="bg-primary/20 flex h-10 w-10 items-center justify-center rounded-md">
-              <Icon icon={CloudCheck} class="text-primary" />
+    <div class="grid w-full max-w-lg grid-cols-1 gap-2 lg:max-w-4xl lg:grid-cols-2">
+      <div class="card2 bg-alt flex flex-col gap-4">
+        <div class="flex flex-col gap-4">
+          <div class="flex items-center justify-between">
+            <div class="flex items-center gap-3">
+              <Icon icon={Server} />
+              <h3 class="text-lg font-bold">Self-Host your Space</h3>
            </div>
-            <div class="flex flex-col gap-1">
-              <h3 class="text-lg font-bold">Community</h3>
-              <div class="text-xs font-semibold tracking-wider opacity-60">SELF-HOSTED</div>
-            </div>
-            <p class="text-sm opacity-70">
-              For technical users who want full control. Deploy on your own infrastructure and
-              manage your own updates and scaling.
-            </p>
+            <div class="badge badge-neutral">Recommended</div>
          </div>
-          <ul class="flex flex-col gap-2 text-sm">
-            <li class="flex items-center gap-2">
-              <Icon icon={CheckCircle} class="opacity-60" />
-              Open source core
-            </li>
-            <li class="flex items-center gap-2">
-              <Icon icon={CheckCircle} class="opacity-60" />
-              Community support
-            </li>
-            <li class="flex items-center gap-2">
-              <Icon icon={CheckCircle} class="opacity-60" />
-              Bring your own infra
-            </li>
+          <ul class="flex list-inside list-disc flex-col gap-1 text-sm opacity-70">
+            <li>Unlimited customization and control</li>
+            <li>Free and open source software</li>
+            <li>Full-featured admin dashboards available</li>
+            <li>Requires some technical skills</li>
          </ul>
-          <Link
-            external
-            class="btn btn-neutral mt-auto"
-            href="https://gitea.coracle.social/coracle/zooid">
-            Get started
-            <Icon icon={ArrowRight} />
-          </Link>
-        </div>
-        <div class="card2 bg-alt border-primary flex flex-col gap-5 border">
-          <div class="flex flex-col gap-3">
-            <div class="flex items-start justify-between">
-              <img alt="Coracle Logo" src="/coracle.png" class="h-10 w-10" />
-              <div class="badge badge-primary">Recommended</div>
-            </div>
-            <div class="flex flex-col gap-1">
-              <h3 class="text-lg font-bold">Coracle Hosting</h3>
-              <div class="text-xs font-semibold tracking-wider opacity-60">FULLY MANAGED</div>
-            </div>
-            <p class="text-sm opacity-70">
-              The premium experience. We handle the infrastructure, security updates, and scaling so
-              you can focus on your community.
-            </p>
-          </div>
-          <ul class="flex flex-col gap-2 text-sm">
-            <li class="flex items-center gap-2">
-              <Icon icon={CheckCircle} class="text-primary" />
-              One-click deployment
-            </li>
-            <li class="flex items-center gap-2">
-              <Icon icon={CheckCircle} class="text-primary" />
-              Automated backups & scaling
-            </li>
-            <li class="flex items-center gap-2">
-              <Icon icon={CheckCircle} class="text-primary" />
-              Priority support
-            </li>
-          </ul>
-          <Link external class="btn btn-primary mt-auto" href="https://hosting.coracle.social">
-            Start for free
-            <Icon icon={ArrowRight} />
-          </Link>
        </div>
+        <Link external class="btn btn-primary" href="https://github.com/coracle-social/zooid">
+          Get Started
+          <Icon icon={ArrowRight} />
+        </Link>
      </div>
-      <div class="flex flex-col items-center justify-center gap-2 py-2 text-sm opacity-70">
-        <span>Want to host on other servers?</span>
-        <Link external class="link center gap-1" href="https://relay.tools/signup">
-          Other hosting options
+      <div class="card2 bg-alt flex flex-col gap-4">
+        <div class="flex flex-col gap-4">
+          <div class="flex items-center justify-between">
+            <div class="flex items-center gap-2">
+              <img alt="Coracle Logo" src="/coracle.png" class="h-7 w-7" />
+              <h3 class="text-lg font-bold">Coracle Hosting</h3>
+            </div>
+            <div class="badge badge-neutral">Recommended</div>
+          </div>
+          <ul class="flex list-inside list-disc flex-col gap-1 text-sm opacity-70">
+            <li>Simple setup, support included</li>
+            <li>Free and open source software — no vendor lock-in</li>
+            <li>Advanced access controls and relay policies</li>
+            <li>Full-featured admin dashboard</li>
+          </ul>
+        </div>
+        <Link external class="btn btn-neutral" href="https://hosting.coracle.social">
+          Get Started
+          <Icon icon={ArrowRight} />
+        </Link>
+      </div>
+      <div class="card2 bg-alt flex flex-col gap-4">
+        <div class="flex flex-col gap-4">
+          <div class="self-start">
+            <img
+              alt="Relay Tools"
+              src="https://relay.tools/17.svg"
+              class="-my-20 -ml-2 hidden h-48 dark:block"
+              style="filter: contrast(50%)" />
+            <img
+              alt="Relay Tools"
+              src="https://relay.tools/19.svg"
+              class="-my-20 -ml-2 h-48 dark:hidden"
+              style="filter: contrast(50%)" />
+          </div>
+          <ul class="flex list-inside list-disc flex-col gap-1 text-sm opacity-70">
+            <li>Independently run</li>
+            <li>Customizable relay policies</li>
+            <li>Simple management dashboard</li>
+            <li>Support available</li>
+          </ul>
+        </div>
+        <Link external class="btn btn-neutral" href="https://relay.tools/signup">
+          Get Started
          <Icon icon={ArrowRight} />
        </Link>
      </div>
@@ -1,15 +1,12 @@
 [
  {
-    "relation": [
-      "delegate_permission/common.handle_all_urls"
-    ],
+    "relation": ["delegate_permission/common.handle_all_urls"],
    "target": {
      "namespace": "android_app",
      "package_name": "social.flotilla",
      "sha256_cert_fingerprints": [
        "D0:2A:2E:82:75:92:4D:E2:13:E8:46:B8:EA:09:15:17:7F:46:7B:D1:49:E3:12:60:F0:01:D3:EF:42:9B:A2:DA",
-        "6D:AF:68:3E:1C:A8:3A:4C:D8:85:73:E9:73:9E:2A:A9:44:C8:5D:56:15:4E:34:42:30:55:7C:FF:ED:4A:D7:8C",
-        "8C:EE:37:F9:8A:08:02:A7:BB:55:2B:64:E5:A5:93:D8:58:73:14:26:66:71:DD:B0:4F:AB:9D:D5:4C:DF:FB:F7"
+        "6D:AF:68:3E:1C:A8:3A:4C:D8:85:73:E9:73:9E:2A:A9:44:C8:5D:56:15:4E:34:42:30:55:7C:FF:ED:4A:D7:8C"
      ]
    }
  }
Author	SHA1	Message	Date
bhavishy2801	45395bae7f	merge upstream	2026-04-14 15:38:42 +00:00
bhavishy2801	0db751bd45	fix: stabilize list loading and show correct list count	2026-04-14 19:45:38 +05:30
bhavishy2801	2cea6c4ef4	merge upstream	2026-04-14 13:42:38 +00:00
bhavishy2801	562886a029	Merge branch 'dev' into feat-bookmarks	2026-04-13 21:19:44 +00:00
bhavishy2801	ad3f882081	feat: implement bookmarks page	2026-04-14 01:21:27 +05:30