diff --git a/src/lib/components/lemmy/post/media/PostImage.svelte b/src/lib/components/lemmy/post/media/PostImage.svelte index 87f81e1b..70d1ca2f 100644 --- a/src/lib/components/lemmy/post/media/PostImage.svelte +++ b/src/lib/components/lemmy/post/media/PostImage.svelte @@ -67,7 +67,7 @@ /> {/each} {/each} + import { browser } from '$app/environment' + import { page } from '$app/state' + import type { GetPosts, ListingType, PostView } from '$lib/client/types' + import Location from '$lib/components/lemmy/dropdowns/Location.svelte' + import Sort from '$lib/components/lemmy/dropdowns/Sort.svelte' + import ViewSelect from '$lib/components/lemmy/dropdowns/ViewSelect.svelte' + import { PostFeed, VirtualFeed } from '$lib/components/lemmy/post' + import { Header } from '$lib/components/ui/layout' + import Pageination from '$lib/components/ui/layout/Pageination.svelte' + import { settings } from '$lib/settings.svelte.js' + import type { SortType } from 'lemmy-js-client' + import Button from 'mono-svelte/button/Button.svelte' + import type { Snippet } from 'svelte' + import { ArrowRight, Icon } from 'svelte-hero-icons' + + interface Props { + posts: PostView[] + cursor?: string + params: { + location?: ListingType + sort?: SortType + } + title?: string + extended?: Snippet + getParams: GetPosts + client: { + lastSeen?: number + itemHeights?: (number | null)[] + } + header?: boolean + } + + let { + params, + posts = $bindable(), + cursor = $bindable(), + title, + extended: passedExtended, + getParams, + client = $bindable(), + header = true, + }: Props = $props() + + $effect(() => { + if (params.sort) settings.defaultSort.sort = params.sort + }) + + const FeedComponent = $derived( + settings.infiniteScroll && browser && !settings.posts.noVirtualize + ? VirtualFeed + : PostFeed, + ) + + +
+ {#if header} +
+ {#if title} + {title} + {/if} + {#snippet extended()} + {@render passedExtended?.()} +
+
+ {#if params.location} + + {/if} + {#if params.sort} + + {/if} + + + +
+
+ {/snippet} +
+ {/if} + + client.lastSeen ?? 0, (v) => (client.lastSeen = v)} + bind:params={getParams} + virtualList={{ itemHeights: client?.itemHeights ?? [] }} + /> + + + typeof page == 'number' ? `?page=${page}` : `?cursor=${page}`} + back={false} + /> + +
diff --git a/src/lib/components/ui/navbar/Navbar.svelte b/src/lib/components/ui/navbar/Navbar.svelte index ecea4f8a..f9a36c29 100644 --- a/src/lib/components/ui/navbar/Navbar.svelte +++ b/src/lib/components/ui/navbar/Navbar.svelte @@ -91,9 +91,10 @@ /> {/if} path.startsWith('/explore')} /> + client: { + itemHeights?: (number | null)[] + lastSeen?: number + } + }, + ] } const feeds = new SvelteMap>() diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte index 07aec680..deb16929 100644 --- a/src/routes/+page.svelte +++ b/src/routes/+page.svelte @@ -1,28 +1,20 @@ - + diff --git a/src/routes/f/[id]/+page.svelte b/src/routes/f/[id]/+page.svelte index 2916fe92..42f18a40 100644 --- a/src/routes/f/[id]/+page.svelte +++ b/src/routes/f/[id]/+page.svelte @@ -1,21 +1,12 @@ @@ -44,87 +25,50 @@ -
-
- {#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} - /> - -
+ + {#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} +
diff --git a/src/routes/post/[instance]/[id=integer]/+page.ts b/src/routes/post/[instance]/[id=integer]/+page.ts index ca3f2659..c2adefa6 100644 --- a/src/routes/post/[instance]/[id=integer]/+page.ts +++ b/src/routes/post/[instance]/[id=integer]/+page.ts @@ -25,15 +25,28 @@ function buildContext(thread?: string) { return { parentId, showContext, max_depth, focus: thread?.split('.').at(-1) } } -function findInFeed(id: '/' | '/c/[name]', postId: string) { - return feed(id, async (p) => ({ - // this will never run - ...(await client().getPosts(p)), - client: {}, - params: p, - })) - .peek() - ?.posts.find((i) => i.post.id.toString() == postId) +async function findInFeed(id: '/' | '/c/[name]' | '/f/[id]', postId: string) { + // this never actually loads anything + if (id == '/') { + const resolved = feed(id, async (p) => ({ + posts: (await client().getPosts(p)).posts, + client: {}, + params: p, + })).peek() + + return resolved + ? resolved?.posts?.find((i) => i.post.id.toString() == postId) + : undefined + } else { + return feed(id, async (p) => ({ + ...(await client().getPosts(p)), + client: {}, + params: p, + community: await client().getCommunity({}), + })) + .peek() + ?.posts.find((i) => i.post.id.toString() == postId) + } } export async function load({ params, url, route }) { @@ -44,7 +57,9 @@ export async function load({ params, url, route }) { const sort = settings?.defaultSort?.comments ?? 'Hot' const cachedPost = - findInFeed('/', params.id) ?? findInFeed('/c/[name]', params.id) + (await findInFeed('/', params.id)) ?? + (await findInFeed('/c/[name]', params.id)) ?? + (await findInFeed('/f/[id]', params.id)) const { parentId, diff --git a/src/routes/topic/[id]/+page.svelte b/src/routes/topic/[id]/+page.svelte new file mode 100644 index 00000000..895e433c --- /dev/null +++ b/src/routes/topic/[id]/+page.svelte @@ -0,0 +1,68 @@ + + + + + {title} + + + + + {#snippet extended()} +
+ {#await data.topic} + + {:then topic} + {#if topic} + + {#snippet nameDetail()} +

{topic.name}

+ {/snippet} + {#if topic.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} +
diff --git a/src/routes/topic/[id]/+page.ts b/src/routes/topic/[id]/+page.ts new file mode 100644 index 00000000..cf9b9203 --- /dev/null +++ b/src/routes/topic/[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.getTopics) 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 piefedTopicData = piefed.getTopics!({ + include_communities: true, + }).then((i) => i.topics.find((j) => j.id.toString() == p.topic_id!)) + + return { + ...(await piefed.getPosts(p)), + topic: piefedTopicData, + params: p, + client: {}, + } + }).load({ + page_cursor: cursor, + sort: sort, + type_: 'All', + limit: 20, + show_hidden: settings.posts.showHidden, + topic_id: params.id, + }) + + return feedData +}