From 9b6eef456fef6329458dbf86f356fa2ade5129a4 Mon Sep 17 00:00:00 2001
From: Jon Staab <shtaab@gmail.com>
Date: Thu, 24 Oct 2024 16:33:41 -0700
Subject: [PATCH] Lint/format, fix message reaction deletion

---
 src/app/components/ChannelMessageMenuMobile.svelte |  3 ++-
 src/app/components/ChatMessage.svelte              | 11 ++++-------
 src/app/components/ChatMessageMenuMobile.svelte    |  1 -
 src/lib/components/FieldInline.svelte              |  2 +-
 src/routes/+layout.svelte                          |  1 -
 5 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/src/app/components/ChannelMessageMenuMobile.svelte b/src/app/components/ChannelMessageMenuMobile.svelte
index c265a4d8..ef3c0c4f 100644
--- a/src/app/components/ChannelMessageMenuMobile.svelte
+++ b/src/app/components/ChannelMessageMenuMobile.svelte
@@ -27,7 +27,8 @@
 
   const showEmojiPicker = () => pushModal(EmojiPicker, {onClick: onEmoji}, {replaceState: true})
 
-  const showConversation = () => pushDrawer(ChannelConversation, {url, room, event}, {replaceState: true})
+  const showConversation = () =>
+    pushDrawer(ChannelConversation, {url, room, event}, {replaceState: true})
 
   const showInfo = () => pushModal(EventInfo, {event}, {replaceState: true})
 
diff --git a/src/app/components/ChatMessage.svelte b/src/app/components/ChatMessage.svelte
index f94dc005..8c2c6a8e 100644
--- a/src/app/components/ChatMessage.svelte
+++ b/src/app/components/ChatMessage.svelte
@@ -1,5 +1,4 @@
 <script lang="ts">
-  import {onMount} from 'svelte'
   import {type Instance} from "tippy.js"
   import {hash} from "@welshman/lib"
   import type {TrustedEvent} from "@welshman/util"
@@ -11,7 +10,6 @@
   import Tippy from "@lib/components/Tippy.svelte"
   import LongPress from "@lib/components/LongPress.svelte"
   import Avatar from "@lib/components/Avatar.svelte"
-  import Button from "@lib/components/Button.svelte"
   import Content from "@app/components/Content.svelte"
   import ReplySummary from "@app/components/ReplySummary.svelte"
   import ReactionSummary from "@app/components/ReactionSummary.svelte"
@@ -33,13 +31,12 @@
 
   const onReactionClick = async (content: string, events: TrustedEvent[]) => {
     const reaction = events.find(e => e.pubkey === $pubkey)
-    const template = reaction ? makeDelete({event}) : makeReaction({event, content})
+    const template = reaction ? makeDelete({event: reaction}) : makeReaction({event, content})
 
     await sendWrapped({template, pubkeys})
   }
 
-  const showMobileMenu = () =>
-    pushModal(ChatMessageMenuMobile, {event})
+  const showMobileMenu = () => pushModal(ChatMessageMenuMobile, {event, pubkeys})
 
   const togglePopover = () => {
     if (popoverIsVisible) {
@@ -84,7 +81,7 @@
     </button>
   </Tippy>
   <div class="flex flex-col">
-    <LongPress class="text-left chat-bubble mx-1 max-w-sm" onLongPress={showMobileMenu}>
+    <LongPress class="chat-bubble mx-1 max-w-sm text-left" onLongPress={showMobileMenu}>
       <div class="flex w-full items-start gap-2">
         {#if showPubkey}
           <Link external href={pubkeyLink(event.pubkey)}>
@@ -113,7 +110,7 @@
         </div>
       </div>
     </LongPress>
-    <div class="row-2 ml-4 -mt-1 z-feature">
+    <div class="row-2 z-feature -mt-1 ml-4">
       <ReplySummary {event} />
       <ReactionSummary {event} {onReactionClick} />
     </div>
diff --git a/src/app/components/ChatMessageMenuMobile.svelte b/src/app/components/ChatMessageMenuMobile.svelte
index 60c5027e..690ca6da 100644
--- a/src/app/components/ChatMessageMenuMobile.svelte
+++ b/src/app/components/ChatMessageMenuMobile.svelte
@@ -3,7 +3,6 @@
   import Icon from "@lib/components/Icon.svelte"
   import Button from "@lib/components/Button.svelte"
   import EmojiPicker from "@lib/components/EmojiPicker.svelte"
-  import ChatMessageEmojiButton from "@app/components/ChatMessageEmojiButton.svelte"
   import EventInfo from "@app/components/EventInfo.svelte"
   import {makeReaction, sendWrapped} from "@app/commands"
   import {pushModal} from "@app/modal"
diff --git a/src/lib/components/FieldInline.svelte b/src/lib/components/FieldInline.svelte
index 5017ce5c..01e71696 100644
--- a/src/lib/components/FieldInline.svelte
+++ b/src/lib/components/FieldInline.svelte
@@ -1,4 +1,4 @@
-<div class="grid grid-cols-1 sm:grid-cols-2 gap-2 {$$props.class}">
+<div class="grid grid-cols-1 gap-2 sm:grid-cols-2 {$$props.class}">
   <label class="flex items-center gap-2 font-bold">
     <slot name="label" />
   </label>
diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte
index 70ddd46a..61c7cdeb 100644
--- a/src/routes/+layout.svelte
+++ b/src/routes/+layout.svelte
@@ -1,6 +1,5 @@
 <script lang="ts">
   import "@src/app.css"
-  import 'long-press-event'
   import {onMount} from "svelte"
   import {get} from "svelte/store"
   import {dev} from "$app/environment"