From cc4eb16c7c0e98c085b51ecf5055bb3594196b63 Mon Sep 17 00:00:00 2001 From: Tulir Asokan Date: Wed, 23 Oct 2024 16:02:20 +0300 Subject: [PATCH] web/timeline: prefer encrypted url if set --- web/src/ui/timeline/content/useMediaContent.tsx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/web/src/ui/timeline/content/useMediaContent.tsx b/web/src/ui/timeline/content/useMediaContent.tsx index 2481159..b33e309 100644 --- a/web/src/ui/timeline/content/useMediaContent.tsx +++ b/web/src/ui/timeline/content/useMediaContent.tsx @@ -23,9 +23,9 @@ import DownloadIcon from "@/icons/download.svg?react" export const useMediaContent = ( content: MediaMessageEventContent, evtType: EventType, containerSize?: ImageContainerSize, ): [React.ReactElement | null, string, CSSProperties] => { - const mediaURL = content.url ? getMediaURL(content.url) : getEncryptedMediaURL(content.file?.url) - const thumbnailURL = content.info?.thumbnail_url - ? getMediaURL(content.info.thumbnail_url) : getEncryptedMediaURL(content.info?.thumbnail_file?.url) + const mediaURL = content.file?.url ? getEncryptedMediaURL(content.file.url) : getMediaURL(content.url) + const thumbnailURL = content.info?.thumbnail_file?.url + ? getEncryptedMediaURL(content.info.thumbnail_file.url) : getMediaURL(content.info?.thumbnail_url) if (content.msgtype === "m.image" || evtType === "m.sticker") { const style = calculateMediaSize(content.info?.w, content.info?.h, containerSize) return [