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

Merge pull request #3 from mikedilger/nip09_delete_event_setting

Browse Source 
PR fixes
This commit is contained in:
nico.benaz 2023-08-26 03:12:50 +02:00 committed by GitHub
commit 19b864e978
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 117 additions and 123 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/settings.rs
View File

@ -141,8 +141,8 @@ impl Default for Settings {
reactions: default_setting!(reactions),
enable_zap_receipts: default_setting!(enable_zap_receipts),
show_media: default_setting!(show_media),
show_deleted_events: default_setting!(show_deleted_events),
approve_content_warning: default_setting!(approve_content_warning),
show_deleted_events: default_setting!(show_deleted_events),
pow: default_setting!(pow),
set_client_tag: default_setting!(set_client_tag),
set_user_agent: default_setting!(set_user_agent),
@ -215,8 +215,8 @@ impl Settings {
reactions: load_setting!(reactions),
enable_zap_receipts: load_setting!(enable_zap_receipts),
show_media: load_setting!(show_media),
show_deleted_events: load_setting!(show_deleted_events),
approve_content_warning: load_setting!(approve_content_warning),
show_deleted_events: load_setting!(show_deleted_events),
pow: load_setting!(pow),
set_client_tag: load_setting!(set_client_tag),
set_user_agent: load_setting!(set_user_agent),
@ -285,8 +285,8 @@ impl Settings {
save_setting!(reactions, self, txn);
save_setting!(enable_zap_receipts, self, txn);
save_setting!(show_media, self, txn);
save_setting!(show_deleted_events, self, txn);
save_setting!(approve_content_warning, self, txn);
save_setting!(show_deleted_events, self, txn);
save_setting!(pow, self, txn);
save_setting!(set_client_tag, self, txn);
save_setting!(set_user_agent, self, txn);

1
src/storage/import/mod.rs
View File

@ -215,7 +215,6 @@ where
"show_long_form" => settings.show_long_form = numstr_to_bool(value),
"show_mentions" => settings.show_mentions = numstr_to_bool(value),
"show_media" => settings.show_media = numstr_to_bool(value),
"show_deleted_events" => settings.show_deleted_events = numstr_to_bool(value),
"approve_content_warning" => settings.approve_content_warning = numstr_to_bool(value),
"load_avatars" => settings.load_avatars = numstr_to_bool(value),
"load_media" => settings.load_media = numstr_to_bool(value),

2
src/storage/types/settings1.rs
View File

@ -29,7 +29,6 @@ pub struct Settings1 {
pub show_mentions: bool,
pub show_media: bool,
pub approve_content_warning: bool,
pub show_deleted_events: bool,
pub load_avatars: bool,
pub load_media: bool,
pub check_nip05: bool,
@ -69,7 +68,6 @@ impl Default for Settings1 {
show_mentions: true,
show_media: true,
approve_content_warning: false,
show_deleted_events: false,
load_avatars: true,
load_media: true,
check_nip05: true,

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

@ -65,8 +65,12 @@ pub(super) fn render_note(
// FIXME drop the cached notes on recompute
if let Ok(note_data) = note_ref.try_borrow() {
// Render if not muted
if !note_data.author.muted {
let skip = note_data.author.muted
|| (note_data.deletion.is_some() && !app.settings.show_deleted_events);
if skip {
return;
}
let viewed = match GLOBALS.storage.is_event_viewed(note_data.event.id) {
Ok(answer) => answer,
_ => false,
@ -116,10 +120,6 @@ pub(super) fn render_note(
.stroke(app.settings.theme.feed_frame_stroke(&render_data))
.show(ui, |ui| {
ui.horizontal_wrapped(|ui| {
// Deleted events are not shown if user did not set show_deleted_events from settings
if !(note_data.deletion.is_some()
&& !app.settings.show_deleted_events)
{
// Inner indents first
app.settings.theme.feed_post_inner_indent(ui, &render_data);
@ -132,7 +132,6 @@ pub(super) fn render_note(
as_reply_to,
&None,
);
}
});
})
});
@ -142,8 +141,7 @@ pub(super) fn render_note(
app.height.insert(id, bottom.y - top.y);
// Mark post as viewed if hovered AND we are not scrolling
if !viewed && inner_response.response.hovered() && app.current_scroll_offset == 0.0
{
if !viewed && inner_response.response.hovered() && app.current_scroll_offset == 0.0 {
let _ = GLOBALS.storage.mark_event_viewed(id, None);
}
@ -188,7 +186,6 @@ pub(super) fn render_note(
}
}
}
}
// FIXME, create some way to limit the arguments here.
fn render_note_inner(