From b456b893526d7d84434bacdb2aa41372a254e472 Mon Sep 17 00:00:00 2001
From: RizqiSyahrendra <rizqialaudinsyahrendra@gmail.com>
Date: Fri, 14 Mar 2025 23:22:42 +0700
Subject: [PATCH] fix: redirection middleware and meta format

---
 src/app/(main)/[slug]/page.tsx              | 4 ++--
 src/app/(main)/staff_member/[slug]/page.tsx | 4 ++--
 src/middleware.ts                           | 3 ++-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/app/(main)/[slug]/page.tsx b/src/app/(main)/[slug]/page.tsx
index 77b7ac3..8ea7bf6 100644
--- a/src/app/(main)/[slug]/page.tsx
+++ b/src/app/(main)/[slug]/page.tsx
@@ -24,7 +24,7 @@ export async function generateMetadata({ params }: { params: Promise<{ slug: str
   if (!!blog) {
     // check for blog data
     title = `${!!blog.data?.meta?.title ? blog.data?.meta?.title : blog.data.title} - ${name}`;
-    description = `${!!blog.data?.meta?.description ? blog.data?.meta?.description : blog.data.title} - ${name}`;
+    description = `${!!blog.data?.meta?.description ? blog.data?.meta?.description : blog.data.title}`;
     imgUrl = blog.imgUrl;
     publishedAt = blog.data.createdAt;
     updatedAt = blog.data.updatedAt;
@@ -39,7 +39,7 @@ export async function generateMetadata({ params }: { params: Promise<{ slug: str
     const page = await fetchPageBySlug({ slug });
     if (!!page) {
       title = `${!!page?.meta?.title ? page?.meta?.title : page.title} - ${name}`;
-      description = `${!!page?.meta?.description ? page?.meta?.description : page.title} - ${name}`;
+      description = `${!!page?.meta?.description ? page?.meta?.description : page.title}`;
       imgUrl = page.heroImg?.url;
       publishedAt = page.createdAt;
       updatedAt = page.updatedAt;
diff --git a/src/app/(main)/staff_member/[slug]/page.tsx b/src/app/(main)/staff_member/[slug]/page.tsx
index 828fa24..73b7f38 100644
--- a/src/app/(main)/staff_member/[slug]/page.tsx
+++ b/src/app/(main)/staff_member/[slug]/page.tsx
@@ -22,8 +22,8 @@ export async function generateMetadata({ params }: { params: Promise<{ slug: str
 
   // check for blog data
   if (!!team) {
-    title = !!team.data.meta?.title ? team.data.meta?.title : `${team.data.name} - ${name}`;
-    description = !!team.data.meta?.description ? team.data.meta?.description : description;
+    title = `${!!team.data?.meta?.title ? team.data?.meta?.title : team.data.name} - ${name}`;
+    description = !!team.data.meta?.description ? team.data.meta?.description : team.data.name;
     imgUrl = team.imgUrl;
     if (!!team?.data?.meta?.canonical_url) {
       canonicalUrl = team.data.meta.canonical_url;
diff --git a/src/middleware.ts b/src/middleware.ts
index 88357f4..b0deaa1 100644
--- a/src/middleware.ts
+++ b/src/middleware.ts
@@ -21,7 +21,8 @@ export function middleware(request: NextRequest) {
 
   // redirect for /blog/<slug>/ path
   const blogPathRegex = /^\/blog\/([^\/]+)(\/[^\/]*)*\/?$/;
-  if (blogPathRegex.test(path)) {
+  console.log("path", blogPathRegex.test(path) && !path.includes("/blog/?"));
+  if (blogPathRegex.test(path) && !path.includes("/blog/?")) {
     const newBlogPath = path.replace(/^\/blog/, "") || "/";
     return NextResponse.redirect(`${mainUrl}${newBlogPath}`, 301);
   }