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

Merge remote-tracking branch 'origin/main' into better-themes

Browse source
This commit is contained in:
Twig 2025-08-05 04:01:45 +02:00
commit 7d267b436e
Signed by: twig
SSH key fingerprint: SHA256:nBO+OwpTkd8LYhe38PIqdxmDvkIg9Vw2EbrRZM97dkU
6 changed files with 40 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

4
components/Message.vue
View file

@ -1,6 +1,6 @@
<template>
<div v-if="props.type == 'normal' || props.replyMessage" ref="messageElement" @contextmenu="showContextMenu($event, contextMenu, menuItems)" :id="props.last ? 'last-message' : undefined"
class="message normal-message" :class="{ 'mentioned': (props.replyMessage || props.isMentioned) && props.message.user.uuid != props.me.uuid && props.replyMessage?.user.uuid == props.me.uuid }" :data-message-id="props.messageId"
class="message normal-message" :class="{ 'mentioned': (props.replyMessage || props.isMentioned) && props.message.member.user.uuid != props.me.uuid && props.replyMessage?.member.user.uuid == props.me.uuid }" :data-message-id="props.messageId"
:editing.sync="props.editing" :replying-to.sync="props.replyingTo">
<div v-if="props.replyMessage" class="message-reply-svg">
<svg
@ -25,7 +25,7 @@
</svg>
</div>
<MessageReply v-if="props.replyMessage" :id="props.message.uuid"
:author="getDisplayName(props.replyMessage.user)"
:author="getDisplayName(props.replyMessage.member)"
:text="props.replyMessage?.message"
:reply-id="props.replyMessage.uuid" max-width="reply" />
<div class="left-column">

30
components/MessageArea.vue
View file

@ -1,13 +1,13 @@
<template>
<div id="message-area">
<div id="messages" ref="messagesElement">
<Message v-for="(message, i) of messages" :username="getDisplayName(message.user)" :key="message.uuid"
:text="message.message" :timestamp="messageTimestamps[message.uuid]" :img="message.user.avatar"
<Message v-for="(message, i) of messages" :username="getDisplayName(message.member.user)" :key="message.uuid"
:text="message.message" :timestamp="messageTimestamps[message.uuid]" :img="message.member.user.avatar"
:format="timeFormat" :type="messagesType[message.uuid]"
:margin-bottom="(messages[i + 1] && messagesType[messages[i + 1].uuid] == 'normal') ?? false"
:last="i == messages.length - 1" :message-id="message.uuid" :author="message.user" :me="me"
:last="i == messages.length - 1" :message-id="message.uuid" :author="message.member" :me="me"
:message="message" :is-reply="message.reply_to"
:author-color="`${generateIrcColor(message.user.uuid)}`"
:author-color="`${generateIrcColor(message.member.uuid)}`"
:reply-message="message.reply_to ? getReplyMessage(message.reply_to) : undefined" />
</div>
<div id="message-box" class="rounded-corners">
@ -67,33 +67,33 @@ const previousMessage = ref<MessageResponse>();
function groupMessage(message: MessageResponse, options?: { prevMessage?: MessageResponse, reverse?: boolean }) {
messageTimestamps.value[message.uuid] = uuidToTimestamp(message.uuid);
console.log("message:", message.message);
console.log("author:", message.user.username, `(${message.user.uuid})`);
console.log("author:", message.member.user.username, `(${message.member.uuid})`);
if (!previousMessage.value || previousMessage.value && message.user.uuid != previousMessage.value.user.uuid) {
if (!previousMessage.value || previousMessage.value && message.member.uuid != previousMessage.value.member.uuid) {
console.log("no previous message or author is different than last messsage's");
messagesType.value[message.uuid] = "normal";
previousMessage.value = message;
console.log("set previous message to:", previousMessage.value.message);
console.log(`setting first post by user ${message.user.username} to "${message.message}" with timestamp ${messageTimestamps.value[message.uuid]}`);
firstMessageByUsers.value[message.user.uuid] = message;
console.log(`setting first post by user ${message.member.user.username} to "${message.message}" with timestamp ${messageTimestamps.value[message.uuid]}`);
firstMessageByUsers.value[message.member.uuid] = message;
return;
}
const firstByUser = firstMessageByUsers.value[message.user.uuid];
const firstByUser = firstMessageByUsers.value[message.member.uuid];
if (firstByUser) {
console.log("first by user exists:", firstByUser);
if (message.user.uuid != firstByUser.user.uuid) {
if (message.member.uuid != firstByUser.member.uuid) {
console.log("message is by new user, setting their first message")
firstMessageByUsers.value[message.user.uuid] = message;
firstMessageByUsers.value[message.member.uuid] = message;
console.log("RETURNING FALSE");
messagesType.value[message.uuid] = "normal";
return;
}
} else {
console.log("first by user doesn't exist");
console.log(`setting first post by user ${message.user.username} to "${message.message}" with timestamp ${messageTimestamps.value[message.uuid]}`);
firstMessageByUsers.value[message.user.uuid] = message;
console.log(`setting first post by user ${message.member.user.username} to "${message.message}" with timestamp ${messageTimestamps.value[message.uuid]}`);
firstMessageByUsers.value[message.member.uuid] = message;
console.log("RETURNING FALSE");
messagesType.value[message.uuid] = "normal";
return;
@ -111,8 +111,8 @@ function groupMessage(message: MessageResponse, options?: { prevMessage?: Messag
console.log("group?", lessThanMax);
if (!lessThanMax) {
console.log("diff exceeds max");
console.log(`setting first post by user ${message.user.username} to "${message.message}" with timestamp ${messageTimestamps.value[message.uuid]}`)
firstMessageByUsers.value[message.user.uuid] = message;
console.log(`setting first post by user ${message.member.user.username} to "${message.message}" with timestamp ${messageTimestamps.value[message.uuid]}`)
firstMessageByUsers.value[message.member.uuid] = message;
messagesType.value[message.uuid] = "normal";
return;
}