Delete messages when edited to have no content

Fixes #311.
decent-chat · May 22, 2018 · 5d1bc61 · 5d1bc61
1 parent 8a20f59
commit 5d1bc61
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 4 deletions.
diff --git a/packages/client/js/Messages/Message/Message.js b/packages/client/js/Messages/Message/Message.js
@@ -61,8 +61,15 @@ class Message extends Component {
                 content={message.text}
 
                 sendMessage={async text => {
+                  console.log(text)
+
                   this.setState({editing: null})
-                  await message.edit(text)
+
+                  if (text.trim().length === 0) {
+                    await message.delete()
+                  } else {
+                    await message.edit(text)
+                  }
                 }}
                 cancel={() => this.setState({editing: null})}
               />

diff --git a/packages/client/js/Messages/MessageEditor/MessageEditor.js b/packages/client/js/Messages/MessageEditor/MessageEditor.js
@@ -125,14 +125,16 @@ class MessageEditor extends Component {
   }
 
   sendMessage = message => {
-    if (!message) return
+    //if (!message) return
 
     let messageFormatted = this.parseMarkdown(message)
     this.props.sendMessage(messageFormatted)
   }
 
   sendMessageFromInput = () => {
-    if (this.state.message === '') return false
+    //if (this.state.message === '') return false
+
+    console.log(this.state)
 
     this.sendMessage(this.state.message)
     this.setState({

diff --git a/packages/client/js/Messages/Messages.js b/packages/client/js/Messages/Messages.js
@@ -273,7 +273,7 @@ class Messages extends Component {
   }
 
   sendMessage = content => {
-    this.props.channel.sendMessage(content)
+    if (content) this.props.channel.sendMessage(content)
   }
 
   render({ channel }, { messages, isLoading, me }) {