From 98cb1992d24ade8165406cd5e7761ae5ad3828b3 Mon Sep 17 00:00:00 2001 From: James Xylight Date: Sat, 8 Feb 2025 13:17:39 -0800 Subject: [PATCH] feat: add better duration selection to ban modal --- src/lib/components/form/Duration.svelte | 70 +++++++++++++++++++ .../lemmy/moderation/BanModal.svelte | 46 ++++-------- src/lib/i18n/en.json | 11 ++- src/lib/mono/forms/TextInput.svelte | 1 - src/lib/mono/forms/select/Select.svelte | 12 ++-- src/routes/modlog/+page.ts | 11 ++- 6 files changed, 110 insertions(+), 41 deletions(-) create mode 100644 src/lib/components/form/Duration.svelte diff --git a/src/lib/components/form/Duration.svelte b/src/lib/components/form/Duration.svelte new file mode 100644 index 00000000..65ca0092 --- /dev/null +++ b/src/lib/components/form/Duration.svelte @@ -0,0 +1,70 @@ + + +
+ {#if duration != 'permanent'} + + {/if} + +
diff --git a/src/lib/components/lemmy/moderation/BanModal.svelte b/src/lib/components/lemmy/moderation/BanModal.svelte index 31e2830f..82c52714 100644 --- a/src/lib/components/lemmy/moderation/BanModal.svelte +++ b/src/lib/components/lemmy/moderation/BanModal.svelte @@ -10,6 +10,8 @@ import MarkdownEditor from '$lib/components/markdown/MarkdownEditor.svelte' import { t } from '$lib/translations' import CommunityLink from '../community/CommunityLink.svelte' + import Duration from '$lib/components/form/Duration.svelte' + import SectionTitle from '$lib/components/ui/SectionTitle.svelte' interface Props { open?: boolean @@ -27,18 +29,17 @@ let reason = $state('') let deleteData = $state(false) - let expires = $state('') - + let expires = $state(-1) let loading = $state(false) // hack due to svelte's reactive declarations const resetReason = () => { reason = '' deleteData = false - expires = '' + expires = -1 } - run(() => { + $effect(() => { if (item) resetReason() }) @@ -50,28 +51,8 @@ try { let date: number | undefined - if (expires != '') { - date = Date.parse(expires) - if (Number.isNaN(date)) { - toast({ - content: $t('toast.invalidDateAbsolute'), - type: 'error', - }) - - loading = false - - return - } - - if (date < Date.now()) { - toast({ - content: $t('toast.invalidDateBeforeCurrent'), - type: 'error', - }) - - loading = false - return - } + if (expires > 0) { + date = Math.floor(Date.now() / 1000) + expires } if (community) { @@ -81,7 +62,7 @@ person_id: item.id, reason: reason || undefined, remove_data: deleteData, - expires: date ? Math.floor(date / 1000) : undefined, + expires: date, }) } else { await getClient().banPerson({ @@ -89,7 +70,7 @@ person_id: item.id, reason: reason || undefined, remove_data: deleteData, - expires: date ? Math.floor(date / 1000) : undefined, + expires: date, }) } @@ -137,11 +118,10 @@ {$t('moderation.ban.warning')} {/snippet} - +
+ {$t('moderation.ban.expires')} + +
{/if}