From 13628aeb714a0bf86fa87e98f0476e1af7c5b647 Mon Sep 17 00:00:00 2001
From: Jon Staab <shtaab@gmail.com>
Date: Wed, 16 Oct 2024 11:27:27 -0700
Subject: [PATCH] Add message deletion

---
 src/app/components/ChannelMessage.svelte      |  8 +--
 src/app/components/ChannelMessageMenu.svelte  | 50 +++++++++++++++++++
 .../ChannelMessageMenuButton.svelte           | 39 +++++++++++++++
 src/assets/icons/Trash Bin 2.svg              |  5 ++
 src/lib/components/Confirm.svelte             | 19 +++++--
 src/lib/components/Icon.svelte                |  2 +
 src/lib/components/Tippy.svelte               |  1 +
 src/routes/+layout.svelte                     |  1 +
 8 files changed, 116 insertions(+), 9 deletions(-)
 create mode 100644 src/app/components/ChannelMessageMenu.svelte
 create mode 100644 src/app/components/ChannelMessageMenuButton.svelte
 create mode 100644 src/assets/icons/Trash Bin 2.svg

diff --git a/src/app/components/ChannelMessage.svelte b/src/app/components/ChannelMessage.svelte
index d400445a..eb570758 100644
--- a/src/app/components/ChannelMessage.svelte
+++ b/src/app/components/ChannelMessage.svelte
@@ -18,9 +18,9 @@
   import Avatar from "@lib/components/Avatar.svelte"
   import Button from "@lib/components/Button.svelte"
   import Content from "@app/components/Content.svelte"
-  import EventInfo from "@app/components/EventInfo.svelte"
   import ChannelThread from "@app/components/ChannelThread.svelte"
   import ChannelMessageEmojiButton from "@app/components/ChannelMessageEmojiButton.svelte"
+  import ChannelMessageMenuButton from "@app/components/ChannelMessageMenuButton.svelte"
   import {colors, tagRoom, deriveEvent, displayReaction} from "@app/state"
   import {publishDelete, publishReaction} from "@app/commands"
   import {pushModal} from "@app/modal"
@@ -45,8 +45,6 @@
     derived(publishStatusData, $m => Object.values($m[event.id] || {})),
   )
 
-  const showInfo = () => pushModal(EventInfo, {event})
-
   const findStatus = ($ps: PublishStatusData[], statuses: PublishStatus[]) =>
     $ps.find(({status}) => statuses.includes(status))
 
@@ -152,8 +150,6 @@
     class="join absolute right-1 top-1 border border-solid border-neutral text-xs opacity-0 transition-all group-hover:opacity-100"
     on:click|stopPropagation>
     <ChannelMessageEmojiButton {url} {room} {event} />
-    <Button class="btn join-item btn-xs" on:click={showInfo}>
-      <Icon size={4} icon="code-2" />
-    </Button>
+    <ChannelMessageMenuButton {url} {room} {event} />
   </button>
 </button>
