diff --git a/package.json b/package.json index 6789d2b2..a720f226 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "photon-lemmy", - "version": "1.23.2", + "version": "1.24.0", "private": true, "scripts": { "dev": "vite dev", diff --git a/src/routes/modlog/+page.svelte b/src/routes/modlog/+page.svelte index 8cac1212..d5b79756 100644 --- a/src/routes/modlog/+page.svelte +++ b/src/routes/modlog/+page.svelte @@ -7,22 +7,25 @@ import { userSettings } from '$lib/settings.js' import ModlogItemCard from './item/ModlogItemCard.svelte' import ModlogItemTable from './item/ModlogItemTable.svelte' - import { Select } from 'mono-svelte' + import { Button, Select } from 'mono-svelte' import { Bars3BottomRight, Icon, MagnifyingGlass, ViewColumns, + XMark, } from 'svelte-hero-icons' import UserAutocomplete from '$lib/components/lemmy/user/UserAutocomplete.svelte' import Placeholder from '$lib/components/ui/Placeholder.svelte' import { isAdmin } from '$lib/components/lemmy/moderation/moderation.js' + import { browser } from '$app/environment' export let data let view = `${ - $userSettings.modlogCardView ?? - !window.matchMedia('(min-width: 1600px)').matches + $userSettings.modlogCardView ?? browser + ? !window.matchMedia('(min-width: 1600px)').matches + : false }` $: $userSettings.modlogCardView = @@ -87,7 +90,10 @@ $page.url, 'instance', e.detail?.domain.toString() ?? '', - 'page', 'community', 'user', 'mod_id' + 'page', + 'community', + 'user', + 'mod_id' )} /> searchParam($page.url, 'user', e.detail?.id.toString() ?? '', 'page')} /> @@ -126,7 +134,9 @@ showWhenEmpty={true} class="flex-1" label="Moderator" - q={$page.url.searchParams.get('mod_id') ? 'Selected' : ''} + q={$page.url.searchParams.get('mod_id') + ? data.filters.moderator ?? 'Selected' + : ''} on:select={(e) => searchParam( $page.url, @@ -136,6 +146,24 @@ )} /> {/if} + {#if data.modlog && data.modlog.length > 0} {#if $userSettings.modlogCardView ?? !window.matchMedia('(min-width: 1600px)').matches} diff --git a/src/routes/modlog/+page.ts b/src/routes/modlog/+page.ts index 7a1c711c..a63eceba 100644 --- a/src/routes/modlog/+page.ts +++ b/src/routes/modlog/+page.ts @@ -249,5 +249,10 @@ export async function load({ url }) { page: page, type: type, modlog: moderationActions, + filters: { + user: user ? moderationActions[0]?.moderatee?.name : undefined, + community: community ? moderationActions[0]?.community?.title : undefined, + moderator: modId ? moderationActions[0]?.moderator?.name : undefined + } } }