From 5110f21e5cc3bded942b7333ade022af15c54f4a Mon Sep 17 00:00:00 2001
From: Ticruz <thib.duchene@gmail.com>
Date: Thu, 31 Oct 2024 10:16:04 +0100
Subject: [PATCH 01/20] add cancelable delay to reply and create note

---
 src/app/shared/Note.svelte          | 68 +++++++++++++++++++++--------
 src/app/shared/NoteReply.svelte     | 34 +++++++++------
 src/app/shared/PersonCircles.svelte |  3 +-
 src/app/views/NoteCreate.svelte     | 24 ++++++----
 src/app/views/UserSettings.svelte   |  6 +++
 src/engine/state.ts                 |  8 +++-
 src/partials/Toast.svelte           | 21 ++++++++-
 src/util/misc.ts                    |  8 +++-
 8 files changed, 128 insertions(+), 44 deletions(-)

diff --git a/src/app/shared/Note.svelte b/src/app/shared/Note.svelte
index efaddcdfe..444fd8f63 100644
--- a/src/app/shared/Note.svelte
+++ b/src/app/shared/Note.svelte
@@ -12,13 +12,13 @@
     ZAP_RESPONSE,
     getAncestorTagValues,
   } from "@welshman/util"
-  import {repository, deriveZapperForPubkey, deriveZapper} from "@welshman/app"
+  import {repository, deriveZapperForPubkey, deriveZapper, session} from "@welshman/app"
   import {identity, reject, whereEq, uniqBy, prop} from "ramda"
-  import {onMount} from "svelte"
+  import {onDestroy, onMount} from "svelte"
   import {quantify, batch} from "hurdak"
   import {fly, slide} from "src/util/transition"
   import {replyKinds, isLike} from "src/util/nostr"
-  import {formatTimestamp} from "src/util/misc"
+  import {formatTimestamp, timestamp1} from "src/util/misc"
   import Popover from "src/partials/Popover.svelte"
   import AltColor from "src/partials/AltColor.svelte"
   import Spinner from "src/partials/Spinner.svelte"
@@ -40,7 +40,9 @@
     userMutes,
     getSetting,
     sortEventsDesc,
+    type Pub,
   } from "src/engine"
+  import {writable} from "svelte/store"
 
   export let note
   export let relays = []
@@ -105,9 +107,23 @@
   }
 
   const addToContext = events => {
+    console.log("add to context", events)
+    // add an ephemeral status to the events
+    events.status = "loaded"
     context = context.concat(events)
   }
 
+  const addDraftStatus = (pub: Pub) => {
+    console.log("add draft status", pub)
+    context = context.map(c => {
+      if (c.id === "draft") {
+        return {...c, pub}
+      } else {
+        return c
+      }
+    })
+  }
+
   $: ancestors = getAncestorTagValues(event.tags || [])
   $: reply = ancestors.replies[0]
   $: root = ancestors.roots[0]
@@ -118,10 +134,11 @@
 
   // Find children in our context
   $: children = context.filter(e => isChildOf(e, event))
-
   // Sort our replies
   $: replies = sortEventsDesc(children.filter(e => replyKinds.includes(e.kind)))
 
+  $: console.log(children, replies)
+
   let mutedReplies, hiddenReplies, visibleReplies
 
   $: {
@@ -134,13 +151,15 @@
         mutedReplies.push(e)
       } else if (collapsed) {
         hiddenReplies.push(e)
-      } else if (!showHiddenReplies && filters && !matchFilters(filters, e)) {
+      } else if (!showHiddenReplies && filters && !matchFilters(filters, e) && e.id !== "draft") {
         hiddenReplies.push(e)
       } else {
         visibleReplies.push(e)
       }
     }
 
