From f9b895b32c0b42b56966db4e2529a5e219d0eb99 Mon Sep 17 00:00:00 2001 From: Cadence Ember Date: Fri, 6 Oct 2023 15:48:48 +1300 Subject: [PATCH] Prompt to send command as message (#1435) --- src/app/organisms/room/RoomViewInput.jsx | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/src/app/organisms/room/RoomViewInput.jsx b/src/app/organisms/room/RoomViewInput.jsx index c43eb60..3fb780a 100644 --- a/src/app/organisms/room/RoomViewInput.jsx +++ b/src/app/organisms/room/RoomViewInput.jsx @@ -206,28 +206,36 @@ function RoomViewInput({ if (replyTo !== null) setReplyTo(null); }; - const processCommand = (cmdBody) => { + /** Return true if a command was executed. */ + const processCommand = async (cmdBody) => { const spaceIndex = cmdBody.indexOf(' '); const cmdName = cmdBody.slice(1, spaceIndex > -1 ? spaceIndex : undefined); const cmdData = spaceIndex > -1 ? cmdBody.slice(spaceIndex + 1) : ''; if (!commands[cmdName]) { - confirmDialog('Invalid Command', `"${cmdName}" is not a valid command.`, 'Alright'); - return; + const sendAsMessage = await confirmDialog('Invalid Command', `"${cmdName}" is not a valid command. Did you mean to send this as a message?`, 'Send as message'); + if (sendAsMessage) { + sendBody(cmdBody); + return true; + } + return false; } if (['me', 'shrug', 'plain'].includes(cmdName)) { commands[cmdName].exe(roomId, cmdData, sendBody); - return; + return true; } commands[cmdName].exe(roomId, cmdData); + return true; }; const sendMessage = async () => { requestAnimationFrame(() => deactivateCmdAndEmit()); const msgBody = textAreaRef.current.value.trim(); if (msgBody.startsWith('/')) { - processCommand(msgBody.trim()); - textAreaRef.current.value = ''; - textAreaRef.current.style.height = 'unset'; + const executed = await processCommand(msgBody.trim()); + if (executed) { + textAreaRef.current.value = ''; + textAreaRef.current.style.height = 'unset'; + } return; } if (msgBody === '' && attachment === null) return;