commit 81ef677bf225a3d48d84db0f88e67f2d7a8297d8
parent 8472a9b64347fa25a5ad718222008a036dc8b18a
Author: William Casarin <jb55@jb55.com>
Date: Thu, 17 Apr 2025 08:36:22 -0700
refactor: nevernest get_display_name
Signed-off-by: William Casarin <jb55@jb55.com>
Diffstat:
1 file changed, 24 insertions(+), 23 deletions(-)
diff --git a/crates/notedeck_columns/src/profile.rs b/crates/notedeck_columns/src/profile.rs
@@ -41,34 +41,35 @@ fn is_empty(s: &str) -> bool {
}
pub fn get_display_name<'a>(record: Option<&ProfileRecord<'a>>) -> NostrName<'a> {
- if let Some(record) = record {
- if let Some(profile) = record.record().profile() {
- let display_name = profile.display_name().filter(|n| !is_empty(n));
- let username = profile.name().filter(|n| !is_empty(n));
- let nip05 = if let Some(raw_nip05) = profile.nip05() {
- if let Some(at_pos) = raw_nip05.find('@') {
- if raw_nip05.starts_with('_') {
- raw_nip05.get(at_pos + 1..)
- } else {
- Some(raw_nip05)
- }
- } else {
- None
- }
- } else {
- None
- };
+ let Some(record) = record else {
+ return NostrName::unknown();
+ };
+
+ let Some(profile) = record.record().profile() else {
+ return NostrName::unknown();
+ };
+
+ let display_name = profile.display_name().filter(|n| !is_empty(n));
+ let username = profile.name().filter(|n| !is_empty(n));
- NostrName {
- username,
- display_name,
- nip05,
+ let nip05 = if let Some(raw_nip05) = profile.nip05() {
+ if let Some(at_pos) = raw_nip05.find('@') {
+ if raw_nip05.starts_with('_') {
+ raw_nip05.get(at_pos + 1..)
+ } else {
+ Some(raw_nip05)
}
} else {
- NostrName::unknown()
+ None
}
} else {
- NostrName::unknown()
+ None
+ };
+
+ NostrName {
+ username,
+ display_name,
+ nip05,
}
}