From d8e916d526f537024fe2de0567ace2d3e3dd389a Mon Sep 17 00:00:00 2001 From: James Xylight Date: Sun, 9 Feb 2025 11:36:04 -0800 Subject: [PATCH] misc: change $instance to a $state --- src/lib/auth.svelte.ts | 11 ++--------- src/lib/components/ui/navbar/Navbar.svelte | 2 +- src/lib/components/ui/sidebar/ProfileButton.svelte | 2 +- src/lib/{instance.ts => instance.svelte.ts} | 12 +++++++++++- src/lib/lemmy.svelte.ts | 2 +- src/lib/lemmy/postfeed.ts | 8 ++++---- src/routes/+layout.svelte | 2 +- src/routes/+page.ts | 5 ----- src/routes/accounts/+page.svelte | 5 ++++- src/routes/admin/team/+page.svelte | 4 ++-- src/routes/communities/+page.ts | 2 +- src/routes/login/+page.svelte | 5 ++++- src/routes/login/guest/+page.svelte | 2 +- src/routes/login/guest/+page.ts | 2 +- src/routes/login_reset/+page.svelte | 2 +- src/routes/password_change/[token]/+page.svelte | 2 +- src/routes/post/[instance]/[id=integer]/+page.svelte | 6 +++--- .../[instance]/[id=integer]/CommentProvider.svelte | 4 ++-- .../(local_user)/password/change/+page.svelte | 2 +- src/routes/profile/media/PictrsImage.svelte | 6 +++--- src/routes/settings/+page.svelte | 2 +- src/routes/signup/+page.svelte | 2 +- src/routes/signup/+page.ts | 2 +- src/routes/signup/[instance]/+page.svelte | 3 +-- src/routes/util/instance/+page.svelte | 5 ++++- src/routes/verify_email/[token]/+page.svelte | 2 +- 26 files changed, 54 insertions(+), 48 deletions(-) rename src/lib/{instance.ts => instance.svelte.ts} (74%) diff --git a/src/lib/auth.svelte.ts b/src/lib/auth.svelte.ts index d52b48b9..50e9b58c 100644 --- a/src/lib/auth.svelte.ts +++ b/src/lib/auth.svelte.ts @@ -3,7 +3,7 @@ import { isAdmin, } from '$lib/components/lemmy/moderation/moderation.js' import { toast } from 'mono-svelte' -import { DEFAULT_INSTANCE_URL, instance } from '$lib/instance.js' +import { DEFAULT_INSTANCE_URL } from '$lib/instance.svelte.js' import { client, getClient } from '$lib/lemmy.svelte.js' import { site } from './lemmy.svelte' import { instanceToURL, moveItem } from '$lib/util.svelte' @@ -27,7 +27,7 @@ import { t } from './translations' const getDefaultProfile = (): Profile => ({ id: -1, - instance: profileData.defaultInstance ?? get(instance), + instance: profileData.defaultInstance ?? DEFAULT_INSTANCE_URL, }) function getFromStorage(key: string): T | undefined { @@ -116,7 +116,6 @@ class CurrentProfile { export let profile = new CurrentProfile() async function fetchUserData(profile: CurrentProfile) { - instance.set(profile.data.instance) if (profile.data.jwt) { site.data = undefined notifications.set({ applications: 0, inbox: 0, reports: 0 }) @@ -161,10 +160,6 @@ $effect.root(() => { } setFromStorage('profileData', serialized) - - if (serialized.profile == -1) { - instance?.set(profileData.defaultInstance ?? DEFAULT_INSTANCE_URL) - } if (serialized.profiles.length == 0) { profileData.profiles = [ { @@ -230,8 +225,6 @@ export async function setUser(jwt: string, inst: string, username?: string) { }) } - instance.set(inst) - const id = Math.max(...profileData.profiles.map((p) => p.id)) + 1 profileData.profile = id profileData.profiles.push({ diff --git a/src/lib/components/ui/navbar/Navbar.svelte b/src/lib/components/ui/navbar/Navbar.svelte index 06129a82..ec7308f3 100644 --- a/src/lib/components/ui/navbar/Navbar.svelte +++ b/src/lib/components/ui/navbar/Navbar.svelte @@ -22,7 +22,7 @@ import Profile from './Profile.svelte' import NavButton from './NavButton.svelte' import Logo from '../Logo.svelte' - import { LINKED_INSTANCE_URL } from '$lib/instance' + import { LINKED_INSTANCE_URL } from '$lib/instance.svelte' import { t } from '$lib/translations' import CommandsWrapper from './commands/CommandsWrapper.svelte' import type { ClassValue } from 'svelte/elements' diff --git a/src/lib/components/ui/sidebar/ProfileButton.svelte b/src/lib/components/ui/sidebar/ProfileButton.svelte index ef6996c7..ff39cb0d 100644 --- a/src/lib/components/ui/sidebar/ProfileButton.svelte +++ b/src/lib/components/ui/sidebar/ProfileButton.svelte @@ -3,7 +3,7 @@ import { page } from '$app/state' import { profile, setUserID, type Profile } from '$lib/auth.svelte.js' import SidebarButton from '$lib/components/ui/sidebar/SidebarButton.svelte' - import { LINKED_INSTANCE_URL } from '$lib/instance' + import { LINKED_INSTANCE_URL } from '$lib/instance.svelte' import ProfileAvatar from '$lib/lemmy/ProfileAvatar.svelte' import { Button } from 'mono-svelte' import { Icon, QuestionMarkCircle } from 'svelte-hero-icons' diff --git a/src/lib/instance.ts b/src/lib/instance.svelte.ts similarity index 74% rename from src/lib/instance.ts rename to src/lib/instance.svelte.ts index b771c0cf..c93b321f 100644 --- a/src/lib/instance.ts +++ b/src/lib/instance.svelte.ts @@ -3,6 +3,7 @@ import { browser } from '$app/environment' import { env } from '$env/dynamic/public' import { writable } from 'svelte/store' +import { profile } from './auth.svelte' export const LINKED_INSTANCE_URL = (env.PUBLIC_LOCK_TO_INSTANCE ?? 'true').toLowerCase() == 'true' @@ -18,4 +19,13 @@ const getDefaultInstance = (): string => { } export const DEFAULT_INSTANCE_URL = getDefaultInstance() -export let instance = writable(DEFAULT_INSTANCE_URL) + +class InstanceData { + #instance = $derived(profile.data.instance) + + get data() { + return this.#instance + } +} + +export let instance = new InstanceData() diff --git a/src/lib/lemmy.svelte.ts b/src/lib/lemmy.svelte.ts index 9624f0e2..530bf189 100644 --- a/src/lib/lemmy.svelte.ts +++ b/src/lib/lemmy.svelte.ts @@ -1,7 +1,7 @@ import { type GetSiteResponse, LemmyHttp } from 'lemmy-js-client' import { get, writable } from 'svelte/store' import { error } from '@sveltejs/kit' -import { instance } from '$lib/instance.js' +import { instance } from '$lib/instance.svelte.js' import { instanceToURL } from '$lib/util.svelte' import { profile } from '$lib/auth.svelte' import { toast } from 'mono-svelte' diff --git a/src/lib/lemmy/postfeed.ts b/src/lib/lemmy/postfeed.ts index 0bc792a9..919d02b1 100644 --- a/src/lib/lemmy/postfeed.ts +++ b/src/lib/lemmy/postfeed.ts @@ -1,5 +1,5 @@ import { browser } from '$app/environment' -import { instance } from '$lib/instance' +import { instance } from '$lib/instance.svelte' import { client } from '$lib/lemmy.svelte' import type { GetPosts, @@ -32,11 +32,11 @@ export async function postFeed(args: { }) { const feed = get(postFeeds)[args.id] - const posts = shouldReload(feed, args.url, get(instance)) + const posts = shouldReload(feed, args.url, instance.data) ? await client({ func: args.fetch }).getPosts(args.request) : feed.data.posts - if (shouldReload(feed, args.url, get(instance)) && browser) + if (shouldReload(feed, args.url, instance.data) && browser) postFeeds.updateFeed(args.id, { data: { ...args.request, @@ -48,7 +48,7 @@ export async function postFeed(args: { }, url: args.url, lastSeen: 0, - instance: get(instance), + instance: instance.data, }) return ( diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte index 119cf6cd..feb3c591 100644 --- a/src/routes/+layout.svelte +++ b/src/routes/+layout.svelte @@ -28,7 +28,7 @@ import SiteCard from '$lib/components/lemmy/SiteCard.svelte' import { site } from '$lib/lemmy.svelte.js' import ExpandableImage from '$lib/components/ui/ExpandableImage.svelte' - import { LINKED_INSTANCE_URL } from '$lib/instance' + import { LINKED_INSTANCE_URL } from '$lib/instance.svelte' import { locale } from '$lib/translations' import { getDefaultColors } from '$lib/ui/presets' interface Props { diff --git a/src/routes/+page.ts b/src/routes/+page.ts index de2c2845..ff8f376b 100644 --- a/src/routes/+page.ts +++ b/src/routes/+page.ts @@ -1,10 +1,5 @@ -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' -import { error } from '@sveltejs/kit' -import { browser } from '$app/environment' -import { instance } from '$lib/instance' import { postFeed, postFeeds, shouldReload } from '$lib/lemmy/postfeed.js' import { t } from '$lib/translations.js' import { ChevronDoubleUp } from 'svelte-hero-icons' diff --git a/src/routes/accounts/+page.svelte b/src/routes/accounts/+page.svelte index f2bb42a7..c346d737 100644 --- a/src/routes/accounts/+page.svelte +++ b/src/routes/accounts/+page.svelte @@ -10,7 +10,10 @@ } from '$lib/auth.svelte.js' import { Menu, MenuButton, Modal } from 'mono-svelte' import DebugObject from '$lib/components/util/debug/DebugObject.svelte' - import { DEFAULT_INSTANCE_URL, LINKED_INSTANCE_URL } from '$lib/instance.js' + import { + DEFAULT_INSTANCE_URL, + LINKED_INSTANCE_URL, + } from '$lib/instance.svelte.js' import ProfileAvatar from '$lib/lemmy/ProfileAvatar.svelte' import { settings } from '$lib/settings.svelte.js' import { Button, TextInput } from 'mono-svelte' diff --git a/src/routes/admin/team/+page.svelte b/src/routes/admin/team/+page.svelte index 14b21398..824b0236 100644 --- a/src/routes/admin/team/+page.svelte +++ b/src/routes/admin/team/+page.svelte @@ -5,7 +5,7 @@ import UserLink from '$lib/components/lemmy/user/UserLink.svelte' import Placeholder from '$lib/components/ui/Placeholder.svelte' import { toast } from 'mono-svelte' - import { instance } from '$lib/instance.js' + import { instance } from '$lib/instance.svelte.js' import { getClient } from '$lib/lemmy.svelte.js' import { addAdmin } from '$lib/lemmy/user.js' import { removeItem, trycatch } from '$lib/util.svelte.js' @@ -79,7 +79,7 @@ adding = true const r = await addAdmin( - `${newAdmin}@${$instance}`, + `${newAdmin}@${instance.data}`, true, profile.data.jwt, ) diff --git a/src/routes/communities/+page.ts b/src/routes/communities/+page.ts index 2934e6a7..e6cb7b50 100644 --- a/src/routes/communities/+page.ts +++ b/src/routes/communities/+page.ts @@ -1,5 +1,5 @@ import { profile } from '$lib/auth.svelte' -import { LINKED_INSTANCE_URL } from '$lib/instance.js' +import { LINKED_INSTANCE_URL } from '$lib/instance.svelte.js' import { client, getClient } from '$lib/lemmy.svelte.js' import { type ListCommunitiesResponse, diff --git a/src/routes/login/+page.svelte b/src/routes/login/+page.svelte index d668cbda..fbcc6412 100644 --- a/src/routes/login/+page.svelte +++ b/src/routes/login/+page.svelte @@ -4,7 +4,10 @@ import { goto } from '$app/navigation' import { setUser } from '$lib/auth.svelte.js' import { Note, toast } from 'mono-svelte' - import { DEFAULT_INSTANCE_URL, LINKED_INSTANCE_URL } from '$lib/instance.js' + import { + DEFAULT_INSTANCE_URL, + LINKED_INSTANCE_URL, + } from '$lib/instance.svelte.js' import { getClient, mayBeIncompatible, diff --git a/src/routes/login/guest/+page.svelte b/src/routes/login/guest/+page.svelte index 85065dfa..a7a06d49 100644 --- a/src/routes/login/guest/+page.svelte +++ b/src/routes/login/guest/+page.svelte @@ -7,7 +7,7 @@ import { mayBeIncompatible } from '$lib/lemmy.svelte' import { DOMAIN_REGEX_FORMS } from '$lib/util.svelte' import { profile, profileData, type Profile } from '$lib/auth.svelte' - import { LINKED_INSTANCE_URL } from '$lib/instance' + import { LINKED_INSTANCE_URL } from '$lib/instance.svelte' import { goto } from '$app/navigation' import { t } from '$lib/translations' import Header from '$lib/components/ui/layout/pages/Header.svelte' diff --git a/src/routes/login/guest/+page.ts b/src/routes/login/guest/+page.ts index b0493438..f5b1d145 100644 --- a/src/routes/login/guest/+page.ts +++ b/src/routes/login/guest/+page.ts @@ -1,4 +1,4 @@ -import { LINKED_INSTANCE_URL } from '$lib/instance' +import { LINKED_INSTANCE_URL } from '$lib/instance.svelte' import { error } from '@sveltejs/kit' export function load() { diff --git a/src/routes/login_reset/+page.svelte b/src/routes/login_reset/+page.svelte index 71b997cb..6a69c432 100644 --- a/src/routes/login_reset/+page.svelte +++ b/src/routes/login_reset/+page.svelte @@ -6,7 +6,7 @@ DEFAULT_INSTANCE_URL, LINKED_INSTANCE_URL, instance as currentInstance, - } from '$lib/instance.js' + } from '$lib/instance.svelte.js' import { getClient, validateInstance } from '$lib/lemmy.svelte.js' import { t } from '$lib/translations' import { Button, TextInput, toast } from 'mono-svelte' diff --git a/src/routes/password_change/[token]/+page.svelte b/src/routes/password_change/[token]/+page.svelte index 79637aa6..d608a00c 100644 --- a/src/routes/password_change/[token]/+page.svelte +++ b/src/routes/password_change/[token]/+page.svelte @@ -7,7 +7,7 @@ DEFAULT_INSTANCE_URL, LINKED_INSTANCE_URL, instance as currentInstance, - } from '$lib/instance.js' + } from '$lib/instance.svelte.js' import { getClient, validateInstance } from '$lib/lemmy.svelte.js' import { t } from '$lib/translations' import { Button, TextInput, toast } from 'mono-svelte' diff --git a/src/routes/post/[instance]/[id=integer]/+page.svelte b/src/routes/post/[instance]/[id=integer]/+page.svelte index 67eba425..3d3508a4 100644 --- a/src/routes/post/[instance]/[id=integer]/+page.svelte +++ b/src/routes/post/[instance]/[id=integer]/+page.svelte @@ -32,7 +32,7 @@ import { Select, removeToast, toast } from 'mono-svelte' import type { CommentSortType, GetCommentsResponse } from 'lemmy-js-client' import { profile } from '$lib/auth.svelte.js' - import { instance } from '$lib/instance.js' + import { instance } from '$lib/instance.svelte.js' import { afterNavigate, goto } from '$app/navigation' import FormattedNumber from '$lib/components/util/FormattedNumber.svelte' import { Button } from 'mono-svelte' @@ -145,7 +145,7 @@ if (res.post) { removeToast(id) - goto(`/post/${$instance}/${res.post.post.id}`, {}).then(() => + goto(`/post/${instance.data}/${res.post.post.id}`, {}).then(() => removeToast(id), ) } @@ -176,7 +176,7 @@ let commenting = $state(false) let remoteView = $derived( - page.params.instance?.toLowerCase() != $instance.toLowerCase(), + page.params.instance?.toLowerCase() != instance.data.toLowerCase(), ) diff --git a/src/routes/post/[instance]/[id=integer]/CommentProvider.svelte b/src/routes/post/[instance]/[id=integer]/CommentProvider.svelte index ae469bfb..21cc5d3c 100644 --- a/src/routes/post/[instance]/[id=integer]/CommentProvider.svelte +++ b/src/routes/post/[instance]/[id=integer]/CommentProvider.svelte @@ -5,7 +5,7 @@ import CommentListVirtualizer from '$lib/components/lemmy/comment/CommentListVirtualizer.svelte' import { buildCommentsTree } from '$lib/components/lemmy/comment/comments.svelte' import EndPlaceholder from '$lib/components/ui/EndPlaceholder.svelte' - import { instance } from '$lib/instance' + import { instance } from '$lib/instance.svelte' import { settings } from '$lib/settings.svelte' import { t } from '$lib/translations' import type { @@ -94,7 +94,7 @@ .map((c) => c.community.id) .includes(post.community_view.community.id) )) || - page.params.instance.toLowerCase() != $instance.toLowerCase()} + page.params.instance.toLowerCase() != instance.data.toLowerCase()} banned={post.community_view.banned_from_community} onfocus={() => (commenting = true)} tools={commenting} diff --git a/src/routes/profile/(local_user)/password/change/+page.svelte b/src/routes/profile/(local_user)/password/change/+page.svelte index 7dc5545b..4c7a7ad6 100644 --- a/src/routes/profile/(local_user)/password/change/+page.svelte +++ b/src/routes/profile/(local_user)/password/change/+page.svelte @@ -3,7 +3,7 @@ import { deleteProfile, profile, setUser } from '$lib/auth.svelte' import { client } from '$lib/lemmy.svelte' - import { instance as currentInstance } from '$lib/instance' + import { instance as currentInstance } from '$lib/instance.svelte' import { t } from '$lib/translations' import { Button, TextInput, toast } from 'mono-svelte' import { errorMessage } from '$lib/lemmy/error' diff --git a/src/routes/profile/media/PictrsImage.svelte b/src/routes/profile/media/PictrsImage.svelte index b58c6b89..b9067408 100644 --- a/src/routes/profile/media/PictrsImage.svelte +++ b/src/routes/profile/media/PictrsImage.svelte @@ -2,7 +2,7 @@ import { profile } from '$lib/auth.svelte' import { publishedToDate } from '$lib/components/util/date' import RelativeDate from '$lib/components/util/RelativeDate.svelte' - import { instance } from '$lib/instance' + import { instance } from '$lib/instance.svelte' import { client } from '$lib/lemmy.svelte' import { t } from '$lib/translations' import { instanceToURL } from '$lib/util.svelte' @@ -40,7 +40,7 @@