From aea47580bf5a52ef962595a6f380fc2eeb794fae Mon Sep 17 00:00:00 2001 From: Xylight Date: Tue, 3 Sep 2024 17:02:44 -0700 Subject: [PATCH] impr: make post semantics better --- bun.lockb | Bin 179355 -> 179355 bytes src/lib/components/lemmy/post/Post.svelte | 8 +- .../components/lemmy/post/PostActions.svelte | 4 +- src/lib/components/lemmy/post/PostBody.svelte | 9 +- src/lib/components/lemmy/post/PostMeta.svelte | 28 ++--- src/lib/components/lemmy/post/PostVote.svelte | 8 ++ src/lib/components/lemmy/post/helpers.ts | 15 +-- .../lemmy/post/link/PostLink.svelte | 14 +-- .../lemmy/post/media/PostImage.svelte | 94 +++++++++++++++++ .../lemmy/post/media/PostMedia.svelte | 98 +----------------- src/lib/components/ui/Avatar.svelte | 24 +++-- src/lib/i18n/en.json | 9 ++ src/routes/accounts/+page.svelte | 30 +++--- 13 files changed, 178 insertions(+), 163 deletions(-) create mode 100644 src/lib/components/lemmy/post/media/PostImage.svelte diff --git a/bun.lockb b/bun.lockb index 316d8979a1caa1958c2902692de09dd9ae4d30df..6291353c43cf40c1028dacfc808d2c7e8148fe6c 100755 GIT binary patch delta 143 zcmV;A0C4}C`3jr)3Xm=!8GmkS1Tpwu`Mos8m)F=;PqR^{f{OM3!T=SvB)E<5u}&&v z0T+{@9Ve6E9SF0iWc8~+!Dmp`eg5(C9>_Q`^TsTXVD{Aro^kY^{V0d73vWl>;rsGL x%5jDiB#lS+P27pcxSaR!wSn+Iis@<;*PXa1hushXx7`o|oOS^-w|a*HAvMEDNp=7L delta 141 zcmV;80CNAE`3jr)3Xm=!)b}zg7^_YVmk~yYQ+UWe!@s@>0T*}gZ*XsT&?i!Ru}&&v zlXOlfli(c)v#4bCt3ZpTf+7`Af(V71l4;hrI%Wp)>L3r)52F$7a1iRiGQ__e)hs_u vBGY2yc56OF*<0r+3b&UDc(je3XO5CON{5CWWb0Wr6FhXNrr!B#+P 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> {