Highlights buffer now includes Action messages

squidowl · Dec 16, 2024 · f0c6e33 · f0c6e33
1 parent 1c5dad6
commit f0c6e33
Show file tree

Hide file tree

Showing 2 changed files with 44 additions and 2 deletions.
diff --git a/data/src/message.rs b/data/src/message.rs
@@ -547,7 +547,6 @@ fn text_references_nickname(text: &str, nickname: NickRef) -> Option<bool> {
 
 fn parse_user_and_channel_fragments(text: &str, channel_users: &[User]) -> Vec<Fragment> {
     text.chars()
-        .filter(|&c| c != '\u{1}')
         .group_by(|c| c.is_whitespace())
         .into_iter()
         .flat_map(|(is_whitespace, chars)| {

diff --git a/src/buffer/highlights.rs b/src/buffer/highlights.rs
@@ -106,7 +106,50 @@ pub fn view<'a>(
                         )
                         .into(),
                     )
-                }
+                },
+                message::Target::Highlights {
+                    server,
+                    channel,
+                    source: message::Source::Action(_),
+                } => {
+                    let timestamp =
+                        config
+                            .buffer
+                            .format_timestamp(&message.server_time)
+                            .map(|timestamp| {
+                                selectable_text(timestamp).style(theme::selectable_text::timestamp)
+                            });
+
+                    let channel_text = selectable_rich_text::<_, _, (), _, _>(vec![
+                        span(channel.as_str())
+                            .color(theme.colors().buffer.url)
+                            .link(message::Link::GoToMessage(
+                                server.clone(),
+                                channel.clone(),
+                                message.hash,
+                            )),
+                        span(" "),
+                    ])
+                    .on_link(scroll_view::Message::Link);
+
+                    let text = message_content(
+                        &message.content,
+                        theme,
+                        scroll_view::Message::Link,
+                        theme::selectable_text::action,
+                        config,
+                    );
+
+                    Some(
+                        container(
+                            row![]
+                                .push_maybe(timestamp)
+                                .push(channel_text)
+                                .push(text),
+                        )
+                        .into(),
+                    )
+                },
                 _ => None,
             },
         )