From f1c721068589c9697ea3237588c8ccb421bf96b9 Mon Sep 17 00:00:00 2001 From: Alan Grainger Date: Sun, 2 Feb 2025 21:16:10 +0800 Subject: [PATCH] #61 don't assume a fileCreatedAt property --- app/src/immich.ts | 8 ++++---- app/src/render.ts | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/app/src/immich.ts b/app/src/immich.ts index 4a03a0e..519b38d 100644 --- a/app/src/immich.ts +++ b/app/src/immich.ts @@ -152,9 +152,9 @@ class Immich { // Sort album if there is a sort order specified const sortOrder = link.album?.order if (sortOrder === 'asc') { - link.assets.sort((a, b) => a.fileCreatedAt.localeCompare(b.fileCreatedAt)) + link.assets.sort((a, b) => a?.fileCreatedAt?.localeCompare(b.fileCreatedAt)) } else if (sortOrder === 'desc') { - link.assets.sort((a, b) => b.fileCreatedAt.localeCompare(a.fileCreatedAt)) + link.assets.sort((a, b) => b?.fileCreatedAt?.localeCompare(a.fileCreatedAt)) } return { valid: true, @@ -220,7 +220,7 @@ class Immich { /** * Return the image data URL for a photo */ - photoUrl (key: string, id: string, size?: ImageSize, password?: string) { + photoUrl (key: string, id: string, size?: ImageSize) { const path = ['photo', key, id] if (size) path.push(size) return this.buildUrl('/share/' + path.join('/')) @@ -229,7 +229,7 @@ class Immich { /** * Return the video data URL for a video */ - videoUrl (key: string, id: string, password?: string) { + videoUrl (key: string, id: string) { return this.buildUrl(`/share/video/${key}/${id}`) } diff --git a/app/src/render.ts b/app/src/render.ts index a7a0cdd..5b468b1 100644 --- a/app/src/render.ts +++ b/app/src/render.ts @@ -94,7 +94,7 @@ class Render { video = JSON.stringify({ source: [ { - src: immich.videoUrl(share.key, asset.id, asset.password), + src: immich.videoUrl(share.key, asset.id), type: await immich.getVideoContentType(asset) } ], @@ -106,12 +106,12 @@ class Render { } if (getConfigOption('ipp.downloadOriginalPhoto', true)) { // Add a download link for the original-size image, if configured in config.json - downloadUrl = immich.photoUrl(share.key, asset.id, ImageSize.original, asset.password) + downloadUrl = immich.photoUrl(share.key, asset.id, ImageSize.original) } items.push({ - previewUrl: immich.photoUrl(share.key, asset.id, ImageSize.preview, asset.password), + previewUrl: immich.photoUrl(share.key, asset.id, ImageSize.preview), downloadUrl, - thumbnailUrl: immich.photoUrl(share.key, asset.id, ImageSize.thumbnail, asset.password), + thumbnailUrl: immich.photoUrl(share.key, asset.id, ImageSize.thumbnail), video }) }