fix: instance blocking page fails to render

This commit is contained in:
James Xylight committed 2025-07-26 17:54:10 -07:00
1 parent fb24c1ca35
commit 9da648c90a
3 files changed
+30 -41

No files matched your search

+1 -1
View File
@@ -19,7 +19,7 @@
let { let {
accept = '*', accept = '*',
id = generateID(), id = generateID(),
files = $bindable(null), files = $bindable(),
multiple = false, multiple = false,
preview = true, preview = true,
label = undefined, label = undefined,
+27 -37
View File
@@ -1,5 +1,5 @@
<script lang="ts"> <script lang="ts">
import { preventDefault, run } from 'svelte/legacy' import { preventDefault } from 'svelte/legacy'
import { profile } from '$lib/auth.svelte.js' import { profile } from '$lib/auth.svelte.js'
import Placeholder from '$lib/components/ui/Placeholder.svelte' import Placeholder from '$lib/components/ui/Placeholder.svelte'
@@ -45,19 +45,17 @@
await trycatch(async () => { await trycatch(async () => {
if ( if (
!profile.current?.jwt || !profile.current?.jwt ||
!data.federated_instances?.federated_instances?.blocked || !data.instances.value?.blocked ||
!data.federated_instances?.federated_instances?.allowed !data.instances.value?.allowed
) )
return return
if (blocked) blockInstance.loading = true if (blocked) blockInstance.loading = true
else allowInstance.loading = true else allowInstance.loading = true
const blockedInstances = const blockedInstances = data.instances.value.blocked.map(i => i.domain)
data.federated_instances.federated_instances.blocked.map(i => i.domain)
const allowedInstances = const allowedInstances = data.instances.value.allowed.map(i => i.domain)
data.federated_instances.federated_instances.allowed.map(i => i.domain)
if (blocked) blockedInstances.push(instance) if (blocked) blockedInstances.push(instance)
if (!blocked) allowedInstances.push(instance) if (!blocked) allowedInstances.push(instance)
@@ -69,7 +67,8 @@
const instances = await getClient().getFederatedInstances() const instances = await getClient().getFederatedInstances()
data.federated_instances = instances // @ts-expect-error stupid typing thing that i shouldnt have done
data.instances.value = instances.federated_instances
blockInstance.instance = '' blockInstance.instance = ''
}) })
@@ -80,18 +79,12 @@
const save = async () => { const save = async () => {
const res = await trycatch(async () => { const res = await trycatch(async () => {
if ( if (!profile.current?.jwt || !data.instances.value?.blocked) return
!profile.current?.jwt ||
!data.federated_instances?.federated_instances?.blocked
)
return
saving = true saving = true
const blockedInstances = const blockedInstances = data.instances.value.blocked.map(i => i.domain)
data.federated_instances.federated_instances.blocked.map(i => i.domain) const allowedInstances = data.instances.value.allowed?.map(i => i.domain)
const allowedInstances =
data.federated_instances.federated_instances.allowed.map(i => i.domain)
return await getClient().editSite({ return await getClient().editSite({
allowed_instances: allowedInstances, allowed_instances: allowedInstances,
@@ -116,8 +109,7 @@
const reader = new FileReader() const reader = new FileReader()
reader.onload = e => { reader.onload = e => {
if (!data.federated_instances?.federated_instances?.blocked) if (!data.instances.value?.blocked) throw new Error('Missing instance')
throw new Error('Missing instance')
const content = e.target?.result const content = e.target?.result
if (!content) toast({ content: $t('toast.failCSV'), type: 'warning' }) if (!content) toast({ content: $t('toast.failCSV'), type: 'warning' })
@@ -141,7 +133,7 @@
instances.push(item) instances.push(item)
} }
data.federated_instances.federated_instances.blocked = instances data.instances.value.blocked = instances
} catch { } catch {
toast({ content: $t('toast.failCSV'), type: 'error' }) toast({ content: $t('toast.failCSV'), type: 'error' })
} }
@@ -153,7 +145,7 @@
reader.readAsText(files[0]) reader.readAsText(files[0])
} }
run(() => { $effect(() => {
if (csv) parseCsv(csv) if (csv) parseCsv(csv)
}) })
</script> </script>
@@ -168,7 +160,7 @@
{$t('common.save')} {$t('common.save')}
</Button> </Button>
</Header> </Header>
{#if data.site && data.federated_instances?.federated_instances?.blocked} {#if data.site && data.instances.value?.blocked}
<FileInput preview={false} bind:files={csv}> <FileInput preview={false} bind:files={csv}>
{#snippet button()} {#snippet button()}
<Button class="w-max"> <Button class="w-max">
@@ -202,14 +194,14 @@
{$t('routes.admin.federation.block')} {$t('routes.admin.federation.block')}
</Button> </Button>
</form> </form>
<Material class="h-full overflow-auto" color="distinct"> <Material class="h-full overflow-auto" color="uniform" rounding="2xl">
<ul <ul
class="*:py-3 dark:divide-zinc-800! {allowInstance.instance != '' class="*:py-3 dark:divide-zinc-800! {allowInstance.instance != ''
? 'opacity-50' ? 'opacity-50'
: ''}" : ''}"
> >
{#if data.federated_instances.federated_instances.blocked.length > 0} {#if data.instances.value.blocked.length > 0}
{#each data.federated_instances.federated_instances.blocked.sort( (b, a) => b.domain.localeCompare(a.domain), ) as instance (instance.id)} {#each data.instances.value.blocked.toSorted( (b, a) => b.domain.localeCompare(a.domain), ) as instance (instance.id)}
<div <div
animate:flip={{ duration: 300, easing: expoOut }} animate:flip={{ duration: 300, easing: expoOut }}
class="flex justify-between items-center first:pt-0 last:pb-0" class="flex justify-between items-center first:pt-0 last:pb-0"
@@ -227,11 +219,10 @@
<Button <Button
size="square-md" size="square-md"
onclick={() => { onclick={() => {
if (!data.federated_instances?.federated_instances?.blocked) if (!data.instances.value?.blocked) return
return
data.federated_instances.federated_instances.blocked = data.instances.value.blocked =
data.federated_instances?.federated_instances?.blocked.filter( data.instances.value?.blocked.filter(
i => i.id != instance.id, i => i.id != instance.id,
) )
}} }}
@@ -255,7 +246,7 @@
<div class="md:flex-1 w-full max-h-168 flex flex-col gap-2"> <div class="md:flex-1 w-full max-h-168 flex flex-col gap-2">
<h2 class="font-bold text-lg flex items-center space-x-1"> <h2 class="font-bold text-lg flex items-center space-x-1">
<span>{$t('routes.admin.federation.allowed')}</span> <span>{$t('routes.admin.federation.allowed')}</span>
{#if allowInstance.instance || !(data.federated_instances.federated_instances.allowed?.length == 0)} {#if allowInstance.instance || !(data.instances.value.allowed?.length == 0)}
<Popover openOnHover placement="bottom-end"> <Popover openOnHover placement="bottom-end">
{#snippet target()} {#snippet target()}
<Icon <Icon
@@ -290,10 +281,10 @@
{$t('routes.admin.federation.allow')} {$t('routes.admin.federation.allow')}
</Button> </Button>
</form> </form>
<Material class="h-full overflow-auto" color="distinct"> <Material class="h-full overflow-auto" color="uniform" rounding="2xl">
<ul class="*:py-3 dark:divide-zinc-800!"> <ul class="*:py-3 dark:divide-zinc-800!">
{#if data.federated_instances.federated_instances.allowed.length > 0} {#if data.instances.value.allowed && (data?.instances?.value?.allowed?.length ?? 0) > 0}
{#each data.federated_instances.federated_instances.allowed.sort( (b, a) => b.domain.localeCompare(a.domain), ) as instance (instance.id)} {#each data.instances.value.allowed.toSorted( (b, a) => b.domain.localeCompare(a.domain), ) as instance (instance.id)}
<div <div
animate:flip={{ duration: 300, easing: expoOut }} animate:flip={{ duration: 300, easing: expoOut }}
class="flex justify-between items-center first:pt-0 last:pb-0" class="flex justify-between items-center first:pt-0 last:pb-0"
@@ -311,11 +302,10 @@
<Button <Button
size="square-md" size="square-md"
onclick={() => { onclick={() => {
if (!data.federated_instances?.federated_instances?.allowed) if (!data.instances.value?.allowed) return
return
data.federated_instances.federated_instances.allowed = data.instances.value.allowed =
data.federated_instances?.federated_instances?.allowed.filter( data.instances.value?.allowed.filter(
i => i.id != instance.id, i => i.id != instance.id,
) )
}} }}
+2 -3
View File
@@ -1,9 +1,8 @@
import { getClient } from '$lib/lemmy.svelte.js' import { getClient } from '$lib/lemmy.svelte.js'
import { ReactiveState } from '$lib/promise.svelte.js'
export async function load({ fetch }) { export async function load({ fetch }) {
const instances = await getClient(undefined, fetch).getFederatedInstances() const instances = await getClient(undefined, fetch).getFederatedInstances()
return { return { instances: new ReactiveState({ ...instances.federated_instances }) }
federated_instances: instances,
}
} }