gorb/frontend
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

dev #1

Merged
sauceyred merged 36 commits from dev into main 2025-05-29 03:01:50 +00:00
Conversation 0 Commits 36 Files changed 18 +2 -20
1 changed files with 2 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit bc94d22ef0 - Show all commits

22
components/MessageArea.vue
View file

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