From c7bfed8baefa4541e811c22b027246da7478cb78 Mon Sep 17 00:00:00 2001
From: Katalina Okano <git@kat.cafe>
Date: Wed, 2 Feb 2022 13:52:01 -0500
Subject: [PATCH] attemptLegacyImport should not break the entire request when
 it fails

---
 packages/api/src/guilds/getters.ts | 21 +++++++++++++--------
 packages/api/src/utils/response.ts |  1 +
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/packages/api/src/guilds/getters.ts b/packages/api/src/guilds/getters.ts
index fba86dc..6bc3feb 100644
--- a/packages/api/src/guilds/getters.ts
+++ b/packages/api/src/guilds/getters.ts
@@ -113,16 +113,21 @@ export const attemptLegacyImport = async (
   config: Config,
   id: string
 ): Promise<GuildData | null> => {
-  const legacyGuildData = await fetchLegacyServer(config, id);
-  if (!legacyGuildData) {
-    // Means there is no legacy data.
+  try {
+    const legacyGuildData = await fetchLegacyServer(config, id);
+    if (!legacyGuildData) {
+      // Means there is no legacy data.
+      return null;
+    }
+
+    const transformed = transformLegacyGuild(legacyGuildData);
+
+    await config.kv.guildData.put(id, transformed);
+    return transformed;
+  } catch (e) {
+    console.error('attemptLegacyImport errored:', e);
     return null;
   }
-
-  const transformed = transformLegacyGuild(legacyGuildData);
-
-  await config.kv.guildData.put(id, transformed);
-  return transformed;
 };
 
 export const getGuildMember = async (
diff --git a/packages/api/src/utils/response.ts b/packages/api/src/utils/response.ts
index 43a4fc3..e2d0824 100644
--- a/packages/api/src/utils/response.ts
+++ b/packages/api/src/utils/response.ts
@@ -36,6 +36,7 @@ export const forbidden = () => json({ error: 'forbidden' }, { status: 403 });
 export const notFound = () => json({ error: 'not found' }, { status: 404 });
 export const serverError = (error: Error) => {
   console.error(error);
+  console.trace();
   return json({ error: 'internal server error' }, { status: 500 });
 };
 export const notImplemented = () => json({ error: 'not implemented' }, { status: 501 });