r-freeman/portfolio
1
0
Fork 0
mirror of https://github.com/r-freeman/portfolio.git synced 2025-10-31 23:11:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Improve comment error handling
All checks were successful
Build And Publish / BuildAndPublish (push) Successful in 3m12s
Details

Browse Source
This commit is contained in:
Ryan Freeman 2025-04-21 17:03:29 +01:00
parent cd5aae039d
commit 272a5cecab
3 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/actions/comments.ts
View File

@ -37,9 +37,10 @@ const notificationBody = (comment: { id: number, content: string }, user: { name
} }
export async function addComment(prevState: { message: string }, formData: FormData) { export async function addComment(prevState: { message: string }, formData: FormData) {
const general_error = 'There was a problem with your comment, please try again later.' const validation_error = 'Validation error, your comment was invalid.'
const authorisation_error = 'Error, you must be logged in to post a comment.' const authorisation_error = 'Error, you must be logged in to post a comment.'
const success_message = 'Thanks, your comment was submitted and is awaiting approval.' const server_error = 'Server error, please try again later.'
const success_message = 'Your comment was submitted and is awaiting approval.'
const schema = z.object({ const schema = z.object({
comment: z.string().min(1).max(300), comment: z.string().min(1).max(300),
@ -55,7 +56,7 @@ export async function addComment(prevState: { message: string }, formData: FormD
const parse = schema.safeParse({comment, slug, parent_id}); const parse = schema.safeParse({comment, slug, parent_id});
if (!parse.success) { if (!parse.success) {
return {message: general_error} return {message: validation_error}
} }
if (parent_id === '') parent_id = null if (parent_id === '') parent_id = null
@ -82,7 +83,7 @@ export async function addComment(prevState: { message: string }, formData: FormD
.single() .single()
if (error || newComment?.id === null) { if (error || newComment?.id === null) {
return {message: general_error} return {message: server_error}
} }
if (process.env.NODE_ENV === 'production') { if (process.env.NODE_ENV === 'production') {
@ -92,6 +93,6 @@ export async function addComment(prevState: { message: string }, formData: FormD
return {message: success_message} return {message: success_message}
} catch (error) { } catch (error) {
console.error('Error posting comment:', error) console.error('Error posting comment:', error)
return {message: general_error} return {message: server_error}
} }
} }

2
components/ui/Comments.tsx
View File

@ -172,7 +172,7 @@ Comments.Form = function Form({slug}: { slug: string }) {
</div> </div>
<input type="hidden" name="parent_id" value={parentId ?? ''}/> <input type="hidden" name="parent_id" value={parentId ?? ''}/>
<input type="hidden" name="slug" value={slug}/> <input type="hidden" name="slug" value={slug}/>
<div className="mt-2 flex justify-between items-start gap-x-4"> <div className="mt-2 flex justify-between items-center gap-x-4">
<p className="text-sm text-zinc-600 dark:text-zinc-400">{`${commentLength} / ${commentMaxLength}`}</p> <p className="text-sm text-zinc-600 dark:text-zinc-400">{`${commentLength} / ${commentMaxLength}`}</p>
<div className="flex gap-x-4"> <div className="flex gap-x-4">
{replyContext?.replyTo && {replyContext?.replyTo &&

6
lib/ntfy.ts
View File

@ -1,9 +1,10 @@
import fetcher from '@/lib/fetcher' import fetcher from '@/lib/fetcher'
const NTFY_URL = process.env.NTFY_URL || '' const NTFY_URL = process.env.NTFY_URL ?? ''
export async function sendNotification(notificationBody: any) { export async function sendNotification(notificationBody: any) {
if (NTFY_URL !== '') { if (NTFY_URL !== '') {
try {
await fetcher(NTFY_URL, { await fetcher(NTFY_URL, {
method: 'POST', method: 'POST',
headers: { headers: {
@ -11,5 +12,8 @@ export async function sendNotification(notificationBody: any) {
}, },
body: JSON.stringify(notificationBody) body: JSON.stringify(notificationBody)
}) })
} catch (error) {
console.error('Failed to send notification:', error)
}
} }
} }