diff --git a/src/lib/app/auth.svelte.ts b/src/lib/app/auth.svelte.ts index 4595ab4d..dd7271bc 100644 --- a/src/lib/app/auth.svelte.ts +++ b/src/lib/app/auth.svelte.ts @@ -3,7 +3,6 @@ import { env } from '$env/dynamic/public' import { DEFAULT_CLIENT_TYPE, type ClientType } from '$lib/api/base' import { client, getClient, site } from '$lib/api/client.svelte' import type { Community, GetSiteResponse, MyUserInfo } from '$lib/api/types' -import { amModOfAny, isAdmin } from '$lib/feature/moderation/moderation' import { publishedToDate } from '$lib/ui/util/date' import { toast } from 'mono-svelte' import { writable } from 'svelte/store' @@ -207,11 +206,7 @@ class Profile { const { user, jwt } = profile.current if (!user || !jwt) throw new Error('checkInbox() called with invalid user') - const notifs = await getNotificationCount( - jwt, - amModOfAny(user) ?? false, - user ? isAdmin(user) : false, - ) + const notifs = await getNotificationCount(jwt, this.isMod(), this.isAdmin) return { inbox: notifs.unreads, @@ -268,6 +263,26 @@ class Profile { } } + isMod(community?: Community) { + if (community) + return ( + (this.#current.user?.moderates.some( + (i) => i.community.id == community.id, + ) || + (community.local && this.isAdmin)) ?? + false + ) + else return (this.#current.user?.moderates.length ?? 0) > 0 + } + + get isAdmin() { + return ( + site.data?.admins.some( + (i) => i.person.id == this.#current.user?.local_user_view.person.id, + ) ?? false + ) + } + mainEffect = $effect.root(() => { // Sync with localStorage $effect(() => { diff --git a/src/lib/feature/comment/CommentActions.svelte b/src/lib/feature/comment/CommentActions.svelte index 54f5d142..89244dfc 100644 --- a/src/lib/feature/comment/CommentActions.svelte +++ b/src/lib/feature/comment/CommentActions.svelte @@ -12,11 +12,12 @@ Flag, PencilSquare, Share, + ShieldCheck, Trash, } from 'svelte-hero-icons/dist' import { deleteItem, save } from '../legacy/contentview' import CommentModerationMenu from '../moderation/CommentModerationMenu.svelte' - import { amMod, isAdmin, report } from '../moderation/moderation' + import { report } from '../moderation/moderation' import CommentVote from './CommentVote.svelte' interface Props { @@ -36,7 +37,7 @@
@@ -57,8 +58,20 @@ > {$t('comment.reply')} - {#if profile.current?.user && (amMod(profile.current?.user, comment.community) || isAdmin(profile.current.user))} - + {#if profile.current?.user && (profile.isMod(comment.community) || profile.isAdmin)} + + {#snippet target(attachment)} + - {/snippet} - {#if (profile.current?.user && amMod(profile.current.user, item.community)) || (profile.current?.user && isAdmin(profile.current.user))} - - {#if !item.community.local && !amMod(profile.current.user, item.community)} + + {#if profile.isMod(item.community) || profile.isAdmin} +
@@ -151,7 +151,7 @@ {$t('moderation.votes')} {/if} - {#if profile.current?.user && isAdmin(profile.current.user)} + {#if profile.isAdmin} {$t('admin.label')} - {#if !removed && profile.current?.user && (amMod(profile.current.user, item.community) || (isAdmin(profile.current.user) && item.community.local))} + {#if !removed} {$t('moderation.removeSubmission.withReason')} diff --git a/src/lib/feature/moderation/moderation.ts b/src/lib/feature/moderation/moderation.ts index 064d26b7..505e3c0d 100644 --- a/src/lib/feature/moderation/moderation.ts +++ b/src/lib/feature/moderation/moderation.ts @@ -1,8 +1,8 @@ import { client } from '$lib/api/client.svelte' import type { + Comment, CommentView, Community, - MyUserInfo, Person, PostView, PrivateMessageView, @@ -104,15 +104,6 @@ export async function viewVotes(item: PostView | CommentView) { })) } -export const amMod = (me: MyUserInfo, community: Community) => - me.moderates.map((c) => c.community.id).includes(community.id) || - (community.local && isAdmin(me)) - -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: { diff --git a/src/lib/feature/post/actions/PostActions.svelte b/src/lib/feature/post/actions/PostActions.svelte index ae123f0b..a8d67988 100644 --- a/src/lib/feature/post/actions/PostActions.svelte +++ b/src/lib/feature/post/actions/PostActions.svelte @@ -4,7 +4,6 @@ import { t } from '$lib/app/i18n' import { settings, type View } from '$lib/app/settings.svelte' import { save } from '$lib/feature/legacy/contentview' - import { amMod, isAdmin } from '$lib/feature/moderation/moderation' import { publishedToDate } from '$lib/ui/util/date' import FormattedNumber from '$lib/ui/util/FormattedNumber.svelte' import { Button, Menu, Modal, Spinner } from 'mono-svelte' @@ -133,7 +132,7 @@ icon={BugAnt} > {/if} - {#if profile.current?.user && (amMod(profile.current.user, post.community) || isAdmin(profile.current.user))} + {#if profile.isMod(post.community) || profile.isAdmin} {#await import('$lib/feature/moderation/ModerationMenu.svelte') then { default: ModerationMenu }} {#snippet target(attachment, acting)} diff --git a/src/lib/ui/navbar/Navbar.svelte b/src/lib/ui/navbar/Navbar.svelte index 3a7c1521..1bcd22c3 100644 --- a/src/lib/ui/navbar/Navbar.svelte +++ b/src/lib/ui/navbar/Navbar.svelte @@ -3,7 +3,6 @@ import { notifications, profile } from '$lib/app/auth.svelte' import { t } from '$lib/app/i18n' import { LINKED_INSTANCE_URL } from '$lib/app/instance.svelte' - import { amModOfAny, isAdmin } from '$lib/feature/moderation/moderation' import { Menu, Spinner } from 'mono-svelte' import { Bars3, @@ -71,7 +70,7 @@
- {#if profile.current?.user && isAdmin(profile.current.user)} + {#if profile.isAdmin} path.startsWith('/admin')} /> {/if} - {#if amModOfAny(profile.current?.user)} + {#if profile.isMod()} {/if} - {#if amModOfAny(profile.current.user)} + {#if profile.isMod()} {$t('routes.moderation.feed')} {#snippet suffix()} @@ -78,7 +77,7 @@ {/snippet} {/if} - {#if profile.current.user && isAdmin(profile.current.user)} + {#if profile.isAdmin} {$t('routes.admin.applications.title')} {#snippet suffix()} diff --git a/src/lib/ui/navbar/commands/actions.svelte.ts b/src/lib/ui/navbar/commands/actions.svelte.ts index aa8dbc3a..bd321a21 100644 --- a/src/lib/ui/navbar/commands/actions.svelte.ts +++ b/src/lib/ui/navbar/commands/actions.svelte.ts @@ -9,7 +9,6 @@ import { settings } from '$lib/app/settings.svelte' import { theme, type ThemeData } from '$lib/app/theme/theme.svelte' import { fullCommunityName } from '$lib/app/util.svelte' import type { ResumableItem } from '$lib/feature/legacy/item' -import { amModOfAny, isAdmin } from '$lib/feature/moderation/moderation' import { ArrowRightOnRectangle, ArrowTrendingDown, @@ -92,7 +91,7 @@ export function getGroups( name: t.get('nav.communities'), icon: GlobeAlt, }, - ...(amModOfAny(profile.user) + ...(currentProfile.isMod() ? [ { href: '/moderation', @@ -101,7 +100,7 @@ export function getGroups( }, ] : []), - ...(profile.user && isAdmin(profile.user) + ...(currentProfile.isAdmin ? [ { href: '/admin', diff --git a/src/lib/ui/shared/popover/MenuDivider.svelte b/src/lib/ui/shared/popover/MenuDivider.svelte index 157505f2..e7b19c94 100644 --- a/src/lib/ui/shared/popover/MenuDivider.svelte +++ b/src/lib/ui/shared/popover/MenuDivider.svelte @@ -3,12 +3,16 @@ let { showLabel = false, + hidden = false, children, - }: { showLabel?: boolean; children: Snippet } = $props() + }: { showLabel?: boolean; hidden?: boolean; children: Snippet } = $props()