+    console.log(mutedReplies, hiddenReplies, visibleReplies)
+
     if (depth === 0) {
       mutedReplies.splice(0)
       hiddenReplies.splice(0)
@@ -284,18 +303,32 @@
                 <NoteContent note={event} {showEntire} {showMedia} />
               {/if}
               <div class="cy-note-click-target h-[2px]" />
-              <NoteActions
-                note={event}
-                zapper={$zapper}
-                bind:this={actions}
-                {removeFromContext}
-                {addToContext}
-                {replyCtrl}
-                {showHidden}
-                {replies}
-                {likes}
-                {zaps}
-                {muted} />
+              {#if event.status != "loaded"}
+                <NoteActions
+                  note={event}
+                  zapper={$zapper}
+                  bind:this={actions}
+                  {removeFromContext}
+                  {addToContext}
+                  {replyCtrl}
+                  {showHidden}
+                  {replies}
+                  {likes}
+                  {zaps}
+                  {muted} />
+              {:else}
+                <div class="flex h-6 w-full justify-between rounded-md bg-accent pl-4">
+                  {#if event.pub}
+                    Publishiiiing
+                  {:else}
+                    Sending reply in {event.created_at + 5 - $timestamp1} seconds
+
+                    <button
+                      class="ml-2 cursor-pointer rounded-r-md bg-neutral-100-d px-4 text-tinted-700-d"
+                      >Cancel</button>
+                  {/if}
+                </div>
+              {/if}
             </div>
           </div>
         </Card>
@@ -328,6 +361,7 @@
 
       <NoteReply
         {addToContext}
+        {addDraftStatus}
         parent={event}
         showBorder={visibleReplies.length > 0}
         bind:this={replyCtrl}
diff --git a/src/app/shared/NoteReply.svelte b/src/app/shared/NoteReply.svelte
index 732829a8c..5412e5f8e 100644
--- a/src/app/shared/NoteReply.svelte
+++ b/src/app/shared/NoteReply.svelte
@@ -1,10 +1,11 @@
 <script lang="ts">
-  import {writable, type Writable} from "svelte/store"
+  import {session, displayProfileByPubkey, tagReplyTo, tagPubkey} from "@welshman/app"
+  import {ctx} from "@welshman/lib"
   import {Tags, createEvent, uniqTags} from "@welshman/util"
+  import {writable, type Writable} from "svelte/store"
   import {createEventDispatcher} from "svelte"
+  import {Editor} from "svelte-tiptap"
   import {without, uniq} from "ramda"
-  import {ctx} from "@welshman/lib"
-  import {session, displayProfileByPubkey, tagReplyTo, tagPubkey} from "@welshman/app"
   import {slide} from "src/util/transition"
   import {showPublishInfo} from "src/partials/Toast.svelte"
   import AltColor from "src/partials/AltColor.svelte"
@@ -13,12 +14,12 @@
   import Compose from "src/app/shared/Compose.svelte"
   import NsecWarning from "src/app/shared/NsecWarning.svelte"
   import NoteOptions from "src/app/shared/NoteOptions.svelte"
-  import {publish, tagsFromContent, getClientTags, signAndPublish} from "src/engine"
   import {drafts} from "src/app/state"
-  import {Editor} from "svelte-tiptap"
+  import {publish, tagsFromContent, getClientTags, signAndPublish} from "src/engine"
 
   export let parent
   export let addToContext
+  export let addDraftStatus
   export let showBorder = false
   export let forceOpen = false
 
@@ -103,15 +104,20 @@
     loading = true
 
     const template = createEvent(1, {content, tags})
-    const pub = await signAndPublish(template, opts)
-
-    loading = false
-
-    // Only track one event/pub to avoid apprent duplicates
-    addToContext(pub.request.event)
-    showPublishInfo(pub)
-    clearDraft()
-    reset()
+    const event = await sign(template, {anonymous: false})
+    console.log("event", event)
+    addToContext({...event, id: "draft"})
+    isOpen = false
+    setTimeout(async () => {
+      const {pubs, events} = await signAndPublish(template, opts)
+      console.log("pubs", pubs, events)
+      addDraftStatus(events[0])
+
+      // Only track one event/pub to avoid apprent duplicates
+      // showPublishInfo(pubs[0])
+      clearDraft()
+      reset()
+    }, 5000)
   }
 
   const onBodyClick = e => {
diff --git a/src/app/shared/PersonCircles.svelte b/src/app/shared/PersonCircles.svelte
index 9f3e24d84..39c7e4f7d 100644
--- a/src/app/shared/PersonCircles.svelte
+++ b/src/app/shared/PersonCircles.svelte
@@ -1,4 +1,5 @@
 <script lang="ts">
+  import {uniq} from "@welshman/lib"
   import cx from "classnames"
   import PersonCircle from "src/app/shared/PersonCircle.svelte"
 
@@ -8,7 +9,7 @@
 </script>
 
 <div class="flex pr-3">
-  {#each pubkeys.slice(0, 15) as pubkey (pubkey)}
+  {#each uniq(pubkeys).slice(0, 15) as pubkey (pubkey)}
     <div class="z-feature -mr-3 inline-block">
       <PersonCircle class={cx(klass, "border border-solid border-neutral-800")} {pubkey} />
     </div>
diff --git a/src/app/views/NoteCreate.svelte b/src/app/views/NoteCreate.svelte
index d0834a649..7c8bd5c3f 100644
--- a/src/app/views/NoteCreate.svelte
+++ b/src/app/views/NoteCreate.svelte
@@ -1,11 +1,14 @@
 <script lang="ts">
   import {onMount} from "svelte"
   import {whereEq} from "ramda"
-  import {commaFormat, toTitle, switcherFn} from "hurdak"
-  import {writable, type Writable} from "svelte/store"
   import {ctx, last, now} from "@welshman/lib"
   import {createEvent} from "@welshman/util"
   import {session, tagPubkey} from "@welshman/app"
+  import {commaFormat, toTitle, switcherFn} from "hurdak"
+  import {writable, type Writable} from "svelte/store"
+  import {Editor} from "svelte-tiptap"
+  import {nip19} from "nostr-tools"
+  import {v4 as uuid} from "uuid"
   import Anchor from "src/partials/Anchor.svelte"
   import Content from "src/partials/Content.svelte"
   import Chip from "src/partials/Chip.svelte"
@@ -25,12 +28,9 @@
   import NoteOptions from "src/app/shared/NoteOptions.svelte"
   import {getEditorOptions} from "src/app/editor"
   import {router} from "src/app/util/router"
-  import {getClientTags, signAndPublish, tagsFromContent} from "src/engine"
   import {dateToSeconds} from "src/util/misc"
   import {currencyOptions} from "src/util/i18n"
-  import {Editor} from "svelte-tiptap"
-  import {nip19} from "nostr-tools"
-  import {v4 as uuid} from "uuid"
+  import {getClientTags, signAndPublish, tagsFromContent} from "src/engine"
 
   export let type = "note"
   export let quote = null
@@ -140,10 +140,16 @@
         }),
     })
 
-    const pub = await signAndPublish(template, opts)
+    let cancel = false
+
+    showInfo("", {type: "delay", onCancel: () => (cancel = true)})
 
-    showPublishInfo(pub)
-    router.clearModals()
+    setTimeout(async () => {
+      if (cancel) return
+      const pub = await signAndPublish(template, opts)
+      showPublishInfo(pub)
+      router.clearModals()
+    }, $userSettings.undo_delay * 1000)
   }
 
   const togglePreview = () => {
diff --git a/src/app/views/UserSettings.svelte b/src/app/views/UserSettings.svelte
index 2423fb89b..3bd124d62 100644
--- a/src/app/views/UserSettings.svelte
+++ b/src/app/views/UserSettings.svelte
@@ -55,6 +55,12 @@
         How much you'd like to tip the developer of {appName} whenever you send a zap.
       </p>
     </Field>
+    <Field label="Undo Delay">
+      <Input type="number" bind:value={values.undo_delay}>
+        <i slot="before" class="fa fa-hourglass-half" />
+      </Input>
+      <p slot="info">A delay period allowing you to cancel a reply or note creation, in seconds.</p>
+    </Field>
     <Field>
       <div slot="label" class="flex justify-between">
         <strong>Max relays per request</strong>
diff --git a/src/engine/state.ts b/src/engine/state.ts
index 29b76b67b..e9152f1d6 100644
--- a/src/engine/state.ts
+++ b/src/engine/state.ts
@@ -226,6 +226,7 @@ export const defaultSettings = {
   relay_limit: 5,
   default_zap: 21,
   show_media: true,
+  undo_delay: 0, // undo send delay in seconds
   muted_words: [],
   hide_sensitive: true,
   report_analytics: true,
@@ -770,6 +771,8 @@ const shouldTrackPublish = (event: TrustedEvent) => {
   return event.pubkey === pubkey.get() || canUnwrap(event)
 }
 
+export type Pub = ReturnType<typeof basePublish>
+
 export const publish = async ({forcePlatform = true, ...request}: MyPublishRequest) => {
   request.relays = forcePlatform
     ? forcePlatformRelays(request.relays)
@@ -801,7 +804,10 @@ export const publish = async ({forcePlatform = true, ...request}: MyPublishReque
   return pub
 }
 
-export const sign = (template, opts: {anonymous?: boolean; sk?: string} = {}) => {
+export const sign = (
+  template,
+  opts: {anonymous?: boolean; sk?: string} = {},
+): Promise<SignedEvent> => {
   if (opts.anonymous) {
     return Nip01Signer.ephemeral().sign(template)
   }
diff --git a/src/partials/Toast.svelte b/src/partials/Toast.svelte
index ed8daefb9..c75bd7529 100644
--- a/src/partials/Toast.svelte
+++ b/src/partials/Toast.svelte
@@ -11,7 +11,7 @@
     timeout = 5,
     ...opts
   }) => {
-    toast.set({id, type, theme, ...opts})
+    toast.set({id, type, theme, timeout, ...opts})
 
     if (timeout) {
       setTimeout(() => {
@@ -43,6 +43,7 @@
   import cx from "classnames"
   import {fly} from "src/util/transition"
   import Anchor from "src/partials/Anchor.svelte"
+  import {onDestroy} from "svelte"
 
   let touchStart = 0
   let startOffset = 0
@@ -50,6 +51,8 @@
 
   $: offset = currentOffset - startOffset
 
+  $: timeLeft = $toast?.timeout || 0
+
   const onTouchStart = e => {
     touchStart = Date.now()
     startOffset = e.touches[0].clientX
@@ -75,6 +78,16 @@
       currentOffset = 0
     }, 200)
   }
+
+  $: console.log($toast, timeLeft)
+
+  const timeInterval = setInterval(() => {
+    timeLeft > 0 && timeLeft--
+  }, 1000)
+
+  onDestroy(() => {
+    clearInterval(timeInterval)
+  })
 </script>
 
 {#if $toast}
@@ -97,6 +110,12 @@
         )}>
         {#if $toast.type === "text"}
           {$toast.message}
+        {:else if $toast.type === "delay"}
+          Sending in {timeLeft} seconds...
+          <Anchor
+            class="ml-3 inline-flex"
+            button
+            on:click={() => $toast.onCancel() && toast.set(null)}>Cancel</Anchor>
         {:else if $toast.type === "publish"}
           {@const {status, request} = $toast.pub}
           {@const total = request.relays.length}
diff --git a/src/util/misc.ts b/src/util/misc.ts
index 4d002d574..bd372a45d 100644
--- a/src/util/misc.ts
+++ b/src/util/misc.ts
@@ -1,11 +1,17 @@
 import {throttle} from "throttle-debounce"
-import {writable} from "svelte/store"
+import {derived, writable, type Readable} from "svelte/store"
 import {now, stripProtocol, isPojo, first, sleep} from "@welshman/lib"
 import {pluck, fromPairs, last, identity, sum, is} from "ramda"
 import {Storage, ensurePlural, seconds, tryFunc, round} from "hurdak"
 import Fuse from "fuse.js"
 import logger from "src/util/logger"
 
+export const timestamp1: Readable<number> = derived([], (_, set) => {
+  setInterval(() => {
+    set(Math.floor(Date.now() / 1000))
+  }, 1000)
+})
+
 export const secondsToDate = ts => new Date(parseInt(ts) * 1000)
 
 export const dateToSeconds = date => Math.round(date.valueOf() / 1000)

From 77b23a4f30bed5c588f1f7ea5ad565b6b0a9cd4b Mon Sep 17 00:00:00 2001
From: Ticruz <thib.duchene@gmail.com>
Date: Thu, 31 Oct 2024 16:35:55 +0100
Subject: [PATCH 02/20] final tweaks

---
 src/app/shared/Note.svelte        | 56 ++++++++-------------
 src/app/shared/NotePending.svelte | 83 +++++++++++++++++++++++++++++++
 src/app/shared/NoteReply.svelte   |  9 ++--
 src/app/views/NoteCreate.svelte   |  1 +
 4 files changed, 110 insertions(+), 39 deletions(-)
 create mode 100644 src/app/shared/NotePending.svelte

diff --git a/src/app/shared/Note.svelte b/src/app/shared/Note.svelte
index 444fd8f63..d03d16343 100644
--- a/src/app/shared/Note.svelte
+++ b/src/app/shared/Note.svelte
@@ -14,7 +14,7 @@
   } from "@welshman/util"
   import {repository, deriveZapperForPubkey, deriveZapper, session} from "@welshman/app"
   import {identity, reject, whereEq, uniqBy, prop} from "ramda"
-  import {onDestroy, onMount} from "svelte"
+  import {onMount} from "svelte"
   import {quantify, batch} from "hurdak"
   import {fly, slide} from "src/util/transition"
   import {replyKinds, isLike} from "src/util/nostr"
@@ -40,9 +40,9 @@
     userMutes,
     getSetting,
     sortEventsDesc,
-    type Pub,
   } from "src/engine"
-  import {writable} from "svelte/store"
+
+  import NotePending from "./NotePending.svelte"
 
   export let note
   export let relays = []
@@ -103,25 +103,21 @@
       .open()
 
   const removeFromContext = e => {
+    console.log("remove from context", e)
     context = reject(whereEq({id: e.id}), context)
   }
 
-  const addToContext = events => {
-    console.log("add to context", events)
-    // add an ephemeral status to the events
-    events.status = "loaded"
-    context = context.concat(events)
+  const addDraftToContext = (event, cb) => {
+    event.status = "draft"
+    event.remove = () => {
+      cb()
+      removeFromContext(event)
+    }
+    context = context.concat(event)
   }
 
-  const addDraftStatus = (pub: Pub) => {
-    console.log("add draft status", pub)
-    context = context.map(c => {
-      if (c.id === "draft") {
-        return {...c, pub}
-      } else {
-        return c
-      }
-    })
+  const addToContext = (event, cb) => {
+    context = context.concat(event)
   }
 
   $: ancestors = getAncestorTagValues(event.tags || [])
@@ -151,15 +147,18 @@
         mutedReplies.push(e)
       } else if (collapsed) {
         hiddenReplies.push(e)
-      } else if (!showHiddenReplies && filters && !matchFilters(filters, e) && e.id !== "draft") {
+      } else if (
+        !showHiddenReplies &&
+        filters &&
+        !matchFilters(filters, e) &&
+        e.status !== "draft"
+      ) {
         hiddenReplies.push(e)
       } else {
         visibleReplies.push(e)
       }
     }
 
-    console.log(mutedReplies, hiddenReplies, visibleReplies)
-
     if (depth === 0) {
       mutedReplies.splice(0)
       hiddenReplies.splice(0)
@@ -303,7 +302,7 @@
                 <NoteContent note={event} {showEntire} {showMedia} />
               {/if}
               <div class="cy-note-click-target h-[2px]" />
-              {#if event.status != "loaded"}
+              {#if event.status !== "draft" || event.created_at < $timestamp1 - 45}
                 <NoteActions
                   note={event}
                   zapper={$zapper}
@@ -317,17 +316,7 @@
                   {zaps}
                   {muted} />
               {:else}
-                <div class="flex h-6 w-full justify-between rounded-md bg-accent pl-4">
-                  {#if event.pub}
-                    Publishiiiing
-                  {:else}
-                    Sending reply in {event.created_at + 5 - $timestamp1} seconds
-
-                    <button
-                      class="ml-2 cursor-pointer rounded-r-md bg-neutral-100-d px-4 text-tinted-700-d"
-                      >Cancel</button>
-                  {/if}
-                </div>
+                <NotePending {event} />
               {/if}
             </div>
           </div>
@@ -360,8 +349,7 @@
       {/if}
 
       <NoteReply
-        {addToContext}
-        {addDraftStatus}
+        {addDraftToContext}
         parent={event}
         showBorder={visibleReplies.length > 0}
         bind:this={replyCtrl}
diff --git a/src/app/shared/NotePending.svelte b/src/app/shared/NotePending.svelte
new file mode 100644
index 000000000..5d5f5054a
--- /dev/null
+++ b/src/app/shared/NotePending.svelte
@@ -0,0 +1,83 @@
+<style>
+  .loading-bar {
+    position: absolute;
+    top: 0;
+    left: 0;
+    height: 100%;
+  }
+
+  div.loading-bar::after {
+    content: "";
+    position: absolute;
+    top: 0;
+    right: -50px;
+    width: 50px;
+    height: 100%;
+    background: linear-gradient(to left, rgba(0, 0, 0, 0), var(--accent));
+  }
+
+  .loading-bar-content > * {
+    z-index: 1;
+  }
+</style>
+
+<script lang="ts">
+  import type {SignedEvent} from "@welshman/util"
+  import {publishes, userSettings, type Pub} from "src/engine"
+  import Anchor from "src/partials/Anchor.svelte"
+  import {timestamp1} from "src/util/misc"
+  import {spring} from "svelte/motion"
+
+  export let event: SignedEvent & {
+    status: string
+    remove: () => void
+  }
+
+  $: pub = Object.values($publishes).find(p => p.request.event.id === event.id)
+
+  $: pendings = Array.from(pub?.status?.values() || []).filter(s => s === "pending" || !s).length
+  $: failed = Array.from(pub?.status?.values() || []).filter(
+    s => s === "failure" || s === "aborted",
+  ).length
+  $: timeout = Array.from(pub?.status?.values() || []).filter(s => s === "timeout").length
+  $: success = Array.from(pub?.status?.values() || []).filter(s => s === "success").length
+  $: total = pub?.request?.relays.length || 0
+
+  let completed = spring(0)
+
+  $: {
+    if (pub) {
+      $completed = ((total - pendings) / total) * 100
+    }
+  }
+
+  $: isPending = pendings > 0
+</script>
+
+<div
+  class="loading-bar-content relative flex h-6 w-full items-center justify-between overflow-hidden rounded-md pl-4 text-sm"
+  class:border={!pub}
+  on:click|stopPropagation>
+  {#if pub}
+    <div class="loading-bar bg-accent" style="width: {$completed}%"></div>
+    {#if isPending}
+      <span>Publishing...</span>
+      <span>{total - pendings} of {total} relays</span>
+    {:else}
+      <span>Published to {success}/{total} ({failed} failed, {timeout} timed out)</span>
+      <Anchor
+        class="staatliches z-feature rounded-r-md bg-tinted-100-d px-4 py-1 uppercase text-tinted-700-d"
+        modal
+        href="/publishes">See details</Anchor>
+    {/if}
+  {:else}
+    <span
+      >Sending reply in {event.created_at + $userSettings.undo_delay - $timestamp1} seconds</span>
+
+    <button
+      class="ml-2 cursor-pointer rounded-md bg-neutral-100-d px-4 py-1 text-tinted-700-d"
+      on:click={() => {
+        event.remove()
+      }}>Cancel</button>
+  {/if}
+</div>
diff --git a/src/app/shared/NoteReply.svelte b/src/app/shared/NoteReply.svelte
index 5412e5f8e..77510e0fc 100644
--- a/src/app/shared/NoteReply.svelte
+++ b/src/app/shared/NoteReply.svelte
@@ -18,8 +18,7 @@
   import {publish, tagsFromContent, getClientTags, signAndPublish} from "src/engine"
 
   export let parent
-  export let addToContext
-  export let addDraftStatus
+  export let addDraftToContext
   export let showBorder = false
   export let forceOpen = false
 
@@ -105,8 +104,8 @@
 
     const template = createEvent(1, {content, tags})
     const event = await sign(template, {anonymous: false})
-    console.log("event", event)
-    addToContext({...event, id: "draft"})
+    let canceled = false
+    addDraftToContext(event, () => (canceled = true))
     isOpen = false
     setTimeout(async () => {
       const {pubs, events} = await signAndPublish(template, opts)
@@ -117,7 +116,7 @@
       // showPublishInfo(pubs[0])
       clearDraft()
       reset()
-    }, 5000)
+    }, $userSettings.undo_delay * 1000)
   }
 
   const onBodyClick = e => {
diff --git a/src/app/views/NoteCreate.svelte b/src/app/views/NoteCreate.svelte
index 7c8bd5c3f..839945b91 100644
--- a/src/app/views/NoteCreate.svelte
+++ b/src/app/views/NoteCreate.svelte
@@ -144,6 +144,7 @@
 
     showInfo("", {type: "delay", onCancel: () => (cancel = true)})
 
+    router.clearModals()
     setTimeout(async () => {
       if (cancel) return
       const pub = await signAndPublish(template, opts)

From d7a6777cf4a73749a1fff46bc70d5fef0f62b491 Mon Sep 17 00:00:00 2001
From: Ticruz <thib.duchene@gmail.com>
Date: Wed, 6 Nov 2024 12:09:55 +0100
Subject: [PATCH 03/20] remove note state from event object

---
 src/app/shared/Note.svelte        | 25 ++++++++++++-------------
 src/app/shared/NotePending.svelte |  8 +++-----
 2 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/src/app/shared/Note.svelte b/src/app/shared/Note.svelte
index d03d16343..6897aee7f 100644
--- a/src/app/shared/Note.svelte
+++ b/src/app/shared/Note.svelte
@@ -30,6 +30,7 @@
   import NoteReply from "src/app/shared/NoteReply.svelte"
   import NoteActions from "src/app/shared/NoteActions.svelte"
   import NoteContent from "src/app/shared/NoteContent.svelte"
+  import NotePending from "src/app/shared/NotePending.svelte"
   import {router} from "src/app/util/router"
   import {
     env,
@@ -42,8 +43,6 @@
     sortEventsDesc,
   } from "src/engine"
 
-  import NotePending from "./NotePending.svelte"
-
   export let note
   export let relays = []
   export let filters = null
@@ -52,6 +51,8 @@
   export let anchor = null
   export let topLevel = false
   export let isLastReply = false
+  export let isDraft = false
+  export let removeDraftCb = null
   export let showParent = true
   export let showLoading = false
   export let showHidden = false
@@ -66,6 +67,8 @@
   let collapsed = depth === 0
   let context = repository.query([{"#e": [event.id]}]).filter(e => isChildOf(e, event))
   let showHiddenReplies = anchor === getIdOrAddress(event)
+  let draftEventId: string
+  let removeDraft: () => void
 
   const showEntire = showHiddenReplies
   const interactive = !anchor || !showEntire
@@ -103,16 +106,12 @@
       .open()
 
   const removeFromContext = e => {
-    console.log("remove from context", e)
     context = reject(whereEq({id: e.id}), context)
   }
 
   const addDraftToContext = (event, cb) => {
-    event.status = "draft"
-    event.remove = () => {
-      cb()
-      removeFromContext(event)
-    }
+    draftEventId = event.id
+    removeDraft = () => cb() && removeFromContext(event)
     context = context.concat(event)
   }
 
@@ -133,8 +132,6 @@
   // Sort our replies
   $: replies = sortEventsDesc(children.filter(e => replyKinds.includes(e.kind)))
 
-  $: console.log(children, replies)
-
   let mutedReplies, hiddenReplies, visibleReplies
 
   $: {
@@ -151,7 +148,7 @@
         !showHiddenReplies &&
         filters &&
         !matchFilters(filters, e) &&
-        e.status !== "draft"
+        draftEventId !== e.id
       ) {
         hiddenReplies.push(e)
       } else {
@@ -302,7 +299,7 @@
                 <NoteContent note={event} {showEntire} {showMedia} />
               {/if}
               <div class="cy-note-click-target h-[2px]" />
-              {#if event.status !== "draft" || event.created_at < $timestamp1 - 45}
+              {#if !isDraft || event.created_at < $timestamp1 - 45}
                 <NoteActions
                   note={event}
                   zapper={$zapper}
@@ -316,7 +313,7 @@
                   {zaps}
                   {muted} />
               {:else}
-                <NotePending {event} />
+                <NotePending {event} removeDraft={removeDraftCb} />
               {/if}
             </div>
           </div>
@@ -391,6 +388,8 @@
                     isLastReply={i === visibleReplies.length - 1}
                     showParent={false}
                     showHidden
+                    isDraft={r.id === draftEventId}
+                    removeDraftCb={removeDraft}
                     note={r}
                     depth={depth - 1}
                     {filters}
diff --git a/src/app/shared/NotePending.svelte b/src/app/shared/NotePending.svelte
index 5d5f5054a..fe028c345 100644
--- a/src/app/shared/NotePending.svelte
+++ b/src/app/shared/NotePending.svelte
@@ -28,10 +28,8 @@
   import {timestamp1} from "src/util/misc"
   import {spring} from "svelte/motion"
 
-  export let event: SignedEvent & {
-    status: string
-    remove: () => void
-  }
+  export let event: SignedEvent
+  export let removeDraft: () => void
 
   $: pub = Object.values($publishes).find(p => p.request.event.id === event.id)
 
@@ -77,7 +75,7 @@
     <button
       class="ml-2 cursor-pointer rounded-md bg-neutral-100-d px-4 py-1 text-tinted-700-d"
       on:click={() => {
-        event.remove()
+        removeDraft()
       }}>Cancel</button>
   {/if}
 </div>

From 5c925294e8ba209ded4eb26cba29b982cb3c5b13 Mon Sep 17 00:00:00 2001
From: Ticruz <thib.duchene@gmail.com>
Date: Wed, 6 Nov 2024 12:10:15 +0100
Subject: [PATCH 04/20] clearInterval on store

---
 src/util/misc.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/util/misc.ts b/src/util/misc.ts
index bd372a45d..04350a592 100644
--- a/src/util/misc.ts
+++ b/src/util/misc.ts
@@ -7,9 +7,10 @@ import Fuse from "fuse.js"
 import logger from "src/util/logger"
 
 export const timestamp1: Readable<number> = derived([], (_, set) => {
-  setInterval(() => {
+  const interval = setInterval(() => {
     set(Math.floor(Date.now() / 1000))
   }, 1000)
+  return () => clearInterval(interval)
 })
 
 export const secondsToDate = ts => new Date(parseInt(ts) * 1000)

From a08831908aea9bad0dd2e9174147ad9571654f3b Mon Sep 17 00:00:00 2001
From: Ticruz <thib.duchene@gmail.com>
Date: Wed, 6 Nov 2024 16:26:16 +0100
Subject: [PATCH 05/20] format and check

---
 .husky/pre-commit                 | 2 +-
 src/app/shared/Note.svelte        | 2 +-
 src/app/shared/NotePending.svelte | 4 ++--
 src/partials/Toast.svelte         | 6 +-----
 4 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/.husky/pre-commit b/.husky/pre-commit
index 0ad376d97..ae18f3c86 100644
--- a/.husky/pre-commit
+++ b/.husky/pre-commit
@@ -1 +1 @@
-npm run check
+npm run format && npm run check
diff --git a/src/app/shared/Note.svelte b/src/app/shared/Note.svelte
index 6897aee7f..2906d9278 100644
--- a/src/app/shared/Note.svelte
+++ b/src/app/shared/Note.svelte
@@ -12,7 +12,7 @@
     ZAP_RESPONSE,
     getAncestorTagValues,
   } from "@welshman/util"
-  import {repository, deriveZapperForPubkey, deriveZapper, session} from "@welshman/app"
+  import {repository, deriveZapperForPubkey, deriveZapper} from "@welshman/app"
   import {identity, reject, whereEq, uniqBy, prop} from "ramda"
   import {onMount} from "svelte"
   import {quantify, batch} from "hurdak"
diff --git a/src/app/shared/NotePending.svelte b/src/app/shared/NotePending.svelte
index fe028c345..9c66149bd 100644
--- a/src/app/shared/NotePending.svelte
+++ b/src/app/shared/NotePending.svelte
@@ -23,7 +23,7 @@
 
 <script lang="ts">
   import type {SignedEvent} from "@welshman/util"
-  import {publishes, userSettings, type Pub} from "src/engine"
+  import {publishes, userSettings} from "src/engine"
   import Anchor from "src/partials/Anchor.svelte"
   import {timestamp1} from "src/util/misc"
   import {spring} from "svelte/motion"
@@ -41,7 +41,7 @@
   $: success = Array.from(pub?.status?.values() || []).filter(s => s === "success").length
   $: total = pub?.request?.relays.length || 0
 
-  let completed = spring(0)
+  const completed = spring(0)
 
   $: {
     if (pub) {
diff --git a/src/partials/Toast.svelte b/src/partials/Toast.svelte
index c75bd7529..c92da02fd 100644
--- a/src/partials/Toast.svelte
+++ b/src/partials/Toast.svelte
@@ -79,11 +79,7 @@
     }, 200)
   }
 
-  $: console.log($toast, timeLeft)
-
-  const timeInterval = setInterval(() => {
-    timeLeft > 0 && timeLeft--
-  }, 1000)
+  const timeInterval = setInterval(() => timeLeft > 0 && timeLeft--, 1000)
 
   onDestroy(() => {
     clearInterval(timeInterval)

From 6f5890f50083589b14d996e274fa9cdc70671cac Mon Sep 17 00:00:00 2001
From: Ticruz <thib.duchene@gmail.com>
Date: Wed, 6 Nov 2024 16:19:07 +0100
Subject: [PATCH 06/20] missing a status or a callback

---
 src/app/views/NoteCreate.svelte | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/app/views/NoteCreate.svelte b/src/app/views/NoteCreate.svelte
index 839945b91..22a564db6 100644
--- a/src/app/views/NoteCreate.svelte
+++ b/src/app/views/NoteCreate.svelte
@@ -142,7 +142,20 @@
 
     let cancel = false
 
-    showInfo("", {type: "delay", onCancel: () => (cancel = true)})
+    const thunk = publishThunk({
+      event: template,
+      relays: ctx.app.router.PublishEvent(template).getUrls(),
+      delay: $userSettings.undo_delay * 1000,
+    })
+
+    thunk.status.subscribe(status => {
+      if (status !== PublishStatus.Pending) {
+        cancel = true
+        router.clearModals()
+      }
+    })
+
+    showInfo("", {type: "delay", onCancel: () => thunk.controller.abort()})
 
     router.clearModals()
     setTimeout(async () => {

From 290508961a6dd3e75b3cc0f82d7698a9f5083ca0 Mon Sep 17 00:00:00 2001
From: Ticruz <thib.duchene@gmail.com>
Date: Wed, 6 Nov 2024 16:19:13 +0100
Subject: [PATCH 07/20] missing import

---
 src/app/views/NoteCreate.svelte | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/app/views/NoteCreate.svelte b/src/app/views/NoteCreate.svelte
index 22a564db6..12fa19109 100644
--- a/src/app/views/NoteCreate.svelte
+++ b/src/app/views/NoteCreate.svelte
@@ -149,10 +149,10 @@
     })
 
     thunk.status.subscribe(status => {
-      if (status !== PublishStatus.Pending) {
-        cancel = true
-        router.clearModals()
-      }
+      // if (status !== PublishStatus.Pending) {
+      //   cancel = true
+      //   router.clearModals()
+      // }
     })
 
     showInfo("", {type: "delay", onCancel: () => thunk.controller.abort()})

From e1020c32ca35d3e0159b9b02e59d4b870f3fb5f6 Mon Sep 17 00:00:00 2001
From: Ticruz <thib.duchene@gmail.com>
Date: Mon, 11 Nov 2024 19:24:14 +0100
Subject: [PATCH 08/20] use thunk for NoteCreate

---
 src/app/views/NoteCreate.svelte | 32 ++++++++++++++------------------
 src/engine/state.ts             | 26 ++++++++------------------
 src/partials/ThunkStatus.svelte | 16 ++++++++++++++++
 src/partials/Toast.svelte       | 16 ++++++++--------
 4 files changed, 46 insertions(+), 44 deletions(-)
 create mode 100644 src/partials/ThunkStatus.svelte

diff --git a/src/app/views/NoteCreate.svelte b/src/app/views/NoteCreate.svelte
index 12fa19109..a3ed63dcb 100644
--- a/src/app/views/NoteCreate.svelte
+++ b/src/app/views/NoteCreate.svelte
@@ -139,31 +139,27 @@
           ],
         }),
     })
-
-    let cancel = false
-
-    const thunk = publishThunk({
+    const thunk = publish({
       event: template,
       relays: ctx.app.router.PublishEvent(template).getUrls(),
       delay: $userSettings.undo_delay * 1000,
     })
 
-    thunk.status.subscribe(status => {
-      // if (status !== PublishStatus.Pending) {
-      //   cancel = true
-      //   router.clearModals()
-      // }
+    showToast({
+      type: "delay",
+      timeout: $userSettings.undo_delay,
+      onCancel: () => thunk.controller.abort(),
     })
 
-    showInfo("", {type: "delay", onCancel: () => thunk.controller.abort()})
-
-    router.clearModals()
-    setTimeout(async () => {
-      if (cancel) return
-      const pub = await signAndPublish(template, opts)
-      showPublishInfo(pub)
-      router.clearModals()
-    }, $userSettings.undo_delay * 1000)
+    thunk.status.subscribe(status => {
+      if (
+        Object.values(status).length === thunk.request.relays.length &&
+        Object.values(status).every(s => s.status === PublishStatus.Pending)
+      ) {
+        showPublishInfo(thunk)
+        router.clearModals()
+      }
+    })
   }
 
   const togglePreview = () => {
diff --git a/src/engine/state.ts b/src/engine/state.ts
index e9152f1d6..ae2cbc54e 100644
--- a/src/engine/state.ts
+++ b/src/engine/state.ts
@@ -1,4 +1,4 @@
-import type {PartialSubscribeRequest} from "@welshman/app"
+import type {PartialSubscribeRequest, Thunk} from "@welshman/app"
 import {
   subscribe as baseSubscribe,
   db,
@@ -21,6 +21,7 @@ import {
   mutesByPubkey,
   plaintext,
   pubkey,
+  publishThunk,
   relay,
   relays,
   repository,
@@ -159,6 +160,7 @@ export const hasNip44 = derived(signer, $signer => Boolean($signer?.nip44))
 
 export const anonymous = withGetter(writable<AnonymousUserState>({follows: [], relays: []}))
 export const publishes = withGetter(writable<Record<string, PublishInfo>>({}))
+export const thunks = writable<Record<string, Thunk>>({})
 
 export const projections = new Worker<TrustedEvent>({
   getKey: prop("kind"),
@@ -763,6 +765,7 @@ export const load = (request: MySubscribeRequest) =>
 
 export type MyPublishRequest = PublishRequest & {
   forcePlatform?: boolean
+  delay?: number
 }
 
 const shouldTrackPublish = (event: TrustedEvent) => {
@@ -773,7 +776,7 @@ const shouldTrackPublish = (event: TrustedEvent) => {
 
 export type Pub = ReturnType<typeof basePublish>
 
-export const publish = async ({forcePlatform = true, ...request}: MyPublishRequest) => {
+export const publish = ({forcePlatform = true, ...request}: MyPublishRequest) => {
   request.relays = forcePlatform
     ? forcePlatformRelays(request.relays)
     : withPlatformRelays(request.relays)
@@ -784,24 +787,11 @@ export const publish = async ({forcePlatform = true, ...request}: MyPublishReque
 
   logger.info(`Publishing event`, request)
 
-  // Make sure the event is decrypted before updating stores
-  if (canUnwrap(request.event)) {
-    await ensureUnwrapped(request.event)
-  } else if (projections.handlers.get(request.event.kind)?.includes(ensurePlaintext)) {
-    await ensurePlaintext(request.event)
-  }
-
-  // Publish to local and remote relays
-  const pub = basePublish(request)
+  const thunk = publishThunk(request)
 
-  // Listen to updates and update our publish queue
-  if (shouldTrackPublish(request.event)) {
-    const pubInfo = omit(["emitter", "result"], pub)
-
-    pub.emitter.on("*", t => publishes.update(assoc(pubInfo.id, pubInfo)))
-  }
+  thunks.update(assoc(request.event.id, thunk))
 
-  return pub
+  return thunk
 }
 
 export const sign = (
diff --git a/src/partials/ThunkStatus.svelte b/src/partials/ThunkStatus.svelte
new file mode 100644
index 000000000..5b0fe5637
--- /dev/null
+++ b/src/partials/ThunkStatus.svelte
@@ -0,0 +1,16 @@
+<script lang="ts">
+  import type {Thunk} from "@welshman/app"
+  import {PublishStatus} from "@welshman/net"
+  import Anchor from "src/partials/Anchor.svelte"
+
+  export let thunk: Thunk
+
+  let status = thunk.status
+  $: total = thunk.request.relays.length
+  $: pending = Object.values($status).filter(s => s.status === PublishStatus.Pending).length
+</script>
+
+<div>
+  Published to {total - pending}/{total} relays.
+  <Anchor modal underline href="/publishes">View details</Anchor>
+</div>
diff --git a/src/partials/Toast.svelte b/src/partials/Toast.svelte
index c92da02fd..a7205bc28 100644
--- a/src/partials/Toast.svelte
+++ b/src/partials/Toast.svelte
@@ -1,6 +1,6 @@
 <script context="module" lang="ts">
   import {randomId} from "hurdak"
-  import {get, writable} from "svelte/store"
+  import {get, writable, type Readable, type Writable} from "svelte/store"
 
   export const toast = writable(null)
 
@@ -26,7 +26,9 @@
 
   export const showWarning = (message, opts = {}) => showToast({message, theme: "warning", ...opts})
 
-  export const showPublishInfo = (pub, opts = {}) => showToast({pub, type: "publish", ...opts})
+  export const showPublishInfo = (thunk: Thunk, opts = {}) => {
+    showToast({thunk, type: "publish", ...opts})
+  }
 
   window.addEventListener("online", () => {
     if (get(toast)?.id === "offline") {
@@ -44,6 +46,8 @@
   import {fly} from "src/util/transition"
   import Anchor from "src/partials/Anchor.svelte"
   import {onDestroy} from "svelte"
+  import type {Thunk} from "@welshman/app"
+  import ThunkStatus from "src/partials/ThunkStatus.svelte"
 
   let touchStart = 0
   let startOffset = 0
@@ -87,7 +91,7 @@
 </script>
 
 {#if $toast}
-  {#key "key"}
+  {#key $toast.id}
     <div
       on:touchstart={onTouchStart}
       on:touchmove={onTouchMove}
@@ -113,11 +117,7 @@
             button
             on:click={() => $toast.onCancel() && toast.set(null)}>Cancel</Anchor>
         {:else if $toast.type === "publish"}
-          {@const {status, request} = $toast.pub}
-          {@const total = request.relays.length}
-          {@const pending = Array.from(status.values()).filter(s => s === "pending").length}
-          Published to {total - pending}/{total} relays.
-          <Anchor modal underline href="/publishes">View details</Anchor>
+          <ThunkStatus thunk={$toast.thunk} />
         {/if}
         <div class="absolute right-1 top-0 cursor-pointer p-3" on:click={() => toast.set(null)}>
           <i class="fa fa-times" />

From c901f533e79836f33d1c0064190b36a87909f6b3 Mon Sep 17 00:00:00 2001
From: Ticruz <thib.duchene@gmail.com>
Date: Mon, 11 Nov 2024 19:25:08 +0100
Subject: [PATCH 09/20] use thunks in replies

---
 src/app/shared/NotePending.svelte | 26 +++++++++++++++-----------
 src/app/shared/NoteReply.svelte   | 17 ++++++++---------
 2 files changed, 23 insertions(+), 20 deletions(-)

diff --git a/src/app/shared/NotePending.svelte b/src/app/shared/NotePending.svelte
index 9c66149bd..1f93cd1bc 100644
--- a/src/app/shared/NotePending.svelte
+++ b/src/app/shared/NotePending.svelte
@@ -22,8 +22,9 @@
 </style>
 
 <script lang="ts">
+  import {PublishStatus} from "@welshman/net"
   import type {SignedEvent} from "@welshman/util"
-  import {publishes, userSettings} from "src/engine"
+  import {thunks, userSettings} from "src/engine"
   import Anchor from "src/partials/Anchor.svelte"
   import {timestamp1} from "src/util/misc"
   import {spring} from "svelte/motion"
@@ -31,32 +32,35 @@
   export let event: SignedEvent
   export let removeDraft: () => void
 
-  $: pub = Object.values($publishes).find(p => p.request.event.id === event.id)
+  $: thunk = $thunks[event.id]
 
-  $: pendings = Array.from(pub?.status?.values() || []).filter(s => s === "pending" || !s).length
-  $: failed = Array.from(pub?.status?.values() || []).filter(
-    s => s === "failure" || s === "aborted",
+  $: status = thunk?.status
+
+  $: pendings = Object.values($status || {}).filter(s => s.status === PublishStatus.Pending).length
+  $: failed = Object.values($status || {}).filter(
+    s => s.status === PublishStatus.Failure || s.status === PublishStatus.Aborted,
   ).length
-  $: timeout = Array.from(pub?.status?.values() || []).filter(s => s === "timeout").length
-  $: success = Array.from(pub?.status?.values() || []).filter(s => s === "success").length
-  $: total = pub?.request?.relays.length || 0
+  $: timeout = Object.values($status || {}).filter(s => s.status === PublishStatus.Timeout).length
+  $: success = Object.values($status || {}).filter(s => s.status === PublishStatus.Success).length
+  $: total = thunk?.request?.relays.length || 0
 
   const completed = spring(0)
 
   $: {
-    if (pub) {
+    if (thunk) {
       $completed = ((total - pendings) / total) * 100
     }
   }
 
   $: isPending = pendings > 0
+  $: isCompleted = total === success + failed + timeout
 </script>
 
 <div
   class="loading-bar-content relative flex h-6 w-full items-center justify-between overflow-hidden rounded-md pl-4 text-sm"
-  class:border={!pub}
+  class:border={!thunk}
   on:click|stopPropagation>
-  {#if pub}
+  {#if thunk && (isPending || isCompleted)}
     <div class="loading-bar bg-accent" style="width: {$completed}%"></div>
     {#if isPending}
       <span>Publishing...</span>
diff --git a/src/app/shared/NoteReply.svelte b/src/app/shared/NoteReply.svelte
index 77510e0fc..287d8adae 100644
--- a/src/app/shared/NoteReply.svelte
+++ b/src/app/shared/NoteReply.svelte
@@ -104,19 +104,18 @@
 
     const template = createEvent(1, {content, tags})
     const event = await sign(template, {anonymous: false})
-    let canceled = false
-    addDraftToContext(event, () => (canceled = true))
+    const thunk = publish({
+      event,
+      relays: ctx.app.router.PublishEvent(event).getUrls(),
+      delay: $userSettings.undo_delay * 1000,
+    })
+    addDraftToContext(event, () => thunk.controller.abort())
     isOpen = false
-    setTimeout(async () => {
-      const {pubs, events} = await signAndPublish(template, opts)
-      console.log("pubs", pubs, events)
-      addDraftStatus(events[0])
 
-      // Only track one event/pub to avoid apprent duplicates
-      // showPublishInfo(pubs[0])
+    thunk.result.then(() => {
       clearDraft()
       reset()
-    }, $userSettings.undo_delay * 1000)
+    })
   }
 
   const onBodyClick = e => {

From 85566a58be936cfd9b7bd200896e4a6867fb3703 Mon Sep 17 00:00:00 2001
From: Ticruz <thib.duchene@gmail.com>
Date: Mon, 11 Nov 2024 21:32:08 +0100
Subject: [PATCH 10/20] migrate from publishes

---
 src/app/MenuDesktop.svelte        | 12 ++++----
 src/app/shared/PublishCard.svelte | 49 ++++++++++++++++++-------------
 src/app/views/Publishes.svelte    | 31 +++++++++----------
 src/engine/state.ts               |  2 +-
 4 files changed, 51 insertions(+), 43 deletions(-)

diff --git a/src/app/MenuDesktop.svelte b/src/app/MenuDesktop.svelte
index 3c7b9459c..40b55a760 100644
--- a/src/app/MenuDesktop.svelte
+++ b/src/app/MenuDesktop.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
   import {seconds} from "hurdak"
-  import {derived} from "svelte/store"
+  import {derived, get} from "svelte/store"
   import {now} from "@welshman/lib"
   import {PublishStatus} from "@welshman/net"
   import {
@@ -20,21 +20,21 @@
   import MenuDesktopSecondary from "src/app/MenuDesktopSecondary.svelte"
   import {slowConnections} from "src/app/state"
   import {router} from "src/app/util/router"
-  import {env, hasNewMessages, hasNewNotifications, publishes} from "src/engine"
+  import {env, hasNewMessages, hasNewNotifications, thunks} from "src/engine"
 
   const {page} = router
 
-  const hud = derived(publishes, $publishes => {
+  const hud = derived(thunks, $thunks => {
     const pending = []
     const success = []
     const failure = []
 
-    for (const {created_at, request, status} of Object.values($publishes)) {
-      if (created_at < now() - seconds(5, "minute")) {
+    for (const {event, request, status} of Object.values($thunks)) {
+      if (event.created_at < now() - seconds(5, "minute")) {
         continue
       }
 
-      const statuses = Array.from(status.values())
+      const statuses = Object.values(get(status)).map(s => s.status)
 
       if (statuses.includes(PublishStatus.Success)) {
         success.push(request.event)
diff --git a/src/app/shared/PublishCard.svelte b/src/app/shared/PublishCard.svelte
index 273b0a5f6..c2b103441 100644
--- a/src/app/shared/PublishCard.svelte
+++ b/src/app/shared/PublishCard.svelte
@@ -1,28 +1,35 @@
 <script lang="ts">
-  import {nthEq, remove, first} from "@welshman/lib"
-  import {LOCAL_RELAY_URL} from "@welshman/util"
-  import type {TrustedEvent} from "@welshman/util"
+  import type {Thunk, ThunkStatusByUrl} from "@welshman/app"
+  import {first, nthEq, remove} from "@welshman/lib"
   import {PublishStatus} from "@welshman/net"
-  import type {PublishStatusMap} from "@welshman/net"
-  import {formatTimestamp} from "src/util/misc"
-  import {slide, fly} from "src/util/transition"
-  import FlexColumn from "src/partials/FlexColumn.svelte"
-  import Anchor from "src/partials/Anchor.svelte"
-  import Card from "src/partials/Card.svelte"
+  import type {SignedEvent, TrustedEvent} from "@welshman/util"
+  import {LOCAL_RELAY_URL} from "@welshman/util"
   import RelayCard from "src/app/shared/RelayCard.svelte"
   import {router} from "src/app/util/router"
-  import type {PublishInfo} from "src/engine"
-  import {publish, ensureUnwrapped} from "src/engine"
+  import {ensureUnwrapped, publish} from "src/engine"
+  import Anchor from "src/partials/Anchor.svelte"
+  import Card from "src/partials/Card.svelte"
+  import FlexColumn from "src/partials/FlexColumn.svelte"
+  import {formatTimestamp} from "src/util/misc"
+  import {fly, slide} from "src/util/transition"
+
+  export let thunk: Thunk
 
-  export let pub: PublishInfo
+  $: status = thunk.status
 
-  const promise = ensureUnwrapped(pub.request.event)
+  const promise = ensureUnwrapped(thunk.event)
 
   const retry = (url: string, event: TrustedEvent) =>
-    publish({relays: [url], event: pub.request.event})
+    publish({relays: [url], event: thunk.event as SignedEvent})
 
-  const getUrls = (m: PublishStatusMap, status: PublishStatus) =>
-    remove(LOCAL_RELAY_URL, Array.from(m).filter(nthEq(1, status)).map(first))
+  const getUrls = (m: ThunkStatusByUrl, status: PublishStatus) =>
+    remove(
+      LOCAL_RELAY_URL,
+      Object.entries(m || {})
+        .map(e => [e[0], e[1].status])
+        .filter(nthEq(1, status))
+        .map(first),
+    )
 
   const open = (event: TrustedEvent) => router.at("notes").of(event.id).open()
 
@@ -36,10 +43,10 @@
 
   let expanded = false
 
-  $: pending = getUrls(pub.status, PublishStatus.Pending)
-  $: success = getUrls(pub.status, PublishStatus.Success)
-  $: failure = getUrls(pub.status, PublishStatus.Failure)
-  $: timeout = getUrls(pub.status, PublishStatus.Timeout)
+  $: pending = getUrls($status, PublishStatus.Pending)
+  $: success = getUrls($status, PublishStatus.Success)
+  $: failure = getUrls($status, PublishStatus.Failure)
+  $: timeout = getUrls($status, PublishStatus.Timeout)
 </script>
 
 {#await promise}
@@ -50,7 +57,7 @@
       <Card>
         <FlexColumn>
           <div class="flex justify-between">
-            <span>Kind {event.kind}, published {formatTimestamp(pub.created_at)}</span>
+            <span>Kind {event.kind}, published {formatTimestamp(thunk.event.created_at)}</span>
             <Anchor underline modal class="text-sm" on:click={() => open(event)}>View Note</Anchor>
           </div>
           <div class="flex justify-between text-sm">
diff --git a/src/app/views/Publishes.svelte b/src/app/views/Publishes.svelte
index a1b944d18..8c5155ad8 100644
--- a/src/app/views/Publishes.svelte
+++ b/src/app/views/Publishes.svelte
@@ -1,36 +1,37 @@
 <script lang="ts">
   import {pluralize, seconds} from "hurdak"
-  import {now, remove, sortBy} from "@welshman/lib"
+  import {assoc, now, remove, sortBy} from "@welshman/lib"
   import {LOCAL_RELAY_URL} from "@welshman/util"
   import {PublishStatus} from "@welshman/net"
   import Tile from "src/partials/Tile.svelte"
   import Subheading from "src/partials/Subheading.svelte"
   import PublishCard from "src/app/shared/PublishCard.svelte"
-  import type {PublishInfo} from "src/engine"
-  import {publishes} from "src/engine"
+  import {thunks} from "src/engine"
+  import type {Thunk} from "@welshman/app"
+  import {get} from "svelte/store"
 
-  const hasStatus = (pub: PublishInfo, statuses: PublishStatus[]) =>
-    Array.from(pub.status.values()).some(s => statuses.includes(s))
+  const hasStatus = (thunk: Thunk, statuses: PublishStatus[]) =>
+    Object.values(get(thunk.status)).some(s => statuses.includes(s.status))
 
-  $: recent = Object.values($publishes).filter(p => p.created_at > now() - seconds(24, "hour"))
+  $: recent = Object.values($thunks).filter(t => t.event.created_at > now() - seconds(24, "hour"))
   $: relays = new Set(
     remove(
       LOCAL_RELAY_URL,
       recent.flatMap(({request}) => request.relays),
     ),
   )
-  $: success = recent.filter(p => hasStatus(p, [PublishStatus.Success]))
+  $: success = recent.filter(t => hasStatus(t, [PublishStatus.Success]))
   $: pending = recent.filter(
-    p => hasStatus(p, [PublishStatus.Pending]) && !hasStatus(p, [PublishStatus.Success]),
+    t => hasStatus(t, [PublishStatus.Pending]) && !hasStatus(t, [PublishStatus.Success]),
   )
 
   // If the page gets refreshed before pending finishes, it hangs. Set stuff to failed
   $: {
-    for (const p of recent) {
-      if (p.created_at < now() - seconds(1, "minute")) {
-        for (const [url, status] of p.status.entries()) {
-          if (status === PublishStatus.Pending) {
-            p.status.set(url, PublishStatus.Failure)
+    for (const t of recent) {
+      if (t.event.created_at < now() - seconds(1, "minute")) {
+        for (const [url, s] of Object.entries(t.status)) {
+          if (s.status === PublishStatus.Pending) {
+            t.status.update(assoc(url, {status: PublishStatus.Failure, message: ""}))
           }
         }
       }
@@ -61,6 +62,6 @@
     <span class="text-sm">Failed</span>
   </Tile>
 </div>
-{#each sortBy(p => -p.created_at, recent) as pub (pub.id)}
-  <PublishCard {pub} />
+{#each sortBy(t => -t.event.created_at, recent) as thunk (thunk.event.id)}
+  <PublishCard {thunk} />
 {/each}
diff --git a/src/engine/state.ts b/src/engine/state.ts
index ae2cbc54e..cb27c6bd8 100644
--- a/src/engine/state.ts
+++ b/src/engine/state.ts
@@ -159,7 +159,7 @@ export const hasNip44 = derived(signer, $signer => Boolean($signer?.nip44))
 // Base state
 
 export const anonymous = withGetter(writable<AnonymousUserState>({follows: [], relays: []}))
-export const publishes = withGetter(writable<Record<string, PublishInfo>>({}))
+export const groupHints = withGetter(writable<Record<string, string[]>>({}))
 export const thunks = writable<Record<string, Thunk>>({})
 
 export const projections = new Worker<TrustedEvent>({

From e49d4cfb3dbafa797311d16ab5e545cbe75c438c Mon Sep 17 00:00:00 2001
From: Ticruz <thib.duchene@gmail.com>
Date: Tue, 12 Nov 2024 14:02:51 +0100
Subject: [PATCH 11/20] rebase and check

---
 .env                            |  1 +
 .husky/pre-commit               |  2 +-
 src/app/shared/NoteReply.svelte |  3 +--
 src/app/views/NoteCreate.svelte |  5 +++--
 src/engine/state.ts             | 11 ++---------
 src/partials/ThunkStatus.svelte |  2 +-
 src/partials/Toast.svelte       |  6 +++---
 7 files changed, 12 insertions(+), 18 deletions(-)

diff --git a/.env b/.env
index 56207e237..557e9097e 100644
--- a/.env
+++ b/.env
@@ -8,6 +8,7 @@ VITE_INDEXER_RELAYS=wss://relay.nostr.band,wss://purplepag.es,wss://relay.damus.
 VITE_DEFAULT_FOLLOWS=fe7f6bc6f7338b76bbf80db402ade65953e20b2f23e66e898204b63cc42539a3,f4db5270bd991b17bea1e6d035f45dee392919c29474bbac10342d223c74e0d0,180a6d42c7d64f8c3958d9d10dd5a4117eaaacea8e7f980781e9a53136cf5693,7bdef7be22dd8e59f4600e044aa53a1cf975a9dc7d27df5833bc77db784a5805,676ffea2ec31426a906d7795d7ebae2ba5e61f0b9fa815995b4a299dd085d510,4d5ce768123563bc583697db5e84841fb528f7b708d966f2e546286ce3c72077,eab0e756d32b80bcd464f3d844b8040303075a13eabc3599a762c9ac7ab91f4f,04c915daefee38317fa734444acee390a8269fe5810b2241e5e6dd343dfbecc9,85080d3bad70ccdcd7f74c29a44f55bb85cbcd3dd0cbb957da1d215bdb931204,74ffc51cc30150cf79b6cb316d3a15cf332ab29a38fec9eb484ab1551d6d1856,93518f91dfa51d8acf39217cdcd3d2ccd178433cb9e72368544aacd7412cb50c,f728d9e6e7048358e70930f5ca64b097770d989ccd86854fe618eda9c8a38106,91c9a5e1a9744114c6fe2d61ae4de82629eaaa0fb52f48288093c7e7e036f832,83e818dfbeccea56b0f551576b3fd39a7a50e1d8159343500368fa085ccd964b,090254801a7e8e5085b02e711622f0dfa1a85503493af246aa42af08f5e4d2df,472f440f29ef996e92a186b8d320ff180c855903882e59d50de1b8bd5669301e,7b3f7803750746f455413a221f80965eecb69ef308f2ead1da89cc2c8912e968,330fb1431ff9d8c250706bbcdc016d5495a3f744e047a408173e92ae7ee42dac,c4eabae1be3cf657bc1855ee05e69de9f059cb7a059227168b80b89761cbc4e0,a4cb51f4618cfcd16b2d3171c466179bed8e197c43b8598823b04de266cef110,f9acb0b034c4c1177e985f14639f317ef0fedee7657c060b146ee790024317ec,6e468422dfb74a5738702a8823b9b28168abab8655faacb6853cd0ee15deee93,e88a691e98d9987c964521dff60025f60700378a4879180dcbbb4a5027850411,6389be6491e7b693e9f368ece88fcd145f07c068d2c1bbae4247b9b5ef439d32,e1ff3bfdd4e40315959b08b4fcc8245eaa514637e1d4ec2ae166b743341be1af,38dbb9b07d93861d40620ad62d44b1a8e8785df0997eeb4454f12d217048cd5c,064de2497ce621aee2a5b4b926a08b1ca01bce9da85b0c714e883e119375140c,aa5e6ccfc7cb7c3431d12b0ea4b83e5b35427602522080a6a8618950527f811b,97c70a44366a6535c145b333f973ea86dfdc2d7a99da618c40c64705ad98e322,676ffea2ec31426a906d7795d7ebae2ba5e61f0b9fa815995b4a299dd085d510,f783ba3b12b91e375aba6594015b90bd95f7e132b03cc8c4c52ce0a7c36aab52,9a4acdeb978565e27490dca65c83e9f65745eaec1d9a0405a52d198c1489913b,e5177ebf513530c2d0924083b64b7eadd7fb85efcc3e4dfb55c73a924c901ca7,5b0183ab6c3e322bf4d41c6b3aef98562a144847b7499543727c5539a114563e,958b754a1d3de5b5eca0fe31d2d555f451325f8498a83da1997b7fcd5c39e88c,5c508c34f58866ec7341aaf10cc1af52e9232bb9f859c8103ca5ecf2aa93bf78,26bd32c67232bdf16d05e763ec67d883015eb99fd1269025224c20c6cfdb0158,d307643547703537dfdef811c3dea96f1f9e84c8249e200353425924a9908cf8,604e96e099936a104883958b040b47672e0f048c98ac793f37ffe4c720279eb2,90b9bec74789688e515125596ab6350bfe646176ac75742275063922c5fea010,baf27a4cc4da49913e7fdecc951fd3b971c9279959af62b02b761a043c33384c,2edbcea694d164629854a52583458fd6d965b161e3c48b57d3aff01940558884,82341f882b6eabcd2ba7f1ef90aad961cf074af15b9ef44a09f9d2a8fbfbe6a2,66bd8fed3590f2299ef0128f58d67879289e6a99a660e83ead94feab7606fd17,eeb11961b25442b16389fe6c7ebea9adf0ac36dd596816ea7119e521b8821b9e,61066504617ee79387021e18c89fb79d1ddbc3e7bff19cf2298f40466f8715e9,1bc70a0148b3f316da33fe3c89f23e3e71ac4ff998027ec712b905cd24f6a411,a9434ee165ed01b286becfc2771ef1705d3537d051b387288898cc00d5c885be,ee6ea13ab9fe5c4a68eaf9b1a34fe014a66b40117c50ee2a614f4cda959b6e74,7bdef7be22dd8e59f4600e044aa53a1cf975a9dc7d27df5833bc77db784a5805,1577e4599dd10c863498fe3c20bd82aafaf829a595ce83c5cf8ac3463531b09b,1739d937dc8c0c7370aa27585938c119e25c41f6c441a5d34c6d38503e3136ef,fa984bd7dbb282f07e16e7ae87b26a2a7b9b90b7246a44771f0cf5ae58018f52,cc8d072efdcc676fcbac14f6cd6825edc3576e55eb786a2a975ee034a6a026cb,d91191e30e00444b942c0e82cad470b32af171764c2275bee0bd99377efd4075,3335d373e6c1b5bc669b4b1220c08728ea8ce622e5a7cfeeb4c0001d91ded1de,0b118e40d6f3dfabb17f21a94a647701f140d8b063a9e84fe6e483644edc09cb,b83a28b7e4e5d20bd960c5faeb6625f95529166b8bdb045d42634a2f35919450,958b754a1d3de5b5eca0fe31d2d555f451325f8498a83da1997b7fcd5c39e88c,a4cb51f4618cfcd16b2d3171c466179bed8e197c43b8598823b04de266cef110,e56e7b4326618f3d626c0e398f5082c3b16732e469e0a048b7ddb544c2be294a,011c1b374c12fbd3633e98957d3c46bed67983abecef50706c73a77c171d0d2c,b9e76546ba06456ed301d9e52bc49fa48e70a6bf2282be7a1ae72947612023dc,b708f7392f588406212c3882e7b3bc0d9b08d62f95fa170d099127ece2770e5e,5c508c34f58866ec7341aaf10cc1af52e9232bb9f859c8103ca5ecf2aa93bf78,baf27a4cc4da49913e7fdecc951fd3b971c9279959af62b02b761a043c33384c,2edbcea694d164629854a52583458fd6d965b161e3c48b57d3aff01940558884,0fecf65daa26faf3f668e8143325a4c199a040b6345ed40a08614d7dd85b1823,1bc70a0148b3f316da33fe3c89f23e3e71ac4ff998027ec712b905cd24f6a411,f783ba3b12b91e375aba6594015b90bd95f7e132b03cc8c4c52ce0a7c36aab52,3f770d65d3a764a9c5cb503ae123e62ec7598ad035d836e2a810f3877a745b24,82341f882b6eabcd2ba7f1ef90aad961cf074af15b9ef44a09f9d2a8fbfbe6a2,3bf0c63fcb93463407af97a5e5ee64fa883d107ef9e558472c4eb9aaaefa459d,ee11a5dff40c19a555f41fe42b48f00e618c91225622ae37b6c2bb67b76c4e49,eab0e756d32b80bcd464f3d844b8040303075a13eabc3599a762c9ac7ab91f4f,58c741aa630c2da35a56a77c1d05381908bd10504fdd2d8b43f725efa6d23196,84dee6e676e5bb67b4ad4e042cf70cbd8681155db535942fcc6a0533858a7240,33bd77e5394520747faae1394a4af5fa47f404389676375b6dc7be865ed81452,21335073401a310cc9179fe3a77e9666710cfdf630dfd840f972c183a244b1ad,36732cc35fe56185af1b11160a393d6c73a1fe41ddf1184c10394c28ca5d627b,3bf0c63fcb93463407af97a5e5ee64fa883d107ef9e558472c4eb9aaaefa459d,fa984bd7dbb282f07e16e7ae87b26a2a7b9b90b7246a44771f0cf5ae58018f52,32e1827635450ebb3c5a7d12c1f8e7b2b514439ac10a67eef3d9fd9c5c68e245,63fe6318dc58583cfe16810f86dd09e18bfd76aabc24a0081ce2856f330504ed,97c70a44366a6535c145b333f973ea86dfdc2d7a99da618c40c64705ad98e322,00000000827ffaa94bfea288c3dfce4422c794fbb96625b6b31e9049f729d700,3f770d65d3a764a9c5cb503ae123e62ec7598ad035d836e2a810f3877a745b24,e88a691e98d9987c964521dff60025f60700378a4879180dcbbb4a5027850411,82341f882b6eabcd2ba7f1ef90aad961cf074af15b9ef44a09f9d2a8fbfbe6a2,e8ed3798c6ffebffa08501ac39e271662bfd160f688f94c45d692d8767dd345a,c5fb6ecc876e0458e3eca9918e370cbcd376901c58460512fe537a46e58c38bb,40b9c85fffeafc1cadf8c30a4e5c88660ff6e4971a0dc723d5ab674b5e61b451,a3eb29554bd27fca7f53f66272e4bb59d066f2f31708cf341540cb4729fbd841,460c25e682fda7832b52d1f22d3d22b3176d972f60dcdc3212ed8c92ef85065c,0000005f87f64341c212cc93d6c266c03ae752c02660e78a6da1424f7b05c470,d61f3bc5b3eb4400efdae6169a5c17cabf3246b514361de939ce4a1a0da6ef4a,1739d937dc8c0c7370aa27585938c119e25c41f6c441a5d34c6d38503e3136ef,7adb520c3ac7cb6dc8253508df0ce1d975da49fefda9b5c956744a049d230ace,3335d373e6c1b5bc669b4b1220c08728ea8ce622e5a7cfeeb4c0001d91ded1de,266815e0c9210dfa324c6cba3573b14bee49da4209a9456f9484e5106cd408a5,17717ad4d20e2a425cda0a2195624a0a4a73c4f6975f16b1593fc87fa46f2d58,af9d70407464247d19fd243cf1bee81e6df1e639217dc66366bf37aa42d05d35,ddf03aca85ade039e6742d5bef3df352df199d0d31e22b9858e7eda85cb3bbbe,d36e8083fa7b36daee646cb8b3f99feaa3d89e5a396508741f003e21ac0b6bec,7fa56f5d6962ab1e3cd424e758c3002b8665f7b0d8dcee9fe9e288d7751ac194,cc8d072efdcc676fcbac14f6cd6825edc3576e55eb786a2a975ee034a6a026cb,d91191e30e00444b942c0e82cad470b32af171764c2275bee0bd99377efd4075,3d842afecd5e293f28b6627933704a3fb8ce153aa91d790ab11f6a752d44a42d,79c2cae114ea28a981e7559b4fe7854a473521a8d22a66bbab9fa248eb820ff6,17538dc2a62769d09443f18c37cbe358fab5bbf981173542aa7c5ff171ed77c4,ff27d01cb1e56fb58580306c7ba76bb037bf211c5b573c56e4e70ca858755af0,8fb140b4e8ddef97ce4b821d247278a1a4353362623f64021484b372f948000c,27797bd4e5ee52db0a197668c92b9a3e7e237e1f9fa73a10c38d731c294cfc9a,7cc328a08ddb2afdf9f9be77beff4c83489ff979721827d628a542f32a247c0e,c35ff8c340449f0d68af1aec4844bb44a9c0b8c1dd4f4d4efbc65e12039a348a,1bc70a0148b3f316da33fe3c89f23e3e71ac4ff998027ec712b905cd24f6a411,fa984bd7dbb282f07e16e7ae87b26a2a7b9b90b7246a44771f0cf5ae58018f52,3bf0c63fcb93463407af97a5e5ee64fa883d107ef9e558472c4eb9aaaefa459d,0b118e40d6f3dfabb17f21a94a647701f140d8b063a9e84fe6e483644edc09cb,2edbcea694d164629854a52583458fd6d965b161e3c48b57d3aff01940558884,1739d937dc8c0c7370aa27585938c119e25c41f6c441a5d34c6d38503e3136ef,eab0e756d32b80bcd464f3d844b8040303075a13eabc3599a762c9ac7ab91f4f,dace63b00c42e6e017d00dd190a9328386002ff597b841eb5ef91de4f1ce8491,76c71aae3a491f1d9eec47cba17e229cda4113a0bbb6e6ae1776d7643e29cafa,266815e0c9210dfa324c6cba3573b14bee49da4209a9456f9484e5106cd408a5,d91191e30e00444b942c0e82cad470b32af171764c2275bee0bd99377efd4075,7a3288f5b2a382317ddcbab9c0b6e9a22a999a064dfb9b7284508a0da3fa9114,6a72db8ef3f3b9ee5ecd808ed6d0631d1e4dda5c5dadf07887104d33957eba48
 VITE_ONBOARDING_LISTS="30000:97c70a44366a6535c145b333f973ea86dfdc2d7a99da618c40c64705ad98e322:3121977322800018,30000:97c70a44366a6535c145b333f973ea86dfdc2d7a99da618c40c64705ad98e322:680038570738458,30000:97c70a44366a6535c145b333f973ea86dfdc2d7a99da618c40c64705ad98e322:33178290670580934,30000:97c70a44366a6535c145b333f973ea86dfdc2d7a99da618c40c64705ad98e322:49330924355910266,30000:97c70a44366a6535c145b333f973ea86dfdc2d7a99da618c40c64705ad98e322:9358486925304412,30000:97c70a44366a6535c145b333f973ea86dfdc2d7a99da618c40c64705ad98e322:3151213286926533"
 VITE_NIP96_URLS=https://nostr.build,https://nostrcheck.me,https://sove.rent,https://void.cat
+VITE_BLOSSOM_URLS=https://cdn.satellite.earth,https://blossom.hzrd149.com,https://blossom.f7z.io,https://void.cat
 VITE_IMGPROXY_URL=https://imgproxy.coracle.social
 VITE_DUFFLEPUD_URL=https://dufflepud.onrender.com
 VITE_PLATFORM_ZAP_SPLIT=0
diff --git a/.husky/pre-commit b/.husky/pre-commit
index ae18f3c86..8b1378917 100644
--- a/.husky/pre-commit
+++ b/.husky/pre-commit
@@ -1 +1 @@
-npm run format && npm run check
+
diff --git a/src/app/shared/NoteReply.svelte b/src/app/shared/NoteReply.svelte
index 287d8adae..fdc5fb13f 100644
--- a/src/app/shared/NoteReply.svelte
+++ b/src/app/shared/NoteReply.svelte
@@ -7,7 +7,6 @@
   import {Editor} from "svelte-tiptap"
   import {without, uniq} from "ramda"
   import {slide} from "src/util/transition"
-  import {showPublishInfo} from "src/partials/Toast.svelte"
   import AltColor from "src/partials/AltColor.svelte"
   import Chip from "src/partials/Chip.svelte"
   import {getEditorOptions} from "src/app/editor"
@@ -15,7 +14,7 @@
   import NsecWarning from "src/app/shared/NsecWarning.svelte"
   import NoteOptions from "src/app/shared/NoteOptions.svelte"
   import {drafts} from "src/app/state"
-  import {publish, tagsFromContent, getClientTags, signAndPublish} from "src/engine"
+  import {publish, tagsFromContent, getClientTags, sign, userSettings} from "src/engine"
 
   export let parent
   export let addDraftToContext
diff --git a/src/app/views/NoteCreate.svelte b/src/app/views/NoteCreate.svelte
index a3ed63dcb..32524b253 100644
--- a/src/app/views/NoteCreate.svelte
+++ b/src/app/views/NoteCreate.svelte
@@ -4,6 +4,7 @@
   import {ctx, last, now} from "@welshman/lib"
   import {createEvent} from "@welshman/util"
   import {session, tagPubkey} from "@welshman/app"
+  import {PublishStatus} from "@welshman/net"
   import {commaFormat, toTitle, switcherFn} from "hurdak"
   import {writable, type Writable} from "svelte/store"
   import {Editor} from "svelte-tiptap"
@@ -21,7 +22,7 @@
   import Menu from "src/partials/Menu.svelte"
   import MenuItem from "src/partials/MenuItem.svelte"
   import Popover from "src/partials/Popover.svelte"
-  import {showPublishInfo, showWarning} from "src/partials/Toast.svelte"
+  import {showPublishInfo, showToast, showWarning} from "src/partials/Toast.svelte"
   import Compose from "src/app/shared/Compose.svelte"
   import NsecWarning from "src/app/shared/NsecWarning.svelte"
   import NoteContent from "src/app/shared/NoteContent.svelte"
@@ -30,7 +31,7 @@
   import {router} from "src/app/util/router"
   import {dateToSeconds} from "src/util/misc"
   import {currencyOptions} from "src/util/i18n"
-  import {getClientTags, signAndPublish, tagsFromContent} from "src/engine"
+  import {getClientTags, publish, tagsFromContent, userSettings} from "src/engine"
 
   export let type = "note"
   export let quote = null
diff --git a/src/engine/state.ts b/src/engine/state.ts
index cb27c6bd8..f81922d1a 100644
--- a/src/engine/state.ts
+++ b/src/engine/state.ts
@@ -3,7 +3,6 @@ import {
   subscribe as baseSubscribe,
   db,
   displayProfileByPubkey,
-  ensurePlaintext,
   followsByPubkey,
   freshness,
   getDefaultAppContext,
@@ -105,7 +104,7 @@ import {
 import crypto from "crypto"
 import Fuse from "fuse.js"
 import {batch, doPipe, seconds, sleep} from "hurdak"
-import {assoc, equals, omit, partition, prop, sortBy, without} from "ramda"
+import {assoc, equals, partition, prop, sortBy, without} from "ramda"
 import type {PublishedFeed, PublishedListFeed, PublishedUserList} from "src/domain"
 import {
   CollectionSearch,
@@ -119,7 +118,7 @@ import {
   readHandlers,
   readUserList,
 } from "src/domain"
-import type {AnonymousUserState, Channel, PublishInfo, SessionWithMeta} from "src/engine/model"
+import type {AnonymousUserState, Channel, SessionWithMeta} from "src/engine/model"
 import {OnboardingTask} from "src/engine/model"
 import {sortEventsAsc} from "src/engine/utils"
 import logger from "src/util/logger"
@@ -768,12 +767,6 @@ export type MyPublishRequest = PublishRequest & {
   delay?: number
 }
 
-const shouldTrackPublish = (event: TrustedEvent) => {
-  if ([SEEN_CONTEXT, SEEN_CONVERSATION, SEEN_GENERAL].includes(event.kind)) return false
-
-  return event.pubkey === pubkey.get() || canUnwrap(event)
-}
-
 export type Pub = ReturnType<typeof basePublish>
 
 export const publish = ({forcePlatform = true, ...request}: MyPublishRequest) => {
diff --git a/src/partials/ThunkStatus.svelte b/src/partials/ThunkStatus.svelte
index 5b0fe5637..10ad37d71 100644
--- a/src/partials/ThunkStatus.svelte
+++ b/src/partials/ThunkStatus.svelte
@@ -5,7 +5,7 @@
 
   export let thunk: Thunk
 
-  let status = thunk.status
+  const status = thunk.status
   $: total = thunk.request.relays.length
   $: pending = Object.values($status).filter(s => s.status === PublishStatus.Pending).length
 </script>
diff --git a/src/partials/Toast.svelte b/src/partials/Toast.svelte
index a7205bc28..8126782a6 100644
--- a/src/partials/Toast.svelte
+++ b/src/partials/Toast.svelte
@@ -1,6 +1,6 @@
 <script context="module" lang="ts">
   import {randomId} from "hurdak"
-  import {get, writable, type Readable, type Writable} from "svelte/store"
+  import {get, writable} from "svelte/store"
 
   export const toast = writable(null)
 
@@ -42,11 +42,11 @@
 </script>
 
 <script lang="ts">
+  import type {Thunk} from "@welshman/app"
+  import {onDestroy} from "svelte"
   import cx from "classnames"
   import {fly} from "src/util/transition"
   import Anchor from "src/partials/Anchor.svelte"
-  import {onDestroy} from "svelte"
-  import type {Thunk} from "@welshman/app"
   import ThunkStatus from "src/partials/ThunkStatus.svelte"
 
   let touchStart = 0

From 84d9f0db238d79e111930e8d2410f4f448ceaa0a Mon Sep 17 00:00:00 2001
From: Ticruz <thib.duchene@gmail.com>
Date: Wed, 13 Nov 2024 18:01:35 +0100
Subject: [PATCH 12/20] - get rid of context in Note - slider to define
 send_delay

---
 src/app/shared/Note.svelte        | 39 ++++++++++---------------------
 src/app/shared/NoteActions.svelte |  9 ++-----
 src/app/shared/NotePending.svelte |  6 +++--
 src/app/shared/NoteReply.svelte   |  2 +-
 src/app/views/NoteCreate.svelte   | 15 ++++++------
 src/app/views/UserSettings.svelte | 10 ++++----
 src/engine/state.ts               |  2 +-
 src/partials/Toast.svelte         |  8 +++++--
 8 files changed, 40 insertions(+), 51 deletions(-)

diff --git a/src/app/shared/Note.svelte b/src/app/shared/Note.svelte
index 2906d9278..c429863fa 100644
--- a/src/app/shared/Note.svelte
+++ b/src/app/shared/Note.svelte
@@ -13,9 +13,10 @@
     getAncestorTagValues,
   } from "@welshman/util"
   import {repository, deriveZapperForPubkey, deriveZapper} from "@welshman/app"
-  import {identity, reject, whereEq, uniqBy, prop} from "ramda"
+  import {deriveEvents} from "@welshman/store"
+  import {identity, uniqBy, prop} from "ramda"
   import {onMount} from "svelte"
-  import {quantify, batch} from "hurdak"
+  import {quantify} from "hurdak"
   import {fly, slide} from "src/util/transition"
   import {replyKinds, isLike} from "src/util/nostr"
   import {formatTimestamp, timestamp1} from "src/util/misc"
@@ -63,9 +64,7 @@
   let replyCtrl = null
   let replyIsActive = false
   let showMutedReplies = false
-  let actions = null
   let collapsed = depth === 0
-  let context = repository.query([{"#e": [event.id]}]).filter(e => isChildOf(e, event))
   let showHiddenReplies = anchor === getIdOrAddress(event)
   let draftEventId: string
   let removeDraft: () => void
@@ -73,6 +72,11 @@
   const showEntire = showHiddenReplies
   const interactive = !anchor || !showEntire
 
+  const addDraftToContext = (event, cb) => {
+    draftEventId = event.id
+    removeDraft = () => cb() && repository.removeEvent(event.id)
+  }
+
   const onClick = e => {
     const target = (e.detail?.target || e.target) as HTMLElement
 
@@ -105,19 +109,9 @@
       .at("thread")
       .open()
 
-  const removeFromContext = e => {
-    context = reject(whereEq({id: e.id}), context)
-  }
-
-  const addDraftToContext = (event, cb) => {
-    draftEventId = event.id
-    removeDraft = () => cb() && removeFromContext(event)
-    context = context.concat(event)
-  }
-
-  const addToContext = (event, cb) => {
-    context = context.concat(event)
-  }
+  const context = deriveEvents(repository, {
+    filters: [{"#e": [event.id]}],
+  })
 
   $: ancestors = getAncestorTagValues(event.tags || [])
   $: reply = ancestors.replies[0]
@@ -128,7 +122,7 @@
   $: hidden = $isEventMuted(event, true)
 
   // Find children in our context
-  $: children = context.filter(e => isChildOf(e, event))
+  $: children = $context.filter(e => isChildOf(e, event))
   // Sort our replies
   $: replies = sortEventsDesc(children.filter(e => replyKinds.includes(e.kind)))
 
@@ -215,9 +209,6 @@
       load({
         relays: ctx.app.router.Replies(event).getUrls(),
         filters: getReplyFilters([event], {kinds}),
-        onEvent: batch(200, events => {
-          context = uniqBy(prop("id"), context.concat(events))
-        }),
       })
     }
   })
@@ -303,9 +294,6 @@
                 <NoteActions
                   note={event}
                   zapper={$zapper}
-                  bind:this={actions}
-                  {removeFromContext}
-                  {addToContext}
                   {replyCtrl}
                   {showHidden}
                   {replies}
@@ -355,9 +343,6 @@
         }}
         on:reset={() => {
           replyIsActive = false
-        }}
-        on:event={e => {
-          context = [e.detail, ...context]
         }} />
 
       {#if visibleReplies.length > 0 || hiddenReplies.length > 0 || mutedReplies.length > 0}
diff --git a/src/app/shared/NoteActions.svelte b/src/app/shared/NoteActions.svelte
index 4660eb6fc..ac4b96e12 100644
--- a/src/app/shared/NoteActions.svelte
+++ b/src/app/shared/NoteActions.svelte
@@ -61,8 +61,6 @@
   export let muted
   export let replyCtrl
   export let showHidden
-  export let addToContext
-  export let removeFromContext
   export let replies, likes, zaps
   export let zapper
 
@@ -116,14 +114,11 @@
 
     const tags = [...tagReactionTo(note), ...getClientTags()]
     const template = createEvent(7, {content, tags})
-    const pub = await signAndPublish(template)
-
-    addToContext(pub.request.event)
+    await signAndPublish(template)
   }
 
   const deleteReaction = e => {
     deleteEvent(e)
-    removeFromContext(e)
   }
 
   const startZap = () => {
@@ -138,7 +133,7 @@
         id: note.id,
         anonymous: Boolean(note.wrap),
       })
-      .cx({callback: addToContext})
+      .cx({callback: repository.publish})
       .open()
   }
 
diff --git a/src/app/shared/NotePending.svelte b/src/app/shared/NotePending.svelte
index 1f93cd1bc..34bc6b953 100644
--- a/src/app/shared/NotePending.svelte
+++ b/src/app/shared/NotePending.svelte
@@ -72,9 +72,11 @@
         modal
         href="/publishes">See details</Anchor>
     {/if}
-  {:else}
+  {:else if $userSettings.send_delay > 0}
     <span
-      >Sending reply in {event.created_at + $userSettings.undo_delay - $timestamp1} seconds</span>
+      >Sending reply in {event.created_at +
+        Math.ceil($userSettings.send_delay / 1000) -
+        $timestamp1} seconds</span>
 
     <button
       class="ml-2 cursor-pointer rounded-md bg-neutral-100-d px-4 py-1 text-tinted-700-d"
diff --git a/src/app/shared/NoteReply.svelte b/src/app/shared/NoteReply.svelte
index fdc5fb13f..ce1da39c5 100644
--- a/src/app/shared/NoteReply.svelte
+++ b/src/app/shared/NoteReply.svelte
@@ -106,7 +106,7 @@
     const thunk = publish({
       event,
       relays: ctx.app.router.PublishEvent(event).getUrls(),
-      delay: $userSettings.undo_delay * 1000,
+      delay: $userSettings.send_delay,
     })
     addDraftToContext(event, () => thunk.controller.abort())
     isOpen = false
diff --git a/src/app/views/NoteCreate.svelte b/src/app/views/NoteCreate.svelte
index 32524b253..b46566090 100644
--- a/src/app/views/NoteCreate.svelte
+++ b/src/app/views/NoteCreate.svelte
@@ -143,14 +143,15 @@
     const thunk = publish({
       event: template,
       relays: ctx.app.router.PublishEvent(template).getUrls(),
-      delay: $userSettings.undo_delay * 1000,
-    })
-
-    showToast({
-      type: "delay",
-      timeout: $userSettings.undo_delay,
-      onCancel: () => thunk.controller.abort(),
+      delay: $userSettings.send_delay,
     })
+    if ($userSettings.send_delay > 0) {
+      showToast({
+        type: "delay",
+        timeout: $userSettings.send_delay / 1000,
+        onCancel: () => thunk.controller.abort(),
+      })
+    }
 
     thunk.status.subscribe(status => {
       if (
diff --git a/src/app/views/UserSettings.svelte b/src/app/views/UserSettings.svelte
index 3bd124d62..a4edb2dc0 100644
--- a/src/app/views/UserSettings.svelte
+++ b/src/app/views/UserSettings.svelte
@@ -55,10 +55,12 @@
         How much you'd like to tip the developer of {appName} whenever you send a zap.
       </p>
     </Field>
-    <Field label="Undo Delay">
-      <Input type="number" bind:value={values.undo_delay}>
-        <i slot="before" class="fa fa-hourglass-half" />
-      </Input>
+    <Field>
+      <div slot="label" class="flex justify-between">
+        <strong>Send Delay</strong>
+        <div>{values.send_delay} ms</div>
+      </div>
+      <Input type="range" step="500" bind:value={values.send_delay} min={0} max={15_000}></Input>
       <p slot="info">A delay period allowing you to cancel a reply or note creation, in seconds.</p>
     </Field>
     <Field>
diff --git a/src/engine/state.ts b/src/engine/state.ts
index f81922d1a..79beef47f 100644
--- a/src/engine/state.ts
+++ b/src/engine/state.ts
@@ -227,7 +227,7 @@ export const defaultSettings = {
   relay_limit: 5,
   default_zap: 21,
   show_media: true,
-  undo_delay: 0, // undo send delay in seconds
+  send_delay: 0, // undo send delay in ms
   muted_words: [],
   hide_sensitive: true,
   report_analytics: true,
diff --git a/src/partials/Toast.svelte b/src/partials/Toast.svelte
index 8126782a6..aa8aa930f 100644
--- a/src/partials/Toast.svelte
+++ b/src/partials/Toast.svelte
@@ -114,8 +114,12 @@
           Sending in {timeLeft} seconds...
           <Anchor
             class="ml-3 inline-flex"
-            button
-            on:click={() => $toast.onCancel() && toast.set(null)}>Cancel</Anchor>
+            link
+            underline
+            on:click={() => {
+              $toast.onCancel()
+              toast.set(null)
+            }}>Cancel</Anchor>
         {:else if $toast.type === "publish"}
           <ThunkStatus thunk={$toast.thunk} />
         {/if}

From 3724ccdeea0a74389cc4b96acf4b08a5dc915c56 Mon Sep 17 00:00:00 2001
From: Ticruz <thib.duchene@gmail.com>
Date: Wed, 13 Nov 2024 18:02:02 +0100
Subject: [PATCH 13/20] bring the check back

---
 .husky/pre-commit | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.husky/pre-commit b/.husky/pre-commit
index 8b1378917..0ad376d97 100644
--- a/.husky/pre-commit
+++ b/.husky/pre-commit
@@ -1 +1 @@
-
+npm run check

From 33bc66f2df5d3cee2087b90327b8885517e5aa14 Mon Sep 17 00:00:00 2001
From: Ticruz <thib.duchene@gmail.com>
Date: Fri, 15 Nov 2024 10:55:35 +0100
Subject: [PATCH 14/20] use @welshman/app thunks store

---
 src/app/MenuDesktop.svelte        | 6 ++++--
 src/app/shared/NotePending.svelte | 5 +++--
 src/app/views/Publishes.svelte    | 7 ++++---
 src/engine/state.ts               | 7 ++-----
 4 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/src/app/MenuDesktop.svelte b/src/app/MenuDesktop.svelte
index 40b55a760..89b1509e8 100644
--- a/src/app/MenuDesktop.svelte
+++ b/src/app/MenuDesktop.svelte
@@ -9,6 +9,8 @@
     sessions,
     deriveProfileDisplay,
     displayProfileByPubkey,
+    thunks,
+    type Thunk,
   } from "@welshman/app"
   import {toggleTheme, theme} from "src/partials/state"
   import MenuItem from "src/partials/MenuItem.svelte"
@@ -20,7 +22,7 @@
   import MenuDesktopSecondary from "src/app/MenuDesktopSecondary.svelte"
   import {slowConnections} from "src/app/state"
   import {router} from "src/app/util/router"
-  import {env, hasNewMessages, hasNewNotifications, thunks} from "src/engine"
+  import {env, hasNewMessages, hasNewNotifications} from "src/engine"
 
   const {page} = router
 
@@ -29,7 +31,7 @@
     const success = []
     const failure = []
 
-    for (const {event, request, status} of Object.values($thunks)) {
+    for (const {event, request, status} of Object.values($thunks) as Thunk[]) {
       if (event.created_at < now() - seconds(5, "minute")) {
         continue
       }
diff --git a/src/app/shared/NotePending.svelte b/src/app/shared/NotePending.svelte
index 34bc6b953..f617059c9 100644
--- a/src/app/shared/NotePending.svelte
+++ b/src/app/shared/NotePending.svelte
@@ -22,9 +22,10 @@
 </style>
 
 <script lang="ts">
+  import {thunks, type Thunk} from "@welshman/app"
   import {PublishStatus} from "@welshman/net"
   import type {SignedEvent} from "@welshman/util"
-  import {thunks, userSettings} from "src/engine"
+  import {userSettings} from "src/engine"
   import Anchor from "src/partials/Anchor.svelte"
   import {timestamp1} from "src/util/misc"
   import {spring} from "svelte/motion"
@@ -32,7 +33,7 @@
   export let event: SignedEvent
   export let removeDraft: () => void
 
-  $: thunk = $thunks[event.id]
+  $: thunk = $thunks[event.id] as Thunk
 
   $: status = thunk?.status
 
diff --git a/src/app/views/Publishes.svelte b/src/app/views/Publishes.svelte
index 8c5155ad8..a17c014e0 100644
--- a/src/app/views/Publishes.svelte
+++ b/src/app/views/Publishes.svelte
@@ -6,14 +6,15 @@
   import Tile from "src/partials/Tile.svelte"
   import Subheading from "src/partials/Subheading.svelte"
   import PublishCard from "src/app/shared/PublishCard.svelte"
-  import {thunks} from "src/engine"
-  import type {Thunk} from "@welshman/app"
+  import {thunks, type Thunk} from "@welshman/app"
   import {get} from "svelte/store"
 
   const hasStatus = (thunk: Thunk, statuses: PublishStatus[]) =>
     Object.values(get(thunk.status)).some(s => statuses.includes(s.status))
 
-  $: recent = Object.values($thunks).filter(t => t.event.created_at > now() - seconds(24, "hour"))
+  $: recent = (Object.values($thunks) as Thunk[]).filter(
+    t => t.event.created_at > now() - seconds(24, "hour"),
+  )
   $: relays = new Set(
     remove(
       LOCAL_RELAY_URL,
diff --git a/src/engine/state.ts b/src/engine/state.ts
index 79beef47f..8a40ad94d 100644
--- a/src/engine/state.ts
+++ b/src/engine/state.ts
@@ -1,4 +1,4 @@
-import type {PartialSubscribeRequest, Thunk} from "@welshman/app"
+import type {PartialSubscribeRequest} from "@welshman/app"
 import {
   subscribe as baseSubscribe,
   db,
@@ -104,7 +104,7 @@ import {
 import crypto from "crypto"
 import Fuse from "fuse.js"
 import {batch, doPipe, seconds, sleep} from "hurdak"
-import {assoc, equals, partition, prop, sortBy, without} from "ramda"
+import {equals, partition, prop, sortBy, without} from "ramda"
 import type {PublishedFeed, PublishedListFeed, PublishedUserList} from "src/domain"
 import {
   CollectionSearch,
@@ -159,7 +159,6 @@ export const hasNip44 = derived(signer, $signer => Boolean($signer?.nip44))
 
 export const anonymous = withGetter(writable<AnonymousUserState>({follows: [], relays: []}))
 export const groupHints = withGetter(writable<Record<string, string[]>>({}))
-export const thunks = writable<Record<string, Thunk>>({})
 
 export const projections = new Worker<TrustedEvent>({
   getKey: prop("kind"),
@@ -782,8 +781,6 @@ export const publish = ({forcePlatform = true, ...request}: MyPublishRequest) =>
 
   const thunk = publishThunk(request)
 
-  thunks.update(assoc(request.event.id, thunk))
-
   return thunk
 }
 

From aee49a3d2ef02001a300e48b771ce3ddd0f282ca Mon Sep 17 00:00:00 2001
From: Ticruz <thib.duchene@gmail.com>
Date: Tue, 19 Nov 2024 14:56:21 +0100
Subject: [PATCH 15/20] remove callback addToContext

---
 src/app/shared/NoteActions.svelte | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/app/shared/NoteActions.svelte b/src/app/shared/NoteActions.svelte
index ac4b96e12..16c28aeae 100644
--- a/src/app/shared/NoteActions.svelte
+++ b/src/app/shared/NoteActions.svelte
@@ -133,7 +133,6 @@
         id: note.id,
         anonymous: Boolean(note.wrap),
       })
-      .cx({callback: repository.publish})
       .open()
   }
 

From 506ed2abbde3a4ec6a1d907c61c66e32a3d9807a Mon Sep 17 00:00:00 2001
From: Ticruz <thib.duchene@gmail.com>
Date: Tue, 19 Nov 2024 14:56:46 +0100
Subject: [PATCH 16/20] remove LOCAL_RELAY from statuses

---
 src/app/shared/NotePending.svelte | 17 ++++++++++-------
 src/partials/ThunkStatus.svelte   | 11 ++++++++---
 2 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/src/app/shared/NotePending.svelte b/src/app/shared/NotePending.svelte
index f617059c9..61d46a4a8 100644
--- a/src/app/shared/NotePending.svelte
+++ b/src/app/shared/NotePending.svelte
@@ -24,7 +24,7 @@
 <script lang="ts">
   import {thunks, type Thunk} from "@welshman/app"
   import {PublishStatus} from "@welshman/net"
-  import type {SignedEvent} from "@welshman/util"
+  import {LOCAL_RELAY_URL, type SignedEvent} from "@welshman/util"
   import {userSettings} from "src/engine"
   import Anchor from "src/partials/Anchor.svelte"
   import {timestamp1} from "src/util/misc"
@@ -36,14 +36,17 @@
   $: thunk = $thunks[event.id] as Thunk
 
   $: status = thunk?.status
-
-  $: pendings = Object.values($status || {}).filter(s => s.status === PublishStatus.Pending).length
-  $: failed = Object.values($status || {}).filter(
+  $: relays = thunk?.request?.relays.filter(r => r !== LOCAL_RELAY_URL)
+  $: statuses = Object.entries($status || {})
+    .filter(([k, v]) => k !== LOCAL_RELAY_URL)
+    .map(([k, v]) => v)
+  $: pendings = statuses.filter(s => s.status === PublishStatus.Pending).length
+  $: failed = statuses.filter(
     s => s.status === PublishStatus.Failure || s.status === PublishStatus.Aborted,
   ).length
-  $: timeout = Object.values($status || {}).filter(s => s.status === PublishStatus.Timeout).length
-  $: success = Object.values($status || {}).filter(s => s.status === PublishStatus.Success).length
-  $: total = thunk?.request?.relays.length || 0
+  $: timeout = statuses.filter(s => s.status === PublishStatus.Timeout).length
+  $: success = statuses.filter(s => s.status === PublishStatus.Success).length
+  $: total = relays.length || 0
 
   const completed = spring(0)
 
diff --git a/src/partials/ThunkStatus.svelte b/src/partials/ThunkStatus.svelte
index 10ad37d71..b0720d7ca 100644
--- a/src/partials/ThunkStatus.svelte
+++ b/src/partials/ThunkStatus.svelte
@@ -1,13 +1,18 @@
 <script lang="ts">
   import type {Thunk} from "@welshman/app"
   import {PublishStatus} from "@welshman/net"
+  import {LOCAL_RELAY_URL} from "@welshman/util"
   import Anchor from "src/partials/Anchor.svelte"
 
   export let thunk: Thunk
 
-  const status = thunk.status
-  $: total = thunk.request.relays.length
-  $: pending = Object.values($status).filter(s => s.status === PublishStatus.Pending).length
+  $: status = thunk.status
+  $: relays = thunk.request.relays.filter(r => r != LOCAL_RELAY_URL)
+  $: statuses = Object.entries($status || {})
+    .filter(([k, v]) => k !== LOCAL_RELAY_URL)
+    .map(([k, v]) => v)
+  $: total = relays.length
+  $: pending = statuses.filter(s => s.status === PublishStatus.Pending).length
 </script>
 
 <div>

From 48fca1ab760ba8c14ebd102319cffacb0cd846af Mon Sep 17 00:00:00 2001
From: Ticruz <thib.duchene@gmail.com>
Date: Tue, 19 Nov 2024 15:13:32 +0100
Subject: [PATCH 17/20] sign event before sending

---
 src/app/views/NoteCreate.svelte | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/app/views/NoteCreate.svelte b/src/app/views/NoteCreate.svelte
index b46566090..b06218ab0 100644
--- a/src/app/views/NoteCreate.svelte
+++ b/src/app/views/NoteCreate.svelte
@@ -31,7 +31,7 @@
   import {router} from "src/app/util/router"
   import {dateToSeconds} from "src/util/misc"
   import {currencyOptions} from "src/util/i18n"
-  import {getClientTags, publish, tagsFromContent, userSettings} from "src/engine"
+  import {getClientTags, publish, sign, tagsFromContent, userSettings} from "src/engine"
 
   export let type = "note"
   export let quote = null
@@ -140,11 +140,15 @@
           ],
         }),
     })
+
+    const signedTemplate = await sign(template)
+
     const thunk = publish({
-      event: template,
+      event: signedTemplate,
       relays: ctx.app.router.PublishEvent(template).getUrls(),
       delay: $userSettings.send_delay,
     })
+
     if ($userSettings.send_delay > 0) {
       showToast({
         type: "delay",

From 46f17962d259d15c46141978d8419ea1c26f9e1f Mon Sep 17 00:00:00 2001
From: Ticruz <thib.duchene@gmail.com>
Date: Tue, 19 Nov 2024 15:14:30 +0100
Subject: [PATCH 18/20] delay configuration in seconds

---
 src/app/views/UserSettings.svelte | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/app/views/UserSettings.svelte b/src/app/views/UserSettings.svelte
index a4edb2dc0..e042bffe7 100644
--- a/src/app/views/UserSettings.svelte
+++ b/src/app/views/UserSettings.svelte
@@ -13,11 +13,12 @@
   import SearchSelect from "src/partials/SearchSelect.svelte"
   import {fuzzy} from "src/util/misc"
   import Select from "src/partials/Select.svelte"
+  import {pluralize} from "hurdak"
 
-  const values = {...$userSettings}
+  const values = {...$userSettings, send_delay: $userSettings.send_delay / 1000}
 
   const submit = () => {
-    publishSettings(values)
+    publishSettings({...values, send_delay: values.send_delay * 1000})
 
     showInfo("Your settings have been saved!")
   }
@@ -58,9 +59,9 @@
     <Field>
       <div slot="label" class="flex justify-between">
         <strong>Send Delay</strong>
-        <div>{values.send_delay} ms</div>
+        <div>{values.send_delay} {pluralize(values.send_delay, "second")}</div>
       </div>
-      <Input type="range" step="500" bind:value={values.send_delay} min={0} max={15_000}></Input>
+      <Input type="range" step="1" bind:value={values.send_delay} min={0} max={15}></Input>
       <p slot="info">A delay period allowing you to cancel a reply or note creation, in seconds.</p>
     </Field>
     <Field>

From 75457aeee02862a5764faac927b04ba12daa7990 Mon Sep 17 00:00:00 2001
From: Ticruz <thib.duchene@gmail.com>
Date: Tue, 19 Nov 2024 15:16:02 +0100
Subject: [PATCH 19/20] remove grouphints store

---
 src/engine/state.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/engine/state.ts b/src/engine/state.ts
index 8a40ad94d..7519fbc59 100644
--- a/src/engine/state.ts
+++ b/src/engine/state.ts
@@ -158,7 +158,6 @@ export const hasNip44 = derived(signer, $signer => Boolean($signer?.nip44))
 // Base state
 
 export const anonymous = withGetter(writable<AnonymousUserState>({follows: [], relays: []}))
-export const groupHints = withGetter(writable<Record<string, string[]>>({}))
 
 export const projections = new Worker<TrustedEvent>({
   getKey: prop("kind"),

From 1ea380cf1cb26157fd811a9cf221ae8437fa425e Mon Sep 17 00:00:00 2001
From: Ticruz <thib.duchene@gmail.com>
Date: Tue, 19 Nov 2024 15:36:32 +0100
Subject: [PATCH 20/20] loading indicator until event is signed

---
 src/app/views/NoteCreate.svelte | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/src/app/views/NoteCreate.svelte b/src/app/views/NoteCreate.svelte
index b06218ab0..f46742948 100644
--- a/src/app/views/NoteCreate.svelte
+++ b/src/app/views/NoteCreate.svelte
@@ -41,6 +41,7 @@
   let charCount: Writable<number>
   let wordCount: Writable<number>
   let showPreview = false
+  let signaturePending = false
 
   let editor: Editor
   let element: HTMLElement
@@ -70,6 +71,7 @@
   }
 
   const onSubmit = async ({skipNsecWarning = false} = {}) => {
+    signaturePending = true
     // prevent sending before media are uploaded and tags are correctly set
     if ($loading) return
 
@@ -143,6 +145,8 @@
 
     const signedTemplate = await sign(template)
 
+    signaturePending = false
+
     const thunk = publish({
       event: signedTemplate,
       relays: ctx.app.router.PublishEvent(template).getUrls(),
@@ -313,8 +317,18 @@
         </div>
       </Field>
       <div class="flex gap-2">
-        <Anchor button tag="button" type="submit" class="flex-grow" disabled={$loading}
-          >Send</Anchor>
+        <Anchor
+          button
+          tag="button"
+          type="submit"
+          class="flex-grow"
+          disabled={$loading || signaturePending}>
+          {#if signaturePending}
+            <i class="fa fa-circle-notch fa-spin" />
+          {:else}
+            Send
+          {/if}
+        </Anchor>
         <button
           class="hover:bg-white-l staatliches flex h-7 w-7 cursor-pointer items-center justify-center gap-2 whitespace-nowrap rounded bg-white px-6 text-xl text-black transition-all"
           on:click|preventDefault={editor.commands.selectFiles}>