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

Move common fields to NoteData::new() so they get used for constructing reposts

Browse Source
This commit is contained in:
Bu5hm4nn 2023-03-13 18:06:08 -06:00
parent 50f1034f5a
commit 90423d9a6a
2 changed files with 23 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/ui/feed/note/content.rs
View File

@ -10,11 +10,11 @@ pub(super) fn render_content(
app: &mut GossipUi,
ctx: &Context,
ui: &mut Ui,
tag_re: &regex::Regex,
event: &Event,
as_deleted: bool,
content: &str,
) {
let tag_re = app.tag_re.clone();
ui.style_mut().spacing.item_spacing.x = 0.0;
for span in LinkFinder::new().kinds(&[LinkKind::Url]).spans(content) {

36
src/ui/feed/note/mod.rs
View File

@ -12,7 +12,8 @@ use egui::{
Align, Context, Frame, Image, Label, Layout, RichText, Sense, Separator, Stroke, TextStyle, Ui,
Vec2,
};
use nostr_types::{Event, EventDelegation, EventKind, IdHex, PublicKeyHex};
use gossip_relay_picker::RelayUrl;
use nostr_types::{Event, EventDelegation, EventKind, IdHex, PublicKeyHex, Id};
mod content;
@ -20,6 +21,10 @@ pub(super) struct NoteData {
event: Event,
delegation: EventDelegation,
author: DbPerson,
deletion: Option<String>,
replies: Option<(Id, Option<RelayUrl>)>,
reactions: Vec<(char, usize)>,
self_already_reacted: bool,
}
impl NoteData {
@ -36,6 +41,12 @@ impl NoteData {
let delegation = event.delegation();
let deletion = Globals::get_deletion_sync(event.id);
let (reactions, self_already_reacted) = Globals::get_reactions_sync(event.id);
let replies = event.replies_to();
// If delegated, use the delegated person
let author_pubkey: PublicKeyHex = if let EventDelegation::DelegatedBy(pubkey) = delegation {
pubkey.into()
@ -52,6 +63,10 @@ impl NoteData {
event,
delegation,
author,
deletion,
replies,
reactions,
self_already_reacted,
})
}
}
@ -214,14 +229,12 @@ fn render_note_inner(
event,
delegation,
author,
deletion,
replies,
reactions,
self_already_reacted
} = note_data;
let deletion = Globals::get_deletion_sync(event.id);
let (reactions, self_already_reacted) = Globals::get_reactions_sync(event.id);
let tag_re = app.tag_re.clone();
let collapsed = app.collapsed.contains(&event.id);
// Avatar first
@ -243,8 +256,6 @@ fn render_note_inner(
app.set_page(Page::Person(author.pubkey.clone()));
};
let mut is_a_reply = false;
// Everything else next
ui.add_space(6.0);
ui.vertical(|ui| {
@ -252,8 +263,7 @@ fn render_note_inner(
ui.horizontal_wrapped(|ui| {
GossipUi::render_person_name_line(app, ui, &author);
if let Some((irt, _)) = event.replies_to() {
is_a_reply = true;
if let Some((irt, _)) = replies {
ui.add_space(8.0);
ui.style_mut().override_text_style = Some(TextStyle::Small);
@ -335,7 +345,7 @@ fn render_note_inner(
matches!(feed_kind, FeedKind::Thread { .. })
};
if is_thread_view && is_a_reply {
if is_thread_view && replies.is_some() {
if collapsed {
let color = app.settings.theme.warning_marker_text_color();
if ui
@ -437,7 +447,6 @@ fn render_note_inner(
app,
ctx,
ui,
&tag_re,
&event,
deletion.is_some(),
&content,
@ -448,7 +457,6 @@ fn render_note_inner(
app,
ctx,
ui,
&tag_re,
&event,
deletion.is_some(),
&content,