From d2caccbce23b07f7e1926f6cfb468c0f73c75d55 Mon Sep 17 00:00:00 2001
From: Jon Staab <shtaab@gmail.com>
Date: Mon, 12 May 2025 15:19:06 -0700
Subject: [PATCH 1/5] Tweak zapstore wording

---
 zapstore.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/zapstore.yaml b/zapstore.yaml
index d8f109efa..bce39b50f 100644
--- a/zapstore.yaml
+++ b/zapstore.yaml
@@ -2,7 +2,7 @@ coracle:
   android:
     identifier: social.coracle.app
     name: Coracle
-    description: An experimental Nostr client focused on unlocking the full potential of multiple relays. Browse, filter, zap, and create custom feeds to create a curated Nostr experience.
+    description: An experimental Nostr client focused on unlocking the full potential of multiple relays. Browse, filter, zap, and create custom feeds for a curated Nostr experience.
     repository: https://github.com/coracle-social/coracle
     artifacts:
       - app-release-signed.apk

From 55d3d1a4dcac40408549bd5bfc1969f978ed3d1f Mon Sep 17 00:00:00 2001
From: Jon Staab <shtaab@gmail.com>
Date: Tue, 13 May 2025 08:05:16 -0700
Subject: [PATCH 2/5] Fix reactions notifications

---
 src/app/views/NotificationSectionReactions.svelte | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/views/NotificationSectionReactions.svelte b/src/app/views/NotificationSectionReactions.svelte
index 3a4018bd0..17d15b7f3 100644
--- a/src/app/views/NotificationSectionReactions.svelte
+++ b/src/app/views/NotificationSectionReactions.svelte
@@ -28,7 +28,7 @@
 </script>
 
 <FlexColumn>
