From 627407848fd89c8513efb7f9959416ae9d071704 Mon Sep 17 00:00:00 2001 From: Jon Staab Date: Thu, 24 Oct 2024 12:55:48 -0700 Subject: [PATCH] Show error on empty message --- src/app/components/ThreadCreate.svelte | 17 +++++++++++++++-- src/app/components/ThreadReply.svelte | 22 +++++++++++++--------- 2 files changed, 28 insertions(+), 11 deletions(-) diff --git a/src/app/components/ThreadCreate.svelte b/src/app/components/ThreadCreate.svelte index d9e54bb0..307f642f 100644 --- a/src/app/components/ThreadCreate.svelte +++ b/src/app/components/ThreadCreate.svelte @@ -9,6 +9,7 @@ import Button from "@lib/components/Button.svelte" import ModalHeader from "@lib/components/ModalHeader.svelte" import ModalFooter from "@lib/components/ModalFooter.svelte" + import {pushToast} from '@app/toast' import {getPubkeyHints} from "@app/commands" import {getEditorOptions, addFile, uploadFiles, getEditorTags} from "@lib/editor" @@ -21,9 +22,21 @@ const loading = writable(false) const submit = () => { - const event = createEvent(NOTE, {content: $editor.getText(), tags: getEditorTags($editor)}) + const content = $editor.getText() + const tags = getEditorTags($editor) + + if (!content.trim()) { + return pushToast({ + theme: 'error', + message: "Please provide a message for your thread.", + }) + } + + publishThunk({ + event: createEvent(NOTE, {content, tags}), + relays: [url], + }) - publishThunk({event, relays: [url]}) history.back() } diff --git a/src/app/components/ThreadReply.svelte b/src/app/components/ThreadReply.svelte index 2ef06ee5..93792c5a 100644 --- a/src/app/components/ThreadReply.svelte +++ b/src/app/components/ThreadReply.svelte @@ -9,6 +9,7 @@ import ModalFooter from "@lib/components/ModalFooter.svelte" import {getPubkeyHints, publishReply} from "@app/commands" import {getEditorOptions, addFile, uploadFiles, getEditorTags} from "@lib/editor" + import {pushToast} from '@app/toast' export let url export let event @@ -20,14 +21,17 @@ const loading = writable(false) const submit = () => { - onSubmit( - publishReply({ - event, - content: $editor.getText(), - tags: getEditorTags($editor), - relays: [url], - }), - ) + const content = $editor.getText() + const tags = getEditorTags($editor) + + if (!content.trim()) { + return pushToast({ + theme: 'error', + message: "Please provide a message for your reply.", + }) + } + + onSubmit(publishReply({event, content, tags, relays: [url]})) } let editor: Readable @@ -38,9 +42,9 @@