fix: decrease site fetches

This commit is contained in:
Xyphyn committed 2023-09-15 14:19:04 -07:00
1 parent b7038b1832
commit da6f4bab6a
7 files changed
+30 -29

No files matched your search

+1 -1
View File
@@ -1,6 +1,6 @@
{ {
"name": "photon-lemmy", "name": "photon-lemmy",
"version": "1.6.5", "version": "1.7.0",
"private": true, "private": true,
"scripts": { "scripts": {
"dev": "vite dev", "dev": "vite dev",
+16 -1
View File
@@ -5,7 +5,11 @@ import { getClient, site } from '$lib/lemmy.js'
import { getInbox, getInboxItemPublished } from '$lib/lemmy/inbox.js' import { getInbox, getInboxItemPublished } from '$lib/lemmy/inbox.js'
import { userSettings } from '$lib/settings.js' import { userSettings } from '$lib/settings.js'
import { moveItem } from '$lib/util.js' import { moveItem } from '$lib/util.js'
import type { GetSiteResponse, MyUserInfo } from 'lemmy-js-client' import {
LemmyHttp,
type GetSiteResponse,
type MyUserInfo,
} from 'lemmy-js-client'
import { get, writable } from 'svelte/store' import { get, writable } from 'svelte/store'
const getDefaultProfile = (): Profile => ({ const getDefaultProfile = (): Profile => ({
@@ -197,9 +201,20 @@ const serializeUser = (user: Profile): Profile => ({
user: undefined, user: undefined,
}) })
instance.subscribe(async (i) => {
try {
// fetching site is handled by auth.ts if logged in
if (get(profile)?.jwt) return
const s = await new LemmyHttp(`https://${i}`).getSite()
site.set(s)
} catch (e) {}
})
export async function setUserID(id: number) { export async function setUserID(id: number) {
const pd = get(profileData) const pd = get(profileData)
if (id == -1) { if (id == -1) {
instance.set(DEFAULT_INSTANCE_URL)
resetProfile() resetProfile()
return return
} }
+1 -1
View File
@@ -66,7 +66,7 @@
Powered by <Link Powered by <Link
href="https://github.com/Xyphyn/photon" href="https://github.com/Xyphyn/photon"
highlight={false} highlight={false}
class="font-bold flex items-center gap-0.5 hover:underline text-black dark:text-white" class="!font-bold flex items-center gap-0.5 hover:underline text-black dark:text-white"
> >
<Logo width={12} /> Photon <Logo width={12} /> Photon
</Link> </Link>
-6
View File
@@ -39,12 +39,6 @@ export const getInstance = () => get(instance)
export const site = writable<GetSiteResponse | undefined>(undefined) export const site = writable<GetSiteResponse | undefined>(undefined)
if (LINKED_INSTANCE_URL) {
getClient(LINKED_INSTANCE_URL)
.getSite({})
.then((s) => site.set(s))
}
export async function validateInstance(instance: string): Promise<boolean> { export async function validateInstance(instance: string): Promise<boolean> {
if (instance == '') return false if (instance == '') return false
-2
View File
@@ -38,8 +38,6 @@
$: webManifest = pwaInfo ? pwaInfo.webManifest.linkTag : '' $: webManifest = pwaInfo ? pwaInfo.webManifest.linkTag : ''
$: darkTheme = $theme && inDarkTheme() $: darkTheme = $theme && inDarkTheme()
$: console.log(darkTheme)
onMount(() => { onMount(() => {
if (browser) { if (browser) {
window window
+12 -15
View File
@@ -10,6 +10,7 @@
import { GlobeAmericas, Icon } from 'svelte-hero-icons' import { GlobeAmericas, Icon } from 'svelte-hero-icons'
import { profile } from '$lib/auth.js' import { profile } from '$lib/auth.js'
import ViewSelect from '$lib/components/lemmy/ViewSelect.svelte' import ViewSelect from '$lib/components/lemmy/ViewSelect.svelte'
import { site } from '$lib/lemmy.js'
export let data export let data
@@ -23,13 +24,13 @@
<Modal bind:open={sidebar}> <Modal bind:open={sidebar}>
<span slot="title">About</span> <span slot="title">About</span>
<div class="mx-auto"> <div class="mx-auto">
{#await data.streamed.site then site} {#if $site}
<SiteCard <SiteCard
site={site.site_view} site={$site.site_view}
taglines={site.taglines} taglines={$site.taglines}
admins={site.admins} admins={$site.admins}
/> />
{/await} {/if}
</div> </div>
</Modal> </Modal>
@@ -75,22 +76,18 @@
</div> </div>
</div> </div>
<div class="hidden xl:block"> <div class="hidden xl:block">
{#await data.streamed.site} {#if !$site}
<StickyCard> <StickyCard>
<div class="h-64 grid place-items-center"> <div class="h-64 grid place-items-center">
<Spinner width={32} /> <Spinner width={32} />
</div> </div>
</StickyCard> </StickyCard>
{:then site} {:else}
<SiteCard <SiteCard
site={site.site_view} site={$site.site_view}
taglines={site.taglines} taglines={$site.taglines}
admins={site.admins} admins={$site.admins}
/> />
{:catch} {/if}
<StickyCard>
<h1 class="font-bold text-lg">Failed to load</h1>
</StickyCard>
{/await}
</div> </div>
</div> </div>
-3
View File
@@ -27,9 +27,6 @@ export async function load({ url, fetch }) {
type_: listingType, type_: listingType,
auth: get(profile)?.jwt, auth: get(profile)?.jwt,
}), }),
streamed: {
site: getClient(undefined, fetch).getSite({}),
},
} }
} catch (err) { } catch (err) {
throw error(500, { throw error(500, {