Merge pull request #186 from coracle-social/flotilla-180-rooms-disappear

Save rooms to local storage
2025-08-27 06:25:08 -07:00 · 2025-08-27 09:07:32 -04:00 · 2025-08-26 11:17:38 -07:00 · 2025-08-26 11:08:59 -07:00 · 2025-08-26 13:37:40 -04:00 · 2025-08-26 13:31:01 -04:00
196 changed files with 3882 additions and 1509 deletions
@@ -13,5 +13,6 @@ VITE_INDEXER_RELAYS=wss://purplepag.es/,wss://relay.damus.io/,wss://relay.nostr.
 VITE_SIGNER_RELAYS=wss://relay.nsec.app/,wss://bucket.coracle.social/
 VITE_NOTIFIER_PUBKEY=27b7c2ed89ef78322114225ea3ebf5f72c7767c2528d4d0c1854d039c00085df
 VITE_NOTIFIER_RELAY=wss://anchor.coracle.social/
+VITE_VAPID_PUBLIC_KEY=BIt2D4BdgdbCowD_0d3Np6GbrIGHxd7aIEUeZNe3hQuRlHz02OhzvDaai0XSFoJYVzSzdMjdyW-QhvW9_yq8j4Y
 VITE_GLITCHTIP_API_KEY=
 GLITCHTIP_AUTH_TOKEN=
@@ -1,47 +0,0 @@
-name: Build and Publish Docker Image
-
-on:
-  push:
-    tags:
-      - '*'
-
-env:
-  REGISTRY: docker.io
-  IMAGE_NAME: ${{ github.repository }}
-
-jobs:
-  build-and-push:
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      packages: write
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-
-      - name: Log in to Docker Hub
-        uses: docker/login-action@v3
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-
-      - name: Extract metadata (tags, labels) for Docker
-        id: meta
-        uses: docker/metadata-action@v5
-        with:
-          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
-          tags: |
-            type=semver,pattern={{version}}
-            type=semver,pattern={{major}}.{{minor}}
-            type=semver,pattern={{major}}
-
-      - name: Build and push Docker image
-        uses: docker/build-push-action@v5
-        with:
-          context: .
-          push: true
-          tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
@@ -1,5 +1,47 @@
 # Changelog

+# 1.2.3
+
+* Add `created_at` to event info dialog
+* Add signer status to profile page
+* Re-work bunker login flow
+* Add in-app onboarding flow
+* Only protect events if relay authenticates
+* Filter out non-global chats from global chat
+* Improve publish status indicator
+* Fix encrypted upload content type
+* Add relays to event details dialog
+* Add universal link handler for apps
+
+# 1.2.2
+
+* Fix phantom chat notifications
+* Fix zaps on mobile
+
+# 1.2.1
+
+* Add zaps to chat, threads, and events
+* Add funding goals
+* Add NWC support
+* Add wallet settings page
+* Handle invalid bunker url
+* Fix sidebar overflow
+* Fix profile npub display
+
+# 1.2.0
+
+* Fix sort order of thread comments
+* Fix link display when no title is available
+* Fix making profiles non-protected
+* Replace bunker url with relay claims for notifier auth
+* Add push notifications on all platforms
+* Add "mark all as read" on desktop
+* Re-design space dashboard
+
+# 1.1.1
+
+* Add chat quick link
+
 # 1.1.0

 * Add better theming support
