From 080f50bf26767547f88dc8b64d359fa4677bc0bc Mon Sep 17 00:00:00 2001
From: styppo <mail@styp-rekowsky.de>
Date: Thu, 26 Jan 2023 18:02:13 +0000
Subject: [PATCH] * Fix duplicated private messages * Fix minor message styling
 issues

---
 src/components/Message/ChatMessage.vue      | 51 +++++++++++++++++++++
 src/components/Message/EncryptedMessage.vue | 31 +++++++++----
 src/pages/messages/Conversation.vue         | 32 +++++++------
 src/pages/messages/Messages.vue             |  2 +-
 4 files changed, 92 insertions(+), 24 deletions(-)
 create mode 100644 src/components/Message/ChatMessage.vue

diff --git a/src/components/Message/ChatMessage.vue b/src/components/Message/ChatMessage.vue
new file mode 100644
index 0000000..e481ffb
--- /dev/null
+++ b/src/components/Message/ChatMessage.vue
@@ -0,0 +1,51 @@
+<template>
+  <q-chat-message
+    :sent="sent"
+    :bg-color="sent ? 'grey-2' : 'pink-2'"
+    :stamp="createdAt"
+    class="chat-message"
+  >
+    <EncryptedMessage :message="message" click-to-decrypt />
+  </q-chat-message>
+</template>
+
+<script>
+import EncryptedMessage from 'components/Message/EncryptedMessage.vue'
+import {useAppStore} from 'stores/App'
+import DateUtils from 'src/utils/DateUtils'
+
+export default {
+  name: 'ChatMessage',
+  components: {EncryptedMessage},
+  props: {
+    message: {
+      type: Object,
+      required: true,
+    }
+  },
+  setup() {
+    return {
+      app: useAppStore()
+    }
+  },
+  computed: {
+    sent() {
+      return this.message.author === this.app.myPubkey
+    },
+    createdAt() {
+      return DateUtils.formatFromNowLong(this.message.createdAt)
+    }
+  },
+}
+</script>
+
+<style lang="scss">
+.chat-message {
+  &.q-message-received .q-message-container {
+    padding-right: 10%;
+  }
+  &.q-message-sent .q-message-container {
+    padding-left: 10%;
+  }
+}
+</style>
diff --git a/src/components/Message/EncryptedMessage.vue b/src/components/Message/EncryptedMessage.vue
index 396c669..f58c8e1 100644
--- a/src/components/Message/EncryptedMessage.vue
+++ b/src/components/Message/EncryptedMessage.vue
@@ -1,6 +1,6 @@
 <template>
-  <PostRenderer v-if="note?.content" :note="note" />
-  <span v-else-if="!decryptFailed" class="click-to-decrypt" @click="decrypt">Click to decrypt</span>
+  <PostRenderer v-if="note" :note="note" />
+  <span v-else-if="!decryptFailed" class="click-to-decrypt" @click="clickToDecrypt && decrypt()">Click to decrypt</span>
   <span v-else class="decrypt-failed" @click="decrypt">Decryption failed</span>
 </template>
 
@@ -17,6 +17,10 @@ export default {
       type: Object,
       required: true,
     },
