fix: load users correctly on initial chat load
This commit is contained in:
parent
cfa35f6421
commit
8561b0cce2
2 changed files with 9 additions and 4 deletions
|
@ -27,7 +27,6 @@
|
||||||
/* check if we are logged in */
|
/* check if we are logged in */
|
||||||
(async () => {
|
(async () => {
|
||||||
try {
|
try {
|
||||||
console.log( 'hi');
|
|
||||||
const session_response = await api.fetch("/api/users/me");
|
const session_response = await api.fetch("/api/users/me");
|
||||||
|
|
||||||
if (!session_response.ok) {
|
if (!session_response.ok) {
|
||||||
|
|
|
@ -190,9 +190,9 @@
|
||||||
return new_room_element;
|
return new_room_element;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const users = {};
|
||||||
async function append_room_events(events) {
|
async function append_room_events(events) {
|
||||||
const room_chat_content = document.getElementById("room-chat-content");
|
const room_chat_content = document.getElementById("room-chat-content");
|
||||||
const users = {};
|
|
||||||
let last_message_id = undefined;
|
let last_message_id = undefined;
|
||||||
for (const event of events) {
|
for (const event of events) {
|
||||||
// if the last message is undefined, it becomes this event, otherwise, if this event's id is newer,
|
// if the last message is undefined, it becomes this event, otherwise, if this event's id is newer,
|
||||||
|
@ -211,8 +211,12 @@
|
||||||
|
|
||||||
users[event.creator_id] =
|
users[event.creator_id] =
|
||||||
users[event.creator_id] ??
|
users[event.creator_id] ??
|
||||||
(await api.fetch(`/api/users/${event.creator_id}`));
|
(await (await api.fetch(`/api/users/${event.creator_id}`)).json());
|
||||||
|
|
||||||
|
console.dir({
|
||||||
|
users,
|
||||||
|
events,
|
||||||
|
});
|
||||||
room_chat_content.insertAdjacentHTML(
|
room_chat_content.insertAdjacentHTML(
|
||||||
"beforeend",
|
"beforeend",
|
||||||
render_text_event(event, users[event.creator_id]),
|
render_text_event(event, users[event.creator_id]),
|
||||||
|
@ -241,9 +245,11 @@
|
||||||
api.fetch(message_polling_url, {
|
api.fetch(message_polling_url, {
|
||||||
signal: room_polling_request_abort_controller.signal,
|
signal: room_polling_request_abort_controller.signal,
|
||||||
})
|
})
|
||||||
.then((new_events) => {
|
.then(async (new_events_response) => {
|
||||||
|
const new_events = await new_events_response.json();
|
||||||
console.dir({
|
console.dir({
|
||||||
room_id,
|
room_id,
|
||||||
|
new_events_response,
|
||||||
new_events,
|
new_events,
|
||||||
});
|
});
|
||||||
append_room_events(new_events);
|
append_room_events(new_events);
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue