diff --git a/src/lib/components/lemmy/post/helpers.ts b/src/lib/components/lemmy/post/helpers.ts index c35d7f40..1bb33f02 100644 --- a/src/lib/components/lemmy/post/helpers.ts +++ b/src/lib/components/lemmy/post/helpers.ts @@ -36,10 +36,10 @@ export const optimizeImageURL = ( try { const url = new URL(urlStr) - url.searchParams.append('format', 'webp') + if (!url.searchParams.has('format')) url.searchParams.set('format', 'webp') - if (width > 0) { - url.searchParams.append( + if (width > 0 && !url.searchParams.has('thumbnail')) { + url.searchParams.set( 'thumbnail', findClosestNumber( [128, 196, 256, 512, 728, 1024, 1536], @@ -48,6 +48,10 @@ export const optimizeImageURL = ( ) } + if (width == -1) { + url.searchParams.delete('thumbnail') + } + return url.toString() } catch (e) { console.log(e) @@ -74,7 +78,8 @@ export const mediaType = (url?: string, view: View = 'cozy'): MediaType => { if (isImage(url)) return 'image' if (isVideo(url)) return 'iframe' if (isYoutubeLink(url)) return 'iframe' - return 'embed' + if (URL.canParse(url)) return 'embed' + return 'none' } return 'none' diff --git a/src/lib/components/markdown/renderers/MdImage.svelte b/src/lib/components/markdown/renderers/MdImage.svelte index e8fba1b6..b3d0e661 100644 --- a/src/lib/components/markdown/renderers/MdImage.svelte +++ b/src/lib/components/markdown/renderers/MdImage.svelte @@ -11,11 +11,13 @@ export let title: string | undefined = undefined export let text: string = '' + console.log(href) + $: type = mediaType(href, 'cozy')
{#if type == 'video' || type == 'embed' || type == 'iframe'} @@ -27,12 +29,15 @@ class="w-full" /> {:else} - {/if} diff --git a/src/lib/ui/image.ts b/src/lib/ui/image.ts index 69c95a75..61003f8c 100644 --- a/src/lib/ui/image.ts +++ b/src/lib/ui/image.ts @@ -2,7 +2,7 @@ export const isImage = (url: string | undefined) => { try { if (!url) return false - return /\.(jpeg|jpg|gif|png|svg|bmp|webp)$/i.test(url) + return /\.(jpeg|jpg|gif|png|svg|bmp|webp|avif)/i.test(url) } catch (err) { return false } @@ -12,7 +12,7 @@ export const isVideo = (url: string | undefined) => { try { if (!url) return false - return /\.(mp4|mov|webm|mkv)$/i.test(url) + return /\.(mp4|mov|webm|mkv|avi)/i.test(url) } catch (err) { return false } diff --git a/src/routes/inbox/InboxItem.svelte b/src/routes/inbox/InboxItem.svelte index 3de105ea..824776e4 100644 --- a/src/routes/inbox/InboxItem.svelte +++ b/src/routes/inbox/InboxItem.svelte @@ -107,14 +107,14 @@ on:click={() => markAsRead(!item.read)} title={$t('post.actions.more.markRead')} > - + {/if} {#if item.type == 'private_message'} {#if item.item.creator.id != $profile?.user?.local_user_view.person.id} {/if} {:else} @@ -123,7 +123,7 @@ href="/comment/{item.item.comment.id}" size="square-md" > - + {/if}