From 4e352fab700cb4a6359ff413591dbd0715b8e45d Mon Sep 17 00:00:00 2001
From: SauceyRed <saucey@saucey.red>
Date: Sat, 16 Aug 2025 16:12:17 +0200
Subject: [PATCH] feat: implement try/catch blocks on calls to fetch guild,
 channel, and messages

---
 components/MessageArea.vue                    | 14 ++++++++++----
 .../[serverId]/channels/[channelId].vue       | 19 +++++++++++++++----
 2 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/components/MessageArea.vue b/components/MessageArea.vue
index 0cf05e6..fd2bef6 100644
--- a/components/MessageArea.vue
+++ b/components/MessageArea.vue
@@ -56,10 +56,16 @@ const messagesType = ref<Record<string, "normal" | "grouped">>({});
 const messageGroupingMaxDifference = useRuntimeConfig().public.messageGroupingMaxDifference
 const timeFormat = getPreferredTimeFormat()
 
-const messagesRes: MessageResponse[] | undefined = await fetchWithApi(
-	`${props.channelUrl}/messages`,
-	{ query: { "amount": props.amount ?? 100, "offset": props.offset ?? 0 } }
-);
+let messagesRes: MessageResponse[] | undefined;
+
+try {
+	messagesRes = await fetchWithApi(
+		`${props.channelUrl}/messages`,
+		{ query: { "amount": props.amount ?? 100, "offset": props.offset ?? 0 } }
+	);
+} catch (error) {
+	console.error("Failed to fetch messages:", error);
+}
 
 const firstMessageByUsers = ref<Record<string, MessageResponse | undefined>>({});
 const previousMessage = ref<MessageResponse>();
diff --git a/pages/servers/[serverId]/channels/[channelId].vue b/pages/servers/[serverId]/channels/[channelId].vue
index 8fc9555..962b532 100644
--- a/pages/servers/[serverId]/channels/[channelId].vue
+++ b/pages/servers/[serverId]/channels/[channelId].vue
@@ -16,8 +16,7 @@
 </template>
 
 <script lang="ts" setup>
-import type { GuildMemberResponse } from '~/types/interfaces';
-
+import type { ChannelResponse, GuildMemberResponse, GuildResponse } from '~/types/interfaces';
 
 const route = useRoute();
 const { fetchGuild, fetchChannel } = useApi()
@@ -27,8 +26,20 @@ const guildId = route.params.serverId as string
 
 const channelUrlPath = `channels/${channelId}`;
 
-const guild = await fetchGuild(guildId)
-const channel = await fetchChannel(channelId)
+let guild: GuildResponse | undefined;
+let channel: ChannelResponse | undefined;
+
+try {
+	guild = await fetchGuild(guildId)
+} catch (error) {
+	console.error("Failed to fetch guild:", error);
+}
+
+try {
+	channel = await fetchChannel(channelId)
+} catch (error) {
+	console.error("Failed to fetch channel:", error);
+}
 
 const { fetchMeMember } = useApi();
 const me = useState<GuildMemberResponse | undefined>("me");