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
+36 -17

No files matched your search

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