docs: publish 1.7.64 safety note

.gitignore

@@ -52,7 +52,8 @@ stats.json
 
 # Local/generated assets & incidental lockfiles (do not commit)
 /assets/
-/resources/
+/resources/*
+!/resources/splash.png
 /bun.lock
 cvm-server/bun.lock
 push-service/bun.lock

AGENTS.md

@@ -2228,7 +2228,7 @@ session with **no other memory of this project**. So:
   instead of showing the error boundary.
 - **Baselines** (verified 2026-10-29): `npm test` → **0 errors, 0 warnings**,
   **156 tests**, build ok. The gate also type-checks the CVM server
-  (`tsc -p cvm-server/tsconfig.json`). `package.json` version **1.7.60**.
+  (`tsc -p cvm-server/tsconfig.json`). `package.json` version **1.7.64**.
   - ✅ Lint is **clean**: `no-explicit-any` = 0 · `react-hooks/exhaustive-deps` = 0
     · `no-unused-vars` = 0 · `react-refresh` = 0. Non-component exports were
     **split into their own modules** (`contexts/language.ts`, `lib/sortOptions.ts`,
@@ -2415,6 +2415,95 @@ Rules:
 - Any time the deploy output isn't verified by the smoke test, run
   `node scripts/smoke-test.mjs` manually before shipping.
 
+### Trust, privacy and consistency invariants
+- **No BFT / no relay quorum.** Nostr events are signed facts; relays are not
+  voters. Social feeds resolve conflicts locally, not by consensus.
+- **Deterministic merge:** `src/lib/eventMerge.ts` is the single merge policy
+  (newest `created_at`, event-id tie-break, local tombstones). Do not add
+  "first relay wins" logic; relay arrival order must not change the result.
+- **Trust boundaries are documented** in `docs/THREAT_MODEL.md`. Keep UI copy
+  honest: a confirmed trade means both parties signed; a payment proof means the
+  money leg was paid; escrow is time-locked, not arbitration.
+- **No remote hotlinks for small brand assets:** OpenSats icons are local under
+  `public/images/` so rendering the footer does not leak the viewer's IP.
+- **Android Auto Backup is off** (`android:allowBackup="false"` injected by
+  `scripts/inject-backup-policy.mjs`); identity/settings/escrow state stays on
+  the device and must be exported explicitly.
+- **Image uploads re-encode decodable formats through canvas** to strip
+  EXIF/GPS before Blossom. GIF and HEIC/HEIF are passed through because they need
+  special handling; do not claim they are metadata-stripped.
+- **No mandatory identity, deposit or global trust score.** Use warnings,
+  explicit consent and optional escrow at value boundaries.
+
+### Distribution without GitHub
+> **Owner decision (2026-10-30): no external identities.** Distribution must
+> stay self-hosted and Nostr-based. Do **not** create or ask for GitLab,
+> Codeberg, GitHub, email or F-Droid-main accounts. The local Forgejo admin
+> account and the self-hosted F-Droid repo key are infrastructure credentials,
+> not third-party identities. F-Droid main and IzzyOnDroid are therefore
+> **out of scope**.
+
+- **Self-hosted Forgejo:** `https://git.skate-spots.org/skatespots/SkateSpots`
+  (public source, registration disabled, admin credentials only on the relay
+  host). It runs on `185.18.221.2` behind Caddy; do not commit its credentials.
+- **Latest release (Obtanium HTML source):**
+  `https://git.skate-spots.org/skatespots/SkateSpots/releases/latest`.
+  The page exposes one signed `.apk`; Obtanium may need **Override Source →
+  HTML** because the host is self-hosted, not Codeberg.
+- **Static download page:** `public/download/index.html` → `https://skate-spots.org/download/`.
+- **Forgejo release helper:** `scripts/publish-forgejo.sh` (uses `FORGEJO_TOKEN`
+  or `FORGEJO_PASSWORD`; `scripts/release.sh` calls it automatically when either
+  is set). It uploads the APK and checksum, but does not push git history.
+- **Self-hosted F-Droid repo:** `https://fdroid.skate-spots.org/repo`
+  (`org.skatespots.app`; currently 1.7.64). It is a **third-party repo**, not
+  F-Droid main. Repo signing fingerprint:
+  `88:B1:71:1C:24:02:89:FB:B2:A7:FC:C1:B3:1F:BB:9D:60:F5:7F:19:18:E0:3D:62:2D:35:F2:3D:E1:84:46:75`.
+  The developer APK signature is unchanged; the repo key only signs indexes.
+  A backup of the repo keystore/config is in
+  `~/.config/skatespots/fdroid-repo/` (mode 600).
+- **F-Droid main/IzzyOnDroid:** **out of scope by owner decision.** Both require
+  external GitLab/Codeberg identities and review; do not submit, create accounts,
+  or present them as live. The self-hosted F-Droid repo above is the supported
+  F-Droid-family channel.
+- **No GitHub required.** Keep Zapstore, Forgejo, the self-hosted F-Droid repo,
+  and the static page in sync for each release.
+
+### Future release / distribution checklist
+1. Bump `package.json`; update the top of `release-notes.txt`; run
+   `scripts/release.sh patch --yes --deploy`.
+2. Set `FORGEJO_TOKEN` (or `FORGEJO_PASSWORD`) to upload the APK/checksum to the
+   latest Forgejo release; the helper is `scripts/publish-forgejo.sh`.
+3. **Push source/tags to Forgejo.** The local machine's DNS for
+   `git.skate-spots.org` is intermittent, so the reliable path is: create a git
+   bundle locally, `scp` it to the relay, clone there, and push to
+   `http://127.0.0.1:3000/skatespots/SkateSpots.git` with the host admin
+   credentials. Do not put the password in a committed remote URL.
+4. Add the APK to `/home/ubuntu/fdroid/repo/`, update the F-Droid metadata
+   changelog, run `fdroid update` in `/home/ubuntu/fdroid`, then rsync `repo/`
+   to `/var/www/fdroid/repo/`.
+5. Update `public/download/index.html` with the new version/checksum and deploy
+   the web page.
+6. Verify: latest Forgejo release exposes one `.apk`; static page 200;
+   `https://fdroid.skate-spots.org/repo/index-v2.json` lists the new
+   `versionCode`; Obtanium still resolves the latest release.
+7. Keep Forgejo/F-Droid credentials and the F-Droid repo keystore out of git.
+   Local backups: `~/.config/skatespots/forgejo-admin.txt` and
+   `~/.config/skatespots/fdroid-repo/` (mode 600).
+
+### Nostr-only distribution (no external identities)
+- **Zapstore** is the Nostr-native app store/update channel; keep publishing
+  release events there.
+- **Obtanium** is URL-based, not an account: users add the latest Forgejo
+  release URL (HTML source if needed) or the self-hosted F-Droid repo.
+- **F-Droid main and IzzyOnDroid do not support Nostr identities.** They are
+  intentionally not pursued. Do not create or request GitLab/Codeberg/email
+  accounts, and do not claim those stores are live.
+- The local Forgejo admin account, the relay, and the F-Droid repo signing key
+  are self-hosted infrastructure, not third-party identities.
+- The F-Droid recipe remains in `distribution/fdroiddata/` only as an unused
+  technical reference. It was locally test-built at `5ebf741`, but must not be
+  submitted.
+
 ### Deploy
 - **Web (auto)**: a systemd user timer (`skatespots-deploy.timer`) runs `scripts/auto-deploy.sh` every ~3 min. When `origin/main` changes it builds and runs `netlify deploy --prod --dir=dist`. It deploys **only committed code** (skips if tracked files are modified) and never mutates a dirty tree. **Doc/scripts-only commits are skipped** (matches `AGENTS.md`/`*.md`/`scripts/`/`cvm-server/`/`skills/`) — Netlify bills **15 credits per production deploy**, so don't spend them on non-site changes. One-time setup: `netlify login` + `netlify link`. Logs: `journalctl --user -u skatespots-deploy`. Manual run: `scripts/auto-deploy.sh`.
   - ⚠️ **Deploy throttle (2026-09-28):** production deploys are capped to one per **24h** by default (after a week of 68 deploys ≈ **1,020 credits** — a third of the monthly allowance). Batching a day's commits into one 15-credit deploy is the single biggest credit lever. Override with `SKATESPOTS_DEPLOY_MIN_INTERVAL=<seconds>` (`0` disables); deploy on demand with **`scripts/auto-deploy.sh --force`**. A throttled tick deliberately does **not** record the deployed SHA, so the pending change still deploys on a later tick; a **failed** deploy doesn't set the clock, so it retries immediately.
@@ -2799,6 +2888,20 @@ Rules:
       1600px WebP when smaller (GIF/undecodable formats untouched), cutting
       quota/storage/upload time. APK sha256 `8f11c229…`, versionCode 10760.
       Web live at `6c9b6fa`.
+    - **1.7.61 (2026-10-30):** Cordn setup timeline now checks prepared device
+     /sent request and spins on the approval step while waiting. APK sha256
+      `db0279f7…`, versionCode 10761. Web live at `50c95d0`.
+    - **1.7.62 (2026-10-31):** 404 uses an in-app link; profile badge URLs are
+      sanitized; marketplace readiness only counts a usable lud16; duplicate
+      Korean picker entry hidden; beta source link points self-hosted. APK
+      sha256 `e746b18e…`, versionCode 10762. Web live at `c08d5d4`.
+    - **1.7.63 (2026-10-31):** deterministic event merge with event-id tie-break
+      and local deletion tombstones; EXIF/GPS stripping for decodable uploads;
+      Android Auto Backup disabled; local OpenSats icon; threat-model document.
+      APK sha256 `70e1dd1a…`, versionCode 10763. Web live at `3edef9c`.
+    - **1.7.64 (2026-10-31):** low-friction new-seller safety note beside trade
+      actions, using existing marketplace guidance; no new gate. APK sha256
+      `32d5cd35…`, versionCode 10764. Web live at `a44665f`.
 
 ### Relay archive (dataset backup)
 - **Transfer content between keys (`scripts/transfer-content.mjs`, 2026-10-04):**

distribution/README.md

@@ -0,0 +1,97 @@
+# Distribution without GitHub
+
+SkateSpots is published from a self-hosted **Forgejo** instance. No GitHub
+account is required.
+
+## Current release source
+
+- Forge: <https://git.skate-spots.org/skatespots/SkateSpots>
+- Latest release: <https://git.skate-spots.org/skatespots/SkateSpots/releases/latest>
+- Signed APK (1.7.64):
+  <https://git.skate-spots.org/skatespots/SkateSpots/releases/download/v1.7.64/SkateSpots-1.7.64.apk>
+- SHA-256:
+  `32d5cd358aaedd8bff8d128035bb6ad30f553d84779d4e5a3f72ee89cabce7fe`
+
+The APK is signed with the same key as the Zapstore build. Installing an
+F-Droid-signed build over it would require uninstalling SkateSpots and losing
+the local key/settings. Obtanium and direct APK updates keep the install.
+
+## Obtanium
+
+Obtanium cannot use a Zapstore URL as a source. Use the self-hosted Forgejo
+release page instead:
+
+1. Open Obtanium → **Add App**.
+2. Paste:
+   `https://git.skate-spots.org/skatespots/SkateSpots/releases/latest`
+3. If Obtanium does not recognise the self-hosted host, select **Override
+   Source → HTML**.
+4. Set version extraction if desired:
+   `SkateSpots-([0-9.]+)\.apk`, match group `1`.
+
+The release page contains exactly one `.apk`, so Obtanium can follow the latest
+release without a custom store listing.
+
+## F-Droid family
+
+### Self-hosted F-Droid repo (live now)
+
+A signed third-party F-Droid repository is published here:
+
+- Repo: <https://fdroid.skate-spots.org/repo>
+- App ID: `org.skatespots.app`
+- Repo signing fingerprint:
+  `88:B1:71:1C:24:02:89:FB:B2:A7:FC:C1:B3:1F:BB:9D:60:F5:7F:19:18:E0:3D:62:2D:35:F2:3D:E1:84:46:75`
+
+Users can add this URL in F-Droid, or add it in Obtanium as an **F-Droid Third
+Party Repo**. This is not F-Droid main: it is a self-hosted, signed repository
+of the developer-signed APK. It keeps the existing install and signing key.
+
+The repository metadata and APK are served from the relay host. The repo index
+is signed with a repository key stored on that host; the APK itself keeps the
+SkateSpots developer signature.
+
+### No external store identities
+
+**Owner decision:** distribution stays self-hosted and Nostr-based. No GitLab,
+Codeberg, GitHub, email or F-Droid-main accounts are created or requested.
+
+F-Droid main and IzzyOnDroid both require external identities and review, so
+they are intentionally out of scope. The self-hosted repo above is the supported
+F-Droid-family channel.
+
+`distribution/fdroiddata/` and `fastlane/` are kept as an unused technical
+reference only. A fresh local clone at `5ebf741` built the unsigned APK through
+the recipe's `npm ci → android:init → android:sync → assembleRelease` path, but
+the recipe must not be submitted.
+
+## Release checklist
+
+1. `npm test`
+2. `scripts/release.sh patch --yes --deploy` (Zapstore + web)
+3. Push the release tag and `main` to Forgejo.
+4. Upload the APK through the helper:
+   `FORGEJO_TOKEN=... scripts/publish-forgejo.sh <version>`
+   (or set `FORGEJO_TOKEN` before `release.sh`; the APK upload is then automatic)
+5. Copy the signed APK into the F-Droid repo on the relay host, add a
+   `metadata/org.skatespots.app.yml` changelog entry, run `fdroid update`, and
+   sync `repo/` to `/var/www/fdroid/repo/`:
+
+   ```bash
+   cd /home/ubuntu/fdroid
+   cp /path/to/SkateSpots-<version>.apk repo/
+   . /home/ubuntu/fdroid-venv/bin/activate
+   fdroid update
+   sudo rsync -a --delete repo/ /var/www/fdroid/repo/
+   sudo chown -R caddy:caddy /var/www/fdroid
+   ```
+
+6. Verify the public latest-release page contains the new `.apk`, and that
+   `https://fdroid.skate-spots.org/repo/index-v2.json` lists the new
+   `versionCode`.
+7. Update the static download page if the displayed version/checksum changes:
+   `public/download/index.html`.
+
+The Forgejo instance runs on the same host as the relay. It exposes public
+read access and HTTPS through Caddy; registration is disabled and administrative
+credentials are kept on the host, not in this repository.

distribution/fdroiddata/org.skatespots.app.yml

@@ -0,0 +1,51 @@
+Categories:
+  - Sports & Health
+License: AGPL-3.0-only
+AuthorName: SkateSpots
+WebSite: https://skate-spots.org
+SourceCode: https://git.skate-spots.org/skatespots/SkateSpots
+IssueTracker: https://git.skate-spots.org/skatespots/SkateSpots/issues
+Changelog: https://git.skate-spots.org/skatespots/SkateSpots/releases
+
+AutoName: SkateSpots
+Summary: Local-first skate map, crews, events and marketplace
+Description: |-
+  SkateSpots is a local-first skating map for finding spots, crews, events and
+  gear. Your keys stay on your device, your messages stay in encrypted crew
+  chats and the app does not use analytics or sell your data.
+
+  Find skate spots on the map, add new ones, organise sessions with your crew,
+  follow events and browse the community marketplace. The Android app bundles
+  the same web app for fast shell startup and native camera, location, push and
+  NFC support where available.
+
+  SkateSpots is self-hosted and built on open protocols. You can run your own
+  relay and Blossom storage instead of relying on a central service.
+
+RepoType: git
+Repo: https://git.skate-spots.org/skatespots/SkateSpots.git
+
+Builds:
+  - versionName: 1.7.61
+    versionCode: 10761
+    commit: 5ebf741427303be0b0feeff5ce1d8420e2c0ddea
+    subdir: .
+    prebuild:
+      - npm ci
+      - npm run android:init
+      - npm run android:sync
+      # F-Droid signs the APK itself. Remove the developer signing config so
+      # Gradle emits an unsigned release APK instead of requiring the keystore.
+      - sed -i '/signingConfig signingConfigs.release/d' android/app/build.gradle
+    build:
+      - cd android && ./gradlew assembleRelease --no-daemon
+    output: android/app/build/outputs/apk/release/app-release-unsigned.apk
+    # The generated Android project is intentionally not committed. This
+    # recipe recreates it with Capacitor before Gradle runs. F-Droid will sign
+    # the resulting APK with its own key. The F-Droid buildserver supplies the
+    # JDK/Android SDK; do not install packages with sudo in a recipe.
+
+AutoUpdateMode: Version
+UpdateCheckMode: Tags
+CurrentVersion: 1.7.61
+CurrentVersionCode: 10761

docs/THREAT_MODEL.md

@@ -0,0 +1,104 @@
+# SkateSpots threat model
+
+This is the short, technical version of what SkateSpots can and cannot guarantee.
+It exists so product copy, support answers and future code do not accidentally
+promise consensus, arbitration or delivery verification that the system does not
+have.
+
+## The model in one sentence
+
+**SkateSpots verifies signed facts, keeps a local view, and uses social/economic
+signals at value boundaries. It does not run a consensus protocol.**
+
+Nostr relays are not voters. A relay can withhold, censor, reorder or serve a
+stale event, but it cannot forge a valid signature. Different clients can
+therefore see different snapshots of the network without either side being
+"wrong" in a Byzantine-consensus sense.
+
+## Assets
+
+- Nostr identity keys and local signer access.
+- Local cache, drafts, pending posts and local deletion tombstones.
+- Crew membership and Cordn group membership.
+- Marketplace listings, offers, trade attestations and reputation.
+- Cashu proofs and escrow tokens.
+- Device storage and any local backup/export.
+
+## Actors and trust boundaries
+
+| Actor | Can do | Cannot do |
+| --- | --- | --- |
+| Author | Sign events with their key | Forge another author's signature |
+| Relay | Withhold, censor, reorder, serve stale or conflicting signed events | Forge a valid event; guarantee availability |
+| Cordn coordinator | Route opaque group ciphertext; drop or delay messages | Read plaintext; forge an author proof |
+| Cashu mint | Issue/redeem proofs, enforce locktime, freeze or become insolvent | Spend a correctly locked P2PK proof without a valid witness |
+| Founder/admin | Modify the crew record, moderate crew content | Forge members' signatures; guarantee global agreement |
+| Buyer/seller | Publish attestations and payment/receipt claims | Make a false claim true by signing it |
+| WebView / host | Run the client | Be assumed trustworthy after device compromise |
+
+## Guarantees
+
+- **Authenticity:** a valid Schnorr signature proves which key signed an event,
+  not that the content is true.
+- **Availability:** the client can use cached data and multiple relays; there is
+  no guarantee that every relay has every event.
+- **Local determinism:** when two valid versions of an addressable or replaceable
+  event exist, the client chooses the newest `created_at`, with an event-id
+  tie-breaker. This is deterministic, not globally agreed.
+- **Deletion:** NIP-09 is a request. Local tombstones prevent a deleted item from
+  flashing back on that device; relays may ignore the request.
+- **Payments:** a Lightning preimage proves the invoice was paid. It does not
+  prove goods were delivered.
+- **Escrow:** a time-locked Cashu P2PK token protects the buyer after the lock
+  expires and lets the seller redeem on delivery. It is not arbitration and does
+  not prove delivery.
+- **Reputation:** reciprocal signed attestations, distinct partners and
+  web-of-trust weighting are evidence. Two colluding accounts can still create a
+  fake trade; the app must not present that as proof of goods.
+
+## Non-guarantees
+
+- No global ordering or consensus over relays.
+- No protection from a compromised identity key, signer or device.
+- No guaranteed delivery or carrier verification.
+- No neutral dispute resolution.
+- No guarantee that every relay honours deletion or moderation.
+- No guarantee that a mint remains solvent, online or P2PK-compatible.
+- No anonymity guarantee: public events, relays, image hosts and map/weather
+  providers may observe network metadata.
+- No guarantee that a Cordn coordinator cannot censor a group. It cannot read or
+  forge messages, but it can drop them.
+
+## Cordn specifically
+
+The current Cordn group scheme is NIP-44 group delivery with a signed author
+proof inside the ciphertext. It is not full MLS yet: it does not provide MLS
+forward secrecy or post-compromise security. A coordinator cannot read the
+message or impersonate the author, but it can refuse to relay it.
+
+## Marketplace safety rules
+
+- Prefer escrowed or in-person deals for high-value trades.
+- Never send a plain, unlocked Cashu token in a public event.
+- Treat "confirmed trade" as "both parties signed", not "goods verified".
+- Treat "payment verified" as "the money leg is verified".
+- A new account with no distinct confirmed partners is a warning, not a ban.
+- Cash, barter and off-platform settlement have no on-chain proof; use
+  reputation and judgement.
+
+## Privacy boundaries
+
+- Public Nostr events are public forever in practice; deletion is best-effort.
+- DMs and Cordn ciphertext are encrypted, but metadata (who, when, which group)
+  may be visible to relays/coordinators depending on the feature.
+- Images are public once uploaded; strip metadata before upload and do not put
+  addresses in public listing images.
+- Self-hosted infrastructure avoids third-party analytics, but network observers
+  can still see traffic to relays, image hosts, map tiles and weather services.
+
+## What would change this model
+
+A real consensus or arbitration layer would need a separate design with explicit
+participants, quorum, liveness, slashing/appeals and privacy trade-offs. It
+should not be smuggled in as "trust" copy or a global score. Until then:
+**signed facts, local merge, explicit boundaries, no fake guarantees.**

fastlane/metadata/android/en-US/changelogs/10761.txt

@@ -0,0 +1 @@
+Cordn setup now shows visible progress: the device-key step is checked once prepared, and the approval step shows a spinner while waiting. The APK uses the same signing key as the Zapstore release.

fastlane/metadata/android/en-US/changelogs/10762.txt

@@ -0,0 +1 @@
+Small correctness pass: 404 navigation stays in-app, profile badge URLs are sanitized, marketplace readiness only counts a usable Lightning address, and the duplicate Korean picker entry is hidden.

fastlane/metadata/android/en-US/changelogs/10763.txt

@@ -0,0 +1 @@
+Deterministic relay merging with a stable event-id tie-break and local deletion tombstones; EXIF/GPS stripping on upload; Android cloud backup disabled; local OpenSats icon; added the trust-model document.

fastlane/metadata/android/en-US/changelogs/10764.txt

@@ -0,0 +1 @@
+Listings from a new seller with no confirmed trading partner now show a compact safety note beside the trade actions: meet in public, prefer escrow for shipped deals, and never pay outside the app's rails.

fastlane/metadata/android/en-US/full_description.txt

@@ -0,0 +1,15 @@
+SkateSpots is a local-first skating map for finding spots, crews, events and
+gear. Your keys stay on your device, your messages stay in encrypted crew chats
+and the app does not use analytics or sell your data.
+
+Find skate spots on the map, add new ones, organise sessions with your crew,
+follow events and browse the community marketplace. The Android app bundles the
+same web app for fast offline shell startup and native camera, location, push
+and NFC support where available.
+
+SkateSpots is self-hosted and built on open protocols. You can run your own
+relay and Blossom storage instead of relying on a central service.
+
+Lightning payments are optional and self-custodial. Transport and driver
+profiles are self-attested; SkateSpots does not verify a licence, insurance or
+vehicle roadworthiness.

fastlane/metadata/android/en-US/short_description.txt

@@ -0,0 +1 @@
+Local-first skate map, crews, events and marketplace.

fastlane/metadata/android/en-US/title.txt

@@ -0,0 +1 @@
+SkateSpots

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "skate-spots",
-  "version": "1.7.61",
+  "version": "1.7.64",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "skate-spots",
-      "version": "1.7.61",
+      "version": "1.7.64",
       "license": "AGPL-3.0-only",
       "dependencies": {
         "@bitcoinerlab/secp256k1": "^1.2.0",

package.json

@@ -1,7 +1,7 @@
 {
   "name": "skate-spots",
   "private": true,
-  "version": "1.7.61",
+  "version": "1.7.64",
   "license": "AGPL-3.0-only",
   "type": "module",
   "homepage": "https://skate-spots.org",
@@ -21,11 +21,11 @@
     "check:i18n": "node scripts/check-i18n.mjs",
     "test": "npm i --silent && tsc --noEmit && tsc -p cvm-server/tsconfig.json && tsc -p ai-proxy/tsconfig.json && tsc -p push-service/tsconfig.json && eslint && node scripts/check-i18n.mjs && vitest run --reporter=dot --silent && vite build -l error && cp dist/index.html dist/404.html && echo 'All tests passed!'",
     "deploy": "npm i --silent && npm run build && npx -y nostr-deploy-cli deploy --skip-setup",
-    "android:init": "npm run android:build:apk && npx cap add android && npx cap sync android && node scripts/inject-amber-queries.mjs && node scripts/inject-main-activity.mjs && node scripts/inject-network-security.mjs && node scripts/inject-signing-config.mjs && node scripts/make-android-splash.mjs",
-    "android:sync": "npm run android:build:apk && npx cap sync android && node scripts/sync-android-version.mjs && node scripts/inject-amber-queries.mjs && node scripts/inject-deep-links.mjs && node scripts/inject-main-activity.mjs && node scripts/inject-network-security.mjs && node scripts/inject-signing-config.mjs && node scripts/make-android-splash.mjs",
+    "android:init": "npm run android:build:apk && npx cap add android && npx cap sync android && node scripts/inject-amber-queries.mjs && node scripts/inject-main-activity.mjs && node scripts/inject-network-security.mjs && node scripts/inject-backup-policy.mjs && node scripts/inject-signing-config.mjs && node scripts/make-android-splash.mjs",
+    "android:sync": "npm run android:build:apk && npx cap sync android && node scripts/sync-android-version.mjs && node scripts/inject-amber-queries.mjs && node scripts/inject-deep-links.mjs && node scripts/inject-main-activity.mjs && node scripts/inject-network-security.mjs && node scripts/inject-backup-policy.mjs && node scripts/inject-signing-config.mjs && node scripts/make-android-splash.mjs",
     "android:open": "npx cap open android",
     "android:version": "node scripts/sync-android-version.mjs",
-    "android:build": "npm run android:build:apk && npx cap sync android && node scripts/sync-android-version.mjs && node scripts/inject-amber-queries.mjs && node scripts/inject-deep-links.mjs && node scripts/inject-main-activity.mjs && node scripts/inject-network-security.mjs && node scripts/inject-signing-config.mjs && node scripts/make-android-splash.mjs && cd android && ./gradlew assembleRelease",
+    "android:build": "npm run android:build:apk && npx cap sync android && node scripts/sync-android-version.mjs && node scripts/inject-amber-queries.mjs && node scripts/inject-deep-links.mjs && node scripts/inject-main-activity.mjs && node scripts/inject-network-security.mjs && node scripts/inject-backup-policy.mjs && node scripts/inject-signing-config.mjs && node scripts/make-android-splash.mjs && cd android && ./gradlew assembleRelease",
     "android:build:apk": "CAPACITOR_BUILD=1 vite build && sed -i 's|<script type=\"module\" src=\"/shakespeare_tailwind[^\"]*\\.js\"></script>||g' dist/index.html && sed -i 's|<style type=\"text/tailwindcss\">|<style>|g' dist/index.html && cp dist/index.html dist/404.html",
     "newsletter:weekly": "tsx scripts/newsletter-weekly.ts",
     "translation:matrix": "node scripts/translation-matrix.mjs"

public/download/index.html

@@ -0,0 +1,127 @@
+<!doctype html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1, viewport-fit=cover" />
+    <meta name="color-scheme" content="dark" />
+    <title>SkateSpots APK</title>
+    <meta
+      name="description"
+      content="Download the signed SkateSpots Android APK. No account, no store, no tracking."
+    />
+    <style>
+      :root {
+        color-scheme: dark;
+        --bg: #090b0c;
+        --panel: #121719;
+        --line: #273033;
+        --text: #f2f5f4;
+        --muted: #9aa7a5;
+        --teal: #56e0c0;
+        --amber: #f5b83d;
+      }
+      * { box-sizing: border-box; }
+      body {
+        margin: 0;
+        min-height: 100dvh;
+        display: grid;
+        place-items: center;
+        padding: 24px;
+        background:
+          radial-gradient(circle at 20% 0%, rgba(86, 224, 192, 0.12), transparent 42%),
+          var(--bg);
+        color: var(--text);
+        font: 15px/1.55 ui-sans-serif, system-ui, -apple-system, "Segoe UI", sans-serif;
+      }
+      main {
+        width: min(100%, 560px);
+        padding: 28px;
+        border: 1px solid var(--line);
+        border-radius: 18px;
+        background: color-mix(in srgb, var(--panel) 92%, transparent);
+        box-shadow: 0 18px 60px rgba(0, 0, 0, 0.35);
+      }
+      .eyebrow {
+        margin: 0 0 10px;
+        color: var(--teal);
+        font-size: 12px;
+        font-weight: 800;
+        letter-spacing: 0.14em;
+        text-transform: uppercase;
+      }
+      h1 { margin: 0; font-size: clamp(28px, 7vw, 38px); line-height: 1.02; }
+      p { margin: 14px 0 0; color: var(--muted); }
+      a.download {
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+        gap: 16px;
+        margin-top: 24px;
+        padding: 16px 18px;
+        border-radius: 12px;
+        background: var(--teal);
+        color: #06201b;
+        font-weight: 800;
+        text-decoration: none;
+      }
+      a.download:focus-visible { outline: 3px solid var(--amber); outline-offset: 3px; }
+      a.download span:last-child { font-size: 20px; }
+      .meta {
+        display: grid;
+        gap: 8px;
+        margin-top: 18px;
+        padding-top: 18px;
+        border-top: 1px solid var(--line);
+        color: var(--muted);
+        font-size: 13px;
+      }
+      code {
+        overflow-wrap: anywhere;
+        color: var(--text);
+        font-family: ui-monospace, SFMono-Regular, Menlo, Consolas, monospace;
+        font-size: 12px;
+      }
+      .links { display: flex; flex-wrap: wrap; gap: 10px 18px; margin-top: 16px; }
+      .links a { color: var(--amber); font-weight: 700; text-decoration: none; }
+      .links a:hover { text-decoration: underline; }
+    </style>
+  </head>
+  <body>
+    <main>
+      <p class="eyebrow">SkateSpots · Android</p>
+      <h1>Get the signed APK.</h1>
+      <p>
+        Local-first skating map, crews, events and marketplace. No store account
+        required. This is the same signing key as the Zapstore and Obtanium
+        releases, so it updates over an existing install.
+      </p>
+
+      <a
+        class="download"
+        href="https://git.skate-spots.org/skatespots/SkateSpots/releases/download/v1.7.64/SkateSpots-1.7.64.apk"
+        rel="noopener"
+      >
+        <span>Download SkateSpots-1.7.64.apk · 56 MB</span>
+        <span aria-hidden="true">↓</span>
+      </a>
+
+      <div class="meta">
+        <span>Requires Android 7.0 or newer.</span>
+        <span>SHA-256: <code>32d5cd358aaedd8bff8d128035bb6ad30f553d84779d4e5a3f72ee89cabce7fe</code></span>
+        <span>Only install APKs from a source you trust. Android will ask you to allow installs from your browser.</span>
+      </div>
+
+      <div class="links">
+        <a href="https://git.skate-spots.org/skatespots/SkateSpots/releases">All releases</a>
+        <a href="https://git.skate-spots.org/skatespots/SkateSpots">Source code</a>
+        <a href="https://skate-spots.org">Open the web app</a>
+      </div>
+
+      <div class="meta">
+        <span><strong>Obtanium:</strong> add the latest release page above as the app source, or select <em>Override Source → HTML</em> if it is not recognised.</span>
+        <span><strong>F-Droid repo:</strong> <a href="https://fdroid.skate-spots.org/repo">https://fdroid.skate-spots.org/repo</a> (third-party self-hosted repo; app ID <code>org.skatespots.app</code>).</span>
+        <span>Repo signing fingerprint: <code>88:B1:71:1C:24:02:89:FB:B2:A7:FC:C1:B3:1F:BB:9D:60:F5:7F:19:18:E0:3D:62:2D:35:F2:3D:E1:84:46:75</code></span>
+      </div>
+    </main>
+  </body>
+</html>

release-notes.txt

@@ -1,3 +1,44 @@
+🛡️ A clearer warning before a new seller deal
+- Listings from a seller with no confirmed trading partner, or an account under
+  30 days old, now show a compact safety note with the marketplace guidance:
+  meet in public, prefer escrow for shipped deals, and never pay outside the
+  app’s rails.
+- The note sits beside the trade actions only — browsing stays frictionless.
+
+---
+
+🔒 Privacy, privacy, consistent merging
+- Relay results are now merged deterministically with a newest-event rule and a
+  stable event-id tie-break instead of “first relay wins”. Local deletion
+  tombstones are applied during the same merge, so a deleted item cannot flash
+  back because a different relay answered first.
+- Photo uploads are redrawn through a canvas before Blossom, stripping EXIF/GPS
+  metadata from decodable images. GIF and HEIC/HEIF still pass through as-is
+  because they need special handling.
+- Android cloud backup is disabled for the app: local keys, settings and pending
+  escrow state stay on the device and must be exported explicitly.
+- The OpenSats footer icon is now served locally, so opening the app does not
+  contact opensats.org just to render the footer.
+- Added a technical threat-model document and linked it from the trust page:
+  signed facts, no relay consensus, no delivery proof, no arbitration.
+
+---
+
+🧹 Small correctness pass
+- Unknown routes now return home with a real in-app link, so the native app no
+  longer does a full page reload on a 404.
+- Profile badge links are sanitized before rendering, blocking `javascript:` and
+  other unsafe URL schemes from user metadata.
+- Marketplace payment readiness now only says “ready” when checkout has a
+  Lightning address it can actually pay; an LNURL-only profile is no longer
+  advertised as ready.
+- Removed the duplicate North Korean option from the language picker while
+  keeping stored preferences valid.
+- The beta screen’s “View the code” link now points at the self-hosted source
+  instead of a GitHub search.
+
+---
+
 🧩 Cordn setup is easier to follow
 - The setup steps now show progress: preparing this device is checked once the
   key package is ready, and the approval step shows a spinner while waiting.

scripts/inject-backup-policy.mjs

@@ -0,0 +1,41 @@
+#!/usr/bin/env node
+/**
+ * Disable Android Auto Backup for SkateSpots.
+ *
+ * The app stores identity material, local settings, pending escrow tokens and
+ * other private state in its WebView storage. Android Auto Backup can copy that
+ * data to a cloud account without the user ever asking for a backup. Keep it
+ * device-local: SkateSpots has its own explicit export/backup flows.
+ *
+ * Idempotent; exits quietly when android/ has not been generated yet.
+ */
+import { existsSync, readFileSync, writeFileSync } from 'node:fs';
+import { dirname, join } from 'node:path';
+import { fileURLToPath } from 'node:url';
+
+const root = join(dirname(fileURLToPath(import.meta.url)), '..');
+const manifestPath = join(root, 'android', 'app', 'src', 'main', 'AndroidManifest.xml');
+
+if (!existsSync(manifestPath)) {
+  console.log('[inject-backup-policy] android/ not generated yet — skipping.');
+  process.exit(0);
+}
+
+let manifest = readFileSync(manifestPath, 'utf8');
+const before = manifest;
+
+if (/android:allowBackup="[^"]*"/.test(manifest)) {
+  manifest = manifest.replace(/android:allowBackup="[^"]*"/, 'android:allowBackup="false"');
+} else {
+  manifest = manifest.replace(
+    /<application\b/,
+    '<application android:allowBackup="false"',
+  );
+}
+
+if (manifest === before) {
+  console.log('[inject-backup-policy] allowBackup already disabled.');
+} else {
+  writeFileSync(manifestPath, manifest);
+  console.log('[inject-backup-policy] ✓ Disabled Android cloud backup (allowBackup=false).');
+}

