Ships `dev` as **v0.11.0**. `main` contains nothing that `dev` does not, so this is a clean sync. ## Headline changes since v0.10.0 - **Journal & Journal Studio** — photo essays at `/journal`, split-screen block editor with live preview, drafts, per-entry passwords, cover images - **First-run setup wizard at `/install`** — configure a fresh deployment from the browser; credentials are verified against Immich before anything is written, and the wizard is gated by a one-time token - **About page editor and toggle** in the admin panel - **Per-album photo order** independent of Immich, with a drag & drop editor - **Custom favicon upload** - **Experimental portfolio features** — justified grid, `cover` hero, unlisted subpages, per-album grid overrides, cover focal points, external nav links - **Security** — asset tokens length-capped before decoding (#423), journal author markdown escaped rather than filtered, journal file paths contained, admin session key derived with scrypt (#432), Next.js 16.3.0 for CVE-2025-13465 - **Fixed** — client proofing honours its own configuration again (#454); journal photo rendering (#432) Full detail in [CHANGELOG.md](CHANGELOG.md#0110--2026-08-15). ## Verified `npx tsc --noEmit` clean · `npx vitest run` 435 tests pass · `npm run build` succeeds · lint 0 errors · `prettier --check` clean · local `docker build` of the release tree. ## After merge Tag `v0.11.0` on `main` and publish the release — that triggers `docker-publish.yml`, which pushes the image and moves `latest`. 🤖 Generated with [Claude Code](https://claude.com/claude-code) --------- Co-authored-by: ralksta <ralksta@users.noreply.github.com> Co-authored-by: lancetm714 <108419425+lancetm714@users.noreply.github.com> Co-authored-by: Claude Opus 5 <noreply@anthropic.com>
203 lines
6.5 KiB
TypeScript
203 lines
6.5 KiB
TypeScript
import { notFound } from 'next/navigation';
|
|
import { cookies } from 'next/headers';
|
|
import type { Metadata } from 'next';
|
|
import { readJournalEntry } from '@/lib/admin/journal-service';
|
|
import type { ParsedJournal } from '@/lib/journal';
|
|
import { isAdminAuthenticated } from '@/lib/admin/auth';
|
|
import { getConfig } from '@/lib/config';
|
|
import { immich } from '@/lib/immich';
|
|
import {
|
|
imageUrl,
|
|
exifUrl,
|
|
assetPlaceholder,
|
|
assetAspectRatio,
|
|
assetExifSummary,
|
|
} from '@/lib/urls';
|
|
import { encodeAssetId } from '@/lib/tokens';
|
|
import { EssayView } from '@/app/[...path]/EssayView';
|
|
import type { PhotoItem } from '@/app/[...path]/PhotoGrid';
|
|
import type { ImmichAsset } from '@/lib/immich';
|
|
import PasswordGate from '@/components/PasswordGate';
|
|
import { BackLink } from '@/components/BackLink';
|
|
import crypto from 'crypto';
|
|
|
|
export const dynamic = 'force-dynamic';
|
|
|
|
interface JournalDetailPageProps {
|
|
params: Promise<{ slug: string }>;
|
|
}
|
|
|
|
export async function generateMetadata({ params }: JournalDetailPageProps): Promise<Metadata> {
|
|
const { slug } = await params;
|
|
const entry = await readJournalEntry(slug);
|
|
if (!entry) return { title: 'Not Found' };
|
|
|
|
const { frontmatter } = entry.parsed;
|
|
const title = frontmatter.title || slug;
|
|
const description = frontmatter.subtitle || 'Journal entry on Immich Folio';
|
|
|
|
const ogImages = frontmatter.coverAssetId
|
|
? [{ url: imageUrl(frontmatter.coverAssetId, 'preview') }]
|
|
: [];
|
|
|
|
return {
|
|
title,
|
|
description,
|
|
openGraph: {
|
|
title,
|
|
description,
|
|
images: ogImages,
|
|
},
|
|
};
|
|
}
|
|
|
|
/** Check if journal entry password cookie is valid */
|
|
function isJournalAuthenticated(
|
|
slug: string,
|
|
storedPassword?: string,
|
|
cookieVal?: string,
|
|
): boolean {
|
|
if (!storedPassword) return true;
|
|
if (!cookieVal) return false;
|
|
|
|
const sep = cookieVal.indexOf('.');
|
|
if (sep === -1) return false;
|
|
|
|
const expiresAt = Number(cookieVal.slice(0, sep));
|
|
if (!Number.isFinite(expiresAt) || expiresAt <= Date.now()) return false;
|
|
|
|
const hmac = crypto
|
|
.createHmac('sha256', getConfig().authSecret)
|
|
.update(`${slug}:${storedPassword}:${expiresAt}`)
|
|
.digest('hex');
|
|
|
|
const expected = `${expiresAt}.${hmac}`;
|
|
try {
|
|
const a = Buffer.from(cookieVal, 'utf8');
|
|
const b = Buffer.from(expected, 'utf8');
|
|
if (a.length !== b.length) return false;
|
|
return crypto.timingSafeEqual(a, b);
|
|
} catch {
|
|
return false;
|
|
}
|
|
}
|
|
|
|
export default async function JournalDetailPage({ params }: JournalDetailPageProps) {
|
|
const { slug } = await params;
|
|
const entry = await readJournalEntry(slug);
|
|
|
|
if (!entry) {
|
|
notFound();
|
|
}
|
|
|
|
const { frontmatter, blocks, referencedAssetIds } = entry.parsed;
|
|
const isAuthedAdmin = await isAdminAuthenticated();
|
|
|
|
// If draft, only visible to authenticated admin
|
|
if (frontmatter.draft && !isAuthedAdmin) {
|
|
notFound();
|
|
}
|
|
|
|
// Password protection check
|
|
if (frontmatter.password) {
|
|
const cookieStore = await cookies();
|
|
const cookieVal = cookieStore.get(`lb_auth_journal_${slug}`)?.value;
|
|
|
|
if (!isJournalAuthenticated(slug, frontmatter.password, cookieVal)) {
|
|
return <PasswordGate slug={slug} title={frontmatter.title || slug} type="journal" />;
|
|
}
|
|
}
|
|
|
|
const config = getConfig();
|
|
|
|
// Fetch all referenced assets from Immich
|
|
const assetPromises = referencedAssetIds.map(async (assetId) => {
|
|
try {
|
|
const asset = await immich.getAssetInfo(assetId);
|
|
return asset;
|
|
} catch {
|
|
return null;
|
|
}
|
|
});
|
|
|
|
const rawAssets = (await Promise.all(assetPromises)).filter((a): a is ImmichAsset => a !== null);
|
|
|
|
// EssayView drops photo blocks it cannot resolve, which is right for visitors
|
|
// but leaves no trace of *why* a photo vanished. Legacy positional references
|
|
// ("1", "2") are the usual cause: they only resolved against a subpage album,
|
|
// and a standalone journal entry has none.
|
|
if (rawAssets.length < referencedAssetIds.length) {
|
|
const resolved = new Set(rawAssets.map((a) => a.id));
|
|
const missing = referencedAssetIds.filter((id) => !resolved.has(id));
|
|
// eslint-disable-next-line no-console
|
|
console.warn(
|
|
`[journal] ${slug}: ${missing.length} photo reference(s) could not be resolved and will not render: ${missing.join(', ')}`,
|
|
);
|
|
}
|
|
|
|
/*
|
|
* EssayView resolves a block's photo through PhotoItem.id, and those ids are
|
|
* encrypted tokens — while the blocks coming out of the Markdown carry raw
|
|
* asset UUIDs. Without this translation every photo block fails its lookup and
|
|
* is dropped, so a correctly authored entry renders text only. Doing it here
|
|
* also keeps raw UUIDs out of the client payload, per the project rule that
|
|
* they must never reach the browser. Unresolvable references collapse to an
|
|
* empty string, which EssayView skips.
|
|
*/
|
|
const tokenByAssetId = new Map(rawAssets.map((a) => [a.id, encodeAssetId(a.id)]));
|
|
const toToken = (assetId: string) => tokenByAssetId.get(assetId) ?? '';
|
|
|
|
const essayForClient: ParsedJournal = {
|
|
frontmatter: {
|
|
...frontmatter,
|
|
coverAssetId: frontmatter.coverAssetId ? toToken(frontmatter.coverAssetId) : undefined,
|
|
},
|
|
blocks: blocks.map((block) => {
|
|
if (block.type === 'photo') {
|
|
return { ...block, assetId: toToken(block.assetId) };
|
|
}
|
|
if (block.type === 'photo-pair') {
|
|
return {
|
|
...block,
|
|
assetIds: [toToken(block.assetIds[0]), toToken(block.assetIds[1])] as [string, string],
|
|
};
|
|
}
|
|
return block;
|
|
}),
|
|
referencedAssetIds: rawAssets.map((a) => encodeAssetId(a.id)),
|
|
};
|
|
|
|
const images: PhotoItem[] = rawAssets
|
|
.filter((a) => a.type === 'IMAGE' || a.type === 'VIDEO')
|
|
.map((a) => {
|
|
const ph = assetPlaceholder(a);
|
|
const exif = config.exifOnHover && a.type === 'IMAGE' ? assetExifSummary(a) : undefined;
|
|
const isVideo = a.type === 'VIDEO';
|
|
return {
|
|
id: encodeAssetId(a.id),
|
|
type: isVideo ? 'video' : 'image',
|
|
thumbUrl: imageUrl(a.id, 'preview'),
|
|
previewUrl: imageUrl(a.id, 'preview'),
|
|
exifUrl: exifUrl(a.id),
|
|
...(ph ? { blurDataURL: ph.blurDataURL, dominantColor: ph.dominantColor } : {}),
|
|
...(exif ?? {}),
|
|
aspectRatio: assetAspectRatio(a),
|
|
};
|
|
});
|
|
|
|
return (
|
|
<div style={{ paddingTop: '2rem' }}>
|
|
<div style={{ maxWidth: '1100px', margin: '0 auto', padding: '0 1.5rem 1rem' }}>
|
|
<BackLink href="/journal" label="Back to Journal" />
|
|
</div>
|
|
<EssayView
|
|
essay={essayForClient}
|
|
assets={images}
|
|
title={frontmatter.title}
|
|
subtitle={frontmatter.subtitle}
|
|
watermark={config.watermark}
|
|
/>
|
|
</div>
|
|
);
|
|
}
|