From e29076fd33083ecbf7aa50c47b01ad2e34975394 Mon Sep 17 00:00:00 2001
From: Jason Woodland <me@jasonwoodland.com>
Date: Fri, 27 May 2022 13:07:26 +1000
Subject: [PATCH 1/4] fix(message): disable save on empty message

---
 components/views/chat/message/edit/Edit.vue | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/components/views/chat/message/edit/Edit.vue b/components/views/chat/message/edit/Edit.vue
index fe67bc7ed9..38790c26a2 100644
--- a/components/views/chat/message/edit/Edit.vue
+++ b/components/views/chat/message/edit/Edit.vue
@@ -52,6 +52,9 @@ export default Vue.extend({
   },
   methods: {
     saveMessage() {
+      if (this.$data.content.length === 0) {
+        return
+      }
       this.$emit('commitMessage', this.$data.content.slice(0, this.maxChars))
     },
     cancelMessage() {
@@ -64,6 +67,7 @@ export default Vue.extend({
       switch (event.key) {
         case KeybindingEnum.ENTER:
           if (!event.shiftKey) {
+            event.preventDefault()
             this.saveMessage()
           }
           break

From 4e03a87794909def078756d100214cbe9f14df1b Mon Sep 17 00:00:00 2001
From: Jason Woodland <me@jasonwoodland.com>
Date: Fri, 27 May 2022 13:10:59 +1000
Subject: [PATCH 2/4] fix(message): edit message style/layout

---
 components/views/chat/message/edit/Edit.html | 12 ++++++++----
 components/views/chat/message/edit/Edit.less | 10 +++++++---
 locales/en-US.js                             |  4 ++--
 3 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/components/views/chat/message/edit/Edit.html b/components/views/chat/message/edit/Edit.html
index 01b9029b86..fdade8f38a 100644
--- a/components/views/chat/message/edit/Edit.html
+++ b/components/views/chat/message/edit/Edit.html
@@ -12,10 +12,14 @@
   </div>
   <div class="edit-message-bottom">
     <div>
-      {{$t('messaging.edit.escape_to')}}
-      <a @click="cancelMessage">{{$t('messaging.edit.cancel')}}</a>
-      {{$t('messaging.edit.enter_to')}}
-      <a @click="saveMessage">{{$t('messaging.edit.save')}}</a>
+      <div>
+        {{$t('messaging.edit.escape_to')}}
+        <a @click="cancelMessage">{{$t('messaging.edit.cancel')}}</a>
+      </div>
+      <div>
+        {{$t('messaging.edit.enter_to')}}
+        <a @click="saveMessage">{{$t('messaging.edit.save')}}</a>
+      </div>
     </div>
     <div>{{lengthCount}}/{{maxChars}}</div>
   </div>
diff --git a/components/views/chat/message/edit/Edit.less b/components/views/chat/message/edit/Edit.less
index d3118482a5..d60d2b451f 100644
--- a/components/views/chat/message/edit/Edit.less
+++ b/components/views/chat/message/edit/Edit.less
@@ -41,9 +41,13 @@
     margin: 0 -@light-spacing 0 0;
     justify-content: space-between;
     & > div {
-      padding: 0 @light-spacing;
-      a {
-        margin-right: @light-spacing;
+      display: flex;
+      margin: 0 @light-spacing;
+      > div {
+        &:not(:last-child)::after {
+          content: '•';
+          margin: 0 @light-spacing;
+        }
       }
     }
   }
diff --git a/locales/en-US.js b/locales/en-US.js
index fea3fe47ad..0640cfa49d 100644
--- a/locales/en-US.js
+++ b/locales/en-US.js
@@ -92,9 +92,9 @@ export default {
       files: 'Files',
     },
     edit: {
-      escape_to: 'escape to ',
+      escape_to: 'escape to',
       cancel: 'cancel',
-      enter_to: ' • enter to ',
+      enter_to: 'enter to',
       save: 'save',
     },
   },

From dbfef1b9e63f2c6d276a0350d88cf6dcf7e7d803 Mon Sep 17 00:00:00 2001
From: Jason Woodland <me@jasonwoodland.com>
Date: Mon, 30 May 2022 20:54:15 +1000
Subject: [PATCH 3/4] style(message): add types/remove $data and $props

---
 components/views/chat/message/edit/Edit.vue | 21 ++++++---------------
 1 file changed, 6 insertions(+), 15 deletions(-)

diff --git a/components/views/chat/message/edit/Edit.vue b/components/views/chat/message/edit/Edit.vue
index 38790c26a2..c72a3924fb 100644
--- a/components/views/chat/message/edit/Edit.vue
+++ b/components/views/chat/message/edit/Edit.vue
@@ -10,15 +10,6 @@ import { Config } from '~/config'
 import { KeybindingEnum } from '~/libraries/Enums/enums'
 import Editable from '~/components/views/chat/chatbar/Editable.vue'
 
-declare module 'vue/types/vue' {
-  interface Vue {
-    saveMessage: Function
-    cancelMessage: Function
-    lengthCount: number
-    charlimit: boolean
-  }
-}
-
 export default Vue.extend({
   components: {
     SmileIcon,
@@ -40,22 +31,22 @@ export default Vue.extend({
     }
   },
   computed: {
-    lengthCount() {
-      return this.$data.content.length
+    lengthCount(): number {
+      return this.content.length
     },
-    charlimit() {
+    charlimit(): boolean {
       return this.lengthCount > this.maxChars
     },
   },
   mounted() {
-    this.$data.content = this.$props.message
+    this.content = this.message
   },
   methods: {
     saveMessage() {
-      if (this.$data.content.length === 0) {
+      if (this.content.length === 0) {
         return
       }
-      this.$emit('commitMessage', this.$data.content.slice(0, this.maxChars))
+      this.$emit('commitMessage', this.content.slice(0, this.maxChars))
     },
     cancelMessage() {
       this.$emit('cancelMessage')

From 5a72d3ea614effbaecd3668c7f93cbdf5684eb43 Mon Sep 17 00:00:00 2001
From: Jason Woodland <me@jasonwoodland.com>
Date: Tue, 31 May 2022 15:05:08 +1000
Subject: [PATCH 4/4] fix(message): add error toast

---
 components/views/chat/message/edit/Edit.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/components/views/chat/message/edit/Edit.vue b/components/views/chat/message/edit/Edit.vue
index c72a3924fb..bb4c4aee72 100644
--- a/components/views/chat/message/edit/Edit.vue
+++ b/components/views/chat/message/edit/Edit.vue
@@ -43,7 +43,8 @@ export default Vue.extend({
   },
   methods: {
     saveMessage() {
-      if (this.content.length === 0) {
+      if (this.content.trim().length === 0) {
+        this.$toast.error(this.$t('errors.chat.empty_message_error') as string)
         return
       }
       this.$emit('commitMessage', this.content.slice(0, this.maxChars))