fix mostly

Headpat-Community · Aug 23, 2024 · 39e92be · 39e92be
1 parent 587d3ed
commit 39e92be
Show file tree

Hide file tree

Showing 6 changed files with 47 additions and 20 deletions.
diff --git a/src/app/[locale]/(account)/account/gallery/[galleryId]/page.tsx b/src/app/[locale]/(account)/account/gallery/[galleryId]/page.tsx
@@ -4,6 +4,7 @@ import { createAdminClient } from '@/app/appwrite-session'
 import { Gallery } from '@/utils/types/models'
 import PageLayout from '@/components/pageLayout'
 import { getUser } from '@/utils/server-api/account/user'
+import { redirect } from '@/navigation'
 
 export const runtime = 'edge'
 
@@ -14,7 +15,13 @@ export const metadata = {
 export default async function AccountSingleGalleryPage({
   params: { galleryId },
 }) {
-  const userData = await getUser()
+  let userData = null
+  try {
+    userData = await getUser()
+  } catch (error) {
+    return redirect('/login')
+  }
+
   const userId = userData?.$id
 
   const { databases } = await createAdminClient()
@@ -31,7 +38,6 @@ export default async function AccountSingleGalleryPage({
     const galleryUserId = singleGallery?.userId
 
     if (!galleryUserId) return notFound() // Wait for userId to be available
-    if (!userId) return notFound() // Wait for userId to be available
 
     if (userId !== galleryUserId) {
       return notFound()

diff --git a/src/app/[locale]/(main)/community/[communityId]/page.client.tsx b/src/app/[locale]/(main)/community/[communityId]/page.client.tsx
@@ -14,8 +14,12 @@ export function FollowerButton({ displayName, communityId }) {
 
   useEffect(() => {
     const getUserId = async () => {
-      const data = await account.get()
-      setUserId(data.$id)
+      try {
+        const data = await account.get()
+        setUserId(data?.$id)
+      } catch (error) {
+        setUserId(null)
+      }
     }
     getUserId().then()
   }, [])

diff --git a/src/app/[locale]/(main)/gallery/[galleryId]/page.tsx b/src/app/[locale]/(main)/gallery/[galleryId]/page.tsx
@@ -21,8 +21,14 @@ export const runtime = 'edge'
 
 export default async function GalleryPage({ params: { galleryId } }) {
   const { databases } = await createSessionServerClient()
-  const userSelf = await getUser()
-  const enableNsfw = userSelf?.prefs?.nsfw || false
+  let userSelf = null
+  let enableNsfw = false
+  try {
+    userSelf = await getUser()
+    enableNsfw = userSelf?.prefs?.nsfw
+  } catch (e) {
+    // do nothing
+  }
 
   const gallery: Gallery.GalleryType = await databases.listDocuments(
     'hp_db',

diff --git a/src/app/[locale]/(main)/gallery/page.tsx b/src/app/[locale]/(main)/gallery/page.tsx
@@ -53,8 +53,13 @@ function UploadButton() {
 }
 
 export default async function Gallery() {
-  const accountData = await getUser()
-  const enableNsfw = accountData?.prefs?.nsfw
+  let enableNsfw = false
+  try {
+    const accountData = await getUser()
+    enableNsfw = accountData?.prefs?.nsfw
+  } catch (e) {
+    // do nothing
+  }
 
   return (
     <PageLayout title={'Gallery'} middleComponent={<UploadButton />}>

diff --git a/src/app/[locale]/(main)/gallery/upload/page.tsx b/src/app/[locale]/(main)/gallery/upload/page.tsx
@@ -6,9 +6,10 @@ import { redirect } from '@/navigation'
 export const runtime = 'edge'
 
 export default async function Page() {
-  const user = await getUser()
-
-  if (!user.$id) {
+  let user = null
+  try {
+    user = await getUser()
+  } catch (e) {
     return redirect('/login')
   }
 

diff --git a/src/app/[locale]/(user)/user/[profileUrl]/page.tsx b/src/app/[locale]/(user)/user/[profileUrl]/page.tsx
@@ -70,7 +70,12 @@ export async function generateMetadata({
 
 export default async function UserProfile({ params: { profileUrl } }) {
   const { databases } = await createSessionServerClient()
-  const account = await getUser()
+  let account = null
+  try {
+    account = await getUser()
+  } catch (error) {
+    // User is not logged in
+  }
 
   const userDataResponse: UserData.UserDataType = await databases.listDocuments(
     'hp_db',
@@ -80,7 +85,7 @@ export default async function UserProfile({ params: { profileUrl } }) {
   const userData = userDataResponse.documents[0]
   const followers = await getFollowers(userData.$id, 0, 5000000)
   const following = await getFollowing(userData.$id, 0, 5000000)
-  const isFollowingResponse = await getIsFollowing(account.$id, userData.$id)
+  const isFollowingResponse = await getIsFollowing(account?.$id, userData?.$id)
   const isFollowing = isFollowingResponse?.documents?.length > 0 || false
 
   const totalFollowers: number = followers?.length
@@ -211,20 +216,20 @@ export default async function UserProfile({ params: { profileUrl } }) {
                       {userData.displayName}
                     </CardTitle>
                     <FollowerButton
-                      userId={account.$id}
-                      displayName={userData.displayName}
+                      userId={account?.$id}
+                      displayName={userData?.displayName}
                       followerId={userData.$id}
                       isFollowing={isFollowing}
                     />
                   </div>
                   <div className={'grid grid-cols-2'}>
-                    <CardDescription>{userData.status}</CardDescription>
+                    <CardDescription>{userData?.status}</CardDescription>
                   </div>
                   <CardDescription className={'flex pt-4 gap-4'}>
                     <Link
                       href={{
                         pathname: '/user/[profileUrl]/following',
-                        params: { profileUrl: userData.profileUrl },
+                        params: { profileUrl: userData?.profileUrl },
                       }}
                     >
                       <Button variant={'link'} className={'p-0'}>
@@ -239,7 +244,7 @@ export default async function UserProfile({ params: { profileUrl } }) {
                     <Link
                       href={{
                         pathname: '/user/[profileUrl]/followers',
-                        params: { profileUrl: userData.profileUrl },
+                        params: { profileUrl: userData?.profileUrl },
                       }}
                     >
                       {' '}
@@ -257,11 +262,11 @@ export default async function UserProfile({ params: { profileUrl } }) {
                 <Separator className={'mb-6'} />
                 <CardContent>
                   <div className={'grid grid-cols-2 mx-auto gap-4'}>
-                    {userData.pronouns && (
+                    {userData?.pronouns && (
                       <>
                         <div className={'col-span-1'}>Pronouns</div>
                         <div className="rounded-md border px-4 py-3 font-mono text-sm col-span-1">
-                          {userData.pronouns}
+                          {userData?.pronouns}
                         </div>
                       </>
                     )}