Adjust archive error

elie222 · Dec 30, 2024 · 64cb6e8 · 64cb6e8 · vercel · Dec 30, 2024
1 parent cae4c21
commit 64cb6e8
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/apps/web/utils/actions/mail.ts b/apps/web/utils/actions/mail.ts
@@ -22,7 +22,7 @@ import { withActionInstrumentation } from "@/utils/actions/middleware";
 import { isActionError } from "@/utils/error";
 
 // do not return functions to the client or we'll get an error
-const isStatusOk = (status?: number) => status && status >= 200 && status < 300;
+const isStatusOk = (status: number) => status >= 200 && status < 300;
 
 export const archiveThreadAction = withActionInstrumentation(
   "archiveThread",
@@ -39,7 +39,7 @@ export const archiveThreadAction = withActionInstrumentation(
       labelId,
     });
 
-    if (!isStatusOk(res?.status)) return { error: "Failed to archive thread" };
+    if (!isStatusOk(res.status)) return { error: "Failed to archive thread" };
   },
 );
 

diff --git a/apps/web/utils/gmail/label.ts b/apps/web/utils/gmail/label.ts
@@ -77,7 +77,7 @@ export async function archiveThread({
     const error = archiveResult.reason as Error;
     if (error.message?.includes("Requested entity was not found")) {
       console.error(`Thread not found: ${threadId}`);
-      return null;
+      return { status: 404, message: "Thread not found" };
     }
     console.error(`Failed to archive thread: ${threadId}`, error);
     throw error;