diff --git a/src/lib/components/lemmy/comment/CommentActions.svelte b/src/lib/components/lemmy/comment/CommentActions.svelte index 9f9a41e8..6dbd976c 100644 --- a/src/lib/components/lemmy/comment/CommentActions.svelte +++ b/src/lib/components/lemmy/comment/CommentActions.svelte @@ -32,7 +32,7 @@ import ModerationMenu from '$lib/components/lemmy/moderation/ModerationMenu.svelte' import CommentModerationMenu from '$lib/components/lemmy/moderation/CommentModerationMenu.svelte' import { profile } from '$lib/auth.js' - import { save } from '$lib/lemmy/contentview.js' + import { deleteItem, save } from '$lib/lemmy/contentview.js' export let comment: CommentView export let replying: boolean = false @@ -101,27 +101,16 @@ { - if (!$profile?.jwt) return - try { - await getClient().deleteComment({ - auth: $profile.jwt, - comment_id: comment.comment.id, - deleted: true, - }) - toast({ - content: 'The comment was deleted.', - type: 'success', - }) - } catch (error) { - toast({ - content: 'Failed to delete comment', - type: 'error', - }) - } + if ($profile?.jwt) + comment.comment.deleted = await deleteItem( + comment, + !comment.comment.deleted, + $profile.jwt + ) }} > - Delete + {comment.comment.deleted ? 'Restore' : 'Delete'} {/if} {#if $profile.jwt && $profile.user?.local_user_view.person.id != comment.creator.id} diff --git a/src/lib/components/lemmy/post/PostActions.svelte b/src/lib/components/lemmy/post/PostActions.svelte index 87373ed7..d54afea8 100644 --- a/src/lib/components/lemmy/post/PostActions.svelte +++ b/src/lib/components/lemmy/post/PostActions.svelte @@ -31,7 +31,7 @@ import ModerationMenu from '$lib/components/lemmy/moderation/ModerationMenu.svelte' import { profile } from '$lib/auth.js' import Spinner from '$lib/components/ui/loader/Spinner.svelte' - import { save } from '$lib/lemmy/contentview.js' + import { deleteItem, save } from '$lib/lemmy/contentview.js' export let post: PostView @@ -166,7 +166,17 @@ {post.saved ? 'Unsave' : 'Save'} {#if $profile.user && post.creator.id == $profile.user.local_user_view.person.id} - + { + if ($profile?.jwt) + post.post.deleted = await deleteItem( + post, + !post.post.deleted, + $profile.jwt + ) + }} + color="dangerSecondary" + > {post.post.deleted ? 'Restore' : 'Delete'} diff --git a/src/lib/lemmy/contentview.ts b/src/lib/lemmy/contentview.ts index 6fcc3953..e614a5c9 100644 --- a/src/lib/lemmy/contentview.ts +++ b/src/lib/lemmy/contentview.ts @@ -59,3 +59,30 @@ export async function save( } return save } + +export async function deleteItem( + item: ContentView | Submission, + deleted: boolean, + jwt: string +): Promise { + if (isSubmission(item)) item = contentView(item) + + if (item.type == 'post') { + return ( + await getClient().deletePost({ + auth: jwt, + post_id: item.id, + deleted: deleted, + }) + ).post_view.post.deleted + } else if (item.type == 'comment') { + return ( + await getClient().deleteComment({ + auth: jwt, + comment_id: item.id, + deleted: deleted, + }) + ).comment_view.post.deleted + } + return deleted +}