Self-hosted personal gallery application with online photo management and albums, supporting Live/Motion Photos, EXIF parsing, geolocation recognition, and an explore map.
TypeScript albumsexif-extractiongeocodinglive-photomotion-photophoto-galleryphoto-sharingwebgl-viewer
fix(albums): avoid stale canonical redirects while resolving
Ahmet Ömer695594d8b87a
diff --git a/packages/gallery/app/pages/albums/[albumId].vue b/packages/gallery/app/pages/albums/[albumId].vueindex 70132f7d..d6b2d9e6 100644--- a/packages/gallery/app/pages/albums/[albumId].vue+++ b/packages/gallery/app/pages/albums/[albumId].vue@@ -10,13 +10,16 @@ const dayjs = useDayjs()const { user } = useUserSession()const { albumListPath } = useHomeView()const albumSegment = computed(() => String(route.params.albumId))-const { data: resolved, error: resolveError } =- await useGalleryFetch<AlbumPathResolution>(- () => `/api/albums/resolve/${encodeURIComponent(albumSegment.value)}`,- {- watch: [albumSegment],- },- )+const {+ data: resolved,+ error: resolveError,+ status: resolveStatus,+} = await useGalleryFetch<AlbumPathResolution>(+ () => `/api/albums/resolve/${encodeURIComponent(albumSegment.value)}`,+ {+ watch: [albumSegment],+ },+)if (resolveError.value || !resolved.value)throw createError({ statusCode: 404, statusMessage: $t('album.notFound') })const canonicalAlbumRoute = computed(() => `/albums/${resolved.value?.slug}`)@@ -30,7 +33,9 @@ if (!resolved.value.isCanonical || route.path !== canonicalAlbumRoute.value)redirectCode: resolved.value.redirectCode ?? 301,replace: true,})-watch([resolved, () => route.path], ([value]) => {+watch([resolved, () => route.path, resolveStatus], ([value]) => {+ // Wait for the resolver to finish for the current route before redirecting.+ if (resolveStatus.value !== 'success') returnif (value && (!value.isCanonical || route.path !== `/albums/${value.slug}`))void navigateTo(canonicalAlbumTarget(value.slug), { replace: true })})