fix: reload posts if instance changes
This commit is contained in:
1 parent
0b13cbc429
commit
802b11e1ed
2 files changed
+30
-10
No files matched your search
+18
-3
@@ -1,9 +1,22 @@
|
|||||||
<script lang="ts" context="module">
|
<script lang="ts" context="module">
|
||||||
export const _posts = writable<{
|
interface CachedPosts {
|
||||||
data: GetPostsResponse
|
data: GetPostsResponse
|
||||||
params: URLSearchParams
|
params: URLSearchParams
|
||||||
lastSeen: number
|
lastSeen: number
|
||||||
}>(undefined)
|
instance: string
|
||||||
|
}
|
||||||
|
|
||||||
|
export const _posts = writable<CachedPosts>(undefined)
|
||||||
|
|
||||||
|
export const shouldReload = (
|
||||||
|
cache: CachedPosts,
|
||||||
|
params: string,
|
||||||
|
instance: string
|
||||||
|
): boolean =>
|
||||||
|
!(
|
||||||
|
cache &&
|
||||||
|
(params == cache.params.toString() || cache.instance != instance)
|
||||||
|
)
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<script lang="ts">
|
<script lang="ts">
|
||||||
@@ -27,12 +40,13 @@
|
|||||||
import { t } from '$lib/translations.js'
|
import { t } from '$lib/translations.js'
|
||||||
import InfiniteScroll from 'svelte-infinite-scroll'
|
import InfiniteScroll from 'svelte-infinite-scroll'
|
||||||
import { Button, Material, Spinner } from 'mono-svelte'
|
import { Button, Material, Spinner } from 'mono-svelte'
|
||||||
import { writable } from 'svelte/store'
|
import { get, writable } from 'svelte/store'
|
||||||
import type { GetPostsResponse } from 'lemmy-js-client'
|
import type { GetPostsResponse } from 'lemmy-js-client'
|
||||||
import { userSettings } from '$lib/settings.js'
|
import { userSettings } from '$lib/settings.js'
|
||||||
import { afterNavigate } from '$app/navigation'
|
import { afterNavigate } from '$app/navigation'
|
||||||
import { browser } from '$app/environment'
|
import { browser } from '$app/environment'
|
||||||
import { onMount } from 'svelte'
|
import { onMount } from 'svelte'
|
||||||
|
import { instance } from '$lib/instance.js'
|
||||||
|
|
||||||
export let data
|
export let data
|
||||||
|
|
||||||
@@ -69,6 +83,7 @@
|
|||||||
data: data.posts,
|
data: data.posts,
|
||||||
params: ps.params,
|
params: ps.params,
|
||||||
lastSeen: ps.lastSeen,
|
lastSeen: ps.lastSeen,
|
||||||
|
instance: ps.instance,
|
||||||
}))
|
}))
|
||||||
|
|
||||||
loading = false
|
loading = false
|
||||||
|
|||||||
+12
-7
@@ -3,8 +3,9 @@ import { userSettings } from '$lib/settings.js'
|
|||||||
import type { GetPostsResponse, ListingType, SortType } from 'lemmy-js-client'
|
import type { GetPostsResponse, ListingType, SortType } from 'lemmy-js-client'
|
||||||
import { get, writable } from 'svelte/store'
|
import { get, writable } from 'svelte/store'
|
||||||
import { error } from '@sveltejs/kit'
|
import { error } from '@sveltejs/kit'
|
||||||
import { _posts } from './+page.svelte'
|
import { _posts, shouldReload } from './+page.svelte'
|
||||||
import { browser } from '$app/environment'
|
import { browser } from '$app/environment'
|
||||||
|
import { instance } from '$lib/instance'
|
||||||
|
|
||||||
export async function load({ url, fetch }) {
|
export async function load({ url, fetch }) {
|
||||||
const cursor = url.searchParams.get('cursor') as string | undefined
|
const cursor = url.searchParams.get('cursor') as string | undefined
|
||||||
@@ -20,10 +21,8 @@ export async function load({ url, fetch }) {
|
|||||||
|
|
||||||
const cached = get(_posts)
|
const cached = get(_posts)
|
||||||
|
|
||||||
const posts =
|
const posts = shouldReload(cached, url.searchParams.toString(), get(instance))
|
||||||
cached && url.searchParams.toString() == cached.params.toString()
|
? await getClient(undefined, fetch).getPosts({
|
||||||
? cached.data
|
|
||||||
: await getClient(undefined, fetch).getPosts({
|
|
||||||
limit: 20,
|
limit: 20,
|
||||||
page: page,
|
page: page,
|
||||||
sort: sort,
|
sort: sort,
|
||||||
@@ -31,12 +30,18 @@ export async function load({ url, fetch }) {
|
|||||||
page_cursor: cursor,
|
page_cursor: cursor,
|
||||||
show_hidden: settings.posts.showHidden,
|
show_hidden: settings.posts.showHidden,
|
||||||
})
|
})
|
||||||
|
: cached.data
|
||||||
|
|
||||||
if (
|
if (
|
||||||
!(cached && url.searchParams.toString() == cached.params.toString()) &&
|
shouldReload(cached, url.searchParams.toString(), get(instance)) &&
|
||||||
browser
|
browser
|
||||||
)
|
)
|
||||||
_posts.set({ data: posts, params: url.searchParams, lastSeen: 0 })
|
_posts.set({
|
||||||
|
data: posts,
|
||||||
|
params: url.searchParams,
|
||||||
|
lastSeen: 0,
|
||||||
|
instance: get(instance),
|
||||||
|
})
|
||||||
|
|
||||||
try {
|
try {
|
||||||
return {
|
return {
|
||||||
|
|||||||
Reference in new issue
Block a user