tyiu/notedeck
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge unknown profile improvements by kernel #955

Browse Source 
kernelkind (1):
      allow body on unknown profile
This commit is contained in:
William Casarin
2025-07-14 14:07:17 -07:00
parent c402320ad3 8c71e154f4
commit e4ca67127e
3 changed files with 28 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
crates/notedeck_columns/src/ui/profile/mod.rs
View File

@@ -77,14 +77,14 @@ impl<'a, 'd> ProfileView<'a, 'd> {
let output = scroll_area.show(ui, |ui| {
let mut action = None;
let txn = Transaction::new(self.note_context.ndb).expect("txn");
if let Ok(profile) = self
let profile = self
.note_context
.ndb
.get_profile_by_pubkey(&txn, self.pubkey.bytes())
{
if let Some(profile_view_action) = self.profile_body(ui, profile) {
action = Some(profile_view_action);
}
.ok();
if let Some(profile_view_action) = self.profile_body(ui, profile.as_ref()) {
action = Some(profile_view_action);
}
let profile_timeline = self
.timeline_cache
@@ -137,13 +137,15 @@ impl<'a, 'd> ProfileView<'a, 'd> {
fn profile_body(
&mut self,
ui: &mut egui::Ui,
profile: ProfileRecord<'_>,
profile: Option<&ProfileRecord<'_>>,
) -> Option<ProfileViewAction> {
let mut action = None;
ui.vertical(|ui| {
banner(
ui,
profile.record().profile().and_then(|p| p.banner()),
profile
.map(|p| p.record().profile())
.and_then(|p| p.and_then(|p| p.banner())),
120.0,
);
@@ -158,12 +160,9 @@ impl<'a, 'd> ProfileView<'a, 'd> {
ui.horizontal(|ui| {
ui.put(
pfp_rect,
&mut ProfilePic::new(
self.note_context.img_cache,
get_profile_url(Some(&profile)),
)
.size(size)
.border(ProfilePic::border_stroke(ui)),
&mut ProfilePic::new(self.note_context.img_cache, get_profile_url(profile))
.size(size)
.border(ProfilePic::border_stroke(ui)),
);
if ui.add(copy_key_widget(&pfp_rect)).clicked() {
@@ -223,30 +222,25 @@ impl<'a, 'd> ProfileView<'a, 'd> {
ui.add_space(18.0);
ui.add(display_name_widget(
&get_display_name(Some(&profile)),
false,
));
ui.add(display_name_widget(&get_display_name(profile), false));
ui.add_space(8.0);
ui.add(about_section_widget(&profile));
ui.add(about_section_widget(profile));
ui.horizontal_wrapped(|ui| {
if let Some(website_url) = profile
.record()
.profile()
.and_then(|p| p.website())
.filter(|s| !s.is_empty())
.as_ref()
.map(|p| p.record().profile())
.and_then(|p| p.and_then(|p| p.website()).filter(|s| !s.is_empty()))
{
handle_link(ui, website_url);
}
if let Some(lud16) = profile
.record()
.profile()
.and_then(|p| p.lud16())
.filter(|s| !s.is_empty())
.as_ref()
.map(|p| p.record().profile())
.and_then(|p| p.and_then(|p| p.lud16()).filter(|s| !s.is_empty()))
{
handle_lud16(ui, lud16);
}

9
crates/notedeck_ui/src/profile/mod.rs
View File

@@ -68,12 +68,17 @@ pub fn display_name_widget<'a>(
}
}
pub fn about_section_widget<'a, 'b>(profile: &'b ProfileRecord<'a>) -> impl egui::Widget + 'b
pub fn about_section_widget<'a, 'b>(
profile: Option<&'b ProfileRecord<'a>>,
) -> impl egui::Widget + 'b
where
'b: 'a,
{
move |ui: &mut egui::Ui| {
if let Some(about) = profile.record().profile().and_then(|p| p.about()) {
if let Some(about) = profile
.map(|p| p.record().profile())
.and_then(|p| p.and_then(|p| p.about()))
{
let resp = ui.label(about);
ui.add_space(8.0);
resp

2
crates/notedeck_ui/src/profile/preview.rs
View File

@@ -46,7 +46,7 @@ impl<'a, 'cache> ProfilePreview<'a, 'cache> {
&get_display_name(Some(self.profile)),
false,
));
ui.add(about_section_widget(self.profile));
ui.add(about_section_widget(Some(self.profile)));
});
}
}