impr: deletion dialog & fix pageination for media listings

This commit is contained in:
Xylight committed 2025-09-25 21:05:04 -07:00
1 parent 672e6fa388
commit 818aea4887
6 files changed
+41 -13

No files matched your search

+3 -2
View File
@@ -1,5 +1,5 @@
import { env } from '$env/dynamic/public' import { env } from '$env/dynamic/public';
import * as types from './types' import * as types from './types';
export type ClientType = export type ClientType =
| { name: 'lemmy'; baseUrl: '/api/v3' } | { name: 'lemmy'; baseUrl: '/api/v3' }
@@ -227,6 +227,7 @@ export abstract class BaseClient {
abstract getFeeds?(form: types.GetFeeds): Promise<types.GetFeedsResponse> abstract getFeeds?(form: types.GetFeeds): Promise<types.GetFeedsResponse>
abstract getTopics?(form: types.GetTopics): Promise<types.GetTopicsResponse> abstract getTopics?(form: types.GetTopics): Promise<types.GetTopicsResponse>
abstract assignFlair?(form: types.AssignFlair): Promise<types.PostView> abstract assignFlair?(form: types.AssignFlair): Promise<types.PostView>
abstract listMedia(form: types.ListMedia): Promise<types.ListMediaResponse>
} }
export type NullableFnArg<T, Fallback = never> = T extends ( export type NullableFnArg<T, Fallback = never> = T extends (
+5
View File
@@ -486,4 +486,9 @@ export class LemmyClient implements BaseClient {
): ReturnType<BaseClient['deleteImage']> { ): ReturnType<BaseClient['deleteImage']> {
return await this.#client.deleteImage(...params) return await this.#client.deleteImage(...params)
} }
async listMedia(
...params: Parameters<BaseClient['listMedia']>
): ReturnType<BaseClient['listMedia']> {
return await this.#client.listMedia(...params)
}
} }
+4
View File
@@ -1014,4 +1014,8 @@ export class PiefedClient implements BaseClient {
return toPostView(response) return toPostView(response)
} }
async listMedia(): ReturnType<BaseClient['listMedia']> {
throw new Error('unsupported')
}
} }
+19 -5
View File
@@ -3,8 +3,8 @@
import type { LocalImage, Person } from '$lib/api/types' import type { LocalImage, Person } from '$lib/api/types'
import { profile } from '$lib/app/auth.svelte' import { profile } from '$lib/app/auth.svelte'
import { t } from '$lib/app/i18n' import { t } from '$lib/app/i18n'
import { instance } from '$lib/app/instance.svelte'
import { instanceToURL } from '$lib/app/util.svelte' import { instanceToURL } from '$lib/app/util.svelte'
import { showImage } from '$lib/ui/generic/ExpandableImage.svelte'
import { publishedToDate } from '$lib/ui/util/date' import { publishedToDate } from '$lib/ui/util/date'
import { action, Button, modal, toast } from 'mono-svelte' import { action, Button, modal, toast } from 'mono-svelte'
import RelativeDate from 'mono-svelte/util/RelativeDate.svelte' import RelativeDate from 'mono-svelte/util/RelativeDate.svelte'
@@ -40,13 +40,26 @@
</script> </script>
<div class="flex flex-col gap-1"> <div class="flex flex-col gap-1">
{#snippet img()}
<button
onclick={
() =>
showImage(`${instanceToURL(profile.current.instance)}/pictrs/image/${image.pictrs_alias}`)
}
class="cursor-pointer"
>
<img <img
src="{instanceToURL(instance.data)}/pictrs/image/{image.pictrs_alias}" src="{instanceToURL(profile.current.instance)}/pictrs/image/{image.pictrs_alias}"
width="500" width="500"
height="500" height="500"
class="aspect-square w-full h-full object-cover rounded-xl" class="aspect-square w-full h-full object-cover rounded-xl"
alt="pictrs" alt="pictrs"
/> />
</button>
{/snippet}
{@render img()}
{#if user} {#if user}
<UserLink {user} /> <UserLink {user} />
{/if} {/if}
@@ -57,17 +70,18 @@
/> />
<Button <Button
title={$t('routes.profile.media.download')} title={$t('routes.profile.media.download')}
href="{instanceToURL(instance.data)}/pictrs/image/{image.pictrs_alias}" href="{instanceToURL(profile.current.instance)}/pictrs/image/{image.pictrs_alias}"
size="square-md" size="square-md"
class="ml-auto" class="ml-auto"
icon={ArrowDownTray} icon={ArrowDownTray}
></Button> />
<Button <Button
title={$t('post.actions.more.delete')} title={$t('post.actions.more.delete')}
onclick={() => { onclick={() => {
modal({ modal({
title: $t('routes.theme.preset.delete.confirm'), title: $t('routes.theme.preset.delete.confirm'),
body: '', body: '',
snippet: img,
actions: [ actions: [
action({ action({
close: true, close: true,
@@ -86,6 +100,6 @@
{loading} {loading}
disabled={loading} disabled={loading}
icon={Trash} icon={Trash}
></Button> />
</div> </div>
</div> </div>
+5 -3
View File
@@ -2,6 +2,7 @@
import { page } from '$app/state' import { page } from '$app/state'
import { t } from '$lib/app/i18n' import { t } from '$lib/app/i18n'
import PictrsImage from '$lib/feature/user/PictrsImage.svelte' import PictrsImage from '$lib/feature/user/PictrsImage.svelte'
import Fixate from '$lib/ui/generic/Fixate.svelte'
import { Header, Pageination } from '$lib/ui/layout' import { Header, Pageination } from '$lib/ui/layout'
import { flip } from 'svelte/animate' import { flip } from 'svelte/animate'
import { expoInOut } from 'svelte/easing' import { expoInOut } from 'svelte/easing'
@@ -10,7 +11,7 @@
</script> </script>
<Header pageHeader>{$t('routes.profile.media.title')}</Header> <Header pageHeader>{$t('routes.profile.media.title')}</Header>
<div class="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3"> <div class="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-4">
{#each data.images.value as image (image.local_image.pictrs_delete_token)} {#each data.images.value as image (image.local_image.pictrs_delete_token)}
<div animate:flip={{ duration: 500, easing: expoInOut }}> <div animate:flip={{ duration: 500, easing: expoInOut }}>
<PictrsImage <PictrsImage
@@ -30,9 +31,10 @@
</div> </div>
{/each} {/each}
</div> </div>
{#if data.images.value.length == 20} <Fixate placement="bottom">
<Pageination <Pageination
page={Number(page.url.searchParams.get('page')) || 1} page={Number(page.url.searchParams.get('page')) || 1}
href={(page) => `?page=${page}`} href={(page) => `?page=${page}`}
hasMore={data.images.value.length == 20}
/> />
{/if} </Fixate>
+5 -3
View File
@@ -2,6 +2,7 @@
import { page } from '$app/state' import { page } from '$app/state'
import { t } from '$lib/app/i18n' import { t } from '$lib/app/i18n'
import PictrsImage from '$lib/feature/user/PictrsImage.svelte' import PictrsImage from '$lib/feature/user/PictrsImage.svelte'
import Fixate from '$lib/ui/generic/Fixate.svelte'
import { Header, Pageination } from '$lib/ui/layout' import { Header, Pageination } from '$lib/ui/layout'
import { flip } from 'svelte/animate' import { flip } from 'svelte/animate'
import { expoInOut } from 'svelte/easing' import { expoInOut } from 'svelte/easing'
@@ -10,7 +11,7 @@
</script> </script>
<Header pageHeader>{$t('routes.admin.media.title')}</Header> <Header pageHeader>{$t('routes.admin.media.title')}</Header>
<div class="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3"> <div class="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-4">
{#each data.images.value as image (image.local_image.pictrs_delete_token)} {#each data.images.value as image (image.local_image.pictrs_delete_token)}
<div animate:flip={{ duration: 500, easing: expoInOut }}> <div animate:flip={{ duration: 500, easing: expoInOut }}>
<PictrsImage <PictrsImage
@@ -29,9 +30,10 @@
</div> </div>
{/each} {/each}
</div> </div>
{#if data.images.value.length == 20} <Fixate placement="bottom">
<Pageination <Pageination
page={Number(page.url.searchParams.get('page')) || 1} page={Number(page.url.searchParams.get('page')) || 1}
href={(page) => `?page=${page}`} href={(page) => `?page=${page}`}
hasMore={data.images.value.length == 20}
/> />
{/if} </Fixate>