From 39a58910f8df6384a58e57358ce08120e207dc09 Mon Sep 17 00:00:00 2001
From: userAdityaa <aditya.chaudhary1558@gmail.com>
Date: Mon, 1 Jun 2026 15:36:38 +0530
Subject: [PATCH] feat: show per-relay failure, pending breakdown on outgoing
 messages

---
 src/app/components/Chat.svelte              |   2 +-
 src/app/components/ChatMessage.svelte       |   6 +-
 src/app/components/RoomItem.svelte          |   4 +-
 src/app/components/ThunkFailure.svelte      |  42 +++-----
 src/app/components/ThunkStatus.svelte       |  14 ++-
 src/app/components/ThunkStatusDetail.svelte | 108 +++++++++++++++++---
 src/routes/spaces/[relay]/[h]/+page.svelte  |   2 +-
 src/routes/spaces/[relay]/chat/+page.svelte |   2 +-
 8 files changed, 127 insertions(+), 53 deletions(-)

diff --git a/src/app/components/Chat.svelte b/src/app/components/Chat.svelte
index 4a078841..6d060ecf 100644
--- a/src/app/components/Chat.svelte
+++ b/src/app/components/Chat.svelte
@@ -280,7 +280,7 @@
   </div>
 </PageBar>
 
-<PageContent class="flex flex-col-reverse gap-2 py-4">
+<PageContent class="flex flex-col-reverse gap-2 py-4 md:pb-8!">
   {#if missingRelayLists.length > 0}
     <div class="py-12">
       <div class="card2 col-2 m-auto max-w-md items-center text-center">
diff --git a/src/app/components/ChatMessage.svelte b/src/app/components/ChatMessage.svelte
index c54249b1..f8022a96 100644
--- a/src/app/components/ChatMessage.svelte
+++ b/src/app/components/ChatMessage.svelte
@@ -65,9 +65,6 @@
   let popoverIsVisible = $state(false)
 </script>
 
-{#if thunk}
-  <ThunkFailure showToastOnRetry {thunk} class="mt-1" />
-{/if}
 <div
   data-event={event.id}
   class="group chat flex items-center justify-end gap-1 px-2"
@@ -125,6 +122,9 @@
         <Content showEntire {event} />
       </div>
     </TapTarget>
+    {#if isOwn && thunk}
+      <ThunkFailure showToastOnRetry {thunk} class="mb-2 mr-2" />
+    {/if}
     <div class="row-2 z-feature -mt-4 ml-4">
       <ReactionSummary {event} {deleteReaction} {createReaction} noTooltip />
     </div>
diff --git a/src/app/components/RoomItem.svelte b/src/app/components/RoomItem.svelte
index 1cf4623c..2fc3898d 100644
--- a/src/app/components/RoomItem.svelte
+++ b/src/app/components/RoomItem.svelte
@@ -126,8 +126,8 @@
       {/if}
       <div class:mt-2={showPubkey && event.kind !== MESSAGE}>
         <RoomItemContent {url} event={$innerEvent ?? event} />
-        {#if thunk}
-          <ThunkFailure showToastOnRetry {thunk} class="mt-2 text-sm" />
+        {#if event.pubkey === $pubkey && thunk}
+          <ThunkFailure showToastOnRetry {thunk} class="mt-1 flex justify-end" />
         {/if}
       </div>
     </div>
diff --git a/src/app/components/ThunkFailure.svelte b/src/app/components/ThunkFailure.svelte
index c09186e3..b21691db 100644
--- a/src/app/components/ThunkFailure.svelte
+++ b/src/app/components/ThunkFailure.svelte
@@ -1,14 +1,14 @@
 <script lang="ts">
+  import type {Instance} from "tippy.js"
   import {stopPropagation} from "svelte/legacy"
   import {noop} from "@welshman/lib"
   import type {AbstractThunk} from "@welshman/app"
-  import {retryThunk, thunkIsComplete, getFailedThunkUrls} from "@welshman/app"
+  import {getFailedThunkUrls, getThunkUrlsWithStatus, thunkIsComplete} from "@welshman/app"
+  import {PublishStatus} from "@welshman/net"
   import Danger from "@assets/icons/danger-triangle.svg?dataurl"
   import Icon from "@lib/components/Icon.svelte"
   import Tippy from "@lib/components/Tippy.svelte"
-  import ThunkToast from "@app/components/ThunkToast.svelte"
   import ThunkStatusDetail from "@app/components/ThunkStatusDetail.svelte"
-  import {pushToast} from "@app/util/toast"
 
   interface Props {
     thunk: AbstractThunk
@@ -16,40 +16,32 @@
     class?: string
   }
 
-  let {thunk, showToastOnRetry, ...restProps}: Props = $props()
+  const {thunk, showToastOnRetry, ...restProps}: Props = $props()
 
-  const retry = () => {
-    thunk = retryThunk(thunk)
-
-    if (showToastOnRetry) {
-      pushToast({
-        timeout: 30_000,
-        children: {
-          component: ThunkToast,
-          props: {thunk},
-        },
-      })
-    }
-  }
-
-  const failedUrls = $derived(getFailedThunkUrls($thunk))
+  const failedUrls = $derived([
+    ...getFailedThunkUrls($thunk),
+    ...getThunkUrlsWithStatus(PublishStatus.Aborted, $thunk),
+  ])
   const showFailure = $derived(thunkIsComplete($thunk) && failedUrls.length > 0)
+
+  let popover: Instance | undefined = $state()
+
+  const hideDetail = () => popover?.hide()
 </script>
 
 {#if showFailure}
-  {@const url = failedUrls[0]}
-  {@const {status, detail: message} = $thunk.results[url]}
   <button
     class="flex w-full justify-end px-1 text-xs {restProps.class}"
     onclick={stopPropagation(noop)}>
     <Tippy
+      bind:popover
       class="flex items-center"
       component={ThunkStatusDetail}
-      props={{url, message, status, retry}}
-      params={{interactive: true}}>
+      props={{thunk, hide: hideDetail, showToastOnRetry}}
+      params={{interactive: true, maxWidth: "none"}}>
       {#snippet children()}
-        <span class="flex cursor-pointer items-center gap-1 text-error">
-          <Icon icon={Danger} size={3} />
+        <span class="flex cursor-pointer items-center gap-1 opacity-75">
+          <Icon icon={Danger} class="text-error" size={3} />
           <span>Failed to send!</span>
         </span>
       {/snippet}
diff --git a/src/app/components/ThunkStatus.svelte b/src/app/components/ThunkStatus.svelte
index 4d5684d4..6afd6037 100644
--- a/src/app/components/ThunkStatus.svelte
+++ b/src/app/components/ThunkStatus.svelte
@@ -1,22 +1,28 @@
 <script lang="ts">
   import type {AbstractThunk} from "@welshman/app"
-  import {thunkIsComplete, getFailedThunkUrls} from "@welshman/app"
+  import {thunkIsComplete, getFailedThunkUrls, getThunkUrlsWithStatus} from "@welshman/app"
+  import {PublishStatus} from "@welshman/net"
   import ThunkFailure from "@app/components/ThunkFailure.svelte"
   import ThunkPending from "@app/components/ThunkPending.svelte"
 
   interface Props {
     thunk: AbstractThunk
+    showToastOnRetry?: boolean
     class?: string
   }
 
-  const {thunk, ...restProps}: Props = $props()
+  const {thunk, showToastOnRetry, ...restProps}: Props = $props()
 
-  const showFailure = $derived(thunkIsComplete($thunk) && getFailedThunkUrls($thunk).length > 0)
+  const failedUrls = $derived([
+    ...getFailedThunkUrls($thunk),
+    ...getThunkUrlsWithStatus(PublishStatus.Aborted, $thunk),
+  ])
+  const showFailure = $derived(thunkIsComplete($thunk) && failedUrls.length > 0)
   const showPending = $derived(!thunkIsComplete($thunk))
 </script>
 
 {#if showFailure}
-  <ThunkFailure class={restProps.class} {thunk} />
+  <ThunkFailure class={restProps.class} {thunk} {showToastOnRetry} />
 {:else if showPending}
   <ThunkPending class={restProps.class} {thunk} />
 {/if}
diff --git a/src/app/components/ThunkStatusDetail.svelte b/src/app/components/ThunkStatusDetail.svelte
index 3da57bb4..969dabb1 100644
--- a/src/app/components/ThunkStatusDetail.svelte
+++ b/src/app/components/ThunkStatusDetail.svelte
@@ -1,32 +1,108 @@
 <script lang="ts">
+  import {stopPropagation} from "svelte/legacy"
+  import type {AbstractThunk} from "@welshman/app"
+  import {
+    flattenThunks,
+    getFailedThunkUrls,
+    getThunkUrlsWithStatus,
+    publishThunk,
+  } from "@welshman/app"
   import {PublishStatus} from "@welshman/net"
   import {displayRelayUrl} from "@welshman/util"
+  import CheckCircle from "@assets/icons/check-circle.svg?dataurl"
+  import Close from "@assets/icons/close.svg?dataurl"
+  import Danger from "@assets/icons/danger-triangle.svg?dataurl"
+  import Icon from "@lib/components/Icon.svelte"
   import Button from "@lib/components/Button.svelte"
   import {addPeriod} from "@lib/util"
+  import ThunkToast from "@app/components/ThunkToast.svelte"
+  import {pushToast} from "@app/util/toast"
 
   interface Props {
-    url: string
-    status: string
-    message: string
-    retry: () => void
+    thunk: AbstractThunk
+    hide: () => void
+    showToastOnRetry?: boolean
   }
 
-  let {url, status, message = $bindable(), retry}: Props = $props()
+  const {thunk, hide, showToastOnRetry}: Props = $props()
 
-  $effect(() => {
-    if (!message && status === PublishStatus.Timeout) {
-      message = "request timed out"
+  const successUrls = $derived(getThunkUrlsWithStatus(PublishStatus.Success, $thunk))
+  const failedUrls = $derived([
+    ...getFailedThunkUrls($thunk),
+    ...getThunkUrlsWithStatus(PublishStatus.Aborted, $thunk),
+  ])
+  const total = $derived(successUrls.length + failedUrls.length)
+  const isPartial = $derived(successUrls.length > 0 && failedUrls.length > 0)
+
+  const title = $derived(
+    isPartial ? `Partial delivery ${successUrls.length}/${total} relays` : "Failed to send!",
+  )
+
+  const relayMessage = (status: PublishStatus | undefined, detail: string | undefined) => {
+    if (detail) {
+      return detail
     }
 
-    if (!message) {
-      message = "no details recieved"
+    if (status === PublishStatus.Timeout) {
+      return "request timed out"
     }
-  })
+
+    return "no details received"
+  }
+
+  const retryRelay = (url: string) => {
+    for (const child of flattenThunks([thunk])) {
+      if (!child.options.relays.includes(url)) {
+        continue
+      }
+
+      const retried = publishThunk({...child.options, relays: [url]})
+
+      if (showToastOnRetry) {
+        pushToast({
+          timeout: 30_000,
+          children: {
+            component: ThunkToast,
+            props: {thunk: retried},
+          },
+        })
+      }
+
+      return
+    }
+  }
 </script>
 
-<div class="card2 bg-alt col-2 shadow-lg">
-  <p>
-    Failed to publish to {displayRelayUrl(url)}: {addPeriod(message)}
-  </p>
-  <Button class="link" onclick={retry}>Retry</Button>
+<div class="card2 bg-alt flex min-w-72 max-w-sm flex-col gap-3 px-4 py-3 shadow-lg">
+  <div class="flex items-center justify-between gap-2">
+    <span class="flex items-center gap-2 text-sm font-medium">
+      <Icon icon={Danger} class="text-error" size={4} />
+      {title}
+    </span>
+    <button type="button" class="opacity-50 hover:opacity-100" onclick={hide}>
+      <Icon icon={Close} size={4} />
+    </button>
+  </div>
+  <div class="divider my-0"></div>
+  <div class="flex flex-col gap-3">
+    {#each successUrls as url (url)}
+      <div class="flex items-start gap-2 text-sm">
+        <Icon icon={CheckCircle} class="mt-0.5 shrink-0 text-success" size={4} />
+        <span>{displayRelayUrl(url)}</span>
+      </div>
+    {/each}
+    {#each failedUrls as url (url)}
+      {@const {detail, status} = $thunk.results[url] || {}}
+      <div class="grid grid-cols-[1rem_1fr_auto] items-start gap-x-3 gap-y-1 text-sm">
+        <Icon icon={Danger} class="mt-0.5 text-error" size={4} />
+        <div class="min-w-0">
+          <p class="break-all">{displayRelayUrl(url)}</p>
+          <p class="text-xs opacity-60">{addPeriod(relayMessage(status, detail))}</p>
+        </div>
+        <Button class="link shrink-0 px-1" onclick={stopPropagation(() => retryRelay(url))}>
+          Retry
+        </Button>
+      </div>
+    {/each}
+  </div>
 </div>
diff --git a/src/routes/spaces/[relay]/[h]/+page.svelte b/src/routes/spaces/[relay]/[h]/+page.svelte
index 55ea26d8..a238253c 100644
--- a/src/routes/spaces/[relay]/[h]/+page.svelte
+++ b/src/routes/spaces/[relay]/[h]/+page.svelte
@@ -470,7 +470,7 @@
       bind:element
       onscroll={onScroll}
       class={cx(
-        "flex-col-reverse pb-0! pt-4",
+        "flex-col-reverse pb-0! pt-4 md:pb-8!",
         showMobileVideoPanel ? "hidden md:flex md:flex-col-reverse" : "flex",
         pageContentHiddenDesktopVideoOnly && "md:hidden",
       )}>
diff --git a/src/routes/spaces/[relay]/chat/+page.svelte b/src/routes/spaces/[relay]/chat/+page.svelte
index 9fdd55d3..07795e51 100644
--- a/src/routes/spaces/[relay]/chat/+page.svelte
+++ b/src/routes/spaces/[relay]/chat/+page.svelte
@@ -318,7 +318,7 @@
   {/snippet}
 </SpaceBar>
 
-<PageContent bind:element onscroll={onScroll} class="flex flex-col-reverse pt-4 pb-0!">
+<PageContent bind:element onscroll={onScroll} class="flex flex-col-reverse pt-4 pb-0! md:pb-8!">
   {#if loadingForward}
     <p class="py-20 flex justify-center">
       <Spinner loading={loadingForward}>Looking for messages...</Spinner>