From 412977a484132786660eee44482db3f2d61688ee Mon Sep 17 00:00:00 2001 From: Xylight <80978739+Xyphyn@users.noreply.github.com> Date: Sun, 6 Jul 2025 15:43:26 -0700 Subject: [PATCH] impr: add more options to moderation page (#604) * feat: allow filtering by community on modpage * feat: add arbitrary banning * temp * feat: combine reports on reports page * design: clarify report design * fix: update lang key for navbar moderation --- .../lemmy/community/CommunityHeader.svelte | 16 +- .../lemmy/community/CommunityItem.svelte | 121 ++++++------ src/lib/components/ui/navbar/Navbar.svelte | 2 +- .../ui/navbar/commands/Commands.svelte | 33 +--- src/lib/i18n/en.json | 8 +- src/lib/lemmy/item.ts | 2 + src/lib/util.svelte.ts | 32 ++++ src/routes/AIButton.svelte | 33 ++++ src/routes/moderation/+layout.svelte | 31 +++ src/routes/moderation/+layout.ts | 6 + src/routes/moderation/+page.svelte | 114 +++++++---- src/routes/moderation/+page.ts | 32 +++- src/routes/moderation/Report.svelte | 179 +++++++++++++----- .../moderation/c/[id=integer]/+page.svelte | 85 +++++++++ src/routes/moderation/c/[id=integer]/+page.ts | 44 +++++ .../moderation/communities/+page.svelte | 73 +++++++ 16 files changed, 621 insertions(+), 190 deletions(-) create mode 100644 src/routes/AIButton.svelte create mode 100644 src/routes/moderation/+layout.svelte create mode 100644 src/routes/moderation/+layout.ts create mode 100644 src/routes/moderation/c/[id=integer]/+page.svelte create mode 100644 src/routes/moderation/c/[id=integer]/+page.ts create mode 100644 src/routes/moderation/communities/+page.svelte diff --git a/src/lib/components/lemmy/community/CommunityHeader.svelte b/src/lib/components/lemmy/community/CommunityHeader.svelte index fbde126b..dcb87f9a 100644 --- a/src/lib/components/lemmy/community/CommunityHeader.svelte +++ b/src/lib/components/lemmy/community/CommunityHeader.svelte @@ -25,10 +25,11 @@ Newspaper, NoSymbol, Plus, + ShieldCheck, } from 'svelte-hero-icons' import Subscribe from '../../../../routes/communities/Subscribe.svelte' import ItemList from '../generic/ItemList.svelte' - import { isAdmin } from '../moderation/moderation' + import { amMod, isAdmin } from '../moderation/moderation' import { block, blockInstance, purgeCommunity } from './CommunityCard.svelte' interface Props { @@ -37,6 +38,7 @@ counts?: CommunityAggregates | undefined moderators?: CommunityModeratorView[] blocked?: boolean + banner?: boolean class?: string } @@ -46,12 +48,13 @@ counts = undefined, moderators = [], blocked = false, + banner = !(settings.nsfwBlur && community.nsfw), class: clazz = '', }: Props = $props() {$t('cards.community.modlog')} + {#if profile.data.user && amMod(profile.data.user, community)} + + + {$t('routes.moderation.feed')} + + {/if} {#if profile.data?.jwt} @@ -137,66 +140,70 @@ - - (showInfo = !showInfo)} - > - - - - {#snippet children({ subscribe, subscribing })} - { - const res = await subscribe() + {#if children} + {@render children?.()} + {:else} + + (showInfo = !showInfo)} + > + + + + {#snippet children({ subscribe, subscribing })} + { + const res = await subscribe() - if (res) { - const newSubscribed = - res.community_view.subscribed != 'NotSubscribed' - ? 'Subscribed' - : 'NotSubscribed' + if (res) { + const newSubscribed = + res.community_view.subscribed != 'NotSubscribed' + ? 'Subscribed' + : 'NotSubscribed' - community.subscribed = newSubscribed - addSubscription( - community.community, - newSubscribed == 'Subscribed', - ) - } - }} - size="custom" - title={isSubscribed(community.subscribed) - ? $t('cards.community.subscribed') - : $t('cards.community.subscribe')} - color={isSubscribed(community.subscribed) - ? 'elevatedLow' - : 'primary'} - class="{isSubscribed(community.subscribed) - ? 'text-slate-600 dark:text-zinc-400' - : ''} + community.subscribed = newSubscribed + addSubscription( + community.community, + newSubscribed == 'Subscribed', + ) + } + }} + size="custom" + title={isSubscribed(community.subscribed) + ? $t('cards.community.subscribed') + : $t('cards.community.subscribe')} + color={isSubscribed(community.subscribed) + ? 'elevatedLow' + : 'primary'} + class="{isSubscribed(community.subscribed) + ? 'text-slate-600 dark:text-zinc-400' + : ''} aspect-square h-8.5 @md:px-2 @md:min-w-30 @md:aspect-auto @md:rounded-full" - > - {#snippet prefix()} - - {/snippet} - - {#if isSubscribed(community.subscribed)} - {$t('cards.community.subscribed')} - {:else} - {$t('cards.community.subscribe')} - {/if} - - - {/snippet} - - + > + {#snippet prefix()} + + {/snippet} + + {#if isSubscribed(community.subscribed)} + {$t('cards.community.subscribed')} + {:else} + {$t('cards.community.subscribe')} + {/if} + + + {/snippet} + + + {/if} {#if showCounts} diff --git a/src/lib/components/ui/navbar/Navbar.svelte b/src/lib/components/ui/navbar/Navbar.svelte index c40cd088..6caa0669 100644 --- a/src/lib/components/ui/navbar/Navbar.svelte +++ b/src/lib/components/ui/navbar/Navbar.svelte @@ -138,7 +138,7 @@ {#if amModOfAny(profile.data.user)} - {$t('routes.moderation.reports')} + {$t('routes.moderation.feed')} {#snippet suffix()} {@render notifBadge($notifications.reports)} {/snippet} diff --git a/src/lib/components/ui/navbar/commands/Commands.svelte b/src/lib/components/ui/navbar/commands/Commands.svelte index 5f168a63..f4417c33 100644 --- a/src/lib/components/ui/navbar/commands/Commands.svelte +++ b/src/lib/components/ui/navbar/commands/Commands.svelte @@ -11,6 +11,7 @@ import { Home, Icon, MagnifyingGlass } from 'svelte-hero-icons' import { getGroups, type Action, type Group } from './actions.svelte' import CommandItem from './CommandItem.svelte' + import { fuzzySearch } from '$lib/util.svelte' interface Props { open?: boolean @@ -37,38 +38,6 @@ let breadcrumbs: Action[] = $state([]) let input = $state() - function fuzzySearch(text: string, pattern: string): number { - const textLower = text.toLowerCase() - const patternLower = pattern.toLowerCase() - let score = 0 - let lastIndex = -1 - let consecutiveBonus = 0 - - for (let i = 0; i < patternLower.length; i++) { - const index = textLower.indexOf(patternLower[i], lastIndex + 1) - if (index === -1) return 0 - - score += 1 - if (index === lastIndex + 1) { - consecutiveBonus++ - score += consecutiveBonus - } else { - consecutiveBonus = 0 - } - - lastIndex = index - } - - // Bonus for matching start of words - if (textLower.startsWith(patternLower)) { - score += 2 - } else if (textLower.includes(' ' + patternLower)) { - score += 1 - } - - return score - } - const debounce = (fn: Function, ms = 300) => { let timeoutId: ReturnType // eslint-disable-next-line diff --git a/src/lib/i18n/en.json b/src/lib/i18n/en.json index 87c4f399..39c3c593 100644 --- a/src/lib/i18n/en.json +++ b/src/lib/i18n/en.json @@ -333,7 +333,13 @@ "resolvedBy": "Resolved by", "markAll": "Mark page resolved", "markAllComplete": "Batch action completed.", - "reports": "Reports" + "feed": "Reports", + "manage": { + "title": "Manage", + "modlogs": "Recent moderation logs", + "ban": "Ban", + "unban": "Unban" + } }, "admin": { "title": "Administration", diff --git a/src/lib/lemmy/item.ts b/src/lib/lemmy/item.ts index ef11e91f..1d2e940a 100644 --- a/src/lib/lemmy/item.ts +++ b/src/lib/lemmy/item.ts @@ -9,6 +9,7 @@ import type { Post, PostReportView, PostView, + PrivateMessage, PrivateMessageReportView, PrivateMessageView, } from 'lemmy-js-client' @@ -25,6 +26,7 @@ export type Result = | PostReportView | CommentReportView | PrivateMessageReportView + | PrivateMessage export function getItemPublished(item: Result) { // reports... why diff --git a/src/lib/util.svelte.ts b/src/lib/util.svelte.ts index ccde8af5..14077ac0 100644 --- a/src/lib/util.svelte.ts +++ b/src/lib/util.svelte.ts @@ -186,3 +186,35 @@ export function escapeHtml(input: string): string { .replace(/"/g, '"') .replace(/'/g, ''') } + +export function fuzzySearch(text: string, pattern: string): number { + const textLower = text.toLowerCase() + const patternLower = pattern.toLowerCase() + let score = 0 + let lastIndex = -1 + let consecutiveBonus = 0 + + for (let i = 0; i < patternLower.length; i++) { + const index = textLower.indexOf(patternLower[i], lastIndex + 1) + if (index === -1) return 0 + + score += 1 + if (index === lastIndex + 1) { + consecutiveBonus++ + score += consecutiveBonus + } else { + consecutiveBonus = 0 + } + + lastIndex = index + } + + // Bonus for matching start of words + if (textLower.startsWith(patternLower)) { + score += 2 + } else if (textLower.includes(' ' + patternLower)) { + score += 1 + } + + return score +} diff --git a/src/routes/AIButton.svelte b/src/routes/AIButton.svelte new file mode 100644 index 00000000..ade71493 --- /dev/null +++ b/src/routes/AIButton.svelte @@ -0,0 +1,33 @@ + + + + {#snippet target()} + + + + {/snippet} + {#snippet popover()} + + AI !!!! + + {/snippet} + + + diff --git a/src/routes/moderation/+layout.svelte b/src/routes/moderation/+layout.svelte new file mode 100644 index 00000000..b566e6d2 --- /dev/null +++ b/src/routes/moderation/+layout.svelte @@ -0,0 +1,31 @@ + + + + {$t('routes.moderation.title')} + + + + + + + {@render children?.()} + diff --git a/src/routes/moderation/+layout.ts b/src/routes/moderation/+layout.ts new file mode 100644 index 00000000..ad029a68 --- /dev/null +++ b/src/routes/moderation/+layout.ts @@ -0,0 +1,6 @@ +import { profile } from '$lib/auth.svelte' +import { error } from '@sveltejs/kit' + +export function load() { + if (!profile.data.jwt) error(401) +} diff --git a/src/routes/moderation/+page.svelte b/src/routes/moderation/+page.svelte index 28e30bba..1e679808 100644 --- a/src/routes/moderation/+page.svelte +++ b/src/routes/moderation/+page.svelte @@ -7,13 +7,14 @@ import { t } from '$lib/i18n/translations' import { client } from '$lib/lemmy.svelte' import { searchParam } from '$lib/util.svelte.js' - import { Button, Select, toast } from 'mono-svelte' + import { Button, Material, Select, Spinner, toast } from 'mono-svelte' import Option from 'mono-svelte/forms/select/Option.svelte' import { tick } from 'svelte' - import { Check, Funnel, Icon, Inbox } from 'svelte-hero-icons' + import { Check, Funnel, Icon, Inbox, XMark } from 'svelte-hero-icons' import { fly } from 'svelte/transition' import Report from './Report.svelte' import Pageination from '$lib/components/ui/Pageination.svelte' + import CommunityLink from '$lib/components/lemmy/community/CommunityLink.svelte' let { data = $bindable() } = $props() @@ -26,38 +27,40 @@ await Promise.all( data.items?.value.map(report => { - switch (report.type) { - case 'comment': { - const promise = client().resolveCommentReport({ - report_id: report.id, - resolved: true, - }) - promise.then( - () => (batch.progress += 1 / data.items?.value!.length), - ) - return promise + report.map(r => { + switch (r.type) { + case 'comment': { + const promise = client().resolveCommentReport({ + report_id: r.id, + resolved: true, + }) + promise.then( + () => (batch.progress += 1 / data.items?.value!.length), + ) + return promise + } + case 'post': { + const promise = client().resolvePostReport({ + report_id: r.id, + resolved: true, + }) + promise.then( + () => (batch.progress += 1 / data.items?.value!.length), + ) + return promise + } + case 'message': { + const promise = client().resolvePrivateMessageReport({ + report_id: r.id, + resolved: true, + }) + promise.then( + () => (batch.progress += 1 / data.items?.value!.length), + ) + return promise + } } - case 'post': { - const promise = client().resolvePostReport({ - report_id: report.id, - resolved: true, - }) - promise.then( - () => (batch.progress += 1 / data.items?.value!.length), - ) - return promise - } - case 'message': { - const promise = client().resolvePrivateMessageReport({ - report_id: report.id, - resolved: true, - }) - promise.then( - () => (batch.progress += 1 / data.items?.value!.length), - ) - return promise - } - } + }) }), ) @@ -101,6 +104,30 @@ {$t('routes.moderation.markAll')} + {#if data.filters.community} + + + + {$t('form.post.community')} + + {#await client().getCommunity({ id: data.filters.community })} + + {:then community} + + + + + {/await} + + + {/if} {/snippet} @@ -109,14 +136,27 @@ - {#each data.items?.value as item (item.id)} + {#each data.items?.value as item} - + - + + {#if item.length > 1} + + {/if} {/each} diff --git a/src/routes/moderation/+page.ts b/src/routes/moderation/+page.ts index 9d80bd28..8ffb893e 100644 --- a/src/routes/moderation/+page.ts +++ b/src/routes/moderation/+page.ts @@ -1,10 +1,12 @@ import { profile } from '$lib/auth.svelte' import { isAdmin } from '$lib/components/lemmy/moderation/moderation.js' import { getClient } from '$lib/lemmy.svelte.js' +import { isCommentView, isPostView } from '$lib/lemmy/item' import { generalizeCommentReport, generalizePostReport, generalizePrivateMessageReport, + type ReportView, } from '$lib/lemmy/report.js' import { ReactiveState } from '$lib/promise.svelte' import { error } from '@sveltejs/kit' @@ -17,20 +19,15 @@ export async function load({ url, fetch }) { const page = Number(url.searchParams.get('page')) || 1 const type: ReportListType = (url.searchParams.get('type') as ReportListType) || 'unread' + const community = Number(url.searchParams.get('community')) || undefined - // can they please - // make a sane, consistent, and simple API for once - // 3 separate requests? really? - // and this time instead of get() it's list(). Why?! - // the interfaces don't even extend each other - // meaning I have to make a separate function to get dates - // for EACH FREAKING ITEM KAJSHDAWLD auwdi awiody const client = getClient(undefined, fetch) const params = { limit: 20, page: page, unresolved_only: type == 'unread', + community_id: community, } const admin = profile.data?.user ? isAdmin(profile!.data.user!) : false @@ -53,9 +50,28 @@ export async function load({ url, fetch }) { ), ].sort((a, b) => b.timestamp.getTime() - a.timestamp.getTime()) + const grouped = everything.reduce( + (groups, item) => { + const key = isPostView(item.item) + ? item.item.post.id + : isCommentView(item.item) + ? item.item.comment.id + : item.item.id + if (!groups[key]) { + groups[key] = [] + } + groups[key].push(item) + return groups + }, + {} as Record, + ) + return { type: new ReactiveState(type), page: page, - items: new ReactiveState(everything), + items: new ReactiveState(Object.values(grouped)), + filters: { + community: community, + }, } } diff --git a/src/routes/moderation/Report.svelte b/src/routes/moderation/Report.svelte index 87e13059..37d0a2e8 100644 --- a/src/routes/moderation/Report.svelte +++ b/src/routes/moderation/Report.svelte @@ -4,19 +4,23 @@ import PrivateMessage from '$lib/components/lemmy/inbox/PrivateMessage.svelte' import Post from '$lib/components/lemmy/post/Post.svelte' import UserLink from '$lib/components/lemmy/user/UserLink.svelte' + import Avatar from '$lib/components/ui/Avatar.svelte' import SectionTitle from '$lib/components/ui/SectionTitle.svelte' import { t } from '$lib/i18n/translations' import { getClient } from '$lib/lemmy.svelte.js' import { errorMessage } from '$lib/lemmy/error' import type { ReportView } from '$lib/lemmy/report.js' - import { Button, Material, toast } from 'mono-svelte' + import { Badge, Button, Material, Modal, toast } from 'mono-svelte' import { CheckCircle, Icon } from 'svelte-hero-icons' interface Props { - item: ReportView + item: ReportView[] } - let { item = $bindable() }: Props = $props() + let { item: items = $bindable() }: Props = $props() + + // TODO more strict type enforcing, this hack is not good + const item = items[0] let resolving = $state(false) async function resolve() { @@ -26,63 +30,72 @@ try { switch (item.type) { case 'comment': { - const res = await getClient().resolveCommentReport({ - report_id: item.id, - resolved: !item.resolved, - }) - - item.resolved = res.comment_report_view.comment_report.resolved - item.resolver = res.comment_report_view.resolver - - toast({ - content: item.resolved - ? $t('toast.resolveReport') - : $t('toast.unresolveReport'), - type: 'success', - }) + await Promise.all( + items.map(async i => + getClient() + .resolveCommentReport({ + report_id: i.id, + resolved: !i.resolved, + }) + .then(res => { + i.resolved = res.comment_report_view.comment_report.resolved + i.resolver = res.comment_report_view.resolver + $notifications.reports += i.resolved ? 1 : -1 + }), + ), + ) break } case 'post': { - const res = await getClient().resolvePostReport({ - report_id: item.id, - resolved: !item.resolved, - }) + await Promise.all( + items.map(async i => + getClient() + .resolvePostReport({ + report_id: i.id, + resolved: !i.resolved, + }) + .then(res => { + i.resolved = res.post_report_view.post_report.resolved - item.resolved = res.post_report_view.post_report.resolved - item.resolver = res.post_report_view.resolver - toast({ - content: item.resolved - ? $t('toast.resolveReport') - : $t('toast.unresolveReport'), - type: 'success', - }) + i.resolver = res.post_report_view.resolver + + $notifications.reports += i.resolved ? 1 : -1 + }), + ), + ) break } case 'message': { - const res = await getClient().resolvePrivateMessageReport({ - report_id: item.id, - resolved: !item.resolved, - }) + await Promise.all( + items.map(async i => + getClient() + .resolvePrivateMessageReport({ + report_id: i.id, + resolved: !i.resolved, + }) + .then(res => { + i.resolved = + res.private_message_report_view.private_message_report.resolved - item.resolved = - res.private_message_report_view.private_message_report.resolved + i.resolver = res.private_message_report_view.resolver - item.resolver = res.private_message_report_view.resolver - - toast({ - content: item.resolved - ? $t('toast.resolveReport') - : $t('toast.unresolveReport'), - type: 'success', - }) + $notifications.reports += i.resolved ? 1 : -1 + }), + ), + ) break } } - $notifications.reports += item.resolved ? 1 : -1 + toast({ + content: item.resolved + ? $t('toast.resolveReport') + : $t('toast.unresolveReport'), + type: 'success', + }) } catch (err) { toast({ content: errorMessage(err as string), @@ -92,16 +105,69 @@ resolving = false } + + let usersModal = $state(false) + let reasonsModal = $state(false) - - - Report from - - - + + + {#each items as item} + + {/each} + + + + {#each items as item} + + + + {item.reason} + + + {/each} + + + + + {#if item.type == 'comment' || item.type == 'post'} + + {$t('form.post.community')} + + + {item.item.community.title} + + + {/if} + {#if items.length > 1} + (usersModal = !usersModal)} + class="flex-1 text-2xl font-medium hover:underline cursor-pointer text-left w-max" + > + {items.length}x + + {:else} + + Report from + + + + + {/if} + + {#if item.type == 'comment'} - + {:else if item.type == 'post'} - + {:else if item.type == 'message'} {item.reason} + {#if items.length > 1} + (reasonsModal = !reasonsModal)} + > + +{items.length - 1} + + {/if} + {#if item.resolver} diff --git a/src/routes/moderation/c/[id=integer]/+page.svelte b/src/routes/moderation/c/[id=integer]/+page.svelte new file mode 100644 index 00000000..0d70d386 --- /dev/null +++ b/src/routes/moderation/c/[id=integer]/+page.svelte @@ -0,0 +1,85 @@ + + + + {#snippet extended()} + + {/snippet} + + + + + {#snippet title()} + {$t('routes.moderation.manage.modlogs')} + {/snippet} + + {#await data.modlog} + + {:then log} + {#each log as modLog} + + {/each} + + + {$t('form.post.readMore')} + + + {/await} + + + + {#snippet title()} + + {$t('moderation.ban.banFromCommunity')} + + {/snippet} + + + + ban(banFromCommunity, p, data.community.community_view.community)} + listing_type="All" + /> + + + diff --git a/src/routes/moderation/c/[id=integer]/+page.ts b/src/routes/moderation/c/[id=integer]/+page.ts new file mode 100644 index 00000000..f1d58e43 --- /dev/null +++ b/src/routes/moderation/c/[id=integer]/+page.ts @@ -0,0 +1,44 @@ +import { client } from '$lib/lemmy.svelte.js' +import { _toModLog } from '../../../modlog/+page.js' + +export async function load({ params, fetch }) { + const modlog = client({ func: fetch }) + .getModlog({ + community_id: Number(params.id), + limit: 5, + page: 1, + }) + .then(i => + [ + ...i.banned_from_community, + ...i.removed_comments, + ...i.removed_posts, + + ...i.added_to_community, + ...i.transferred_to_community, + + ...i.featured_posts, + ...i.locked_posts, + + ...i.admin_purged_comments, + ...i.admin_purged_communities, + ...i.admin_purged_posts, + ...i.admin_purged_persons, + + ...i.hidden_communities, + ...i.banned, + ...i.added, + ] + .map(_toModLog) + .toSorted((a, b) => b.timestamp - a.timestamp), + ) + + const community = await client({ func: fetch }).getCommunity({ + id: Number(params.id), + }) + + return { + community: community, + modlog: modlog, + } +} diff --git a/src/routes/moderation/communities/+page.svelte b/src/routes/moderation/communities/+page.svelte new file mode 100644 index 00000000..6399e1f0 --- /dev/null +++ b/src/routes/moderation/communities/+page.svelte @@ -0,0 +1,73 @@ + + + + {$t('nav.communities')} + + + {#if !profile.data.user} + + + + {:else} + + {#each profile.data.user.moderates as moderate} + {@const community = moderate.community} + + + + {$t('routes.moderation.feed')} + + + + {$t('routes.moderation.manage.title')} + + + + {/each} + + {/if} +
+ {item.reason} +