From e259ed4582906edb7251afb543b464529b92c025 Mon Sep 17 00:00:00 2001 From: Xyphyn Date: Wed, 6 Sep 2023 18:40:11 -0700 Subject: [PATCH] feat: add option to expand images, close #91, close #128, close #121 --- package.json | 2 +- src/lib/components/helper/Empty.svelte | 1 + src/lib/components/lemmy/post/Post.svelte | 105 +++++++++++-------- src/lib/components/lemmy/post/helpers.ts | 21 +++- src/lib/components/ui/ExpandableImage.svelte | 49 +++++++++ src/lib/settings.ts | 2 + src/routes/settings/+page.svelte | 9 ++ 7 files changed, 142 insertions(+), 47 deletions(-) create mode 100644 src/lib/components/helper/Empty.svelte create mode 100644 src/lib/components/ui/ExpandableImage.svelte diff --git a/package.json b/package.json index 8e5d51c5..4aa9bed6 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "photon-lemmy", - "version": "1.4.1", + "version": "1.4.2", "private": true, "scripts": { "dev": "vite dev", diff --git a/src/lib/components/helper/Empty.svelte b/src/lib/components/helper/Empty.svelte new file mode 100644 index 00000000..c06d5a9c --- /dev/null +++ b/src/lib/components/helper/Empty.svelte @@ -0,0 +1 @@ + diff --git a/src/lib/components/lemmy/post/Post.svelte b/src/lib/components/lemmy/post/Post.svelte index 5b6336e4..9bec408c 100644 --- a/src/lib/components/lemmy/post/Post.svelte +++ b/src/lib/components/lemmy/post/Post.svelte @@ -8,6 +8,9 @@ import PostMeta from '$lib/components/lemmy/post/PostMeta.svelte' import { Material, toast } from 'mono-svelte' import Markdown from '$lib/components/markdown/Markdown.svelte' + import ExpandableImage from '$lib/components/ui/ExpandableImage.svelte' + import { bestImageURL, postLink } from '$lib/components/lemmy/post/helpers.js' + import Empty from '$lib/components/helper/Empty.svelte' export let post: PostView export let actions: boolean = true @@ -54,36 +57,42 @@ {#if !$userSettings.showCompactPosts} {#if isImage(post.post.url)} - - - - - - (loaded = true)} - /> - - + + + + + (loaded = true)} + /> + + + {:else if post.post.url} {#if $userSettings.showCompactPosts && (post.post.thumbnail_url || isImage(post.post.url))}
- - {#if post.post.thumbnail_url} - - - {:else} - - - {/if} - + {#if !$userSettings.expandImages || (post.post.thumbnail_url && !isImage(post.post.url))} + + {#if post.post.thumbnail_url} + + + {/if} + + {:else} + + {#if post.post.thumbnail_url} + + + {/if} + + {/if}
{/if} diff --git a/src/lib/components/lemmy/post/helpers.ts b/src/lib/components/lemmy/post/helpers.ts index 54954dd2..793f0065 100644 --- a/src/lib/components/lemmy/post/helpers.ts +++ b/src/lib/components/lemmy/post/helpers.ts @@ -1,7 +1,26 @@ -import type { CommentView, PersonView, PostView } from 'lemmy-js-client' +import { getInstance } from '$lib/lemmy.js' +import type { CommentView, PersonView, Post, PostView } from 'lemmy-js-client' export const isMutable = (post: PostView, me: PersonView) => (me.person.admin && post.post.local) || me.person.id == post.creator.id export const isCommentMutable = (comment: CommentView, me: PersonView) => me.person.id == comment.creator.id + +export const bestImageURL = ( + post: Post, + compact: boolean = true, + width: number = 1024 +) => { + if (compact && post.thumbnail_url) + return `${post.thumbnail_url}?thumbnail=256&format=webp` + else if (compact && post.url) return `${post.url}?thumbnail=256&format=webp` + + if (post.url) return `${post.url}?thumbnail=${width}&format=webp` + else if (post.thumbnail_url) + return `${post.thumbnail_url}?thumbnail=${width}&format=webp` + + return post.url ?? '' +} + +export const postLink = (post: Post) => `/post/${getInstance()}/${post.id}` diff --git a/src/lib/components/ui/ExpandableImage.svelte b/src/lib/components/ui/ExpandableImage.svelte new file mode 100644 index 00000000..20edf9eb --- /dev/null +++ b/src/lib/components/ui/ExpandableImage.svelte @@ -0,0 +1,49 @@ + + + { + if (open && e.code == 'Escape') open = false + }} +/> + +{#if open} + + + + +
(open = false)} + > + + +
+{/if} + + diff --git a/src/lib/settings.ts b/src/lib/settings.ts index 3986ccb5..75be96a0 100644 --- a/src/lib/settings.ts +++ b/src/lib/settings.ts @@ -54,6 +54,7 @@ interface Settings { modlogCardView: boolean | undefined debugInfo: boolean systemUI: boolean + expandImages: boolean } export const defaultSettings: Settings = { @@ -93,6 +94,7 @@ export const defaultSettings: Settings = { modlogCardView: toBool(env.PUBLIC_MODLOG_CARD_VIEW) ?? undefined, debugInfo: false, systemUI: true, + expandImages: true, } export const userSettings = writable(defaultSettings) diff --git a/src/routes/settings/+page.svelte b/src/routes/settings/+page.svelte index 59c8ee77..91034e3f 100644 --- a/src/routes/settings/+page.svelte +++ b/src/routes/settings/+page.svelte @@ -145,6 +145,15 @@ Alternate vote design + + + Expand Images + + + Clicking on an image brings you to an expanded view rather than sending + you to the post page. + + Instances