aljaz/notedeck
1
0
Fork 0
mirror of https://github.com/aljazceru/notedeck.git synced 2026-01-16 06:44:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

profiles: introduce DisplayNames

Browse Source 
This is exactly the same as the DisplayName enum in Damus iOS. Due to
the various inconsistencies in `name` and `display_name` between
clients, we have to generalize DisplayName into two variants: one name
or two names.

If we have two names, we treat it in the standard way of display_name is
the real name, and `name` is the username.

If only one is set, then it is considered both the username and "real name".

Signed-off-by: William Casarin <jb55@jb55.com>
This commit is contained in:
William Casarin
2024-04-21 15:55:47 -07:00
parent 2edba9942c
commit 893fd582dc
4 changed files with 59 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/ui/note/contents.rs
View File

@@ -129,19 +129,17 @@ fn render_note_contents(
let name: String = if let Some(name) =
profile.as_ref().and_then(crate::profile::get_profile_name)
{
format!("@{}", name)
format!("@{}", name.username())
} else {
"@nostrich".to_string()
"??".to_string()
};
let resp = ui.colored_label(colors::PURPLE, &name);
if let Some(rec) = profile.as_ref() {
resp.on_hover_ui_at_pointer(|ui| {
egui::Frame::default().show(ui, |ui| {
ui.set_max_width(300.0);
ui.add(ui::ProfilePreview::new(rec));
});
ui.set_max_width(300.0);
ui.add(ui::ProfilePreview::new(rec));
});
}
});

22
src/ui/profile/preview.rs
View File

@@ -1,5 +1,6 @@
use crate::app_style::NotedeckTextStyle;
use crate::images;
use crate::DisplayName;
use egui::load::TexturePoll;
use egui::{RichText, Sense};
use egui_extras::Size;
@@ -58,14 +59,29 @@ impl<'a> ProfilePreview<'a> {
}
}
fn body(ui: &mut egui::Ui, profile: &ProfileRecord<'_>) -> egui::Response {
fn body(ui: &mut egui::Ui, profile: &ProfileRecord<'_>) {
let name = if let Some(name) = crate::profile::get_profile_name(profile) {
name
} else {
"nostrich"
DisplayName::One("??")
};
ui.label(RichText::new(name).text_style(NotedeckTextStyle::Heading3.text_style()))
match name {
DisplayName::One(n) => {
ui.label(RichText::new(n).text_style(NotedeckTextStyle::Heading3.text_style()));
}
DisplayName::Both {
display_name,
username,
} => {
ui.label(
RichText::new(display_name)
.text_style(NotedeckTextStyle::Heading3.text_style()),
);
ui.label(RichText::new(format!("@{}", username)));
}
}
}
}