From e2bb991c1cf58ea16189200626908e17fc79315a Mon Sep 17 00:00:00 2001
From: NextFire <git@yuru.moe>
Date: Wed, 11 Sep 2024 11:17:09 +0200
Subject: [PATCH] api/calendar: use aggregate endpoint

---
 components/Projection.vue          | 20 ++++++++++---------
 server/api/calendars/[user].get.ts | 32 ++----------------------------
 server/utils/nanapi-client.ts      |  5 ++++-
 3 files changed, 17 insertions(+), 40 deletions(-)

diff --git a/components/Projection.vue b/components/Projection.vue
index e1ae481..9bc2074 100644
--- a/components/Projection.vue
+++ b/components/Projection.vue
@@ -4,15 +4,17 @@ import uniqolor from "uniqolor";
 
 const props = defineProps<{ projection: Projection }>();
 
-const eventSources = props.projection.participants.map(
-  (p) =>
-    ({
-      id: p.discord_username,
-      url: `/api/calendars/${p.discord_id_str}`,
-      format: "ics",
-      color: uniqolor(p.id).color,
-    } satisfies EventSourceInput)
-);
+const eventSources = props.projection.participants
+  .toSorted((a, b) => a.discord_username.localeCompare(b.discord_username))
+  .map(
+    (p) =>
+      ({
+        id: p.discord_username,
+        url: `/api/calendars/${p.discord_id_str}`,
+        format: "ics",
+        color: uniqolor(p.id).color,
+      } satisfies EventSourceInput)
+  );
 </script>
 
 <template>
diff --git a/server/api/calendars/[user].get.ts b/server/api/calendars/[user].get.ts
index 2d6cfc4..733bd2c 100644
--- a/server/api/calendars/[user].get.ts
+++ b/server/api/calendars/[user].get.ts
@@ -7,39 +7,11 @@ export default defineEventHandler(async (event) => {
 
   const config = useRuntimeConfig();
 
-  // fetch user calendar
-  let userCalendar: string = "";
-  const { data } = await authRetry(() =>
-    nanapi.GET("/calendar/user_calendars/{discord_id}", {
-      params: {
-        path: {
-          discord_id: discord_id as any,
-        },
-      },
-    })
-  );
-  if (data !== undefined) {
-    const icsUrl = data.ics.replace(/^webcal:/, "https:");
-    userCalendar = await $fetch<string>(icsUrl);
-  }
-
-  // fetch guild calendar
   const url = new URL(`${config.nanapiUrl}/calendar/ics`);
   url.searchParams.append("client", config.nanapiCustomClientUsername);
   url.searchParams.append("user", discord_id);
-  const guildCalendar = await $fetch<string>(url.toString());
-
-  // dirty merge
-  let ics = "";
-  if (userCalendar) {
-    let userLines = userCalendar.trim().split("\n");
-    let guildLines = guildCalendar.trim().split("\n");
-    ics = userLines.slice(0, -1).join("\n") + "\n";
-    ics += "\n";
-    ics += guildLines.slice(1).join("\n");
-  } else {
-    ics = guildCalendar;
-  }
+  url.searchParams.append("aggregate", "true");
+  const ics = await $fetch<string>(url.toString());
 
   setHeader(event, "Content-Type", "text/calendar");
   return ics;
diff --git a/server/utils/nanapi-client.ts b/server/utils/nanapi-client.ts
index 71239ce..85fa098 100644
--- a/server/utils/nanapi-client.ts
+++ b/server/utils/nanapi-client.ts
@@ -36,7 +36,7 @@ export async function authRetry<T extends FetchResponse<any, any, any>>(
   makeReq: () => Promise<T>
 ) {
   let res;
-  while (true) {
+  for (let i = 0; i < 3; i++) {
     res = await makeReq();
     if (res.response.status === 401) {
       access_token = "";
@@ -44,6 +44,9 @@ export async function authRetry<T extends FetchResponse<any, any, any>>(
       return res;
     }
   }
+  throw new Error(
+    `Failed to authenticate after 3 attempts: ${res?.response.status}`
+  );
 }
 
 export const nanapi = createClient<paths>({ baseUrl: config.nanapiUrl });