diff --git a/src/lib/auth.ts b/src/lib/auth.ts index 3cfd676d..2d501fa1 100644 --- a/src/lib/auth.ts +++ b/src/lib/auth.ts @@ -1,9 +1,15 @@ import { amModOfAny } from '$lib/components/lemmy/moderation/moderation.js' import { toast } from '$lib/components/ui/toasts/toasts.js' -import { DEFAULT_INSTANCE_URL, getClient, instance } from '$lib/lemmy.js' +import { DEFAULT_INSTANCE_URL, instance } from '$lib/instance.js' +import { getClient } from '$lib/lemmy.js' import type { MyUserInfo } from 'lemmy-js-client' import { get, writable } from 'svelte/store' +const getDefaultProfile = () => ({ + id: -1, + instance: get(profileData)?.defaultInstance ?? get(instance), +}) + function getFromStorage(key: string): T | undefined { if (typeof localStorage == 'undefined') return undefined const lc = localStorage.getItem(key) @@ -40,7 +46,7 @@ interface PersonData extends MyUserInfo { reports: number } -export const profileData = writable( +export let profileData = writable( getFromStorage('profileData') ?? { profiles: [], profile: -1 } ) @@ -58,7 +64,7 @@ profileData.subscribe(async (pd) => { } }) -export const profile = writable(getProfile()) +export let profile = writable(getProfile()) profile.subscribe(async (p) => { if (p?.id == -1) { @@ -149,13 +155,6 @@ function getProfile() { return pd.profiles.find((p) => p.id == id) } -function getDefaultProfile() { - return { - id: -1, - instance: get(profileData)?.defaultInstance ?? get(instance), - } -} - export function resetProfile() { profile.set(getDefaultProfile()) profileData.update((p) => ({ ...p, profile: -1 })) diff --git a/src/lib/components/ui/Navbar.svelte b/src/lib/components/ui/Navbar.svelte index 437fef54..9ddec68d 100644 --- a/src/lib/components/ui/Navbar.svelte +++ b/src/lib/components/ui/Navbar.svelte @@ -9,7 +9,8 @@ import Spinner from '$lib/components/ui/loader/Spinner.svelte' import Menu from '$lib/components/ui/menu/Menu.svelte' import MenuButton from '$lib/components/ui/menu/MenuButton.svelte' - import { LINKED_INSTANCE_URL, instance, site } from '$lib/lemmy.js' + import { LINKED_INSTANCE_URL, instance } from '$lib/instance.js' + import { site } from '$lib/lemmy.js' import { ArrowLeftOnRectangle, ArrowRightOnRectangle, diff --git a/src/lib/instance.ts b/src/lib/instance.ts new file mode 100644 index 00000000..639a3a67 --- /dev/null +++ b/src/lib/instance.ts @@ -0,0 +1,8 @@ +// maybe fix circular dependency, hopefully. + +import { env } from '$env/dynamic/public' +import { writable } from 'svelte/store' + +export const LINKED_INSTANCE_URL = env.PUBLIC_INSTANCE_URL +export const DEFAULT_INSTANCE_URL = env.PUBLIC_INSTANCE_URL || 'lemmy.ml' +export let instance = writable(DEFAULT_INSTANCE_URL) diff --git a/src/lib/lemmy.ts b/src/lib/lemmy.ts index cc2cfbda..b37f06d7 100644 --- a/src/lib/lemmy.ts +++ b/src/lib/lemmy.ts @@ -8,10 +8,7 @@ import { get, writable } from 'svelte/store' import { env } from '$env/dynamic/public' import { profile } from '$lib/auth.js' import { error } from '@sveltejs/kit' - -export const LINKED_INSTANCE_URL = env.PUBLIC_INSTANCE_URL -export const DEFAULT_INSTANCE_URL = env.PUBLIC_INSTANCE_URL || 'lemmy.ml' -export let instance = writable(DEFAULT_INSTANCE_URL) +import { LINKED_INSTANCE_URL, instance } from '$lib/instance.js' async function customFetch( func: ( diff --git a/src/routes/accounts/+page.svelte b/src/routes/accounts/+page.svelte index 40463bb8..21beba0e 100644 --- a/src/routes/accounts/+page.svelte +++ b/src/routes/accounts/+page.svelte @@ -10,9 +10,8 @@ import TextInput from '$lib/components/input/TextInput.svelte' import EditableList from '$lib/components/ui/list/EditableList.svelte' import { toast } from '$lib/components/ui/toasts/toasts.js' + import { LINKED_INSTANCE_URL, instance } from '$lib/instance.js' import { - LINKED_INSTANCE_URL, - instance, validateInstance, } from '$lib/lemmy.js' import { ArrowLeftOnRectangle, Icon, Plus, Trash } from 'svelte-hero-icons' diff --git a/src/routes/login/+page.svelte b/src/routes/login/+page.svelte index 0309a796..d2b3cf78 100644 --- a/src/routes/login/+page.svelte +++ b/src/routes/login/+page.svelte @@ -5,12 +5,8 @@ import TextInput from '$lib/components/input/TextInput.svelte' import Card from '$lib/components/ui/Card.svelte' import { toast } from '$lib/components/ui/toasts/toasts.js' - import { - DEFAULT_INSTANCE_URL, - LINKED_INSTANCE_URL, - getClient, - validateInstance, - } from '$lib/lemmy.js' + import { DEFAULT_INSTANCE_URL, LINKED_INSTANCE_URL } from '$lib/instance.js' + import { getClient, validateInstance } from '$lib/lemmy.js' let data = { instance: DEFAULT_INSTANCE_URL, diff --git a/src/routes/settings/+page.svelte b/src/routes/settings/+page.svelte index e5355a7e..de35215f 100644 --- a/src/routes/settings/+page.svelte +++ b/src/routes/settings/+page.svelte @@ -1,16 +1,6 @@