diff --git a/src/lib/components/lemmy/ObjectAutocomplete.svelte b/src/lib/components/lemmy/ObjectAutocomplete.svelte index 547af2b8..6da25af2 100644 --- a/src/lib/components/lemmy/ObjectAutocomplete.svelte +++ b/src/lib/components/lemmy/ObjectAutocomplete.svelte @@ -4,23 +4,25 @@ import type { Community, ListingType } from 'lemmy-js-client' import { MenuButton, Search } from 'mono-svelte' import { createEventDispatcher } from 'svelte' - import { Icon, XCircle } from 'svelte-hero-icons' + import { Icon, XCircle, ServerStack } from 'svelte-hero-icons' import { fly } from 'svelte/transition' - let type: 'community' | 'instance' = 'community' + export let type: 'community' | 'instance' = 'community' export let q: string = '' + export let instance: string | undefined = undefined export let jwt: string | undefined = undefined export let listing_type: ListingType = 'Subscribed' export let showWhenEmpty: boolean = false const dispatcher = createEventDispatcher<{ select: Community | undefined }>() + $: instances = type == 'instance' && getClient().getFederatedInstances() {#if type == 'community'} { - const results = await getClient().search({ + const results = await getClient(instance).search({ q: q || ' ', type_: 'Communities', limit: 20, @@ -62,4 +64,41 @@ +{:else if type == 'instance'} + { + const results = await instances || {} + + return q ? (results.federated_instances?.linked || []).filter( + (i) => i.domain.includes(q) + ) : [] + }} + extractName={(i) => `${i.domain}`} + on:select + bind:query={q} + {showWhenEmpty} + {...$$restProps} + let:item + let:select + > +
+ {#if q == '' && showWhenEmpty} + dispatcher('select', undefined)}> +
+ None (Start typing to search) +
+
+ {:else} + No results. + {/if} +
+
+ select(item)}> + +
+ {item.domain} +
+
+
+
{/if} diff --git a/src/lib/components/lemmy/user/UserAutocomplete.svelte b/src/lib/components/lemmy/user/UserAutocomplete.svelte index 6eb49354..62a60e00 100644 --- a/src/lib/components/lemmy/user/UserAutocomplete.svelte +++ b/src/lib/components/lemmy/user/UserAutocomplete.svelte @@ -9,6 +9,7 @@ export let q: string = '' + export let instance: string | undefined = undefined export let listing_type: ListingType = 'Subscribed' export let showWhenEmpty: boolean = false @@ -17,7 +18,7 @@ { - const results = await getClient().search({ + const results = await getClient(instance).search({ q: q || ' ', type_: 'Users', limit: 20, diff --git a/src/routes/modlog/+page.svelte b/src/routes/modlog/+page.svelte index 26836596..8cac1212 100644 --- a/src/routes/modlog/+page.svelte +++ b/src/routes/modlog/+page.svelte @@ -74,6 +74,22 @@
+ + searchParam( + $page.url, + 'instance', + e.detail?.domain.toString() ?? '', + 'page', 'community', 'user', 'mod_id' + )} + /> { } export async function load({ url }) { + let instance = url.searchParams.get('instance') || undefined let community = Number(url.searchParams.get('community')) || undefined let user = Number(url.searchParams.get('user')) || undefined let modId = Number(url.searchParams.get('mod_id')) || undefined @@ -210,7 +211,7 @@ export async function load({ url }) { let type: ModlogActionType = (url.searchParams.get('type') as ModlogActionType) || 'All' - const results = await getClient().getModlog({ + const results = await getClient(instance).getModlog({ community_id: community, limit: 40, type_: type,