[frontend] Moved the redirect function out of the try-catch block for…

… correction
usatie · Mar 6, 2024 · bdf6810 · bdf6810
1 parent 994bff0
commit bdf6810
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 11 deletions.
diff --git a/frontend/app/lib/actions.ts b/frontend/app/lib/actions.ts
@@ -269,7 +269,7 @@ export async function createDirectRoom(userId: number) {
   }
   if (!res.ok) {
     console.error("createDirectRoom error: ", data);
-    return { error: data.message };
+    return "Error";
   } else {
     redirect(`/room/${data.id}`);
   }

diff --git a/frontend/app/ui/user/direct-message-button.tsx b/frontend/app/ui/user/direct-message-button.tsx
@@ -21,18 +21,19 @@ const showGetDirectRoomErrorToast = () => {
 export default function DirectMessageButton({ id }: { id: number }) {
   const router = useRouter();
   const createOrRedirectDirectRoom = async () => {
+    let room;
     try {
-      const room = await getDirectRoom(id);
-      if (room.statusCode === 404) {
-        const result = await createDirectRoom(id);
-        if (result.error) {
-          showCreateDirectRoomErrorToast();
-        }
-      } else {
-        router.push(`/room/${room.id}`);
-      }
+      room = await getDirectRoom(id);
     } catch (e) {
-      showGetDirectRoomErrorToast();
+      return showGetDirectRoomErrorToast();
+    }
+    if (room.statusCode === 404) {
+      const result = await createDirectRoom(id);
+      if (result === "Error") {
+        showCreateDirectRoomErrorToast();
+      }
+    } else {
+      router.push(`/room/${room.id}`);
     }
   };
   return <Button onClick={createOrRedirectDirectRoom}>Message</Button>;