From 52ef3ecc5be617f0533c86d6ef7bca594d7c7648 Mon Sep 17 00:00:00 2001
From: Sam Becker <sam@sambecker.com>
Date: Tue, 3 Oct 2023 16:52:14 -0500
Subject: [PATCH] Ensure photo title links direct to canonical path

---
 src/app/(static)/shot-on/[camera]/[photoId]/layout.tsx | 6 +-----
 src/app/(static)/t/[tag]/[photoId]/layout.tsx          | 6 +-----
 src/photo/PhotoLarge.tsx                               | 2 +-
 3 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/src/app/(static)/shot-on/[camera]/[photoId]/layout.tsx b/src/app/(static)/shot-on/[camera]/[photoId]/layout.tsx
index 90fbd171..f1912648 100644
--- a/src/app/(static)/shot-on/[camera]/[photoId]/layout.tsx
+++ b/src/app/(static)/shot-on/[camera]/[photoId]/layout.tsx
@@ -82,10 +82,6 @@ export default async function PhotoCameraPage({
 
   return <>
     {children}
-    <PhotoDetailPage
-      photo={photo}
-      photos={photos}
-      camera={camera}
-    />
+    <PhotoDetailPage {...{ photo, photos, camera }} />
   </>;
 }
diff --git a/src/app/(static)/t/[tag]/[photoId]/layout.tsx b/src/app/(static)/t/[tag]/[photoId]/layout.tsx
index c8315406..1aca6497 100644
--- a/src/app/(static)/t/[tag]/[photoId]/layout.tsx
+++ b/src/app/(static)/t/[tag]/[photoId]/layout.tsx
@@ -74,10 +74,6 @@ export default async function PhotoTagPage({
 
   return <>
     {children}
-    <PhotoDetailPage
-      photo={photo}
-      photos={photos}
-      tag={tag}
-    />
+    <PhotoDetailPage {...{ photo, photos, tag }} />
   </>;
 }
diff --git a/src/photo/PhotoLarge.tsx b/src/photo/PhotoLarge.tsx
index 6c07194e..bede78a7 100644
--- a/src/photo/PhotoLarge.tsx
+++ b/src/photo/PhotoLarge.tsx
@@ -64,7 +64,7 @@ export default function PhotoLarge({
           {renderMiniGrid(<>
             <div>
               <Link
-                href={pathForPhoto(photo, tag)}
+                href={pathForPhoto(photo)}
                 className="font-bold uppercase"
               >
                 {titleForPhoto(photo)}