From 22ce7bf39e525c33e009de4b46cf261db436370b Mon Sep 17 00:00:00 2001 From: Xyphyn Date: Wed, 23 Aug 2023 17:53:33 -0700 Subject: [PATCH] feat: add more moderator actions --- src/lib/components/input/SearchInput.svelte | 10 ++++-- src/lib/components/input/TextInput.svelte | 1 + .../lemmy/ObjectAutocomplete.svelte | 5 +-- src/routes/modlog/+page.svelte | 21 +++++++++++- src/routes/modlog/+page.ts | 34 ++++++++++++++++++- src/routes/modlog/ModlogAction.svelte | 31 +++++++++++++++++ 6 files changed, 96 insertions(+), 6 deletions(-) diff --git a/src/lib/components/input/SearchInput.svelte b/src/lib/components/input/SearchInput.svelte index b1cbe3e7..13df9129 100644 --- a/src/lib/components/input/SearchInput.svelte +++ b/src/lib/components/input/SearchInput.svelte @@ -13,6 +13,8 @@ export let extractSelected: (item: T | null) => any export let extractName: (item: T) => string export let showWhenEmpty: boolean = false + let canSearch: boolean = false + export { canSearch as searchOnMount } const debounce = (fn: Function, ms = 300) => { let timeoutId: ReturnType @@ -25,6 +27,7 @@ const dispatcher = createEventDispatcher<{ search: string }>() const debounceFunc = debounce(() => { + canSearch = true dispatcher('search', query) }, debounceTime) @@ -38,8 +41,11 @@ }} {...$$restProps} /> - - {#if query == ''} + + {#if query == '' && showWhenEmpty} {:else} {#each options as option} diff --git a/src/lib/components/input/TextInput.svelte b/src/lib/components/input/TextInput.svelte index 9c69bc5a..af7df2ed 100644 --- a/src/lib/components/input/TextInput.svelte +++ b/src/lib/components/input/TextInput.svelte @@ -40,6 +40,7 @@ on:keydown={(e) => dispatcher('keydown', e)} on:input={(e) => dispatcher('input', e)} on:change={(e) => dispatcher('change', e)} + on:focus {...$$restProps} class={className} {required} diff --git a/src/lib/components/lemmy/ObjectAutocomplete.svelte b/src/lib/components/lemmy/ObjectAutocomplete.svelte index 1b193017..66a6307f 100644 --- a/src/lib/components/lemmy/ObjectAutocomplete.svelte +++ b/src/lib/components/lemmy/ObjectAutocomplete.svelte @@ -13,6 +13,7 @@ export let jwt: string | undefined = undefined export let listing_type: ListingType = 'Subscribed' export let items: Community[] | undefined = undefined + export let showWhenEmpty: boolean = false let showNone: boolean = false const dispatcher = createEventDispatcher<{ select: Community }>() @@ -45,11 +46,11 @@ let:extractName let:extractSelected let:option - showWhenEmpty + {showWhenEmpty} {...$$restProps} let:query > - {#if query == ''} + {#if query == '' && showWhenEmpty} dispatcher('select', undefined)}>
diff --git a/src/routes/modlog/+page.svelte b/src/routes/modlog/+page.svelte index 7af93e99..3086e172 100644 --- a/src/routes/modlog/+page.svelte +++ b/src/routes/modlog/+page.svelte @@ -38,6 +38,24 @@ 'AdminPurgePost', 'AdminPurgeComment', ]} + optionNames={[ + 'All', + 'Remove Post', + 'Lock Post', + 'Feature Post', + 'Remove Comment', + 'Remove Community', + 'Ban From Community', + 'Add Community', + 'Transfer Community', + 'Add', + 'Ban', + 'Hide Community', + 'Purge Person', + 'Purge Community', + 'Purge Post', + 'Purge Comment', + ]} selected={data.type} on:select={(e) => searchParam($page.url, 'type', e.detail, 'page')} /> @@ -47,6 +65,7 @@ placeholder="Filter by community" jwt={$profile?.jwt} listing_type="All" + showWhenEmpty={true} on:select={(e) => searchParam($page.url, 'community', e.detail?.id.toString(), 'page')} /> @@ -61,7 +80,7 @@ - + diff --git a/src/routes/modlog/+page.ts b/src/routes/modlog/+page.ts index 4e1dac34..12754d7d 100644 --- a/src/routes/modlog/+page.ts +++ b/src/routes/modlog/+page.ts @@ -4,8 +4,11 @@ import type { Community, ModAddCommunityView, ModBanFromCommunityView, + ModFeaturePostView, + ModLockPostView, ModRemoveCommentView, ModRemovePostView, + ModTransferCommunityView, ModlogActionType, ModlogListParams, Person, @@ -17,6 +20,8 @@ export type ActionName = | 'postRemoval' | 'commentRemoval' | 'postLock' + | 'postUnlock' + | 'postUnfeature' | 'postFeature' | 'modAdd' | 'modRemove' @@ -27,6 +32,9 @@ type ModAction = | ModRemoveCommentView | ModRemovePostView | ModAddCommunityView + | ModLockPostView + | ModFeaturePostView + | ModTransferCommunityView export interface ModLog { reason?: string @@ -81,8 +89,27 @@ export const _toModLog = (item: ModAction): ModLog => { moderator: item.moderator, moderatee: item.modded_person, } + } else if ('mod_feature_post' in item) { + return { + actionName: item.mod_feature_post.featured + ? 'postFeature' + : 'postUnfeature', + timestamp: Date.parse(`${item.mod_feature_post.when_}Z`), + community: item.community, + link: `/post/${item.post.id}`, + moderator: item.moderator, + content: item.post.name, + } + } else if ('mod_lock_post' in item) { + return { + actionName: item.mod_lock_post.locked ? 'postLock' : 'postUnlock', + timestamp: Date.parse(`${item.mod_lock_post.when_}Z`), + community: item.community, + link: `/post/${item.post.id}`, + moderator: item.moderator, + content: item.post.name, + } } - return { actionName: 'Unknown', timestamp: 0, @@ -109,7 +136,12 @@ export async function load({ url }) { ...results.banned_from_community, ...results.removed_comments, ...results.removed_posts, + ...results.added_to_community, + ...results.transferred_to_community, + + ...results.featured_posts, + ...results.locked_posts, ] const moderationActions = moderation diff --git a/src/routes/modlog/ModlogAction.svelte b/src/routes/modlog/ModlogAction.svelte index d138f821..a85868f4 100644 --- a/src/routes/modlog/ModlogAction.svelte +++ b/src/routes/modlog/ModlogAction.svelte @@ -2,6 +2,9 @@ import type { IconSource } from 'svelte-hero-icons' import { Icon, + InformationCircle, + LockClosed, + LockOpen, QuestionMarkCircle, Trash, UserMinus, @@ -53,6 +56,34 @@ text: 'Removed Mod', } } + case 'postFeature': { + return { + icon: InformationCircle, + class: 'text-green-600 dark:text-green-400', + text: 'Featured Post', + } + } + case 'postUnfeature': { + return { + icon: InformationCircle, + class: 'text-red-600 dark:text-red-400', + text: 'Unfeatured Post', + } + } + case 'postLock': { + return { + icon: LockClosed, + class: 'text-yellow-600 dark:text-yellow-400', + text: 'Locked Post', + } + } + case 'postUnlock': { + return { + icon: LockOpen, + class: 'text-yellow-600 dark:text-yellow-400', + text: 'Unlocked Post', + } + } } return {