From b538e12f64925c8e068d0001536bf01fee06c0d9 Mon Sep 17 00:00:00 2001 From: Alan Grainger Date: Fri, 25 Apr 2025 08:19:05 +1200 Subject: [PATCH] #87 fetch album assets separately to address change in Immich 1.132+ --- app/src/immich.ts | 35 ++++++++++++++++++++++++++++++++--- app/src/types.ts | 10 ++++++++++ 2 files changed, 42 insertions(+), 3 deletions(-) diff --git a/app/src/immich.ts b/app/src/immich.ts index ec0107a..6aa67e7 100644 --- a/app/src/immich.ts +++ b/app/src/immich.ts @@ -1,4 +1,13 @@ -import { Asset, AssetType, ImageSize, IncomingShareRequest, SharedLink, SharedLinkResult } from './types' +import { + Album, + AlbumType, + Asset, + AssetType, + ImageSize, + IncomingShareRequest, + SharedLink, + SharedLinkResult +} from './types' import dayjs from 'dayjs' import { addResponseHeaders, canDownload, getConfigOption, log } from './functions' import render from './render' @@ -94,14 +103,15 @@ class Immich { respondToInvalidRequest(res, 404) return } + const link = sharedLinkRes.link // Make sure there are some photo/video assets for this link - const link = sharedLinkRes.link + /* if (!link.assets.length) { log('No assets for key ' + request.key) respondToInvalidRequest(res, 404) return - } + } */ // Everything is ok - output the shared link data @@ -145,6 +155,25 @@ class Immich { if (res.status === 200) { // Normal response - get the shared assets link = jsonBody as SharedLink + + // For an album, we need to make a second request to Immich to populate + // the array of assets + if (link.type === AlbumType.album) { + const albumRes = await fetch(this.buildUrl(this.apiUrl() + '/albums/' + link?.album?.id, { + key, + password + })) + const album = await albumRes.json() as Album + if (!album?.id) { + log('Invalid album ID - ' + link?.album?.id) + return { + valid: false + } + } + // Replace the empty link.assets array with the array of assets from the album + link.assets = album.assets + } + link.password = password if (link.expiresAt && dayjs(link.expiresAt) < dayjs()) { // This link has expired diff --git a/app/src/types.ts b/app/src/types.ts index 8ac6d84..c86a402 100644 --- a/app/src/types.ts +++ b/app/src/types.ts @@ -5,6 +5,11 @@ export enum AssetType { video = 'VIDEO' } +export enum AlbumType { + album = 'ALBUM', + individual = 'INDIVIDUAL' +} + export interface Asset { id: string; key: string; @@ -15,6 +20,11 @@ export interface Asset { isTrashed: boolean; } +export interface Album { + id: string; + assets: Asset[]; +} + export interface SharedLink { key: string; type: string;