feat: add federation management
This commit is contained in:
1 parent
0c6cab22f3
commit
e530dcd05f
17 files changed
+386
-33
No files matched your search
+1
-18
@@ -44,7 +44,7 @@
|
||||
</script>
|
||||
|
||||
<div class={containerClass}>
|
||||
{#each options.slice(0, 4) as option, index}
|
||||
{#each options as option, index}
|
||||
<button
|
||||
class={buttonClass(selected == option)}
|
||||
on:click|preventDefault={() => (selected = option)}
|
||||
@@ -59,22 +59,5 @@
|
||||
{/if}
|
||||
</button>
|
||||
{/each}
|
||||
{#if options.length > 4}
|
||||
<select
|
||||
bind:value={selected}
|
||||
class="bg-inherit text-sm mr-2 p-1.5 rounded-md cursor-pointer {options
|
||||
.slice(4)
|
||||
.includes(selected)
|
||||
? 'bg-slate-900 text-slate-50 dark:bg-zinc-100 dark:text-black w-max'
|
||||
: 'w-4'}"
|
||||
>
|
||||
<Button color="tertiary">
|
||||
<Icon src={ChevronDown} size="16" mini />
|
||||
</Button>
|
||||
{#each options.slice(4) as option, index}
|
||||
<option value={option}>{optionNames[index + 4] || option}</option>
|
||||
{/each}
|
||||
</select>
|
||||
{/if}
|
||||
</div>
|
||||
<slot {selected} />
|
||||
@@ -2,7 +2,6 @@
|
||||
import type { CommentResponse } from 'lemmy-js-client'
|
||||
import { getClient } from '$lib/lemmy.js'
|
||||
import { createEventDispatcher } from 'svelte'
|
||||
import MultiSelect from '$lib/components/input/MultiSelect.svelte'
|
||||
import Markdown from '$lib/components/markdown/Markdown.svelte'
|
||||
import { profile } from '$lib/auth.js'
|
||||
import { toast } from 'mono-svelte'
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
import { profile } from '$lib/auth.js'
|
||||
import MarkdownEditor from '$lib/components/markdown/MarkdownEditor.svelte'
|
||||
import { Fire, Icon, Trash } from 'svelte-hero-icons'
|
||||
import MultiSelect from '$lib/components/input/MultiSelect.svelte'
|
||||
import MultiSelect from '$lib/components/input/Switch.svelte'
|
||||
import { removalTemplate } from '$lib/components/lemmy/moderation/moderation.js'
|
||||
import { userSettings } from '$lib/settings.js'
|
||||
import { fullCommunityName } from '$lib/util.js'
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
<script lang="ts">
|
||||
import { profile } from '$lib/auth.js'
|
||||
import MultiSelect from '$lib/components/input/MultiSelect.svelte'
|
||||
import MultiSelect from '$lib/components/input/Switch.svelte'
|
||||
import Markdown from '$lib/components/markdown/Markdown.svelte'
|
||||
import { ImageInput, toast } from 'mono-svelte'
|
||||
import { uploadImage } from '$lib/lemmy.js'
|
||||
|
||||
@@ -10,6 +10,8 @@
|
||||
}
|
||||
</script>
|
||||
|
||||
<ul class="divide-y divide-slate-200 dark:divide-zinc-900 flex flex-col">
|
||||
<ul
|
||||
class="divide-y divide-slate-200 dark:divide-zinc-900 flex flex-col {$$props.class}"
|
||||
>
|
||||
<slot {action} />
|
||||
</ul>
|
||||
@@ -1,7 +1,7 @@
|
||||
<script>
|
||||
import { goto } from '$app/navigation'
|
||||
import { page } from '$app/stores'
|
||||
import MultiSelect from '$lib/components/input/MultiSelect.svelte'
|
||||
import MultiSelect from '$lib/components/input/Switch.svelte'
|
||||
</script>
|
||||
|
||||
<div class="flex flex-col gap-4 h-full">
|
||||
@@ -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)
|
||||
|
||||
@@ -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
|
||||
</script>
|
||||
|
||||
@@ -0,0 +1,349 @@
|
||||
<script lang="ts">
|
||||
import { profile } from '$lib/auth.js'
|
||||
import Placeholder from '$lib/components/ui/Placeholder.svelte'
|
||||
import EditableList from '$lib/components/ui/list/EditableList.svelte'
|
||||
import RelativeDate from '$lib/components/util/RelativeDate.svelte'
|
||||
import { publishedToDate } from '$lib/components/util/date.js'
|
||||
import { getClient } from '$lib/lemmy.js'
|
||||
import { trycatch } from '$lib/util.js'
|
||||
import type { Instance } from 'lemmy-js-client'
|
||||
import {
|
||||
Button,
|
||||
FileInput,
|
||||
Material,
|
||||
Popover,
|
||||
TextInput,
|
||||
toast,
|
||||
} from 'mono-svelte'
|
||||
import {
|
||||
Check,
|
||||
ExclamationTriangle,
|
||||
Icon,
|
||||
InformationCircle,
|
||||
Plus,
|
||||
XMark,
|
||||
} from 'svelte-hero-icons'
|
||||
import { flip } from 'svelte/animate'
|
||||
import { expoInOut, expoOut } from 'svelte/easing'
|
||||
import { slide } from 'svelte/transition'
|
||||
|
||||
export let data
|
||||
|
||||
let blockInstance = {
|
||||
instance: '',
|
||||
loading: false,
|
||||
},
|
||||
allowInstance = {
|
||||
instance: '',
|
||||
loading: false,
|
||||
},
|
||||
saving = false
|
||||
|
||||
const moderateInstance = async (instance: string, blocked: boolean) => {
|
||||
if (instance == '') return
|
||||
await trycatch(async () => {
|
||||
if (
|
||||
!$profile?.jwt ||
|
||||
!data.federated_instances?.federated_instances?.blocked ||
|
||||
!data.federated_instances?.federated_instances?.allowed
|
||||
)
|
||||
return
|
||||
|
||||
if (blocked) blockInstance.loading = true
|
||||
else allowInstance.loading = true
|
||||
|
||||
const blockedInstances =
|
||||
data.federated_instances.federated_instances.blocked.map(
|
||||
(i) => i.domain
|
||||
)
|
||||
|
||||
const allowedInstances =
|
||||
data.federated_instances.federated_instances.allowed.map(
|
||||
(i) => i.domain
|
||||
)
|
||||
|
||||
if (blocked) blockedInstances.push(instance)
|
||||
if (!blocked) allowedInstances.push(instance)
|
||||
|
||||
await getClient().editSite({
|
||||
auth: $profile.jwt,
|
||||
blocked_instances: blockedInstances,
|
||||
allowed_instances: allowedInstances,
|
||||
})
|
||||
|
||||
const instances = await getClient().getFederatedInstances()
|
||||
|
||||
data.federated_instances = instances
|
||||
|
||||
blockInstance.instance = ''
|
||||
})
|
||||
|
||||
blockInstance.loading = false
|
||||
allowInstance.loading = false
|
||||
}
|
||||
|
||||
const save = async () => {
|
||||
const res = await trycatch(async () => {
|
||||
if (
|
||||
!$profile?.jwt ||
|
||||
!data.federated_instances?.federated_instances?.blocked
|
||||
)
|
||||
return
|
||||
|
||||
saving = true
|
||||
|
||||
const blockedInstances =
|
||||
data.federated_instances.federated_instances.blocked.map(
|
||||
(i) => i.domain
|
||||
)
|
||||
const allowedInstances =
|
||||
data.federated_instances.federated_instances.allowed.map(
|
||||
(i) => i.domain
|
||||
)
|
||||
|
||||
return await getClient().editSite({
|
||||
auth: $profile.jwt,
|
||||
allowed_instances: allowedInstances,
|
||||
blocked_instances: blockedInstances,
|
||||
})
|
||||
})
|
||||
|
||||
if (res) {
|
||||
toast({
|
||||
content: 'Edited your site.',
|
||||
type: 'success',
|
||||
})
|
||||
}
|
||||
saving = false
|
||||
}
|
||||
|
||||
let csv: FileList | null
|
||||
|
||||
async function parseCsv(files: FileList) {
|
||||
if (!(files.length > 0)) return
|
||||
|
||||
const reader = new FileReader()
|
||||
|
||||
reader.onload = (e) => {
|
||||
if (!data.federated_instances?.federated_instances?.blocked)
|
||||
throw new Error('Missing instance')
|
||||
const content = e.target?.result
|
||||
if (!content)
|
||||
toast({ content: 'No content in that file', type: 'warning' })
|
||||
|
||||
try {
|
||||
const instances: Instance[] = []
|
||||
const str = content?.toString()
|
||||
if (!str) throw new Error('No content')
|
||||
|
||||
const lines = str.split(/\r?\n/).slice(1)
|
||||
|
||||
for (const line of lines) {
|
||||
if (line == '') continue
|
||||
const domain = line.split(',')[0]
|
||||
|
||||
const item: Instance = {
|
||||
domain: domain,
|
||||
id: Math.floor(Math.random() * 1000000),
|
||||
published: new Date().toISOString(),
|
||||
}
|
||||
|
||||
instances.push(item)
|
||||
}
|
||||
|
||||
data.federated_instances.federated_instances.blocked = instances
|
||||
} catch (err) {
|
||||
toast({ content: err as 'Failed to parse CSV', type: 'error' })
|
||||
}
|
||||
}
|
||||
|
||||
reader.onerror = (e) =>
|
||||
toast({ content: 'Failed to read file.', type: 'error' })
|
||||
|
||||
reader.readAsText(files[0])
|
||||
}
|
||||
|
||||
$: {
|
||||
if (csv) parseCsv(csv)
|
||||
}
|
||||
</script>
|
||||
|
||||
<svelte:head>
|
||||
<title>Federation</title>
|
||||
</svelte:head>
|
||||
|
||||
<h1 class="font-bold text-2xl flex items-center justify-between">
|
||||
Federation <Button
|
||||
color="primary"
|
||||
on:click={save}
|
||||
loading={saving}
|
||||
disabled={saving}
|
||||
>
|
||||
Save
|
||||
</Button>
|
||||
</h1>
|
||||
{#if data.site && data.federated_instances?.federated_instances?.blocked}
|
||||
<FileInput preview={false} bind:files={csv}>
|
||||
<Button class="w-max" slot="button">
|
||||
<Icon src={Plus} mini size="18" slot="prefix" />
|
||||
Upload a CSV
|
||||
</Button>
|
||||
<svelte:fragment slot="choose">
|
||||
{''}
|
||||
</svelte:fragment>
|
||||
</FileInput>
|
||||
<div class="flex flex-col md:flex-row gap-4">
|
||||
<div class="flex-1 w-full max-h-[42rem] h-full flex flex-col gap-2">
|
||||
<h2 class="font-bold text-lg">Blocked Instances</h2>
|
||||
<form
|
||||
on:submit|preventDefault={() =>
|
||||
moderateInstance(blockInstance.instance, true)}
|
||||
class="flex flex-row gap-2"
|
||||
>
|
||||
<TextInput
|
||||
placeholder="Block an instance..."
|
||||
class="flex-1"
|
||||
bind:value={blockInstance.instance}
|
||||
/>
|
||||
<Button
|
||||
submit
|
||||
loading={blockInstance.loading}
|
||||
disabled={blockInstance.loading}
|
||||
>
|
||||
Block
|
||||
</Button>
|
||||
</form>
|
||||
<Material class="h-full overflow-auto" color="distinct">
|
||||
<EditableList
|
||||
class="[&>*]:py-3 dark:!divide-zinc-800 {allowInstance.instance != ''
|
||||
? 'opacity-50'
|
||||
: ''}"
|
||||
>
|
||||
{#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)}
|
||||
<div
|
||||
animate:flip={{ duration: 300, easing: expoOut }}
|
||||
class="flex justify-between items-center first:pt-0 last:pb-0"
|
||||
>
|
||||
<div class="flex flex-col">
|
||||
<span class="font-medium">{instance.domain}</span>
|
||||
<span
|
||||
class="text-xs text-slate-600 dark:text-zinc-400 capitalize"
|
||||
>
|
||||
{instance.software ?? 'Unknown'} • <RelativeDate
|
||||
date={publishedToDate(instance.published)}
|
||||
/>
|
||||
</span>
|
||||
</div>
|
||||
<Button
|
||||
size="square-md"
|
||||
on:click={() => {
|
||||
if (!data.federated_instances?.federated_instances?.blocked)
|
||||
return
|
||||
|
||||
data.federated_instances.federated_instances.blocked =
|
||||
data.federated_instances?.federated_instances?.blocked.filter(
|
||||
(i) => i.id != instance.id
|
||||
)
|
||||
}}
|
||||
>
|
||||
<Icon src={XMark} size="16" mini slot="prefix" />
|
||||
</Button>
|
||||
</div>
|
||||
{/each}
|
||||
{:else}
|
||||
<Placeholder
|
||||
icon={Check}
|
||||
title="No blocked instances"
|
||||
description="Blocking an instance will hide submissions from that instance."
|
||||
/>
|
||||
{/if}
|
||||
</EditableList>
|
||||
</Material>
|
||||
</div>
|
||||
<div class="md:flex-1 w-full max-h-[42rem] flex flex-col gap-2">
|
||||
<h2 class="font-bold text-lg flex items-center space-x-1">
|
||||
<span>Allowed Instances</span>
|
||||
{#if allowInstance.instance || !(data.federated_instances.federated_instances.allowed?.length == 0)}
|
||||
<Popover openOnHover origin="bottom-right">
|
||||
<Icon
|
||||
src={ExclamationTriangle}
|
||||
solid
|
||||
class="text-yellow-500"
|
||||
slot="target"
|
||||
size="20"
|
||||
/>
|
||||
<p class="font-normal">
|
||||
Adding items to "Allowed Instances" will <strong>
|
||||
block every other instance.
|
||||
</strong>
|
||||
</p>
|
||||
</Popover>
|
||||
{/if}
|
||||
</h2>
|
||||
<form
|
||||
on:submit|preventDefault={() =>
|
||||
moderateInstance(allowInstance.instance, false)}
|
||||
class="flex flex-row gap-2"
|
||||
>
|
||||
<TextInput
|
||||
placeholder="Allow an instance..."
|
||||
class="flex-1"
|
||||
bind:value={allowInstance.instance}
|
||||
/>
|
||||
<Button
|
||||
submit
|
||||
loading={allowInstance.loading}
|
||||
disabled={allowInstance.loading}
|
||||
>
|
||||
Allow
|
||||
</Button>
|
||||
</form>
|
||||
<Material class="h-full overflow-auto" color="distinct">
|
||||
<EditableList class="[&>*]:py-3 dark:!divide-zinc-800 ">
|
||||
{#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)}
|
||||
<div
|
||||
animate:flip={{ duration: 300, easing: expoOut }}
|
||||
class="flex justify-between items-center first:pt-0 last:pb-0"
|
||||
>
|
||||
<div class="flex flex-col">
|
||||
<span class="font-medium">{instance.domain}</span>
|
||||
<span
|
||||
class="text-xs text-slate-600 dark:text-zinc-400 capitalize"
|
||||
>
|
||||
{instance.software ?? 'Unknown'} • <RelativeDate
|
||||
date={publishedToDate(instance.published)}
|
||||
/>
|
||||
</span>
|
||||
</div>
|
||||
<Button
|
||||
size="square-md"
|
||||
on:click={() => {
|
||||
if (!data.federated_instances?.federated_instances?.blocked)
|
||||
return
|
||||
|
||||
data.federated_instances.federated_instances.blocked =
|
||||
data.federated_instances?.federated_instances?.blocked.filter(
|
||||
(i) => i.id != instance.id
|
||||
)
|
||||
}}
|
||||
>
|
||||
<Icon src={XMark} size="16" mini slot="prefix" />
|
||||
</Button>
|
||||
</div>
|
||||
{/each}
|
||||
{:else}
|
||||
<div class="my-auto h-max">
|
||||
<Placeholder
|
||||
icon={Check}
|
||||
title="No allowed instances"
|
||||
description="Adding an item to this will block every other instance."
|
||||
/>
|
||||
</div>
|
||||
{/if}
|
||||
</EditableList>
|
||||
</Material>
|
||||
</div>
|
||||
</div>
|
||||
{/if}
|
||||
@@ -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,
|
||||
}
|
||||
}
|
||||
@@ -1,7 +1,7 @@
|
||||
<script lang="ts">
|
||||
import { goto } from '$app/navigation'
|
||||
import { page } from '$app/stores'
|
||||
import MultiSelect from '$lib/components/input/MultiSelect.svelte'
|
||||
import MultiSelect from '$lib/components/input/Switch.svelte'
|
||||
import { fullCommunityName } from '$lib/util.js'
|
||||
import type { PageData } from './$types.js'
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
<script lang="ts">
|
||||
import { goto } from '$app/navigation'
|
||||
import MultiSelect from '$lib/components/input/MultiSelect.svelte'
|
||||
import MultiSelect from '$lib/components/input/Switch.svelte'
|
||||
import { page } from '$app/stores'
|
||||
import {
|
||||
ChatBubbleOvalLeftEllipsis,
|
||||
|
||||
@@ -13,7 +13,7 @@
|
||||
import { page } from '$app/stores'
|
||||
import { isRead } from '$lib/lemmy/inbox.js'
|
||||
import Pageination from '$lib/components/ui/Pageination.svelte'
|
||||
import MultiSelect from '$lib/components/input/MultiSelect.svelte'
|
||||
import MultiSelect from '$lib/components/input/Switch.svelte'
|
||||
import { profile } from '$lib/auth.js'
|
||||
import Placeholder from '$lib/components/ui/Placeholder.svelte'
|
||||
import { fly } from 'svelte/transition'
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
import UserLink from '$lib/components/lemmy/user/UserLink.svelte'
|
||||
import { fly } from 'svelte/transition'
|
||||
import Report from './Report.svelte'
|
||||
import MultiSelect from '$lib/components/input/MultiSelect.svelte'
|
||||
import MultiSelect from '$lib/components/input/Switch.svelte'
|
||||
import { page } from '$app/stores'
|
||||
import {
|
||||
EnvelopeOpen,
|
||||
|
||||
@@ -18,7 +18,7 @@
|
||||
import PostMeta from '$lib/components/lemmy/post/PostMeta.svelte'
|
||||
import { Badge, Material, Spinner, removeToast, toast } from 'mono-svelte'
|
||||
import type { CommentSortType } from 'lemmy-js-client'
|
||||
import MultiSelect from '$lib/components/input/MultiSelect.svelte'
|
||||
import MultiSelect from '$lib/components/input/Switch.svelte'
|
||||
import { profile } from '$lib/auth.js'
|
||||
import { instance } from '$lib/instance.js'
|
||||
import { afterNavigate, goto } from '$app/navigation'
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
import { goto } from '$app/navigation'
|
||||
import { page } from '$app/stores'
|
||||
|
||||
import MultiSelect from '$lib/components/input/MultiSelect.svelte'
|
||||
import MultiSelect from '$lib/components/input/Switch.svelte'
|
||||
</script>
|
||||
|
||||
<svelte:head>
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
<script lang="ts">
|
||||
import { defaultSettings, userSettings } from '$lib/settings'
|
||||
import Setting from './Setting.svelte'
|
||||
import MultiSelect from '$lib/components/input/MultiSelect.svelte'
|
||||
import MultiSelect from '$lib/components/input/Switch.svelte'
|
||||
import Sort from '$lib/components/lemmy/Sort.svelte'
|
||||
import { toast } from 'mono-svelte'
|
||||
import SectionTitle from '$lib/components/ui/SectionTitle.svelte'
|
||||
|
||||
Reference in new issue
Block a user