fix: duplicated posts, close #359

This commit is contained in:
Xylight committed 2024-07-11 11:45:16 -07:00
1 parent 471ffd360e
commit 1a08d0238e
2 files changed
+26 -7

No files matched your search

+13 -4
View File
@@ -1,6 +1,14 @@
<script lang="ts" context="module"> <script lang="ts" context="module">
export interface CachedPosts { export interface CachedPosts {
data: GetPostsResponse data: {
sort: SortType
listingType: ListingType
page: number
posts: GetPostsResponse
cursor: {
next: string | undefined
}
}
params: URLSearchParams params: URLSearchParams
lastSeen: number lastSeen: number
instance: string instance: string
@@ -37,7 +45,7 @@
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 { get, writable } from 'svelte/store' import { get, writable } from 'svelte/store'
import type { GetPostsResponse } from 'lemmy-js-client' import type { GetPostsResponse, ListingType, SortType } 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'
@@ -58,6 +66,7 @@
try { try {
loading = true loading = true
console.log(`loading more with cursor ${data.cursor.next}`)
const newPosts = await getClient() const newPosts = await getClient()
.getPosts({ .getPosts({
limit: limit, limit: limit,
@@ -78,7 +87,7 @@
data.posts.posts = [...data.posts.posts, ...newPosts.posts] data.posts.posts = [...data.posts.posts, ...newPosts.posts]
_posts.update((ps) => ({ _posts.update((ps) => ({
data: data.posts, data: data,
params: ps.params, params: ps.params,
lastSeen: ps.lastSeen, lastSeen: ps.lastSeen,
instance: ps.instance, instance: ps.instance,
@@ -195,7 +204,7 @@
> >
<Pageination <Pageination
page={data.page} page={data.page}
cursor={{ next: data.cursor.next, back: data.cursor.back }} cursor={{ next: data.cursor.next }}
on:change={(p) => searchParam($page.url, 'page', p.detail.toString())} on:change={(p) => searchParam($page.url, 'page', p.detail.toString())}
on:cursor={(c) => { on:cursor={(c) => {
searchParam($page.url, 'cursor', c.detail) searchParam($page.url, 'cursor', c.detail)
+13 -3
View File
@@ -30,21 +30,30 @@ export async function load({ url, fetch }) {
page_cursor: cursor, page_cursor: cursor,
show_hidden: settings.posts.showHidden, show_hidden: settings.posts.showHidden,
}) })
: cached.data : cached.data.posts
if ( if (
shouldReload(cached, url.searchParams.toString(), get(instance)) && shouldReload(cached, url.searchParams.toString(), get(instance)) &&
browser browser
) )
_posts.set({ _posts.set({
data: posts, data: {
sort: sort,
listingType: listingType,
page: page || 1,
posts: posts,
cursor: {
next: posts.next_page,
},
},
params: url.searchParams, params: url.searchParams,
lastSeen: 0, lastSeen: 0,
instance: get(instance), instance: get(instance),
}) })
try { try {
return { return shouldReload(cached, url.searchParams.toString(), get(instance))
? {
sort: sort, sort: sort,
listingType: listingType, listingType: listingType,
page: page || 1, page: page || 1,
@@ -55,6 +64,7 @@ export async function load({ url, fetch }) {
current: cursor, current: cursor,
}, },
} }
: cached.data
} catch (err) { } catch (err) {
error(500, { error(500, {
message: 'Failed to fetch homepage.', message: 'Failed to fetch homepage.',