+    clickToDecrypt: {
+      type: Boolean,
+      default: false,
+    }
   },
   setup() {
     return {
@@ -25,26 +29,30 @@ export default {
   },
   data() {
     return {
-      plaintext: null,
       decryptFailed: false,
     }
   },
   computed: {
     note() {
-      if (!this.message) return
+      if (!this.message?.plaintext) return
       const note = new Note(this.message.id, this.message)
-      note.content = this.message.plaintext || this.plaintext
+      note.content = this.message.plaintext
       return note
     }
   },
   methods: {
     async decrypt() {
+      if (this.message.plaintext) return
       try {
+        const messageId = this.message.id
         const counterparty = this.message.author === this.app.myPubkey
           ? this.message.recipient
           : this.message.author
-        this.plaintext = await this.app.decryptMessage(counterparty, this.message.content)
-        this.message.cachePlaintext(this.plaintext)
+        const plaintext = await this.app.decryptMessage(counterparty, this.message.content)
+        // The message can change while we are decrypting it, so we need to make sure not to cache the wrong message.
+        if (this.message.id === messageId) {
+          this.message.cachePlaintext(plaintext)
+        }
       } catch (e) {
         console.error('Failed to decrypt message', e)
         this.decryptFailed = true
@@ -52,9 +60,16 @@ export default {
     }
   },
   async mounted() {
-    if (!this.message.plaintext && this.app.activeAccount.canDecrypt()) {
+    if (this.app.activeAccount.canDecrypt()) {
       await this.decrypt()
     }
+  },
+  watch: {
+    async message() {
+      if (this.app.activeAccount.canDecrypt()) {
+        await this.decrypt()
+      }
+    }
   }
 }
 </script>
diff --git a/src/pages/messages/Conversation.vue b/src/pages/messages/Conversation.vue
index 31cac47..d3c46a2 100644
--- a/src/pages/messages/Conversation.vue
+++ b/src/pages/messages/Conversation.vue
@@ -5,15 +5,11 @@
 
   <div class="conversation">
     <div class="pusher"></div>
-    <q-chat-message
+    <ChatMessage
       v-for="message in conversation"
       :key="message.id"
-      :sent="message.author === app.myPubkey"
-      :bg-color="message.author === app.myPubkey ? 'grey-2' : 'pink-2'"
-      :stamp="formatMessageDate(message.createdAt)"
-    >
-      <EncryptedMessage :message="message" />
-    </q-chat-message>
+      :message="message"
+    />
     <p v-if="!conversation?.length" class="placeholder">
       <template v-if="counterparty !== app.myPubkey">
         This is the beginning of your message history with <UserName :pubkey="counterparty" clickable />.
@@ -32,17 +28,16 @@
 <script>
 import PageHeader from 'components/PageHeader.vue'
 import UserCard from 'components/User/UserCard.vue'
-import EncryptedMessage from 'components/Message/EncryptedMessage.vue'
 import MessageEditor from 'components/Message/MessageEditor.vue'
+import UserName from 'components/User/UserName.vue'
+import ChatMessage from 'components/Message/ChatMessage.vue'
 import {useMessageStore} from 'src/nostr/store/MessageStore'
 import {useAppStore} from 'stores/App'
-import DateUtils from 'src/utils/DateUtils'
 import {bech32ToHex} from 'src/utils/utils'
-import UserName from 'components/User/UserName.vue'
 
 export default {
   name: 'Conversation',
-  components: {UserName, MessageEditor, EncryptedMessage, PageHeader, UserCard},
+  components: {ChatMessage, UserName, MessageEditor, PageHeader, UserCard},
   setup() {
     return {
       app: useAppStore(),
@@ -65,21 +60,22 @@ export default {
     },
   },
   methods: {
-    formatMessageDate(timestamp) {
-      return DateUtils.formatFromNowLong(timestamp)
-    },
     onPublish() {
       this.markAsRead()
-      this.$nextTick(() => window.scrollTo(0, document.body.scrollHeight))
+      this.scrollToBottom()
     },
     markAsRead() {
       if (this.app.isSignedIn && this.counterparty) {
         this.messages.markAsRead(this.app.myPubkey, this.counterparty)
       }
     },
+    scrollToBottom() {
+      this.$nextTick(() => window.scrollTo(0, document.body.scrollHeight))
+    },
   },
   mounted() {
     this.markAsRead()
+    setTimeout(() => this.scrollToBottom(), 100)
   }
 }
 </script>
@@ -116,6 +112,9 @@ export default {
 }
 
 @media screen and (max-width: $tablet) {
+  .conversation {
+    padding-bottom: 76px;
+  }
   .conversation-reply {
     padding-bottom: 22px;
   }
@@ -128,6 +127,9 @@ export default {
 }
 
 @media screen and (max-width: $phone) {
+  .conversation {
+    padding-bottom: 48px;
+  }
   .conversation-reply {
     width: 100%;
     padding-bottom: 1rem;
diff --git a/src/pages/messages/Messages.vue b/src/pages/messages/Messages.vue
index adf8ae1..772ab03 100644
--- a/src/pages/messages/Messages.vue
+++ b/src/pages/messages/Messages.vue
@@ -1,7 +1,7 @@
 <template>
   <PageHeader back-button>
     <template #addon>
-      <q-btn icon="more_vert" size="md" round>
+      <q-btn icon="more_vert" size="md" round flat>
         <q-menu anchor="bottom right" self="top right" :offset="[0, 6]" class="options-popup">
           <a @click="markAllAsRead" v-close-popup>Mark all as read</a>
         </q-menu>