From cc36fc1912152dfd63f06661166dc64aeffd98da Mon Sep 17 00:00:00 2001
From: SauceyRed <saucey@saucey.red>
Date: Tue, 27 May 2025 01:45:33 +0200
Subject: [PATCH 1/3] feat: add utilities to fetch guild member and instance
 user

---
 utils/fetchMember.ts | 6 ++++++
 utils/fetchUser.ts   | 6 ++++++
 2 files changed, 12 insertions(+)
 create mode 100644 utils/fetchMember.ts
 create mode 100644 utils/fetchUser.ts

diff --git a/utils/fetchMember.ts b/utils/fetchMember.ts
new file mode 100644
index 0000000..a0f5782
--- /dev/null
+++ b/utils/fetchMember.ts
@@ -0,0 +1,6 @@
+import type { UserResponse } from "~/types/interfaces"
+
+export default async (serverId: string, memberId: string): Promise<UserResponse> => {
+	const user = await fetchWithApi(`/servers/${serverId}/members/${memberId}`) as UserResponse;
+	return user;
+}
diff --git a/utils/fetchUser.ts b/utils/fetchUser.ts
new file mode 100644
index 0000000..d509fe0
--- /dev/null
+++ b/utils/fetchUser.ts
@@ -0,0 +1,6 @@
+import type { UserResponse } from "~/types/interfaces"
+
+export default async (serverId: string, userId: string): Promise<UserResponse> => {
+	const user = await fetchWithApi(`/users/${userId}`) as UserResponse;
+	return user;
+}

From a110e39c2ba96ca264ad74074a427e36f7a5499b Mon Sep 17 00:00:00 2001
From: SauceyRed <saucey@saucey.red>
Date: Tue, 27 May 2025 01:47:18 +0200
Subject: [PATCH 2/3] feat: change spacing of messages

---
 components/Message.vue | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/components/Message.vue b/components/Message.vue
index 870738b..78f2889 100644
--- a/components/Message.vue
+++ b/components/Message.vue
@@ -71,6 +71,9 @@ if (now.getUTCHours() >= 0) {
 .message-data {
 	/* border: 1px solid white; */
 	margin-left: .5dvw;
+	display: flex;
+	flex-direction: column;
+	gap: 1dvh;
 }
 
 .message-author {

From c7b853230e87d22c7f93332913f3a40d60f3af0b Mon Sep 17 00:00:00 2001
From: SauceyRed <saucey@saucey.red>
Date: Tue, 27 May 2025 01:47:48 +0200
Subject: [PATCH 3/3] feat: implement fetching of usernames for messages

---
 components/MessageArea.vue | 62 ++++++++++++++++++++++++++------------
 1 file changed, 42 insertions(+), 20 deletions(-)

diff --git a/components/MessageArea.vue b/components/MessageArea.vue
index 000230e..b99b487 100644
--- a/components/MessageArea.vue
+++ b/components/MessageArea.vue
@@ -1,7 +1,7 @@
 <template>
   <div id="message-area">
 	<div id="messages">
-		<Message v-for="message of messages" :username="message.user_uuid" :text="message.message"
+		<Message v-for="message of messages" :username="displayNames[message.user_uuid]" :text="message.message"
 			:timestamp="uuidToTimestamp(message.uuid)" format="12" />
 	</div>
 	<div id="message-box">
@@ -17,6 +17,7 @@
 
 <script lang="ts" setup>
 import type { MessageResponse } from '~/types/interfaces';
+import fetchUser from '~/utils/fetchUser';
 
 const props = defineProps<{ channelUrl: string, amount?: number, offset?: number, reverse?: boolean }>();
 
@@ -28,12 +29,11 @@ if (messagesRes && props.reverse) {
   messagesRes.reverse();
 }
 
-const messages = ref(messagesRes);
+const messages = ref(messagesRes ?? []);
 
-const { fetchUser } = useAuth();
+const displayNames = ref<Record<string, string>>({});
 
-const user = await fetchUser();
-const displayName = user!.display_name ?? user!.username
+const route = useRoute();
 
 const messageInput = ref<string>();
 
@@ -49,26 +49,33 @@ if (accessToken && apiBase) {
 	do {
 		console.log("Trying to connect to channel WebSocket...");
 		ws = new WebSocket(`${apiBase.replace("http", "ws").replace("3000", "8080")}/${props.channelUrl}/socket`,
-			["Authorization", accessToken]
-		);
-		if (ws) break;
-		await sleep(10000);
-	} while (!ws);
+		["Authorization", accessToken]
+	);
+	if (ws) break;
+	await sleep(10000);
+} while (!ws);
 
-	ws.addEventListener("open", (event) => {
-		console.log("WebSocket connected!");
-	});
-	
-	ws.addEventListener("message", (event) => {
-		console.log("event data:", event.data);
-		messages.value?.push(
-			JSON.parse(event.data)
-		)
-	});
+ws.addEventListener("open", (event) => {
+	console.log("WebSocket connected!");
+});
+
+ws.addEventListener("message", (event) => {
+	console.log("event data:", event.data);
+	messages.value?.push(
+		JSON.parse(event.data)
+	);
+});
 } else {
 	await refresh();
 }
 
+async function getDisplayName(memberId: string): Promise<string> {
+	//const user = await fetchMember((route.params.serverId as string), memberId);
+	const user = await fetchUser((route.params.serverId as string), memberId);
+	return user!.display_name ?? user!.username;
+
+}
+
 function sendMessage(e: Event) {
 	e.preventDefault();
 	const text = messageInput.value;
@@ -79,6 +86,18 @@ function sendMessage(e: Event) {
 		console.log("MESSAGE SENT!!!");
 	}
 }
+
+onMounted(async () => {
+	const displayNamesArr: Record<string, string> = {};
+	for (const message of messages.value) {
+		if (!displayNamesArr[message.user_uuid]) {
+			const displayName = await getDisplayName(message.user_uuid);
+			displayNamesArr[message.user_uuid] = displayName;
+		}
+	}
+	displayNames.value = displayNamesArr;
+});
+
 </script>
 
 <style scoped>
@@ -117,6 +136,9 @@ function sendMessage(e: Event) {
 
 #messages {
 	overflow-y: scroll;
+	display: flex;
+	flex-direction: column;
+	gap: 1dvh;
 }
 
 </style>
\ No newline at end of file