@@ -12,8 +12,15 @@
'/admin/applications',
'/admin/taglines',
'/admin/team',
+ '/admin/federation',
+ ]}
+ optionNames={[
+ 'Configuration',
+ 'Applications',
+ 'Taglines',
+ 'Team',
+ 'Federation',
]}
- optionNames={['Configuration', 'Applications', 'Taglines', 'Team']}
selected={$page.url.pathname}
on:select={(e) => {
goto(e.detail)
diff --git a/src/routes/admin/applications/+page.svelte b/src/routes/admin/applications/+page.svelte
index cfd191f6..22bb6387 100644
--- a/src/routes/admin/applications/+page.svelte
+++ b/src/routes/admin/applications/+page.svelte
@@ -5,7 +5,7 @@
import { searchParam } from '$lib/util.js'
import { ClipboardDocumentCheck, Icon } from 'svelte-hero-icons'
import Application from './Application.svelte'
- import MultiSelect from '$lib/components/input/MultiSelect.svelte'
+ import MultiSelect from '$lib/components/input/Switch.svelte'
export let data
diff --git a/src/routes/admin/federation/+page.svelte b/src/routes/admin/federation/+page.svelte
new file mode 100644
index 00000000..084dbea1
--- /dev/null
+++ b/src/routes/admin/federation/+page.svelte
@@ -0,0 +1,349 @@
+
+
+
+ Federation
+
+
+
+ Federation
+
+{#if data.site && data.federated_instances?.federated_instances?.blocked}
+
+
+
+ {''}
+
+
+
+
+
Blocked Instances
+
+
+
+ {#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)}
+
+
+ {instance.domain}
+
+ {instance.software ?? 'Unknown'} •
+
+
+
+
+ {/each}
+ {:else}
+
+ {/if}
+
+
+
+
+
+ Allowed Instances
+ {#if allowInstance.instance || !(data.federated_instances.federated_instances.allowed?.length == 0)}
+
+
+
+ Adding items to "Allowed Instances" will
+ block every other instance.
+
+
+
+ {/if}
+
+
+
+
+ {#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)}
+
+
+ {instance.domain}
+
+ {instance.software ?? 'Unknown'} •
+
+
+
+
+ {/each}
+ {:else}
+
+ {/if}
+
+
+
+
+{/if}
diff --git a/src/routes/admin/federation/+page.ts b/src/routes/admin/federation/+page.ts
new file mode 100644
index 00000000..5b64aeac
--- /dev/null
+++ b/src/routes/admin/federation/+page.ts
@@ -0,0 +1,13 @@
+import { profile } from '$lib/auth.js'
+import { getClient } from '$lib/lemmy.js'
+import { get } from 'svelte/store'
+
+export async function load({ fetch, parent }) {
+ const instances = await getClient(undefined, fetch).getFederatedInstances({
+ auth: get(profile)?.jwt,
+ })
+
+ return {
+ federated_instances: instances,
+ }
+}
diff --git a/src/routes/c/[name]/settings/+layout.svelte b/src/routes/c/[name]/settings/+layout.svelte
index 1686dc7d..c6722de6 100644
--- a/src/routes/c/[name]/settings/+layout.svelte
+++ b/src/routes/c/[name]/settings/+layout.svelte
@@ -1,7 +1,7 @@
diff --git a/src/routes/settings/+page.svelte b/src/routes/settings/+page.svelte
index 3ce11e35..59c8ee77 100644
--- a/src/routes/settings/+page.svelte
+++ b/src/routes/settings/+page.svelte
@@ -1,7 +1,7 @@