misc: change $instance to a $state

This commit is contained in:
James Xylight committed 2025-02-09 11:36:04 -08:00
1 parent 8dcca84e60
commit d8e916d526
26 files changed
+54 -48

No files matched your search

+1 -1
View File
@@ -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 {
-5
View File
@@ -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'
+4 -1
View File
@@ -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'
+2 -2
View File
@@ -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,
)
+1 -1
View File
@@ -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,
+4 -1
View File
@@ -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,
+1 -1
View File
@@ -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'
+1 -1
View File
@@ -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() {
+1 -1
View File
@@ -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'
@@ -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'
@@ -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(),
)
</script>
@@ -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}
@@ -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'
+3 -3
View File
@@ -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 @@
<div class="flex flex-col gap-1">
<img
src="{instanceToURL($instance)}/pictrs/image/{image.pictrs_alias}"
src="{instanceToURL(instance.data)}/pictrs/image/{image.pictrs_alias}"
width="500"
height="500"
class="aspect-square w-full h-full object-cover rounded-xl"
@@ -53,7 +53,7 @@
/>
<Button
title={$t('routes.profile.media.download')}
href="{instanceToURL($instance)}/pictrs/image/{image.pictrs_alias}"
href="{instanceToURL(instance.data)}/pictrs/image/{image.pictrs_alias}"
size="square-md"
class="ml-auto"
>
+1 -1
View File
@@ -43,7 +43,7 @@
import { removalTemplate } from '$lib/components/lemmy/moderation/moderation.js'
import { Button, Checkbox, Select, Spinner } from 'mono-svelte'
import ViewSelect from '$lib/components/lemmy/dropdowns/ViewSelect.svelte'
import { LINKED_INSTANCE_URL } from '$lib/instance.js'
import { LINKED_INSTANCE_URL } from '$lib/instance.svelte.js'
import { DOMAIN_REGEX_FORMS, removeItem } from '$lib/util.svelte.js'
import Section from './Section.svelte'
import ToggleSetting from './ToggleSetting.svelte'
+1 -1
View File
@@ -18,7 +18,7 @@
import { goto } from '$app/navigation'
import { Badge, Material, Spinner, toast } from 'mono-svelte'
import { DEFAULT_INSTANCE_URL } from '$lib/instance.js'
import { DEFAULT_INSTANCE_URL } from '$lib/instance.svelte.js'
import { validateInstance } from '$lib/lemmy.svelte.js'
import { Button, TextInput } from 'mono-svelte'
import { onMount } from 'svelte'
+1 -1
View File
@@ -1,4 +1,4 @@
import { LINKED_INSTANCE_URL } from '$lib/instance.js'
import { LINKED_INSTANCE_URL } from '$lib/instance.svelte.js'
import { redirect } from '@sveltejs/kit'
export const load = () => {
+1 -2
View File
@@ -21,7 +21,7 @@
QuestionMarkCircle,
XCircle,
} from 'svelte-hero-icons'
import { instance as currentInstance } from '$lib/instance.js'
import { instance as currentInstance } from '$lib/instance.svelte.js'
import Header from '$lib/components/ui/layout/pages/Header.svelte'
import { t } from '$lib/translations.js'
@@ -79,7 +79,6 @@
res.verify_email_sent ||
data.site_view.local_site.registration_mode == 'RequireApplication'
) {
currentInstance.set(instance)
if (res.verify_email_sent) {
toast({
content: $t('toast.verifyEmail'),
+4 -1
View File
@@ -1,7 +1,10 @@
<script>
import { env } from '$env/dynamic/public'
import Header from '$lib/components/ui/layout/pages/Header.svelte'
import { DEFAULT_INSTANCE_URL, LINKED_INSTANCE_URL } from '$lib/instance'
import {
DEFAULT_INSTANCE_URL,
LINKED_INSTANCE_URL,
} from '$lib/instance.svelte'
</script>
<Header pageHeader>Photon instance</Header>
+1 -1
View File
@@ -1,5 +1,5 @@
<script>
import { LINKED_INSTANCE_URL } from '$lib/instance'
import { LINKED_INSTANCE_URL } from '$lib/instance.svelte'
import { t } from '$lib/translations'
import { Check, Icon } from 'svelte-hero-icons'
</script>