nostr/gossip
1
0
Fork 0
mirror of https://github.com/mikedilger/gossip.git synced 2024-09-29 08:21:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make sure Person::best_name() is the only way of choosing the best name

Browse Source
This commit is contained in:
Bu5hm4nn 2024-03-26 14:52:51 -06:00
parent 45eb3648fe
commit f421a25304
2 changed files with 2 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
gossip-bin/src/ui/mod.rs
View File

@ -1493,20 +1493,6 @@ impl GossipUi {
ui.set_enabled(self.enable_ui());
}
pub fn person_name(person: &Person) -> String {
if let Some(petname) = &person.petname {
petname.clone()
} else if let Some(display_name) = person.display_name() {
display_name.to_string()
} else if let Some(name) = person.name() {
name.to_string()
} else if let Some(nip05) = person.nip05() {
nip05.to_string()
} else {
gossip_lib::names::pubkey_short(&person.pubkey)
}
}
pub fn richtext_from_person_nip05(person: &Person) -> RichText {
if let Some(mut nip05) = person.nip05().map(|s| s.to_owned()) {
if nip05.starts_with("_@") {
@ -1544,10 +1530,7 @@ impl GossipUi {
let tag_name_menu = {
let text = if !profile_page {
match &person.petname {
Some(pn) => pn.to_owned(),
None => person.best_name(),
}
person.best_name()
} else {
"ACTIONS".to_string()
};

3
gossip-bin/src/ui/people/person.rs
View File

@ -38,9 +38,8 @@ pub(super) fn update(app: &mut GossipUi, ctx: &Context, _frame: &mut eframe::Fra
ui.add_space(10.0);
ui.horizontal(|ui| {
ui.add_space(10.0);
let name = GossipUi::person_name(&person);
ui.label(
RichText::new(name)
RichText::new(person.best_name())
.size(22.0)
.color(app.theme.accent_color()),
);