From cd123d56cd55d7ac2f02b02efa8dc20de22ae22d Mon Sep 17 00:00:00 2001 From: Xylight <80978739+Xyphyn@users.noreply.github.com> Date: Thu, 26 Jun 2025 01:56:01 +0000 Subject: [PATCH] Merge pull request #599 from Xyphyn/moderation-impr feat: add view votes modal to comments/posts, close #243 --- .../moderation/CommentModerationMenu.svelte | 46 +++---- .../lemmy/moderation/Moderation.svelte | 6 + .../lemmy/moderation/ModerationMenu.svelte | 23 ++-- .../lemmy/moderation/ViewVotesModal.svelte | 130 ++++++++++++++++++ .../components/lemmy/moderation/moderation.ts | 18 +++ src/lib/mono/button/Button.svelte | 2 + 6 files changed, 193 insertions(+), 32 deletions(-) create mode 100644 src/lib/components/lemmy/moderation/ViewVotesModal.svelte diff --git a/src/lib/components/lemmy/moderation/CommentModerationMenu.svelte b/src/lib/components/lemmy/moderation/CommentModerationMenu.svelte index f1a2df27..44d49f92 100644 --- a/src/lib/components/lemmy/moderation/CommentModerationMenu.svelte +++ b/src/lib/components/lemmy/moderation/CommentModerationMenu.svelte @@ -1,7 +1,12 @@ + + +
+ {#await votes} +
+ +
+ {:then votes} + + + + + + + + + + {#each votes as vote} + + + + + + {/each} + +
+ {$t('routes.admin.applications.user')} +
+ + + + + + + +
+ {#if !(votes.length < 50 && page == 1)} +
+ + {page} + +
+ {/if} + {/await} +
+
diff --git a/src/lib/components/lemmy/moderation/moderation.ts b/src/lib/components/lemmy/moderation/moderation.ts index 6fbb838c..dad8978c 100644 --- a/src/lib/components/lemmy/moderation/moderation.ts +++ b/src/lib/components/lemmy/moderation/moderation.ts @@ -27,6 +27,10 @@ interface Modals { user: Person | undefined community: Community | undefined } + votes: { + open: boolean + item: PostView | CommentView | undefined + } } export const modals = writable({ @@ -45,6 +49,10 @@ export const modals = writable({ user: undefined, community: undefined, }, + votes: { + open: false, + item: undefined, + }, }) export function report(item: PostView | CommentView | PrivateMessageView) { @@ -87,6 +95,16 @@ export async function feature(featured: boolean, item: Comment, jwt: string) { }) } +export async function viewVotes(item: PostView | CommentView) { + modals.update(m => ({ + ...m, + votes: { + open: true, + item: item, + }, + })) +} + export const amMod = (me: MyUserInfo, community: Community) => me.moderates.map(c => c.community.id).includes(community.id) || (community.local && isAdmin(me)) diff --git a/src/lib/mono/button/Button.svelte b/src/lib/mono/button/Button.svelte index fad680db..7cf8de4e 100644 --- a/src/lib/mono/button/Button.svelte +++ b/src/lib/mono/button/Button.svelte @@ -40,6 +40,8 @@ dark:border-zinc-800 hover:bg-slate-200 dark:hover:bg-zinc-800 hover:border-slate-300 dark:hover:border-zinc-700`, + 'blue-subtle': `text-blue-500 hover:bg-blue-500 hover:text-inherit!`, + none: '', }