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

Layout person page better and show all of their metadata

Browse Source
This commit is contained in:
Mike Dilger 2023-01-23 08:42:00 +13:00
parent 5a00d00400
commit 1182660489
5 changed files with 156 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/people.rs
View File

@ -26,6 +26,18 @@ pub struct DbPerson {
}
impl DbPerson {
pub fn new(pubkey: PublicKeyHex) -> DbPerson {
DbPerson {
pubkey,
metadata: None,
metadata_at: None,
nip05_valid: 0,
nip05_last_checked: None,
followed: 0,
followed_last_updated: 0,
}
}
pub fn name(&self) -> Option<&str> {
if let Some(md) = &self.metadata {
md.name.as_deref()

8
src/ui/feed.rs
View File

@ -2,6 +2,7 @@ use super::{GossipUi, Page};
use crate::comms::ToOverlordMessage;
use crate::feed::FeedKind;
use crate::globals::{Globals, GLOBALS};
use crate::people::DbPerson;
use crate::tags::{keys_from_text, textarea_highlighter};
use crate::ui::widgets::CopyButton;
use crate::AVATAR_SIZE_F32;
@ -349,7 +350,10 @@ fn render_post_actual(
return;
}
let maybe_person = GLOBALS.people.get(&event.pubkey.into());
let person = match GLOBALS.people.get(&event.pubkey.into()) {
Some(p) => p,
None => DbPerson::new(event.pubkey.into()),
};
let reactions = Globals::get_reactions_sync(event.id);
@ -450,7 +454,7 @@ fn render_post_actual(
ui.vertical(|ui| {
// First row
ui.horizontal_wrapped(|ui| {
GossipUi::render_person_name_line(ui, maybe_person.as_ref());
GossipUi::render_person_name_line(ui, &person);
if let Some((irt, _)) = event.replies_to() {
ui.add_space(8.0);

56
src/ui/mod.rs
View File

@ -378,39 +378,37 @@ impl GossipUi {
idhex.0[0..8].to_string()
}
pub fn render_person_name_line(ui: &mut Ui, maybe_person: Option<&DbPerson>) {
pub fn render_person_name_line(ui: &mut Ui, person: &DbPerson) {
ui.horizontal_wrapped(|ui| {
if let Some(person) = maybe_person {
if let Some(name) = person.name() {
ui.label(RichText::new(name).strong());
if let Some(name) = person.name() {
ui.label(RichText::new(name).strong());
} else {
ui.label(RichText::new(GossipUi::hex_pubkey_short(&person.pubkey)).weak());
}
if person.followed > 0 {
ui.label("🚶");
}
if let Some(mut nip05) = person.nip05().map(|s| s.to_owned()) {
if nip05.starts_with("_@") {
nip05 = nip05.get(2..).unwrap().to_string();
}
if person.nip05_valid > 0 {
ui.label(RichText::new(nip05).monospace().small());
} else {
ui.label(RichText::new(GossipUi::hex_pubkey_short(&person.pubkey)).weak());
ui.label(RichText::new(nip05).monospace().small().strikethrough());
}
}
if person.followed > 0 {
ui.label("🚶");
}
if let Some(mut nip05) = person.nip05().map(|s| s.to_owned()) {
if nip05.starts_with("_@") {
nip05 = nip05.get(2..).unwrap().to_string();
}
if person.nip05_valid > 0 {
ui.label(RichText::new(nip05).monospace().small());
} else {
ui.label(RichText::new(nip05).monospace().small().strikethrough());
}
}
ui.label(RichText::new("🔑").text_style(TextStyle::Small).weak());
if ui
.add(CopyButton {})
.on_hover_text("Copy Public Key")
.clicked()
{
ui.output().copied_text = person.pubkey.try_as_bech32_string().unwrap();
}
ui.label(RichText::new("🔑").text_style(TextStyle::Small).weak());
if ui
.add(CopyButton {})
.on_hover_text("Copy Public Key")
.clicked()
{
ui.output().copied_text = person.pubkey.try_as_bech32_string().unwrap();
}
});
}

2
src/ui/people/mod.rs
View File

@ -95,7 +95,7 @@ pub(super) fn update(app: &mut GossipUi, ctx: &Context, _frame: &mut eframe::Fra
ui.vertical(|ui| {
ui.label(RichText::new(GossipUi::hex_pubkey_short(&person.pubkey)).weak());
GossipUi::render_person_name_line(ui, Some(person));
GossipUi::render_person_name_line(ui, person);
});
});

147
src/ui/people/person.rs
View File

@ -3,15 +3,21 @@ use crate::comms::ToOverlordMessage;
use crate::feed::FeedKind;
use crate::globals::GLOBALS;
use crate::people::DbPerson;
use crate::ui::widgets::CopyButton;
use crate::AVATAR_SIZE_F32;
use eframe::egui;
use egui::{Context, RichText, Ui, Vec2};
use egui::{Context, Frame, RichText, ScrollArea, Ui, Vec2};
use nostr_types::PublicKeyHex;
use serde_json::Value;
pub(super) fn update(app: &mut GossipUi, ctx: &Context, _frame: &mut eframe::Frame, ui: &mut Ui) {
let (pubkeyhex, maybe_person) = match &app.page {
let (pubkeyhex, person) = match &app.page {
Page::Person(pubkeyhex) => {
let maybe_person = GLOBALS.people.get(pubkeyhex);
(pubkeyhex.to_owned(), maybe_person)
let person = match GLOBALS.people.get(pubkeyhex) {
Some(p) => p,
None => DbPerson::new(pubkeyhex.to_owned()),
};
(pubkeyhex.to_owned(), person)
}
_ => {
ui.label("ERROR");
@ -19,13 +25,21 @@ pub(super) fn update(app: &mut GossipUi, ctx: &Context, _frame: &mut eframe::Fra
}
};
ui.add_space(24.0);
ScrollArea::vertical()
.id_source("person page")
.show(ui, |ui| {
content(app, ctx, ui, pubkeyhex, person);
});
}
if let Some(person) = &maybe_person {
ui.heading(get_name(person));
} else {
ui.heading(&pubkeyhex.0);
}
fn content(
app: &mut GossipUi,
ctx: &Context,
ui: &mut Ui,
pubkeyhex: PublicKeyHex,
person: DbPerson,
) {
ui.add_space(24.0);
ui.horizontal(|ui| {
// Avatar first
@ -42,43 +56,102 @@ pub(super) fn update(app: &mut GossipUi, ctx: &Context, _frame: &mut eframe::Fra
},
);
ui.vertical(|ui| {
ui.heading(get_name(&person));
ui.label(RichText::new(GossipUi::hex_pubkey_short(&pubkeyhex)).weak());
GossipUi::render_person_name_line(ui, maybe_person.as_ref());
GossipUi::render_person_name_line(ui, &person);
#[allow(clippy::collapsible_else_if)]
if person.followed == 0 {
if ui.button("FOLLOW").clicked() {
GLOBALS.people.follow(&pubkeyhex, true);
}
} else {
if ui.button("UNFOLLOW").clicked() {
GLOBALS.people.follow(&pubkeyhex, false);
}
}
if ui.button("UPDATE METADATA").clicked() {
let _ = GLOBALS
.to_overlord
.send(ToOverlordMessage::UpdateMetadata(pubkeyhex.clone()));
}
if ui.button("VIEW THEIR FEED").clicked() {
app.set_page(Page::Feed(FeedKind::Person(pubkeyhex.clone())));
}
});
});
ui.add_space(12.0);
if let Some(person) = &maybe_person {
if let Some(about) = person.about() {
ui.label(about);
}
}
ui.add_space(12.0);
if let Some(person) = &maybe_person {
#[allow(clippy::collapsible_else_if)]
if maybe_person.is_none() || person.followed == 0 {
if ui.button("FOLLOW").clicked() {
GLOBALS.people.follow(&pubkeyhex, true);
if let Some(name) = person.name() {
ui.horizontal_wrapped(|ui| {
ui.label(RichText::new("Name: ").strong());
ui.label(name);
if ui.add(CopyButton {}).on_hover_text("Copy Name").clicked() {
ui.output().copied_text = name.to_owned();
}
} else {
if ui.button("UNFOLLOW").clicked() {
GLOBALS.people.follow(&pubkeyhex, false);
});
}
if let Some(about) = person.about() {
ui.label(RichText::new("About: ").strong());
Frame::group(ui.style()).show(ui, |ui| {
ui.horizontal_wrapped(|ui| {
ui.label(about);
if ui.add(CopyButton {}).on_hover_text("Copy About").clicked() {
ui.output().copied_text = about.to_owned();
}
});
});
}
if let Some(picture) = person.picture() {
ui.horizontal_wrapped(|ui| {
ui.label(RichText::new("Picture: ").strong());
ui.label(picture);
if ui
.add(CopyButton {})
.on_hover_text("Copy Picture")
.clicked()
{
ui.output().copied_text = picture.to_owned();
}
});
}
if let Some(nip05) = person.nip05() {
ui.horizontal_wrapped(|ui| {
ui.label(RichText::new("nip05: ").strong());
ui.label(nip05);
if ui.add(CopyButton {}).on_hover_text("Copy nip05").clicked() {
ui.output().copied_text = nip05.to_owned();
}
});
}
if let Some(md) = &person.metadata {
for (key, value) in &md.other {
let svalue = if let Value::String(s) = value {
s.to_owned()
} else {
serde_json::to_string(&value).unwrap()
};
ui.horizontal_wrapped(|ui| {
ui.label(RichText::new(format!("{}: ", key)).strong());
ui.label(&svalue);
if ui
.add(CopyButton {})
.on_hover_text(format!("Copy {}", key))
.clicked()
{
ui.output().copied_text = svalue;
}
});
}
}
if ui.button("UPDATE METADATA").clicked() {
let _ = GLOBALS
.to_overlord
.send(ToOverlordMessage::UpdateMetadata(pubkeyhex.clone()));
}
if ui.button("VIEW THEIR FEED").clicked() {
app.set_page(Page::Feed(FeedKind::Person(pubkeyhex.clone())));
}
}
fn get_name(person: &DbPerson) -> String {