cleanup: switch to state-based post feeds

This commit is contained in:
James Xylight committed 2025-03-08 13:06:17 -08:00
1 parent 0236928bb9
commit 897a3c363c
10 files changed
+79 -85

No files matched your search

+8 -4
View File
@@ -19,8 +19,8 @@
let { data = $bindable() } = $props()
let type = $state(data.type_)
let sort = $state(data.sort)
let type = $state(data.feed.value.type_)
let sort = $state(data.feed.value.sort)
$effect(() => {
if (type) settings.defaultSort.feed = type
@@ -61,7 +61,11 @@
</Header>
</header>
<FeedComponent bind:posts={data.posts.posts} feedData={data} feedId="main" />
<FeedComponent
bind:posts={data.feed.value.posts.posts}
bind:feedData={data.feed.value}
feedId="main"
/>
<svelte:element
this={settings.infiniteScroll && !settings.posts.noVirtualize
? 'noscript'
@@ -69,7 +73,7 @@
class="mt-auto"
>
<Pageination
cursor={{ next: data.cursor.next }}
cursor={{ next: data.feed.value.cursor.next }}
href={(page) =>
typeof page == 'number' ? `?page=${page}` : `?cursor=${page}`}
>
+20 -13
View File
@@ -1,8 +1,13 @@
import { settings } from '$lib/settings.svelte'
import type { GetPostsResponse, ListingType, SortType } from 'lemmy-js-client'
import { postFeed, postFeeds, shouldReload } from '$lib/lemmy/postfeed.js'
import {
postFeed,
postFeeds,
shouldReload,
} from '$lib/lemmy/postfeed.svelte.js'
import { t } from '$lib/translations.js'
import { ChevronDoubleUp } from 'svelte-hero-icons'
import { ReactiveState } from '$lib/promise.svelte.js'
export async function load({ url, fetch }) {
const cursor = url.searchParams.get('cursor') as string | undefined
@@ -14,18 +19,20 @@ export async function load({ url, fetch }) {
(url.searchParams.get('type') as ListingType) || settings.defaultSort.feed
return {
...(await postFeed({
id: 'main',
request: {
page_cursor: cursor,
sort: sort,
type_: listingType,
limit: 20,
show_hidden: settings.posts.showHidden,
},
url: url,
fetch: fetch,
})),
feed: new ReactiveState(
await postFeed({
id: 'main',
request: {
page_cursor: cursor,
sort: sort,
type_: listingType,
limit: 20,
show_hidden: settings.posts.showHidden,
},
url: url,
fetch: fetch,
}),
),
contextual: {
actions: [
{
+1 -1
View File
@@ -1,4 +1,4 @@
import { postFeed } from '$lib/lemmy/postfeed.js'
import { postFeed } from '$lib/lemmy/postfeed.svelte.js'
import { settings } from '$lib/settings.svelte'
import type { SortType } from 'lemmy-js-client'
import { get } from 'svelte/store'
+1 -1
View File
@@ -1,5 +1,5 @@
import { client } from '$lib/lemmy.svelte.js'
import { postFeed } from '$lib/lemmy/postfeed.js'
import { postFeed } from '$lib/lemmy/postfeed.svelte.js'
import { error } from '@sveltejs/kit'
export async function load({ url, params, fetch }) {