notedeck

commit 5bae19fe0096ba2b904dad37f6deb268ac338fdc
parent 10a2459da201eff8f8ca0040d630e181d3e3ea56
Author: William Casarin <jb55@jb55.com>
Date:   Thu,  1 May 2025 17:21:19 -0700

mention: show username instead of display_name

Fixes: #833
Signed-off-by: William Casarin <jb55@jb55.com>

Diffstat:
M
crates/notedeck/src/name.rs
 | 
10
++++++++++
M
crates/notedeck_ui/src/mention.rs
 | 
5
++++-

2 files changed, 14 insertions(+), 1 deletion(-)
diff --git a/crates/notedeck/src/name.rs b/crates/notedeck/src/name.rs
@@ -19,6 +19,16 @@ impl<'a> NostrName<'a> {
         }
     }
 
+    pub fn username_or_displayname(&self) -> &'a str {
+        if let Some(name) = self.username {
+            name
+        } else if let Some(name) = self.display_name {
+            name
+        } else {
+            self.nip05.unwrap_or("??")
+        }
+    }
+
     pub fn unknown() -> Self {
         Self {
             username: None,
diff --git a/crates/notedeck_ui/src/mention.rs b/crates/notedeck_ui/src/mention.rs
@@ -77,7 +77,10 @@ fn mention_ui(
     ui.horizontal(|ui| {
         let profile = ndb.get_profile_by_pubkey(txn, pk).ok();
 
-        let name: String = format!("@{}", get_display_name(profile.as_ref()).name());
+        let name: String = format!(
+            "@{}",
+            get_display_name(profile.as_ref()).username_or_displayname()
+        );
 
         let resp = ui.add(
             egui::Label::new(egui::RichText::new(name).color(link_color).size(size))