From e5b284ed19cb99f79a0cbaca9e2339b9171e6d6d Mon Sep 17 00:00:00 2001
From: Ulyssa <git@ulyssa.dev>
Date: Tue, 2 Apr 2024 08:42:27 -0700
Subject: [PATCH] Use color overrides for users when `message_user_color` is
 enabled (#245)

---
 src/config.rs      | 11 ++++++-----
 src/message/mod.rs |  2 +-
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/config.rs b/src/config.rs
index 5603ce0..6d7dd0e 100644
--- a/src/config.rs
+++ b/src/config.rs
@@ -912,15 +912,16 @@ impl ApplicationSettings {
             .unwrap_or_default()
     }
 
-    pub fn get_user_style(&self, user_id: &UserId) -> Style {
-        let color = self
-            .tunables
+    pub fn get_user_color(&self, user_id: &UserId) -> Color {
+        self.tunables
             .users
             .get(user_id)
             .and_then(|user| user.color.as_ref().map(|c| c.0))
-            .unwrap_or_else(|| user_color(user_id.as_str()));
+            .unwrap_or_else(|| user_color(user_id.as_str()))
+    }
 
-        user_style_from_color(color)
+    pub fn get_user_style(&self, user_id: &UserId) -> Style {
+        user_style_from_color(self.get_user_color(user_id))
     }
 
     pub fn get_user_span<'a>(&self, user_id: &'a UserId, info: &'a RoomInfo) -> Span<'a> {
diff --git a/src/message/mod.rs b/src/message/mod.rs
index 48b149a..e835e83 100644
--- a/src/message/mod.rs
+++ b/src/message/mod.rs
@@ -863,7 +863,7 @@ impl Message {
         }
 
         if settings.tunables.message_user_color {
-            let color = crate::config::user_color(self.sender.as_str());
+            let color = settings.get_user_color(&self.sender);
             style = style.fg(color);
         }