diff --git a/app/config.json b/app/config.json index 7dabf59..73ceb6a 100644 --- a/app/config.json +++ b/app/config.json @@ -42,6 +42,8 @@ "singleItemAutoOpen": true, "showTitle": true, "showDescription": false, + "showExpiryDate": false, + "expiryDateFormat": "YYYY-MM-DD", "groupByDate": false, "cacheTime": 300 }, diff --git a/app/src/gallery/builder.ts b/app/src/gallery/builder.ts index bc78ea1..fd9923a 100644 --- a/app/src/gallery/builder.ts +++ b/app/src/gallery/builder.ts @@ -6,7 +6,7 @@ import { import { Response } from 'express-serve-static-core' import { AssetType, ImageSize, SharedLink } from '../types' import { getConfigOption } from '../config/access' -import { canDownload, title } from '../share' +import { canDownload, expiryDate, title } from '../share' import { toString } from '../utils/text' import { h } from 'preact' import { renderPage } from '../view/render' @@ -138,6 +138,7 @@ export async function gallery (res: Response, share: SharedLink, openItem?: numb path: '/share/' + share.key, showDownload: downloadAllowed, showTitle: !!getConfigOption('ipp.gallery.showTitle', true), + expiryDate: expiryDate(share), openItem, ogImageItem, lightboxConfig: { diff --git a/app/src/share.ts b/app/src/share.ts index 31b2ca0..2287c30 100644 --- a/app/src/share.ts +++ b/app/src/share.ts @@ -1,5 +1,6 @@ import { DownloadAll, SharedLink } from './types' import { getConfigOption } from './config/access' +import dayjs from 'dayjs' /** * Display title for a shared link. Prefers the user-set link description, @@ -31,3 +32,21 @@ export function canDownload (share: SharedLink): boolean { return !!share.allowDownload } } + +/** + * Formatted expiry date for the gallery subtitle, or undefined when the + * feature is off, the share never expires, or the date can't be parsed. + * + * Gated by `ipp.gallery.showExpiryDate` (default `false`). The date is + * formatted with `ipp.gallery.expiryDateFormat`, a dayjs format string that + * defaults to the ISO 8601 date `YYYY-MM-DD` (e.g. `2026-07-10`). + */ +export function expiryDate (share: SharedLink): string | undefined { + if (!getConfigOption('ipp.gallery.showExpiryDate', false)) return undefined + if (!share.expiresAt) return undefined + const parsed = dayjs(share.expiresAt) + if (!parsed.isValid()) return undefined + const configured = getConfigOption('ipp.gallery.expiryDateFormat', 'YYYY-MM-DD') + const format = typeof configured === 'string' && configured ? configured : 'YYYY-MM-DD' + return parsed.format(format) +} diff --git a/app/src/view/gallery.tsx b/app/src/view/gallery.tsx index 68eeb8d..9a99292 100644 --- a/app/src/view/gallery.tsx +++ b/app/src/view/gallery.tsx @@ -13,6 +13,9 @@ export interface GalleryProps { path: string showDownload: boolean showTitle: boolean + // Formatted "available until" date shown in the subtitle, or undefined when + // ipp.gallery.showExpiryDate is off or the share never expires. + expiryDate?: string openItem?: number ogImageItem?: GalleryItem lightboxConfig: LightboxConfig @@ -71,6 +74,9 @@ export function Gallery (props: GalleryProps) {

{props.items.length}{' '} {props.items.length === 1 ? 'item' : 'items'} + {props.expiryDate && ( + <>{' ยท available until '}{props.expiryDate} + )}

)}