From a2d64cbb4c2aa5c39967997e066527c17f0fb767 Mon Sep 17 00:00:00 2001 From: link2xt Date: Tue, 9 Feb 2021 05:26:05 +0300 Subject: [PATCH] Show sender name override in chatlist summary --- src/message.rs | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/src/message.rs b/src/message.rs index 708ec783a..b750b52b6 100644 --- a/src/message.rs +++ b/src/message.rs @@ -1078,17 +1078,9 @@ impl Lot { self.text1 = None; self.text1_meaning = Meaning::None; } else { - if chat.id.is_deaddrop() { - if let Some(contact) = contact { - self.text1 = Some(msg.get_sender_name(contact)); - } else { - self.text1 = None; - } - } else if let Some(contact) = contact { - self.text1 = Some(msg.get_sender_name(contact)); - } else { - self.text1 = None; - } + self.text1 = msg + .get_override_sender_name() + .or_else(|| contact.map(|contact| msg.get_sender_name(contact))); self.text1_meaning = Meaning::Text1Username; } }