diff --git a/bun.lockb b/bun.lockb index 316d8979..6291353c 100755 Binary files a/bun.lockb and b/bun.lockb differ diff --git a/src/lib/components/lemmy/post/Post.svelte b/src/lib/components/lemmy/post/Post.svelte index 2ab5260d..13099400 100644 --- a/src/lib/components/lemmy/post/Post.svelte +++ b/src/lib/components/lemmy/post/Post.svelte @@ -83,6 +83,7 @@ + {/if} {#if actions} diff --git a/src/lib/components/lemmy/post/PostActions.svelte b/src/lib/components/lemmy/post/PostActions.svelte index c7c59e4f..607924fe 100644 --- a/src/lib/components/lemmy/post/PostActions.svelte +++ b/src/lib/components/lemmy/post/PostActions.svelte @@ -116,7 +116,7 @@ {/await} {/if} -
@@ -398,4 +398,4 @@ {/if} {/if} -
+ diff --git a/src/lib/components/lemmy/post/PostBody.svelte b/src/lib/components/lemmy/post/PostBody.svelte index 7a9c6069..4e9789f0 100644 --- a/src/lib/components/lemmy/post/PostBody.svelte +++ b/src/lib/components/lemmy/post/PostBody.svelte @@ -7,6 +7,10 @@ export let body: string export let view: View = 'cozy' export let clickThrough = false + let htmlElement = 'div' + + export { htmlElement as element } + let expanded = false let element: Element @@ -25,7 +29,8 @@ $: overflows = isOverflown(element, body) -
{#if user} - - - {#if badges.moderator} - - {/if} - {#if badges.admin} - - {/if} - - +
+ + + {#if badges.moderator} + + {/if} + {#if badges.admin} + + {/if} + + +
{/if} {#if published} @@ -251,7 +253,7 @@ {/if}
- + {#if title && id} + {/if} + + diff --git a/src/lib/components/lemmy/post/media/PostMedia.svelte b/src/lib/components/lemmy/post/media/PostMedia.svelte index 1481bde4..ee8e773e 100644 --- a/src/lib/components/lemmy/post/media/PostMedia.svelte +++ b/src/lib/components/lemmy/post/media/PostMedia.svelte @@ -16,20 +16,13 @@ import { Button, Material, modal } from 'mono-svelte' import { onMount } from 'svelte' import { ArrowDownTray, Icon } from 'svelte-hero-icons' + import PostImage from './PostImage.svelte' export let view: 'card' | 'cozy' | 'list' | 'compact' = 'cozy' export let post: Post export let type: MediaType = 'none' export let opened: boolean | undefined = undefined export let blur: boolean = post.nsfw && $userSettings.nsfwBlur - - let showAltText = false - - let imageLoaded: boolean | null = null - - onMount(() => { - imageLoaded = false - }) {#if type == 'image'} - {#if view == 'card' || view == 'cozy'} - - showImage(bestImageURL(post, false, 2048))} - role="button" - tabindex="0" - > - - - - - - - - - {post.alt_text (imageLoaded = true)} - /> - - - -
{}} - > - - {#if post.alt_text} - - {/if} -
-
- {/if} + {:else if (type == 'iframe' || type == 'video') && (view == 'cozy' || view == 'card') && post.url} { + const optimizeUrl = ( + url: string | undefined, + res: number + ): string | undefined => { if (url === undefined) return try { const urlObj = new URL(url) urlObj.searchParams.append('format', 'webp') - urlObj.searchParams.append( - 'thumbnail', - findClosestNumber(sizes, (res || width) * 1.5).toString() - ) + if (res > -1) { + urlObj.searchParams.append( + 'thumbnail', + findClosestNumber(sizes, res).toString() + ) + } return urlObj.toString() } catch (e) { @@ -30,13 +35,16 @@ } } - $: optimizedURL = optimizeUrl(url) + $: optimizedURLs = [2, 3, 6, -1].map((n) => + optimizeUrl(url, (res || width) * n) + ) -{#if optimizedURL} +{#if optimizedURLs} {:else}
-
-
{$t('routes.accounts')}
-
-
-
- - {#if !LINKED_INSTANCE_URL} - - {/if} + {#if !LINKED_INSTANCE_URL} + + {/if} +
-
+ i.instance} let:items> {