.

crates/chat_ui/src/lib.rs

@@ -1,7 +1,7 @@
 use std::collections::HashSet;
-use std::time::Duration;
 
 pub use actions::*;
+use anyhow::Error;
 use chat::{Message, RenderedMessage, Room, RoomEvent, RoomKind, SendReport};
 use common::{nip96_upload, RenderedTimestamp};
 use dock::panel::{Panel, PanelEvent};
@@ -244,27 +244,21 @@ impl ChatPanel {
             return;
         }
 
-        // Get the current room entity
-        let Some(room) = self.room.upgrade().map(|this| this.read(cx)) else {
-            return;
-        };
-
         // Get replies_to if it's present
         let replies: Vec<EventId> = self.replies_to.read(cx).iter().copied().collect();
 
-        // Create a temporary message for optimistic update
-        let rumor = room.create_message(&content, replies.as_ref(), cx);
-        let rumor_id = rumor.id.unwrap();
-
-        // Create a task for sending the message in the background
-        let send_message = room.send_message(&rumor, cx);
+        // Get a task to create temporary message for optimistic update
+        let Ok(get_rumor) = self
+            .room
+            .read_with(cx, |this, cx| this.create_message(&content, replies, cx))
+        else {
+            return;
+        };
 
         // Optimistically update message list
-        cx.spawn_in(window, async move |this, cx| {
-            // Wait for the delay
-            cx.background_executor()
-                .timer(Duration::from_millis(100))
-                .await;
+        let task: Task<Result<(), Error>> = cx.spawn_in(window, async move |this, cx| {
+            let mut rumor = get_rumor.await?;
+            let rumor_id = rumor.id();
 
             // Update the message list and reset the states
             this.update_in(cx, |this, window, cx| {
@@ -280,43 +274,50 @@ impl ChatPanel {
 
                 // Update the message list
                 this.insert_message(&rumor, true, cx);
-            })
-            .ok();
-        })
-        .detach();
 
-        self.tasks.push(cx.spawn_in(window, async move |this, cx| {
-            let result = send_message.await;
+                if let Ok(task) = this
+                    .room
+                    .read_with(cx, |this, cx| this.send_message(&rumor, cx))
+                {
+                    this.tasks.push(cx.spawn_in(window, async move |this, cx| {
+                        let result = task.await;
 
-            this.update_in(cx, |this, window, cx| {
-                match result {
-                    Ok(reports) => {
-                        // Update room's status
-                        this.room
-                            .update(cx, |this, cx| {
-                                if this.kind != RoomKind::Ongoing {
-                                    // Update the room kind to ongoing,
-                                    // but keep the room kind if send failed
-                                    if reports.iter().all(|r| !r.is_sent_success()) {
-                                        this.kind = RoomKind::Ongoing;
-                                        cx.notify();
-                                    }
+                        this.update_in(cx, |this, window, cx| {
+                            match result {
+                                Ok(reports) => {
+                                    // Update room's status
+                                    this.room
+                                        .update(cx, |this, cx| {
+                                            if this.kind != RoomKind::Ongoing {
+                                                // Update the room kind to ongoing,
+                                                // but keep the room kind if send failed
+                                                if reports.iter().all(|r| !r.is_sent_success()) {
+                                                    this.kind = RoomKind::Ongoing;
+                                                    cx.notify();
+                                                }
+                                            }
+                                        })
+                                        .ok();
+
+                                    // Insert the sent reports
+                                    this.reports_by_id.insert(rumor_id, reports);
+
+                                    cx.notify();
                                 }
-                            })
-                            .ok();
-
-                        // Insert the sent reports
-                        this.reports_by_id.insert(rumor_id, reports);
-
-                        cx.notify();
-                    }
-                    Err(e) => {
-                        window.push_notification(e.to_string(), cx);
-                    }
+                                Err(e) => {
+                                    window.push_notification(e.to_string(), cx);
+                                }
+                            }
+                        })
+                        .ok();
+                    }))
                 }
-            })
-            .ok();
-        }));
+            })?;
+
+            Ok(())
+        });
+
+        task.detach();
     }
 
     /// Insert a message into the chat panel