From 82a8747ad4907e526c087b98a500317c53567739 Mon Sep 17 00:00:00 2001 From: James Xylight Date: Fri, 12 Sep 2025 17:09:31 -0700 Subject: [PATCH] feat [2/3]: add feed viewing --- .../lemmy/community/CommunityHeader.svelte | 2 +- src/lib/components/ui/EntityHeader.svelte | 9 +- .../components/ui/layout/pages/Header.svelte | 16 ++- src/lib/lemmy/feeds/feed.svelte.ts | 17 ++- src/routes/f/[id]/+page.svelte | 130 ++++++++++++++++++ src/routes/f/[id]/+page.ts | 38 +++++ 6 files changed, 202 insertions(+), 10 deletions(-) create mode 100644 src/routes/f/[id]/+page.svelte create mode 100644 src/routes/f/[id]/+page.ts diff --git a/src/lib/components/lemmy/community/CommunityHeader.svelte b/src/lib/components/lemmy/community/CommunityHeader.svelte index 00550aa2..2438f840 100644 --- a/src/lib/components/lemmy/community/CommunityHeader.svelte +++ b/src/lib/components/lemmy/community/CommunityHeader.svelte @@ -50,7 +50,7 @@ blocked?: boolean banner?: boolean class?: string - compact?: 'lg' + compact?: 'always' | 'lg' avatarCircle?: boolean } diff --git a/src/lib/components/ui/EntityHeader.svelte b/src/lib/components/ui/EntityHeader.svelte index 67955195..72029454 100644 --- a/src/lib/components/ui/EntityHeader.svelte +++ b/src/lib/components/ui/EntityHeader.svelte @@ -22,7 +22,7 @@ nameDetail?: import('svelte').Snippet actions?: import('svelte').Snippet children?: import('svelte').Snippet - compact?: 'lg' + compact?: 'always' | 'lg' avatarCircle?: boolean } @@ -48,6 +48,7 @@
@@ -80,7 +81,7 @@ !avatarCircle && 'rounded-3xl!', ]} /> -
+
{#each stats as stat} @@ -136,6 +138,7 @@
-

- {@render children?.()} -

+ {#if children} +

+ {@render children?.()} +

+ {/if} {#if extended}
{@render extended?.()} diff --git a/src/lib/lemmy/feeds/feed.svelte.ts b/src/lib/lemmy/feeds/feed.svelte.ts index e323ede9..154d7923 100644 --- a/src/lib/lemmy/feeds/feed.svelte.ts +++ b/src/lib/lemmy/feeds/feed.svelte.ts @@ -3,6 +3,7 @@ import { profile } from '$lib/auth.svelte' import type { CommentView, CommunityView, + FeedView, GetComments, GetCommunityResponse, GetPersonDetails, @@ -48,7 +49,7 @@ export class Feed { } } -interface FeedTypes { +export interface FeedTypes { '/': [ GetPosts, { @@ -94,6 +95,20 @@ interface FeedTypes { params: { posts: GetPost; comments: GetComments } }, ] + '/f/[id]': [ + GetPosts, + + { + posts: PostView[] + next_page?: string + params: GetPosts + feed: Promise + client: { + itemHeights?: (number | null)[] + lastSeen?: number + } + }, + ] } const feeds = new SvelteMap>() diff --git a/src/routes/f/[id]/+page.svelte b/src/routes/f/[id]/+page.svelte new file mode 100644 index 00000000..2916fe92 --- /dev/null +++ b/src/routes/f/[id]/+page.svelte @@ -0,0 +1,130 @@ + + + + + {title} + + + +
+
+ {#snippet extended()} +
+ {#await data.feed} + + {:then feed} + {#if feed} + + {#snippet nameDetail()} +

{feed.name}

+ {/snippet} + {#if feed.communities} + + {#snippet title()} + {$t('content.communities')} + {/snippet} + ({ + id: i.id, + name: i.title, + url: communityLink(i), + avatar: i.icon, + instance: new SvelteURL(i.actor_id).hostname, + }))} + /> + + {/if} +
+ {/if} + {/await} +
+
+
+ + + + +
+
+ {/snippet} +
+ + data.client.lastSeen ?? 0, (v) => (data.client.lastSeen = v) + } + bind:params={data.params} + virtualList={{ itemHeights: data.client?.itemHeights ?? [] }} + /> + + + typeof page == 'number' ? `?page=${page}` : `?cursor=${page}`} + back={false} + /> + +
diff --git a/src/routes/f/[id]/+page.ts b/src/routes/f/[id]/+page.ts new file mode 100644 index 00000000..a967d1dd --- /dev/null +++ b/src/routes/f/[id]/+page.ts @@ -0,0 +1,38 @@ +import { client } from '$lib/client/lemmy.svelte.js' +import type { SortType } from '$lib/client/types' +import { feed } from '$lib/lemmy/feeds/feed.svelte.js' +import { settings } from '$lib/settings.svelte.js' +import { error } from '@sveltejs/kit' + +export async function load({ url, fetch, route, params }) { + const piefed = client({ func: fetch }) + + if (!piefed.getFeeds) error(404, 'unsupported') + + const sort: SortType = + (url.searchParams.get('sort') as SortType) || settings.defaultSort.sort + + const cursor = url.searchParams.get('cursor') as string | undefined + + const feedData = await feed(route.id, async (p) => { + const piefedFeedData = piefed.getFeeds!({ include_communities: true }).then( + (i) => i.feeds.find((j) => j.id.toString() == p.feed_id!), + ) + + return { + ...(await piefed.getPosts(p)), + feed: piefedFeedData, + params: p, + client: {}, + } + }).load({ + page_cursor: cursor, + sort: sort, + type_: 'All', + limit: 20, + show_hidden: settings.posts.showHidden, + feed_id: params.id, + }) + + return feedData +}