scripts/publish-forgejo.sh

@@ -0,0 +1,108 @@
+#!/usr/bin/env bash
+#
+# Publish a built APK to the self-hosted Forgejo release page.
+#
+# Usage:
+#   FORGEJO_TOKEN=... scripts/publish-forgejo.sh 1.7.62 [path/to.apk]
+#   FORGEJO_PASSWORD=... FORGEJO_USER=skatespots scripts/publish-forgejo.sh 1.7.62
+#
+# This uploads the APK and its .sha256 file. It does not push the git tag or
+# source; do that separately (the Forgejo repo is a mirror, not an auto-push
+# remote). Keep credentials in your shell/environment, never in this repo.
+set -euo pipefail
+
+VERSION="${1:?usage: publish-forgejo.sh <version> [apk]}"
+APK="${2:-android/app/build/outputs/apk/release/app-release.apk}"
+TAG="${FORGEJO_TAG:-v$VERSION}"
+BASE="${FORGEJO_URL:-https://git.skate-spots.org}"
+OWNER="${FORGEJO_OWNER:-skatespots}"
+REPO="${FORGEJO_REPO:-SkateSpots}"
+API="$BASE/api/v1/repos/$OWNER/$REPO"
+
+command -v curl >/dev/null || { echo "curl is required" >&2; exit 1; }
+command -v python3 >/dev/null || { echo "python3 is required" >&2; exit 1; }
+[ -f "$APK" ] || { echo "APK not found: $APK" >&2; exit 1; }
+
+AUTH=()
+if [ -n "${FORGEJO_TOKEN:-}" ]; then
+  AUTH=(-H "Authorization: token $FORGEJO_TOKEN")
+elif [ -n "${FORGEJO_PASSWORD:-}" ]; then
+  AUTH=(-u "${FORGEJO_USER:-skatespots}:$FORGEJO_PASSWORD")
+else
+  echo "set FORGEJO_TOKEN (preferred) or FORGEJO_PASSWORD" >&2
+  exit 1
+fi
+
+tmpdir="$(mktemp -d)"
+trap 'rm -rf "$tmpdir"' EXIT
+
+sha="$(sha256sum "$APK" | awk '{print $1}')"
+body="$tmpdir/release.md"
+cat >"$body" <<EOF
+## SkateSpots $VERSION
+
+Signed Android release. SHA-256: \`$sha\`
+
+- Source: $BASE/$OWNER/$REPO
+- APK signing key: same as the Zapstore release.
+EOF
+
+python3 - "$TAG" "$VERSION" "$body" >"$tmpdir/payload.json" <<'PY'
+import json
+import sys
+from pathlib import Path
+
+tag, version, body_path = sys.argv[1:]
+print(json.dumps({
+    "tag_name": tag,
+    "name": version,
+    "body": Path(body_path).read_text(),
+    "draft": False,
+    "prerelease": False,
+}))
+PY
+
+create_code="$(curl -sS -o "$tmpdir/release.json" -w '%{http_code}' \
+  "${AUTH[@]}" -H 'Content-Type: application/json' \
+  -X POST "$API/releases" --data-binary @"$tmpdir/payload.json" || true)"
+
+if [ "$create_code" = "201" ]; then
+  release_id="$(python3 -c 'import json,sys; print(json.load(open(sys.argv[1]))["id"])' "$tmpdir/release.json")"
+elif [ "$create_code" = "409" ] || [ "$create_code" = "422" ]; then
+  curl -fsS "${AUTH[@]}" "$API/releases/tags/$TAG" -o "$tmpdir/release.json"
+  release_id="$(python3 -c 'import json,sys; print(json.load(open(sys.argv[1]))["id"])' "$tmpdir/release.json")"
+else
+  echo "Forgejo release creation failed (HTTP $create_code)" >&2
+  cat "$tmpdir/release.json" >&2
+  exit 1
+fi
+
+sha_file="$tmpdir/SkateSpots-$VERSION.apk.sha256"
+printf '%s  SkateSpots-%s.apk\n' "$sha" "$VERSION" >"$sha_file"
+
+existing_assets="$(python3 - "$tmpdir/release.json" <<'PY'
+import json
+import sys
+
+data = json.load(open(sys.argv[1]))
+print("\n".join(asset["name"] for asset in data.get("assets", [])))
+PY
+)"
+
+for file in "$APK" "$sha_file"; do
+  name="$(basename "$file")"
+  if printf '%s\n' "$existing_assets" | grep -Fqx "$name"; then
+    echo "already present: $name"
+    continue
+  fi
+  code="$(curl -sS -o "$tmpdir/asset.json" -w '%{http_code}' \
+    "${AUTH[@]}" -X POST "$API/releases/$release_id/assets?name=$name" \
+    -F "attachment=@$file" || true)"
+  case "$code" in
+    201|202) echo "uploaded $name" ;;
+    *) echo "warning: upload of $name returned HTTP $code" >&2 ;;
+  esac
+done
+
+echo "release: $BASE/$OWNER/$REPO/releases/tag/$TAG"
+echo "latest:  $BASE/$OWNER/$REPO/releases/latest"

scripts/release.sh

@@ -126,6 +126,14 @@ for _ in 1 2 3 4 5 6; do
 done
 [ "$FOUND" -eq 1 ] || log "warning: the release event did not appear on the relay yet (it usually propagates shortly)"
 
+if [ -n "${FORGEJO_TOKEN:-}" ] || [ -n "${FORGEJO_PASSWORD:-}" ]; then
+  log "publishing the APK to the self-hosted Forgejo release page…"
+  scripts/publish-forgejo.sh "$VERSION" "$APK" || \
+    log "warning: Forgejo upload failed — the Zapstore release is still valid"
+else
+  log "Forgejo: skipped (set FORGEJO_TOKEN or FORGEJO_PASSWORD to publish there)"
+fi
+
 log "committing the release…"
 git add package.json package-lock.json release-notes.txt
 git commit -m "release: $VERSION" >/dev/null

src/components/BetaDisclaimerDialog.tsx

@@ -19,8 +19,7 @@ import { useTranslation } from '@/contexts/language';
 const DISCLAIMER_VERSION = 1;
 const STORAGE_KEY = `skatespots_disclaimer_accepted_v${DISCLAIMER_VERSION}`;
 
-const REPO_URL =
-  'https://github.com/search?q=SkateSpots';
+const REPO_URL = 'https://git.skate-spots.org/skatespots/SkateSpots';
 
 export function BetaDisclaimerDialog() {
   const [accepted, setAccepted] = useLocalStorage<boolean>(STORAGE_KEY, false);

src/components/LanguageToggle.tsx

@@ -11,6 +11,8 @@ import { useTranslation } from '@/contexts/language';
 import { LANGUAGE_OPTIONS } from '@/lib/languageOptions';
 import { cn } from '@/lib/utils';
 
+const VISIBLE_LANGUAGE_OPTIONS = LANGUAGE_OPTIONS.filter((language) => !language.hidden);
+
 interface LanguageToggleProps {
   /** Show only the flag icon (compact mode) */
   compact?: boolean;
@@ -65,13 +67,13 @@ export function LanguageToggle({ compact = false, inline = false, className, var
 
   const safeQuery = query.trim().toLowerCase();
   const filteredLanguages = safeQuery
-    ? LANGUAGE_OPTIONS.filter(
+    ? VISIBLE_LANGUAGE_OPTIONS.filter(
         (l) =>
           l.name.toLowerCase().includes(safeQuery) ||
           l.nativeName.toLowerCase().includes(safeQuery) ||
           l.code.toLowerCase().includes(safeQuery)
       )
-    : LANGUAGE_OPTIONS;
+    : VISIBLE_LANGUAGE_OPTIONS;
 
   const currentLanguage =
     LANGUAGE_OPTIONS.find((l) => l.code === language) || LANGUAGE_OPTIONS[0];
@@ -196,7 +198,7 @@ export function LanguageSelector() {
     <div className="space-y-3">
       <label className="text-sm font-medium">{t('settings.selectLanguage')}</label>
       <div className="grid grid-cols-1 gap-3 sm:grid-cols-2">
-        {LANGUAGE_OPTIONS.map((lang) => (
+        {VISIBLE_LANGUAGE_OPTIONS.map((lang) => (
           <button
             key={lang.code}
             onClick={() => setLanguage(lang.code)}

src/components/Layout.tsx

@@ -1223,7 +1223,7 @@ export function Layout({ children, noPadding }: LayoutProps) {
                 <span>{t('chromeUi.notSponsoredBy')}</span>
                 <span className="inline-flex items-center gap-1.5">
                   <img 
-                    src="https://opensats.org/favicon.ico" 
+                    src="/images/opensats.ico" 
                     alt="OpenSats" 
                     className="h-4 w-4"
                   />

src/components/MapFooterStrip.tsx

@@ -32,7 +32,7 @@ export function MapFooterStrip() {
         <div className="flex items-center gap-3">
           <span className="flex items-center gap-1.5 text-gray-500">
             {t('chromeUi.notSponsoredBy')}
-            <img src="https://opensats.org/favicon.ico" alt="OpenSats" className="h-3 w-3" />
+            <img src="/images/opensats.ico" alt="OpenSats" className="h-3 w-3" />
             <span className="font-medium text-gray-400">OpenSats</span>
           </span>
         </div>

src/components/PaymentReadinessNote.tsx

@@ -21,7 +21,10 @@ export function PaymentReadinessNote() {
   const metadata = author.data?.metadata;
 
   const lud16 = metadata?.lud16;
-  const hasLightning = isValidLightningAddress(lud16) || !!metadata?.lud06;
+  // PayWithSats falls back to the profile's lud16. A lud06/LNURL alone is
+  // not enough to settle a marketplace offer, so do not advertise readiness
+  // for a payment path checkout cannot actually use.
+  const hasLightning = isValidLightningAddress(lud16);
   // Silent payment lives in a custom kind-0 field the app reads elsewhere.
   const rawSp = (metadata as Record<string, unknown> | undefined)?.bitcoin_silent_payment;
   const hasSilentPayment = typeof rawSp === 'string' && isValidSilentPayment(rawSp);

src/components/ProfileBadges.tsx

@@ -1,6 +1,7 @@
 import { BadgeCheck, ExternalLink } from 'lucide-react';
 import { cn } from '@/lib/utils';
 import { SKATESPOTS_SITE, type ProfileBadge } from '@/lib/badges';
+import { sanitizeUrl } from '@/lib/sanitizeUrl';
 
 /** The app logo is already served with the site. */
 const SKATESPOTS_LOGO = '/images/logo-icon.png';
@@ -26,6 +27,7 @@ export function ProfileBadges({
     <div className={cn('flex flex-wrap items-center gap-2', className)}>
       {badges.map((b, i) => {
         const app = isApp(b);
+        const safeUrl = b.url ? sanitizeUrl(b.url) : null;
         const cls = cn(
           'inline-flex items-center gap-1.5 rounded-full border font-bold transition-colors',
           size === 'sm' ? 'px-2 py-0.5 text-[11px]' : 'px-3 py-1.5 text-sm',
@@ -41,17 +43,17 @@ export function ProfileBadges({
               <BadgeCheck className={size === 'sm' ? 'h-3 w-3' : 'h-3.5 w-3.5'} />
             )}
             <span className="max-w-[12rem] truncate">{b.label}</span>
-            {b.url && !app && <ExternalLink className="h-3 w-3 opacity-60" />}
+            {safeUrl && !app && <ExternalLink className="h-3 w-3 opacity-60" />}
           </>
         );
 
-        return b.url ? (
+        return safeUrl ? (
           <a
             key={`${b.label}-${i}`}
-            href={b.url}
+            href={safeUrl}
             target="_blank"
             rel="noopener noreferrer"
-            title={b.url}
+            title={safeUrl}
             className={cls}
           >
             {inner}

src/hooks/useSkateRelays.ts

@@ -4,30 +4,27 @@ import { useAppContext } from '@/hooks/useAppContext';
 import { useRelays } from '@/lib/relays';
 import { useCitrine } from '@/hooks/useCitrine';
 import { SKATE_RELAY } from '@/lib/types';
+import { mergeEvents } from '@/lib/eventMerge';
+import { getLocalDeletions } from '@/lib/localDeletions';
 import type { NostrEvent, NostrFilter } from '@nostrify/nostrify';
 
 /**
- * Deduplicate a batch of events from several relays, keeping the newest per
- * identity:
- *  - addressable (has `d`): `pubkey:kind:d-tag`;
- *  - replaceable (0, 3, 10000–19999): `pubkey:kind` (NIP-01 keeps only the
- *    latest per author+kind — keying by id would surface stale profiles/relay
- *    lists when relays return different versions);
- *  - otherwise: the event id.
+ * Merge relay results deterministically and drop this device's local deletion
+ * tombstones. Consensus is deliberately absent: relays are not voters, and this
+ * client must not let relay timing decide which version of an event is shown.
  */
 function dedupeEvents(events: NostrEvent[]): NostrEvent[] {
-  const map = new Map<string, NostrEvent>();
-  for (const event of events) {
-    const dTag = event.tags.find(([name]) => name === 'd')?.[1];
-    let key: string;
-    if (dTag) key = `${event.pubkey}:${event.kind}:${dTag}`;
-    else if (event.kind === 0 || event.kind === 3 || (event.kind >= 10000 && event.kind < 20000)) {
-      key = `${event.pubkey}:${event.kind}`;
-    } else key = event.id;
-    const existing = map.get(key);
-    if (!existing || event.created_at > existing.created_at) map.set(key, event);
-  }
-  return Array.from(map.values());
+  const deleted = getLocalDeletions();
+  return mergeEvents(events, {
+    isDeleted: (event) => {
+      const dTag = event.tags.find(([name]) => name === 'd')?.[1];
+      const coord = dTag !== undefined ? `${event.kind}:${event.pubkey}:${dTag}` : undefined;
+      return !!(
+        (coord && deleted.has(coord)) ||
+        deleted.has(`e:${event.id}`)
+      );
+    },
+  });
 }
 
 /**

src/hooks/useUploadFile.ts

@@ -59,11 +59,8 @@ async function prepareImage(file: File): Promise<File> {
   try {
     const bitmap = await createImageBitmap(file);
     const scale = Math.min(1, 1600 / Math.max(bitmap.width, bitmap.height));
-    // Already small enough: keep the original bytes/format.
-    if (scale === 1 && file.size <= 1_200_000) {
-      bitmap.close();
-      return file;
-    }
+    // Always redraw through a canvas, even for images that are already small:
+    // this strips EXIF/GPS and other metadata before the file leaves the device.
     const canvas = document.createElement('canvas');
     canvas.width = Math.max(1, Math.round(bitmap.width * scale));
     canvas.height = Math.max(1, Math.round(bitmap.height * scale));
@@ -74,7 +71,7 @@ async function prepareImage(file: File): Promise<File> {
     const blob = await new Promise<Blob | null>((resolve) => {
       canvas.toBlob(resolve, 'image/webp', 0.84);
     });
-    if (!blob || blob.size >= file.size) return file;
+    if (!blob) return file;
     const base = file.name.replace(/\.[^.]+$/, '') || 'image';
     return new File([blob], `${base}.webp`, { type: 'image/webp', lastModified: file.lastModified });
   } catch {

src/lib/eventMerge.test.ts

@@ -0,0 +1,55 @@
+import { describe, expect, it } from 'vitest';
+import type { NostrEvent } from '@nostrify/nostrify';
+import { eventMergeKey, eventReplaces, mergeEvents } from './eventMerge';
+
+function ev(partial: Partial<NostrEvent> & { id: string }): NostrEvent {
+  return {
+    pubkey: 'a'.repeat(64),
+    created_at: 100,
+    kind: 1,
+    tags: [],
+    content: '',
+    sig: '0'.repeat(128),
+    ...partial,
+  } as NostrEvent;
+}
+
+describe('eventMerge', () => {
+  it('keys addressable, replaceable and regular events correctly', () => {
+    expect(eventMergeKey(ev({ id: '1', kind: 30818, tags: [['d', 'spot']] }))).toBe(
+      `${'a'.repeat(64)}:30818:spot`,
+    );
+    expect(eventMergeKey(ev({ id: '2', kind: 0 }))).toBe(`${'a'.repeat(64)}:0`);
+    expect(eventMergeKey(ev({ id: '3', kind: 1 }))).toBe('3');
+  });
+
+  it('keeps the newest addressable version regardless of input order', () => {
+    const old = ev({ id: 'b', kind: 30818, tags: [['d', 'spot']], created_at: 100 });
+    const fresh = ev({ id: 'a', kind: 30818, tags: [['d', 'spot']], created_at: 101 });
+
+    expect(mergeEvents([old, fresh])).toEqual([fresh]);
+    expect(mergeEvents([fresh, old])).toEqual([fresh]);
+  });
+
+  it('uses event id as a deterministic tie-breaker', () => {
+    const first = ev({ id: 'aaa', kind: 30000, tags: [['d', 'x']], created_at: 100 });
+    const second = ev({ id: 'zzz', kind: 30000, tags: [['d', 'x']], created_at: 100 });
+
+    expect(eventReplaces(first, second)).toBe(true);
+    expect(mergeEvents([first, second])).toEqual([second]);
+    expect(mergeEvents([second, first])).toEqual([second]);
+  });
+
+  it('keeps distinct regular events and deduplicates by id', () => {
+    const a = ev({ id: 'a' });
+    const b = ev({ id: 'b' });
+    expect(mergeEvents([a, b, a])).toHaveLength(2);
+  });
+
+  it('drops local tombstones', () => {
+    const a = ev({ id: 'a', kind: 30818, tags: [['d', 'spot']] });
+    const b = ev({ id: 'b', kind: 30818, tags: [['d', 'other']] });
+
+    expect(mergeEvents([a, b], { isDeleted: (event) => event.id === 'a' })).toEqual([b]);
+  });
+});

src/lib/eventMerge.ts

@@ -0,0 +1,74 @@
+import type { NostrEvent } from '@nostrify/nostrify';
+
+/**
+ * Deterministic event merging.
+ *
+ * Nostr does not provide global ordering: relays can return the same logical
+ * event set in a different order, and two relays can serve different versions
+ * of an addressable event. We do not attempt consensus; we make the client's
+ * local answer deterministic and explainable.
+ *
+ * Rules:
+ *  - addressable events (`d` tag): newest `created_at` wins;
+ *  - replaceable events (kind 0/3 and 10000-19999): newest `created_at` wins;
+ *  - regular events: identity is the event id;
+ *  - equal timestamps: lexicographically larger event id wins, so relay order
+ *    and Promise timing cannot change the result.
+ *
+ * Local NIP-09 tombstones are applied by the caller before/while merging; a
+ * tombstone is a device-local safety net, not a claim that every relay erased
+ * the event.
+ */
+export type EventMergePredicate = (event: NostrEvent) => boolean;
+
+export interface EventMergeOptions {
+  /** Return true for events that must not appear (local tombstones, moderation). */
+  isDeleted?: EventMergePredicate;
+}
+
+/** Stable identity used to compare two versions of the same logical event. */
+export function eventMergeKey(event: NostrEvent): string {
+  const dTag = event.tags.find(([name]) => name === 'd')?.[1];
+  if (dTag !== undefined) return `${event.pubkey}:${event.kind}:${dTag}`;
+  if (event.kind === 0 || event.kind === 3 || (event.kind >= 10000 && event.kind < 20000)) {
+    return `${event.pubkey}:${event.kind}`;
+  }
+  return event.id;
+}
+
+/**
+ * Return true when `candidate` should replace `current` for the same key.
+ * Larger ids win ties; this is arbitrary but stable across relays and devices.
+ */
+export function eventReplaces(current: NostrEvent, candidate: NostrEvent): boolean {
+  if (candidate.created_at !== current.created_at) {
+    return candidate.created_at > current.created_at;
+  }
+  return candidate.id > current.id;
+}
+
+/**
+ * Merge events from one or more relays into one deterministic list.
+ *
+ * The returned list is sorted by key only for stable snapshots; callers that
+ * care about display order should sort for their own UI.
+ */
+export function mergeEvents(
+  events: readonly NostrEvent[],
+  options: EventMergeOptions = {},
+): NostrEvent[] {
+  const { isDeleted } = options;
+  const byKey = new Map<string, NostrEvent>();
+
+  for (const event of events) {
+    if (isDeleted?.(event)) continue;
+
+    const key = eventMergeKey(event);
+    const current = byKey.get(key);
+    if (!current || eventReplaces(current, event)) {
+      byKey.set(key, event);
+    }
+  }
+
+  return [...byKey.values()];
+}

src/lib/languageOptions.ts

@@ -5,6 +5,8 @@ export interface LanguageOption {
   name: string;
   nativeName: string;
   flag: string;
+  /** Kept for stored preferences, but omitted from the visible picker. */
+  hidden?: boolean;
 }
 
 /**
@@ -26,7 +28,9 @@ export const LANGUAGE_OPTIONS: LanguageOption[] = [
   { code: 'pl', name: 'Polish', nativeName: 'Polski', flag: '🇵🇱' },
   { code: 'ru', name: 'Russian', nativeName: 'Русский', flag: '🇷🇺' },
   { code: 'ko', name: 'Korean', nativeName: '한국어', flag: '🇰🇷' },
-  { code: 'ko-KP', name: 'Korean (North)', nativeName: '조선어', flag: '🇰🇵' },
+  // North Korean reuses the Korean dictionary; hide the duplicate from the
+  // picker while keeping the code valid for existing stored preferences.
+  { code: 'ko-KP', name: 'Korean (North)', nativeName: '조선어', flag: '🇰🇵', hidden: true },
   { code: 'th', name: 'Thai', nativeName: 'ไทย', flag: '🇹🇭' },
   { code: 'ja', name: 'Japanese', nativeName: '日本語', flag: '🇯🇵' },
   { code: 'zh-CN', name: 'Chinese (Simplified)', nativeName: '简体中文', flag: '🇨🇳' },

src/pages/ListingDetailPage.tsx

@@ -23,6 +23,7 @@ import { useMarkListingSold } from '@/hooks/useMarkListingSold';
 import { useCurrentUser } from '@/hooks/useCurrentUser';
 import { useAuthor } from '@/hooks/useAuthor';
 import { useSellerInfo } from '@/hooks/useSellerInfo';
+import { useTradeReputation } from '@/hooks/useTradeAttestations';
 import { useToast } from '@/hooks/useToast';
 import { ErrorState } from '@/components/ErrorState';
 import { formatPrice, GEAR_CONDITIONS, GEAR_CATEGORIES, isValidNoffer } from '@/lib/types';
@@ -40,6 +41,7 @@ import {
   Tag,
   Handshake,
   Share2,
+  ShieldAlert,
 } from 'lucide-react';
 import { useTranslation } from '@/contexts/language';
 
@@ -61,6 +63,7 @@ export default function ListingDetailPage() {
   const author = useAuthor(pubkey);
   const metadata = author.data?.metadata;
   const { data: sellerInfo } = useSellerInfo(pubkey);
+  const { data: sellerReputation } = useTradeReputation(pubkey);
   const { relist, isPending: isUpdatingStatus } = useMarkListingSold();
 
   const [lightboxIndex, setLightboxIndex] = useState<number | null>(null);
@@ -340,6 +343,17 @@ export default function ListingDetailPage() {
             ) : (
               <Card className="bg-black/90 border-white/10">
                 <CardContent className="p-4">
+                  {(sellerInfo?.accountAge !== undefined && sellerInfo.accountAge < 30) ||
+                  (sellerReputation && sellerReputation.verifiedCounterparties === 0) ? (
+                    <div className="mb-3 space-y-1.5 rounded-lg border border-amber-500/30 bg-amber-500/10 p-3">
+                      <p className="flex items-center gap-1.5 text-xs font-bold uppercase tracking-wide text-amber-300">
+                        <ShieldAlert className="h-3.5 w-3.5" /> {t('marketUi.card.newSeller')}
+                      </p>
+                      <p className="text-xs leading-relaxed text-gray-400">
+                        {t('marketTerms.safetyBody')}
+                      </p>
+                    </div>
+                  ) : null}
                   <ListingTradeActions item={item} />
                   {isValidNoffer(sellerNoffer) && (
                     <ClinkPayButton

src/pages/NotFound.tsx

@@ -1,5 +1,5 @@
 import { useSeoMeta } from "@unhead/react";
-import { useLocation } from "react-router-dom";
+import { Link, useLocation } from "react-router-dom";
 import { useEffect } from "react";
 import { useTranslation } from '@/contexts/language';
 
@@ -24,9 +24,9 @@ const NotFound = () => {
       <div className="text-center">
         <h1 className="text-4xl font-bold mb-4 text-gray-900 dark:text-gray-100">404</h1>
         <p className="text-xl text-gray-600 dark:text-gray-400 mb-4">{t('settingsUi.notFound.message')}</p>
-        <a href="/" className="text-blue-500 hover:text-blue-700 dark:text-blue-400 dark:hover:text-blue-300 underline">
+        <Link to="/" className="text-blue-500 hover:text-blue-700 dark:text-blue-400 dark:hover:text-blue-300 underline">
           {t('settingsUi.notFound.returnHome')}
-        </a>
+        </Link>
       </div>
     </div>
   );

src/pages/TrustPage.tsx

@@ -115,12 +115,20 @@ export default function TrustPage() {
         <p>{t('trustUi.povDesc')}</p>
       </Section>
 
-      <div className="flex justify-center pt-2">
+      <div className="flex flex-col items-center gap-3 pt-2">
         <Link to="/settings">
           <Button className="gap-2 bg-[#ccff00] text-black hover:bg-[#ccff00]/90">
             {t('trustUi.settingsCta')}
           </Button>
         </Link>
+        <a
+          href="https://git.skate-spots.org/skatespots/SkateSpots/blob/main/docs/THREAT_MODEL.md"
+          target="_blank"
+          rel="noopener noreferrer"
+          className="text-xs text-gray-500 underline decoration-dotted underline-offset-2 hover:text-gray-300"
+        >
+          {t('common.learnMore')}
+        </a>
       </div>
     </div>
   );