diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte
index fb036c4c..13f42450 100644
--- a/src/routes/+page.svelte
+++ b/src/routes/+page.svelte
@@ -5,7 +5,7 @@
import ViewSelect from '$lib/components/lemmy/dropdowns/ViewSelect.svelte'
import { searchParam } from '$lib/util.svelte.js'
import { ArrowRight, ChartBar, Icon } from 'svelte-hero-icons'
- import { site } from '$lib/lemmy.js'
+ import { site } from '$lib/lemmy.svelte.js'
import Location from '$lib/components/lemmy/dropdowns/Location.svelte'
import Header from '$lib/components/ui/layout/pages/Header.svelte'
import { t } from '$lib/translations.js'
@@ -77,7 +77,7 @@
{$t('routes.frontpage.footer', {
// @ts-ignore
- users: $site?.site_view?.counts?.users_active_day ?? '??',
+ users: site.data?.site_view?.counts?.users_active_day ?? '??',
})}
diff --git a/src/routes/+page.ts b/src/routes/+page.ts
index 049da94c..de2c2845 100644
--- a/src/routes/+page.ts
+++ b/src/routes/+page.ts
@@ -1,4 +1,4 @@
-import { getClient } from '$lib/lemmy.js'
+import { getClient } from '$lib/lemmy.svelte.js'
import { settings } from '$lib/settings.svelte'
import type { GetPostsResponse, ListingType, SortType } from 'lemmy-js-client'
import { get, writable } from 'svelte/store'
diff --git a/src/routes/activitypub/externalInteraction/+page.ts b/src/routes/activitypub/externalInteraction/+page.ts
index 473920d9..f6e776ce 100644
--- a/src/routes/activitypub/externalInteraction/+page.ts
+++ b/src/routes/activitypub/externalInteraction/+page.ts
@@ -1,5 +1,5 @@
import { profile } from '$lib/auth.svelte.js'
-import { client } from '$lib/lemmy.js'
+import { client } from '$lib/lemmy.svelte.js'
import { error, redirect } from '@sveltejs/kit'
export const ssr = false
diff --git a/src/routes/admin/+layout.ts b/src/routes/admin/+layout.ts
index 8a76c40e..17d35734 100644
--- a/src/routes/admin/+layout.ts
+++ b/src/routes/admin/+layout.ts
@@ -1,18 +1,16 @@
-import { profile } from '$lib/auth.svelte'
-import { get } from 'svelte/store'
-import { getClient } from '$lib/lemmy.js'
-import { site as siteStore } from '$lib/lemmy'
+import { getClient } from '$lib/lemmy.svelte.js'
+import { site as siteStore } from '$lib/lemmy.svelte.js'
export async function load({ fetch }) {
- let site = get(siteStore)
+ let site = siteStore
- if (!site) {
+ if (!site.data) {
const res = await getClient(undefined, fetch).getSite()
- site = res
+ site.data = res
}
return {
- site: site,
+ site: site.data,
}
}
diff --git a/src/routes/admin/applications/+page.ts b/src/routes/admin/applications/+page.ts
index 795d7a9a..6b730aa4 100644
--- a/src/routes/admin/applications/+page.ts
+++ b/src/routes/admin/applications/+page.ts
@@ -1,5 +1,5 @@
import { profile } from '$lib/auth.svelte'
-import { getClient } from '$lib/lemmy.js'
+import { getClient } from '$lib/lemmy.svelte.js'
import { get } from 'svelte/store'
export async function load({ data, fetch, url }) {
diff --git a/src/routes/admin/applications/Application.svelte b/src/routes/admin/applications/Application.svelte
index e35fd4b8..34f63460 100644
--- a/src/routes/admin/applications/Application.svelte
+++ b/src/routes/admin/applications/Application.svelte
@@ -3,7 +3,7 @@
import UserLink from '$lib/components/lemmy/user/UserLink.svelte'
import SectionTitle from '$lib/components/ui/SectionTitle.svelte'
import { Material, toast } from 'mono-svelte'
- import { getClient } from '$lib/lemmy.js'
+ import { getClient } from '$lib/lemmy.svelte.js'
import type {
ApproveRegistrationApplication,
RegistrationApplicationView,
diff --git a/src/routes/admin/config/+page.svelte b/src/routes/admin/config/+page.svelte
index b7fe4f7d..5654eacb 100644
--- a/src/routes/admin/config/+page.svelte
+++ b/src/routes/admin/config/+page.svelte
@@ -10,7 +10,7 @@
Switch,
toast,
} from 'mono-svelte'
- import { getClient, site } from '$lib/lemmy.js'
+ import { getClient, site } from '$lib/lemmy.svelte.js'
import type { EditSite } from 'lemmy-js-client'
import type { PageData } from './$types.js'
import { Button, Checkbox, Select, TextInput } from 'mono-svelte'
@@ -246,7 +246,7 @@
{$t('form.profile.languages.title')}
{$t('form.profile.languages.description')}
- {#if $site}
+ {#if site.data}
{#each formData.discussion_languages ?? [] as languageId, index}
- {@const language = $site.all_languages.find(
+ {@const language = site.data.all_languages.find(
(l) => l.id == languageId,
)}
{$t('routes.frontpage.footer', {
// @ts-ignore
- users: $site?.site_view.counts.users_active_day ?? '??',
+ users: site.data?.site_view.counts.users_active_day ?? '??',
})}
diff --git a/src/routes/c/[name]/settings/team/+page.svelte b/src/routes/c/[name]/settings/team/+page.svelte
index eac97000..9c1ce26c 100644
--- a/src/routes/c/[name]/settings/team/+page.svelte
+++ b/src/routes/c/[name]/settings/team/+page.svelte
@@ -5,7 +5,7 @@
import type { PageData } from './$types.js'
import { profile } from '$lib/auth.svelte.js'
import { toast } from 'mono-svelte'
- import { client, getClient } from '$lib/lemmy.js'
+ import { client, getClient } from '$lib/lemmy.svelte.js'
import { flip } from 'svelte/animate'
import { Button, TextInput } from 'mono-svelte'
import { t } from '$lib/translations.js'
diff --git a/src/routes/comment/[instance]/[id]/+page.ts b/src/routes/comment/[instance]/[id]/+page.ts
index a126a718..5d6aceb4 100644
--- a/src/routes/comment/[instance]/[id]/+page.ts
+++ b/src/routes/comment/[instance]/[id]/+page.ts
@@ -1,4 +1,4 @@
-import { client } from '$lib/lemmy.js'
+import { client } from '$lib/lemmy.svelte.js'
import { redirect } from '@sveltejs/kit'
export async function load({ params, fetch }) {
diff --git a/src/routes/communities/+page.ts b/src/routes/communities/+page.ts
index c87ccc86..2934e6a7 100644
--- a/src/routes/communities/+page.ts
+++ b/src/routes/communities/+page.ts
@@ -1,6 +1,6 @@
import { profile } from '$lib/auth.svelte'
import { LINKED_INSTANCE_URL } from '$lib/instance.js'
-import { client, getClient } from '$lib/lemmy.js'
+import { client, getClient } from '$lib/lemmy.svelte.js'
import {
type ListCommunitiesResponse,
type ListingType,
diff --git a/src/routes/communities/Subscribe.svelte b/src/routes/communities/Subscribe.svelte
index 687269ef..c80fe70d 100644
--- a/src/routes/communities/Subscribe.svelte
+++ b/src/routes/communities/Subscribe.svelte
@@ -1,5 +1,5 @@
- {#if $site}
+ {#if site.data}
{$t('routes.legal.title')}
diff --git a/src/routes/login/+page.svelte b/src/routes/login/+page.svelte
index 4ee63627..d668cbda 100644
--- a/src/routes/login/+page.svelte
+++ b/src/routes/login/+page.svelte
@@ -10,7 +10,7 @@
mayBeIncompatible,
site,
validateInstance,
- } from '$lib/lemmy.js'
+ } from '$lib/lemmy.svelte.js'
import { Button, TextInput } from 'mono-svelte'
import {
Icon,
@@ -98,7 +98,7 @@
{@render children?.()}
- {#if $site && mayBeIncompatible(MINIMUM_VERSION, $site.version.replace('v', ''))}
+ {#if site.data && mayBeIncompatible(MINIMUM_VERSION, site.data.version.replace('v', ''))}
{$t('account.versionGate', {
//@ts-ignore
diff --git a/src/routes/login/guest/+page.svelte b/src/routes/login/guest/+page.svelte
index 722c28ee..85065dfa 100644
--- a/src/routes/login/guest/+page.svelte
+++ b/src/routes/login/guest/+page.svelte
@@ -1,10 +1,10 @@