@@ -1,26 +0,0 @@
-## Project Overview
-
-Flotilla is a Discord-like Nostr client that operates on the concept of "relays as groups/spaces." Built with SvelteKit 2.5 and Svelte 5, it provides messaging, threads, calendar events, and social features across Nostr relays.
-
-## Important Patterns
-
-### Finding Code
- Prefer navigating from one file to the next following imports when possible
- If search is necessary, use `ack`, not `grep` or `rg`.
-
-### Nostr Event Handling
- Prefer seconds to milliseconds when handling nostr events.
-
-### Styling Conventions
- When styling html, prefer flex/gap classes over margin or space-y classes.
-
-### Room/space memberships
-
-Memberships are surfaced as "bookmarks" to the user.
-
-```typescript
-import {membershipsByPubkey, getMembershipUrls} from '@app/state'
-
-const spaces = getMembershipUrls($membershipsByPubkey.get(pubkey))
-const rooms = getMembershipRooms($membershipsByPubkey.get(pubkey))
-```
@@ -0,0 +1,96 @@
+# Contributing guidelines
+
+## Project Overview
+
+Flotilla is a svelte/typescript/capacitor project. It's intended to be an alternative to Discord for Nostr users. A high-quality UX is a priority, with an emphasis on well-tested, intuitive designs, and robust implementations.
+
+## Getting Started
+
+Run `pnpm run dev` to get a dev server, and `pnpm run check:watch` to watch for typescript errors. When you're ready to commit, a pre-commit hook will run to lint and typecheck your work. To run the project on Android or iOS, use Android Studio or Xcode.
+
+The `master` branch is automatically deployed to production, so always work on feature branches based on the `dev` branch. This project frequently uses unreleased versions of [welshman](https://welshman.coracle.social), using `pnpm` link to hotlink a local copy of the code. To set that up, clone welshman to the parent directory of your `coracle` client, then add `link:../welshman/packages/packagename` to the `pnpm.overrides` section of your `package.json`. Below is a nodejs script that will do that automatically for you:
+
+```javascript
+#!/usr/bin/env node
+
+import fs from 'fs'
+import path from 'path'
+
+const packageJson = JSON.parse(fs.readFileSync('./package.json', 'utf8'))
+
+packageJson.pnpm.overrides = Object.keys(packageJson.dependencies)
+  .filter(pkg => pkg.startsWith('@welshman/'))
+  .reduce((acc, pkg) => {
+    const packageName = pkg.split('/')[1]
+    acc[pkg] = `link:../welshman/packages/${packageName}`
+    return acc
+  }, {})
+
+fs.writeFileSync('./package.json', JSON.stringify(packageJson, null, 2) + '\n')
+
+console.log('Added welshman package overrides.')
+```
+
+Be sure to avoid committing overrides to either `package.json` or `pnpm-lock.yaml`. These overrides can generally be added, installed, and removed, and will persist until another `pnpm install` command gets run.
+
+## File Structure
+
+The main parts of the application are as follows:
+
+- `static` - static assets like fonts, images, etc.
+- `src/assets` - svgs for use as icons.
+- `src/lib` - general purpose components and utilities.
+- `src/app/core/state` - environment variables, constants, custom stores, and some utilities derived from them.
+- `src/app/core/requests` - utilities related to loading data from the nostr network.
+- `src/app/core/commands` - utilities related to publishing nostr events and uploading media to blossom servers.
+- `src/app/utils` - other application logic, including stuff related to modals, routing, etc.
+- `src/app/editor` - configuration for `@welshman/editor` for use in various app views.
+- `src/app/components` - reusable components that depend on other `app` stuff.
+- `src/routes` - file-based routing interpreted by sveltekit.
+
+Application organization is based on an acyclic dependency graph:
+
+- `routes` can depend on anything
+- `app/components` can depend on anything in `app` or `lib`
+- `app/utils` and `app/core` can only depend on `lib`
+- `lib` (and everything else) can depend only on external libraries
+
+The main stylistic/organizational rule when working in this project is that imports should be sorted based on the dependency graph. Third-party libraries should come first, then `lib`, then `app`.
+
+## System Architecture
+
+Flotilla's architecture generally mirrors the file structure. State is stored using Svelte `store`s provided either by `@welshman/app` or by `app/core/state`, allowing for idiomatic svelte 4 usage (svelte 5 runes are [ghey](https://habla.news/u/hodlbod@coracle.social/1739830562159) and not allowed outside of UI components).
+
+State is then synchronized to local storage or indexeddb using storage helpers provided by welshman in `routes/+layout.svelte`. Other top level synchronization logic generally belongs there.
+
+`app/core/state` contains all environment variables, constants, custom stores, and utilities derived from them. Most stores are `derived` from our event `repository` using `deriveEventsMapped`, which efficiently queries the repository and maps events to custom data structures. Some of these data structures are provided by `welshman`, and some are defined in `app/core/state`. In either case, they can always be mapped back to an event, which is important for updating replaceables without dropping unknown data.
+
+Here are a few important domain objects:
+
+- Spaces are relays used as community groups. Their `url`s are core to a lot of data and components, and are frequently passed around from place to place.
+- Chats are direct message conversations. There is currently some ambiguity in routing, since relays that don't support NIP 29 also have a "chat" tab, which uses vanilla NIP-C7.
+- NIP 29 groups are variously called "rooms" and "channels". Conventionally, a "room" is a group id, while a "channel" as an object representing the group's metadata.
+- "Alerts" are records of requests the user has made to be notified, following [this NIP](https://github.com/nostr-protocol/nips/pull/1796)
+
+`app/core/requests` contains utilities related to loading data from the nostr network. This might include feed manager utilities, loaders, or listeners.
+
+`app/core/commands` contains utilities related to publishing nostr events and uploading media to blossom servers. This also includes utilities related to sending lighting payments, authenticating with relays, or probing relay policy. Event creation should generally be split into `make` functions which build the event, and `publish` functions which publish the event using `publishThunk`.
+
+Any of these utilities can be included either in `app/components` or `routes`. Crucial to keep in mind is that nearly all global state runs through welshman's `repository` in a unidirectional way. To update state, run `publishThunk`, which immediately publishes the event to the local repository. State can be read from the repository using `deriveEventsMapped` or other utilities provided by welshman like `deriveProfile`.
+
+Thunks are designed to reduce UI latency, handling signatures and delayed sending the background. In most cases, thunk status should be displayed to the user so that they can cancel sending or address errors.
+
+Toast, modals, and sidebar dialogs are controlled in `app/util/modal` and `app/util/toast`. In both cases, component objects can be passed along with parameters, but care has to be taken that the calling component either doesn't unmount before the modal (as when one modal replaces another), or that `$state.snapshot` is appropriately called on any state runes. These components frequently run into weird svelte compiler bugs too, in which case you may have to do some silly things to cope.
+
+## Issues and Pull Requests
+
+All work by contributors should be done against an issue. If there is no issue for the work you're doing, please open one or ask the project owner to open one. All PRs should be opened against the `dev` branch (unless for hotfixes).
+
+## Communication
+
+Discussion about development is done [on Flotilla](https://app.flotilla.social/spaces/internal.coracle.social). The group is currently closed, so please let me know if you'd like access.
+
+## Project License
+
+This project is licensed under the MIT license. By contributing, you agree to waive all intellectual property rights to your contributions to this project.
+
@@ -22,7 +22,7 @@ If you're deploying a custom version of flotilla, be sure to remove the `plausib

 ## Development

-Run `pnpm run dev` to get a dev server, and `pnpm run check:watch` to watch for typescript errors. When you're ready to commit, a pre-commit hook will run to lint and typecheck your work.
+See [./CONTRIBUTING.md](CONTRIBUTING.md).

 ## Deployment

@@ -7,8 +7,8 @@ android {
        applicationId "social.flotilla"
        minSdk rootProject.ext.minSdkVersion
        targetSdk rootProject.ext.targetSdkVersion
-        versionCode 19
-        versionName "1.1.0"
+        versionCode 24
+        versionName "1.2.3"
        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
        aaptOptions {
             // Files and dirs to omit from the packaged assets dir, modified to accommodate modern web apps.
@@ -12,6 +12,8 @@ dependencies {
    implementation project(':capacitor-community-safe-area')
    implementation project(':capacitor-app')
    implementation project(':capacitor-keyboard')
+    implementation project(':capacitor-push-notifications')
+    implementation project(':capawesome-capacitor-badge')
    implementation project(':nostr-signer-capacitor-plugin')

 }
@@ -20,6 +20,13 @@
                <action android:name="android.intent.action.MAIN" />
                <category android:name="android.intent.category.LAUNCHER" />
            </intent-filter>
+
+            <intent-filter android:autoVerify="true">
+                <action android:name="android.intent.action.VIEW" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+                <data android:scheme="https" android:host="app.flotilla.social" />
+            </intent-filter>
        </activity>

        <provider
@@ -34,4 +41,5 @@
    <!-- Permissions -->

    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
 </manifest>
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools">

    <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
        <item name="colorPrimary">@color/colorPrimary</item>
@@ -11,6 +11,7 @@
        <item name="windowActionBar">false</item>
        <item name="windowNoTitle">true</item>
        <item name="android:background">@null</item>
+        <item name="android:windowOptOutEdgeToEdgeEnforcement" tools:ignore="NewApi">true</item>
    </style>


@@ -11,5 +11,11 @@ project(':capacitor-app').projectDir = new File('../node_modules/.pnpm/@capacito
 include ':capacitor-keyboard'
 project(':capacitor-keyboard').projectDir = new File('../node_modules/.pnpm/@capacitor+keyboard@7.0.1_@capacitor+core@7.2.0/node_modules/@capacitor/keyboard/android')

+include ':capacitor-push-notifications'
+project(':capacitor-push-notifications').projectDir = new File('../node_modules/.pnpm/@capacitor+push-notifications@7.0.1_@capacitor+core@7.2.0/node_modules/@capacitor/push-notifications/android')
+
+include ':capawesome-capacitor-badge'
+project(':capawesome-capacitor-badge').projectDir = new File('../node_modules/.pnpm/@capawesome+capacitor-badge@7.0.1_@capacitor+core@7.2.0/node_modules/@capawesome/capacitor-badge/android')
+
 include ':nostr-signer-capacitor-plugin'
 project(':nostr-signer-capacitor-plugin').projectDir = new File('../node_modules/.pnpm/nostr-signer-capacitor-plugin@0.0.4_@capacitor+core@7.2.0/node_modules/nostr-signer-capacitor-plugin/android')
@@ -1,8 +1,10 @@
 #!/usr/bin/env bash

+set -e
+
 # Fetch tags and set to env vars
-git fetch --prune --unshallow --tags
-git describe --tags --abbrev=0
+git fetch --prune --unshallow --tags || true
+git describe --tags --abbrev=0 || true
 export VITE_BUILD_VERSION=$RENDER_GIT_COMMIT
 export VITE_BUILD_HASH=$RENDER_GIT_COMMIT

@@ -7,6 +7,9 @@ const config: CapacitorConfig = {
  server: {
    androidScheme: "https"
  },
+  android: {
+    adjustMarginsForEdgeToEdge: false,
+  },
  plugins: {
    SplashScreen: {
      androidSplashResourceName: "splash"
@@ -15,6 +18,10 @@ const config: CapacitorConfig = {
      style: "DARK",
      resizeOnFullScreen: true,
    },
+    Badge: {
+      persist: true,
+      autoClear: true
+    },
  },
  // Use this for live reload https://capacitorjs.com/docs/guides/live-reload
  // server: {
@@ -18,6 +18,7 @@
 /* End PBXBuildFile section */

 /* Begin PBXFileReference section */
+		051414282E0CC28400BE0BC8 /* Flotilla Chat.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = "Flotilla Chat.entitlements"; sourceTree = "<group>"; };
 		1F53EE54954731A2328CBC4B /* Pods-Flotilla Chat.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Flotilla Chat.release.xcconfig"; path = "Pods/Target Support Files/Pods-Flotilla Chat/Pods-Flotilla Chat.release.xcconfig"; sourceTree = "<group>"; };
 		2FAD9762203C412B000D30F8 /* config.xml */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = config.xml; sourceTree = "<group>"; };
 		50379B222058CBB4000EE86E /* capacitor.config.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = capacitor.config.json; sourceTree = "<group>"; };
@@ -57,6 +58,7 @@
 		504EC2FB1FED79650016851F = {
 			isa = PBXGroup;
 			children = (
+				051414282E0CC28400BE0BC8 /* Flotilla Chat.entitlements */,
 				504EC3061FED79650016851F /* App */,
 				504EC3051FED79650016851F /* Products */,
 				7F8756D8B27F46E3366F6CEA /* Pods */,
@@ -349,16 +351,17 @@
 			baseConfigurationReference = 7B9FA71C362B734D9F965709 /* Pods-Flotilla Chat.debug.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				CODE_SIGN_ENTITLEMENTS = "Flotilla Chat.entitlements";
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 12;
+				CURRENT_PROJECT_VERSION = 17;
 				DEVELOPMENT_TEAM = S26U9DYW3A;
 				INFOPLIST_FILE = App/Info.plist;
 				INFOPLIST_KEY_CFBundleDisplayName = "Flotilla Chat";
 				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.social-networking";
 				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				MARKETING_VERSION = 1.1.0;
+				MARKETING_VERSION = 1.2.3;
 				OTHER_SWIFT_FLAGS = "$(inherited) \"-D\" \"COCOAPODS\" \"-DDEBUG\"";
 				PRODUCT_BUNDLE_IDENTIFIER = social.flotilla;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -374,16 +377,17 @@
 			baseConfigurationReference = 1F53EE54954731A2328CBC4B /* Pods-Flotilla Chat.release.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				CODE_SIGN_ENTITLEMENTS = "Flotilla Chat.entitlements";
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 12;
+				CURRENT_PROJECT_VERSION = 17;
 				DEVELOPMENT_TEAM = S26U9DYW3A;
 				INFOPLIST_FILE = App/Info.plist;
 				INFOPLIST_KEY_CFBundleDisplayName = "Flotilla Chat";
 				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.social-networking";
 				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				MARKETING_VERSION = 1.1.0;
+				MARKETING_VERSION = 1.2.3;
 				PRODUCT_BUNDLE_IDENTIFIER = social.flotilla;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -46,4 +46,13 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
        return ApplicationDelegateProxy.shared.application(application, continue: userActivity, restorationHandler: restorationHandler)
    }

+    func application(_ application: UIApplication, didRegisterForRemoteNotificationsWithDeviceToken deviceToken: Data) {
+      // Enable push notifications https://capacitorjs.com/docs/apis/push-notifications
+      NotificationCenter.default.post(name: .capacitorDidRegisterForRemoteNotifications, object: deviceToken)
+    }
+
+    func application(_ application: UIApplication, didFailToRegisterForRemoteNotificationsWithError error: Error) {
+      // Enable push notifications https://capacitorjs.com/docs/apis/push-notifications
+      NotificationCenter.default.post(name: .capacitorDidFailToRegisterForRemoteNotifications, object: error)
+    }
 }
@@ -49,5 +49,9 @@
 	<true/>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
+	<key>UIBackgroundModes</key>
+	<array>
+		<string>remote-notification</string>
+	</array>
 </dict>
 </plist>
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>aps-environment</key>
+	<string>development</string>
+	<key>com.apple.developer.associated-domains</key>
+	<array>
+		<string>applinks:app.flotilla.social</string>
+	</array>
+</dict>
+</plist>
@@ -14,6 +14,8 @@ def capacitor_pods
  pod 'CapacitorCommunitySafeArea', :path => '../../node_modules/.pnpm/@capacitor-community+safe-area@7.0.0-alpha.1_@capacitor+core@7.2.0/node_modules/@capacitor-community/safe-area'
  pod 'CapacitorApp', :path => '../../node_modules/.pnpm/@capacitor+app@7.0.1_@capacitor+core@7.2.0/node_modules/@capacitor/app'
  pod 'CapacitorKeyboard', :path => '../../node_modules/.pnpm/@capacitor+keyboard@7.0.1_@capacitor+core@7.2.0/node_modules/@capacitor/keyboard'
+  pod 'CapacitorPushNotifications', :path => '../../node_modules/.pnpm/@capacitor+push-notifications@7.0.1_@capacitor+core@7.2.0/node_modules/@capacitor/push-notifications'
+  pod 'CapawesomeCapacitorBadge', :path => '../../node_modules/.pnpm/@capawesome+capacitor-badge@7.0.1_@capacitor+core@7.2.0/node_modules/@capawesome/capacitor-badge'
  pod 'NostrSignerCapacitorPlugin', :path => '../../node_modules/.pnpm/nostr-signer-capacitor-plugin@0.0.4_@capacitor+core@7.2.0/node_modules/nostr-signer-capacitor-plugin'
 end

@@ -1,6 +1,6 @@
 {
  "name": "flotilla",
-  "version": "1.1.0",
+  "version": "1.2.3",
  "private": true,
  "scripts": {
    "dev": "vite dev",
@@ -45,25 +45,28 @@
    "@capacitor/core": "^7.0.1",
    "@capacitor/ios": "^7.0.0",
    "@capacitor/keyboard": "^7.0.0",
+    "@capacitor/push-notifications": "^7.0.1",
+    "@capawesome/capacitor-badge": "^7.0.1",
+    "@getalby/sdk": "^5.1.0",
    "@poppanator/sveltekit-svg": "^4.2.1",
    "@sentry/browser": "^8.35.0",
    "@sveltejs/adapter-static": "^3.0.4",
    "@tiptap/core": "^2.12.0",
    "@types/qrcode": "^1.5.5",
+    "@types/throttle-debounce": "^5.0.2",
    "@vite-pwa/assets-generator": "^0.2.6",
    "@vite-pwa/sveltekit": "^0.6.6",
-    "@welshman/app": "^0.3.4",
-    "@welshman/content": "^0.3.4",
-    "@welshman/dvm": "^0.3.4",
-    "@welshman/editor": "^0.3.4",
-    "@welshman/feeds": "^0.3.4",
-    "@welshman/lib": "^0.3.4",
-    "@welshman/net": "^0.3.4",
-    "@welshman/relay": "^0.3.4",
-    "@welshman/router": "^0.3.4",
-    "@welshman/signer": "^0.3.4",
-    "@welshman/store": "^0.3.4",
-    "@welshman/util": "^0.3.4",
+    "@welshman/app": "^0.4.3",
+    "@welshman/content": "^0.4.3",
+    "@welshman/editor": "^0.4.3",
+    "@welshman/feeds": "^0.4.3",
+    "@welshman/lib": "^0.4.3",
+    "@welshman/net": "^0.4.3",
+    "@welshman/relay": "^0.4.3",
+    "@welshman/router": "^0.4.3",
+    "@welshman/signer": "^0.4.3",
+    "@welshman/store": "^0.4.3",
+    "@welshman/util": "^0.4.3",
    "compressorjs": "^1.2.1",
    "daisyui": "^4.12.10",
    "date-picker-svelte": "^2.13.0",
@@ -75,7 +78,9 @@
    "nostr-signer-capacitor-plugin": "^0.0.4",
    "nostr-tools": "^2.14.2",
    "prettier-plugin-tailwindcss": "^0.6.5",
+    "qr-scanner": "^1.4.2",
    "qrcode": "^1.5.4",
+    "throttle-debounce": "^5.0.2",
    "tippy.js": "^6.3.7"
  },
  "pnpm": {
@@ -29,6 +29,15 @@ importers:
      '@capacitor/keyboard':
        specifier: ^7.0.0
        version: 7.0.1(@capacitor/core@7.2.0)
+      '@capacitor/push-notifications':
+        specifier: ^7.0.1
+        version: 7.0.1(@capacitor/core@7.2.0)
+      '@capawesome/capacitor-badge':
+        specifier: ^7.0.1
+        version: 7.0.1(@capacitor/core@7.2.0)
+      '@getalby/sdk':
+        specifier: ^5.1.0
+        version: 5.1.0(typescript@5.8.3)
      '@poppanator/sveltekit-svg':
        specifier: ^4.2.1
        version: 4.2.1(rollup@2.79.2)(svelte@5.25.10)(svgo@3.3.2)(vite@5.4.17(@types/node@22.14.0)(terser@5.39.0))
@@ -44,6 +53,9 @@ importers:
      '@types/qrcode':
        specifier: ^1.5.5
        version: 1.5.5
+      '@types/throttle-debounce':
+        specifier: ^5.0.2
+        version: 5.0.2
      '@vite-pwa/assets-generator':
        specifier: ^0.2.6
        version: 0.2.6
@@ -51,41 +63,38 @@ importers:
        specifier: ^0.6.6
        version: 0.6.8(@sveltejs/kit@2.20.5(@sveltejs/vite-plugin-svelte@4.0.4(svelte@5.25.10)(vite@5.4.17(@types/node@22.14.0)(terser@5.39.0)))(svelte@5.25.10)(vite@5.4.17(@types/node@22.14.0)(terser@5.39.0)))(@vite-pwa/assets-generator@0.2.6)(vite-plugin-pwa@0.21.2(@vite-pwa/assets-generator@0.2.6)(vite@5.4.17(@types/node@22.14.0)(terser@5.39.0))(workbox-build@7.3.0)(workbox-window@7.3.0))
      '@welshman/app':
-        specifier: ^0.3.4
-        version: 0.3.4(nostr-signer-capacitor-plugin@0.0.4(@capacitor/core@7.2.0))(typescript@5.8.3)(ws@8.18.2)
+        specifier: ^0.4.3
+        version: 0.4.3(nostr-signer-capacitor-plugin@0.0.4(@capacitor/core@7.2.0))(typescript@5.8.3)(ws@8.18.3)
      '@welshman/content':
-        specifier: ^0.3.4
-        version: 0.3.4(typescript@5.8.3)
-      '@welshman/dvm':
-        specifier: ^0.3.4
-        version: 0.3.4(nostr-signer-capacitor-plugin@0.0.4(@capacitor/core@7.2.0))(typescript@5.8.3)(ws@8.18.2)
+        specifier: ^0.4.3
+        version: 0.4.3(typescript@5.8.3)
      '@welshman/editor':
-        specifier: ^0.3.4
-        version: 0.3.4(@tiptap/extension-image@2.14.0(@tiptap/core@2.12.0(@tiptap/pm@2.12.0)))(@tiptap/extension-link@2.14.0(@tiptap/core@2.12.0(@tiptap/pm@2.12.0))(@tiptap/pm@2.12.0))(linkifyjs@4.3.1)(prosemirror-markdown@1.13.2)(prosemirror-model@1.25.1)(prosemirror-state@1.4.3)(tiptap-markdown@0.8.10(@tiptap/core@2.12.0(@tiptap/pm@2.12.0)))(typescript@5.8.3)
+        specifier: ^0.4.3
+        version: 0.4.3(@tiptap/extension-image@2.26.1(@tiptap/core@2.12.0(@tiptap/pm@2.12.0)))(@tiptap/extension-link@2.26.1(@tiptap/core@2.12.0(@tiptap/pm@2.12.0))(@tiptap/pm@2.12.0))(linkifyjs@4.3.1)(prosemirror-markdown@1.13.2)(prosemirror-model@1.25.1)(prosemirror-state@1.4.3)(prosemirror-view@1.39.3)(tiptap-markdown@0.8.10(@tiptap/core@2.12.0(@tiptap/pm@2.12.0)))(typescript@5.8.3)
      '@welshman/feeds':
-        specifier: ^0.3.4
-        version: 0.3.4(nostr-signer-capacitor-plugin@0.0.4(@capacitor/core@7.2.0))(typescript@5.8.3)(ws@8.18.2)
+        specifier: ^0.4.3
+        version: 0.4.3(nostr-signer-capacitor-plugin@0.0.4(@capacitor/core@7.2.0))(typescript@5.8.3)(ws@8.18.3)
      '@welshman/lib':
-        specifier: ^0.3.4
-        version: 0.3.4
+        specifier: ^0.4.3
+        version: 0.4.3
      '@welshman/net':
-        specifier: ^0.3.4
-        version: 0.3.4(typescript@5.8.3)(ws@8.18.2)
+        specifier: ^0.4.3
+        version: 0.4.3(typescript@5.8.3)(ws@8.18.3)
      '@welshman/relay':
-        specifier: ^0.3.4
-        version: 0.3.4(typescript@5.8.3)
+        specifier: ^0.4.3
+        version: 0.4.3(typescript@5.8.3)
      '@welshman/router':
-        specifier: ^0.3.4
-        version: 0.3.4(typescript@5.8.3)
+        specifier: ^0.4.3
+        version: 0.4.3(typescript@5.8.3)
      '@welshman/signer':
-        specifier: ^0.3.4
-        version: 0.3.4(nostr-signer-capacitor-plugin@0.0.4(@capacitor/core@7.2.0))(typescript@5.8.3)(ws@8.18.2)
+        specifier: ^0.4.3
+        version: 0.4.3(nostr-signer-capacitor-plugin@0.0.4(@capacitor/core@7.2.0))(typescript@5.8.3)(ws@8.18.3)
      '@welshman/store':
-        specifier: ^0.3.4
-        version: 0.3.4(typescript@5.8.3)
+        specifier: ^0.4.3
+        version: 0.4.3(typescript@5.8.3)
      '@welshman/util':
-        specifier: ^0.3.4
-        version: 0.3.4(typescript@5.8.3)
+        specifier: ^0.4.3
+        version: 0.4.3(typescript@5.8.3)
      compressorjs:
        specifier: ^1.2.1
        version: 1.2.1
@@ -119,9 +128,15 @@ importers:
      prettier-plugin-tailwindcss:
        specifier: ^0.6.5
        version: 0.6.11(prettier-plugin-svelte@3.3.3(prettier@3.5.3)(svelte@5.25.10))(prettier@3.5.3)
+      qr-scanner:
+        specifier: ^1.4.2
+        version: 1.4.2
      qrcode:
        specifier: ^1.5.4
        version: 1.5.4
+      throttle-debounce:
+        specifier: ^5.0.2
+        version: 5.0.2
      tippy.js:
        specifier: ^6.3.7
        version: 6.3.7
@@ -743,6 +758,16 @@ packages:
    peerDependencies:
      '@capacitor/core': '>=7.0.0'

+  '@capacitor/push-notifications@7.0.1':
+    resolution: {integrity: sha512-nSHsMSrTHX5pOkX1Khse75/uvSx/JTcXG+9aT6a66CvzalH6MCs0ha8Jv+xu0k9xW8caO+qSUMjfj5Oy82Uxmw==}
+    peerDependencies:
+      '@capacitor/core': '>=7.0.0'
+
+  '@capawesome/capacitor-badge@7.0.1':
+    resolution: {integrity: sha512-jhVieRRVLgGO1NU7PW8uWZmf3WD4IsYUlkrJ82KuoRgLFx1tbJGwHU1ro0sUJmEwfLO9vldhBnJJ/J5nHrjbQQ==}
+    peerDependencies:
+      '@capacitor/core': '>=7.0.0'
+
  '@cspotcode/source-map-support@0.8.1':
    resolution: {integrity: sha512-IchNf6dN4tHoMFIn/7OE8LWZ19Y6q/67Bmf6vnGREv8RSbBVb9LPJxEcnwrcwX6ixSvaiGoomAUvu4YSxXrVgw==}
    engines: {node: '>=12'}
@@ -931,6 +956,14 @@ packages:
    resolution: {integrity: sha512-ZAoA40rNMPwSm+AeHpCq8STiNAwzWLJuP8Xv4CHIc9wv/PSuExjMrmjfYNj682vW0OOiZ1HKxzvjQr9XZIisQA==}
    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}

+  '@getalby/lightning-tools@5.2.0':
+    resolution: {integrity: sha512-8kBvENBTMh541VjGKhw3I29+549/C02gLSh3AQaMfoMNSZaMxfQW+7dcMcc7vbFaCKEcEe18ST5bUveTRBuXCQ==}
+    engines: {node: '>=14'}
+
+  '@getalby/sdk@5.1.0':
+    resolution: {integrity: sha512-0ijo4enzoxZinyhOMFlR4h3qTQ9I0Se+dBkefk0ja5zOcpi61ZqT86n0T+7u94l8SH6/poysFBObdtN61u+6tQ==}
+    engines: {node: '>=14'}
+
  '@humanfs/core@0.19.1':
    resolution: {integrity: sha512-5DyQ4+1JEUzejeK1JGICcideyfUbGixgS9jNgex5nqkW+cY7WZhxBigmieN5Qnw9ZosSNVC9KQKyb+GUaGyKUA==}
    engines: {node: '>=18.18.0'}
@@ -1370,77 +1403,77 @@ packages:
    peerDependencies:
      '@tiptap/pm': ^2.7.0

-  '@tiptap/extension-code-block@2.14.0':
-    resolution: {integrity: sha512-LRYYZeh8U2XgfTsJ4houB9s9cVRt7PRfVa4MaCeOYKfowVOKQh67yV5oom8Azk9XrMPkPxDmMmdPAEPxeVYFvw==}
+  '@tiptap/extension-code-block@2.26.1':
+    resolution: {integrity: sha512-/TDDOwONl0qEUc4+B6V9NnWtSjz95eg7/8uCb8Y8iRbGvI9vT4/znRKofFxstvKmW4URu/H74/g0ywV57h0B+A==}
    peerDependencies:
      '@tiptap/core': ^2.7.0
      '@tiptap/pm': ^2.7.0

-  '@tiptap/extension-code@2.14.0':
-    resolution: {integrity: sha512-kyo02mnzqgwXayMcyRA/fHQgb+nMmQQpIt1irZwjtEoFZshA7NnY/6b5SJmRcxQ4/X4r2Y2Ha2sWmOcEkLmt4A==}
+  '@tiptap/extension-code@2.26.1':
+    resolution: {integrity: sha512-GU9deB1A/Tr4FMPu71CvlcjGKwRhGYz60wQ8m4aM+ELZcVIcZRa1ebR8bExRIEWnvRztQuyRiCQzw2N0xQJ1QQ==}
    peerDependencies:
      '@tiptap/core': ^2.7.0

-  '@tiptap/extension-document@2.14.0':
-    resolution: {integrity: sha512-qwEgpPIJ3AgXdEtRTr88hODbXRdt14VAwLj27PTSqexB5V7Ra1Jy7iQDhqRwBCoUomVywBsWYxkSuDisSRG+9w==}
+  '@tiptap/extension-document@2.26.1':
+    resolution: {integrity: sha512-2P2IZp1NRAE+21mRuFBiP3X2WKfZ6kUC23NJKpn8bcOamY3obYqCt0ltGPhE4eR8n8QAl2fI/3jIgjR07dC8ow==}
    peerDependencies:
      '@tiptap/core': ^2.7.0

-  '@tiptap/extension-dropcursor@2.14.0':
-    resolution: {integrity: sha512-FIh5cdPuoPKvZ0GqSKhzMZGixm05ac3hSgqhMNCBZmXX459qBUI9CvDl/uzSnY9koBDeLVV3HYMthWQQLSXl9A==}
+  '@tiptap/extension-dropcursor@2.26.1':
+    resolution: {integrity: sha512-JkDQU2ZYFOuT5mNYb8OiWGwD1HcjbtmX8tLNugQbToECmz9WvVPqJmn7V/q8VGpP81iEECz/IsyRmuf2kSD4uA==}
    peerDependencies:
      '@tiptap/core': ^2.7.0
      '@tiptap/pm': ^2.7.0

-  '@tiptap/extension-gapcursor@2.14.0':
-    resolution: {integrity: sha512-as+SqC39FRshw4Fm1XVlrdSXveiusf5xiC4nuefLmXsUxO7Yx67x8jS0/VQbxWTLHZ6R1YEW8prLtnxGmVLCAQ==}
+  '@tiptap/extension-gapcursor@2.26.1':
+    resolution: {integrity: sha512-KOiMZc3PwJS3hR0nSq5d0TJi2jkNZkLZElcT6pCEnhRHzPH6dRMu9GM5Jj798ZRUy0T9UFcKJalFZaDxnmRnpg==}
    peerDependencies:
      '@tiptap/core': ^2.7.0
      '@tiptap/pm': ^2.7.0

-  '@tiptap/extension-hard-break@2.14.0':
-    resolution: {integrity: sha512-A8c8n8881iBq3AusNqibh6Hloybr+FgYdg4Lg4jNxbbEaL0WhyLFge1bWlGVpbHXFqdv5YldMUAu6Rop3FhNvw==}
+  '@tiptap/extension-hard-break@2.26.1':
+    resolution: {integrity: sha512-d6uStdNKi8kjPlHAyO59M6KGWATNwhLCD7dng0NXfwGndc22fthzIk/6j9F6ltQx30huy5qQram6j3JXwNACoA==}
    peerDependencies:
      '@tiptap/core': ^2.7.0

-  '@tiptap/extension-history@2.14.0':
-    resolution: {integrity: sha512-/qnOHQFCEPfkb3caykqd+sqzEC2gx30EQB/mM7+5kIG7CQy7XXaGjFAEaqzE1xJ783Q2E7GVk4JxWM+3NhYSLw==}
+  '@tiptap/extension-history@2.26.1':
+    resolution: {integrity: sha512-m6YR1gkkauIDo3PRl0gP+7Oc4n5OqDzcjVh6LvWREmZP8nmi94hfseYbqOXUb6RPHIc0JKF02eiRifT4MSd2nw==}
    peerDependencies:
      '@tiptap/core': ^2.7.0
      '@tiptap/pm': ^2.7.0

-  '@tiptap/extension-image@2.14.0':
-    resolution: {integrity: sha512-pYCUzZBgsxIvVGTzuW03cPz6PIrAo26xpoxqq4W090uMVoK0SgY5W5y0IqCdw4QyLkJ2/oNSFNc2EP9jVi1CcQ==}
+  '@tiptap/extension-image@2.26.1':
+    resolution: {integrity: sha512-96+MaYBJebQlR/ik5W72GLUfXdEoxFs+6jsoERxbM5qEdhb7TEnodBFtWZOwgDO27kFd6rSNZuW9r5KJNtljEg==}
    peerDependencies:
      '@tiptap/core': ^2.7.0

-  '@tiptap/extension-link@2.14.0':
-    resolution: {integrity: sha512-fsqW7eRD2xoD6xy7eFrNPAdIuZ3eicA4jKC45Vcft/Xky0DJoIehlVBLxsPbfmv3f27EBrtPkg5+msLXkLyzJA==}
+  '@tiptap/extension-link@2.26.1':
+    resolution: {integrity: sha512-7yfum5Jymkue/uOSTQPt2SmkZIdZx7t3QhZLqBU7R9ettkdSCBgEGok6N+scJM1R1Zes+maSckLm0JZw5BKYNA==}
    peerDependencies:
      '@tiptap/core': ^2.7.0
      '@tiptap/pm': ^2.7.0

-  '@tiptap/extension-paragraph@2.14.0':
-    resolution: {integrity: sha512-bsQesVpgvDS2e+wr2fp59QO7rWRp2FqcJvBafwXS3Br9U5Mx3eFYryx4wC7cUnhlhUwX5pmaoA7zISgV9dZDgg==}
+  '@tiptap/extension-paragraph@2.26.1':
+    resolution: {integrity: sha512-UezvM9VDRAVJlX1tykgHWSD1g3MKfVMWWZ+Tg+PE4+kizOwoYkRWznVPgCAxjmyHajxpCKRXgqTZkOxjJ9Kjzg==}
    peerDependencies:
      '@tiptap/core': ^2.7.0

-  '@tiptap/extension-placeholder@2.14.0':
-    resolution: {integrity: sha512-xzfjHvuukbch4i5O/5uyS2K2QgNEaMKi6e6GExTTgVwnFjKfJmgTqee33tt5JCqSItBvtSZlU3SX/vpiaIof+w==}
+  '@tiptap/extension-placeholder@2.26.1':
+    resolution: {integrity: sha512-MBlqbkd+63btY7Qu+SqrXvWjPwooGZDsLTtl7jp52BczBl61cq9yygglt9XpM11TFMBdySgdLHBrLtQ0B7fBlw==}
    peerDependencies:
      '@tiptap/core': ^2.7.0
      '@tiptap/pm': ^2.7.0

-  '@tiptap/extension-text@2.14.0':
-    resolution: {integrity: sha512-rHny566nGZHq61zRLwQ9BPG55W/O+eDKwUJl+LhrLiVWwzpvAl9QQYixtoxJKOY48VK41PKwxe3bgDYgNs/Fhg==}
+  '@tiptap/extension-text@2.26.1':
+    resolution: {integrity: sha512-p2n8WVMd/2vckdJlol24acaTDIZAhI7qle5cM75bn01sOEZoFlSw6SwINOULrUCzNJsYb43qrLEibZb4j2LeQw==}
    peerDependencies:
      '@tiptap/core': ^2.7.0

  '@tiptap/pm@2.12.0':
    resolution: {integrity: sha512-TNzVwpeNzFfHAcYTOKqX9iU4fRxliyoZrCnERR+RRzeg7gWrXrCLubQt1WEx0sojMAfznshSL3M5HGsYjEbYwA==}

-  '@tiptap/suggestion@2.14.0':
-    resolution: {integrity: sha512-AXzEw0KYIyg5id8gz5geIffnBtkZqan5MWe29rGo3gXTfKH+Ik8tWbZdnlMVheycsUCllrymDRei4zw9DqVqkQ==}
+  '@tiptap/suggestion@2.26.1':
+    resolution: {integrity: sha512-iNWJdQN7h01keNoVwyCsdI7ZX11YkrexZjCnutWK17Dd72s3NYVTmQXu7saftwddT4nDdlczNxAFosrt0zMhcg==}
    peerDependencies:
      '@tiptap/core': ^2.7.0
      '@tiptap/pm': ^2.7.0
@@ -1515,6 +1548,9 @@ packages:
  '@types/normalize-package-data@2.4.4':
    resolution: {integrity: sha512-37i+OaWTh9qeK4LSHPsyRC7NahnGotNuZvjLSgcPzblpHB3rrCJxAOgI5gCdKm7coonsaX1Of0ILiTcnZjbfxA==}

+  '@types/offscreencanvas@2019.7.3':
+    resolution: {integrity: sha512-ieXiYmgSRXUDeOntE1InxjWyvEelZGP63M+cGuquuRLuIKKT1osnkXjxev9B7d1nXSug5vpunx+gNlbVxMlC9A==}
+
  '@types/qrcode@1.5.5':
    resolution: {integrity: sha512-CdfBi/e3Qk+3Z/fXYShipBT13OJ2fDO2Q2w5CIP5anLTLIndQG9z6P1cnm+8zCWSpm5dnxMFd/uREtb0EXuQzg==}

@@ -1596,44 +1632,41 @@ packages:
      '@vite-pwa/assets-generator':
        optional: true

-  '@welshman/app@0.3.4':
-    resolution: {integrity: sha512-pb1I53hWog6plLVyOx6biN0uiB7zdheDqN2hWfb/uUKKzD484u+Yk3p5H2S6VaJnSbgNHnPuuJnjVstts1rhLg==}
+  '@welshman/app@0.4.3':
+    resolution: {integrity: sha512-bnanLtSsX45gqdFKlCZr4IRBMQo+7TXycduI9ffgj/9rEu+94rKIEjUVOnbZF8+hhtaqL/Eypvjz2+N33O1mUQ==}

-  '@welshman/content@0.3.4':
-    resolution: {integrity: sha512-kuyykt5SK4vHUciJBooqfLDI/HBxekZPK3qVgmKlpVf8cMRmaSOGTjsKljINgFsT/3J5z7wZI5AzQR/2FBo2ZQ==}
+  '@welshman/content@0.4.3':
+    resolution: {integrity: sha512-5QxfY+QOBfrEHF76/feJ1Oxvp/SSkvp091b3AhxbcuvLnPOfaaUqAHmfktaM3XhAZF2T2bGDICV/vO7eUghz+Q==}

-  '@welshman/dvm@0.3.4':
-    resolution: {integrity: sha512-39uSVco5VZmYEE+BZ3Lx/hGVM/HzGfnlEMR0fysh4BqfMm3Po9KXfOLy4YDMoHt7Ai/rC4z/HdJ81F3jHhJZjw==}
+  '@welshman/editor@0.4.3':
+    resolution: {integrity: sha512-R03W3XfOFqougx2qJrfHchpVA445Rt7zYQ0hzNo8oFLjWCMG9flvNXY5n7imPGTGthNaUm+s87dDLbkxpL1m/A==}

-  '@welshman/editor@0.3.4':
-    resolution: {integrity: sha512-fpUnacyZvbtytadtVwV4CEm1rGHgp8xWHQB7pZ0m/5bxlAHT1p/cL5a83CjdrVbu3+HMzBfgV4k6ldhH1XnJaQ==}
+  '@welshman/feeds@0.4.3':
+    resolution: {integrity: sha512-176IpUPpvYl0pLXNnHRL2pWAx0C1XJ2b7BSxAXw/CC77Dyn857AFL5tO6YnZSQg5/RtH3WlldMtY2UsJF0fybg==}

-  '@welshman/feeds@0.3.4':
-    resolution: {integrity: sha512-w4GLcWOxTUlx9MBbqHfee0ePWW8oyMGaf+Hey35FNsKcBvxiO58uW9j6BBvlu9yacthw0RGa/91giJn3zZzx1Q==}
-
-  '@welshman/lib@0.3.4':
-    resolution: {integrity: sha512-37WDPZHsUFBLKdlkQXKAVuEDZB3lzQOkfIG0MMy7uZsg8+zR4VoA28g9B1vAKGky9lmWequHMPNigPRjC7RHQA==}
+  '@welshman/lib@0.4.3':
+    resolution: {integrity: sha512-wOfrdHfoA+WQwFI54lvVUoRrnZJNTeYHPYlKA+g+wKN1iS4rvpsKi+echWNkzRN8WcHT53qymVhgHEoqqDfOXA==}
    engines: {node: '>=12.0.0'}

-  '@welshman/net@0.3.4':
-    resolution: {integrity: sha512-btC7eXwEA8wfzaCsq8mdFIfbX61JeoyI3am53+L23ujbJQ9aqCciTA6EYEa2JzYB2HdydmCzdZrP/DTSjHN6bw==}
+  '@welshman/net@0.4.3':
+    resolution: {integrity: sha512-JBnOAYCP1LgEXuPrM1G/QrKwUClXxTmyj+Ksdf41Scr8XLxPPpAh1HQ2RirCekydGdw6Ax6SxzUzN69Hru3vew==}

-  '@welshman/relay@0.3.4':
-    resolution: {integrity: sha512-XjZY6XQXvNVFr3KC4O2Mlj+LHg/xJuQnhAHUYemvtJ9BcxvY01fq4ESadyiJklCjqNabsCPz76o+qFweZmym7Q==}
+  '@welshman/relay@0.4.3':
+    resolution: {integrity: sha512-UI+IAwEkicaiu8DhBmy81NVPFkHSUVjymbXZsxaCZuT86tJQvtr5cpf0/f/blh9Ncl8Gf1qmjj3A0Q4WnM6Z2A==}

-  '@welshman/router@0.3.4':
-    resolution: {integrity: sha512-ej4EjXWNj6srj6xnzcmFqhGXg6asTByPHPxQCkPG6HDOMVmG8GejlcatvjkzB4ppfdwYCz+jyJvjq30JBHmlbQ==}
+  '@welshman/router@0.4.3':
+    resolution: {integrity: sha512-ptWsxTkxIstELFMxkgOHrK65JvRUIN6q3HC/nu9Xy590tohZ3NeQUCfA7ujFo8LfymRavx/gdMwqOfePvgwHUQ==}

-  '@welshman/signer@0.3.4':
-    resolution: {integrity: sha512-kg2d4dQutRYvuuiCFC2I0UZfEHu+71t6o2g+jMtJ6d55dSa6+xUMCQ0/8Ua0AMOc/D7tJ1HLvtbmOjsehKkkKQ==}
+  '@welshman/signer@0.4.3':
+    resolution: {integrity: sha512-WQduEU5arxaHDza6NfbRMBBh9PqCsmD/a32fsnY/+eaID9eUtABu9s/NM2ZWu2rQWi1VeQ95RSxAZWZOzgUmqw==}
    peerDependencies:
      nostr-signer-capacitor-plugin: ~0.0.4

-  '@welshman/store@0.3.4':
-    resolution: {integrity: sha512-AYDLTA7+ptbJYfAVRQ5lC/l65FtkAj7lKSadUguSf+R10JClNeYPWqQ6RTRpvyZ9qn9QetuYx8ecLfm8BxC7Ow==}
+  '@welshman/store@0.4.3':
+    resolution: {integrity: sha512-D1MgedZROr+7X+O+2xH+ZV/5W1CmkmEpceiDQfxLTmgrihNGsnBf7Ub+b6DwdzCrVZNgh3wVByASZe4ppjV9LA==}

-  '@welshman/util@0.3.4':
-    resolution: {integrity: sha512-sBznEqAPlNu9CZQSNFPcL5kNOIoWYfUTY/lyXQXLiYhMorXQmVGXS4TT7knS41oKiLgkUK98T0DvjMr4iJd3/g==}
+  '@welshman/util@0.4.3':
+    resolution: {integrity: sha512-DN/Au5e17cNBGvuuiJAM0cVe1XSvFbiZvZ+WZK9K2ACNVK2WccIywAGYTAP3buZZIvnpt7Af+60qmhMQSBD+/g==}

  '@xml-tools/parser@1.0.11':
    resolution: {integrity: sha512-aKqQ077XnR+oQtHJlrAflaZaL7qZsulWc/i/ZEooar5JiWj1eLt0+Wg28cpa+XLney107wXqneC+oG1IZvxkTA==}
@@ -3381,8 +3414,8 @@ packages:
    resolution: {integrity: sha512-bdok/XvKII3nUpklnV6P2hxtMNrCboOjAcyBuQnWEhO665FwrSNRxU+AqpsyvO6LgGYPspN+lu5CLtw4jPRKNA==}
    engines: {node: '>=0.10.0'}

-  nostr-editor-coracle-workaround@0.0.4-pre.18:
-    resolution: {integrity: sha512-QAoySZ9uOsR7C4nnVbcEpVgT0vLxwZxlYhE2NsJzmeoK7nTgkcHFaZkn/QMlUem3qjT8AolW8X5TrRdnZ5eIZQ==}
+  nostr-editor@1.0.0:
+    resolution: {integrity: sha512-+TL3G0m7WsXeEAitxzQhun7hyARxqRANjGIS2z9CBbniCGvT/Wz6YLgUnUysnBg3tmSgMZg5FWhaDPwfvdvbSw==}
    engines: {node: '>=18.16.1'}
    peerDependencies:
      '@tiptap/core': ^2.6.6
@@ -3390,10 +3423,11 @@ packages:
      '@tiptap/extension-link': ^2.6.6
      '@tiptap/pm': ^2.6.6
      linkifyjs: ^4.1.3
-      nostr-tools: ^2.14.2
+      nostr-tools: ~2.14.2
      prosemirror-markdown: ^1.13.0
      prosemirror-model: ^1.22.3
      prosemirror-state: ^1.4.3
+      prosemirror-view: ^1.39.3
      tiptap-markdown: ^0.8.10

  nostr-signer-capacitor-plugin@0.0.4:
@@ -3401,6 +3435,14 @@ packages:
    peerDependencies:
      '@capacitor/core': ^7.0.0

+  nostr-tools@2.12.0:
+    resolution: {integrity: sha512-pUWEb020gTvt1XZvTa8AKNIHWFapjsv2NKyk43Ez2nnvz6WSXsrTFE0XtkNLSRBjPn6EpxumKeNiVzLz74jNSA==}
+    peerDependencies:
+      typescript: '>=5.0.0'
+    peerDependenciesMeta:
+      typescript:
+        optional: true
+
  nostr-tools@2.14.2:
    resolution: {integrity: sha512-YOIOn5EdJ2Kq5sQW5Zh4wOcqzR6kUyrCDHG4+mVD2szzthsyOTpiWX0yrwaRZGlHJG6q83vkhg95qc2W201XTQ==}
    peerDependencies:
@@ -3824,6 +3866,9 @@ packages:

      (For a CapTP with native promises, see @endo/eventual-send and @endo/captp)

+  qr-scanner@1.4.2:
+    resolution: {integrity: sha512-kV1yQUe2FENvn59tMZW6mOVfpq9mGxGf8l6+EGaXUOd4RBOLg7tRC83OrirM5AtDvZRpdjdlXURsHreAOSPOUw==}
+
  qrcode@1.5.4:
    resolution: {integrity: sha512-1ca71Zgiu6ORjHqFBDpnSMTR2ReToX4l1Au1VFLyVeBTFavzQnv5JxMFr3ukHVKpSrSA2MCk0lNJSykjUfz7Zg==}
    engines: {node: '>=10.13.0'}
@@ -4120,6 +4165,7 @@ packages:
  source-map@0.8.0-beta.0:
    resolution: {integrity: sha512-2ymg6oRBpebeZi9UUNsgQ89bhx01TcTkmNTGnNO88imTmbSgy4nfujrgVEFKWpMTEGA11EDkTt7mqObTPdigIA==}
    engines: {node: '>= 8'}
+    deprecated: The work that was done in this beta branch won't be included in future versions

  sourcemap-codec@1.4.8:
    resolution: {integrity: sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA==}
@@ -4687,8 +4733,8 @@ packages:
  wrappy@1.0.2:
    resolution: {integrity: sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==}

-  ws@8.18.2:
-    resolution: {integrity: sha512-DMricUmwGZUVr++AEAe2uiVM7UoO9MAVZMDu05UQOaUII0lp+zOzLLU4Xqh/JvTqklB1T4uELaaPBKyjE1r4fQ==}
+  ws@8.18.3:
+    resolution: {integrity: sha512-PEIGCY5tSlUt50cqyMXfCzX+oOPqN0vuGqWzbcJ2xvnkzkq46oOpz7dQaTDBdfICb4N14+GARUDw2XV2N4tvzg==}
    engines: {node: '>=10.0.0'}
    peerDependencies:
      bufferutil: ^4.0.1
@@ -5547,6 +5593,14 @@ snapshots:
    dependencies:
      '@capacitor/core': 7.2.0

+  '@capacitor/push-notifications@7.0.1(@capacitor/core@7.2.0)':
+    dependencies:
+      '@capacitor/core': 7.2.0
+
+  '@capawesome/capacitor-badge@7.0.1(@capacitor/core@7.2.0)':
+    dependencies:
+      '@capacitor/core': 7.2.0
+
  '@cspotcode/source-map-support@0.8.1':
    dependencies:
      '@jridgewell/trace-mapping': 0.3.9
@@ -5670,6 +5724,15 @@ snapshots:
      '@eslint/core': 0.13.0
      levn: 0.4.1

+  '@getalby/lightning-tools@5.2.0': {}
+
+  '@getalby/sdk@5.1.0(typescript@5.8.3)':
+    dependencies:
+      '@getalby/lightning-tools': 5.2.0
+      nostr-tools: 2.12.0(typescript@5.8.3)
+    transitivePeerDependencies:
+      - typescript
+
  '@humanfs/core@0.19.1': {}

  '@humanfs/node@0.16.6':
@@ -6150,58 +6213,58 @@ snapshots:
    dependencies:
      '@tiptap/pm': 2.12.0

-  '@tiptap/extension-code-block@2.14.0(@tiptap/core@2.12.0(@tiptap/pm@2.12.0))(@tiptap/pm@2.12.0)':
+  '@tiptap/extension-code-block@2.26.1(@tiptap/core@2.12.0(@tiptap/pm@2.12.0))(@tiptap/pm@2.12.0)':
    dependencies:
      '@tiptap/core': 2.12.0(@tiptap/pm@2.12.0)
      '@tiptap/pm': 2.12.0

-  '@tiptap/extension-code@2.14.0(@tiptap/core@2.12.0(@tiptap/pm@2.12.0))':
+  '@tiptap/extension-code@2.26.1(@tiptap/core@2.12.0(@tiptap/pm@2.12.0))':
    dependencies:
      '@tiptap/core': 2.12.0(@tiptap/pm@2.12.0)

-  '@tiptap/extension-document@2.14.0(@tiptap/core@2.12.0(@tiptap/pm@2.12.0))':
+  '@tiptap/extension-document@2.26.1(@tiptap/core@2.12.0(@tiptap/pm@2.12.0))':
    dependencies:
      '@tiptap/core': 2.12.0(@tiptap/pm@2.12.0)

-  '@tiptap/extension-dropcursor@2.14.0(@tiptap/core@2.12.0(@tiptap/pm@2.12.0))(@tiptap/pm@2.12.0)':
+  '@tiptap/extension-dropcursor@2.26.1(@tiptap/core@2.12.0(@tiptap/pm@2.12.0))(@tiptap/pm@2.12.0)':
    dependencies:
      '@tiptap/core': 2.12.0(@tiptap/pm@2.12.0)
      '@tiptap/pm': 2.12.0

-  '@tiptap/extension-gapcursor@2.14.0(@tiptap/core@2.12.0(@tiptap/pm@2.12.0))(@tiptap/pm@2.12.0)':
+  '@tiptap/extension-gapcursor@2.26.1(@tiptap/core@2.12.0(@tiptap/pm@2.12.0))(@tiptap/pm@2.12.0)':
    dependencies:
      '@tiptap/core': 2.12.0(@tiptap/pm@2.12.0)
      '@tiptap/pm': 2.12.0

-  '@tiptap/extension-hard-break@2.14.0(@tiptap/core@2.12.0(@tiptap/pm@2.12.0))':
+  '@tiptap/extension-hard-break@2.26.1(@tiptap/core@2.12.0(@tiptap/pm@2.12.0))':
    dependencies:
      '@tiptap/core': 2.12.0(@tiptap/pm@2.12.0)

-  '@tiptap/extension-history@2.14.0(@tiptap/core@2.12.0(@tiptap/pm@2.12.0))(@tiptap/pm@2.12.0)':
+  '@tiptap/extension-history@2.26.1(@tiptap/core@2.12.0(@tiptap/pm@2.12.0))(@tiptap/pm@2.12.0)':
    dependencies:
      '@tiptap/core': 2.12.0(@tiptap/pm@2.12.0)
      '@tiptap/pm': 2.12.0

-  '@tiptap/extension-image@2.14.0(@tiptap/core@2.12.0(@tiptap/pm@2.12.0))':
+  '@tiptap/extension-image@2.26.1(@tiptap/core@2.12.0(@tiptap/pm@2.12.0))':
    dependencies:
      '@tiptap/core': 2.12.0(@tiptap/pm@2.12.0)

-  '@tiptap/extension-link@2.14.0(@tiptap/core@2.12.0(@tiptap/pm@2.12.0))(@tiptap/pm@2.12.0)':
+  '@tiptap/extension-link@2.26.1(@tiptap/core@2.12.0(@tiptap/pm@2.12.0))(@tiptap/pm@2.12.0)':
    dependencies:
      '@tiptap/core': 2.12.0(@tiptap/pm@2.12.0)
      '@tiptap/pm': 2.12.0
      linkifyjs: 4.3.1

-  '@tiptap/extension-paragraph@2.14.0(@tiptap/core@2.12.0(@tiptap/pm@2.12.0))':
+  '@tiptap/extension-paragraph@2.26.1(@tiptap/core@2.12.0(@tiptap/pm@2.12.0))':
    dependencies:
      '@tiptap/core': 2.12.0(@tiptap/pm@2.12.0)

-  '@tiptap/extension-placeholder@2.14.0(@tiptap/core@2.12.0(@tiptap/pm@2.12.0))(@tiptap/pm@2.12.0)':
+  '@tiptap/extension-placeholder@2.26.1(@tiptap/core@2.12.0(@tiptap/pm@2.12.0))(@tiptap/pm@2.12.0)':
    dependencies:
      '@tiptap/core': 2.12.0(@tiptap/pm@2.12.0)
      '@tiptap/pm': 2.12.0

-  '@tiptap/extension-text@2.14.0(@tiptap/core@2.12.0(@tiptap/pm@2.12.0))':
+  '@tiptap/extension-text@2.26.1(@tiptap/core@2.12.0(@tiptap/pm@2.12.0))':
    dependencies:
      '@tiptap/core': 2.12.0(@tiptap/pm@2.12.0)

@@ -6226,7 +6289,7 @@ snapshots:
      prosemirror-transform: 1.10.4
      prosemirror-view: 1.39.3

-  '@tiptap/suggestion@2.14.0(@tiptap/core@2.12.0(@tiptap/pm@2.12.0))(@tiptap/pm@2.12.0)':
+  '@tiptap/suggestion@2.26.1(@tiptap/core@2.12.0(@tiptap/pm@2.12.0))(@tiptap/pm@2.12.0)':
    dependencies:
      '@tiptap/core': 2.12.0(@tiptap/pm@2.12.0)
      '@tiptap/pm': 2.12.0
@@ -6322,6 +6385,8 @@ snapshots:

  '@types/normalize-package-data@2.4.4': {}

+  '@types/offscreencanvas@2019.7.3': {}
+
  '@types/qrcode@1.5.5':
    dependencies:
      '@types/node': 22.14.0
@@ -6435,18 +6500,17 @@ snapshots:
    optionalDependencies:
      '@vite-pwa/assets-generator': 0.2.6

-  '@welshman/app@0.3.4(nostr-signer-capacitor-plugin@0.0.4(@capacitor/core@7.2.0))(typescript@5.8.3)(ws@8.18.2)':
+  '@welshman/app@0.4.3(nostr-signer-capacitor-plugin@0.0.4(@capacitor/core@7.2.0))(typescript@5.8.3)(ws@8.18.3)':
    dependencies:
      '@types/throttle-debounce': 5.0.2
-      '@welshman/dvm': 0.3.4(nostr-signer-capacitor-plugin@0.0.4(@capacitor/core@7.2.0))(typescript@5.8.3)(ws@8.18.2)
-      '@welshman/feeds': 0.3.4(nostr-signer-capacitor-plugin@0.0.4(@capacitor/core@7.2.0))(typescript@5.8.3)(ws@8.18.2)
-      '@welshman/lib': 0.3.4
-      '@welshman/net': 0.3.4(typescript@5.8.3)(ws@8.18.2)
-      '@welshman/relay': 0.3.4(typescript@5.8.3)
-      '@welshman/router': 0.3.4(typescript@5.8.3)
-      '@welshman/signer': 0.3.4(nostr-signer-capacitor-plugin@0.0.4(@capacitor/core@7.2.0))(typescript@5.8.3)(ws@8.18.2)
-      '@welshman/store': 0.3.4(typescript@5.8.3)
-      '@welshman/util': 0.3.4(typescript@5.8.3)
+      '@welshman/feeds': 0.4.3(nostr-signer-capacitor-plugin@0.0.4(@capacitor/core@7.2.0))(typescript@5.8.3)(ws@8.18.3)
+      '@welshman/lib': 0.4.3
+      '@welshman/net': 0.4.3(typescript@5.8.3)(ws@8.18.3)
+      '@welshman/relay': 0.4.3(typescript@5.8.3)
+      '@welshman/router': 0.4.3(typescript@5.8.3)
+      '@welshman/signer': 0.4.3(nostr-signer-capacitor-plugin@0.0.4(@capacitor/core@7.2.0))(typescript@5.8.3)(ws@8.18.3)
+      '@welshman/store': 0.4.3(typescript@5.8.3)
+      '@welshman/util': 0.4.3(typescript@5.8.3)
      fuse.js: 7.1.0
      idb: 8.0.2
      svelte: 4.2.20
@@ -6456,43 +6520,31 @@ snapshots:
      - typescript
      - ws

-  '@welshman/content@0.3.4(typescript@5.8.3)':
+  '@welshman/content@0.4.3(typescript@5.8.3)':
    dependencies:
      '@braintree/sanitize-url': 7.1.1
      nostr-tools: 2.14.2(typescript@5.8.3)
    transitivePeerDependencies:
      - typescript

-  '@welshman/dvm@0.3.4(nostr-signer-capacitor-plugin@0.0.4(@capacitor/core@7.2.0))(typescript@5.8.3)(ws@8.18.2)':
-    dependencies:
-      '@noble/hashes': 1.8.0
-      '@welshman/lib': 0.3.4
-      '@welshman/net': 0.3.4(typescript@5.8.3)(ws@8.18.2)
-      '@welshman/signer': 0.3.4(nostr-signer-capacitor-plugin@0.0.4(@capacitor/core@7.2.0))(typescript@5.8.3)(ws@8.18.2)
-      '@welshman/util': 0.3.4(typescript@5.8.3)
-    transitivePeerDependencies:
-      - nostr-signer-capacitor-plugin
-      - typescript
-      - ws
-
-  '@welshman/editor@0.3.4(@tiptap/extension-image@2.14.0(@tiptap/core@2.12.0(@tiptap/pm@2.12.0)))(@tiptap/extension-link@2.14.0(@tiptap/core@2.12.0(@tiptap/pm@2.12.0))(@tiptap/pm@2.12.0))(linkifyjs@4.3.1)(prosemirror-markdown@1.13.2)(prosemirror-model@1.25.1)(prosemirror-state@1.4.3)(tiptap-markdown@0.8.10(@tiptap/core@2.12.0(@tiptap/pm@2.12.0)))(typescript@5.8.3)':
+  '@welshman/editor@0.4.3(@tiptap/extension-image@2.26.1(@tiptap/core@2.12.0(@tiptap/pm@2.12.0)))(@tiptap/extension-link@2.26.1(@tiptap/core@2.12.0(@tiptap/pm@2.12.0))(@tiptap/pm@2.12.0))(linkifyjs@4.3.1)(prosemirror-markdown@1.13.2)(prosemirror-model@1.25.1)(prosemirror-state@1.4.3)(prosemirror-view@1.39.3)(tiptap-markdown@0.8.10(@tiptap/core@2.12.0(@tiptap/pm@2.12.0)))(typescript@5.8.3)':
    dependencies:
      '@tiptap/core': 2.12.0(@tiptap/pm@2.12.0)
-      '@tiptap/extension-code': 2.14.0(@tiptap/core@2.12.0(@tiptap/pm@2.12.0))
-      '@tiptap/extension-code-block': 2.14.0(@tiptap/core@2.12.0(@tiptap/pm@2.12.0))(@tiptap/pm@2.12.0)
-      '@tiptap/extension-document': 2.14.0(@tiptap/core@2.12.0(@tiptap/pm@2.12.0))
-      '@tiptap/extension-dropcursor': 2.14.0(@tiptap/core@2.12.0(@tiptap/pm@2.12.0))(@tiptap/pm@2.12.0)
-      '@tiptap/extension-gapcursor': 2.14.0(@tiptap/core@2.12.0(@tiptap/pm@2.12.0))(@tiptap/pm@2.12.0)
-      '@tiptap/extension-hard-break': 2.14.0(@tiptap/core@2.12.0(@tiptap/pm@2.12.0))
-      '@tiptap/extension-history': 2.14.0(@tiptap/core@2.12.0(@tiptap/pm@2.12.0))(@tiptap/pm@2.12.0)
-      '@tiptap/extension-paragraph': 2.14.0(@tiptap/core@2.12.0(@tiptap/pm@2.12.0))
-      '@tiptap/extension-placeholder': 2.14.0(@tiptap/core@2.12.0(@tiptap/pm@2.12.0))(@tiptap/pm@2.12.0)
-      '@tiptap/extension-text': 2.14.0(@tiptap/core@2.12.0(@tiptap/pm@2.12.0))
+      '@tiptap/extension-code': 2.26.1(@tiptap/core@2.12.0(@tiptap/pm@2.12.0))
+      '@tiptap/extension-code-block': 2.26.1(@tiptap/core@2.12.0(@tiptap/pm@2.12.0))(@tiptap/pm@2.12.0)
+      '@tiptap/extension-document': 2.26.1(@tiptap/core@2.12.0(@tiptap/pm@2.12.0))
+      '@tiptap/extension-dropcursor': 2.26.1(@tiptap/core@2.12.0(@tiptap/pm@2.12.0))(@tiptap/pm@2.12.0)
+      '@tiptap/extension-gapcursor': 2.26.1(@tiptap/core@2.12.0(@tiptap/pm@2.12.0))(@tiptap/pm@2.12.0)
+      '@tiptap/extension-hard-break': 2.26.1(@tiptap/core@2.12.0(@tiptap/pm@2.12.0))
+      '@tiptap/extension-history': 2.26.1(@tiptap/core@2.12.0(@tiptap/pm@2.12.0))(@tiptap/pm@2.12.0)
+      '@tiptap/extension-paragraph': 2.26.1(@tiptap/core@2.12.0(@tiptap/pm@2.12.0))
+      '@tiptap/extension-placeholder': 2.26.1(@tiptap/core@2.12.0(@tiptap/pm@2.12.0))(@tiptap/pm@2.12.0)
+      '@tiptap/extension-text': 2.26.1(@tiptap/core@2.12.0(@tiptap/pm@2.12.0))
      '@tiptap/pm': 2.12.0
-      '@tiptap/suggestion': 2.14.0(@tiptap/core@2.12.0(@tiptap/pm@2.12.0))(@tiptap/pm@2.12.0)
-      '@welshman/lib': 0.3.4
-      '@welshman/util': 0.3.4(typescript@5.8.3)
-      nostr-editor-coracle-workaround: 0.0.4-pre.18(@tiptap/core@2.12.0(@tiptap/pm@2.12.0))(@tiptap/extension-image@2.14.0(@tiptap/core@2.12.0(@tiptap/pm@2.12.0)))(@tiptap/extension-link@2.14.0(@tiptap/core@2.12.0(@tiptap/pm@2.12.0))(@tiptap/pm@2.12.0))(@tiptap/pm@2.12.0)(linkifyjs@4.3.1)(nostr-tools@2.14.2(typescript@5.8.3))(prosemirror-markdown@1.13.2)(prosemirror-model@1.25.1)(prosemirror-state@1.4.3)(tiptap-markdown@0.8.10(@tiptap/core@2.12.0(@tiptap/pm@2.12.0)))
+      '@tiptap/suggestion': 2.26.1(@tiptap/core@2.12.0(@tiptap/pm@2.12.0))(@tiptap/pm@2.12.0)
+      '@welshman/lib': 0.4.3
+      '@welshman/util': 0.4.3(typescript@5.8.3)
+      nostr-editor: 1.0.0(@tiptap/core@2.12.0(@tiptap/pm@2.12.0))(@tiptap/extension-image@2.26.1(@tiptap/core@2.12.0(@tiptap/pm@2.12.0)))(@tiptap/extension-link@2.26.1(@tiptap/core@2.12.0(@tiptap/pm@2.12.0))(@tiptap/pm@2.12.0))(@tiptap/pm@2.12.0)(linkifyjs@4.3.1)(nostr-tools@2.14.2(typescript@5.8.3))(prosemirror-markdown@1.13.2)(prosemirror-model@1.25.1)(prosemirror-state@1.4.3)(prosemirror-view@1.39.3)(tiptap-markdown@0.8.10(@tiptap/core@2.12.0(@tiptap/pm@2.12.0)))
      nostr-tools: 2.14.2(typescript@5.8.3)
      tippy.js: 6.3.7
    transitivePeerDependencies:
@@ -6502,82 +6554,82 @@ snapshots:
      - prosemirror-markdown
      - prosemirror-model
      - prosemirror-state
+      - prosemirror-view
      - tiptap-markdown
      - typescript

-  '@welshman/feeds@0.3.4(nostr-signer-capacitor-plugin@0.0.4(@capacitor/core@7.2.0))(typescript@5.8.3)(ws@8.18.2)':
+  '@welshman/feeds@0.4.3(nostr-signer-capacitor-plugin@0.0.4(@capacitor/core@7.2.0))(typescript@5.8.3)(ws@8.18.3)':
    dependencies:
-      '@welshman/dvm': 0.3.4(nostr-signer-capacitor-plugin@0.0.4(@capacitor/core@7.2.0))(typescript@5.8.3)(ws@8.18.2)
-      '@welshman/lib': 0.3.4
-      '@welshman/net': 0.3.4(typescript@5.8.3)(ws@8.18.2)
-      '@welshman/relay': 0.3.4(typescript@5.8.3)
-      '@welshman/router': 0.3.4(typescript@5.8.3)
-      '@welshman/signer': 0.3.4(nostr-signer-capacitor-plugin@0.0.4(@capacitor/core@7.2.0))(typescript@5.8.3)(ws@8.18.2)
-      '@welshman/util': 0.3.4(typescript@5.8.3)
+      '@welshman/lib': 0.4.3
+      '@welshman/net': 0.4.3(typescript@5.8.3)(ws@8.18.3)
+      '@welshman/relay': 0.4.3(typescript@5.8.3)
+      '@welshman/router': 0.4.3(typescript@5.8.3)
+      '@welshman/signer': 0.4.3(nostr-signer-capacitor-plugin@0.0.4(@capacitor/core@7.2.0))(typescript@5.8.3)(ws@8.18.3)
+      '@welshman/util': 0.4.3(typescript@5.8.3)
      trava: 1.2.1
    transitivePeerDependencies:
      - nostr-signer-capacitor-plugin
      - typescript
      - ws

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

-  '@welshman/net@0.3.4(typescript@5.8.3)(ws@8.18.2)':
+  '@welshman/net@0.4.3(typescript@5.8.3)(ws@8.18.3)':
    dependencies:
-      '@welshman/lib': 0.3.4
-      '@welshman/relay': 0.3.4(typescript@5.8.3)
-      '@welshman/util': 0.3.4(typescript@5.8.3)
+      '@welshman/lib': 0.4.3
+      '@welshman/relay': 0.4.3(typescript@5.8.3)
+      '@welshman/util': 0.4.3(typescript@5.8.3)
      events: 3.3.0
-      isomorphic-ws: 5.0.0(ws@8.18.2)
+      isomorphic-ws: 5.0.0(ws@8.18.3)
    transitivePeerDependencies:
      - typescript
      - ws

-  '@welshman/relay@0.3.4(typescript@5.8.3)':
+  '@welshman/relay@0.4.3(typescript@5.8.3)':
    dependencies:
-      '@welshman/lib': 0.3.4
-      '@welshman/util': 0.3.4(typescript@5.8.3)
+      '@welshman/lib': 0.4.3
+      '@welshman/util': 0.4.3(typescript@5.8.3)
    transitivePeerDependencies:
      - typescript

-  '@welshman/router@0.3.4(typescript@5.8.3)':
+  '@welshman/router@0.4.3(typescript@5.8.3)':
    dependencies:
-      '@welshman/lib': 0.3.4
-      '@welshman/relay': 0.3.4(typescript@5.8.3)
-      '@welshman/util': 0.3.4(typescript@5.8.3)
+      '@welshman/lib': 0.4.3
+      '@welshman/relay': 0.4.3(typescript@5.8.3)
+      '@welshman/util': 0.4.3(typescript@5.8.3)
    transitivePeerDependencies:
      - typescript

-  '@welshman/signer@0.3.4(nostr-signer-capacitor-plugin@0.0.4(@capacitor/core@7.2.0))(typescript@5.8.3)(ws@8.18.2)':
+  '@welshman/signer@0.4.3(nostr-signer-capacitor-plugin@0.0.4(@capacitor/core@7.2.0))(typescript@5.8.3)(ws@8.18.3)':
    dependencies:
      '@noble/curves': 1.9.2
      '@noble/hashes': 1.8.0
-      '@welshman/lib': 0.3.4
-      '@welshman/net': 0.3.4(typescript@5.8.3)(ws@8.18.2)
-      '@welshman/util': 0.3.4(typescript@5.8.3)
+      '@welshman/lib': 0.4.3
+      '@welshman/net': 0.4.3(typescript@5.8.3)(ws@8.18.3)
+      '@welshman/util': 0.4.3(typescript@5.8.3)
      nostr-signer-capacitor-plugin: 0.0.4(@capacitor/core@7.2.0)
      nostr-tools: 2.14.2(typescript@5.8.3)
    transitivePeerDependencies:
      - typescript
      - ws

-  '@welshman/store@0.3.4(typescript@5.8.3)':
+  '@welshman/store@0.4.3(typescript@5.8.3)':
    dependencies:
-      '@welshman/lib': 0.3.4
-      '@welshman/relay': 0.3.4(typescript@5.8.3)
-      '@welshman/util': 0.3.4(typescript@5.8.3)
+      '@welshman/lib': 0.4.3
+      '@welshman/relay': 0.4.3(typescript@5.8.3)
+      '@welshman/util': 0.4.3(typescript@5.8.3)
      svelte: 4.2.20
    transitivePeerDependencies:
      - typescript

-  '@welshman/util@0.3.4(typescript@5.8.3)':
+  '@welshman/util@0.4.3(typescript@5.8.3)':
    dependencies:
      '@types/ws': 8.18.1
-      '@welshman/lib': 0.3.4
+      '@welshman/lib': 0.4.3
      js-base64: 3.7.7
      nostr-tools: 2.14.2(typescript@5.8.3)
      nostr-wasm: 0.1.0
@@ -8075,9 +8127,9 @@ snapshots:

  isexe@2.0.0: {}

-  isomorphic-ws@5.0.0(ws@8.18.2):
+  isomorphic-ws@5.0.0(ws@8.18.3):
    dependencies:
-      ws: 8.18.2
+      ws: 8.18.3

  jackspeak@3.4.3:
    dependencies:
@@ -8409,11 +8461,11 @@ snapshots:

  normalize-range@0.1.2: {}

-  nostr-editor-coracle-workaround@0.0.4-pre.18(@tiptap/core@2.12.0(@tiptap/pm@2.12.0))(@tiptap/extension-image@2.14.0(@tiptap/core@2.12.0(@tiptap/pm@2.12.0)))(@tiptap/extension-link@2.14.0(@tiptap/core@2.12.0(@tiptap/pm@2.12.0))(@tiptap/pm@2.12.0))(@tiptap/pm@2.12.0)(linkifyjs@4.3.1)(nostr-tools@2.14.2(typescript@5.8.3))(prosemirror-markdown@1.13.2)(prosemirror-model@1.25.1)(prosemirror-state@1.4.3)(tiptap-markdown@0.8.10(@tiptap/core@2.12.0(@tiptap/pm@2.12.0))):
+  nostr-editor@1.0.0(@tiptap/core@2.12.0(@tiptap/pm@2.12.0))(@tiptap/extension-image@2.26.1(@tiptap/core@2.12.0(@tiptap/pm@2.12.0)))(@tiptap/extension-link@2.26.1(@tiptap/core@2.12.0(@tiptap/pm@2.12.0))(@tiptap/pm@2.12.0))(@tiptap/pm@2.12.0)(linkifyjs@4.3.1)(nostr-tools@2.14.2(typescript@5.8.3))(prosemirror-markdown@1.13.2)(prosemirror-model@1.25.1)(prosemirror-state@1.4.3)(prosemirror-view@1.39.3)(tiptap-markdown@0.8.10(@tiptap/core@2.12.0(@tiptap/pm@2.12.0))):
    dependencies:
      '@tiptap/core': 2.12.0(@tiptap/pm@2.12.0)
-      '@tiptap/extension-image': 2.14.0(@tiptap/core@2.12.0(@tiptap/pm@2.12.0))
-      '@tiptap/extension-link': 2.14.0(@tiptap/core@2.12.0(@tiptap/pm@2.12.0))(@tiptap/pm@2.12.0)
+      '@tiptap/extension-image': 2.26.1(@tiptap/core@2.12.0(@tiptap/pm@2.12.0))
+      '@tiptap/extension-link': 2.26.1(@tiptap/core@2.12.0(@tiptap/pm@2.12.0))(@tiptap/pm@2.12.0)
      '@tiptap/pm': 2.12.0
      js-base64: 3.7.7
      light-bolt11-decoder: 3.2.0
@@ -8422,12 +8474,25 @@ snapshots:
      prosemirror-markdown: 1.13.2
      prosemirror-model: 1.25.1
      prosemirror-state: 1.4.3
+      prosemirror-view: 1.39.3
      tiptap-markdown: 0.8.10(@tiptap/core@2.12.0(@tiptap/pm@2.12.0))

  nostr-signer-capacitor-plugin@0.0.4(@capacitor/core@7.2.0):
    dependencies:
      '@capacitor/core': 7.2.0

+  nostr-tools@2.12.0(typescript@5.8.3):
+    dependencies:
+      '@noble/ciphers': 0.5.3
+      '@noble/curves': 1.2.0
+      '@noble/hashes': 1.3.1
+      '@scure/base': 1.1.1
+      '@scure/bip32': 1.3.1
+      '@scure/bip39': 1.2.1
+    optionalDependencies:
+      nostr-wasm: 0.1.0
+      typescript: 5.8.3
+
  nostr-tools@2.14.2(typescript@5.8.3):
    dependencies:
      '@noble/ciphers': 0.5.3
@@ -8811,6 +8876,10 @@ snapshots:

  q@1.5.1: {}

+  qr-scanner@1.4.2:
+    dependencies:
+      '@types/offscreencanvas': 2019.7.3
+
  qrcode@1.5.4:
    dependencies:
      dijkstrajs: 1.0.3
@@ -9924,7 +9993,7 @@ snapshots:

  wrappy@1.0.2: {}

-  ws@8.18.2: {}
+  ws@8.18.3: {}

  xcode@3.0.1:
    dependencies:
@@ -46,10 +46,10 @@

 :root {
  font-family: Lato;
-  --sait: env(safe-area-inset-top);
-  --saib: env(safe-area-inset-bottom);
-  --sail: env(safe-area-inset-left);
-  --sair: env(safe-area-inset-right);
+  --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));
 }

 [data-theme] {
@@ -160,11 +160,11 @@
 }

 .card2 {
-  @apply rounded-box p-6 text-base-content;
+  @apply rounded-box p-4 text-base-content sm:p-6;
 }

 .card2.card2-sm {
-  @apply p-4 text-base-content;
+  @apply p-2 text-base-content sm:p-4;
 }

 .column {
@@ -1,24 +1,56 @@
 <script lang="ts">
+  import {onMount} from "svelte"
  import {preventDefault} from "@lib/html"
-  import {randomInt, displayList, TIMEZONE, identity} from "@welshman/lib"
-  import {displayRelayUrl, getTagValue, THREAD, MESSAGE, EVENT_TIME, COMMENT} from "@welshman/util"
+  import {decrypt} from "@welshman/signer"
+  import {randomInt, parseJson, fromPairs, displayList, TIMEZONE, identity} from "@welshman/lib"
+  import {
+    displayRelayUrl,
+    getTagValue,
+    getAddress,
+    THREAD,
+    MESSAGE,
+    EVENT_TIME,
+    COMMENT,
+  } from "@welshman/util"
  import type {Filter} from "@welshman/util"
-  import type {Nip46ResponseWithResult} from "@welshman/signer"
  import {makeIntersectionFeed, makeRelayFeed, feedFromFilters} from "@welshman/feeds"
-  import {pubkey} from "@welshman/app"
+  import {pubkey, signer, getThunkError} from "@welshman/app"
  import Icon from "@lib/components/Icon.svelte"
  import Button from "@lib/components/Button.svelte"
  import FieldInline from "@lib/components/FieldInline.svelte"
  import Spinner from "@lib/components/Spinner.svelte"
  import ModalHeader from "@lib/components/ModalHeader.svelte"
  import ModalFooter from "@lib/components/ModalFooter.svelte"
-  import InfoBunker from "@app/components/InfoBunker.svelte"
-  import BunkerConnect, {BunkerConnectController} from "@app/components/BunkerConnect.svelte"
-  import {alerts, getMembershipUrls, getMembershipRoomsByUrl, userMembership} from "@app/state"
-  import {loadAlertStatuses} from "@app/requests"
-  import {publishAlert} from "@app/commands"
-  import {pushToast} from "@app/toast"
-  import {pushModal} from "@app/modal"
+  import {
+    alerts,
+    getMembershipUrls,
+    userMembership,
+    NOTIFIER_PUBKEY,
+    NOTIFIER_RELAY,
+  } from "@app/core/state"
+  import {loadAlertStatuses, requestRelayClaim} from "@app/core/requests"
+  import {publishAlert, attemptAuth} from "@app/core/commands"
+  import type {AlertParams} from "@app/core/commands"
+  import {platform, platformName, canSendPushNotifications, getPushInfo} from "@app/util/push"
+  import {pushToast} from "@app/util/toast"
+
+  type Props = {
+    url?: string
+    channel?: string
+    notifyChat?: boolean
+    notifyThreads?: boolean
+    notifyCalendar?: boolean
+    hideSpaceField?: boolean
+  }
+
+  let {
+    url = "",
+    channel = "email",
+    notifyChat = true,
+    notifyThreads = true,
+    notifyCalendar = true,
+    hideSpaceField = false,
+  }: Props = $props()

  const timezoneOffset = parseInt(TIMEZONE.slice(3)) / 100
  const minute = randomInt(0, 59)
@@ -26,49 +58,21 @@
  const WEEKLY = `0 ${minute} ${hour} * * 1`
  const DAILY = `0 ${minute} ${hour} * * *`

-  let loading = false
-  let cron = WEEKLY
-  let email = $alerts.map(a => getTagValue("email", a.tags)).filter(identity)[0] || ""
-  let relay = ""
-  let bunker = ""
-  let secret = ""
-  let notifyThreads = true
-  let notifyCalendar = true
-  let notifyChat = false
-  let showBunker = false
+  let loading = $state(false)
+  let cron = $state(WEEKLY)
+  let email = $state($alerts.map(a => getTagValue("email", a.tags)).filter(identity)[0] || "")

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

-  const controller = new BunkerConnectController({
-    onNostrConnect: (response: Nip46ResponseWithResult) => {
-      bunker = controller.broker.getBunkerUrl()
-      secret = controller.broker.params.clientSecret
-      showBunker = false
-    },
-  })
-
-  const connectBunker = () => {
-    showBunker = true
-  }
-
-  const hideBunker = () => {
-    showBunker = false
-  }
-
-  const clearBunker = () => {
-    bunker = ""
-    secret = ""
-  }
-
  const submit = async () => {
-    if (!email.includes("@")) {
+    if (channel === "email" && !email.includes("@")) {
      return pushToast({
        theme: "error",
        message: "Please provide an email address",
      })
    }

-    if (!relay) {
+    if (!url) {
      return pushToast({
        theme: "error",
        message: "Please select a space",
@@ -99,22 +103,70 @@

    if (notifyChat) {
      display.push("chat")
-      filters.push({
-        kinds: [MESSAGE],
-        "#h": getMembershipRoomsByUrl(relay, $userMembership),
-      })
+      filters.push({kinds: [MESSAGE]})
    }

    loading = true

    try {
-      const cadence = cron?.endsWith("1") ? "Weekly" : "Daily"
-      const description = `${cadence} alert for ${displayList(display)} on ${displayRelayUrl(relay)}, sent via email.`
-      const feed = makeIntersectionFeed(feedFromFilters(filters), makeRelayFeed(relay))
-      const thunk = await publishAlert({cron, email, feed, bunker, secret, description})
+      const claim = url ? await requestRelayClaim(url) : undefined
+      const claims = claim ? {[url]: claim} : {}
+      const feed = makeIntersectionFeed(feedFromFilters(filters), makeRelayFeed(url))
+      const description = `for ${displayList(display)} on ${displayRelayUrl(url)}`
+      const params: AlertParams = {feed, claims, description}

-      await thunk.result
-      await loadAlertStatuses($pubkey!)
+      if (channel === "email") {
+        const cadence = cron?.endsWith("1") ? "Weekly" : "Daily"
+
+        params.description = `${cadence} alert ${description}, sent via email.`
+        params.email = {
+          cron,
+          email,
+          handler: [
+            "31990:97c70a44366a6535c145b333f973ea86dfdc2d7a99da618c40c64705ad98e322:1737058597050",
+            "wss://relay.nostr.band/",
+            "web",
+          ],
+        }
+      } else {
+        try {
+          // @ts-ignore
+          params[platform] = await getPushInfo()
+          params.description = `${platformName} push notification ${description}.`
+        } catch (e: any) {
+          return pushToast({
+            theme: "error",
+            message: String(e),
+          })
+        }
+      }
+
+      // If we don't do this we'll get an event rejection
+      await attemptAuth(NOTIFIER_RELAY)
+
+      const thunk = await publishAlert(params)
+      const error = await getThunkError(thunk)
+
+      if (error) {
+        return pushToast({
+          theme: "error",
+          message: `Failed to send your alert to the notification server (${error}).`,
+        })
+      }
+
+      // Fetch our new status to make sure it's active
+      const address = getAddress(thunk.event)
+      const statusEvents = await loadAlertStatuses($pubkey!)
+      const statusEvent = statusEvents.find(event => getTagValue("d", event.tags) === address)
+      const statusTags = statusEvent
+        ? parseJson(await decrypt(signer.get(), NOTIFIER_PUBKEY, statusEvent.content))
+        : []
+      const {status = "error", message = "Your alert was not activated"}: Record<string, string> =
+        fromPairs(statusTags)
+
+      if (status === "error") {
+        return pushToast({theme: "error", message})
+      }

      pushToast({message: "Your alert has been successfully created!"})
      back()
@@ -122,6 +174,12 @@
      loading = false
    }
  }
+
+  onMount(() => {
+    if (!canSendPushNotifications()) {
+      channel = "email"
+    }
+  })
 </script>

 <form class="column gap-4" onsubmit={preventDefault(submit)}>
@@ -130,13 +188,20 @@
      Add an Alert
    {/snippet}
  </ModalHeader>
-  {#if showBunker}
-    <div class="card2 flex flex-col items-center gap-4 bg-base-300">
-      <p>Scan using a nostr signer, or click to copy.</p>
-      <BunkerConnect {controller} />
-      <Button class="btn btn-neutral btn-sm" onclick={hideBunker}>Cancel</Button>
-    </div>
-  {:else}
+  {#if canSendPushNotifications()}
+    <FieldInline>
+      {#snippet label()}
+        <p>Alert Type*</p>
+      {/snippet}
+      {#snippet input()}
+        <select bind:value={channel} class="select select-bordered">
+          <option value="email">Email Digest</option>
+          <option value="push">Push Notification</option>
+        </select>
+      {/snippet}
+    </FieldInline>
+  {/if}
+  {#if channel === "email"}
    <FieldInline>
      {#snippet label()}
        <p>Email Address*</p>
@@ -158,12 +223,14 @@
        </select>
      {/snippet}
    </FieldInline>
+  {/if}
+  {#if !hideSpaceField}
    <FieldInline>
      {#snippet label()}
        <p>Space*</p>
      {/snippet}
      {#snippet input()}
-        <select bind:value={relay} class="select select-bordered">
+        <select bind:value={url} class="select select-bordered">
          <option value="" disabled selected>Choose a space URL</option>
          {#each getMembershipUrls($userMembership) as url (url)}
            <option value={url}>{displayRelayUrl(url)}</option>
@@ -171,59 +238,34 @@
        </select>
      {/snippet}
    </FieldInline>
-    <FieldInline>
-      {#snippet label()}
-        <p>Notifications*</p>
-      {/snippet}
-      {#snippet input()}
-        <div class="flex items-center justify-end gap-4">
-          <span class="flex gap-3">
-            <input type="checkbox" class="checkbox" bind:checked={notifyThreads} />
-            Threads
-          </span>
-          <span class="flex gap-3">
-            <input type="checkbox" class="checkbox" bind:checked={notifyCalendar} />
-            Calendar
-          </span>
-          <span class="flex gap-3">
-            <input type="checkbox" class="checkbox" bind:checked={notifyChat} />
-            Chat
-          </span>
-        </div>
-      {/snippet}
-    </FieldInline>
-    <div class="card2 flex flex-col gap-3 bg-base-300">
-      <div class="flex items-center justify-between">
-        <strong>Connect a Bunker</strong>
-        <span class="flex items-center gap-2 text-sm" class:text-primary={bunker}>
-          {#if bunker}
-            <Icon icon="check-circle" size={5} />
-            Connected
-          {:else}
-            <Icon icon="close-circle" size={5} />
-            Not Connected
-          {/if}
+  {/if}
+  <FieldInline>
+    {#snippet label()}
+      <p>Notifications*</p>
+    {/snippet}
+    {#snippet input()}
+      <div class="flex items-center justify-end gap-4">
+        <span class="flex gap-3">
+          <input type="checkbox" class="checkbox" bind:checked={notifyThreads} />
+          Threads
+        </span>
+        <span class="flex gap-3">
+          <input type="checkbox" class="checkbox" bind:checked={notifyCalendar} />
+          Calendar
+        </span>
+        <span class="flex gap-3">
+          <input type="checkbox" class="checkbox" bind:checked={notifyChat} />
+          Chat
        </span>
      </div>
-      <p class="text-sm">
-        Required for receiving alerts about spaces with access controls. You can get one from your
-        <Button class="text-primary" onclick={() => pushModal(InfoBunker)}>remote signer app</Button
-        >.
-      </p>
-      {#if bunker}
-        <Button class="btn btn-neutral btn-sm flex-grow" onclick={clearBunker}>Disconnect</Button>
-      {:else}
-        <Button class="btn btn-primary btn-sm w-full flex-grow" onclick={connectBunker}
-          >Connect</Button>
-      {/if}
-    </div>
-  {/if}
+    {/snippet}
+  </FieldInline>
  <ModalFooter>
    <Button class="btn btn-link" onclick={back}>
      <Icon icon="alt-arrow-left" />
      Go back
    </Button>
-    <Button type="submit" class="btn btn-primary" disabled={loading || showBunker}>
+    <Button type="submit" class="btn btn-primary" disabled={loading}>
      <Spinner {loading}>Confirm</Spinner>
      <Icon icon="alt-arrow-right" />
    </Button>
@@ -1,9 +1,9 @@
 <script lang="ts">
  import Confirm from "@lib/components/Confirm.svelte"
-  import type {Alert} from "@app/state"
-  import {NOTIFIER_RELAY} from "@app/state"
-  import {publishDelete} from "@app/commands"
-  import {pushToast} from "@app/toast"
+  import type {Alert} from "@app/core/state"
+  import {NOTIFIER_RELAY, NOTIFIER_PUBKEY} from "@app/core/state"
+  import {publishDelete} from "@app/core/commands"
+  import {pushToast} from "@app/util/toast"

  type Props = {
    alert: Alert
@@ -12,7 +12,10 @@
  const {alert}: Props = $props()

  const confirm = () => {
-    publishDelete({event: alert.event, relays: [NOTIFIER_RELAY]})
+    const relays = [NOTIFIER_RELAY]
+    const tags = [["p", NOTIFIER_PUBKEY]]
+
+    publishDelete({event: alert.event, relays, tags, protect: false})
    pushToast({message: "Your alert has been deleted!"})
    history.back()
  }
@@ -1,13 +1,13 @@
 <script lang="ts">
-  import {parseJson, nthEq} from "@welshman/lib"
+  import {parseJson} from "@welshman/lib"
  import {displayFeeds} from "@welshman/feeds"
  import {getAddress, getTagValue, getTagValues} from "@welshman/util"
  import Icon from "@lib/components/Icon.svelte"
  import Button from "@lib/components/Button.svelte"
  import AlertDelete from "@app/components/AlertDelete.svelte"
-  import type {Alert} from "@app/state"
-  import {alertStatuses} from "@app/state"
-  import {pushModal} from "@app/modal"
+  import type {Alert} from "@app/core/state"
+  import {deriveAlertStatus} from "@app/core/state"
+  import {pushModal} from "@app/util/modal"

  type Props = {
    alert: Alert
@@ -15,8 +15,7 @@

  const {alert}: Props = $props()

-  const address = $derived(getAddress(alert.event))
-  const status = $derived($alertStatuses.find(s => s.event.tags.some(nthEq(1, address))))
+  const status = deriveAlertStatus(getAddress(alert.event))
  const cron = $derived(getTagValue("cron", alert.tags))
  const channel = $derived(getTagValue("channel", alert.tags))
  const feeds = $derived(getTagValues("feed", alert.tags))
@@ -39,24 +38,24 @@
    </Button>
    <div class="flex-inline gap-1">{description}</div>
  </div>
-  {#if status}
-    {@const statusText = getTagValue("status", status.tags) || "error"}
+  {#if $status}
+    {@const statusText = getTagValue("status", $status.tags) || "error"}
    {#if statusText === "ok"}
      <span
        class="tooltip tooltip-left cursor-pointer rounded-full border border-solid border-base-content px-3 py-1 text-sm"
-        data-tip={getTagValue("message", status.tags)}>
+        data-tip={getTagValue("message", $status.tags)}>
        Active
      </span>
    {:else if statusText === "pending"}
      <span
        class="tooltip tooltip-left cursor-pointer rounded-full border border-solid border-base-content border-yellow-500 px-3 py-1 text-sm text-yellow-500"
-        data-tip={getTagValue("message", status.tags)}>
+        data-tip={getTagValue("message", $status.tags)}>
        Pending
      </span>
    {:else}
      <span
        class="tooltip tooltip-left cursor-pointer rounded-full border border-solid border-error px-3 py-1 text-sm text-error"
-        data-tip={getTagValue("message", status.tags)}>
+        data-tip={getTagValue("message", $status.tags)}>
        {statusText.replace("-", " ").replace(/^(.)/, x => x.toUpperCase())}
      </span>
    {/if}
@@ -1,20 +1,25 @@
 <script lang="ts">
-  import {onMount} from "svelte"
-  import {pubkey} from "@welshman/app"
+  import {getTagValue} from "@welshman/util"
  import Icon from "@lib/components/Icon.svelte"
  import Button from "@lib/components/Button.svelte"
  import AlertAdd from "@app/components/AlertAdd.svelte"
  import AlertItem from "@app/components/AlertItem.svelte"
-  import {loadAlertStatuses, loadAlerts} from "@app/requests"
-  import {pushModal} from "@app/modal"
-  import {alerts} from "@app/state"
+  import {pushModal} from "@app/util/modal"
+  import {alerts} from "@app/core/state"

-  const startAlert = () => pushModal(AlertAdd)
+  type Props = {
+    url?: string
+    channel?: string
+    hideSpaceField?: boolean
+  }

-  onMount(() => {
-    loadAlertStatuses($pubkey!)
-    loadAlerts($pubkey!)
-  })
+  const {url = "", channel = "push", hideSpaceField = false}: Props = $props()
+
+  const startAlert = () => pushModal(AlertAdd, {url, channel, hideSpaceField})
+
+  const filteredAlerts = $derived(
+    url ? $alerts.filter(a => getTagValue("feed", a.tags)?.includes(url)) : $alerts,
+  )
 </script>

 <div class="card2 bg-alt flex flex-col gap-6 shadow-xl">
@@ -29,10 +34,10 @@
    </Button>
  </div>
  <div class="col-4">
-    {#each $alerts as alert (alert.event.id)}
+    {#each filteredAlerts as alert (alert.event.id)}
      <AlertItem {alert} />
    {:else}
-      <p class="text-center opacity-75 py-12">No alerts found</p>
+      <p class="text-center opacity-75 py-12">Nothing here yet!</p>
    {/each}
  </div>
 </div>
@@ -7,8 +7,8 @@
  import PrimaryNav from "@app/components/PrimaryNav.svelte"
  import EmailConfirm from "@app/components/EmailConfirm.svelte"
  import PasswordReset from "@app/components/PasswordReset.svelte"
-  import {BURROW_URL} from "@app/state"
-  import {modals, pushModal} from "@app/modal"
+  import {BURROW_URL} from "@app/core/state"
+  import {modals, pushModal} from "@app/util/modal"

  interface Props {
    children: Snippet
@@ -1,79 +1,25 @@
-<script module lang="ts">
-  import type {Nip46ResponseWithResult} from "@welshman/signer"
-  import {Nip46Broker, makeSecret} from "@welshman/signer"
-  import {NIP46_PERMS, PLATFORM_URL, PLATFORM_NAME, PLATFORM_LOGO, SIGNER_RELAYS} from "@app/state"
-
-  export class BunkerConnectController {
-    url = $state("")
-    bunker = $state("")
-    loading = $state(false)
-    clientSecret = makeSecret()
-    abortController = new AbortController()
-    broker = new Nip46Broker({clientSecret: this.clientSecret, relays: SIGNER_RELAYS})
-    onNostrConnect: (response: Nip46ResponseWithResult) => void
-
-    constructor({onNostrConnect}: {onNostrConnect: (response: Nip46ResponseWithResult) => void}) {
-      this.onNostrConnect = onNostrConnect
-    }
-
-    async start() {
-      this.url = await this.broker.makeNostrconnectUrl({
-        perms: NIP46_PERMS,
-        url: PLATFORM_URL,
-        name: PLATFORM_NAME,
-        image: PLATFORM_LOGO,
-      })
-
-      let response
-      try {
-        response = await this.broker.waitForNostrconnect(this.url, this.abortController.signal)
-      } catch (errorResponse: any) {
-        if (errorResponse?.error) {
-          pushToast({
-            theme: "error",
-            message: `Received error from signer: ${errorResponse.error}`,
-          })
-        } else if (errorResponse) {
-          console.error(errorResponse)
-        }
-      }
-
-      if (response) {
-        this.loading = true
-        this.onNostrConnect(response)
-      }
-    }
-
-    stop() {
-      this.broker.cleanup()
-      this.abortController.abort()
-    }
-  }
-</script>
-
 <script lang="ts">
-  import {onMount, onDestroy} from "svelte"
-  import {slideAndFade} from "@lib/transition"
+  import Spinner from "@lib/components/Spinner.svelte"
  import QRCode from "@app/components/QRCode.svelte"
-  import {pushToast} from "@app/toast"
+  import type {Nip46Controller} from "@app/util/nip46"

  type Props = {
-    controller: BunkerConnectController
+    controller: Nip46Controller
  }

  const {controller}: Props = $props()
-
-  onMount(() => {
-    controller.start()
-  })
-
-  onDestroy(() => {
-    controller.stop()
-  })
+  const {url, loading} = controller
 </script>

-{#if controller.url}
-  <div class="flex justify-center" out:slideAndFade>
-    <QRCode code={controller.url} />
-  </div>
+{#if $url}
+  {#if $loading}
+    <div class="flex justify-center">
+      <Spinner loading>Establishing connection...</Spinner>
+    </div>
+  {:else}
+    <div class="flex flex-col items-center gap-2">
+      <QRCode code={$url} />
+      <p class="text-sm opacity-75">Scan with your signer to log in, or click to copy.</p>
+    </div>
+  {/if}
 {/if}
@@ -1,16 +1,30 @@
 <script lang="ts">
-  import {pushModal} from "@app/modal"
-  import InfoBunker from "@app/components/InfoBunker.svelte"
+  import {debounce} from "throttle-debounce"
+  import Scanner from "@lib/components/Scanner.svelte"
  import Button from "@lib/components/Button.svelte"
  import Field from "@lib/components/Field.svelte"
  import Icon from "@lib/components/Icon.svelte"
+  import InfoBunker from "@app/components/InfoBunker.svelte"
+  import type {Nip46Controller} from "@app/util/nip46"
+  import {pushModal} from "@app/util/modal"

  type Props = {
-    bunker: string
-    loading: boolean
+    controller: Nip46Controller
  }

-  let {loading, bunker = $bindable("")}: Props = $props()
+  const {controller}: Props = $props()
+  const {loading, bunker} = controller
+
+  const toggleScanner = () => {
+    showScanner = !showScanner
+  }
+
+  const onScan = debounce(1000, async (data: string) => {
+    showScanner = false
+    $bunker = data
+  })
+
+  let showScanner = $state(false)
 </script>

 <Field>
@@ -20,7 +34,10 @@
  {#snippet input()}
    <label class="input input-bordered flex w-full items-center gap-2">
      <Icon icon="cpu" />
-      <input disabled={loading} bind:value={bunker} class="grow" placeholder="bunker://" />
+      <input disabled={$loading} bind:value={$bunker} class="grow" placeholder="bunker://" />
+      <Button onclick={toggleScanner}>
+        <Icon icon="qr-code" />
+      </Button>
    </label>
  {/snippet}
  {#snippet info()}
@@ -30,3 +47,6 @@
    </p>
  {/snippet}
 </Field>
+{#if showScanner}
+  <Scanner onscan={onScan} />
+{/if}
@@ -8,9 +8,9 @@
  import EventActivity from "@app/components/EventActivity.svelte"
  import EventActions from "@app/components/EventActions.svelte"
  import CalendarEventEdit from "@app/components/CalendarEventEdit.svelte"
-  import {publishDelete, publishReaction} from "@app/commands"
-  import {makeCalendarPath} from "@app/routes"
-  import {pushModal} from "@app/modal"
+  import {publishDelete, publishReaction, canEnforceNip70} from "@app/core/commands"
+  import {makeCalendarPath} from "@app/util/routes"
+  import {pushModal} from "@app/util/modal"

  const {
    url,
@@ -22,14 +22,17 @@
    showActivity?: boolean
  } = $props()

+  const shouldProtect = canEnforceNip70(url)
+
  const path = makeCalendarPath(url, event.id)

  const editEvent = () => pushModal(CalendarEventEdit, {url, event})

-  const deleteReaction = (event: TrustedEvent) => publishDelete({relays: [url], event})
+  const deleteReaction = async (event: TrustedEvent) =>
+    publishDelete({relays: [url], event, protect: await shouldProtect})

-  const createReaction = (template: EventContent) =>
-    publishReaction({...template, event, relays: [url]})
+  const createReaction = async (template: EventContent) =>
+    publishReaction({...template, event, relays: [url], protect: await shouldProtect})
 </script>

 <div class="flex flex-wrap items-center justify-between gap-2">
@@ -2,7 +2,7 @@
  import type {Snippet} from "svelte"
  import {writable} from "svelte/store"
  import {randomId, HOUR} from "@welshman/lib"
-  import {createEvent, EVENT_TIME} from "@welshman/util"
+  import {makeEvent, EVENT_TIME} from "@welshman/util"
  import {publishThunk} from "@welshman/app"
  import {preventDefault} from "@lib/html"
  import {daysBetween} from "@lib/util"
@@ -13,9 +13,10 @@
  import ModalFooter from "@lib/components/ModalFooter.svelte"
  import DateTimeInput from "@lib/components/DateTimeInput.svelte"
  import EditorContent from "@app/editor/EditorContent.svelte"
-  import {PROTECTED} from "@app/state"
+  import {PROTECTED} from "@app/core/state"
  import {makeEditor} from "@app/editor"
-  import {pushToast} from "@app/toast"
+  import {pushToast} from "@app/util/toast"
+  import {canEnforceNip70} from "@app/core/commands"

  type Props = {
    url: string
@@ -32,6 +33,8 @@

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

+  const shouldProtect = canEnforceNip70(url)
+
  const uploading = writable(false)

  const back = () => history.back()
@@ -63,19 +66,22 @@
    }

    const ed = await editor
-    const event = createEvent(EVENT_TIME, {
-      content: ed.getText({blockSeparator: "\n"}).trim(),
-      tags: [
-        ["d", initialValues?.d || randomId()],
-        ["title", title],
-        ["location", location || ""],
-        ["start", start.toString()],
-        ["end", end.toString()],
-        ...daysBetween(start, end).map(D => ["D", D.toString()]),
-        ...ed.storage.nostr.getEditorTags(),
-        PROTECTED,
-      ],
-    })
+    const content = ed.getText({blockSeparator: "\n"}).trim()
+    const tags = [
+      ["d", initialValues?.d || randomId()],
+      ["title", title],
+      ["location", location || ""],
+      ["start", start.toString()],
+      ["end", end.toString()],
+      ...daysBetween(start, end).map(D => ["D", D.toString()]),
+      ...ed.storage.nostr.getEditorTags(),
+    ]
+
+    if (await shouldProtect) {
+      tags.push(PROTECTED)
+    }
+
+    const event = makeEvent(EVENT_TIME, {content, tags})

    pushToast({message: "Your event has been saved!"})
    publishThunk({event, relays: [url]})
@@ -4,7 +4,7 @@
  import CalendarEventActions from "@app/components/CalendarEventActions.svelte"
  import CalendarEventHeader from "@app/components/CalendarEventHeader.svelte"
  import ProfileLink from "@app/components/ProfileLink.svelte"
-  import {makeCalendarPath} from "@app/routes"
+  import {makeCalendarPath} from "@app/util/routes"

  type Props = {
    url: string
@@ -8,15 +8,16 @@
  import Icon from "@lib/components/Icon.svelte"
  import Button from "@lib/components/Button.svelte"
  import Content from "@app/components/Content.svelte"
-  import ThunkStatus from "@app/components/ThunkStatus.svelte"
+  import ThunkFailure from "@app/components/ThunkFailure.svelte"
  import ProfileDetail from "@app/components/ProfileDetail.svelte"
  import ReactionSummary from "@app/components/ReactionSummary.svelte"
+  import ChannelMessageZapButton from "@app/components/ChannelMessageZapButton.svelte"
  import ChannelMessageEmojiButton from "@app/components/ChannelMessageEmojiButton.svelte"
  import ChannelMessageMenuButton from "@app/components/ChannelMessageMenuButton.svelte"
  import ChannelMessageMenuMobile from "@app/components/ChannelMessageMenuMobile.svelte"
-  import {colors} from "@app/state"
-  import {publishDelete, publishReaction} from "@app/commands"
-  import {pushModal} from "@app/modal"
+  import {colors, ENABLE_ZAPS} from "@app/core/state"
+  import {publishDelete, publishReaction, canEnforceNip70} from "@app/core/commands"
+  import {pushModal} from "@app/util/modal"

  interface Props {
    url: string
@@ -29,6 +30,7 @@
  const {url, event, replyTo = undefined, showPubkey = false, inert = false}: Props = $props()

  const thunk = $thunks[event.id]
+  const shouldProtect = canEnforceNip70(url)
  const today = formatTimestampAsDate(now())
  const profile = deriveProfile(event.pubkey, [url])
  const profileDisplay = deriveProfileDisplay(event.pubkey, [url])
@@ -40,10 +42,11 @@

  const openProfile = () => pushModal(ProfileDetail, {pubkey: event.pubkey, url})

-  const deleteReaction = (event: TrustedEvent) => publishDelete({relays: [url], event})
+  const deleteReaction = async (event: TrustedEvent) =>
+    publishDelete({relays: [url], event, protect: await shouldProtect})

-  const createReaction = (template: EventContent) =>
-    publishReaction({...template, event, relays: [url]})
+  const createReaction = async (template: EventContent) =>
+    publishReaction({...template, event, relays: [url], protect: await shouldProtect})
 </script>

 <TapTarget
@@ -77,12 +80,12 @@
      <div class="text-sm">
        <Content minimalQuote {event} {url} />
        {#if thunk}
-          <ThunkStatus {thunk} class="mt-2" />
+          <ThunkFailure showToastOnRetry {thunk} class="mt-2" />
        {/if}
      </div>
    </div>
  </div>
-  <div class="row-2 ml-10 mt-1">
+  <div class="row-2 ml-10 mt-1 pl-1">
    <ReactionSummary
      {url}
      {event}
@@ -94,6 +97,9 @@
    <button
      class="join absolute right-1 top-1 border border-solid border-neutral text-xs opacity-0 transition-all"
      class:group-hover:opacity-100={!isMobile}>
+      {#if ENABLE_ZAPS}
+        <ChannelMessageZapButton {url} {event} />
+      {/if}
      <ChannelMessageEmojiButton {url} {event} />
      {#if replyTo}
        <Button class="btn join-item btn-xs" onclick={reply}>
@@ -2,12 +2,19 @@
  import type {NativeEmoji} from "emoji-picker-element/shared"
  import EmojiButton from "@lib/components/EmojiButton.svelte"
  import Icon from "@lib/components/Icon.svelte"
-  import {publishReaction} from "@app/commands"
+  import {publishReaction, canEnforceNip70} from "@app/core/commands"

  const {url, event} = $props()

-  const onEmoji = (emoji: NativeEmoji) =>
-    publishReaction({event, relays: [url], content: emoji.unicode})
+  const shouldProtect = canEnforceNip70(url)
+
+  const onEmoji = async (emoji: NativeEmoji) =>
+    publishReaction({
+      event,
+      relays: [url],
+      content: emoji.unicode,
+      protect: await shouldProtect,
+    })
 </script>

 <EmojiButton {onEmoji} class="btn join-item btn-xs">
@@ -5,7 +5,7 @@
  import EventInfo from "@app/components/EventInfo.svelte"
  import EventReport from "@app/components/EventReport.svelte"
  import EventDeleteConfirm from "@app/components/EventDeleteConfirm.svelte"
-  import {pushModal} from "@app/modal"
+  import {pushModal} from "@app/util/modal"

  const {url, event, onClick} = $props()

@@ -5,10 +5,12 @@
  import Button from "@lib/components/Button.svelte"
  import Icon from "@lib/components/Icon.svelte"
  import EmojiPicker from "@lib/components/EmojiPicker.svelte"
+  import ZapButton from "@app/components/ZapButton.svelte"
  import EventInfo from "@app/components/EventInfo.svelte"
  import EventDeleteConfirm from "@app/components/EventDeleteConfirm.svelte"
-  import {publishReaction} from "@app/commands"
-  import {pushModal} from "@app/modal"
+  import {ENABLE_ZAPS} from "@app/core/state"
+  import {publishReaction, canEnforceNip70} from "@app/core/commands"
+  import {pushModal} from "@app/util/modal"

  type Props = {
    url: string
@@ -18,9 +20,16 @@

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

-  const onEmoji = ((event: TrustedEvent, url: string, emoji: NativeEmoji) => {
+  const shouldProtect = canEnforceNip70(url)
+
+  const onEmoji = (async (event: TrustedEvent, url: string, emoji: NativeEmoji) => {
    history.back()
-    publishReaction({event, relays: [url], content: emoji.unicode})
+    publishReaction({
+      event,
+      relays: [url],
+      content: emoji.unicode,
+      protect: await shouldProtect,
+    })
  }).bind(undefined, event, url)

  const showEmojiPicker = () => pushModal(EmojiPicker, {onClick: onEmoji}, {replaceState: true})
@@ -40,6 +49,12 @@
    <Icon size={4} icon="smile-circle" />
    Send Reaction
  </Button>
+  {#if ENABLE_ZAPS}
+    <ZapButton replaceState {url} {event} class="btn btn-secondary w-full">
+      <Icon size={4} icon="bolt" />
+      Send Zap
+    </ZapButton>
+  {/if}
  <Button class="btn btn-neutral w-full" onclick={sendReply}>
    <Icon size={4} icon="reply" />
    Send Reply
@@ -0,0 +1,10 @@
+<script lang="ts">
+  import Icon from "@lib/components/Icon.svelte"
+  import ZapButton from "@app/components/ZapButton.svelte"
+
+  const {url, event} = $props()
+</script>
+
+<ZapButton {url} {event} class="btn join-item btn-xs">
+  <Icon icon="bolt" size={4} />
+</ZapButton>
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import {channelsById, makeChannelId} from "@app/state"
+  import {channelsById, makeChannelId} from "@app/core/state"

  const {url, room} = $props()
 </script>
@@ -16,20 +16,21 @@
  import type {TrustedEvent, EventTemplate, EventContent} from "@welshman/util"
  import {parse, isLink} from "@welshman/content"
  import {
-    createEvent,
+    makeEvent,
    tagsFromIMeta,
    getTags,
    DIRECT_MESSAGE,
    DIRECT_MESSAGE_FILE,
-    INBOX_RELAYS,
  } from "@welshman/util"
  import {
    pubkey,
    tagPubkey,
    sendWrapped,
-    loadUsingOutbox,
+    mergeThunks,
+    loadInboxRelaySelections,
    inboxRelaySelectionsByPubkey,
  } from "@welshman/app"
+  import type {AbstractThunk} from "@welshman/app"
  import Icon from "@lib/components/Icon.svelte"
  import Link from "@lib/components/Link.svelte"
  import Spinner from "@lib/components/Spinner.svelte"
@@ -45,15 +46,17 @@
  import ChatMessage from "@app/components/ChatMessage.svelte"
  import ChatCompose from "@app/components/ChatCompose.svelte"
  import ChatComposeParent from "@app/components/ChatComposeParent.svelte"
+  import ThunkToast from "@app/components/ThunkToast.svelte"
  import {
    INDEXER_RELAYS,
    userSettingValues,
    deriveChat,
    splitChatId,
    PLATFORM_NAME,
-  } from "@app/state"
-  import {pushModal} from "@app/modal"
-  import {prependParent} from "@app/commands"
+  } from "@app/core/state"
+  import {pushModal} from "@app/util/modal"
+  import {prependParent} from "@app/core/commands"
+  import {pushToast} from "@app/util/toast"

  type Props = {
    id: string
@@ -97,7 +100,7 @@
      content = content.trim()

      if (content) {
-        templates.push(createEvent(kind, {content, tags: [...tags, ...ptags]}))
+        templates.push(makeEvent(kind, {content, tags: [...tags, ...ptags]}))
      }
    }

@@ -122,12 +125,23 @@

    // Split the message into multiple pieces so that we can use kind 15 to send images per nip 17
    // Sleep 1 second between each one to make sure timestamps are distinct
+    const thunks: AbstractThunk[] = []
    for (let i = 0; i < templates.length; i++) {
      const template = templates[i]

-      await sendWrapped({pubkeys, template, delay: $userSettingValues.send_delay + ms(i)})
+      thunks.push(
+        await sendWrapped({pubkeys, template, delay: $userSettingValues.send_delay + ms(i)}),
+      )
    }

+    pushToast({
+      timeout: 30_000,
+      children: {
+        component: ThunkToast,
+        props: {thunk: mergeThunks(thunks)},
+      },
+    })
+
    clearParent()
  }

@@ -156,7 +170,7 @@
        id,
        type: "note",
        value: event,
-        showPubkey: created_at - previousCreatedAt > int(15, MINUTE) || previousPubkey !== pubkey,
+        showPubkey: created_at - previousCreatedAt > int(2, MINUTE) || previousPubkey !== pubkey,
      })

      previousDate = date
@@ -168,13 +182,8 @@
  })

  onMount(() => {
-    // Don't use loadInboxRelaySelection because we want to force reload
    for (const pubkey of others) {
-      loadUsingOutbox({
-        pubkey,
-        kind: INBOX_RELAYS,
-        relays: INDEXER_RELAYS,
-      })
+      loadInboxRelaySelections(pubkey, INDEXER_RELAYS, true)
    }

    const observer = new ResizeObserver(() => {
@@ -8,8 +8,8 @@
  import Spinner from "@lib/components/Spinner.svelte"
  import ModalHeader from "@lib/components/ModalHeader.svelte"
  import ModalFooter from "@lib/components/ModalFooter.svelte"
-  import {canDecrypt, PLATFORM_NAME, ensureUnwrapped} from "@app/state"
-  import {clearModals} from "@app/modal"
+  import {canDecrypt, PLATFORM_NAME, ensureUnwrapped} from "@app/core/state"
+  import {clearModals} from "@app/util/modal"

  const {next} = $props()

@@ -9,8 +9,8 @@
  import ProfileName from "@app/components/ProfileName.svelte"
  import ProfileCircle from "@app/components/ProfileCircle.svelte"
  import ProfileCircles from "@app/components/ProfileCircles.svelte"
-  import {makeChatPath} from "@app/routes"
-  import {notifications} from "@app/notifications"
+  import {makeChatPath} from "@app/util/routes"
+  import {notifications} from "@app/util/notifications"

  interface Props {
    id: string
@@ -59,6 +59,11 @@
        {/if}
      </div>
      <p class="overflow-hidden text-ellipsis whitespace-nowrap text-sm">
+        <span class="opacity-50">
+          {#if props.messages[0].pubkey === $pubkey}
+            You:
+          {/if}
+        </span>
        {props.messages[0].content}
      </p>
    </div>
@@ -2,8 +2,8 @@
  import Icon from "@lib/components/Icon.svelte"
  import Button from "@lib/components/Button.svelte"
  import ChatStart from "@app/components/ChatStart.svelte"
-  import {setChecked} from "@app/notifications"
-  import {pushModal} from "@app/modal"
+  import {setChecked} from "@app/util/notifications"
+  import {pushModal} from "@app/util/modal"

  const startChat = () => pushModal(ChatStart, {}, {replaceState: true})

@@ -11,13 +11,13 @@
  import Avatar from "@lib/components/Avatar.svelte"
  import Content from "@app/components/Content.svelte"
  import ReactionSummary from "@app/components/ReactionSummary.svelte"
-  import ThunkStatus from "@app/components/ThunkStatus.svelte"
+  import ThunkFailure from "@app/components/ThunkFailure.svelte"
  import ProfileDetail from "@app/components/ProfileDetail.svelte"
  import ChatMessageMenu from "@app/components/ChatMessageMenu.svelte"
  import ChatMessageMenuMobile from "@app/components/ChatMessageMenuMobile.svelte"
-  import {colors} from "@app/state"
-  import {makeDelete, makeReaction} from "@app/commands"
-  import {pushModal} from "@app/modal"
+  import {colors} from "@app/core/state"
+  import {makeDelete, makeReaction} from "@app/core/commands"
+  import {pushModal} from "@app/util/modal"

  interface Props {
    event: TrustedEvent
@@ -37,10 +37,10 @@
  const reply = () => replyTo(event)

  const deleteReaction = (event: TrustedEvent) =>
-    sendWrapped({template: makeDelete({event}), pubkeys})
+    sendWrapped({template: makeDelete({event, protect: false}), pubkeys})

  const createReaction = (template: EventContent) =>
-    sendWrapped({template: makeReaction({event, ...template}), pubkeys})
+    sendWrapped({template: makeReaction({event, protect: false, ...template}), pubkeys})

  const openProfile = () => pushModal(ProfileDetail, {pubkey: event.pubkey})

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

 {#if thunk}
-  <ThunkStatus {thunk} class="mt-1" />
+  <ThunkFailure showToastOnRetry {thunk} class="mt-1" />
 {/if}
 <div
  data-event={event.id}
@@ -4,7 +4,7 @@
  import {sendWrapped} from "@welshman/app"
  import Icon from "@lib/components/Icon.svelte"
  import EmojiButton from "@lib/components/EmojiButton.svelte"
-  import {makeReaction} from "@app/commands"
+  import {makeReaction} from "@app/core/commands"

  interface Props {
    event: TrustedEvent
@@ -14,7 +14,7 @@
  const {event, pubkeys}: Props = $props()

  const onEmoji = (emoji: NativeEmoji) =>
-    sendWrapped({template: makeReaction({event, content: emoji.unicode}), pubkeys})
+    sendWrapped({template: makeReaction({event, content: emoji.unicode, protect: false}), pubkeys})
 </script>

 <EmojiButton {onEmoji} class="btn join-item btn-xs">
@@ -3,7 +3,7 @@
  import Button from "@lib/components/Button.svelte"
  import ChatMessageEmojiButton from "@app/components/ChatMessageEmojiButton.svelte"
  import EventInfo from "@app/components/EventInfo.svelte"
-  import {pushModal} from "@app/modal"
+  import {pushModal} from "@app/util/modal"

  const {event, pubkeys, popover, replyTo} = $props()

@@ -6,9 +6,9 @@
  import Button from "@lib/components/Button.svelte"
  import EmojiPicker from "@lib/components/EmojiPicker.svelte"
  import EventInfo from "@app/components/EventInfo.svelte"
-  import {makeReaction} from "@app/commands"
-  import {pushModal} from "@app/modal"
-  import {clip} from "@app/toast"
+  import {makeReaction} from "@app/core/commands"
+  import {pushModal} from "@app/util/modal"
+  import {clip} from "@app/util/toast"

  type Props = {
    pubkeys: string[]
@@ -20,7 +20,7 @@

  const onEmoji = ((event: TrustedEvent, pubkeys: string[], emoji: NativeEmoji) => {
    history.back()
-    sendWrapped({template: makeReaction({event, content: emoji.unicode}), pubkeys})
+    sendWrapped({template: makeReaction({event, content: emoji.unicode, protect: false}), pubkeys})
  }).bind(undefined, event, pubkeys)

  const showEmojiPicker = () => pushModal(EmojiPicker, {onClick: onEmoji}, {replaceState: true})
@@ -13,7 +13,7 @@
  import ModalHeader from "@lib/components/ModalHeader.svelte"
  import ModalFooter from "@lib/components/ModalFooter.svelte"
  import ProfileMultiSelect from "@app/components/ProfileMultiSelect.svelte"
-  import {makeChatPath} from "@app/routes"
+  import {makeChatPath} from "@app/util/routes"

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

@@ -0,0 +1,38 @@
+<script lang="ts">
+  import type {TrustedEvent, EventContent} from "@welshman/util"
+  import ReactionSummary from "@app/components/ReactionSummary.svelte"
+  import ThunkStatusOrDeleted from "@app/components/ThunkStatusOrDeleted.svelte"
+  import EventActivity from "@app/components/EventActivity.svelte"
+  import EventActions from "@app/components/EventActions.svelte"
+  import {publishDelete, publishReaction, canEnforceNip70} from "@app/core/commands"
+  import {makeThreadPath} from "@app/util/routes"
+
+  interface Props {
+    url: any
+    event: any
+    showActivity?: boolean
+  }
+
+  const {url, event, showActivity = false}: Props = $props()
+
+  const shouldProtect = canEnforceNip70(url)
+
+  const path = makeThreadPath(url, event.id)
+
+  const deleteReaction = async (event: TrustedEvent) =>
+    publishDelete({relays: [url], event, protect: await shouldProtect})
+
+  const createReaction = async (template: EventContent) =>
+    publishReaction({...template, event, relays: [url], protect: await shouldProtect})
+</script>
+
+<div class="flex flex-wrap items-center justify-between gap-2">
+  <div class="flex flex-grow flex-wrap justify-end gap-2">
+    <ReactionSummary {url} {event} {deleteReaction} {createReaction} reactionClass="tooltip-left" />
+    <ThunkStatusOrDeleted {event} />
+    {#if showActivity}
+      <EventActivity {url} {path} {event} />
+    {/if}
+    <EventActions {url} {event} noun="Comment" />
+  </div>
+</div>
@@ -31,7 +31,7 @@
  import ContentQuote from "@app/components/ContentQuote.svelte"
  import ContentTopic from "@app/components/ContentTopic.svelte"
  import ContentMention from "@app/components/ContentMention.svelte"
-  import {entityLink, userSettingValues} from "@app/state"
+  import {entityLink, userSettingValues} from "@app/core/state"

  interface Props {
    event: any
@@ -1,6 +1,6 @@
 <script lang="ts">
  import type {ParsedEmojiValue} from "@welshman/content"
-  import {imgproxy} from "@app/state"
+  import {imgproxy} from "@app/core/state"

  export let value: ParsedEmojiValue

@@ -1,11 +1,11 @@
 <script lang="ts">
-  import {ellipsize, postJson} from "@welshman/lib"
-  import {dufflepud, imgproxy} from "@app/state"
+  import {ellipsize, displayUrl, postJson} from "@welshman/lib"
+  import {dufflepud, imgproxy} from "@app/core/state"
  import {preventDefault, stopPropagation} from "@lib/html"
  import Link from "@lib/components/Link.svelte"
  import ContentLinkDetail from "@app/components/ContentLinkDetail.svelte"
  import ContentLinkBlockImage from "@app/components/ContentLinkBlockImage.svelte"
-  import {pushModal} from "@app/modal"
+  import {pushModal} from "@app/util/modal"

  const {value, event} = $props()

@@ -52,15 +52,13 @@
              alt="Link preview"
              onerror={onError}
              src={imgproxy(preview.image)}
-              class="bg-alt max-h-72 object-contain object-center" />
-          {/if}
-          {#if preview.title}
-            <div class="flex flex-col gap-2 p-4">
-              <strong class="overflow-hidden text-ellipsis whitespace-nowrap"
-                >{preview.title}</strong>
-              <p>{ellipsize(preview.description, 140)}</p>
-            </div>
+              class="bg-alt max-h-72 rounded-t-box object-contain object-center" />
          {/if}
+          <div class="flex flex-col gap-2 p-4">
+            <strong class="overflow-hidden text-ellipsis whitespace-nowrap"
+              >{preview.title || displayUrl(url)}</strong>
+            <p>{ellipsize(preview.description, 140)}</p>
+          </div>
        </div>
      {:catch}
        <p class="bg-alt p-12 text-center leading-normal">
@@ -3,7 +3,7 @@
  import {displayUrl} from "@welshman/lib"
  import {getTags, decryptFile, getTagValue, tagsFromIMeta} from "@welshman/util"
  import Icon from "@lib/components/Icon.svelte"
-  import {imgproxy} from "@app/state"
+  import {imgproxy} from "@app/core/state"

  const {value, event, ...props} = $props()

@@ -4,7 +4,7 @@
  import Icon from "@lib/components/Icon.svelte"
  import Link from "@lib/components/Link.svelte"
  import ContentLinkDetail from "@app/components/ContentLinkDetail.svelte"
-  import {pushModal} from "@app/modal"
+  import {pushModal} from "@app/util/modal"

  const {value} = $props()

@@ -1,11 +1,10 @@
 <script lang="ts">
  import {removeNil} from "@welshman/lib"
  import type {ProfilePointer} from "@welshman/content"
-  import {displayProfile} from "@welshman/util"
-  import {deriveProfile} from "@welshman/app"
+  import {deriveProfileDisplay} from "@welshman/app"
  import Button from "@lib/components/Button.svelte"
  import ProfileDetail from "@app/components/ProfileDetail.svelte"
-  import {pushModal} from "@app/modal"
+  import {pushModal} from "@app/util/modal"

  type Props = {
    value: ProfilePointer
@@ -14,11 +13,11 @@

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

-  const profile = deriveProfile(value.pubkey, removeNil([url]))
+  const display = deriveProfileDisplay(value.pubkey, removeNil([url]))

  const openProfile = () => pushModal(ProfileDetail, {pubkey: value.pubkey, url})
 </script>

 <Button onclick={openProfile} class="link-content">
-  @{displayProfile($profile)}
+  @{$display}
 </Button>
@@ -7,8 +7,8 @@
  import Spinner from "@lib/components/Spinner.svelte"
  import NoteCard from "@app/components/NoteCard.svelte"
  import NoteContent from "@app/components/NoteContent.svelte"
-  import {deriveEvent, entityLink} from "@app/state"
-  import {goToEvent} from "@app/routes"
+  import {deriveEvent, entityLink} from "@app/core/state"
+  import {goToEvent} from "@app/util/routes"

  type Props = {
    value: any
@@ -1,7 +1,7 @@
 <script lang="ts">
  import Icon from "@lib/components/Icon.svelte"
  import Button from "@lib/components/Button.svelte"
-  import {clip} from "@app/toast"
+  import {clip} from "@app/util/toast"

  const {value} = $props()

@@ -0,0 +1,74 @@
+<script lang="ts">
+  import {formatTimestamp} from "@welshman/lib"
+  import type {TrustedEvent} from "@welshman/util"
+  import Icon from "@lib/components/Icon.svelte"
+  import Button from "@lib/components/Button.svelte"
+  import Content from "@app/components/Content.svelte"
+  import ProfileCircle from "@app/components/ProfileCircle.svelte"
+  import ProfileCircles from "@app/components/ProfileCircles.svelte"
+  import {goToEvent} from "@app/util/routes"
+  import {displayChannel} from "@app/core/state"
+
+  type Props = {
+    url: string
+    room?: string
+    events: TrustedEvent[]
+    latest: TrustedEvent
+    earliest: TrustedEvent
+    participants: string[]
+  }
+
+  const {url, room, events, latest, earliest, participants}: Props = $props()
+</script>
+
+<Button class="card2 bg-alt" onclick={() => goToEvent(earliest)}>
+  <div class="flex flex-col gap-3">
+    <div class="flex items-start gap-3">
+      <ProfileCircle pubkey={earliest.pubkey} size={10} />
+      <div class="min-w-0 flex-1">
+        <div class="flex items-center gap-2 text-sm opacity-70">
+          {#if room}
+            <span class="truncate font-medium text-blue-400">
+              #{displayChannel(url, room)}
+            </span>
+            <span class="opacity-50">•</span>
+          {/if}
+          <span class="text-nowrap">{formatTimestamp(earliest.created_at)}</span>
+        </div>
+        <Content minimalQuote minLength={100} maxLength={400} event={earliest} />
+      </div>
+    </div>
+    <div class="ml-13 flex items-center justify-between">
+      <div class="flex gap-1">
+        <Icon icon="alt-arrow-left" />
+        <span class="text-sm opacity-70">
+          {events.length}
+          {events.length === 1 ? "message" : "messages"}
+        </span>
+      </div>
+      <div class="flex gap-2">
+        <ProfileCircles pubkeys={participants} size={6} />
+        <span class="text-sm opacity-70">
+          {participants.length}
+          {participants.length === 1 ? "participant" : "participants"}
+        </span>
+      </div>
+    </div>
+    {#if latest !== earliest}
+      <Button class="card2 bg-alt" onclick={() => goToEvent(latest)}>
+        <div class="flex flex-col gap-2">
+          <div class="flex items-center justify-between">
+            <div class="flex items-center gap-2 text-sm opacity-70">
+              <ProfileCircle pubkey={latest.pubkey} size={5} />
+              <span class="font-medium">Latest reply:</span>
+            </div>
+            <span class="text-xs opacity-50">
+              {formatTimestamp(latest.created_at)}
+            </span>
+          </div>
+          <Content minimalQuote minLength={100} maxLength={400} event={latest} />
+        </div>
+      </Button>
+    {/if}
+  </div>
+</Button>
@@ -4,8 +4,8 @@
  import Button from "@lib/components/Button.svelte"
  import Spinner from "@lib/components/Spinner.svelte"
  import LogInPassword from "@app/components/LogInPassword.svelte"
-  import {pushModal} from "@app/modal"
-  import {BURROW_URL} from "@app/state"
+  import {pushModal} from "@app/util/modal"
+  import {BURROW_URL} from "@app/core/state"

  const {email, confirm_token} = $props()

@@ -6,30 +6,45 @@
  import Icon from "@lib/components/Icon.svelte"
  import Tippy from "@lib/components/Tippy.svelte"
  import Button from "@lib/components/Button.svelte"
+  import ZapButton from "@app/components/ZapButton.svelte"
  import EmojiButton from "@lib/components/EmojiButton.svelte"
  import EventMenu from "@app/components/EventMenu.svelte"
-  import {publishReaction} from "@app/commands"
+  import {ENABLE_ZAPS} from "@app/core/state"
+  import {publishReaction, canEnforceNip70} from "@app/core/commands"

  type Props = {
    url: string
    noun: string
    event: TrustedEvent
+    hideZap?: boolean
    customActions?: Snippet
  }

-  const {url, noun, event, customActions}: Props = $props()
+  const {url, noun, event, hideZap, customActions}: Props = $props()
+
+  const shouldProtect = canEnforceNip70(url)

  const showPopover = () => popover?.show()

  const hidePopover = () => popover?.hide()

-  const onEmoji = (emoji: NativeEmoji) =>
-    publishReaction({event, content: emoji.unicode, relays: [url]})
+  const onEmoji = async (emoji: NativeEmoji) =>
+    publishReaction({
+      event,
+      content: emoji.unicode,
+      relays: [url],
+      protect: await shouldProtect,
+    })

  let popover: Instance | undefined = $state()
 </script>

 <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} />
+    </ZapButton>
+  {/if}
  <EmojiButton {onEmoji} class="btn join-item btn-neutral btn-xs">
    <Icon icon="smile-circle" size={4} />
  </EmojiButton>
@@ -6,7 +6,7 @@
  import {deriveEvents} from "@welshman/store"
  import type {TrustedEvent} from "@welshman/util"
  import {repository} from "@welshman/app"
-  import {notifications} from "@app/notifications"
+  import {notifications} from "@app/util/notifications"
  import Icon from "@lib/components/Icon.svelte"

  const {url, path, event}: {url: string; path: string; event: TrustedEvent} = $props()
@@ -1,8 +1,8 @@
 <script lang="ts">
  import type {TrustedEvent} from "@welshman/util"
  import Confirm from "@lib/components/Confirm.svelte"
-  import {publishDelete} from "@app/commands"
-  import {clearModals} from "@app/modal"
+  import {publishDelete, canEnforceNip70} from "@app/core/commands"
+  import {clearModals} from "@app/util/modal"

  type Props = {
    url: string
@@ -11,8 +11,10 @@

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

+  const shouldProtect = canEnforceNip70(url)
+
  const confirm = async () => {
-    await publishDelete({event, relays: [url]})
+    await publishDelete({event, relays: [url], protect: await shouldProtect})

    clearModals()
  }
@@ -1,12 +1,15 @@
 <script lang="ts">
  import * as nip19 from "nostr-tools/nip19"
  import {Router} from "@welshman/router"
+  import {LOCALE, secondsToDate} from "@welshman/lib"
  import type {TrustedEvent} from "@welshman/util"
+  import {displayRelayUrl} from "@welshman/util"
  import Icon from "@lib/components/Icon.svelte"
  import FieldInline from "@lib/components/FieldInline.svelte"
  import Button from "@lib/components/Button.svelte"
  import ModalHeader from "@lib/components/ModalHeader.svelte"
-  import {clip} from "@app/toast"
+  import {trackerStore} from "@app/core/state"
+  import {clip} from "@app/util/toast"

  type Props = {
    url?: string
@@ -17,11 +20,17 @@

  const relays = url ? [url] : Router.get().Event(event).getUrls()
  const nevent1 = nip19.neventEncode({...event, relays})
+  const seenOn = $trackerStore.getRelays(event.id)
  const npub1 = nip19.npubEncode(event.pubkey)
  const json = JSON.stringify(event, null, 2)
  const copyLink = () => clip(nevent1)
  const copyPubkey = () => clip(npub1)
  const copyJson = () => clip(json)
+
+  const formatter = new Intl.DateTimeFormat(LOCALE, {
+    dateStyle: "long",
+    timeStyle: "long",
+  })
 </script>

 <div class="column gap-4">
@@ -33,6 +42,14 @@
      <div>The full details of this event are shown below.</div>
    {/snippet}
  </ModalHeader>
+  <FieldInline>
+    {#snippet label()}
+      <p>Created At</p>
+    {/snippet}
+    {#snippet input()}
+      <p>{formatter.format(secondsToDate(event.created_at))}</p>
+    {/snippet}
+  </FieldInline>
  <FieldInline>
    {#snippet label()}
      <p>Event Link</p>
@@ -61,6 +78,22 @@
      </label>
    {/snippet}
  </FieldInline>
+  {#if !url && seenOn.size > 0}
+    <FieldInline>
+      {#snippet label()}
+        <p>Seen On</p>
+      {/snippet}
+      {#snippet input()}
+        <div class="flex flex-wrap gap-2">
+          {#each seenOn as url, i (url)}
+            <span class="bg-alt badge flex gap-1">
+              {displayRelayUrl(url)}
+            </span>
+          {/each}
+        </div>
+      {/snippet}
+    </FieldInline>
+  {/if}
  <div class="relative">
    <pre class="card2 card2-sm bg-alt overflow-auto text-xs"><code>{json}</code></pre>
    <p class="absolute right-2 top-2 flex flex-grow items-center justify-between">
@@ -10,7 +10,7 @@
  import EventReport from "@app/components/EventReport.svelte"
  import EventShare from "@app/components/EventShare.svelte"
  import EventDeleteConfirm from "@app/components/EventDeleteConfirm.svelte"
-  import {pushModal} from "@app/modal"
+  import {pushModal} from "@app/util/modal"

  type Props = {
    url: string
@@ -7,13 +7,15 @@
  import Button from "@lib/components/Button.svelte"
  import ModalFooter from "@lib/components/ModalFooter.svelte"
  import EditorContent from "@app/editor/EditorContent.svelte"
-  import {publishComment} from "@app/commands"
-  import {PROTECTED} from "@app/state"
+  import {publishComment, canEnforceNip70} from "@app/core/commands"
+  import {PROTECTED} from "@app/core/state"
  import {makeEditor} from "@app/editor"
-  import {pushToast} from "@app/toast"
+  import {pushToast} from "@app/util/toast"

  const {url, event, onClose, onSubmit} = $props()

+  const shouldProtect = canEnforceNip70(url)
+
  const uploading = writable(false)

  const selectFiles = () => editor.then(ed => ed.commands.selectFiles())
@@ -23,7 +25,11 @@

    const ed = await editor
    const content = ed.getText({blockSeparator: "\n"}).trim()
-    const tags = [...ed.storage.nostr.getEditorTags(), PROTECTED]
+    const tags = ed.storage.nostr.getEditorTags()
+
+    if (await shouldProtect) {
+      tags.push(PROTECTED)
+    }

    if (!content) {
      return pushToast({
@@ -6,8 +6,8 @@
  import Icon from "@lib/components/Icon.svelte"
  import ModalHeader from "@lib/components/ModalHeader.svelte"
  import ModalFooter from "@lib/components/ModalFooter.svelte"
-  import {pushToast} from "@app/toast"
-  import {publishReport} from "@app/commands"
+  import {pushToast} from "@app/util/toast"
+  import {publishReport} from "@app/core/commands"

  const {url, event} = $props()

@@ -6,18 +6,20 @@
  import ModalHeader from "@lib/components/ModalHeader.svelte"
  import Button from "@lib/components/Button.svelte"
  import Profile from "@app/components/Profile.svelte"
-  import {publishDelete} from "@app/commands"
+  import {publishDelete, canEnforceNip70} from "@app/core/commands"

  const {url, event} = $props()

+  const shouldProtect = canEnforceNip70(url)
+
  const reports = deriveEvents(repository, {
    filters: [{kinds: [REPORT], "#e": [event.id]}],
  })

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

-  const deleteReport = (report: TrustedEvent) => {
-    publishDelete({event: report, relays: [url]})
+  const deleteReport = async (report: TrustedEvent) => {
+    publishDelete({event: report, relays: [url], protect: await shouldProtect})

    if ($reports.length === 0) {
      history.back()
@@ -7,9 +7,9 @@
  import ModalHeader from "@lib/components/ModalHeader.svelte"
  import ModalFooter from "@lib/components/ModalFooter.svelte"
  import ChannelName from "@app/components/ChannelName.svelte"
-  import {channelsByUrl} from "@app/state"
-  import {makeRoomPath} from "@app/routes"
-  import {setKey} from "@app/implicit"
+  import {channelsByUrl} from "@app/core/state"
+  import {makeRoomPath} from "@app/util/routes"
+  import {setKey} from "@lib/implicit"

  const {url, noun, event}: {url: string; noun: string; event: TrustedEvent} = $props()

@@ -0,0 +1,38 @@
+<script lang="ts">
+  import type {TrustedEvent, EventContent} from "@welshman/util"
+  import ReactionSummary from "@app/components/ReactionSummary.svelte"
+  import ThunkStatusOrDeleted from "@app/components/ThunkStatusOrDeleted.svelte"
+  import EventActivity from "@app/components/EventActivity.svelte"
+  import EventActions from "@app/components/EventActions.svelte"
+  import {publishDelete, publishReaction, canEnforceNip70} from "@app/core/commands"
+  import {makeGoalPath} from "@app/util/routes"
+
+  interface Props {
+    url: any
+    event: any
+    showActivity?: boolean
+  }
+
+  const {url, event, showActivity = false}: Props = $props()
+
+  const shouldProtect = canEnforceNip70(url)
+
+  const path = makeGoalPath(url, event.id)
+
+  const deleteReaction = async (event: TrustedEvent) =>
+    publishDelete({relays: [url], event, protect: await shouldProtect})
+
+  const createReaction = async (template: EventContent) =>
+    publishReaction({...template, event, relays: [url], protect: await shouldProtect})
+</script>
+
+<div class="flex flex-wrap items-center justify-between gap-2">
+  <div class="flex flex-grow flex-wrap justify-end gap-2">
+    <ReactionSummary {url} {event} {deleteReaction} {createReaction} reactionClass="tooltip-left" />
+    <ThunkStatusOrDeleted {event} />
+    {#if showActivity}
+      <EventActivity {url} {path} {event} />
+    {/if}
+    <EventActions {url} {event} hideZap noun="Goal" />
+  </div>
+</div>
@@ -0,0 +1,152 @@
+<script lang="ts">
+  import {writable} from "svelte/store"
+  import {makeEvent, ZAP_GOAL} from "@welshman/util"
+  import {publishThunk} from "@welshman/app"
+  import {isMobile, preventDefault} from "@lib/html"
+  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 ModalHeader from "@lib/components/ModalHeader.svelte"
+  import ModalFooter from "@lib/components/ModalFooter.svelte"
+  import EditorContent from "@app/editor/EditorContent.svelte"
+  import {pushToast} from "@app/util/toast"
+  import {PROTECTED} from "@app/core/state"
+  import {makeEditor} from "@app/editor"
+  import {canEnforceNip70} from "@app/core/commands"
+
+  const {url} = $props()
+
+  const shouldProtect = canEnforceNip70(url)
+
+  const uploading = writable(false)
+
+  const back = () => history.back()
+
+  const selectFiles = () => editor.then(ed => ed.commands.selectFiles())
+
+  const submit = async () => {
+    if ($uploading) return
+
+    if (!content) {
+      return pushToast({
+        theme: "error",
+        message: "Please provide a title for your funding goal.",
+      })
+    }
+
+    const ed = await editor
+    const summary = ed.getText({blockSeparator: "\n"}).trim()
+
+    if (!summary.trim()) {
+      return pushToast({
+        theme: "error",
+        message: "Please provide details about your funding goal.",
+      })
+    }
+
+    const tags = [
+      ...ed.storage.nostr.getEditorTags(),
+      ["summary", summary],
+      ["amount", String(amount)],
+      ["relays", url],
+    ]
+
+    if (await shouldProtect) {
+      tags.push(PROTECTED)
+    }
+
+    publishThunk({
+      relays: [url],
+      event: makeEvent(ZAP_GOAL, {content, tags}),
+    })
+
+    history.back()
+  }
+
+  const editor = makeEditor({url, submit, uploading, placeholder: "What's on your mind?"})
+
+  let content = $state("")
+  let amount = $state(1000)
+</script>
+
+<form class="column gap-4" onsubmit={preventDefault(submit)}>
+  <ModalHeader>
+    {#snippet title()}
+      <div>Create a Funding Goal</div>
+    {/snippet}
+    {#snippet info()}
+      <div>Request contributions for your fundraiser.</div>
+    {/snippet}
+  </ModalHeader>
+  <div class="col-8 relative">
+    <Field>
+      {#snippet label()}
+        <p>Title*</p>
+      {/snippet}
+      {#snippet input()}
+        <label class="input input-bordered flex w-full items-center gap-2">
+          <!-- svelte-ignore a11y_autofocus -->
+          <input
+            autofocus={!isMobile}
+            bind:value={content}
+            class="grow"
+            type="text"
+            placeholder="What do funds go towards?" />
+        </label>
+      {/snippet}
+    </Field>
+    <div class="relative">
+      <Field>
+        {#snippet label()}
+          <p>Details*</p>
+        {/snippet}
+        {#snippet input()}
+          <div class="note-editor flex-grow overflow-hidden">
+            <EditorContent {editor} />
+          </div>
+        {/snippet}
+      </Field>
+      <Button
+        data-tip="Add an image"
+        class="tooltip tooltip-left absolute bottom-1 right-2"
+        onclick={selectFiles}>
+        {#if $uploading}
+          <span class="loading loading-spinner loading-xs"></span>
+        {:else}
+          <Icon icon="paperclip" size={3} />
+        {/if}
+      </Button>
+    </div>
+    <div class="flex flex-col gap-1">
+      <FieldInline>
+        {#snippet label()}
+          Goal Amount (sats)*
+        {/snippet}
+        {#snippet input()}
+          <div class="flex flex-grow justify-end">
+            <label class="input input-bordered flex items-center gap-2">
+              <Icon icon="bolt" />
+              <input bind:value={amount} type="number" class="w-28" />
+              <p class="opacity-50">sats</p>
+            </label>
+          </div>
+        {/snippet}
+      </FieldInline>
+      <input
+        class="range range-primary -mt-2"
+        type="range"
+        min="1000"
+        max="100000"
+        step="1000"
+        bind:value={amount} />
+    </div>
+  </div>
+  <ModalFooter>
+    <Button class="btn btn-link" onclick={back}>
+      <Icon icon="alt-arrow-left" />
+      Go back
+    </Button>
+    <Button type="submit" class="btn btn-primary">Create Goal</Button>
+  </ModalFooter>
+</form>
@@ -0,0 +1,36 @@
+<script lang="ts">
+  import type {TrustedEvent} from "@welshman/util"
+  import {getTagValue} from "@welshman/util"
+  import Link from "@lib/components/Link.svelte"
+  import Content from "@app/components/Content.svelte"
+  import ProfileLink from "@app/components/ProfileLink.svelte"
+  import GoalActions from "@app/components/GoalActions.svelte"
+  import GoalSummary from "@app/components/GoalSummary.svelte"
+  import {makeGoalPath} from "@app/util/routes"
+
+  type Props = {
+    url: string
+    event: TrustedEvent
+  }
+
+  const {url, event}: Props = $props()
+
+  const summary = getTagValue("summary", event.tags)
+</script>
+
+<Link class="col-2 card2 bg-alt w-full cursor-pointer" href={makeGoalPath(url, event.id)}>
+  <p class="text-2xl">{event.content}</p>
+  <Content
+    event={{content: summary, tags: event.tags}}
+    {url}
+    expandMode="inline"
+    minLength={50}
+    maxLength={300} />
+  <GoalSummary {url} {event} />
+  <div class="flex w-full flex-col items-end justify-between gap-2 sm:flex-row">
+    <span class="whitespace-nowrap py-1 text-sm opacity-75">
+      Posted by <ProfileLink pubkey={event.pubkey} {url} />
+    </span>
+    <GoalActions showActivity {url} {event} />
+  </div>
+</Link>
@@ -0,0 +1,49 @@
+<script lang="ts">
+  import {now, DAY, uniq, sum} from "@welshman/lib"
+  import type {Zap, TrustedEvent} from "@welshman/util"
+  import {getTagValue, fromMsats, ZAP_RESPONSE} from "@welshman/util"
+  import {deriveEventsMapped} from "@welshman/store"
+  import {repository, getValidZap} from "@welshman/app"
+  import Icon from "@lib/components/Icon.svelte"
+  import ZapButton from "@app/components/ZapButton.svelte"
+
+  type Props = {
+    url: string
+    event: TrustedEvent
+  }
+
+  const {url, event}: Props = $props()
+
+  const zaps = deriveEventsMapped<Zap>(repository, {
+    filters: [{kinds: [ZAP_RESPONSE], "#e": [event.id]}],
+    itemToEvent: item => item.response,
+    eventToItem: (response: TrustedEvent) => getValidZap(response, event),
+  })
+
+  const goalAmount = parseInt(getTagValue("amount", event.tags) || "0")
+  const zapAmount = $derived(fromMsats(sum($zaps.map(zap => zap.invoiceAmount))))
+  const contributorsCount = $derived(uniq($zaps.map(zap => zap.request.pubkey)).length)
+  const daysOld = Math.ceil((now() - event.created_at) / DAY)
+</script>
+
+<div class="card2 bg-alt flex flex-col gap-8">
+  <div class="flex gap-8">
+    <div>
+      <p class="text-xl text-primary">{zapAmount} sats</p>
+      <p class="text-sm opacity-75">funded of {goalAmount} sats</p>
+    </div>
+    <div>
+      <p class="text-xl">{contributorsCount}</p>
+      <p class="text-sm opacity-75">{contributorsCount === 1 ? "contributor" : "contributors"}</p>
+    </div>
+    <div>
+      <p class="text-xl">{daysOld}</p>
+      <p class="text-sm opacity-75">{daysOld === 1 ? "day" : "days"} old</p>
+    </div>
+  </div>
+  <progress class="progress progress-primary" value={zapAmount} max={goalAmount}></progress>
+  <ZapButton {url} {event} class="btn btn-primary lg:m-auto lg:px-20">
+    <Icon icon="bolt" />
+    Contribute to this goal
+  </ZapButton>
+</div>
@@ -2,7 +2,7 @@
  import Link from "@lib/components/Link.svelte"
  import Button from "@lib/components/Button.svelte"
  import ModalHeader from "@lib/components/ModalHeader.svelte"
-  import {PLATFORM_NAME} from "@app/state"
+  import {PLATFORM_NAME} from "@app/core/state"
 </script>

 <div class="column gap-4">
@@ -2,7 +2,7 @@
  import Button from "@lib/components/Button.svelte"
  import Link from "@lib/components/Link.svelte"
  import ModalHeader from "@lib/components/ModalHeader.svelte"
-  import {PLATFORM_NAME} from "@app/state"
+  import {PLATFORM_NAME} from "@app/core/state"
 </script>

 <div class="column gap-4">
@@ -6,8 +6,8 @@
  import ModalHeader from "@lib/components/ModalHeader.svelte"
  import ModalFooter from "@lib/components/ModalFooter.svelte"
  import ProfileEject from "@app/components/ProfileEject.svelte"
-  import {PLATFORM_NAME} from "@app/state"
-  import {pushModal} from "@app/modal"
+  import {PLATFORM_NAME} from "@app/core/state"
+  import {pushModal} from "@app/util/modal"

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

@@ -1,31 +0,0 @@
-<script lang="ts">
-  import Button from "@lib/components/Button.svelte"
-  import Link from "@lib/components/Link.svelte"
-  import ModalHeader from "@lib/components/ModalHeader.svelte"
-  import {PLATFORM_NAME} from "@app/state"
-</script>
-
-<div class="column gap-4">
-  <ModalHeader>
-    {#snippet title()}
-      <div>Where did my rooms go?</div>
-    {/snippet}
-  </ModalHeader>
-  <p>
-    You might have noticed that old rooms have disappeared from navigation. {PLATFORM_NAME} is still
-    under heavy development, which means that we occasionally have to make breaking changes. In this
-    case, we've changed how rooms work in {PLATFORM_NAME} to be more fully compatible with other NIP
-    29 clients, like <Link external class="link" href="https://chachi.chat">Chachi</Link> and
-    <Link external class="link" href="https://0xchat.com">0xChat</Link>.
-  </p>
-  <p>
-    If you run a relay, please upgrade to a version that supports NIP 29. {PLATFORM_NAME} works best
-    with the latest version of <Link
-      external
-      class="link"
-      href="https://github.com/coracle-social/frith">Frith</Link
-    >, which will automatically migrate your rooms. In the meantime, your messages are all still
-    available under the "Chat" tab (all conversations have been temporarily merged together).
-  </p>
-  <Button class="btn btn-primary" onclick={() => history.back()}>Got it</Button>
-</div>
@@ -2,7 +2,7 @@
  import Button from "@lib/components/Button.svelte"
  import Link from "@lib/components/Link.svelte"
  import ModalHeader from "@lib/components/ModalHeader.svelte"
-  import {PLATFORM_NAME} from "@app/state"
+  import {PLATFORM_NAME} from "@app/core/state"
 </script>

 <div class="column gap-4">
@@ -0,0 +1,36 @@
+<script lang="ts">
+  import {deriveZapperForPubkey} from "@welshman/app"
+  import Icon from "@lib/components/Icon.svelte"
+  import Button from "@lib/components/Button.svelte"
+  import ModalHeader from "@lib/components/ModalHeader.svelte"
+  import ModalFooter from "@lib/components/ModalFooter.svelte"
+  import ProfileLink from "@app/components/ProfileLink.svelte"
+
+  const {pubkey} = $props()
+
+  const zapper = deriveZapperForPubkey(pubkey)
+
+  const back = () => history.back()
+</script>
+
+<div class="column gap-4">
+  <ModalHeader>
+    {#snippet title()}
+      <div>Unable to Zap</div>
+    {/snippet}
+  </ModalHeader>
+  <p>
+    Zapping <ProfileLink {pubkey} class="!text-primary" /> isn't possible right now because
+    {#if $zapper}
+      their zap receiver isn't correctly set up.
+    {:else}
+      they don't currently have a zap receiver set up.
+    {/if}
+  </p>
+  <ModalFooter>
+    <Button class="btn btn-link" onclick={back}>
+      <Icon icon="alt-arrow-left" />
+      Go back
+    </Button>
+  </ModalFooter>
+</div>
@@ -6,8 +6,8 @@
  import CardButton from "@lib/components/CardButton.svelte"
  import LogIn from "@app/components/LogIn.svelte"
  import SignUp from "@app/components/SignUp.svelte"
-  import {PLATFORM_TERMS, PLATFORM_PRIVACY, PLATFORM_NAME} from "@app/state"
-  import {pushModal} from "@app/modal"
+  import {PLATFORM_TERMS, PLATFORM_PRIVACY, PLATFORM_NAME} from "@app/core/state"
+  import {pushModal} from "@app/util/modal"

  const logIn = () => pushModal(LogIn)

@@ -10,11 +10,11 @@
  import InfoNostr from "@app/components/InfoNostr.svelte"
  import LogInBunker from "@app/components/LogInBunker.svelte"
  import LogInPassword from "@app/components/LogInPassword.svelte"
-  import {pushModal, clearModals} from "@app/modal"
-  import {PLATFORM_NAME, BURROW_URL} from "@app/state"
-  import {pushToast} from "@app/toast"
-  import {loadUserData} from "@app/requests"
-  import {setChecked} from "@app/notifications"
+  import {pushModal, clearModals} from "@app/util/modal"
+  import {PLATFORM_NAME, BURROW_URL} from "@app/core/state"
+  import {pushToast} from "@app/util/toast"
+  import {loadUserData} from "@app/core/requests"
+  import {setChecked} from "@app/util/notifications"

  let signers: any[] = $state([])
  let loading: string | undefined = $state()
@@ -1,4 +1,5 @@
 <script lang="ts">
+  import {onMount, onDestroy} from "svelte"
  import type {Nip46ResponseWithResult} from "@welshman/signer"
  import {Nip46Broker, makeSecret} from "@welshman/signer"
  import {loginWithNip01, loginWithNip46} from "@welshman/app"
@@ -8,17 +9,24 @@
  import Icon from "@lib/components/Icon.svelte"
  import ModalHeader from "@lib/components/ModalHeader.svelte"
  import ModalFooter from "@lib/components/ModalFooter.svelte"
-  import BunkerConnect, {BunkerConnectController} from "@app/components/BunkerConnect.svelte"
+  import BunkerConnect from "@app/components/BunkerConnect.svelte"
  import BunkerUrl from "@app/components/BunkerUrl.svelte"
-  import {loadUserData} from "@app/requests"
-  import {clearModals} from "@app/modal"
-  import {setChecked} from "@app/notifications"
-  import {pushToast} from "@app/toast"
-  import {SIGNER_RELAYS, NIP46_PERMS} from "@app/state"
+  import {Nip46Controller} from "@app/util/nip46"
+  import {loadUserData} from "@app/core/requests"
+  import {clearModals} from "@app/util/modal"
+  import {setChecked} from "@app/util/notifications"
+  import {pushToast} from "@app/util/toast"
+  import {SIGNER_RELAYS, NIP46_PERMS} from "@app/core/state"

-  const back = () => history.back()
+  const back = () => {
+    if (mode === "connect") {
+      selectBunker()
+    } else {
+      history.back()
+    }
+  }

-  const controller = new BunkerConnectController({
+  const controller = new Nip46Controller({
    onNostrConnect: async (response: Nip46ResponseWithResult) => {
      const pubkey = await controller.broker.getPublicKey()

@@ -30,21 +38,23 @@
    },
  })

+  const {loading, bunker} = controller
+
  const onSubmit = async () => {
-    if (controller.loading) return
-
-    const {signerPubkey, connectSecret, relays} = Nip46Broker.parseBunkerUrl(controller.bunker)
-
-    if (!signerPubkey || relays.length === 0) {
-      return pushToast({
-        theme: "error",
-        message: "Sorry, it looks like that's an invalid bunker link.",
-      })
-    }
-
-    controller.loading = true
+    if ($loading) return

    try {
+      const {signerPubkey, connectSecret, relays} = Nip46Broker.parseBunkerUrl($bunker)
+
+      if (!signerPubkey || relays.length === 0) {
+        return pushToast({
+          theme: "error",
+          message: "Sorry, it looks like that's an invalid bunker link.",
+        })
+      }
+
+      controller.loading.set(true)
+
      const {clientSecret} = controller
      const broker = new Nip46Broker({relays, clientSecret, signerPubkey})
      const result = await broker.connect(connectSecret, NIP46_PERMS)
@@ -64,43 +74,73 @@
          message: "Something went wrong, please try again!",
        })
      }
+    } catch (e) {
+      console.error(e)
+
+      return pushToast({
+        theme: "error",
+        message: "Something went wrong, please try again!",
+      })
    } finally {
-      controller.loading = false
+      controller.loading.set(false)
    }

    clearModals()
  }

+  const selectConnect = () => {
+    mode = "connect"
+  }
+
+  const selectBunker = () => {
+    mode = "bunker"
+  }
+
+  let mode: string = $state("bunker")
+
  $effect(() => {
    // For testing and for play store reviewers
-    if (controller.bunker === "reviewkey") {
+    if ($bunker === "reviewkey") {
      loginWithNip01(makeSecret())
    }
  })
+
+  onMount(() => {
+    controller.start()
+  })
+
+  onDestroy(() => {
+    controller.stop()
+  })
 </script>

 <form class="column gap-4" onsubmit={preventDefault(onSubmit)}>
  <ModalHeader>
    {#snippet title()}
-      <div>Log In</div>
+      <div>Log In with a Signer</div>
    {/snippet}
    {#snippet info()}
-      <div>Connect your signer by scanning the QR code below or pasting a bunker link.</div>
+      <div>Using a remote signer app helps you keep your keys safe.</div>
    {/snippet}
  </ModalHeader>
-  <BunkerConnect {controller} />
-  <BunkerUrl loading={controller.loading} bind:bunker={controller.bunker} />
+  <div class:hidden={mode !== "bunker"}></div>
+  {#if mode === "connect"}
+    <BunkerConnect {controller} />
+  {:else}
+    <BunkerUrl {controller} />
+    <Button class="btn {$bunker ? 'btn-neutral' : 'btn-primary'}" onclick={selectConnect}
+      >Log in with a QR code instead</Button>
+  {/if}
  <ModalFooter>
-    <Button class="btn btn-link" onclick={back} disabled={controller.loading}>
+    <Button class="btn btn-link" onclick={back} disabled={$loading}>
      <Icon icon="alt-arrow-left" />
      Go back
    </Button>
-    <Button
-      type="submit"
-      class="btn btn-primary"
-      disabled={controller.loading || !controller.bunker}>
-      <Spinner loading={controller.loading}>Next</Spinner>
-      <Icon icon="alt-arrow-right" />
-    </Button>
+    {#if mode === "bunker"}
+      <Button type="submit" class="btn btn-primary" disabled={$loading || !$bunker}>
+        <Spinner loading={$loading}>Next</Spinner>
+        <Icon icon="alt-arrow-right" />
+      </Button>
+    {/if}
  </ModalFooter>
 </form>
@@ -12,11 +12,17 @@
  import ModalHeader from "@lib/components/ModalHeader.svelte"
  import ModalFooter from "@lib/components/ModalFooter.svelte"
  import PasswordResetRequest from "@app/components/PasswordResetRequest.svelte"
-  import {loadUserData} from "@app/requests"
-  import {clearModals, pushModal} from "@app/modal"
-  import {setChecked} from "@app/notifications"
-  import {pushToast} from "@app/toast"
-  import {NIP46_PERMS, BURROW_URL, PLATFORM_URL, PLATFORM_NAME, PLATFORM_LOGO} from "@app/state"
+  import {loadUserData} from "@app/core/requests"
+  import {clearModals, pushModal} from "@app/util/modal"
+  import {setChecked} from "@app/util/notifications"
+  import {pushToast} from "@app/util/toast"
+  import {
+    NIP46_PERMS,
+    BURROW_URL,
+    PLATFORM_URL,
+    PLATFORM_NAME,
+    PLATFORM_LOGO,
+  } from "@app/core/state"

  interface Props {
    email?: string
@@ -5,7 +5,7 @@
  import Spinner from "@lib/components/Spinner.svelte"
  import ModalHeader from "@lib/components/ModalHeader.svelte"
  import ModalFooter from "@lib/components/ModalFooter.svelte"
-  import {logout} from "@app/commands"
+  import {logout} from "@app/core/commands"

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

@@ -4,8 +4,8 @@
  import Button from "@lib/components/Button.svelte"
  import CardButton from "@lib/components/CardButton.svelte"
  import LogOut from "@app/components/LogOut.svelte"
-  import {PLATFORM_NAME} from "@app/state"
-  import {pushModal} from "@app/modal"
+  import {PLATFORM_NAME} from "@app/core/state"
+  import {pushModal} from "@app/util/modal"

  const logout = () => pushModal(LogOut)
 </script>
@@ -1,6 +1,6 @@
 <script lang="ts">
  import {onMount} from "svelte"
-  import {displayRelayUrl} from "@welshman/util"
+  import {displayRelayUrl, getTagValue} from "@welshman/util"
  import {deriveRelay} from "@welshman/app"
  import {fly} from "@lib/transition"
  import Icon from "@lib/components/Icon.svelte"
@@ -13,29 +13,34 @@
  import SpaceExit from "@app/components/SpaceExit.svelte"
  import SpaceJoin from "@app/components/SpaceJoin.svelte"
  import ProfileList from "@app/components/ProfileList.svelte"
+  import AlertAdd from "@app/components/AlertAdd.svelte"
+  import Alerts from "@app/components/Alerts.svelte"
  import RoomCreate from "@app/components/RoomCreate.svelte"
  import MenuSpaceRoomItem from "@app/components/MenuSpaceRoomItem.svelte"
-  import InfoMissingRooms from "@app/components/InfoMissingRooms.svelte"
  import {
+    ENABLE_ZAPS,
    userRoomsByUrl,
    hasMembershipUrl,
    memberships,
    deriveUserRooms,
    deriveOtherRooms,
    hasNip29,
-  } from "@app/state"
-  import {notifications} from "@app/notifications"
-  import {pushModal} from "@app/modal"
-  import {makeSpacePath} from "@app/routes"
+    alerts,
+  } from "@app/core/state"
+  import {notifications} from "@app/util/notifications"
+  import {pushModal} from "@app/util/modal"
+  import {makeSpacePath} from "@app/util/routes"

  const {url} = $props()

  const relay = deriveRelay(url)
  const chatPath = makeSpacePath(url, "chat")
+  const goalsPath = makeSpacePath(url, "goals")
  const threadsPath = makeSpacePath(url, "threads")
  const calendarPath = makeSpacePath(url, "calendar")
  const userRooms = deriveUserRooms(url)
  const otherRooms = deriveOtherRooms(url)
+  const hasAlerts = $derived($alerts.some(a => getTagValue("feed", a.tags)?.includes(url)))

  const openMenu = () => {
    showMenu = true
@@ -45,8 +50,6 @@
    showMenu = !showMenu
  }

-  const showMissingRooms = () => pushModal(InfoMissingRooms)
-
  const showMembers = () =>
    pushModal(
      ProfileList,
@@ -62,6 +65,13 @@

  const addRoom = () => pushModal(RoomCreate, {url}, {replaceState})

+  const manageAlerts = () => {
+    const component = hasAlerts ? Alerts : AlertAdd
+    const params = {url, channel: "push", hideSpaceField: true}
+
+    pushModal(component, params, {replaceState})
+  }
+
  let showMenu = $state(false)
  let replaceState = $state(false)
  let element: Element | undefined = $state()
@@ -75,18 +85,20 @@
  })
 </script>

-<div bind:this={element}>
-  <SecondaryNavSection class="max-h-screen">
+<div bind:this={element} class="flex h-full flex-col justify-between">
+  <SecondaryNavSection>
    <div>
      <SecondaryNavItem class="w-full !justify-between" onclick={openMenu}>
-        <strong class="ellipsize">{displayRelayUrl(url)}</strong>
+        <strong class="ellipsize flex items-center gap-3">
+          {displayRelayUrl(url)}
+        </strong>
        <Icon icon="alt-arrow-down" />
      </SecondaryNavItem>
      {#if showMenu}
        <Popover hideOnClick onClose={toggleMenu}>
          <ul
            transition:fly
-            class="menu absolute z-popover mt-2 w-full rounded-box bg-base-100 p-2 shadow-xl">
+            class="menu absolute z-popover mt-2 w-full gap-1 rounded-box bg-base-100 p-2 shadow-xl">
            <li>
              <Button onclick={showMembers}>
                <Icon icon="user-rounded" />
@@ -116,10 +128,18 @@
        </Popover>
      {/if}
    </div>
-    <div class="flex min-h-0 flex-col gap-1 overflow-auto">
+    <div class="flex max-h-[calc(100vh-150px)] min-h-0 flex-col gap-1 overflow-auto">
      <SecondaryNavItem {replaceState} href={makeSpacePath(url)}>
        <Icon icon="home-smile" /> Home
      </SecondaryNavItem>
+      {#if ENABLE_ZAPS}
+        <SecondaryNavItem
+          {replaceState}
+          href={goalsPath}
+          notification={$notifications.has(goalsPath)}>
+          <Icon icon="star-fall-minimalistic-2" /> Goals
+        </SecondaryNavItem>
+      {/if}
      <SecondaryNavItem
        {replaceState}
        href={threadsPath}
@@ -164,11 +184,13 @@
          notification={$notifications.has(chatPath)}>
          <Icon icon="chat-round" /> Chat
        </SecondaryNavItem>
-        <Button class="link flex items-center gap-2 py-2 pl-4 text-sm" onclick={showMissingRooms}>
-          <Icon icon="info-circle" size={4} />
-          Where did my rooms go?
-        </Button>
      {/if}
    </div>
  </SecondaryNavSection>
+  <div class="p-4">
+    <button class="btn btn-neutral btn-sm w-full" onclick={manageAlerts}>
+      <Icon icon="bell" />
+      Manage Alerts
+    </button>
+  </div>
 </div>
@@ -2,9 +2,9 @@
  import Icon from "@lib/components/Icon.svelte"
  import Button from "@lib/components/Button.svelte"
  import MenuSpace from "@app/components/MenuSpace.svelte"
-  import {notifications} from "@app/notifications"
-  import {makeSpacePath} from "@app/routes"
-  import {pushDrawer} from "@app/modal"
+  import {notifications} from "@app/util/notifications"
+  import {makeSpacePath} from "@app/util/routes"
+  import {pushDrawer} from "@app/util/modal"

  const {url} = $props()

@@ -2,9 +2,9 @@
  import Icon from "@lib/components/Icon.svelte"
  import SecondaryNavItem from "@lib/components/SecondaryNavItem.svelte"
  import ChannelName from "@app/components/ChannelName.svelte"
-  import {makeRoomPath} from "@app/routes"
-  import {deriveChannel} from "@app/state"
-  import {notifications} from "@app/notifications"
+  import {makeRoomPath} from "@app/util/routes"
+  import {deriveChannel} from "@app/core/state"
+  import {notifications} from "@app/util/notifications"

  interface Props {
    url: any
@@ -5,8 +5,8 @@
  import CardButton from "@lib/components/CardButton.svelte"
  import MenuSpacesItem from "@app/components/MenuSpacesItem.svelte"
  import SpaceAdd from "@app/components/SpaceAdd.svelte"
-  import {userRoomsByUrl, PLATFORM_RELAYS} from "@app/state"
-  import {pushModal} from "@app/modal"
+  import {userRoomsByUrl, PLATFORM_RELAYS} from "@app/core/state"
+  import {pushModal} from "@app/util/modal"

  const addSpace = () => pushModal(SpaceAdd)
 </script>
@@ -4,8 +4,8 @@
  import SpaceAvatar from "@app/components/SpaceAvatar.svelte"
  import RelayName from "@app/components/RelayName.svelte"
  import RelayDescription from "@app/components/RelayDescription.svelte"
-  import {makeSpacePath} from "@app/routes"
-  import {notifications} from "@app/notifications"
+  import {makeSpacePath} from "@app/util/routes"
+  import {notifications} from "@app/util/notifications"

  const {url} = $props()

@@ -2,7 +2,7 @@
  import {page} from "$app/stores"
  import Drawer from "@lib/components/Drawer.svelte"
  import Dialog from "@lib/components/Dialog.svelte"
-  import {modals, clearModals} from "@app/modal"
+  import {modals, clearModals} from "@app/util/modal"

  const onKeyDown = (e: any) => {
    if (e.code === "Escape" && e.target === document.body) {
@@ -12,7 +12,7 @@
  import Button from "@lib/components/Button.svelte"
  import Profile from "@app/components/Profile.svelte"
  import ProfileName from "@app/components/ProfileName.svelte"
-  import {entityLink} from "@app/state"
+  import {entityLink} from "@app/core/state"

  const {
    event,
@@ -6,17 +6,25 @@
  import NoteContent from "@app/components/NoteContent.svelte"
  import NoteCard from "@app/components/NoteCard.svelte"
  import ReactionSummary from "@app/components/ReactionSummary.svelte"
-  import {publishDelete, publishReaction} from "@app/commands"
+  import {publishDelete, publishReaction, canEnforceNip70} from "@app/core/commands"

  const {url, event} = $props()

-  const deleteReaction = (event: TrustedEvent) => publishDelete({relays: [url], event})
+  const shouldProtect = canEnforceNip70(url)

-  const createReaction = (template: EventContent) =>
-    publishReaction({...template, event, relays: [url]})
+  const deleteReaction = async (event: TrustedEvent) =>
+    publishDelete({relays: [url], event, protect: await shouldProtect})

-  const onEmoji = (emoji: NativeEmoji) =>
-    publishReaction({event, content: emoji.unicode, relays: [url]})
+  const createReaction = async (template: EventContent) =>
+    publishReaction({...template, event, relays: [url], protect: await shouldProtect})
+
+  const onEmoji = async (emoji: NativeEmoji) =>
+    publishReaction({
+      event,
+      content: emoji.unicode,
+      relays: [url],
+      protect: await shouldProtect,
+    })
 </script>

 <NoteCard {event} {url} class="card2 bg-alt">
@@ -7,9 +7,9 @@
  import FieldInline from "@lib/components/FieldInline.svelte"
  import ModalHeader from "@lib/components/ModalHeader.svelte"
  import LogInPassword from "@app/components/LogInPassword.svelte"
-  import {pushModal} from "@app/modal"
-  import {pushToast} from "@app/toast"
-  import {BURROW_URL} from "@app/state"
+  import {pushModal} from "@app/util/modal"
+  import {pushToast} from "@app/util/toast"
+  import {BURROW_URL} from "@app/core/state"

  const {email, reset_token} = $props()

@@ -8,9 +8,9 @@
  import ModalHeader from "@lib/components/ModalHeader.svelte"
  import ModalFooter from "@lib/components/ModalFooter.svelte"
  import LogInPassword from "@app/components/LogInPassword.svelte"
-  import {pushModal} from "@app/modal"
-  import {pushToast} from "@app/toast"
-  import {BURROW_URL} from "@app/state"
+  import {pushModal} from "@app/util/modal"
+  import {pushToast} from "@app/util/toast"
+  import {BURROW_URL} from "@app/core/state"

  interface Props {
    email: string
@@ -5,7 +5,7 @@
  import ProfileInfo from "@app/components/ProfileInfo.svelte"
  import ProfileBadges from "@app/components/ProfileBadges.svelte"
  import ProfileDetail from "@app/components/ProfileDetail.svelte"
-  import {pushModal} from "@app/modal"
+  import {pushModal} from "@app/util/modal"

  type Props = {
    pubkey: string
@@ -13,10 +13,10 @@
  import MenuOtherSpaces from "@app/components/MenuOtherSpaces.svelte"
  import MenuSettings from "@app/components/MenuSettings.svelte"
  import PrimaryNavItemSpace from "@app/components/PrimaryNavItemSpace.svelte"
-  import {userRoomsByUrl, canDecrypt, PLATFORM_RELAYS, PLATFORM_LOGO} from "@app/state"
-  import {pushModal} from "@app/modal"
-  import {makeSpacePath} from "@app/routes"
-  import {notifications} from "@app/notifications"
+  import {userRoomsByUrl, canDecrypt, PLATFORM_RELAYS, PLATFORM_LOGO} from "@app/core/state"
+  import {pushModal} from "@app/util/modal"
+  import {makeSpacePath} from "@app/util/routes"
+  import {notifications} from "@app/util/notifications"

  type Props = {
    children?: Snippet
@@ -77,7 +77,7 @@
          </PrimaryNavItem>
        {/if}
        <PrimaryNavItem title="Add Space" onclick={addSpace} class="tooltip-right">
-          <Avatar icon="settings-minimalistic" class="!h-10 !w-10" />
+          <Avatar icon="add-square" class="!h-10 !w-10" />
        </PrimaryNavItem>
      {/each}
    </div>
@@ -2,8 +2,8 @@
  import {displayRelayUrl} from "@welshman/util"
  import PrimaryNavItem from "@lib/components/PrimaryNavItem.svelte"
  import SpaceAvatar from "@app/components/SpaceAvatar.svelte"
-  import {makeSpacePath} from "@app/routes"
-  import {notifications} from "@app/notifications"
+  import {makeSpacePath} from "@app/util/routes"
+  import {notifications} from "@app/util/notifications"

  const {url} = $props()

@@ -13,8 +13,8 @@
  import Avatar from "@lib/components/Avatar.svelte"
  import WotScore from "@app/components/WotScore.svelte"
  import ProfileDetail from "@app/components/ProfileDetail.svelte"
-  import {pushModal} from "@app/modal"
-  import {clip} from "@app/toast"
+  import {pushModal} from "@app/util/modal"
+  import {clip} from "@app/util/toast"

  type Props = {
    pubkey: string
@@ -5,13 +5,13 @@
  import type {Filter} from "@welshman/util"
  import {deriveEvents} from "@welshman/store"
  import {formatTimestampRelative} from "@welshman/lib"
-  import {NOTE, GROUPS, MESSAGE, THREAD, COMMENT, getRelayTags, getListTags} from "@welshman/util"
+  import {NOTE, ROOMS, MESSAGE, THREAD, COMMENT, getRelayTags, getListTags} from "@welshman/util"
  import {repository, loadRelaySelections} from "@welshman/app"
  import Button from "@lib/components/Button.svelte"
  import ProfileSpaces from "@app/components/ProfileSpaces.svelte"
-  import {membershipsByPubkey} from "@app/state"
-  import {goToEvent} from "@app/routes"
-  import {pushModal} from "@app/modal"
+  import {membershipsByPubkey} from "@app/core/state"
+  import {goToEvent} from "@app/util/routes"
+  import {pushModal} from "@app/util/modal"

  type Props = {
    pubkey: string
@@ -35,7 +35,7 @@
    // Load groups and at least one note, regardless of time frame
    load({
      filters: [
-        {authors: [pubkey], kinds: [GROUPS]},
+        {authors: [pubkey], kinds: [ROOMS]},
        {authors: [pubkey], limit: 1, kinds: [NOTE, MESSAGE, THREAD, COMMENT]},
      ],
      relays: Router.get().FromPubkeys([pubkey]).getUrls(),
@@ -1,7 +1,7 @@
 <script lang="ts">
  import {chunk, sleep, uniq} from "@welshman/lib"
  import {
-    createEvent,
+    makeEvent,
    createProfile,
    PROFILE,
    DELETE,
@@ -16,9 +16,9 @@
  import Spinner from "@lib/components/Spinner.svelte"
  import ModalHeader from "@lib/components/ModalHeader.svelte"
  import ModalFooter from "@lib/components/ModalFooter.svelte"
-  import {pushToast} from "@app/toast"
-  import {logout} from "@app/commands"
-  import {INDEXER_RELAYS, PLATFORM_NAME, userMembership, getMembershipUrls} from "@app/state"
+  import {pushToast} from "@app/util/toast"
+  import {logout} from "@app/core/commands"
+  import {INDEXER_RELAYS, PLATFORM_NAME, userMembership, getMembershipUrls} from "@app/core/state"

  let progress: number | undefined = $state(undefined)
  let confirmText = $state("")
@@ -36,8 +36,8 @@
    }

    const chunks = chunk(500, repository.query([{authors: [$pubkey!]}]))
-    const profileEvent = createEvent(PROFILE, createProfile({name: "[deleted]"}))
-    const vanishEvent = createEvent(62, {tags: [["relay", "ALL_RELAYS"]]})
+    const profileEvent = makeEvent(PROFILE, createProfile({name: "[deleted]"}))
+    const vanishEvent = makeEvent(62, {tags: [["relay", "ALL_RELAYS"]]})
    const denominator = chunks.length + 2
    const relays = uniq([
      ...INDEXER_RELAYS,
@@ -75,7 +75,7 @@
        }
      }

-      await publishThunk({relays, event: createEvent(DELETE, {tags})})
+      await publishThunk({relays, event: makeEvent(DELETE, {tags})})

      await incrementProgress()
    }
@@ -9,9 +9,9 @@
  import ProfileInfo from "@app/components/ProfileInfo.svelte"
  import ProfileBadges from "@app/components/ProfileBadges.svelte"
  import ChatEnable from "@app/components/ChatEnable.svelte"
-  import {canDecrypt, pubkeyLink} from "@app/state"
-  import {pushModal} from "@app/modal"
-  import {makeChatPath} from "@app/routes"
+  import {canDecrypt, pubkeyLink} from "@app/core/state"
+  import {pushModal} from "@app/util/modal"
+  import {makeChatPath} from "@app/util/routes"

  export type Props = {
    pubkey: string
@@ -1,8 +1,9 @@
 <script lang="ts">
+  import {nthNe} from "@welshman/lib"
  import type {Profile} from "@welshman/util"
  import {
    getTag,
-    createEvent,
+    makeEvent,
    makeProfile,
    editProfile,
    createProfile,
@@ -13,9 +14,9 @@
  import {pubkey, profilesByPubkey, publishThunk} from "@welshman/app"
  import Button from "@lib/components/Button.svelte"
  import ProfileEditForm from "@app/components/ProfileEditForm.svelte"
-  import {clearModals} from "@app/modal"
-  import {pushToast} from "@app/toast"
-  import {PROTECTED, getMembershipUrls, userMembership} from "@app/state"
+  import {clearModals} from "@app/util/modal"
+  import {pushToast} from "@app/util/toast"
+  import {PROTECTED, getMembershipUrls, userMembership} from "@app/core/state"

  const profile = $profilesByPubkey.get($pubkey!) || makeProfile()
  const shouldBroadcast = !getTag(PROTECTED, profile.event?.tags || [])
@@ -24,16 +25,19 @@
  const back = () => history.back()

  const onsubmit = ({profile, shouldBroadcast}: {profile: Profile; shouldBroadcast: boolean}) => {
+    const router = Router.get()
    const template = isPublishedProfile(profile) ? editProfile(profile) : createProfile(profile)
-    const relays = [...getMembershipUrls($userMembership)]
+    const scenarios = [router.FromRelays(getMembershipUrls($userMembership))]

    if (shouldBroadcast) {
-      relays.push(...Router.get().FromUser().getUrls())
+      scenarios.push(router.FromUser(), router.Index())
+      template.tags = template.tags.filter(nthNe(0, "-"))
    } else {
      template.tags = uniqTags([...template.tags, PROTECTED])
    }

-    const event = createEvent(template.kind, template)
+    const event = makeEvent(template.kind, template)
+    const relays = router.merge(scenarios).getUrls()

    publishThunk({event, relays})
    pushToast({message: "Your profile has been updated!"})
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
hodlbod	5ea4aeb75c	Merge pull request #186 from coracle-social/flotilla-180-rooms-disappear Save rooms to local storage	2025-08-27 06:25:08 -07:00
Matthew Remmel	456d111925	Save rooms to local storage	2025-08-27 09:07:32 -04:00
Jon Staab	837ae4b38e	Update changelog, bump version	2025-08-26 11:17:38 -07:00
Jon Staab	ffbcbf86c3	Bump welshman	2025-08-26 11:08:59 -07:00
Matthew Remmel	bcda637192	Merge pull request #182 from coracle-social/flotilla-148-deep-linking Add mobile deep linking support	2025-08-26 13:37:40 -04:00
Matthew Remmel	72c7dd6126	Add missing data config to android manifest	2025-08-26 13:31:01 -04:00
Matthew Remmel	a2a4b3599f	Remove temporary code and comments	2025-08-26 13:17:25 -04:00
Matthew Remmel	4955a4f16c	Add real values in app association files	2025-08-26 13:16:32 -04:00
Matthew Remmel	bb1ff4fb11	Add temporary web event listener for deep link navigation testing in web browser	2025-08-26 12:43:44 -04:00
Matthew Remmel	b81f7c9ed3	Add basic deep link route handling	2025-08-26 12:14:11 -04:00
Matthew Remmel	689cfb6d45	Add placholder changes for deep linking	2025-08-26 10:37:45 -04:00
Jon Staab	9da3141650	Add indicator for who sent the most recent message in a converssation	2025-08-25 16:24:24 -07:00
Jon Staab	e4fe18df2f	Fix encrypted uploads, show error	2025-08-21 16:06:14 -07:00
Jon Staab	ba80ebac63	Add contributing file, rename some files	2025-08-21 15:01:31 -07:00
Jon Staab	d4943daa82	Add chat prompt to dashboard	2025-08-19 14:05:02 -07:00
Jon Staab	cde03ec0fe	Avoid reflow by showing chat thunk status in a toast	2025-08-19 14:03:04 -07:00
Jon Staab	4f6c08f8a2	Build better onboarding	2025-08-18 15:02:17 -07:00
Jon Staab	38e0fc53ad	Update wallet to use welshman's session wallet	2025-08-18 13:26:28 -07:00
Jon Staab	2a30ca5306	Bump welshman, drop support for safe area insets	2025-08-06 15:09:22 -07:00
Jon Staab	4a4ea13bef	Show relays a note was seen on	2025-08-04 12:32:44 -07:00
Jon Staab	239bd3f31a	Remove invite code input from alert add screen	2025-08-01 12:57:29 -07:00
Jon Staab	831ec05012	Filter out non-global chat from global chat	2025-07-31 13:25:40 -07:00
Jon Staab	0cc0598287	Allow tapping on tippy triggers on mobile	2025-07-31 10:25:55 -07:00
Jon Staab	0a5bc618c2	Fix formatting	2025-07-30 16:37:05 -07:00
Jon Staab	069904f07a	Only protect events if the relay will authenticate with the user	2025-07-30 16:31:40 -07:00
Jon Staab	03b42c8276	Monitor signer status	2025-07-30 15:54:10 -07:00
Jon Staab	8697cc23be	Add signer status, re-work bunker login	2025-07-29 10:53:48 -07:00
Jon Staab	69e1f97e72	Display create at on event info	2025-07-22 10:10:20 -07:00
Jon Staab	3e832af3e4	Update version	2025-07-17 15:41:30 -07:00
Jon Staab	84b8650fa4	Shorten goals title for mobile	2025-07-17 15:40:07 -07:00
Jon Staab	83abb5aa94	Fix chat notifications so they take nip 29 into account	2025-07-17 15:35:49 -07:00
Jon Staab	a12eddb47b	Fix zaps on mobile	2025-07-17 15:29:26 -07:00
Jon Staab	c87166247c	Update zapstore.yaml	2025-07-17 15:21:05 -07:00
Jon Staab	037c8cb41b	Disable zaps on ios	2025-07-17 14:39:59 -07:00
Jon Staab	79de2e1176	Bump version	2025-07-17 14:30:18 -07:00
Jon Staab	d4b026a3ad	Add zaps to threads/events	2025-07-15 15:56:55 -07:00
Jon Staab	00f383ff2e	Add qr scanning for wallet connect	2025-07-15 15:49:26 -07:00
Jon Staab	6f6bb508db	Handle invalid bunker url, update synced stores	2025-07-15 11:34:29 -07:00
Jon Staab	e2a0672ca5	load messages in general on room relay	2025-07-09 14:28:07 -07:00
Jon Staab	e2a5fe7a79	Fix sidebar overflow	2025-07-09 14:22:59 -07:00
Jon Staab	5d02ae75dc	Bump welshman	2025-07-09 14:00:42 -07:00
Jon Staab	2460bbbc83	Fix balance coming from webln	2025-07-09 13:19:33 -07:00
Jon Staab	084d8d931b	Load relay selections whenever we see a new pubkey	2025-07-09 09:17:45 -07:00
Jon Staab	6ee4ac1a89	Add funding goals	2025-07-07 15:28:36 -07:00
Jon Staab	1d07097350	Fix some zap bugs	2025-07-07 13:58:43 -07:00
Jon Staab	63d6b362c7	Remove info missing rooms	2025-07-07 12:46:17 -07:00
Jon Staab	bfed277ea9	Add zaps	2025-07-04 06:22:19 -07:00
Jon Staab	9e8aa2ef3a	show and copy npub	2025-07-02 16:48:44 -07:00
Jon Staab	4bbc0878f7	Bump apple version, add vapid key	2025-07-01 12:53:09 -07:00
Jon Staab	16a3ba2a9b	Bump version	2025-06-30 11:08:42 -07:00
Jon Staab	7c11eb8947	Allow mark all as read on desktop	2025-06-30 11:03:02 -07:00
Jon Staab	6bdc8d4d9f	Space alerts dialog	2025-06-30 10:41:42 -07:00
Jon Staab	b9048936ba	Tweak alerts button layout	2025-06-30 09:38:43 -07:00
Jon Staab	b9620f4443	Add claim to alert add	2025-06-27 14:36:09 -07:00
Jon Staab	f2249fe592	Handle conversations with no room	2025-06-27 09:44:01 -07:00
Jon Staab	fd42a0e8d4	Clear badge when opening app	2025-06-27 09:41:30 -07:00
Jon Staab	37d52ba35f	Show latest note as conversation	2025-06-27 09:00:43 -07:00
Jon Staab	3037323dc0	Add support for ios push notifications	2025-06-27 08:33:31 -07:00
Jon Staab	5301ef876d	Fix notification badge for global chat	2025-06-24 17:36:14 -07:00
Jon Staab	aa054d8b1a	Fix ContentMention display	2025-06-24 17:23:07 -07:00
Jon Staab	3655790e5f	Add fcm push notifications	2025-06-24 14:27:16 -07:00
Jon Staab	6cca823ed4	Get web push working	2025-06-23 11:16:25 -07:00
Jon Staab	18a383edab	Update alert form to include push notifications	2025-06-19 10:01:16 -07:00
Jon Staab	43da7d628e	Replace bunker with claim on alerts page	2025-06-18 17:02:32 -07:00
Jon Staab	2fae3ca248	Fix broadcasting user profiles when protected	2025-06-16 16:56:59 -07:00
Jon Staab	d99ada44f5	Show link url if no title is available	2025-06-16 11:45:05 -07:00
Jon Staab	cb0119b9b8	Update welshman	2025-06-16 10:12:24 -07:00
Jon Staab	dac9ef8e4e	Move some stuff to welshman, broadcast profile updates	2025-06-13 15:17:20 -07:00
Jon Staab	528917b90e	Fix sort order of thread comments	2025-06-13 10:14:12 -07:00
Jon Staab	a22db78967	rename createEvent to makeEvent	2025-06-10 13:35:57 -07:00
Jon Staab	5718510779	Bump versions	2025-06-09 15:29:13 -07:00
Jon Staab	f877dc7fbe	Add chat quick link	2025-06-09 15:27:00 -07:00
Jon Staab	df03fb1116	Remove old docker workflow	2025-06-09 15:20:09 -07:00