diff --git a/src/lib/components/lemmy/post/feed/VirtualFeed.svelte b/src/lib/components/lemmy/post/feed/VirtualFeed.svelte index 2b5843df..293d4679 100644 --- a/src/lib/components/lemmy/post/feed/VirtualFeed.svelte +++ b/src/lib/components/lemmy/post/feed/VirtualFeed.svelte @@ -23,6 +23,7 @@ Icon, } from 'svelte-hero-icons' import InfiniteScroll from 'svelte-infinite-scroll' + import { SvelteSet } from 'svelte/reactivity' interface Props { posts: PostView[] @@ -50,6 +51,9 @@ let hasMore = $state(true) const abortLoad = new AbortController() + let seenIds = new SvelteSet( + feedData.posts.posts.map(post => post.post.id), + ) async function loadMore() { if (!hasMore || loading) return @@ -82,15 +86,14 @@ hasMore = newPosts.posts.length != 0 - let postIds: number[] = [] - let duplicates: number[] = [] - for (const post of newPosts.posts) { - if (postIds.includes(post.post.id)) duplicates.push(post.post.id) - else postIds.push(post.post.id) - } - feedData.cursor.next = newPosts.next_page - feedData.posts.posts.push(...newPosts.posts) + feedData.posts.posts.push( + ...newPosts.posts.filter(post => { + if (seenIds.has(post.post.id)) return false + seenIds.add(post.post.id) + return true + }), + ) postFeeds.value[feedId].data = feedData diff --git a/src/routes/post/[instance]/[id=integer]/+page.svelte b/src/routes/post/[instance]/[id=integer]/+page.svelte index f983e535..7aac7fda 100644 --- a/src/routes/post/[instance]/[id=integer]/+page.svelte +++ b/src/routes/post/[instance]/[id=integer]/+page.svelte @@ -20,7 +20,7 @@ import { settings } from '$lib/settings.svelte.js' import { isImage } from '$lib/ui/image.js' import { Button, toast } from 'mono-svelte' - import { onMount, untrack } from 'svelte' + import { onMount } from 'svelte' import { ArrowLeft, ArrowRight, @@ -65,10 +65,8 @@ $effect(() => { if (data.cachedFeed && data.post.value.post_view) { - untrack(() => { - const { id, index } = data.cachedFeed! - postFeeds.value[id].data.posts.posts[index] = data.post.value.post_view - }) + const { id, index } = data.cachedFeed! + postFeeds.value[id].data.posts.posts[index] = data.post.value.post_view } })