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

Compare commits

base: gorb:9fee630a6806fbc330ccb852924cd6225f5d7216
Branches Tags
gorb:main
gorb:settings-page
gorb:info-components
gorb:guild-joining
gorb:guild-settings
gorb:dev
..
compare: gorb:5b1d25807e9b9462b3b5eea270c3a912f4a6a976
Branches Tags
gorb:main
gorb:settings-page
gorb:info-components
gorb:guild-joining
gorb:guild-settings
gorb:dev

No commits in common. "9fee630a6806fbc330ccb852924cd6225f5d7216" and "5b1d25807e9b9462b3b5eea270c3a912f4a6a976" have entirely different histories.
9fee630a68 ... 5b1d25807e

1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
components/MessageArea.vue
View file

@ -37,7 +37,8 @@ const messagesRes: MessageResponse[] | undefined = await fetchWithApi(
const firstMessageByUsers = ref<Record<string, MessageResponse | undefined>>({});
const previousMessage = ref<MessageResponse>();
function groupMessage(message: MessageResponse, options?: { prevMessage?: MessageResponse, reverse?: boolean }) {
async function groupMessage(message: MessageResponse, options?: { prevMessage?: MessageResponse, reverse?: boolean }) {
await nextTick();
messageTimestamps.value[message.uuid] = uuidToTimestamp(message.uuid);
console.log("message:", message.message);
console.log("author:", message.user.username, `(${message.user.uuid})`);
@ -137,7 +138,7 @@ if (accessToken && apiBase) {
console.log("message uuid:", event.data.uuid);
const parsedData = JSON.parse(event.data);
groupMessage(parsedData);
await groupMessage(parsedData);
console.log("parsed message type:", messagesType.value[parsedData.uuid]);
console.log("parsed message timestamp:", messageTimestamps.value[parsedData.uuid]);
messages.value.push(parsedData);
@ -170,7 +171,6 @@ onMounted(async () => {
if (messagesElement.value) {
scrollToBottom(messagesElement);
let fetched = false;
const amount = messages.value.length;
let offset = messages.value.length;
messagesElement.value.addEventListener("scroll", async (e) => {
if (e.target) {
@ -180,7 +180,7 @@ onMounted(async () => {
fetched = true;
console.log("scroll height is at 10% or less");
//console.log("current oldest:", currentOldestMessage);
const olderMessages = await fetchMessages(route.params.channelId as string, { amount, offset });
const olderMessages = await fetchMessages(route.params.channelId as string, { amount: 2, offset: offset });
if (olderMessages) {
olderMessages.reverse();
console.log("older messages:", olderMessages);
@ -189,10 +189,10 @@ onMounted(async () => {
console.log("old message:", oldMessage);
messages.value.unshift(oldMessage);
for (const message of messages.value) {
groupMessage(message);
await groupMessage(message);
}
}
offset += offset;
offset += 2;
}
} else {
fetched = false;