update ui

Cargo.lock

@@ -2155,6 +2155,27 @@ dependencies = [
  "wio",
 ]
 
+[[package]]
+name = "dyn-clonable"
+version = "0.9.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a36efbb9bfd58e1723780aa04b61aba95ace6a05d9ffabfdb0b43672552f0805"
+dependencies = [
+ "dyn-clonable-impl",
+ "dyn-clone",
+]
+
+[[package]]
+name = "dyn-clonable-impl"
+version = "0.9.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7e8671d54058979a37a26f3511fbf8d198ba1aa35ffb202c42587d918d77213a"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.119",
+]
+
 [[package]]
 name = "dyn-clone"
 version = "1.0.20"
@@ -5939,6 +5960,8 @@ version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "13a380031deed8e99db00065c45937da434ca987c034e13b87e4441f9e4090be"
 dependencies = [
+ "bitflags 2.13.2",
+ "block2 0.6.2",
  "objc2 0.6.5",
  "objc2-foundation 0.3.2",
 ]
@@ -6436,6 +6459,15 @@ dependencies = [
  "ureq",
 ]
 
+[[package]]
+name = "oxilangtag"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5d3b4eb570abd4a1dcb062c31fd37b832264d9dc7292c3e69acfe926c87b063f"
+dependencies = [
+ "serde",
+]
+
 [[package]]
 name = "page_size"
 version = "0.6.0"
@@ -8372,6 +8404,7 @@ dependencies = [
  "serde",
  "serde_json",
  "sha2 0.10.9",
+ "tts",
  "wasm-bindgen",
  "web-sys",
 ]
@@ -8443,6 +8476,21 @@ dependencies = [
  "web-sys",
 ]
 
+[[package]]
+name = "ssip"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b81f5ada7d4745722e62f8be4aca56abcf0e0e46e409612ac94a4a3a2b471d39"
+
+[[package]]
+name = "ssip-client-async"
+version = "0.19.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2cfbcb0ed774006ab9f14d4595fc02668cd7f5e662a87ff82264e6506238f47f"
+dependencies = [
+ "ssip",
+]
+
 [[package]]
 name = "stable_deref_trait"
 version = "1.2.1"
@@ -9289,6 +9337,33 @@ dependencies = [
  "core_maths",
 ]
 
+[[package]]
+name = "tts"
+version = "0.27.0"
+source = "git+https://github.com/ndarilek/tts-rs#8fbcb720cb86c5166a9ed46272e3777f742da18e"
+dependencies = [
+ "block2 0.6.2",
+ "dyn-clonable",
+ "hound",
+ "jni 0.22.4",
+ "libloading",
+ "ndk-context",
+ "objc2 0.6.5",
+ "objc2-avf-audio",
+ "objc2-foundation 0.3.2",
+ "oxilangtag",
+ "parking_lot",
+ "ssip",
+ "ssip-client-async",
+ "tempfile",
+ "thiserror 2.0.21",
+ "tracing",
+ "wasm-bindgen",
+ "web-sys",
+ "windows 0.62.2",
+ "zbus",
+]
+
 [[package]]
 name = "tungstenite"
 version = "0.28.0"

Cargo.toml

