From 46483c336a90910a833c71717a0344bce4b0e783 Mon Sep 17 00:00:00 2001
From: SauceyRed <saucey@saucey.red>
Date: Thu, 29 May 2025 04:26:34 +0200
Subject: [PATCH 1/3] feat: add user property to MessageResponse interface

---
 types/interfaces.ts | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/types/interfaces.ts b/types/interfaces.ts
index 05830d2..c0c87a9 100644
--- a/types/interfaces.ts
+++ b/types/interfaces.ts
@@ -32,10 +32,11 @@ export interface ChannelResponse {
 }
 
 export interface MessageResponse {
-	uuid: string
-	channel_uuid: string
-	user_uuid: string
-	message: string
+	uuid: string,
+	channel_uuid: string,
+	user_uuid: string,
+	message: string,
+	user: UserResponse
 }
 
 export interface InviteResponse {
@@ -49,6 +50,6 @@ export interface UserResponse {
 	username: string,
 	display_name: string | null,
 	avatar: string | null,
-	email: string,
-	email_verified: boolean
+	email?: string,
+	email_verified?: boolean
   }

From bc94d22ef0f665c689393e61369eb8602b916798 Mon Sep 17 00:00:00 2001
From: SauceyRed <saucey@saucey.red>
Date: Thu, 29 May 2025 04:27:19 +0200
Subject: [PATCH 2/3] feat: switch to using user property of message object

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

diff --git a/components/MessageArea.vue b/components/MessageArea.vue
index 7d20ff0..d58b037 100644
--- a/components/MessageArea.vue
+++ b/components/MessageArea.vue
@@ -1,8 +1,8 @@
 <template>
   <div id="message-area">
 	<div id="messages" ref="messagesElement">
-		<Message v-for="message of messages" :username="displayNames[message.user_uuid]" :text="message.message"
-			:timestamp="uuidToTimestamp(message.uuid)" format="12" />
+		<Message v-for="message of messages" :username="message.user.display_name ?? message.user.username" :text="message.message"
+			:timestamp="uuidToTimestamp(message.uuid)" :img="message.user.avatar" format="12" />
 	</div>
 	<div id="message-box">
 		<form id="message-form" @submit="sendMessage">
@@ -17,7 +17,6 @@
 
 <script lang="ts" setup>
 import type { MessageResponse } from '~/types/interfaces';
-import fetchUser from '~/utils/fetchUser';
 import scrollToBottom from '~/utils/scrollToBottom';
 
 const props = defineProps<{ channelUrl: string, amount?: number, offset?: number, reverse?: boolean }>();
@@ -32,8 +31,6 @@ if (messagesRes && props.reverse) {
 
 const messages = ref<MessageResponse[]>([]);
 
-const displayNames = ref<Record<string, string>>({});
-
 const route = useRoute();
 
 const messageInput = ref<string>();
@@ -41,14 +38,6 @@ const messageInput = ref<string>();
 const messagesElement = ref<HTMLDivElement>();
 
 if (messagesRes) messages.value = messagesRes;
-	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;
 
 const accessToken = useCookie("access_token").value;
 const apiBase = useCookie("api_base").value;
@@ -87,13 +76,6 @@ ws.addEventListener("message", async (event) => {
 	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;

From d80731a1c0bf924275fa5909540ac0318f0d9447 Mon Sep 17 00:00:00 2001
From: SauceyRed <saucey@saucey.red>
Date: Thu, 29 May 2025 04:28:58 +0200
Subject: [PATCH 3/3] fix: props definition not allowing for null value on img

---
 components/Message.vue | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/components/Message.vue b/components/Message.vue
index 78f2889..70115c5 100644
--- a/components/Message.vue
+++ b/components/Message.vue
@@ -1,7 +1,7 @@
 <template>
 	<div class="message">
 		<div>
-			<img v-if="props.img" class="message-author-avatar" :src="img" :alt="username">
+			<img v-if="props.img" class="message-author-avatar" :src="props.img" :alt="username">
 			<Icon v-else name="lucide:user" class="message-author-avatar" />
 		</div>
 		<div class="message-data">
@@ -25,7 +25,7 @@
 </template>
 
 <script lang="ts" setup>
-const props = defineProps<{ class?: string, img?: string, username: string, text: string, timestamp: number, format: "12" | "24" }>();
+const props = defineProps<{ class?: string, img?: string | null, username: string, text: string, timestamp: number, format: "12" | "24" }>();
 
 const messageDate = ref<string>();
 const showHover = ref(false);
@@ -74,6 +74,7 @@ if (now.getUTCHours() >= 0) {
 	display: flex;
 	flex-direction: column;
 	gap: 1dvh;
+	height: 100%;
 }
 
 .message-author {
@@ -84,6 +85,7 @@ if (now.getUTCHours() >= 0) {
 .message-author-avatar {
 	margin-right: 1dvw;
 	width: 3em;
+	border-radius: 50%;
 }
 
 .author-username {