diff --git a/src/routes/+page.ts b/src/routes/+page.ts index f8aaef9d..7e3c5bdb 100644 --- a/src/routes/+page.ts +++ b/src/routes/+page.ts @@ -8,7 +8,7 @@ import { feature } from '$lib/version.js' export async function load({ url, fetch }) { const cursor = url.searchParams.get('cursor') as string | undefined - const page = Number(url.searchParams.get('page') || 1) || 1 + const page = Number(url.searchParams.get('page')) || undefined const sort: SortType = (url.searchParams.get('sort') as SortType) || @@ -29,7 +29,7 @@ export async function load({ url, fetch }) { return { sort: sort, listingType: listingType, - page: page, + page: page || 1, posts: posts, next_page: posts.next_page } diff --git a/src/routes/c/[name]/+layout.ts b/src/routes/c/[name]/+layout.ts index 89689fd3..e891aa21 100644 --- a/src/routes/c/[name]/+layout.ts +++ b/src/routes/c/[name]/+layout.ts @@ -5,7 +5,8 @@ import type { ListingType, SortType } from 'lemmy-js-client' import { get } from 'svelte/store' export async function load(req: any) { - const page = Number(req.url.searchParams.get('page') || 1) || 1 + const cursor: string | undefined = req.url.searchParams.get('cursor') + const page = Number(req.url.searchParams.get('page')) || undefined const sort: SortType = (req.url.searchParams.get('sort') as SortType) || @@ -13,12 +14,13 @@ export async function load(req: any) { return { sort: sort, - page: page, + page: page || 1, posts: getClient(undefined, req.fetch).getPosts({ limit: 40, community_name: req.params.name, page: page, sort: sort, + page_cursor: cursor }), community: getClient(undefined, req.fetch).getCommunity({ name: req.params.name, diff --git a/src/routes/c/[name]/+page.svelte b/src/routes/c/[name]/+page.svelte index a84a0332..951dcdd3 100644 --- a/src/routes/c/[name]/+page.svelte +++ b/src/routes/c/[name]/+page.svelte @@ -89,6 +89,8 @@ searchParam($page.url, 'cursor', c.detail)} on:change={(p) => searchParam($page.url, 'page', p.detail.toString())} > {#if data.posts.posts.length > 0}