From 6265e478865a5eaaaf3c26903e3513034164ea9c Mon Sep 17 00:00:00 2001 From: Mike Dilger Date: Fri, 10 Feb 2023 03:06:20 +1300 Subject: [PATCH] Render display_name instead of name (if set in metadata) --- src/people.rs | 15 +++++++++++++++ src/ui/mod.rs | 2 +- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/src/people.rs b/src/people.rs index b4eb205e..0769410f 100644 --- a/src/people.rs +++ b/src/people.rs @@ -46,6 +46,21 @@ impl DbPerson { } } + pub fn display_name(&self) -> Option<&str> { + if let Some(md) = &self.metadata { + if md.other.contains_key("display_name") { + if let Some(serde_json::Value::String(s)) = md.other.get("display_name") { + if !s.is_empty() { + return Some(s); + } + } + } + md.name.as_deref() + } else { + None + } + } + pub fn name(&self) -> Option<&str> { if let Some(md) = &self.metadata { md.name.as_deref() diff --git a/src/ui/mod.rs b/src/ui/mod.rs index 67016c1c..f4561eda 100644 --- a/src/ui/mod.rs +++ b/src/ui/mod.rs @@ -461,7 +461,7 @@ impl GossipUi { pub fn render_person_name_line(app: &mut GossipUi, ui: &mut Ui, person: &DbPerson) { ui.horizontal_wrapped(|ui| { - let name = if let Some(name) = person.name() { + let name = if let Some(name) = person.display_name() { name.to_owned() } else { GossipUi::pubkey_short(&person.pubkey)