.

crates/chat_ui/src/lib.rs

@@ -30,7 +30,7 @@ use person::{Directory, Person};
 use regex::Regex;
 use settings::{AppSettings, SignerKind};
 use smallvec::{SmallVec, smallvec};
-use speech::speaker::Speaker;
+use speech::speaker::{END_GRACE, Speaker};
 use state::{
     FileAttachment, LocalFile, NostrRegistry, PickedFile, download_and_decrypt_file, pick_file,
 };
@@ -46,8 +46,7 @@ use crate::file::*;
 const PRIVATE_NOTICE: &str =
     "This conversation is private. Only members can see each other's messages.";
 
-/// Regex matching strings that consist entirely of emoji characters,
-/// zero-width joiners, variation selectors, and keycap combiners.
+/// Regex matching strings that consist entirely of emoji characters.
 static EMOJI_RE: LazyLock<Regex> =
     LazyLock::new(|| Regex::new(r"^[\p{Emoji}\u{200D}\u{FE0F}\u{20E3}]+$").unwrap());
 
@@ -90,9 +89,10 @@ pub struct ChatPanel {
     speech_started: Option<instant::Instant>,
     /// Reads messages aloud
     speaker: Speaker,
-
     /// The message being revealed in step with speech, with its estimated duration
     speech_reveal: Option<(EventId, Duration)>,
+    /// Fallback reveal end for backends that cannot report utterance end
+    reveal_timeout: Option<Task<Result<(), Error>>>,
     /// Subject input state
     subject_input: Entity<InputState>,
     /// Subject bar visibility
@@ -253,6 +253,7 @@ impl ChatPanel {
             speech_started: None,
             speaker,
             speech_reveal: None,
+            reveal_timeout: None,
             subject_input,
             subject_bar,
             replies_to,
@@ -1473,22 +1474,42 @@ impl ChatPanel {
             actions
         };
 
+        let speaking = self.speech_reveal.is_some();
         let speech_id = *id;
-        let actions = actions.speech(cx.listener(move |this, _event, window, cx| {
-            let text = this.message(&speech_id).map(|message| message.preview());
 
-            if let Some(text) = text {
-                match this.speaker.speak(&text) {
-                    Ok(duration) => {
-                        this.speech_reveal = Some((speech_id, duration));
-                        cx.notify();
-                    }
-                    Err(error) => {
-                        window.push_notification(Notification::error(error.to_string()), cx)
+        let actions = actions.speech(
+            speaking,
+            cx.listener(move |this, _event, window, cx| {
+                let text = this.message(&speech_id).map(|message| message.preview());
+
+                if let Some(text) = text {
+                    match this.speaker.speak(&text) {
+                        Ok(duration) => {
+                            this.speech_reveal = Some((speech_id, duration));
+
+                            // Re-enable speaking when no end event ever arrives
+                            let session = (speech_id, duration);
+                            let timer = cx.background_executor().timer(duration + END_GRACE);
+                            this.reveal_timeout = Some(cx.spawn(async move |this, cx| {
+                                timer.await;
+                                this.update(cx, |this, cx| {
+                                    if this.speech_reveal.as_ref() == Some(&session) {
+                                        this.speech_reveal = None;
+                                        cx.notify();
+                                    }
+                                })?;
+
+                                Ok(())
+                            }));
+                            cx.notify();
+                        }
+                        Err(error) => {
+                            window.push_notification(Notification::error(error.to_string()), cx)
+                        }
                     }
                 }
-            }
-        }));
+            }),
+        );
 
         actions.dropdown(move |menu, _window, _cx| {
             menu.menu("Copy author", Box::new(Command::Copy(public_key)))