diff --git a/src/lib/components/lemmy/post/Post.svelte b/src/lib/components/lemmy/post/Post.svelte index 6976521f..88e1be40 100644 --- a/src/lib/components/lemmy/post/Post.svelte +++ b/src/lib/components/lemmy/post/Post.svelte @@ -68,11 +68,6 @@ view != 'compact' && type != 'iframe', ) - let hideBody = $derived( - settings.posts.deduplicateEmbed && - post.post.embed_description == post.post.body && - view != 'compact', - ) let badges = $derived({ deleted: post.post.deleted, @@ -154,7 +149,7 @@ /> {/if} {/key} - {#if post.post.body && !post.post.nsfw && view != 'compact' && !hideBody && rule != 'hide'} + {#if post.post.body && !post.post.nsfw && view != 'compact'} diff --git a/src/lib/components/lemmy/post/PostVote.svelte b/src/lib/components/lemmy/post/PostVote.svelte index 7b9953bb..632b34e8 100644 --- a/src/lib/components/lemmy/post/PostVote.svelte +++ b/src/lib/components/lemmy/post/PostVote.svelte @@ -35,15 +35,15 @@ upvotes?: number downvotes?: number showCounts?: boolean - children?: import('svelte').Snippet<[{ vote: number; score: number }]> + children?: import('svelte').Snippet<[{ vote?: number; score?: number }]> } let { post = $bindable(), - vote = $bindable(0), + vote = $bindable(), score = $bindable(), - upvotes = $bindable(0), - downvotes = $bindable(0), + upvotes = $bindable(), + downvotes = $bindable(), showCounts = true, children, }: Props = $props() @@ -99,7 +99,7 @@ out:fly={{ duration: 400, y: 10, easing: backOut }} aria-label={$t('aria.vote.upvotes', { default: upvotes })} > - + {/key} @@ -127,7 +127,7 @@ out:fly={{ duration: 400, y: 10, easing: backOut }} aria-label={$t('aria.vote.downvotes', { default: downvotes })} > - + {/key} diff --git a/src/lib/components/lemmy/post/feed/VirtualFeed.svelte b/src/lib/components/lemmy/post/feed/VirtualFeed.svelte index 0727d740..697deba8 100644 --- a/src/lib/components/lemmy/post/feed/VirtualFeed.svelte +++ b/src/lib/components/lemmy/post/feed/VirtualFeed.svelte @@ -50,6 +50,7 @@ let hasMore = $state(true) async function loadMore() { + console.log(hasMore, loading) if (!hasMore || loading) return try { @@ -255,7 +256,14 @@ {/if} - + { + console.log('loadMore triggered') + loadMore() + }} + /> {/if} {@render children?.()} diff --git a/src/lib/components/render/VirtualList.svelte b/src/lib/components/render/VirtualList.svelte index 6a207985..7d6d6848 100644 --- a/src/lib/components/render/VirtualList.svelte +++ b/src/lib/components/render/VirtualList.svelte @@ -1,7 +1,7 @@ { if (type) settings.defaultSort.feed = type @@ -62,8 +63,8 @@ data.feed.value, v => (postFeeds.value.main.data = v)} feedId="main" /> typeof page == 'number' ? `?page=${page}` : `?cursor=${page}`} back={false} diff --git a/src/routes/+page.ts b/src/routes/+page.ts index 4598836e..c326a0d2 100644 --- a/src/routes/+page.ts +++ b/src/routes/+page.ts @@ -1,5 +1,6 @@ import { t } from '$lib/i18n/translations.js' import { postFeed } from '$lib/lemmy/postfeed.svelte.js' +import { ReactiveState } from '$lib/promise.svelte.js' import { settings } from '$lib/settings.svelte' import type { ListingType, SortType } from 'lemmy-js-client' import { ChevronDoubleUp } from 'svelte-hero-icons' @@ -13,18 +14,20 @@ export async function load({ url, fetch }) { (url.searchParams.get('type') as ListingType) || settings.defaultSort.feed return { - feed: 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: [ { diff --git a/src/routes/AIButton.svelte b/src/routes/AIButton.svelte deleted file mode 100644 index ade71493..00000000 --- a/src/routes/AIButton.svelte +++ /dev/null @@ -1,33 +0,0 @@ - - - - {#snippet target()} - - {/snippet} - {#snippet popover()} - -

AI !!!!

-
- {/snippet} -
- - diff --git a/src/routes/post/[instance]/[id=integer]/+page.svelte b/src/routes/post/[instance]/[id=integer]/+page.svelte index 04f61c54..7ec4f8ea 100644 --- a/src/routes/post/[instance]/[id=integer]/+page.svelte +++ b/src/routes/post/[instance]/[id=integer]/+page.svelte @@ -116,7 +116,7 @@ toast({ content: 'The post was edited successfully.',