From abb0c7d2ca4cc315c2b3e4e1a012d31696d73263 Mon Sep 17 00:00:00 2001 From: Bill Thornton Date: Mon, 16 Oct 2023 12:09:56 -0400 Subject: [PATCH] Ensure IconUrl from capabilities is a valid url --- src/utils/image.ts | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/utils/image.ts b/src/utils/image.ts index 553420422..7420fad41 100644 --- a/src/utils/image.ts +++ b/src/utils/image.ts @@ -63,7 +63,14 @@ export function getDeviceIcon(info: DeviceInfo | SessionInfo) { case 'Jellyfin Web': return getWebDeviceIcon((info as DeviceInfo).Name || (info as SessionInfo).DeviceName); default: - return info.Capabilities?.IconUrl || BASE_DEVICE_IMAGE_URL + 'other.svg'; + if (info.Capabilities?.IconUrl) { + try { + return new URL(info.Capabilities.IconUrl).toString(); + } catch (err) { + console.error('[getDeviceIcon] device capabilities has invalid IconUrl', info, err); + } + } + return BASE_DEVICE_IMAGE_URL + 'other.svg'; } }