Skip to content

Self-hosted personal gallery application with online photo management and albums, supporting Live/Motion Photos, EXIF parsing, geolocation recognition, and an explore map.

feat(albums): add title-based slugs and permanent redirects

Ahmet Ömerd51605201353
diff --git a/apps/self-hosted/server/api/albums/[albumId]/index.put.ts b/apps/self-hosted/server/api/albums/[albumId]/index.put.ts
index 52ed29c5..4ccc7c88 100644
--- a/apps/self-hosted/server/api/albums/[albumId]/index.put.ts
+++ b/apps/self-hosted/server/api/albums/[albumId]/index.put.ts
@@ -25,6 +25,7 @@ export default eventHandler(async (event) => {
event,
z.object({
title: z.string().min(1).max(255).optional(),
+ slug: z.string().max(80).optional(),
description: z.string().max(1000).optional(),
coverPhotoId: z.string().optional(),
photoIds: z.array(z.string()).optional(),
diff --git a/apps/self-hosted/server/api/albums/index.post.ts b/apps/self-hosted/server/api/albums/index.post.ts
index 83a24cb6..49819ad9 100644
--- a/apps/self-hosted/server/api/albums/index.post.ts
+++ b/apps/self-hosted/server/api/albums/index.post.ts
@@ -12,6 +12,7 @@ export default eventHandler(async (event) => {
event,
z.object({
title: z.string().min(1).max(255),
+ slug: z.string().max(80).optional(),
description: z.string().max(1000).optional(),
coverPhotoId: z.string().optional(),
photoIds: z.array(z.string()).optional(),
diff --git a/apps/self-hosted/server/api/albums/resolve/[slug].get.ts b/apps/self-hosted/server/api/albums/resolve/[slug].get.ts
new file mode 100644
index 00000000..2a1a819e
--- /dev/null
+++ b/apps/self-hosted/server/api/albums/resolve/[slug].get.ts
@@ -0,0 +1,13 @@
+import { DEFAULT_SITE } from '@chronoframe/core'
+import { resolveAlbumPath } from '@chronoframe/database/album-slugs'
+import { albumAccess } from '../../../utils/album-access'
+import { useDB } from '../../../utils/db'
+
+export default eventHandler(async (event) => {
+ const segment = getRouterParam(event, 'slug') ?? ''
+ const resolved = resolveAlbumPath(useDB(), DEFAULT_SITE, segment)
+ const access = await albumAccess(event)
+ if (!resolved || (resolved.isHidden && !access.admin))
+ throw createError({ statusCode: 404, statusMessage: 'Album not found' })
+ return resolved
+})
diff --git a/apps/self-hosted/server/api/photos/[photoId]/albums.get.ts b/apps/self-hosted/server/api/photos/[photoId]/albums.get.ts
index e8884eaa..35201a8d 100644
--- a/apps/self-hosted/server/api/photos/[photoId]/albums.get.ts
+++ b/apps/self-hosted/server/api/photos/[photoId]/albums.get.ts
@@ -19,6 +19,7 @@ export default eventHandler(async (event) => {
const albums = await db
.select({
id: tables.albums.id,
+ slug: tables.albumSlugs.slug,
isHidden: tables.albums.isHidden,
passwordHash: tables.albums.passwordHash,
title: tables.albums.title,
@@ -32,6 +33,14 @@ export default eventHandler(async (event) => {
tables.albumPhotos,
eq(tables.albums.id, tables.albumPhotos.albumId),
)
+ .innerJoin(
+ tables.albumSlugs,
+ siteAnd(
+ eq(tables.albumSlugs.albumId, tables.albums.id),
+ eq(tables.albumSlugs.siteId, tables.albums.siteId),
+ eq(tables.albumSlugs.isCurrent, true),
+ ),
+ )
.where(
siteAnd(
eq(tables.albumPhotos.photoId, photoId),
diff --git a/apps/self-hosted/server/middleware/album-slug-redirect.ts b/apps/self-hosted/server/middleware/album-slug-redirect.ts
new file mode 100644
index 00000000..926983fb
--- /dev/null
+++ b/apps/self-hosted/server/middleware/album-slug-redirect.ts
@@ -0,0 +1,23 @@
+import { DEFAULT_SITE } from '@chronoframe/core'
+import { resolveAlbumPath } from '@chronoframe/database/album-slugs'
+import { albumAccess } from '../utils/album-access'
+import { useDB } from '../utils/db'
+
+export default defineEventHandler(async (event) => {
+ if (event.method !== 'GET' && event.method !== 'HEAD') return
+ const url = getRequestURL(event)
+ const match = /^\/albums\/([^/]+)\/?$/.exec(url.pathname)
+ if (!match) return
+ let segment: string
+ try {
+ segment = decodeURIComponent(match[1]!)
+ } catch {
+ throw createError({ statusCode: 404, statusMessage: 'Album not found' })
+ }
+ const resolved = resolveAlbumPath(useDB(), DEFAULT_SITE, segment)
+ const access = await albumAccess(event)
+ if (!resolved || (resolved.isHidden && !access.admin))
+ throw createError({ statusCode: 404, statusMessage: 'Album not found' })
+ if (!resolved.isCanonical || url.pathname !== `/albums/${resolved.slug}`)
+ return sendRedirect(event, `/albums/${resolved.slug}${url.search}`, 301)
+})
diff --git a/packages/console/app/pages/dashboard/albums.vue b/packages/console/app/pages/dashboard/albums.vue
index 6d51bb2d..d778e693 100644
--- a/packages/console/app/pages/dashboard/albums.vue
+++ b/packages/console/app/pages/dashboard/albums.vue
@@ -25,6 +25,7 @@ interface AlbumItem extends Album {
interface AlbumFormState {
title: string
+ slug: string
description: string
isHidden: boolean
password: string
@@ -62,6 +63,7 @@ const currentAlbum = ref<AlbumItem | null>(null)
const formData = reactive<AlbumFormState>({
title: '',
+ slug: '',
description: '',
isHidden: false,
password: '',
@@ -100,6 +102,17 @@ const validateForm = (state: any): FormError[] => {
message: $t('dashboard.albums.form.titleRequired'),
})
}
+ if (
+ state.slug?.trim() &&
+ (state.slug.trim().length > 80 ||
+ !/^[a-z0-9]+(?:-[a-z0-9]+)*$/.test(state.slug.trim()) ||
+ /^\d+$/.test(state.slug.trim()))
+ ) {
+ errors.push({
+ name: 'slug',
+ message: $t('dashboard.albums.form.slugInvalid'),
+ })
+ }
if (state.passwordEnabled) {
if (!state.password) {
if (!currentAlbum.value?.hasPassword) {
@@ -175,6 +188,7 @@ const loadPhotos = async () => {
const openCreateSlideover = () => {
currentAlbum.value = null
formData.title = ''
+ formData.slug = ''
formData.description = ''
formData.isHidden = false
formData.password = ''
@@ -190,6 +204,7 @@ const openEditSlideover = async (album: AlbumItem) => {
try {
const albumDetail = (await consoleApi(`/api/albums/${album.id}`)) as any
formData.title = album.title
+ formData.slug = album.slug
formData.description = album.description || ''
formData.isHidden = album.isHidden || false
formData.password = ''
@@ -220,6 +235,7 @@ const onFormSubmit = async (event: FormSubmitEvent<AlbumFormState>) => {
method: 'PUT',
body: {
title: event.data.title,
+ slug: event.data.slug,
description: event.data.description || undefined,
coverPhotoId: coverPhotoId.value || undefined,
photoIds: selectedPhotoIds.value,
@@ -241,6 +257,7 @@ const onFormSubmit = async (event: FormSubmitEvent<AlbumFormState>) => {
method: 'POST',
body: {
title: event.data.title,
+ slug: event.data.slug,
description: event.data.description || undefined,
coverPhotoId: coverPhotoId.value || undefined,
photoIds: selectedPhotoIds.value,
@@ -261,6 +278,26 @@ const onFormSubmit = async (event: FormSubmitEvent<AlbumFormState>) => {
await loadAlbums()
} catch (error) {
+ const status =
+ (error as { statusCode?: number; status?: number })?.statusCode ??
+ (error as { status?: number })?.status
+ const message =
+ (error as { statusMessage?: string; message?: string })?.statusMessage ??
+ (error as { message?: string })?.message ??
+ ''
+ if (status === 409 || (status === 400 && /slug/i.test(message))) {
+ formRef.value?.setErrors([
+ {
+ name: 'slug',
+ message: $t(
+ status === 409
+ ? 'dashboard.albums.form.slugConflict'
+ : 'dashboard.albums.form.slugInvalid',
+ ),
+ },
+ ])
+ return
+ }
console.error('Failed to save album:', error)
useToast().add({
title: currentAlbum.value
@@ -601,7 +638,7 @@ const columns = computed<any[]>(() => [
<template #title-cell="{ row }">
<NuxtLink
- :to="`/albums/${(row.original as unknown as AlbumItem).id}`"
+ :to="`/albums/${(row.original as unknown as AlbumItem).slug}`"
target="_blank"
class="font-medium text-primary-600 dark:text-primary-400 hover:underline cursor-pointer inline-flex items-center gap-2"
>
@@ -818,6 +855,27 @@ const columns = computed<any[]>(() => [
/>
</UFormField>
+ <UFormField
+ :label="$t('dashboard.albums.form.slug')"
+ :description="$t('dashboard.albums.form.slugHint')"
+ name="slug"
+ >
+ <UInput
+ v-model="formData.slug"
+ class="w-full"
+ maxlength="80"
+ :placeholder="$t('dashboard.albums.form.slugPlaceholder')"
+ />
+ <p
+ v-if="currentAlbum"
+ class="mt-1 text-xs text-muted"
+ >
+ {{ $t('dashboard.albums.form.slugCurrent') }}: /albums/{{
+ currentAlbum.slug
+ }}
+ </p>
+ </UFormField>
+
<UFormField
:label="$t('dashboard.albums.form.description')"
name="description"
diff --git a/packages/contracts/src/resources.ts b/packages/contracts/src/resources.ts
index 84b48fc1..46fb97bb 100644
--- a/packages/contracts/src/resources.ts
+++ b/packages/contracts/src/resources.ts
@@ -33,6 +33,7 @@ export interface Photo {
export interface Album {
id: number
+ slug: string
title: string
description: string | null
coverPhotoId: string | null
diff --git a/packages/core/src/mutations.ts b/packages/core/src/mutations.ts
index 4de6c363..89360cc5 100644
--- a/packages/core/src/mutations.ts
+++ b/packages/core/src/mutations.ts
@@ -11,6 +11,7 @@ export interface Clock {
export interface AlbumInput {
title?: string
+ slug?: string
description?: string
coverPhotoId?: string
photoIds?: string[]
@@ -19,6 +20,7 @@ export interface AlbumInput {
}
export interface AlbumWriteData {
title?: string
+ slug?: string
description?: string | null
coverPhotoId?: string | null
isHidden?: boolean
@@ -68,6 +70,7 @@ export function createAlbumWriter(deps: {
return deps.repository.createFirst(
{
title: input.title,
+ slug: input.slug ?? '',
description: input.description || null,
coverPhotoId: input.coverPhotoId || null,
isHidden: input.isHidden || false,
@@ -84,6 +87,7 @@ export function createAlbumWriter(deps: {
throw new CoreError(404, 'Album not found')
const data: AlbumWriteData = { updatedAt: deps.clock.now() }
if (input.title !== undefined) data.title = input.title
+ if (input.slug !== undefined) data.slug = input.slug
if (input.description !== undefined)
data.description = input.description || null
if (input.coverPhotoId !== undefined)
diff --git a/packages/database/migrations/0020_album_slugs.sql b/packages/database/migrations/0020_album_slugs.sql
new file mode 100644
index 00000000..47fd975f
--- /dev/null
+++ b/packages/database/migrations/0020_album_slugs.sql
@@ -0,0 +1,29 @@
+CREATE TABLE album_slugs (
+ site_id INTEGER NOT NULL REFERENCES sites(id),
+ slug TEXT NOT NULL,
+ album_id INTEGER REFERENCES albums(id) ON DELETE SET NULL,
+ is_current INTEGER NOT NULL DEFAULT 0 CHECK (is_current IN (0, 1)),
+ PRIMARY KEY (site_id, slug),
+ CHECK (album_id IS NOT NULL OR is_current = 0)
+);
+--> statement-breakpoint
+CREATE UNIQUE INDEX album_slugs_one_current ON album_slugs(site_id, album_id) WHERE is_current = 1;
+--> statement-breakpoint
+CREATE INDEX album_slugs_album ON album_slugs(site_id, album_id);
+--> statement-breakpoint
+CREATE TRIGGER album_slugs_same_site_insert BEFORE INSERT ON album_slugs
+WHEN NEW.album_id IS NOT NULL AND NOT EXISTS (
+ SELECT 1 FROM albums WHERE id = NEW.album_id AND site_id = NEW.site_id
+)
+BEGIN SELECT RAISE(ABORT, 'cross-site or missing relation'); END;
+--> statement-breakpoint
+CREATE TRIGGER album_slugs_same_site_update BEFORE UPDATE OF album_id, site_id ON album_slugs
+WHEN NEW.album_id IS NOT NULL AND NOT EXISTS (
+ SELECT 1 FROM albums WHERE id = NEW.album_id AND site_id = NEW.site_id
+)
+BEGIN SELECT RAISE(ABORT, 'cross-site or missing relation'); END;
+--> statement-breakpoint
+CREATE TRIGGER album_slugs_tombstone BEFORE DELETE ON albums
+BEGIN
+ UPDATE album_slugs SET album_id = NULL, is_current = 0 WHERE album_id = OLD.id;
+END;
diff --git a/packages/database/migrations/meta/_journal.json b/packages/database/migrations/meta/_journal.json
index 8a84461a..87c68f22 100644
--- a/packages/database/migrations/meta/_journal.json
+++ b/packages/database/migrations/meta/_journal.json
@@ -141,6 +141,13 @@
"when": 1792307737436,
"tag": "0019_job_leases",
"breakpoints": true
+ },
+ {
+ "idx": 20,
+ "version": "6",
+ "when": 1792307738436,
+ "tag": "0020_album_slugs",
+ "breakpoints": true
}
]
}
diff --git a/packages/database/package.json b/packages/database/package.json
index 4ff80ac4..9257d5ac 100644
--- a/packages/database/package.json
+++ b/packages/database/package.json
@@ -9,7 +9,8 @@
"./repositories": "./src/repositories.ts",
"./dto": "./src/dto.ts",
"./album-membership": "./src/album-membership.ts",
- "./album-photos-add": "./src/album-photos-add.ts"
+ "./album-photos-add": "./src/album-photos-add.ts",
+ "./album-slugs": "./src/album-slugs.ts"
},
"scripts": {
"type-check": "tsc --noEmit"
@@ -17,14 +18,15 @@
"dependencies": {
"@chronoframe/contracts": "workspace:*",
"@chronoframe/core": "workspace:*",
+ "@chronoframe/jobs": "workspace:*",
"better-sqlite3": "^12.11.1",
"drizzle-orm": "^0.45.4",
- "@chronoframe/jobs": "workspace:*"
+ "transliteration": "2.6.1"
},
"devDependencies": {
"@types/better-sqlite3": "^9.6.0",
- "typescript": "^5.9.3",
- "@types/node": "^22.20.5"
+ "@types/node": "^22.20.5",
+ "typescript": "^5.9.3"
},
"license": "AGPL-3.0-only"
}
diff --git a/packages/database/src/album-slug.ts b/packages/database/src/album-slug.ts
new file mode 100644
index 00000000..ea2f59db
--- /dev/null
+++ b/packages/database/src/album-slug.ts
@@ -0,0 +1,39 @@
+import { slugify } from 'transliteration'
+import { CoreError } from '@chronoframe/core'
+
+export const ALBUM_SLUG_MAX_LENGTH = 80
+const slugPattern = /^[a-z0-9]+(?:-[a-z0-9]+)*$/
+
+/** Convert a title to a stable, URL-safe base. Persistence owns uniqueness. */
+export function generatedAlbumSlug(title: string): string {
+ const result = slugify(title.normalize('NFKD'), {
+ separator: '-',
+ lowercase: true,
+ })
+ .replace(/[^a-z0-9]+/g, '-')
+ .replace(/^-+|-+$/g, '')
+ .slice(0, ALBUM_SLUG_MAX_LENGTH)
+ .replace(/-+$/g, '')
+ if (!result) return 'album'
+ return /^\d+$/.test(result)
+ ? `album-${result.slice(0, ALBUM_SLUG_MAX_LENGTH - 6)}`
+ : result
+}
+
+/** Keep a manually chosen slug exact after trimming surrounding whitespace. */
+export function validateCustomAlbumSlug(input: string): string {
+ const slug = input.trim()
+ if (
+ slug.length > ALBUM_SLUG_MAX_LENGTH ||
+ !slugPattern.test(slug) ||
+ /^\d+$/.test(slug)
+ )
+ throw new CoreError(400, 'Invalid album URL slug')
+ return slug
+}
+
+export function suffixedAlbumSlug(base: string, suffix: number): string {
+ if (suffix === 0) return base
+ const ending = `-${suffix}`
+ return `${base.slice(0, ALBUM_SLUG_MAX_LENGTH - ending.length).replace(/-+$/g, '')}${ending}`
+}
diff --git a/packages/database/src/album-slugs.ts b/packages/database/src/album-slugs.ts
new file mode 100644
index 00000000..db16022f
--- /dev/null
+++ b/packages/database/src/album-slugs.ts
@@ -0,0 +1,173 @@
+import { CoreError, type SiteContext } from '@chronoframe/core'
+import { and, asc, eq } from 'drizzle-orm'
+import { type AppDatabase } from './connection.ts'
+import * as tables from './schema.ts'
+import {
+ generatedAlbumSlug,
+ suffixedAlbumSlug,
+ validateCustomAlbumSlug,
+} from './album-slug.ts'
+
+type AlbumSlugDb = Pick<AppDatabase, 'select' | 'insert' | 'update'>
+
+function currentSlug(db: AlbumSlugDb, siteId: number, albumId: number) {
+ return db
+ .select({ slug: tables.albumSlugs.slug })
+ .from(tables.albumSlugs)
+ .where(
+ and(
+ eq(tables.albumSlugs.siteId, siteId),
+ eq(tables.albumSlugs.albumId, albumId),
+ eq(tables.albumSlugs.isCurrent, true),
+ ),
+ )
+ .get()?.slug
+}
+
+export function getCurrentAlbumSlug(
+ db: AlbumSlugDb,
+ site: SiteContext,
+ albumId: number,
+): string {
+ const slug = currentSlug(db, site.id, albumId)
+ if (!slug) throw new Error(`Album ${albumId} has no current slug`)
+ return slug
+}
+
+/** Must run inside the caller's transaction. The registry is the sole slug namespace. */
+export function claimAlbumSlug(
+ db: AlbumSlugDb,
+ site: SiteContext,
+ albumId: number,
+ title: string,
+ requestedSlug: string,
+): string {
+ const automatic = requestedSlug.trim() === ''
+ const base = automatic
+ ? generatedAlbumSlug(title)
+ : validateCustomAlbumSlug(requestedSlug)
+ for (let suffix = 0; suffix < 1_000_000; suffix++) {
+ const slug = automatic ? suffixedAlbumSlug(base, suffix) : base
+ const existing = db
+ .select()
+ .from(tables.albumSlugs)
+ .where(
+ and(
+ eq(tables.albumSlugs.siteId, site.id),
+ eq(tables.albumSlugs.slug, slug),
+ ),
+ )
+ .get()
+ if (existing && existing.albumId !== albumId) {
+ if (!automatic) throw new CoreError(409, 'Album URL slug already exists')
+ continue
+ }
+ if (existing?.isCurrent) return slug
+ db.update(tables.albumSlugs)
+ .set({ isCurrent: false })
+ .where(
+ and(
+ eq(tables.albumSlugs.siteId, site.id),
+ eq(tables.albumSlugs.albumId, albumId),
+ eq(tables.albumSlugs.isCurrent, true),
+ ),
+ )
+ .run()
+ if (existing) {
+ db.update(tables.albumSlugs)
+ .set({ isCurrent: true })
+ .where(
+ and(
+ eq(tables.albumSlugs.siteId, site.id),
+ eq(tables.albumSlugs.slug, slug),
+ ),
+ )
+ .run()
+ } else {
+ db.insert(tables.albumSlugs)
+ .values({ siteId: site.id, slug, albumId, isCurrent: true })
+ .run()
+ }
+ return slug
+ }
+ throw new Error('Album slug namespace exhausted')
+}
+
+/** Repeatable repair for old installations and rollback-created albums. */
+export function backfillAlbumSlugs(db: AppDatabase) {
+ return db.transaction(
+ (tx) => {
+ const albums = tx
+ .select({
+ id: tables.albums.id,
+ siteId: tables.albums.siteId,
+ title: tables.albums.title,
+ })
+ .from(tables.albums)
+ .orderBy(asc(tables.albums.siteId), asc(tables.albums.id))
+ .all()
+ let created = 0
+ for (const album of albums) {
+ if (currentSlug(tx, album.siteId, album.id)) continue
+ claimAlbumSlug(tx, { id: album.siteId }, album.id, album.title, '')
+ created++
+ }
+ return created
+ },
+ { behavior: 'immediate' },
+ )
+}
+
+export function resolveAlbumSlug(
+ db: AppDatabase,
+ site: SiteContext,
+ slug: string,
+) {
+ return db
+ .select({
+ albumId: tables.albumSlugs.albumId,
+ isCurrent: tables.albumSlugs.isCurrent,
+ })
+ .from(tables.albumSlugs)
+ .where(
+ and(
+ eq(tables.albumSlugs.siteId, site.id),
+ eq(tables.albumSlugs.slug, slug),
+ ),
+ )
+ .get()
+}
+
+/** Resolve both old numeric paths and current/historical public slugs. */
+export function resolveAlbumPath(
+ db: AppDatabase,
+ site: SiteContext,
+ segment: string,
+) {
+ if (segment.length > 80) return null
+ let albumId: number | null = null
+ let isCurrent = false
+ if (/^\d+$/.test(segment)) {
+ const number = Number(segment)
+ if (Number.isSafeInteger(number) && number > 0) albumId = number
+ } else if (/^[a-z0-9]+(?:-[a-z0-9]+)*$/.test(segment)) {
+ const entry = resolveAlbumSlug(db, site, segment)
+ albumId = entry?.albumId ?? null
+ isCurrent = entry?.isCurrent ?? false
+ }
+ if (albumId === null) return null
+ const album = db
+ .select({ isHidden: tables.albums.isHidden })
+ .from(tables.albums)
+ .where(
+ and(eq(tables.albums.siteId, site.id), eq(tables.albums.id, albumId)),
+ )
+ .get()
+ if (!album) return null
+ return {
+ albumId,
+ slug: getCurrentAlbumSlug(db, site, albumId),
+ isCanonical: isCurrent,
+ isHidden: album.isHidden,
+ }
+}
diff --git a/packages/database/src/connection.ts b/packages/database/src/connection.ts
index c56b4514..0e98f943 100644
--- a/packages/database/src/connection.ts
+++ b/packages/database/src/connection.ts
@@ -6,6 +6,7 @@ import { dirname } from 'node:path'
import Database from 'better-sqlite3'
import { drizzle } from 'drizzle-orm/better-sqlite3'
import * as schema from './schema.ts'
+import { backfillAlbumSlugs } from './album-slugs.ts'
export const tables = schema
export type AppDatabase = ReturnType<typeof drizzle<typeof schema>>
@@ -43,8 +44,13 @@ export function openDatabase(options: DatabaseOptions) {
sqlite.pragma('cache_size = 1000')
sqlite.pragma('temp_store = MEMORY')
const db = drizzle(sqlite, { schema })
- if (options.migrationsFolder)
+ if (options.migrationsFolder) {
migrateDatabase(db, options.migrationsFolder, options.filename)
+ const slugTable = db.get<{ present: number }>(
+ sql`SELECT 1 AS present FROM sqlite_master WHERE type='table' AND name='album_slugs'`,
+ )
+ if (slugTable) backfillAlbumSlugs(db)
+ }
return {
db,
/** SQLite backup includes committed WAL data and does not mutate the source. */
diff --git a/packages/database/src/dto.ts b/packages/database/src/dto.ts
index 57362500..0ec83050 100644
--- a/packages/database/src/dto.ts
+++ b/packages/database/src/dto.ts
@@ -50,9 +50,10 @@ export function toPhotoDto(photo: PhotoRow): Photo {
}
/** Serialize album dates and expose password presence without its hash. */
-export function toAlbumDto(album: AlbumRow): Album {
+export function toAlbumDto(album: AlbumRow, slug: string): Album {
return {
id: album.id,
+ slug,
title: album.title,
description: album.description,
coverPhotoId: album.coverPhotoId,
diff --git a/packages/database/src/schema.ts b/packages/database/src/schema.ts
index e23a326d..60600e57 100644
--- a/packages/database/src/schema.ts
+++ b/packages/database/src/schema.ts
@@ -248,6 +248,28 @@ export const albums = sqliteTable(
(t) => [index('idx_albums_site').on(t.siteId)],
)
+/** Current and historical public paths share one per-site namespace. */
+export const albumSlugs = sqliteTable(
+ 'album_slugs',
+ {
+ siteId: siteColumn(),
+ slug: text('slug').notNull(),
+ albumId: integer('album_id').references(() => albums.id, {
+ onDelete: 'set null',
+ }),
+ isCurrent: integer('is_current', { mode: 'boolean' })
+ .notNull()
+ .default(false),
+ },
+ (t) => [
+ primaryKey({ columns: [t.siteId, t.slug] }),
+ uniqueIndex('album_slugs_one_current')
+ .on(t.siteId, t.albumId)
+ .where(sql`is_current = 1`),
+ index('album_slugs_album').on(t.siteId, t.albumId),
+ ],
+)
+
// 相簿-照片 多对多关系表
export const albumPhotos = sqliteTable(
'album_photos',
diff --git a/packages/database/src/sqlite-mutations.ts b/packages/database/src/sqlite-mutations.ts
index 17594bd4..73080ecd 100644
--- a/packages/database/src/sqlite-mutations.ts
+++ b/packages/database/src/sqlite-mutations.ts
@@ -10,6 +10,7 @@ import type {
} from '@chronoframe/core'
import { tables, type AppDatabase } from './connection.ts'
import { toAlbumDto, toPhotoDto } from './dto.ts'
+import { claimAlbumSlug, getCurrentAlbumSlug } from './album-slugs.ts'
/** Keep album row and membership changes inside synchronous SQLite transactions. */
export function createSqliteAlbumWriteRepository(
@@ -33,61 +34,41 @@ export function createSqliteAlbumWriteRepository(
)
},
async createFirst(data, photoIds) {
- return db.transaction((tx) => {
- const row = tx
- .select({ min: min(tables.albums.position) })
- .from(tables.albums)
- .where(siteEq(tables.albums.siteId, site.id))
- .get()
- const album = tx
- .insert(tables.albums)
- .values({
- ...data,
- siteId: site.id,
- position: (row?.min ?? 1000) - 1000,
- })
- .returning()
- .get()
- appendAlbumPhotos(tx, album.id, photoIds, site)
- return toAlbumDto(album)
- })
+ return db.transaction(
+ (tx) => {
+ const { slug: requestedSlug = '', ...albumData } = data
+ const row = tx
+ .select({ min: min(tables.albums.position) })
+ .from(tables.albums)
+ .where(siteEq(tables.albums.siteId, site.id))
+ .get()
+ const album = tx
+ .insert(tables.albums)
+ .values({
+ ...albumData,
+ siteId: site.id,
+ position: (row?.min ?? 1000) - 1000,
+ })
+ .returning()
+ .get()
+ appendAlbumPhotos(tx, album.id, photoIds, site)
+ const slug = claimAlbumSlug(
+ tx,
+ site,
+ album.id,
+ album.title,
+ requestedSlug,
+ )
+ return toAlbumDto(album, slug)
+ },
+ { behavior: 'immediate' },
+ )
},
async update(id, data, photoIds) {
- return db.transaction((tx) => {
- const exists = tx
- .select({ id: tables.albums.id })
- .from(tables.albums)
- .where(
- siteAnd(
- eq(tables.albums.id, id),
- siteEq(tables.albums.siteId, site.id),
- ),
- )
- .get()
- if (!exists) return null
- tx.update(tables.albums)
- .set(data)
- .where(
- siteAnd(
- eq(tables.albums.id, id),
- siteEq(tables.albums.siteId, site.id),
- ),
- )
- .run()
- if (photoIds !== undefined) {
- tx.delete(tables.albumPhotos)
- .where(
- siteAnd(
- eq(tables.albumPhotos.albumId, id),
- siteEq(tables.albumPhotos.siteId, site.id),
- ),
- )
- .run()
- appendAlbumPhotos(tx, id, photoIds, site)
- }
- return toAlbumDto(
- tx
- .select()
+ return db.transaction(
+ (tx) => {
+ const exists = tx
+ .select({ id: tables.albums.id, title: tables.albums.title })
.from(tables.albums)
.where(
siteAnd(
@@ -95,9 +76,57 @@ export function createSqliteAlbumWriteRepository(
siteEq(tables.albums.siteId, site.id),
),
)
- .get()!,
- )
- })
+ .get()
+ if (!exists) return null
+ const { slug: requestedSlug, ...albumData } = data
+ if (Object.keys(albumData).length) {
+ tx.update(tables.albums)
+ .set(albumData)
+ .where(
+ siteAnd(
+ eq(tables.albums.id, id),
+ siteEq(tables.albums.siteId, site.id),
+ ),
+ )
+ .run()
+ }
+ if (photoIds !== undefined) {
+ tx.delete(tables.albumPhotos)
+ .where(
+ siteAnd(
+ eq(tables.albumPhotos.albumId, id),
+ siteEq(tables.albumPhotos.siteId, site.id),
+ ),
+ )
+ .run()
+ appendAlbumPhotos(tx, id, photoIds, site)
+ }
+ const slug =
+ requestedSlug === undefined
+ ? getCurrentAlbumSlug(tx, site, id)
+ : claimAlbumSlug(
+ tx,
+ site,
+ id,
+ data.title ?? exists.title,
+ requestedSlug,
+ )
+ return toAlbumDto(
+ tx
+ .select()
+ .from(tables.albums)
+ .where(
+ siteAnd(
+ eq(tables.albums.id, id),
+ siteEq(tables.albums.siteId, site.id),
+ ),
+ )
+ .get()!,
+ slug,
+ )
+ },
+ { behavior: 'immediate' },
+ )
},
async delete(id) {
return db.transaction((tx) => {
diff --git a/packages/database/src/sqlite-resources.ts b/packages/database/src/sqlite-resources.ts
index 7a6bacc9..38f9b742 100644
--- a/packages/database/src/sqlite-resources.ts
+++ b/packages/database/src/sqlite-resources.ts
@@ -1,7 +1,7 @@
import { requireSite } from './site-repository.ts'
import { type SiteContext } from '@chronoframe/core'
import { and as siteAnd, eq as siteEq } from 'drizzle-orm'
-import { asc, desc, eq, getTableColumns, notInArray } from 'drizzle-orm'
+import { and, asc, desc, eq, getTableColumns, notInArray } from 'drizzle-orm'
import type { ResourceReadRepository } from '@chronoframe/core'
import { tables, type AppDatabase } from './connection.ts'
import { toAlbumDto, toPhotoDto } from './dto.ts'
@@ -12,8 +12,10 @@ export function createSqliteResourceRepository(
site: SiteContext,
): ResourceReadRepository {
requireSite(db, site)
- const albumRecord = (row: typeof tables.albums.$inferSelect) => ({
- resource: toAlbumDto(row),
+ const albumRecord = (
+ row: typeof tables.albums.$inferSelect & { slug: string },
+ ) => ({
+ resource: toAlbumDto(row, row.slug),
passwordHash: row.passwordHash,
})
return {
@@ -45,8 +47,19 @@ export function createSqliteResourceRepository(
},
async listAlbums() {
return db
- .select()
+ .select({
+ ...getTableColumns(tables.albums),
+ slug: tables.albumSlugs.slug,
+ })
.from(tables.albums)
+ .innerJoin(
+ tables.albumSlugs,
+ and(
+ eq(tables.albumSlugs.siteId, tables.albums.siteId),
+ eq(tables.albumSlugs.albumId, tables.albums.id),
+ eq(tables.albumSlugs.isCurrent, true),
+ ),
+ )
.where(siteEq(tables.albums.siteId, site.id))
.orderBy(asc(tables.albums.position), desc(tables.albums.createdAt))
.all()
@@ -54,8 +67,19 @@ export function createSqliteResourceRepository(
},
async getAlbum(id) {
const row = db
- .select()
+ .select({
+ ...getTableColumns(tables.albums),
+ slug: tables.albumSlugs.slug,
+ })
.from(tables.albums)
+ .innerJoin(
+ tables.albumSlugs,
+ and(
+ eq(tables.albumSlugs.siteId, tables.albums.siteId),
+ eq(tables.albumSlugs.albumId, tables.albums.id),
+ eq(tables.albumSlugs.isCurrent, true),
+ ),
+ )
.where(
siteAnd(
eq(tables.albums.id, id),
diff --git a/packages/gallery/app/components/album/Listing.vue b/packages/gallery/app/components/album/Listing.vue
index 86ec4c3c..5130359e 100644
--- a/packages/gallery/app/components/album/Listing.vue
+++ b/packages/gallery/app/components/album/Listing.vue
@@ -291,7 +291,7 @@ const hoveredAlbum = ref<number | null>(null)
<NuxtLink
v-for="album in visibleAlbums"
:key="album.id"
- :to="`/albums/${album.id}`"
+ :to="`/albums/${album.slug}`"
class="block"
@mouseenter="hoveredAlbum = album.id"
@mouseleave="hoveredAlbum = null"
diff --git a/packages/gallery/app/components/photo/InfoPanel.vue b/packages/gallery/app/components/photo/InfoPanel.vue
index 8d402cbc..e90f4ab5 100644
--- a/packages/gallery/app/components/photo/InfoPanel.vue
+++ b/packages/gallery/app/components/photo/InfoPanel.vue
@@ -14,6 +14,7 @@ interface Props {
interface Album {
id: number
+ slug: string
title: string
description: string | null
coverPhotoId: string | null
@@ -481,8 +482,8 @@ const onTagClick = (tag: string) => {
})
}
-const onAlbumClick = (albumId: number) => {
- window.open(`/albums/${albumId}`)
+const onAlbumClick = (albumSlug: string) => {
+ window.open(`/albums/${albumSlug}`)
}
</script>
@@ -588,7 +589,7 @@ const onAlbumClick = (albumId: number) => {
v-for="album in albums"
:key="album.id"
class="p-3 bg-white/5 border border-white/10 rounded-lg cursor-pointer hover:bg-white/10 transition-colors"
- @click="onAlbumClick(album.id)"
+ @click="onAlbumClick(album.slug)"
>
<p class="text-sm text-white font-medium line-clamp-1">
{{ album.title }}
diff --git a/packages/gallery/app/pages/albums/[albumId].vue b/packages/gallery/app/pages/albums/[albumId].vue
index fc4ab5f2..3d1b16f7 100644
--- a/packages/gallery/app/pages/albums/[albumId].vue
+++ b/packages/gallery/app/pages/albums/[albumId].vue
@@ -9,10 +9,46 @@ const dayjs = useDayjs()
const { user } = useUserSession()
const { albumListPath } = useHomeView()
-const albumId = computed(() => {
- const id = route.params.albumId as string
- return parseInt(id, 10)
+const albumSegment = computed(() => String(route.params.albumId))
+const { data: resolved, error: resolveError } = await useGalleryFetch<{
+ albumId: number
+ slug: string
+ isCanonical: boolean
+}>(() => `/api/albums/resolve/${encodeURIComponent(albumSegment.value)}`, {
+ watch: [albumSegment],
})
+if (resolveError.value || !resolved.value)
+ throw createError({ statusCode: 404, statusMessage: $t('album.notFound') })
+if (!resolved.value.isCanonical)
+ await navigateTo(
+ {
+ path: `/albums/${resolved.value.slug}`,
+ query: route.query,
+ hash: route.hash,
+ },
+ {
+ redirectCode: 301,
+ replace: true,
+ },
+ )
+watch(resolved, (value) => {
+ if (value && !value.isCanonical)
+ void navigateTo(
+ { path: `/albums/${value.slug}`, query: route.query, hash: route.hash },
+ { replace: true },
+ )
+})
+const albumId = computed(() => resolved.value?.albumId ?? 0)
+const canonicalAlbumRoute = computed(() => `/albums/${resolved.value?.slug}`)
+const requestUrl = useRequestURL()
+useHead(() => ({
+ link: [
+ {
+ rel: 'canonical',
+ href: `${requestUrl.origin}${canonicalAlbumRoute.value}`,
+ },
+ ],
+}))
const {
data: album,
@@ -133,7 +169,7 @@ const handleOpenViewer = (index: number) => {
const photos = albumData.value?.photos
if (photos && photos[index]) {
const { openViewer } = useViewerState()
- const albumRoute = `/albums/${albumId.value}`
+ const albumRoute = canonicalAlbumRoute.value
// Scope the viewer to the album's photos so prev/next stays within this album.
// The fetched photos are serialized rows of the same shape as Photo.
openViewer(index, albumRoute, photos as Photo[])
@@ -146,18 +182,16 @@ watch(
([requestedPhoto, photos]) => {
const viewer = useViewerState()
if (typeof requestedPhoto !== 'string' || !photos) {
- if (viewer.returnRoute === `/albums/${albumId.value}`)
- viewer.closeViewer()
+ if (viewer.returnRoute === canonicalAlbumRoute.value) viewer.closeViewer()
return
}
const index = photos.findIndex((photo) => photo.id === requestedPhoto)
if (index < 0) {
- if (viewer.returnRoute === `/albums/${albumId.value}`)
- viewer.closeViewer()
+ if (viewer.returnRoute === canonicalAlbumRoute.value) viewer.closeViewer()
return
}
const { openViewer } = viewer
- openViewer(index, `/albums/${albumId.value}`, photos as Photo[])
+ openViewer(index, canonicalAlbumRoute.value, photos as Photo[])
},
{ immediate: true },
)
diff --git a/packages/gallery/i18n/locales/en.json b/packages/gallery/i18n/locales/en.json
index 4528c3e4..19eb40b5 100644
--- a/packages/gallery/i18n/locales/en.json
+++ b/packages/gallery/i18n/locales/en.json
@@ -922,6 +922,12 @@
"title": "Title",
"titlePlaceholder": "Enter album title",
"titleRequired": "Please enter album title",
+ "slug": "URL slug",
+ "slugPlaceholder": "Leave blank to generate from the title",
+ "slugHint": "Clear this field to generate from the title. Changing it redirects old links.",
+ "slugCurrent": "Current URL",
+ "slugInvalid": "Use lowercase letters, numbers, and single hyphens (up to 80 characters).",
+ "slugConflict": "This album URL is already in use.",
"description": "Description",
"descriptionPlaceholder": "Enter album description (optional)",
"coverPhoto": "Album Cover",
diff --git a/packages/gallery/i18n/locales/ja.json b/packages/gallery/i18n/locales/ja.json
index 8285a8da..c1612e69 100644
--- a/packages/gallery/i18n/locales/ja.json
+++ b/packages/gallery/i18n/locales/ja.json
@@ -844,6 +844,12 @@
"title": "タイトル",
"titlePlaceholder": "アルバムのタイトルを入力",
"titleRequired": "アルバムのタイトルを入力してください",
+ "slug": "URL スラッグ",
+ "slugPlaceholder": "空欄にするとタイトルから生成します",
+ "slugHint": "空欄にするとタイトルから生成します。変更前の URL はリダイレクトされます。",
+ "slugCurrent": "現在の URL",
+ "slugInvalid": "小文字の英字、数字、単一のハイフンを使用してください(最大80文字)。",
+ "slugConflict": "このアルバム URL は既に使用されています。",
"description": "説明",
"descriptionPlaceholder": "アルバムの説明を入力(オプション)",
"coverPhoto": "アルバムカバー",
diff --git a/packages/gallery/i18n/locales/ru.json b/packages/gallery/i18n/locales/ru.json
index f29e9c03..9ccb4ebc 100644
--- a/packages/gallery/i18n/locales/ru.json
+++ b/packages/gallery/i18n/locales/ru.json
@@ -922,6 +922,12 @@
"title": "Название",
"titlePlaceholder": "Введите название альбома",
"titleRequired": "Введите название альбома",
+ "slug": "Адрес альбома (slug)",
+ "slugPlaceholder": "Оставьте пустым для создания из названия",
+ "slugHint": "Очистите поле, чтобы создать адрес из названия. Старые ссылки будут перенаправлены.",
+ "slugCurrent": "Текущий адрес",
+ "slugInvalid": "Используйте строчные латинские буквы, цифры и одиночные дефисы (до 80 символов).",
+ "slugConflict": "Этот адрес альбома уже используется.",
"description": "Описание",
"descriptionPlaceholder": "Введите описание альбома (необязательно)",
"coverPhoto": "Обложка альбома",
diff --git a/packages/gallery/i18n/locales/zh-Hans.json b/packages/gallery/i18n/locales/zh-Hans.json
index 7b5489f3..1f780584 100644
--- a/packages/gallery/i18n/locales/zh-Hans.json
+++ b/packages/gallery/i18n/locales/zh-Hans.json
@@ -922,6 +922,12 @@
"title": "标题",
"titlePlaceholder": "输入相簿标题",
"titleRequired": "请输入相簿标题",
+ "slug": "网址别名",
+ "slugPlaceholder": "留空则根据标题生成",
+ "slugHint": "清空此字段可根据标题生成。旧链接将自动重定向。",
+ "slugCurrent": "当前网址",
+ "slugInvalid": "仅可使用小写英文字母、数字和单个连字符(最多 80 个字符)。",
+ "slugConflict": "此相簿网址已被使用。",
"description": "描述",
"descriptionPlaceholder": "输入相簿描述(可选)",
"coverPhoto": "相簿封面",
diff --git a/packages/gallery/i18n/locales/zh-Hant-HK.json b/packages/gallery/i18n/locales/zh-Hant-HK.json
index c31614bc..2c894c8d 100644
--- a/packages/gallery/i18n/locales/zh-Hant-HK.json
+++ b/packages/gallery/i18n/locales/zh-Hant-HK.json
@@ -844,6 +844,12 @@
"title": "標題",
"titlePlaceholder": "輸入相簿標題",
"titleRequired": "請輸入相簿標題",
+ "slug": "網址別名",
+ "slugPlaceholder": "留空則根據標題產生",
+ "slugHint": "清除此欄位可根據標題產生。舊連結會自動重新導向。",
+ "slugCurrent": "目前網址",
+ "slugInvalid": "只可使用小寫英文字母、數字及單個連字號(最多 80 個字元)。",
+ "slugConflict": "此相簿網址已被使用。",
"description": "描述",
"descriptionPlaceholder": "輸入相簿描述(可選)",
"coverPhoto": "相簿封面",
diff --git a/packages/gallery/i18n/locales/zh-Hant-TW.json b/packages/gallery/i18n/locales/zh-Hant-TW.json
index b3a2e463..70dd1b85 100644
--- a/packages/gallery/i18n/locales/zh-Hant-TW.json
+++ b/packages/gallery/i18n/locales/zh-Hant-TW.json
@@ -844,6 +844,12 @@
"title": "標題",
"titlePlaceholder": "輸入相簿標題",
"titleRequired": "請輸入相簿標題",
+ "slug": "網址別名",
+ "slugPlaceholder": "留空則根據標題產生",
+ "slugHint": "清除此欄位可根據標題產生。舊連結會自動重新導向。",
+ "slugCurrent": "目前網址",
+ "slugInvalid": "僅可使用小寫英文字母、數字與單個連字號(最多 80 個字元)。",
+ "slugConflict": "此相簿網址已被使用。",
"description": "描述",
"descriptionPlaceholder": "輸入相簿描述(選填)",
"coverPhoto": "相簿封面",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index bf02ec85..6347d1da 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -338,6 +338,9 @@ importers:
drizzle-orm:
specifier: ^0.45.4
version: 0.45.4(@cloudflare/[email protected])(@opentelemetry/[email protected])(@types/[email protected])([email protected])
+ transliteration:
+ specifier: 2.6.1
+ version: 2.6.1
devDependencies:
"@types/better-sqlite3":
specifier: ^9.6.0
@@ -8199,6 +8202,11 @@ packages:
resolution: {integrity: sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==}
+ resolution: {integrity: sha512-hJ9BhrQAOnNTbpOr1MxsNjZISkn7ppvF5TKUeFmTE1mG4ZPD/XVxF0L0LUoIUCWmQyxH0gJpVtfYLAWf298U9w==}
+ engines: {node: '>=20.0.0'}
+ hasBin: true
+
resolution: {integrity: sha512-kRj8B+YHZCc9kQYdWfJB2/oUl9rA99qbowYYBtr4ui4mZyAQ2JpvVBd/6U2YloATfqBhBTSMhTpgBHtU0Mf3Rg==}
@@ -17649,6 +17657,8 @@ snapshots:
+
diff --git a/tests/album-slug-persistence.test.ts b/tests/album-slug-persistence.test.ts
new file mode 100644
index 00000000..5c473a09
--- /dev/null
+++ b/tests/album-slug-persistence.test.ts
@@ -0,0 +1,128 @@
+import assert from 'node:assert/strict'
+import test from 'node:test'
+import Database from 'better-sqlite3'
+import { drizzle } from 'drizzle-orm/better-sqlite3'
+import { migrate } from 'drizzle-orm/better-sqlite3/migrator'
+import { DEFAULT_SITE, CoreError, createAlbumWriter } from '@chronoframe/core'
+import * as schema from '../packages/database/src/schema.ts'
+import {
+ backfillAlbumSlugs,
+ resolveAlbumPath,
+ resolveAlbumSlug,
+} from '../packages/database/src/album-slugs.ts'
+import { createSqliteAlbumWriteRepository } from '../packages/database/src/sqlite-mutations.ts'
+
+const access = { authenticated: true }
+
+test('album slugs remain unique, redirectable, and reserved after deletion', async () => {
+ const sqlite = new Database(':memory:')
+ sqlite.pragma('foreign_keys = ON')
+ const db = drizzle(sqlite, { schema })
+ migrate(db, { migrationsFolder: './packages/database/migrations' })
+ try {
+ const writer = createAlbumWriter({
+ repository: createSqliteAlbumWriteRepository(db, DEFAULT_SITE),
+ clock: { now: () => new Date() },
+ hashPassword: async (value) => value,
+ })
+ const first = await writer.create({ title: 'My Album' }, access)
+ const second = await writer.create({ title: 'My Album' }, access)
+ assert.equal(first.slug, 'my-album')
+ assert.equal(second.slug, 'my-album-1')
+ const site2 = db
+ .insert(schema.sites)
+ .values({ workspaceId: 1, name: 'Another site' })
+ .returning({ id: schema.sites.id })
+ .get()
+ const otherWriter = createAlbumWriter({
+ repository: createSqliteAlbumWriteRepository(db, { id: site2.id }),
+ clock: { now: () => new Date() },
+ hashPassword: async (value) => value,
+ })
+ assert.equal(
+ (await otherWriter.create({ title: 'My Album' }, access)).slug,
+ 'my-album',
+ )
+
+ const renamed = await writer.update(
+ first.id,
+ { title: 'A New Title', slug: '' },
+ access,
+ )
+ assert.equal(renamed.slug, 'a-new-title')
+ assert.deepEqual(resolveAlbumPath(db, DEFAULT_SITE, String(first.id)), {
+ albumId: first.id,
+ slug: 'a-new-title',
+ isCanonical: false,
+ isHidden: false,
+ })
+ assert.equal(
+ resolveAlbumPath(db, DEFAULT_SITE, 'a-new-title')?.isCanonical,
+ true,
+ )
+ assert.equal(
+ resolveAlbumSlug(db, DEFAULT_SITE, 'my-album')?.albumId,
+ first.id,
+ )
+ assert.equal(
+ resolveAlbumSlug(db, DEFAULT_SITE, 'my-album')?.isCurrent,
+ false,
+ )
+ await assert.rejects(
+ writer.update(second.id, { slug: 'my-album' }, access),
+ (error) => error instanceof CoreError && error.statusCode === 409,
+ )
+ assert.equal(
+ (await writer.update(first.id, { title: 'Only Title' }, access)).slug,
+ 'a-new-title',
+ )
+ assert.equal(
+ (await writer.update(first.id, { slug: 'my-album' }, access)).slug,
+ 'my-album',
+ )
+
+ await assert.rejects(
+ writer.update(second.id, { slug: 'my-album' }, access),
+ (error) => error instanceof CoreError && error.statusCode === 409,
+ )
+ await assert.rejects(
+ writer.update(second.id, { slug: 'Invalid Slug' }, access),
+ (error) => error instanceof CoreError && error.statusCode === 400,
+ )
+ await writer.delete(first.id, access)
+ assert.equal(resolveAlbumSlug(db, DEFAULT_SITE, 'my-album')?.albumId, null)
+ assert.equal(
+ resolveAlbumSlug(db, DEFAULT_SITE, 'a-new-title')?.albumId,
+ null,
+ )
+ assert.equal(
+ (await writer.create({ title: 'My Album' }, access)).slug,
+ 'my-album-2',
+ )
+ } finally {
+ sqlite.close()
+ }
+})
+
+test('backfill assigns deterministic slugs once for existing rows', () => {
+ const sqlite = new Database(':memory:')
+ const db = drizzle(sqlite, { schema })
+ migrate(db, { migrationsFolder: './packages/database/migrations' })
+ try {
+ db.insert(schema.albums)
+ .values([{ title: '你好' }, { title: '你好' }])
+ .run()
+ assert.equal(backfillAlbumSlugs(db), 2)
+ assert.equal(backfillAlbumSlugs(db), 0)
+ assert.deepEqual(
+ db
+ .select()
+ .from(schema.albumSlugs)
+ .all()
+ .map((row) => row.slug),
+ ['ni-hao', 'ni-hao-1'],
+ )
+ } finally {
+ sqlite.close()
+ }
+})
diff --git a/tests/album-slug.test.ts b/tests/album-slug.test.ts
new file mode 100644
index 00000000..228046cb
--- /dev/null
+++ b/tests/album-slug.test.ts
@@ -0,0 +1,36 @@
+import assert from 'node:assert/strict'
+import test from 'node:test'
+import {
+ generatedAlbumSlug,
+ validateCustomAlbumSlug,
+} from '../packages/database/src/album-slug.ts'
+
+test('generated album slugs romanize titles and normalize separators', () => {
+ assert.equal(
+ generatedAlbumSlug('My New Favourite Album'),
+ 'my-new-favourite-album',
+ )
+ assert.equal(generatedAlbumSlug('Crème brûlée!'), 'creme-brulee')
+ assert.equal(generatedAlbumSlug('你好,世界'), 'ni-hao-shi-jie')
+ assert.equal(generatedAlbumSlug('Привет мир'), 'privet-mir')
+})
+
+test('custom album slugs are exact, lowercase, safe, and not numeric', () => {
+ assert.equal(validateCustomAlbumSlug(' my-album '), 'my-album')
+ for (const invalid of [
+ '1',
+ 'My Album',
+ 'my--album',
+ '你好',
+ '../album',
+ '',
+ ]) {
+ assert.throws(() => validateCustomAlbumSlug(invalid))
+ }
+})
+
+test('automatic slugs have a fallback and a bounded length', () => {
+ assert.equal(generatedAlbumSlug('🎉'), 'album')
+ assert.ok(generatedAlbumSlug('a'.repeat(200)).length <= 80)
+ assert.ok(generatedAlbumSlug('1'.repeat(200)).length <= 80)
+})
diff --git a/tests/resource-contracts.test.ts b/tests/resource-contracts.test.ts
index 9af4a67a..77ec07f7 100644
--- a/tests/resource-contracts.test.ts
+++ b/tests/resource-contracts.test.ts
@@ -32,7 +32,8 @@ test('user and album boundaries remove password material and serialize dates', (
createdAt: date,
updatedAt: date,
}
- const dto = toAlbumDto(album)
+ const dto = toAlbumDto(album, 'test')
+ assert.equal(dto.slug, 'test')
assert.equal(dto.hasPassword, true)
assert.equal('passwordHash' in dto, false)
assert.equal(dto.createdAt, date.toISOString())
diff --git a/tests/site-migration.test.ts b/tests/site-migration.test.ts
index 417fdc7c..2b9605ef 100644
--- a/tests/site-migration.test.ts
+++ b/tests/site-migration.test.ts
@@ -110,6 +110,14 @@ test('legacy ownership upgrade preserves rows, assigns memberships, backs up and
raw.prepare('SELECT position FROM album_photos').get().position,
42,
)
+ assert.equal(
+ raw
+ .prepare(
+ 'SELECT slug FROM album_slugs WHERE album_id = 1 AND is_current = 1',
+ )
+ .get().slug,
+ 'legacy-album',
+ )
assert.deepEqual(
raw.prepare('SELECT user_id,role FROM memberships ORDER BY user_id').all(),
[
diff --git a/tests/sqlite-resource-read.test.ts b/tests/sqlite-resource-read.test.ts
index 512b8afa..7fcb4544 100644
--- a/tests/sqlite-resource-read.test.ts
+++ b/tests/sqlite-resource-read.test.ts
@@ -8,6 +8,7 @@ import { createResourceReader } from '@chronoframe/core'
import * as schema from '../apps/self-hosted/server/database/schema.ts'
import { createSqliteResourceRepository } from '../apps/self-hosted/server/repositories/sqlite-resources.ts'
import { fetchAlbumPhotos } from '../apps/self-hosted/server/utils/album-visibility.ts'
+import { backfillAlbumSlugs } from '../packages/database/src/album-slugs.ts'
test('SQLite reader preserves migrated data, ordering and legacy album visibility', async () => {
const sqlite = new Database(':memory:')
@@ -31,6 +32,7 @@ test('SQLite reader preserves migrated data, ordering and legacy album visibilit
{ id: 3, title: 'Locked', passwordHash: 'private-hash', position: 0 },
])
.run()
+ backfillAlbumSlugs(db)
db.insert(schema.albumPhotos)
.values([
{ albumId: 1, photoId: 'old', position: 30 },