From 7475ac30e0b5122ec06db17c6ba44f599d01747c Mon Sep 17 00:00:00 2001
From: DIYgod <i@diygod.me>
Date: Mon, 31 Oct 2022 21:26:12 +0000
Subject: [PATCH] fix: 404 page redirection

---
 src/components/site/SiteLayout.server.tsx | 28 +++++++++++++----------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/src/components/site/SiteLayout.server.tsx b/src/components/site/SiteLayout.server.tsx
index 9be2d546..7156f7e7 100644
--- a/src/components/site/SiteLayout.server.tsx
+++ b/src/components/site/SiteLayout.server.tsx
@@ -24,20 +24,24 @@ export const getServerSideProps = async (
       },
       queryClient,
     ),
-    new Promise(async (resolve) => {
+    new Promise(async (resolve, reject) => {
       if (pageSlug) {
-        const page = await fetchGetPage(
-          {
-            site: domainOrSubdomain,
-            page: pageSlug,
-            render: true,
-            includeAuthors: true,
-          },
-          queryClient,
-        )
+        try {
+          const page = await fetchGetPage(
+            {
+              site: domainOrSubdomain,
+              page: pageSlug,
+              render: true,
+              includeAuthors: true,
+            },
+            queryClient,
+          )
 
-        if (new Date(page!.date_published) > new Date()) {
-          throw notFound()
+          if (!page || new Date(page!.date_published) > new Date()) {
+            reject(notFound())
+          }
+        } catch (error) {
+          reject(error)
         }
       } else {
         await prefetchGetPagesBySite(