-  {#each notifications as [i, events] (i)}
+  {#each notifications as [seconds, events], i (seconds)}
     <NotificationItem
       depth={0}
       {notifications}

From 7ace67a5343ea84c32c014c88c6caf9a305ad00f Mon Sep 17 00:00:00 2001
From: Jon Staab <shtaab@gmail.com>
Date: Tue, 13 May 2025 08:29:06 -0700
Subject: [PATCH 3/5] Show wot badges on DM items

---
 CHANGELOG.md                            |  6 ++++++
 src/app/shared/Message.svelte           | 12 ++++++++++--
 src/app/shared/PersonBadgeMedium.svelte | 12 ------------
 src/app/views/ChannelsListItem.svelte   | 13 +++++++++----
 4 files changed, 25 insertions(+), 18 deletions(-)
 delete mode 100644 src/app/shared/PersonBadgeMedium.svelte

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 30e129cad..2bab25e08 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+# 0.6.17
+
+* Fix reaction notifications crash
+* Show web of trust badge on DM items
+* Make name on messages clickable
+
 # 0.6.16
 
 * Add support for editing WOT feeds
diff --git a/src/app/shared/Message.svelte b/src/app/shared/Message.svelte
index 0b80d9f2d..8068e03ed 100644
--- a/src/app/shared/Message.svelte
+++ b/src/app/shared/Message.svelte
@@ -9,9 +9,11 @@
   import Popover from "src/partials/Popover.svelte"
   import Anchor from "src/partials/Anchor.svelte"
   import NoteContent from "src/app/shared/NoteContent.svelte"
-  import PersonBadgeMedium from "src/app/shared/PersonBadgeMedium.svelte"
+  import PersonCircle from "src/app/shared/PersonCircle.svelte"
+  import PersonName from "src/app/shared/PersonName.svelte"
   import NoteInfo from "src/app/shared/NoteInfo.svelte"
   import {ensureMessagePlaintext, userSettings} from "src/engine"
+  import {router} from "src/app/util/router"
 
   export let message
 
@@ -30,7 +32,13 @@
       "mr-12 rounded-bl-none bg-tinted-800": message.pubkey !== $session.pubkey,
     })}>
     {#if message.showProfile && message.pubkey !== $session.pubkey}
-      <PersonBadgeMedium pubkey={message.pubkey} />
+      <Anchor
+        modal
+        href={router.at("people").of(message.pubkey).toString()}
+        class="relative z-feature flex items-center gap-2">
+        <PersonCircle pubkey={message.pubkey} class="h-8 w-8" />
+        <PersonName pubkey={message.pubkey} />
+      </Anchor>
     {/if}
     <div class="break-words">
       {#await getContent(message)}
diff --git a/src/app/shared/PersonBadgeMedium.svelte b/src/app/shared/PersonBadgeMedium.svelte
deleted file mode 100644
index 26a05376c..000000000
--- a/src/app/shared/PersonBadgeMedium.svelte
+++ /dev/null
@@ -1,12 +0,0 @@
-<script lang="ts">
-  import cx from "classnames"
-  import PersonCircle from "src/app/shared/PersonCircle.svelte"
-  import PersonName from "src/app/shared/PersonName.svelte"
-
-  export let pubkey
-</script>
-
-<span class={cx($$props.class, "relative z-feature flex items-center gap-2")}>
-  <PersonCircle {pubkey} class="h-8 w-8" />
-  <PersonName {pubkey} />
-</span>
diff --git a/src/app/views/ChannelsListItem.svelte b/src/app/views/ChannelsListItem.svelte
index 7216e7af1..cbf54021c 100644
--- a/src/app/views/ChannelsListItem.svelte
+++ b/src/app/views/ChannelsListItem.svelte
@@ -3,6 +3,7 @@
   import {pubkey, profiles, displayProfileByPubkey} from "@welshman/app"
   import {without, displayList} from "@welshman/lib"
   import PersonCircles from "src/app/shared/PersonCircles.svelte"
+  import PersonBadge from "src/app/shared/PersonBadge.svelte"
   import Card from "src/partials/Card.svelte"
   import {router} from "src/app/util/router"
   import {channelHasNewMessages} from "src/engine"
@@ -19,10 +20,14 @@
 </script>
 
 <Card interactive on:click={enter}>
-  <div class="flex justify-between gap-8 px-2 py-4">
-    <div class="flex gap-8" class:flex-col={members.length > 3}>
-      <PersonCircles pubkeys={members} />
-      <h2>{displayList($membersDisplay)}</h2>
+  <div class="flex items-center justify-between gap-8">
+    <div class="flex items-center gap-4" class:flex-col={members.length > 3}>
+      {#if members.length === 1}
+        <PersonBadge pubkey={members[0]} />
+      {:else}
+        <PersonCircles pubkeys={members} />
+        <h2>{displayList($membersDisplay)}</h2>
+      {/if}
     </div>
     <div class="relative">
       <i class="fa fa-bell" class:text-neutral-600={!showAlert} />

From 7af9d791912d06a1bc26d863b232c21a3a6c1ab8 Mon Sep 17 00:00:00 2001
From: Jon Staab <shtaab@gmail.com>
Date: Tue, 13 May 2025 10:41:52 -0700
Subject: [PATCH 4/5] Add relays to note options

---
 CHANGELOG.md                      |  2 ++
 remove-pnpm-overrides.js          |  7 ++++++-
 src/app/shared/NoteOptions.svelte | 33 +++++++++++++++++++++++++------
 src/app/shared/NoteReply.svelte   | 14 +++++++++++--
 src/app/views/NoteCreate.svelte   | 12 +++++++----
 src/partials/FieldInline.svelte   |  4 ++--
 6 files changed, 57 insertions(+), 15 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2bab25e08..18f263e83 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,8 @@
 * Fix reaction notifications crash
 * Show web of trust badge on DM items
 * Make name on messages clickable
+* Reduce duplicate dependencies
+* Add relays to note options form
 
 # 0.6.16
 
diff --git a/remove-pnpm-overrides.js b/remove-pnpm-overrides.js
index 1b493b1d7..575956338 100644
--- a/remove-pnpm-overrides.js
+++ b/remove-pnpm-overrides.js
@@ -12,7 +12,12 @@ if (!pkgName?.endsWith("package.json")) {
 const pkg = JSON.parse(fs.readFileSync(pkgName, "utf8"))
 
 if (pkg.pnpm && pkg.pnpm.overrides) {
-  delete pkg.pnpm.overrides
+  // Use $package notation to make sure we only get one copy of each welshman dependency
+  // TODO: move welshman to a single package to straighten all this out.
+  for (const k of Object.keys(pkg.pnpm.overrides)) {
+    pkg.pnpm.overrides[k] = "$" + k
+  }
+
   fs.writeFileSync(pkgName, JSON.stringify(pkg, null, 2) + "\n")
   console.log("Removed pnpm.overrides from package.json")
 } else {
diff --git a/src/app/shared/NoteOptions.svelte b/src/app/shared/NoteOptions.svelte
index 00f6b5bed..6e71028bb 100644
--- a/src/app/shared/NoteOptions.svelte
+++ b/src/app/shared/NoteOptions.svelte
@@ -1,4 +1,16 @@
+<script lang="ts" context="module">
+  export type Values = {
+    warning: string
+    anonymous: boolean
+    pow_difficulty: number
+    publish_at?: Date
+    relays?: string[]
+  }
+</script>
+
 <script lang="ts">
+  import {relaySearch} from "@welshman/app"
+  import {Router} from "@welshman/router"
   import Anchor from "src/partials/Anchor.svelte"
   import DateTimeInput from "src/partials/DateTimeInput.svelte"
   import Field from "src/partials/Field.svelte"
@@ -8,22 +20,22 @@
   import Input from "src/partials/Input.svelte"
   import Modal from "src/partials/Modal.svelte"
   import WorkEstimate from "src/partials/WorkEstimate.svelte"
+  import SearchSelect from "src/partials/SearchSelect.svelte"
   import Toggle from "src/partials/Toggle.svelte"
 
   export let publishAt = false
   export let onClose
   export let onSubmit
-  export let initialValues: {
-    warning: string
-    anonymous: boolean
-    pow_difficulty: number
-    publish_at?: number
-  }
+  export let initialValues: Values
 
   const values = {
     ...initialValues,
   }
 
+  const initRelays = () => {
+    values.relays = Router.get().FromUser().getUrls()
+  }
+
   const submit = () =>
     onSubmit({
       ...values,
@@ -58,6 +70,15 @@
         <Toggle bind:value={values.anonymous} />
         <p slot="info">Enable this to create an anonymous note.</p>
       </FieldInline>
+      {#if values.relays}
+        <Field icon="fa-server" label="Relays">
+          <SearchSelect multiple bind:value={values.relays} search={$relaySearch.searchValues} />
+        </Field>
+      {:else}
+        <FieldInline icon="fa-server" label="Relays">
+          <Anchor underline on:click={initRelays}>Select relays</Anchor>
+        </FieldInline>
+      {/if}
       <Anchor button tag="button" type="submit">Done</Anchor>
     </FlexColumn>
   </form>
diff --git a/src/app/shared/NoteReply.svelte b/src/app/shared/NoteReply.svelte
index 6cd90e362..2f7ada77b 100644
--- a/src/app/shared/NoteReply.svelte
+++ b/src/app/shared/NoteReply.svelte
@@ -20,6 +20,7 @@
   import AltColor from "src/partials/AltColor.svelte"
   import Chip from "src/partials/Chip.svelte"
   import EditorContent from "src/app/editor/EditorContent.svelte"
+  import type {Values} from "src/app/shared/NoteOptions.svelte"
   import NoteOptions from "src/app/shared/NoteOptions.svelte"
   import NsecWarning from "src/app/shared/NsecWarning.svelte"
   import {drafts} from "src/app/state"
@@ -42,7 +43,11 @@
   let loading
   let pow: ProofOfWork
   let showOptions = false
-  let options = {warning: "", anonymous: false, pow_difficulty: $userSettings.pow_difficulty}
+  let options: Values = {
+    warning: "",
+    anonymous: false,
+    pow_difficulty: $userSettings.pow_difficulty,
+  }
 
   const bypassNsecWarning = () => {
     nsecWarning.set(null)
@@ -109,9 +114,14 @@
       hashedEvent = await pow.result
     }
 
+    const relays =
+      options.relays?.length > 0
+        ? options.relays
+        : Router.get().PublishEvent(hashedEvent).policy(addMaximalFallbacks).getUrls()
+
     const thunk = publishThunk({
+      relays,
       event: await sign(hashedEvent, options),
-      relays: Router.get().PublishEvent(hashedEvent).policy(addMaximalFallbacks).getUrls(),
       delay: $userSettings.send_delay,
     })
 
diff --git a/src/app/views/NoteCreate.svelte b/src/app/views/NoteCreate.svelte
index 09b9735b6..d1119e16b 100644
--- a/src/app/views/NoteCreate.svelte
+++ b/src/app/views/NoteCreate.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
   import {onMount} from "svelte"
-  import {last} from "@welshman/lib"
+  import {last, dateToSeconds} from "@welshman/lib"
   import {now, own, hash} from "@welshman/signer"
   import type {TrustedEvent} from "@welshman/util"
   import {Router, addMaximalFallbacks} from "@welshman/router"
@@ -35,6 +35,7 @@
   import EditorContent from "src/app/editor/EditorContent.svelte"
   import NsecWarning from "src/app/shared/NsecWarning.svelte"
   import NoteContent from "src/app/shared/NoteContent.svelte"
+  import type {Values} from "src/app/shared/NoteOptions.svelte"
   import NoteOptions from "src/app/shared/NoteOptions.svelte"
   import {makeEditor} from "src/app/editor"
   import {drafts} from "src/app/state"
@@ -112,7 +113,10 @@
     publishing = "signing"
 
     const signedEvent = await sign(hashedEvent, options)
-    const relays = Router.get().PublishEvent(signedEvent).policy(addMaximalFallbacks).getUrls()
+    const relays =
+      options.relays?.length > 0
+        ? options.relays
+        : Router.get().PublishEvent(signedEvent).policy(addMaximalFallbacks).getUrls()
 
     let thunk: Thunk
 
@@ -242,7 +246,7 @@
   let showOptions = false
   let publishing: "signing" | "pow"
   let pow: ProofOfWork
-  let options = {
+  let options: Values = {
     warning: "",
     anonymous: false,
     publish_at: null,
@@ -329,7 +333,7 @@
             {:else}
               <i class="fa fa-circle-notch fa-spin" /> Uploading media...
             {/if}
-          {:else if options?.publish_at && Math.floor(options?.publish_at / 1000) > now()}
+          {:else if options?.publish_at && dateToSeconds(options.publish_at) > now()}
             Schedule
           {:else}
             Send
diff --git a/src/partials/FieldInline.svelte b/src/partials/FieldInline.svelte
index 21072d653..ed5eb07c7 100644
--- a/src/partials/FieldInline.svelte
+++ b/src/partials/FieldInline.svelte
@@ -6,11 +6,11 @@
 <div class="flex flex-col gap-2">
   <slot name="label">
     <div class="grid grid-cols-2 gap-2">
-      <label class="font-bold">
+      <label class="flex items-center gap-2 font-bold">
         {#if icon}
           <i class={`fa ${icon}`} />
         {/if}
-        {label}
+        <span>{label}</span>
       </label>
       <slot />
     </div>

From 00ab81915ab9a65c3718185a969410546265b1b1 Mon Sep 17 00:00:00 2001
From: Jon Staab <shtaab@gmail.com>
Date: Wed, 14 May 2025 13:32:11 -0700
Subject: [PATCH 5/5] Bump version

---
 android/app/build.gradle | 4 ++--
 package.json             | 5 ++---
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/android/app/build.gradle b/android/app/build.gradle
index cceee6bdb..99ec6bb0c 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -7,8 +7,8 @@ android {
         applicationId "social.coracle.app"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 16
-        versionName "0.6.16"
+        versionCode 17
+        versionName "0.6.17"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         aaptOptions {
              // Files and dirs to omit from the packaged assets dir, modified to accommodate modern web apps.
diff --git a/package.json b/package.json
index 758d0e612..d4fd1a4de 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "coracle",
   "private": true,
-  "version": "0.6.16",
+  "version": "0.6.17",
   "type": "module",
   "scripts": {
     "dev": "vite --host",
@@ -41,8 +41,7 @@
     "@tsconfig/svelte": "^5.0.4",
     "@types/throttle-debounce": "^5.0.2",
     "@vite-pwa/assets-generator": "^0.2.6",
-    "@welshman/app": "^0.2.5",
-    "@welshman/content": "^0.2.2",
+    "@welshman/app": "^0.2.5",    "@welshman/content": "^0.2.2",
     "@welshman/dvm": "^0.2.0",
     "@welshman/editor": "^0.2.4",
     "@welshman/feeds": "^0.2.2",