diff --git a/src/app/components/ChannelMessageMenu.svelte b/src/app/components/ChannelMessageMenu.svelte
new file mode 100644
index 00000000..6240f101
--- /dev/null
+++ b/src/app/components/ChannelMessageMenu.svelte
@@ -0,0 +1,50 @@
+<script lang="ts">
+  import {pubkey, publishThunk} from '@welshman/app'
+  import Button from "@lib/components/Button.svelte"
+  import Icon from "@lib/components/Icon.svelte"
+  import Confirm from "@lib/components/Confirm.svelte"
+  import EventInfo from "@app/components/EventInfo.svelte"
+  import {makeDelete} from '@app/commands'
+  import {pushModal} from '@app/modal'
+
+  export let url
+  export let event
+  export let onClick
+
+  const showInfo = () => {
+    onClick()
+    pushModal(EventInfo, {event})
+  }
+
+  const showDelete = () => {
+    onClick()
+    pushModal(Confirm, {
+      title: "Delete Message",
+      subtitle: "Are you sure you want to delete this message?",
+      message: `
+        This will send a request to delete this message.
+        Be aware that not all relays may honor this request.`,
+      confirm: async () => {
+        await publishThunk({event: makeDelete({event}), relays: [url]})
+        history.back()
+      },
+    })
+  }
+</script>
+
+<ul class="menu rounded-box bg-base-100 p-2 shadow-xl whitespace-nowrap">
+  <li>
+    <Button on:click={showInfo}>
+      <Icon size={4} icon="code-2" />
+      Message Details
+    </Button>
+  </li>
+  {#if event.pubkey === $pubkey}
+    <li>
+      <Button on:click={showDelete} class="text-error">
+        <Icon size={4} icon="trash-bin-2" />
+        Delete Message
+      </Button>
+    </li>
+  {/if}
+</ul>
diff --git a/src/app/components/ChannelMessageMenuButton.svelte b/src/app/components/ChannelMessageMenuButton.svelte
new file mode 100644
index 00000000..f91320f1
--- /dev/null
+++ b/src/app/components/ChannelMessageMenuButton.svelte
@@ -0,0 +1,39 @@
+<script lang="ts">
+  import {type Instance} from "tippy.js"
+  import {between} from "@welshman/lib"
+  import Icon from "@lib/components/Icon.svelte"
+  import Button from "@lib/components/Button.svelte"
+  import Tippy from "@lib/components/Tippy.svelte"
+  import ChannelMessageMenu from "@app/components/ChannelMessageMenu.svelte"
+  import {tagRoom} from "@app/state"
+  import {publishReaction} from "@app/commands"
+
+  export let url, room, event
+
+  const open = () => popover.show()
+
+  const onClick = () => popover.hide()
+
+  const onMouseMove = ({clientX, clientY}: any) => {
+    const {x, y, width, height} = popover.popper.getBoundingClientRect()
+
+    if (!between([x, x + width], clientX) || !between([y, y + height + 30], clientY)) {
+      popover.hide()
+    }
+  }
+
+  let popover: Instance
+</script>
+
+<svelte:document on:mousemove={onMouseMove} />
+
+<div class="flex">
+  <Button class="btn join-item btn-xs" on:click={open}>
+    <Icon icon="menu-dots" size={4} />
+  </Button>
+  <Tippy
+    bind:popover
+    component={ChannelMessageMenu}
+    props={{url, room, event, onClick}}
+    params={{trigger: "manual", interactive: true}} />
+</div>
diff --git a/src/assets/icons/Trash Bin 2.svg b/src/assets/icons/Trash Bin 2.svg
new file mode 100644
index 00000000..8fdc10ed
--- /dev/null
+++ b/src/assets/icons/Trash Bin 2.svg	
@@ -0,0 +1,5 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M20.5 6H3.49991" stroke="#1C274C" stroke-width="1.5" stroke-linecap="round"/>
+<path d="M18.8333 8.5L18.3734 15.3991C18.1964 18.054 18.1079 19.3815 17.2429 20.1907C16.3779 21 15.0475 21 12.3867 21H11.6133C8.95252 21 7.62212 21 6.75711 20.1907C5.8921 19.3815 5.80361 18.054 5.62661 15.3991L5.16667 8.5" stroke="#1C274C" stroke-width="1.5" stroke-linecap="round"/>
+<path d="M6.5 6C6.55588 6 6.58382 6 6.60915 5.99936C7.43259 5.97849 8.15902 5.45491 8.43922 4.68032C8.44784 4.65649 8.45667 4.62999 8.47434 4.57697L8.57143 4.28571C8.65431 4.03708 8.69575 3.91276 8.75071 3.8072C8.97001 3.38607 9.37574 3.09364 9.84461 3.01877C9.96213 3 10.0932 3 10.3553 3H13.6447C13.9068 3 14.0379 3 14.1554 3.01877C14.6243 3.09364 15.03 3.38607 15.2493 3.8072C15.3043 3.91276 15.3457 4.03708 15.4286 4.28571L15.5257 4.57697C15.5433 4.62992 15.5522 4.65651 15.5608 4.68032C15.841 5.45491 16.5674 5.97849 17.3909 5.99936C17.4162 6 17.4441 6 17.5 6" stroke="#1C274C" stroke-width="1.5"/>
+</svg>
diff --git a/src/lib/components/Confirm.svelte b/src/lib/components/Confirm.svelte
index 57732ef6..007d8517 100644
--- a/src/lib/components/Confirm.svelte
+++ b/src/lib/components/Confirm.svelte
@@ -1,6 +1,7 @@
 <script lang="ts">
   import Icon from "@lib/components/Icon.svelte"
   import Button from "@lib/components/Button.svelte"
+  import Spinner from "@lib/components/Spinner.svelte"
   import ModalHeader from "@lib/components/ModalHeader.svelte"
   import ModalFooter from "@lib/components/ModalFooter.svelte"
 
@@ -9,10 +10,22 @@
   export let message
   export let confirm
 
+  let loading = false
+
+  const tryConfirm = async () => {
+    loading = true
+
+    try {
+      await confirm()
+    } finally {
+      loading = false
+    }
+  }
+
   const back = () => history.back()
 </script>
 
-<form class="column gap-4" on:submit|preventDefault={confirm}>
+<form class="column gap-4" on:submit|preventDefault={tryConfirm}>
   <ModalHeader>
     <div slot="title">{title}</div>
     <div slot="info">{subtitle}</div>
@@ -23,8 +36,8 @@
       <Icon icon="alt-arrow-left" />
       Go back
     </Button>
-    <Button type="submit" class="btn btn-primary">
-      Confirm
+    <Button type="submit" class="btn btn-primary" disabled={loading}>
+      <Spinner {loading}>Confirm</Spinner>
       <Icon icon="alt-arrow-right" />
     </Button>
   </ModalFooter>
diff --git a/src/lib/components/Icon.svelte b/src/lib/components/Icon.svelte
index a1a07bfd..767db3b5 100644
--- a/src/lib/components/Icon.svelte
+++ b/src/lib/components/Icon.svelte
@@ -66,6 +66,7 @@
   import ShopMinimalistic from "@assets/icons/Shop Minimalistic.svg?dataurl"
   import SmileCircle from "@assets/icons/Smile Circle.svg?dataurl"
   import SquareShareLine from "@assets/icons/Square Share Line.svg?dataurl"
+  import TrashBin2 from "@assets/icons/Trash Bin 2.svg?dataurl"
   import UFO3 from "@assets/icons/UFO 3.svg?dataurl"
   import UserHeart from "@assets/icons/User Heart.svg?dataurl"
   import UserCircle from "@assets/icons/User Circle.svg?dataurl"
@@ -137,6 +138,7 @@
     "smile-circle": SmileCircle,
     settings: Settings,
     "tag-horizontal": TagHorizontal,
+    "trash-bin-2": TrashBin2,
     "ufo-3": UFO3,
     "square-share-line": SquareShareLine,
     "user-heart": UserHeart,
diff --git a/src/lib/components/Tippy.svelte b/src/lib/components/Tippy.svelte
index 9d1c61f5..f08e729c 100644
--- a/src/lib/components/Tippy.svelte
+++ b/src/lib/components/Tippy.svelte
@@ -22,6 +22,7 @@
       popover = tippy(element, {
         content: target,
         animation: "shift-away",
+        appendTo: document.querySelector('.tippy-target')!,
         ...params,
       })
 
diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte
index 282f5261..71103bc6 100644
--- a/src/routes/+layout.svelte
+++ b/src/routes/+layout.svelte
@@ -143,5 +143,6 @@
       <slot />
     </AppContainer>
     <ModalContainer />
+    <div class="tippy-target" />
   </div>
 {/await}