From 9da648c90a0d32a2284f90cc65c2709932ef4ff7 Mon Sep 17 00:00:00 2001 From: James Xylight Date: Sat, 26 Jul 2025 17:54:10 -0700 Subject: [PATCH] fix: instance blocking page fails to render --- src/lib/mono/forms/FileInput.svelte | 2 +- src/routes/admin/federation/+page.svelte | 64 ++++++++++-------------- src/routes/admin/federation/+page.ts | 5 +- 3 files changed, 30 insertions(+), 41 deletions(-) diff --git a/src/lib/mono/forms/FileInput.svelte b/src/lib/mono/forms/FileInput.svelte index dc76b4dc..d216b7f1 100644 --- a/src/lib/mono/forms/FileInput.svelte +++ b/src/lib/mono/forms/FileInput.svelte @@ -19,7 +19,7 @@ let { accept = '*', id = generateID(), - files = $bindable(null), + files = $bindable(), multiple = false, preview = true, label = undefined, diff --git a/src/routes/admin/federation/+page.svelte b/src/routes/admin/federation/+page.svelte index 639bd573..eab7ff78 100644 --- a/src/routes/admin/federation/+page.svelte +++ b/src/routes/admin/federation/+page.svelte @@ -1,5 +1,5 @@ @@ -168,7 +160,7 @@ {$t('common.save')} -{#if data.site && data.federated_instances?.federated_instances?.blocked} +{#if data.site && data.instances.value?.blocked} {#snippet button()} - +
    - {#if data.federated_instances.federated_instances.blocked.length > 0} - {#each data.federated_instances.federated_instances.blocked.sort( (b, a) => b.domain.localeCompare(a.domain), ) as instance (instance.id)} + {#if data.instances.value.blocked.length > 0} + {#each data.instances.value.blocked.toSorted( (b, a) => b.domain.localeCompare(a.domain), ) as instance (instance.id)}
    { - if (!data.federated_instances?.federated_instances?.blocked) - return + if (!data.instances.value?.blocked) return - data.federated_instances.federated_instances.blocked = - data.federated_instances?.federated_instances?.blocked.filter( + data.instances.value.blocked = + data.instances.value?.blocked.filter( i => i.id != instance.id, ) }} @@ -255,7 +246,7 @@

    {$t('routes.admin.federation.allowed')} - {#if allowInstance.instance || !(data.federated_instances.federated_instances.allowed?.length == 0)} + {#if allowInstance.instance || !(data.instances.value.allowed?.length == 0)} {#snippet target()} - +
      - {#if data.federated_instances.federated_instances.allowed.length > 0} - {#each data.federated_instances.federated_instances.allowed.sort( (b, a) => b.domain.localeCompare(a.domain), ) as instance (instance.id)} + {#if data.instances.value.allowed && (data?.instances?.value?.allowed?.length ?? 0) > 0} + {#each data.instances.value.allowed.toSorted( (b, a) => b.domain.localeCompare(a.domain), ) as instance (instance.id)}
      { - if (!data.federated_instances?.federated_instances?.allowed) - return + if (!data.instances.value?.allowed) return - data.federated_instances.federated_instances.allowed = - data.federated_instances?.federated_instances?.allowed.filter( + data.instances.value.allowed = + data.instances.value?.allowed.filter( i => i.id != instance.id, ) }} diff --git a/src/routes/admin/federation/+page.ts b/src/routes/admin/federation/+page.ts index 429a33d5..643757ba 100644 --- a/src/routes/admin/federation/+page.ts +++ b/src/routes/admin/federation/+page.ts @@ -1,9 +1,8 @@ import { getClient } from '$lib/lemmy.svelte.js' +import { ReactiveState } from '$lib/promise.svelte.js' export async function load({ fetch }) { const instances = await getClient(undefined, fetch).getFederatedInstances() - return { - federated_instances: instances, - } + return { instances: new ReactiveState({ ...instances.federated_instances }) } }