From fb393f4fc4bc7c68b667f395077b5fdf5a3927d2 Mon Sep 17 00:00:00 2001
From: Sam Becker <sam@sambecker.com>
Date: Thu, 14 Mar 2024 13:03:31 -0500
Subject: [PATCH] Redirect to canonical photo path when un-favoriting

---
 src/admin/AdminPhotoMenuClient.tsx | 1 +
 src/photo/actions.ts               | 9 +++++++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/admin/AdminPhotoMenuClient.tsx b/src/admin/AdminPhotoMenuClient.tsx
index bbe31808..f31c5a9e 100644
--- a/src/admin/AdminPhotoMenuClient.tsx
+++ b/src/admin/AdminPhotoMenuClient.tsx
@@ -20,6 +20,7 @@ export default function AdminPhotoMenuClient({
   const path = usePathname();
   const shouldRedirectFav = isPathFavs(path) && isFav;
   const shouldRedirectDelete = pathForPhoto(photo.id) === path;
+
   return (
     <>
       <MoreMenu {...{
diff --git a/src/photo/actions.ts b/src/photo/actions.ts
index 3a2c42cf..fe2bb913 100644
--- a/src/photo/actions.ts
+++ b/src/photo/actions.ts
@@ -24,7 +24,12 @@ import {
   revalidatePhotosKey,
   revalidateTagsKey,
 } from '@/photo/cache';
-import { PATH_ADMIN_PHOTOS, PATH_ADMIN_TAGS, PATH_ROOT } from '@/site/paths';
+import {
+  PATH_ADMIN_PHOTOS,
+  PATH_ADMIN_TAGS,
+  PATH_ROOT,
+  pathForPhoto,
+} from '@/site/paths';
 import { extractExifDataFromBlobPath } from './server';
 import { TAG_FAVS, isTagFavs } from '@/tag';
 import { convertPhotoToPhotoDbInsert } from '.';
@@ -66,7 +71,7 @@ export async function toggleFavoritePhotoAction(
     await sqlUpdatePhoto(convertPhotoToPhotoDbInsert(photo));
     revalidateAllKeysAndPaths();
     if (shouldRedirect) {
-      redirect(PATH_ROOT);
+      redirect(pathForPhoto(photoId));
     }
   }
 }