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
This commit is contained in:
1 parent
5b8f9d15af
commit
412977a484
16 files changed
+621
-190
No files matched your search
@@ -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)
|
||||
</script>
|
||||
|
||||
<div class="flex flex-row">
|
||||
<div class="flex flex-col gap-1.5 flex-1">
|
||||
<span class="text-xs font-medium">Report from</span>
|
||||
<span class="font-bold">
|
||||
<UserLink avatar user={item.creator} />
|
||||
</span>
|
||||
<Modal title="Report from" bind:open={usersModal}>
|
||||
<div class="flex flex-col divide-y divide-slate-200 dark:divide-zinc-800">
|
||||
{#each items as item}
|
||||
<UserLink avatar={false} user={item.creator} class="py-1" />
|
||||
{/each}
|
||||
</div>
|
||||
</Modal>
|
||||
|
||||
<Modal title={$t('moderation.reason')} bind:open={reasonsModal}>
|
||||
<div class="flex flex-col divide-y divide-slate-200 dark:divide-zinc-800">
|
||||
{#each items as item}
|
||||
<div class="py-2">
|
||||
<UserLink avatar={false} user={item.creator} class="py-1 block" />
|
||||
<blockquote
|
||||
class="italic text-sm pl-4 border-l-2 border-slate-300 dark:border-zinc-700"
|
||||
>
|
||||
{item.reason}
|
||||
</blockquote>
|
||||
</div>
|
||||
{/each}
|
||||
</div>
|
||||
</Modal>
|
||||
|
||||
<div class={['flex flex-row flex-wrap gap-4']}>
|
||||
{#if item.type == 'comment' || item.type == 'post'}
|
||||
<div class="flex flex-col gap-1.5">
|
||||
<span class="text-xs font-medium">{$t('form.post.community')}</span>
|
||||
<a
|
||||
href="?community={item.item.community.id}"
|
||||
class="flex items-center gap-1 font-medium hover:underline"
|
||||
>
|
||||
<Avatar
|
||||
circle={false}
|
||||
url={item.item.community.icon}
|
||||
alt={item.item.community.name}
|
||||
width={24}
|
||||
/>
|
||||
{item.item.community.title}
|
||||
</a>
|
||||
</div>
|
||||
{/if}
|
||||
{#if items.length > 1}
|
||||
<button
|
||||
onclick={() => (usersModal = !usersModal)}
|
||||
class="flex-1 text-2xl font-medium hover:underline cursor-pointer text-left w-max"
|
||||
>
|
||||
{items.length}x
|
||||
</button>
|
||||
{:else}
|
||||
<div class="flex flex-col gap-1.5">
|
||||
<span class="text-xs font-medium">Report from</span>
|
||||
<span class="font-bold">
|
||||
<UserLink avatar user={item.creator} />
|
||||
</span>
|
||||
</div>
|
||||
{/if}
|
||||
|
||||
<div class="flex-1"></div>
|
||||
<Button
|
||||
onclick={resolve}
|
||||
class="h-max self-end {item.resolved
|
||||
@@ -123,9 +189,9 @@
|
||||
|
||||
<Material rounding="xl" color="uniform" class="dark:bg-zinc-950">
|
||||
{#if item.type == 'comment'}
|
||||
<CommentItem community={true} comment={item.item} class="p-0!" />
|
||||
<CommentItem comment={item.item} class="p-0!" />
|
||||
{:else if item.type == 'post'}
|
||||
<Post post={item.item} class="p-0!" />
|
||||
<Post hideCommunity post={item.item} class="p-0!" />
|
||||
{:else if item.type == 'message'}
|
||||
<PrivateMessage
|
||||
message={{
|
||||
@@ -145,7 +211,16 @@
|
||||
<p>
|
||||
{item.reason}
|
||||
</p>
|
||||
{#if items.length > 1}
|
||||
<button
|
||||
class="cursor-pointer"
|
||||
onclick={() => (reasonsModal = !reasonsModal)}
|
||||
>
|
||||
<Badge class="w-max my-1">+{items.length - 1}</Badge>
|
||||
</button>
|
||||
{/if}
|
||||
</div>
|
||||
<div class="flex-1"></div>
|
||||
{#if item.resolver}
|
||||
<div>
|
||||
<SectionTitle small>
|
||||
|
||||
Reference in new issue
Block a user