From 9fd32aa7dd473fa6670450effcf25c946f32c827 Mon Sep 17 00:00:00 2001 From: Xyphyn Date: Sat, 12 Aug 2023 19:07:38 -0700 Subject: [PATCH] feat: add removal templates --- .../lemmy/moderation/RemoveModal.svelte | 17 +++++++- .../components/lemmy/moderation/moderation.ts | 21 +++++++++- .../components/markdown/MarkdownEditor.svelte | 4 +- src/lib/components/ui/Navbar.svelte | 2 +- src/lib/components/ui/StickyCard.svelte | 2 +- src/lib/settings.ts | 6 +++ src/routes/+page.svelte | 4 +- src/routes/settings/+page.svelte | 42 +++++++++++++++++++ src/style/app.css | 9 +++- 9 files changed, 97 insertions(+), 10 deletions(-) diff --git a/src/lib/components/lemmy/moderation/RemoveModal.svelte b/src/lib/components/lemmy/moderation/RemoveModal.svelte index 07858415..ea11d0f3 100644 --- a/src/lib/components/lemmy/moderation/RemoveModal.svelte +++ b/src/lib/components/lemmy/moderation/RemoveModal.svelte @@ -13,6 +13,9 @@ import MarkdownEditor from '$lib/components/markdown/MarkdownEditor.svelte' import { Fire, Icon, Trash } from 'svelte-hero-icons' import MultiSelect from '$lib/components/input/MultiSelect.svelte' + import { removalTemplate } from '$lib/components/lemmy/moderation/moderation.js' + import { userSettings } from '$lib/settings.js' + import { fullCommunityName } from '$lib/util.js' export let open: boolean export let item: PostView | CommentView | undefined = undefined @@ -30,10 +33,20 @@ : false const getReplyReason = (reason: string) => { - return `Your submission in *"${item?.post.name}"* was removed for:\n${reason}` + if (!item) return `no template` + + return removalTemplate($userSettings.moderation.removalReasonPreset, { + communityLink: `!${fullCommunityName( + item!.community.name, + item!.community.actor_id + )}`, + postTitle: item.post.name, + reason: reason, + username: item.creator.name, + }) } - $: replyReason = getReplyReason(reason) + $: replyReason = commentReason ? getReplyReason(reason) : '' async function remove() { if (!item) return diff --git a/src/lib/components/lemmy/moderation/moderation.ts b/src/lib/components/lemmy/moderation/moderation.ts index 36071881..b68cd779 100644 --- a/src/lib/components/lemmy/moderation/moderation.ts +++ b/src/lib/components/lemmy/moderation/moderation.ts @@ -1,3 +1,4 @@ +import type Post from '$lib/components/lemmy/post/Post.svelte' import type { CommentView, Community, @@ -61,7 +62,7 @@ export function remove(item: PostView | CommentView, purge: boolean = false) { removing: { open: true, item: item, - purge: purge + purge: purge, }, })) } @@ -86,3 +87,21 @@ export const amModOfAny = (me?: MyUserInfo) => me && (me.moderates.length > 0 || isAdmin(me)) export const isAdmin = (me: MyUserInfo) => me.local_user_view.person.admin + +export const removalTemplate = ( + input: string, + content: { + postTitle?: string + communityLink?: string + username?: string + reason?: string + } +) => { + if (content.postTitle) input = input.replaceAll('{{post}}', content.postTitle) + if (content.communityLink) + input = input.replaceAll('{{community}}', content.communityLink) + if (content.username) + input = input.replaceAll('{{username}}', content.username) + if (content.reason) input = input.replaceAll('{{reason}}', content.reason) + return input +} diff --git a/src/lib/components/markdown/MarkdownEditor.svelte b/src/lib/components/markdown/MarkdownEditor.svelte index 6524006f..8702c327 100644 --- a/src/lib/components/markdown/MarkdownEditor.svelte +++ b/src/lib/components/markdown/MarkdownEditor.svelte @@ -24,6 +24,8 @@ export let previewButton: boolean = false export let disabled: boolean = false + export let beforePreview: (input: string) => string = (input) => input + const dispatcher = createEventDispatcher<{ confirm: string }>() let textArea: HTMLTextAreaElement @@ -119,7 +121,7 @@ overflow-hidden focus-within:border-black focus-within:dark:border-white transit > {#if previewing}
- +
{:else} diff --git a/src/lib/components/ui/Navbar.svelte b/src/lib/components/ui/Navbar.svelte index e5ff3772..ab21efcd 100644 --- a/src/lib/components/ui/Navbar.svelte +++ b/src/lib/components/ui/Navbar.svelte @@ -163,7 +163,7 @@