From c5afc07b417d94ffbb4c6d7fcdd849e93c56eea9 Mon Sep 17 00:00:00 2001 From: Xyphyn Date: Thu, 10 Aug 2023 16:47:43 -0700 Subject: [PATCH] feat: add post and comment purging, fix #92 --- package.json | 2 +- .../lemmy/comment/CommentActions.svelte | 8 +- .../moderation/CommentModerationMenu.svelte | 66 +++++++----- .../lemmy/moderation/Moderation.svelte | 1 + .../lemmy/moderation/ModerationMenu.svelte | 100 +++++++++-------- .../lemmy/moderation/RemoveModal.svelte | 101 +++++++++++++++--- .../components/lemmy/moderation/moderation.ts | 5 +- .../components/lemmy/post/PostActions.svelte | 8 +- 8 files changed, 197 insertions(+), 94 deletions(-) diff --git a/package.json b/package.json index ddd1b8b4..eb9b3f6f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "photon-lemmy", - "version": "0.6.1", + "version": "0.6.2", "private": true, "scripts": { "dev": "vite dev", diff --git a/src/lib/components/lemmy/comment/CommentActions.svelte b/src/lib/components/lemmy/comment/CommentActions.svelte index 5c4754f7..e3a45b6d 100644 --- a/src/lib/components/lemmy/comment/CommentActions.svelte +++ b/src/lib/components/lemmy/comment/CommentActions.svelte @@ -24,7 +24,11 @@ import Button from '$lib/components/input/Button.svelte' import { createEventDispatcher } from 'svelte' import { isCommentMutable } from '$lib/components/lemmy/post/helpers.js' - import { amMod, report } from '$lib/components/lemmy/moderation/moderation.js' + import { + amMod, + isAdmin, + report, + } from '$lib/components/lemmy/moderation/moderation.js' import ModerationMenu from '$lib/components/lemmy/moderation/ModerationMenu.svelte' import CommentModerationMenu from '$lib/components/lemmy/moderation/CommentModerationMenu.svelte' import { profile } from '$lib/auth.js' @@ -73,7 +77,7 @@ Reply - {#if $profile?.user && amMod($profile?.user, comment.community)} + {#if $profile?.user && (amMod($profile?.user, comment.community) || isAdmin($profile.user))} {/if} - + - - Moderation - - remove(item)}> - - {#if isComment(item)} - {item.comment.removed ? 'Restore' : 'Remove'} - {:else} - {item.post.removed ? 'Restore' : 'Remove'} + {#if ($profile?.user && amMod($profile.user, item.community)) || ($profile?.user && isAdmin($profile.user) && item.community.local)} +
  • + Moderation +
  • + remove(item)}> + + {#if isComment(item)} + {item.comment.removed ? 'Restore' : 'Remove'} + {:else} + {item.post.removed ? 'Restore' : 'Remove'} + {/if} + + {#if $profile?.user && $profile.user?.local_user_view.person.id != item.creator.id} + + User + + + ban(item.creator_banned_from_community, item.creator, item.community)} + > + + {item.creator_banned_from_community + ? 'Unban from community' + : 'Ban from community'} + {/if} -
    - {#if $profile?.user && $profile.user?.local_user_view.person.id != item.creator.id} - - User - - - ban(item.creator_banned_from_community, item.creator, item.community)} - > - - {item.creator_banned_from_community - ? 'Unban from community' - : 'Ban from community'} + {/if} + + {#if $profile?.user && isAdmin($profile.user)} +
  • + Admin +
  • + remove(item, true)}> + + Purge {/if}
    diff --git a/src/lib/components/lemmy/moderation/Moderation.svelte b/src/lib/components/lemmy/moderation/Moderation.svelte index b8b7365e..1c08ecac 100644 --- a/src/lib/components/lemmy/moderation/Moderation.svelte +++ b/src/lib/components/lemmy/moderation/Moderation.svelte @@ -17,6 +17,7 @@ {/await} {/if} diff --git a/src/lib/components/lemmy/moderation/ModerationMenu.svelte b/src/lib/components/lemmy/moderation/ModerationMenu.svelte index a08577e1..6f1d8ea2 100644 --- a/src/lib/components/lemmy/moderation/ModerationMenu.svelte +++ b/src/lib/components/lemmy/moderation/ModerationMenu.svelte @@ -1,11 +1,12 @@ - {removed ? 'Restoring' : 'Removing'} submission + + {purge ? 'Purging' : removed ? 'Restoring' : 'Removing'} submission + {#if item}
    - {#if !removed} + {#if !removed && !purge} Reply with reason {#if commentReason} + - {removed ? 'Restore' : 'Remove'} + {/if} diff --git a/src/lib/components/lemmy/moderation/moderation.ts b/src/lib/components/lemmy/moderation/moderation.ts index 2e465cf7..36071881 100644 --- a/src/lib/components/lemmy/moderation/moderation.ts +++ b/src/lib/components/lemmy/moderation/moderation.ts @@ -17,6 +17,7 @@ interface Modals { removing: { open: boolean item: PostView | CommentView | undefined + purge: boolean } banning: { open: boolean @@ -34,6 +35,7 @@ export let modals = writable({ removing: { open: false, item: undefined, + purge: false, }, banning: { open: false, @@ -53,12 +55,13 @@ export function report(item: PostView | CommentView) { })) } -export function remove(item: PostView | CommentView) { +export function remove(item: PostView | CommentView, purge: boolean = false) { modals.update((m) => ({ ...m, removing: { open: true, item: item, + purge: purge }, })) } diff --git a/src/lib/components/lemmy/post/PostActions.svelte b/src/lib/components/lemmy/post/PostActions.svelte index e4bebdaf..83abbc10 100644 --- a/src/lib/components/lemmy/post/PostActions.svelte +++ b/src/lib/components/lemmy/post/PostActions.svelte @@ -24,7 +24,11 @@ import { createEventDispatcher } from 'svelte' import Modal from '$lib/components/ui/modal/Modal.svelte' import PostForm from '$lib/components/lemmy/post/PostForm.svelte' - import { amMod, report } from '$lib/components/lemmy/moderation/moderation.js' + import { + amMod, + isAdmin, + report, + } from '$lib/components/lemmy/moderation/moderation.js' import ModerationMenu from '$lib/components/lemmy/moderation/ModerationMenu.svelte' import { profile } from '$lib/auth.js' @@ -114,7 +118,7 @@
    - {#if $profile?.user && amMod($profile.user, post.community)} + {#if $profile?.user && (amMod($profile.user, post.community) || isAdmin($profile.user))} {/if}