From 6802b411e2502f80833ea7e0a1822fb0b212fb78 Mon Sep 17 00:00:00 2001
From: Jonathan Staab <shtaab@gmail.com>
Date: Fri, 3 Mar 2023 12:54:26 -0600
Subject: [PATCH] Add images to replies

---
 CHANGELOG.md                      |  2 ++
 ROADMAP.md                        |  1 -
 src/partials/ImageInput.svelte    | 10 ++++--
 src/partials/Modal.svelte         |  2 +-
 src/views/notes/Note.svelte       | 51 ++++++++++++++++++++++---------
 src/views/notes/NoteCreate.svelte |  2 +-
 src/views/notes/NoteDetail.svelte |  2 +-
 7 files changed, 49 insertions(+), 21 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a946160a..55da49a9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,8 @@
 
 - [x] Add search by nip05
 - [x] Fix feed to show more variety
+- [x] Beautify notes
+- [x] Add uploads to replies
 
 ## 0.2.15
 
diff --git a/ROADMAP.md b/ROADMAP.md
index 8e9fe43e..f345e580 100644
--- a/ROADMAP.md
+++ b/ROADMAP.md
@@ -1,6 +1,5 @@
 # Current
 
-- [ ] Strip zero width spaces from compose
 - [ ] Fix iOS/safari/firefox
 - [ ] Add dynamic title tag
 - [ ] Show more link on long notes (rather than just an ellipsis)
diff --git a/src/partials/ImageInput.svelte b/src/partials/ImageInput.svelte
index 24b0e42d..6072e011 100644
--- a/src/partials/ImageInput.svelte
+++ b/src/partials/ImageInput.svelte
@@ -61,9 +61,13 @@
     <i slot="before" class={`fa fa-${icon}`} />
   </Input>
   {/if}
