From 818aea48878095ba1e760bf37df2f3941e7af458 Mon Sep 17 00:00:00 2001 From: Xylight Date: Thu, 25 Sep 2025 21:05:04 -0700 Subject: [PATCH] impr: deletion dialog & fix pageination for media listings --- src/lib/api/base.ts | 5 ++-- src/lib/api/lemmy/adapter.ts | 5 ++++ src/lib/api/piefed/adapter.ts | 4 +++ src/lib/feature/user/PictrsImage.svelte | 36 +++++++++++++++++-------- src/routes/admin/media/+page.svelte | 8 +++--- src/routes/profile/media/+page.svelte | 8 +++--- 6 files changed, 47 insertions(+), 19 deletions(-) diff --git a/src/lib/api/base.ts b/src/lib/api/base.ts index c331e5b5..fe47aa0f 100644 --- a/src/lib/api/base.ts +++ b/src/lib/api/base.ts @@ -1,5 +1,5 @@ -import { env } from '$env/dynamic/public' -import * as types from './types' +import { env } from '$env/dynamic/public'; +import * as types from './types'; export type ClientType = | { name: 'lemmy'; baseUrl: '/api/v3' } @@ -227,6 +227,7 @@ export abstract class BaseClient { abstract getFeeds?(form: types.GetFeeds): Promise abstract getTopics?(form: types.GetTopics): Promise abstract assignFlair?(form: types.AssignFlair): Promise + abstract listMedia(form: types.ListMedia): Promise } export type NullableFnArg = T extends ( diff --git a/src/lib/api/lemmy/adapter.ts b/src/lib/api/lemmy/adapter.ts index b6d0534e..c3a25c55 100644 --- a/src/lib/api/lemmy/adapter.ts +++ b/src/lib/api/lemmy/adapter.ts @@ -486,4 +486,9 @@ export class LemmyClient implements BaseClient { ): ReturnType { return await this.#client.deleteImage(...params) } + async listMedia( + ...params: Parameters + ): ReturnType { + return await this.#client.listMedia(...params) + } } diff --git a/src/lib/api/piefed/adapter.ts b/src/lib/api/piefed/adapter.ts index ed793c0a..4bf9b4f9 100644 --- a/src/lib/api/piefed/adapter.ts +++ b/src/lib/api/piefed/adapter.ts @@ -1014,4 +1014,8 @@ export class PiefedClient implements BaseClient { return toPostView(response) } + + async listMedia(): ReturnType { + throw new Error('unsupported') + } } diff --git a/src/lib/feature/user/PictrsImage.svelte b/src/lib/feature/user/PictrsImage.svelte index ed4ef63e..582d9d3e 100644 --- a/src/lib/feature/user/PictrsImage.svelte +++ b/src/lib/feature/user/PictrsImage.svelte @@ -3,8 +3,8 @@ import type { LocalImage, Person } from '$lib/api/types' import { profile } from '$lib/app/auth.svelte' import { t } from '$lib/app/i18n' - import { instance } from '$lib/app/instance.svelte' import { instanceToURL } from '$lib/app/util.svelte' + import { showImage } from '$lib/ui/generic/ExpandableImage.svelte' import { publishedToDate } from '$lib/ui/util/date' import { action, Button, modal, toast } from 'mono-svelte' import RelativeDate from 'mono-svelte/util/RelativeDate.svelte' @@ -40,13 +40,26 @@
- pictrs + {#snippet img()} + + {/snippet} + + {@render img()} + {#if user} {/if} @@ -57,17 +70,18 @@ /> + /> + />
diff --git a/src/routes/admin/media/+page.svelte b/src/routes/admin/media/+page.svelte index c86e49f4..239092d6 100644 --- a/src/routes/admin/media/+page.svelte +++ b/src/routes/admin/media/+page.svelte @@ -2,6 +2,7 @@ import { page } from '$app/state' import { t } from '$lib/app/i18n' import PictrsImage from '$lib/feature/user/PictrsImage.svelte' + import Fixate from '$lib/ui/generic/Fixate.svelte' import { Header, Pageination } from '$lib/ui/layout' import { flip } from 'svelte/animate' import { expoInOut } from 'svelte/easing' @@ -10,7 +11,7 @@
{$t('routes.profile.media.title')}
-
+
{#each data.images.value as image (image.local_image.pictrs_delete_token)}
{/each}
-{#if data.images.value.length == 20} + `?page=${page}`} + hasMore={data.images.value.length == 20} /> -{/if} + \ No newline at end of file diff --git a/src/routes/profile/media/+page.svelte b/src/routes/profile/media/+page.svelte index ba679d4e..53591155 100644 --- a/src/routes/profile/media/+page.svelte +++ b/src/routes/profile/media/+page.svelte @@ -2,6 +2,7 @@ import { page } from '$app/state' import { t } from '$lib/app/i18n' import PictrsImage from '$lib/feature/user/PictrsImage.svelte' + import Fixate from '$lib/ui/generic/Fixate.svelte' import { Header, Pageination } from '$lib/ui/layout' import { flip } from 'svelte/animate' import { expoInOut } from 'svelte/easing' @@ -10,7 +11,7 @@
{$t('routes.admin.media.title')}
-
+
{#each data.images.value as image (image.local_image.pictrs_delete_token)}
{/each}
-{#if data.images.value.length == 20} + `?page=${page}`} + hasMore={data.images.value.length == 20} /> -{/if} +