Simplify highlight box for /me action

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

Hide file tree

Showing 2 changed files with 12 additions and 25 deletions.
diff --git a/src/buffer/channel.rs b/src/buffer/channel.rs
@@ -214,22 +214,14 @@ pub fn view<'a>(
                             config,
                         );
 
-                        let text_container =
-                            container(message_content).style(move |theme| match user {
-                                Some(user) => match our_nick {
-                                    Some(nick)
-                                        if message::references_user(
-                                            user.nickname(),
-                                            nick,
-                                            message,
-                                        ) =>
-                                    {
-                                        theme::container::highlight(theme)
-                                    }
-                                    _ => Default::default(),
-                                },
-                                _ => Default::default(),
-                            });
+                        let text_container = container(message_content).style(move |theme| {
+                            if let (Some(user), Some(nick)) = (user, our_nick) {
+                                if message::references_user(user.nickname(), nick, message) {
+                                    return theme::container::highlight(theme);
+                                }
+                            }
+                            Default::default()
+                        });
 
                         Some(
                             container(

diff --git a/src/buffer/highlights.rs b/src/buffer/highlights.rs
@@ -106,7 +106,7 @@ pub fn view<'a>(
                         )
                         .into(),
                     )
-                },
+                }
                 message::Target::Highlights {
                     server,
                     channel,
@@ -141,15 +141,10 @@ pub fn view<'a>(
                     );
 
                     Some(
-                        container(
-                            row![]
-                                .push_maybe(timestamp)
-                                .push(channel_text)
-                                .push(text),
-                        )
-                        .into(),
+                        container(row![].push_maybe(timestamp).push(channel_text).push(text))
+                            .into(),
                     )
-                },
+                }
                 _ => None,
             },
         )