From 8dcca84e607f1bf7d63f6457e28f91f6ca78952f Mon Sep 17 00:00:00 2001 From: James Xylight Date: Sun, 9 Feb 2025 11:15:46 -0800 Subject: [PATCH] misc: change $site to a $state --- src/lib/auth.svelte.ts | 12 +++++----- .../lemmy/ObjectAutocomplete.svelte | 2 +- .../components/lemmy/comment/Comment.svelte | 2 +- .../lemmy/comment/CommentForm.svelte | 6 ++--- .../lemmy/comment/CommentVote.svelte | 2 +- .../components/lemmy/comment/Comments.svelte | 2 +- .../lemmy/community/CommunityCard.svelte | 2 +- .../lemmy/community/CommunityForm.svelte | 8 +++---- .../lemmy/modal/PrivateMessageModal.svelte | 2 +- .../lemmy/moderation/BanModal.svelte | 2 +- .../lemmy/moderation/ModerationMenu.svelte | 2 +- .../lemmy/moderation/RemoveModal.svelte | 2 +- .../lemmy/moderation/ReportModal.svelte | 2 +- .../components/lemmy/moderation/moderation.ts | 2 +- .../components/lemmy/post/PostActions.svelte | 4 ++-- src/lib/components/lemmy/post/PostVote.svelte | 4 ++-- .../lemmy/post/feed/VirtualFeed.svelte | 2 +- .../lemmy/post/form/PostForm.svelte | 6 ++--- src/lib/components/lemmy/post/helpers.ts | 2 +- .../lemmy/user/UserAutocomplete.svelte | 2 +- src/lib/components/ui/navbar/Navbar.svelte | 10 ++++---- src/lib/components/ui/navbar/Profile.svelte | 12 +++++----- src/lib/{lemmy.ts => lemmy.svelte.ts} | 14 ++++++++++- src/lib/lemmy/contentview.ts | 2 +- src/lib/lemmy/inbox.ts | 2 +- src/lib/lemmy/postfeed.ts | 2 +- src/lib/lemmy/user.ts | 2 +- src/lib/util.svelte.ts | 6 ++--- src/routes/+layout.svelte | 23 +++++++++++-------- src/routes/+page.svelte | 4 ++-- src/routes/+page.ts | 2 +- .../activitypub/externalInteraction/+page.ts | 2 +- src/routes/admin/+layout.ts | 14 +++++------ src/routes/admin/applications/+page.ts | 2 +- .../admin/applications/Application.svelte | 2 +- src/routes/admin/config/+page.svelte | 8 +++---- src/routes/admin/federation/+page.svelte | 2 +- src/routes/admin/federation/+page.ts | 2 +- src/routes/admin/taglines/+page.svelte | 2 +- src/routes/admin/team/+page.svelte | 2 +- src/routes/c/[name]/+layout.ts | 2 +- src/routes/c/[name]/+page.svelte | 4 ++-- .../c/[name]/settings/team/+page.svelte | 2 +- src/routes/comment/[instance]/[id]/+page.ts | 2 +- src/routes/communities/+page.ts | 2 +- src/routes/communities/Subscribe.svelte | 2 +- src/routes/create/post/+page.ts | 2 +- src/routes/inbox/+page.svelte | 2 +- src/routes/inbox/+page.ts | 2 +- src/routes/inbox/InboxItem.svelte | 2 +- src/routes/inbox/messages/+page.ts | 2 +- .../messages/[user_id=integer]/+page.svelte | 2 +- .../inbox/messages/[user_id=integer]/+page.ts | 2 +- src/routes/instances/+page.ts | 2 +- src/routes/legal/+page.svelte | 6 ++--- src/routes/login/+page.svelte | 4 ++-- src/routes/login/guest/+page.svelte | 6 ++--- src/routes/login_reset/+page.svelte | 2 +- src/routes/moderation/+page.ts | 2 +- src/routes/moderation/Report.svelte | 2 +- src/routes/modlog/+page.ts | 2 +- .../password_change/[token]/+page.svelte | 2 +- .../post/[instance]/[id=integer]/+page.svelte | 2 +- .../post/[instance]/[id=integer]/+page.ts | 2 +- .../profile/(local_user)/blocks/+page.svelte | 2 +- .../(local_user)/password/2fa/+page.svelte | 2 +- .../(local_user)/password/change/+page.svelte | 2 +- .../(local_user)/password/delete/+page.svelte | 2 +- .../(local_user)/password/logins/+page.svelte | 2 +- .../(local_user)/password/logins/+page.ts | 2 +- .../(local_user)/settings/+page.svelte | 8 +++---- src/routes/profile/+layout.svelte | 4 ++-- src/routes/profile/+layout.ts | 2 +- src/routes/profile/media/+page.ts | 2 +- src/routes/profile/media/PictrsImage.svelte | 2 +- src/routes/profile/user/+page.ts | 2 +- src/routes/profile/voted/[type]/+page.ts | 2 +- src/routes/saved/+page.ts | 2 +- src/routes/search/+page.ts | 2 +- src/routes/signup/+page.svelte | 2 +- src/routes/signup/[instance]/+page.svelte | 2 +- src/routes/signup/[instance]/+page.ts | 2 +- src/routes/u/[name]/+page.svelte | 2 +- src/routes/u/[name]/+page.ts | 2 +- src/routes/verify_email/[token]/+page.ts | 2 +- 85 files changed, 153 insertions(+), 140 deletions(-) rename src/lib/{lemmy.ts => lemmy.svelte.ts} (94%) diff --git a/src/lib/auth.svelte.ts b/src/lib/auth.svelte.ts index 7d21bb12..d52b48b9 100644 --- a/src/lib/auth.svelte.ts +++ b/src/lib/auth.svelte.ts @@ -4,8 +4,8 @@ import { } from '$lib/components/lemmy/moderation/moderation.js' import { toast } from 'mono-svelte' import { DEFAULT_INSTANCE_URL, instance } from '$lib/instance.js' -import { client, getClient } from '$lib/lemmy.js' -import { site } from './lemmy' +import { client, getClient } from '$lib/lemmy.svelte.js' +import { site } from './lemmy.svelte' import { instanceToURL, moveItem } from '$lib/util.svelte' import { type GetSiteResponse, @@ -118,7 +118,7 @@ export let profile = new CurrentProfile() async function fetchUserData(profile: CurrentProfile) { instance.set(profile.data.instance) if (profile.data.jwt) { - site.set(undefined) + site.data = undefined notifications.set({ applications: 0, inbox: 0, reports: 0 }) const res = await userFromJwt(profile.data.jwt, profile.data.instance) @@ -129,7 +129,7 @@ async function fetchUserData(profile: CurrentProfile) { type: 'error', }) - site.set(res?.site) + site.data = res?.site profile.data.user = res?.user if (profile.data.user) { profile.data.avatar = res?.user?.local_user_view.person.avatar @@ -137,10 +137,10 @@ async function fetchUserData(profile: CurrentProfile) { } } else { if (browser) { - site.set(undefined) + site.data = undefined client({ instanceURL: profile.data.instance }) .getSite() - .then((res) => site.set(res)) + .then((res) => (site.data = res)) } } diff --git a/src/lib/components/lemmy/ObjectAutocomplete.svelte b/src/lib/components/lemmy/ObjectAutocomplete.svelte index 487e455d..5369353d 100644 --- a/src/lib/components/lemmy/ObjectAutocomplete.svelte +++ b/src/lib/components/lemmy/ObjectAutocomplete.svelte @@ -1,6 +1,6 @@ - {#if $site?.site_view} - {$site?.site_view.site.name} + {#if site.data?.site_view} + {site.data?.site_view.site.name} {#if LINKED_INSTANCE_URL} - - + + {:else} {/if} @@ -150,12 +153,12 @@ {#if page.data.slots?.sidebar?.component} {@const SvelteComponent = page.data.slots.sidebar.component} - {:else if $site} + {:else if site.data} {:else}
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}
{#snippet target()} @@ -257,7 +257,7 @@ {/snippet} - {#each $site.all_languages.filter((l) => !formData.discussion_languages?.includes(l.id)) as language, index} + {#each site.data.all_languages.filter((l) => !formData.discussion_languages?.includes(l.id)) as language, index} { @@ -269,7 +269,7 @@ {/each} {#each formData.discussion_languages ?? [] as languageId, index} - {@const language = $site.all_languages.find( + {@const language = site.data.all_languages.find( (l) => l.id == languageId, )}