Merge branch 'metadata' into description

This commit is contained in:
Alan Grainger
2025-05-05 11:10:10 +12:00
committed by GitHub
6 changed files with 46 additions and 9 deletions
+1 -1
View File
@@ -1,6 +1,6 @@
{
"name": "immich-public-proxy",
"version": "1.9.1",
"version": "1.10.0",
"scripts": {
"dev": "ts-node src/index.ts",
"build": "npx tsc",
+32 -3
View File
@@ -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
+10
View File
@@ -9,6 +9,11 @@ export interface ExifInfo {
description?: string;
}
export enum AlbumType {
album = 'ALBUM',
individual = 'INDIVIDUAL'
}
export interface Asset {
id: string;
key: string;
@@ -20,6 +25,11 @@ export interface Asset {
exifInfo?: ExifInfo;
}
export interface Album {
id: string;
assets: Asset[];
}
export interface SharedLink {
key: string;
type: string;