@@ -50,6 +50,7 @@ rand = { version = "0.10", default-features = false, features = [ "std", "sys_rn
 
 # Others
 anyhow = "1.0.44"
+tts = { git = "https://github.com/ndarilek/tts-rs" }
 chrono = { version = "0.4.38", features = ["wasmbind"] }
 futures = "0.3"
 itertools = "0.13.0"

assets/icons/speech.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none">
+<path d="M10.75 14.75V17.25" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/><path d="M14.25 7.75V20.25" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/><path d="M17.75 10.75V17.25" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/><path d="M21.25 12.75V15.25" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/><path d="M2.75 5.25V3.75H7M11.25 5.25V3.75H7M7 3.75V12.25M7 12.25H5.25M7 12.25H8.75" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>

crates/chat_ui/src/lib.rs

@@ -30,6 +30,7 @@ use person::{Directory, Person};
 use regex::Regex;
 use settings::{AppSettings, SignerKind};
 use smallvec::{SmallVec, smallvec};
+use speech::speaker::Speaker;
 use state::{
     FileAttachment, LocalFile, NostrRegistry, PickedFile, download_and_decrypt_file, pick_file,
 };
@@ -65,65 +66,45 @@ pub fn init(room: WeakEntity<Room>, window: &mut Window, cx: &mut App) -> Entity
 pub struct ChatPanel {
     id: SharedString,
     focus_handle: FocusHandle,
-
     /// Chat Room
     room: WeakEntity<Room>,
-
     /// Person directory shared with the room
     directory: Entity<Directory>,
-
     /// Message list state
     list_state: ListState,
-
     /// All messages (sorted by created_at)
     messages: Vec<Message>,
-
     /// O(1) message lookup by EventId
     message_index: HashMap<EventId, usize>,
-
     /// All reactions
     reactions: BTreeMap<EventId, Vec<(SharedString, Option<SharedUri>, PublicKey)>>,
-
     /// Mapping message ids to their rendered texts
     rendered_texts_by_id: BTreeMap<EventId, RenderedText>,
-
     /// Mapping message (rumor event) ids to their reports
     reports_by_id: Arc<RwLock<BTreeMap<EventId, Vec<SendReport>>>>,
-
     /// Chat input state
     input: Entity<TextareaState>,
-
     /// Dictation session for the chat input
     speech: Entity<SpeechState>,
-
     /// When the running dictation started, for the elapsed counter
     speech_started: Option<instant::Instant>,
-
+    /// Reads messages aloud
+    speaker: Speaker,
     /// Subject input state
     subject_input: Entity<InputState>,
-
     /// Subject bar visibility
     subject_bar: Entity<bool>,
-
     /// Replies to
     replies_to: Entity<HashSet<EventId>>,
-
     /// Media Attachment
     attachments: Entity<Vec<Url>>,
-
     /// Uploaded, encrypted file attachments which are not sent yet
     encrypted_attachments: Entity<Vec<PendingFile>>,
-
     /// Decrypted attachments of file messages, by message id
     decrypted_files: HashMap<EventId, DecryptedFile>,
-
     /// Upload state
     uploading: bool,
-
-    /// Async operations
     tasks: Vec<Task<Result<(), Error>>>,
-
-    /// Event subscriptions
     subscriptions: SmallVec<[Subscription; 4]>,
 }
 
@@ -253,6 +234,7 @@ impl ChatPanel {
             input,
             speech,
             speech_started: None,
+            speaker: Speaker::new(),
             subject_input,
             subject_bar,
             replies_to,
@@ -1449,6 +1431,7 @@ impl ChatPanel {
 
         let reply_id = *id;
         let dropdown_id = *id;
+        let speech_id = *id;
         let public_key = *public_key;
 
         let actions = actions.reply(cx.listener(move |this, _event, _window, cx| {
@@ -1464,6 +1447,16 @@ impl ChatPanel {
             actions
         };
 
+        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
+                && let Err(error) = this.speaker.speak(&text)
+            {
+                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)))
                 .menu("Seen on", Box::new(Command::Trace(dropdown_id)))

crates/nip29_ui/src/lib.rs

@@ -26,6 +26,7 @@ use person::Directory;
 use serde::Deserialize;
 use settings::AppSettings;
 use smallvec::{SmallVec, smallvec};
+use speech::speaker::Speaker;
 use state::{NostrRegistry, pick_file, upload_file};
 use ui::{Avatar, RenderedText, WelcomeMessage, rendered_text};
 use util::{attachment_name, display_name, opens_run, pin_label, report};
@@ -320,6 +321,8 @@ pub struct GroupPanel {
     speech: Entity<SpeechState>,
     /// When the running dictation started, for the elapsed counter
     speech_started: Option<instant::Instant>,
+    /// Reads messages aloud
+    speaker: Speaker,
     /// Uploaded, non-encrypted attachments waiting to be sent.
     attachments: Vec<Url>,
     /// Whether an upload is in flight.
@@ -419,9 +422,10 @@ impl GroupPanel {
                     }
                 },
             ));
+            this.track_participants(cx);
         });
 
-        let mut this = Self {
+        Self {
             focus_handle: cx.focus_handle(),
             group: group.downgrade(),
             directory: Directory::new(cx),
@@ -433,19 +437,15 @@ impl GroupPanel {
             input,
             speech,
             speech_started: None,
+            speaker: Speaker::new(),
             attachments: Vec::new(),
             uploading: false,
             tasks: smallvec![],
             _subscriptions: subscriptions,
-        };
-
-        this.track_participants(cx);
-
-        this
+        }
     }
 
-    /// Track the keys rendered by this panel: members, message authors, and
-    /// activity subjects
+    /// Track the keys rendered by this panel.
     fn track_participants(&mut self, cx: &mut Context<Self>) {
         let Some(group) = self.group.upgrade() else {
             return;

crates/nip29_ui/src/message.rs

@@ -8,15 +8,16 @@ use gpui::{
 use gpui_kit::assets::IconName;
 use gpui_kit::base::StyledExt as _;
 use gpui_kit::component::menu::{ContextMenuExt as _, PopupMenuItem};
-use gpui_kit::component::{ActiveTheme, Icon, Sizable, h_flex};
+use gpui_kit::component::notification::Notification;
+use gpui_kit::component::{ActiveTheme, Icon, Sizable, WindowExt, h_flex};
 use nip29::{Activity, Group, Reaction};
 use nostr_sdk::prelude::{EventId, Kind};
 use person::Directory;
 use settings::AppSettings;
 use state::NostrRegistry;
 use ui::{
-    Avatar, MessageMedia, MessageRow, REACTION_EMOJIS, ReactionBar, ReplyPreview, group_reactions,
-    react_menu,
+    Avatar, MessageActions, MessageMedia, MessageRow, REACTION_EMOJIS, ReactionBar, ReplyPreview,
+    group_reactions, react_menu,
 };
 
 use crate::GroupPanel;
@@ -87,10 +88,18 @@ pub(crate) fn render(
     let admin = actions.admin;
     let pinned = actions.pinned;
     let group = actions.group;
-    let panel = actions.panel;
+    let speech_panel = actions.panel;
+    let panel = speech_panel.clone();
+    let speech_text = message.preview();
+
+    let row = row.overlay(MessageActions::new().speech(move |_event, _window, cx| {
+        _ = speech_panel.update_in(cx, |panel, window, cx| {
+            if let Err(error) = panel.speaker.speak(&speech_text) {
+                window.push_notification(Notification::error(error.to_string()), cx);
+            }
+        });
+    }));
 
-    // Reading the panel here would re-enter its ongoing update, so resolve
-    // the current user's custom emojis through the shared person directory.
     let custom = nostr
         .read(cx)
         .current_user()

crates/speech/Cargo.toml

@@ -11,6 +11,7 @@ gpui.workspace = true
 gpui-kit = { workspace = true, features = ["speech"] }
 flume.workspace = true
 instant.workspace = true
+tts.workspace = true
 
 [target.'cfg(not(target_arch = "wasm32"))'.dependencies]
 common = { path = "../common" }

crates/speech/src/lib.rs

@@ -2,6 +2,7 @@
 pub mod model;
 #[cfg(not(target_arch = "wasm32"))]
 mod parakeet;
+pub mod speaker;
 #[cfg(target_arch = "wasm32")]
 mod web;
 

crates/speech/src/speaker.rs

@@ -0,0 +1,47 @@
+use tts::Tts;
+
+/// Reads text aloud through the platform's speech backend, created on first use.
+pub struct Speaker {
+    tts: Option<Tts>,
+}
+
+impl Default for Speaker {
+    fn default() -> Self {
+        Self::new()
+    }
+}
+
+impl Speaker {
+    pub fn new() -> Self {
+        Self { tts: None }
+    }
+
+    /// Speak the text, interrupting what this speaker is already saying.
+    pub fn speak(&mut self, text: &str) -> Result<(), tts::Error> {
+        let tts = match self.tts.as_ref() {
+            Some(tts) => tts,
+            None => self.tts.insert(Tts::default()?),
+        };
+
+        tts.speak(text, true)?;
+        Ok(())
+    }
+
+    /// Stop speaking; a speaker that never spoke is already silent.
+    pub fn stop(&mut self) -> Result<(), tts::Error> {
+        match self.tts.as_ref() {
+            Some(tts) => tts.stop()?,
+            None => return Ok(()),
+        }
+
+        Ok(())
+    }
+
+    /// Best-effort speaking state; a speaker that never spoke is silent.
+    pub fn speaking(&self) -> bool {
+        self.tts
+            .as_ref()
+            .and_then(|tts| tts.is_speaking().ok())
+            .unwrap_or(false)
+    }
+}

crates/ui/src/icon.rs

@@ -26,6 +26,7 @@ pub enum IconName {
     PlusChat,
     Profile,
     Relay,
+    Speech,
     Search,
     Settings,
     Settings2,
@@ -58,6 +59,7 @@ impl IconNamed for IconName {
             Self::PlusChat => "icons/plus-chat.svg",
             Self::Profile => "icons/profile.svg",
             Self::Relay => "icons/relay.svg",
+            Self::Speech => "icons/speech.svg",
             Self::Search => "icons/search.svg",
             Self::Settings => "icons/settings.svg",
             Self::Settings2 => "icons/settings2.svg",

crates/ui/src/message.rs

@@ -597,13 +597,14 @@ pub fn react_menu(
     })
 }
 
-/// A hovered message's action bar: quick reactions, reply, copy, and an overflow menu.
+/// A hovered message's action bar: quick reactions, reply, copy, read aloud, and an overflow menu.
 #[derive(IntoElement)]
 pub struct MessageActions {
     style: StyleRefinement,
     reactions: SmallVec<[(&'static str, SharedClickListener); 4]>,
     reply: Option<SharedClickListener>,
     copy: Option<(ElementId, SharedString)>,
+    speech: Option<SharedClickListener>,
     dropdown: Option<DropdownBuilder>,
 }
 
@@ -615,6 +616,7 @@ impl MessageActions {
             reactions: SmallVec::new(),
             reply: None,
             copy: None,
+            speech: None,
             dropdown: None,
         }
     }
@@ -642,6 +644,15 @@ impl MessageActions {
         self
     }
 
+    /// Add the read-aloud button.
+    pub fn speech(
+        mut self,
+        handler: impl Fn(&ClickEvent, &mut Window, &mut App) + 'static,
+    ) -> Self {
+        self.speech = Some(Rc::new(handler));
+        self
+    }
+
     /// Fill the bar's overflow menu.
     pub fn dropdown(
         mut self,
@@ -671,10 +682,13 @@ impl RenderOnce for MessageActions {
             reactions,
             reply,
             copy,
+            speech,
             dropdown,
         } = self;
 
-        let has_center = reply.is_some() || copy.is_some();
+        // The leading separator only separates reactions from the center buttons
+        let has_center =
+            !reactions.is_empty() && (reply.is_some() || copy.is_some() || speech.is_some());
 
         h_flex()
             .p_0p5()
@@ -712,6 +726,16 @@ impl RenderOnce for MessageActions {
             .when_some(copy, |this, (id, value)| {
                 this.child(Clipboard::new(id).value(value).tooltip("Copy").small())
             })
+            .when_some(speech, |this, speech| {
+                this.child(
+                    Button::new("speech")
+                        .icon(crate::IconName::Speech)
+                        .tooltip("Read aloud")
+                        .small()
+                        .ghost()
+                        .on_click(move |event, window, cx| speech(event, window, cx)),
+                )
+            })
             .when_some(dropdown, |this, dropdown| {
                 this.child(div().flex_shrink_0().h_4().w_px().bg(cx.theme().border))
                     .child(