src/cri.rs

@@ -7,9 +7,7 @@ use iced::{
     widget::{column, container, mouse_area, row, text, text_input},
     Application, Background, Element, Length, Theme,
 };
-use irc::proto::{
+use irc::proto::{message::Tag, CapSubCommand, Capability, Command as IrcCommand, Response};
-    message::Tag, CapSubCommand, Capability, ChannelExt, Command as IrcCommand, Response,
-};
 use once_cell::sync::Lazy;
 use tokio::sync::mpsc::{UnboundedReceiver, UnboundedSender};
 
@@ -192,6 +190,7 @@ impl Application for Cri {
     fn update(&mut self, message: Self::Message) -> iced::Command<Self::Message> {
         match message {
             ui_message::UiMessage::IrcMessageReceived(message) => {
+                // TODO use actual nickname
                 let source_nickname: String =
                     message.source_nickname().unwrap_or(&self.nickname).into();
 
@@ -253,19 +252,11 @@ impl Application for Cri {
 
                     IrcCommand::PRIVMSG(msgtarget, content)
                     | IrcCommand::NOTICE(msgtarget, content) => {
-                        let source_nickname = message.source_nickname();
+                        let channel: String = message.response_target().unwrap_or(msgtarget).into();
-                        let target_name = if msgtarget.is_channel_name()
-                            || source_nickname == Some(&self.nickname)
-                        {
-                            msgtarget
-                        } else {
-                            source_nickname.unwrap_or(msgtarget)
-                        };
-
                         self.message_log.on_privmsg(
                             &self.nickname,
-                            target_name,
+                            &channel,
-                            source_nickname.unwrap(),
+                            &source_nickname,
                             content,
                             message_id,
                             &timestamp,

src/message_log.rs

@@ -287,14 +287,14 @@ impl<'a> MessageLog {
     pub fn on_privmsg(
         &mut self,
         current_nickname: &str,
-        target_name: &str,
+        channel_name: &str,
         nickname: &str,
         message: &str,
         message_id: Option<&str>,
         timestamp: &DateTime<Local>,
     ) {
-        let is_active = self.active_channel.as_deref() == Some(target_name);
+        let is_active = self.active_channel.as_deref() == Some(channel_name);
-        let channel = self.get_mut(Some(target_name));
+        let channel = self.get_mut(Some(channel_name));
 
         if channel.is_multiline {
             Self::handle_multiline_message(channel, nickname, message, message_id);
@@ -449,10 +449,11 @@ impl<'a> MessageLog {
             }
             MessageDetail::Privmsg { nickname, message } => {
                 let is_self = nickname == current_nickname;
+                let text_color = if is_self { util::DARK_RED } else { util::BLACK };
                 let message_appearance = Self::container_appearance(util::WHITE, 8.0);
                 let own_message_appearance = Self::container_appearance(util::LIGHTER_GREEN, 8.0);
                 let mut elements: Vec<Element<'_, _, _>> =
-                    vec![text(message).style(util::BLACK).into()];
+                    vec![text(message).style(text_color).into()];
 
                 if !is_self {
                     elements.insert(0, text(nickname).style(util::DARK_RED).into());