misc: change $instance to a $state
This commit is contained in:
26 files changed
+54
-48
No files matched your search
@@ -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<T>(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({
|
||||
|
||||
@@ -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'
|
||||
|
||||
@@ -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'
|
||||
|
||||
@@ -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()
|
||||
@@ -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'
|
||||
|
||||
@@ -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 (
|
||||
|
||||
@@ -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 {
|
||||
|
||||
@@ -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'
|
||||
|
||||
@@ -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'
|
||||
|
||||
@@ -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,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,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,
|
||||
|
||||
@@ -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,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() {
|
||||
|
||||
@@ -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'
|
||||
|
||||
@@ -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"
|
||||
>
|
||||
|
||||
@@ -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'
|
||||
|
||||
@@ -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,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 = () => {
|
||||
|
||||
@@ -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'),
|
||||
|
||||
@@ -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,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>
|
||||
|
||||
Reference in new issue
Block a user