reya/coop
1
0
Fork 0
Code Issues Pull Requests Releases Activity

chore: fix double messages on load (#134)

Browse Source
This commit is contained in:
reya
2025-09-01 08:22:04 +07:00
committed by GitHub
parent 6a5304514f
commit e7ffe7627c
2 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
crates/coop/src/chatspace.rs
View File

@@ -248,7 +248,7 @@ impl ChatSpace {
} }
} }
smol::Timer::after(Duration::from_secs(1)).await; smol::Timer::after(Duration::from_millis(300)).await;
} }
} }

11
crates/coop/src/views/chat/mod.rs
View File

@@ -1,4 +1,4 @@
use std::collections::HashMap; use std::collections::{BTreeSet, HashMap};
use anyhow::anyhow; use anyhow::anyhow;
use common::display::{ReadableProfile, ReadableTimestamp}; use common::display::{ReadableProfile, ReadableTimestamp};
@@ -54,7 +54,7 @@ pub struct Chat {
// Chat Room // Chat Room
room: Entity<Room>, room: Entity<Room>,
list_state: ListState, list_state: ListState,
messages: Vec<RenderedMessage>, messages: BTreeSet<RenderedMessage>,
rendered_texts_by_id: HashMap<EventId, RenderedText>, rendered_texts_by_id: HashMap<EventId, RenderedText>,
reports_by_id: HashMap<EventId, Vec<SendReport>>, reports_by_id: HashMap<EventId, Vec<SendReport>>,
// New Message // New Message
@@ -154,7 +154,7 @@ impl Chat {
focus_handle: cx.focus_handle(), focus_handle: cx.focus_handle(),
uploading: false, uploading: false,
sending: false, sending: false,
messages: Vec::new(), messages: BTreeSet::new(),
rendered_texts_by_id: HashMap::new(), rendered_texts_by_id: HashMap::new(),
reports_by_id: HashMap::new(), reports_by_id: HashMap::new(),
room, room,
@@ -340,7 +340,7 @@ impl Chat {
let new_len = 1; let new_len = 1;
// Extend the messages list with the new events // Extend the messages list with the new events
self.messages.push(event.into()); self.messages.insert(event.into());
// Update list state with the new messages // Update list state with the new messages
self.list_state.splice(old_len..old_len, new_len); self.list_state.splice(old_len..old_len, new_len);
@@ -359,7 +359,6 @@ impl Chat {
// Extend the messages list with the new events // Extend the messages list with the new events
self.messages.extend(events); self.messages.extend(events);
self.messages.sort_by_key(|ev| ev.created_at);
// Update list state with the new messages // Update list state with the new messages
self.list_state.splice(old_len..old_len, new_len); self.list_state.splice(old_len..old_len, new_len);
@@ -527,7 +526,7 @@ impl Chat {
window: &mut Window, window: &mut Window,
cx: &mut Context<Self>, cx: &mut Context<Self>,
) -> Stateful<Div> { ) -> Stateful<Div> {
let Some(message) = self.messages.get(ix) else { let Some(message) = self.messages.iter().nth(ix) else {
return div().id(ix); return div().id(ix);
}; };