-  <Anchor type="button" on:click={() => { isOpen = true }}>
-    <i class="fa fa-upload" />
-  </Anchor>
+  <div on:click={() => { isOpen = true }}>
+    <slot name="button">
+      <Anchor type="button">
+        <i class="fa fa-upload" />
+      </Anchor>
+    </slot>
+  </div>
 </div>
 
 {#if quote}
diff --git a/src/partials/Modal.svelte b/src/partials/Modal.svelte
index 87f4b360..34dd554d 100644
--- a/src/partials/Modal.svelte
+++ b/src/partials/Modal.svelte
@@ -20,7 +20,7 @@
     transition:fade
     on:click={onEscape} />
   <div
-    class="absolute inset-0 mt-20 sm:mt-28 modal-content"
+    class="absolute inset-0 mt-24 sm:mt-28 modal-content"
     transition:fly={{y: 1000, opacity: 1}}>
     <div class="bg-dark border-t border-solid border-medium h-full w-full overflow-auto pb-10">
       <slot />
diff --git a/src/views/notes/Note.svelte b/src/views/notes/Note.svelte
index a9b18bdb..e752d40c 100644
--- a/src/views/notes/Note.svelte
+++ b/src/views/notes/Note.svelte
@@ -13,6 +13,7 @@
   import {formatTimestamp, now, tryJson, stringToColor, formatSats, fetchJson} from 'src/util/misc'
   import {extractUrls, copyToClipboard} from "src/util/html"
   import ImageCircle from 'src/partials/ImageCircle.svelte'
+  import ImageInput from 'src/partials/ImageInput.svelte'
   import Input from 'src/partials/Input.svelte'
   import Textarea from 'src/partials/Textarea.svelte'
   import Content from 'src/partials/Content.svelte'
@@ -46,6 +47,7 @@
     without([user.getPubkey()], uniq(Tags.from(note).type("p").values().all().concat(note.pubkey)))
 
   let zap = null
+  let image = null
   let reply = null
   let replyMentions = getDefaultReplyMentions()
   let replyContainer = null
@@ -197,6 +199,10 @@
   const sendReply = async () => {
     let {content, mentions, topics} = reply.parse()
 
+    if (image) {
+      content = (content + '\n' + image).trim()
+    }
+
     if (content) {
       mentions = uniq(mentions.concat(replyMentions))
 
@@ -389,16 +395,16 @@
           </button>
           {/if}
         </div>
-        <div class="flex justify-between text-light" on:click={e => e.stopPropagation()}>
+        <div class="flex justify-between text-light">
           <div class="flex">
             <div class="w-16">
-              <button class="fa fa-reply cursor-pointer" on:click={startReply} />
+              <button class="fa fa-reply cursor-pointer" on:click|stopPropagation={startReply} />
               {$repliesCount}
             </div>
             <div class="w-16" class:text-accent={like}>
               <button
                 class={cx('fa fa-heart cursor-pointer', {'fa-beat fa-beat-custom': like})}
-                on:click={() => like ? deleteReaction(like) : react("+")} />
+                on:click|stopPropagation={() => like ? deleteReaction(like) : react("+")} />
               {$likesCount}
             </div>
             <div class="w-20" class:text-accent={zapped}>
@@ -406,16 +412,17 @@
                 class={cx("fa fa-bolt cursor-pointer", {
                   'pointer-events-none opacity-50': !canZap,
                 })}
-                on:click={startZap} />
+                on:click|stopPropagation={startZap} />
               {formatSats($zapsTotal)}
             </div>
             <div class="w-16">
-              <button class="fa fa-flag cursor-pointer" on:click={() => react("-")} />
+              <button class="fa fa-flag cursor-pointer" on:click|stopPropagation={() => react("-")} />
               {$flagsCount}
             </div>
           </div>
           <div
-            class="cursor-pointer flex gap-1 items-center" on:click={() => { showRelays = true }}>
+            class="cursor-pointer flex gap-1 items-center"
+            on:click|stopPropagation={() => { showRelays = true }}>
             <i class="fa fa-server" />
             <div
               class="h-1 w-1 rounded-full"
@@ -429,8 +436,13 @@
 </div>
 
 {#if reply}
-<div transition:slide class="note-reply relative z-10" bind:this={replyContainer}>
-  <div class={`border border-${borderColor} border-solid rounded-t bg-dark`} on:keydown={onReplyKeydown}>
+<div transition:slide
+  class={`note-reply relative z-10 border border-${borderColor} border-solid rounded`}
+  bind:this={replyContainer}>
+  <div
+    class="bg-dark"
+    class:rounded-b={replyMentions.length === 0}
+    on:keydown={onReplyKeydown}>
     <Compose bind:this={reply} onSubmit={sendReply}>
       <button
         slot="addon"
@@ -441,20 +453,31 @@
       </button>
     </Compose>
   </div>
-  {#if replyMentions.length > 0}
-  <div class={`text-white text-sm p-2 rounded-b border-t-0 border border-solid border-${borderColor} bg-black`}>
-    <div class="inline-block border-r border-solid border-medium pl-1 pr-3 mr-2">
-      <i class="fa fa-at" />
+  {#if image}
+  <div class="p-2 bg-dark">
+    <Preview url={image} onClose={() => { image = null }} />
+  </div>
+  {/if}
+  <div class={`h-px bg-${borderColor}`} />
+  <div class="text-white text-sm p-2 rounded-b bg-black h-12">
+    <div class="inline-block py-2 pl-1 pr-3 mr-2 border-r border-solid border-medium">
+      <div class="flex gap-3 items-center cursor-pointer">
+        <ImageInput bind:value={image} icon="image" hideInput>
+          <i slot="button" class="fa fa-paperclip" />
+        </ImageInput>
+        <i class="fa fa-at" />
+      </div>
     </div>
     {#each replyMentions as p}
-      <div class="inline-block py-1 px-2 mr-1 mb-2 rounded-full border border-solid border-light">
+      <div class="inline-block py-1 px-2 mr-1 rounded-full border border-solid border-light">
         <button class="fa fa-times cursor-pointer" on:click|stopPropagation={() => removeMention(p)} />
         {displayPerson(database.getPersonWithFallback(p))}
       </div>
+    {:else}
+    <div class="text-light inline-block">No mentions</div>
     {/each}
     <div class="-mt-2" />
   </div>
-  {/if}
 </div>
 {/if}
 
diff --git a/src/views/notes/NoteCreate.svelte b/src/views/notes/NoteCreate.svelte
index b50b3531..bf4e4ea3 100644
--- a/src/views/notes/NoteCreate.svelte
+++ b/src/views/notes/NoteCreate.svelte
@@ -45,7 +45,7 @@
     let {content, mentions, topics} = input.parse()
 
     if (image) {
-      content += '\n' + image
+      content = (content + '\n' + image).trim()
     }
 
     if (content) {
diff --git a/src/views/notes/NoteDetail.svelte b/src/views/notes/NoteDetail.svelte
index 993f05d3..d1cfae27 100644
--- a/src/views/notes/NoteDetail.svelte
+++ b/src/views/notes/NoteDetail.svelte
@@ -56,7 +56,7 @@
 </div>
 {:else if note.pubkey}
 <div in:fly={{y: 20}} class="flex flex-col gap-4 p-4">
-  <Note showContext invertColors depth={6} anchorId={note.id} note={asDisplayEvent(note)} />
+  <Note showContext depth={6} anchorId={note.id} note={asDisplayEvent(note)} />
 </div>
 {/if}