mirror of
https://github.com/mikedilger/gossip.git
synced 2024-09-29 08:21:47 +00:00
Merge pull request #3 from mikedilger/nip09_delete_event_setting
PR fixes
This commit is contained in:
commit
19b864e978
@ -141,8 +141,8 @@ impl Default for Settings {
|
|||||||
reactions: default_setting!(reactions),
|
reactions: default_setting!(reactions),
|
||||||
enable_zap_receipts: default_setting!(enable_zap_receipts),
|
enable_zap_receipts: default_setting!(enable_zap_receipts),
|
||||||
show_media: default_setting!(show_media),
|
show_media: default_setting!(show_media),
|
||||||
show_deleted_events: default_setting!(show_deleted_events),
|
|
||||||
approve_content_warning: default_setting!(approve_content_warning),
|
approve_content_warning: default_setting!(approve_content_warning),
|
||||||
|
show_deleted_events: default_setting!(show_deleted_events),
|
||||||
pow: default_setting!(pow),
|
pow: default_setting!(pow),
|
||||||
set_client_tag: default_setting!(set_client_tag),
|
set_client_tag: default_setting!(set_client_tag),
|
||||||
set_user_agent: default_setting!(set_user_agent),
|
set_user_agent: default_setting!(set_user_agent),
|
||||||
@ -215,8 +215,8 @@ impl Settings {
|
|||||||
reactions: load_setting!(reactions),
|
reactions: load_setting!(reactions),
|
||||||
enable_zap_receipts: load_setting!(enable_zap_receipts),
|
enable_zap_receipts: load_setting!(enable_zap_receipts),
|
||||||
show_media: load_setting!(show_media),
|
show_media: load_setting!(show_media),
|
||||||
show_deleted_events: load_setting!(show_deleted_events),
|
|
||||||
approve_content_warning: load_setting!(approve_content_warning),
|
approve_content_warning: load_setting!(approve_content_warning),
|
||||||
|
show_deleted_events: load_setting!(show_deleted_events),
|
||||||
pow: load_setting!(pow),
|
pow: load_setting!(pow),
|
||||||
set_client_tag: load_setting!(set_client_tag),
|
set_client_tag: load_setting!(set_client_tag),
|
||||||
set_user_agent: load_setting!(set_user_agent),
|
set_user_agent: load_setting!(set_user_agent),
|
||||||
@ -285,8 +285,8 @@ impl Settings {
|
|||||||
save_setting!(reactions, self, txn);
|
save_setting!(reactions, self, txn);
|
||||||
save_setting!(enable_zap_receipts, self, txn);
|
save_setting!(enable_zap_receipts, self, txn);
|
||||||
save_setting!(show_media, self, txn);
|
save_setting!(show_media, self, txn);
|
||||||
save_setting!(show_deleted_events, self, txn);
|
|
||||||
save_setting!(approve_content_warning, self, txn);
|
save_setting!(approve_content_warning, self, txn);
|
||||||
|
save_setting!(show_deleted_events, self, txn);
|
||||||
save_setting!(pow, self, txn);
|
save_setting!(pow, self, txn);
|
||||||
save_setting!(set_client_tag, self, txn);
|
save_setting!(set_client_tag, self, txn);
|
||||||
save_setting!(set_user_agent, self, txn);
|
save_setting!(set_user_agent, self, txn);
|
||||||
|
@ -215,7 +215,6 @@ where
|
|||||||
"show_long_form" => settings.show_long_form = numstr_to_bool(value),
|
"show_long_form" => settings.show_long_form = numstr_to_bool(value),
|
||||||
"show_mentions" => settings.show_mentions = numstr_to_bool(value),
|
"show_mentions" => settings.show_mentions = numstr_to_bool(value),
|
||||||
"show_media" => settings.show_media = 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),
|
"approve_content_warning" => settings.approve_content_warning = numstr_to_bool(value),
|
||||||
"load_avatars" => settings.load_avatars = numstr_to_bool(value),
|
"load_avatars" => settings.load_avatars = numstr_to_bool(value),
|
||||||
"load_media" => settings.load_media = numstr_to_bool(value),
|
"load_media" => settings.load_media = numstr_to_bool(value),
|
||||||
|
@ -29,7 +29,6 @@ pub struct Settings1 {
|
|||||||
pub show_mentions: bool,
|
pub show_mentions: bool,
|
||||||
pub show_media: bool,
|
pub show_media: bool,
|
||||||
pub approve_content_warning: bool,
|
pub approve_content_warning: bool,
|
||||||
pub show_deleted_events: bool,
|
|
||||||
pub load_avatars: bool,
|
pub load_avatars: bool,
|
||||||
pub load_media: bool,
|
pub load_media: bool,
|
||||||
pub check_nip05: bool,
|
pub check_nip05: bool,
|
||||||
@ -69,7 +68,6 @@ impl Default for Settings1 {
|
|||||||
show_mentions: true,
|
show_mentions: true,
|
||||||
show_media: true,
|
show_media: true,
|
||||||
approve_content_warning: false,
|
approve_content_warning: false,
|
||||||
show_deleted_events: false,
|
|
||||||
load_avatars: true,
|
load_avatars: true,
|
||||||
load_media: true,
|
load_media: true,
|
||||||
check_nip05: true,
|
check_nip05: true,
|
||||||
|
@ -65,8 +65,12 @@ pub(super) fn render_note(
|
|||||||
// FIXME drop the cached notes on recompute
|
// FIXME drop the cached notes on recompute
|
||||||
|
|
||||||
if let Ok(note_data) = note_ref.try_borrow() {
|
if let Ok(note_data) = note_ref.try_borrow() {
|
||||||
// Render if not muted
|
let skip = note_data.author.muted
|
||||||
if !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) {
|
let viewed = match GLOBALS.storage.is_event_viewed(note_data.event.id) {
|
||||||
Ok(answer) => answer,
|
Ok(answer) => answer,
|
||||||
_ => false,
|
_ => false,
|
||||||
@ -116,10 +120,6 @@ pub(super) fn render_note(
|
|||||||
.stroke(app.settings.theme.feed_frame_stroke(&render_data))
|
.stroke(app.settings.theme.feed_frame_stroke(&render_data))
|
||||||
.show(ui, |ui| {
|
.show(ui, |ui| {
|
||||||
ui.horizontal_wrapped(|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
|
// Inner indents first
|
||||||
app.settings.theme.feed_post_inner_indent(ui, &render_data);
|
app.settings.theme.feed_post_inner_indent(ui, &render_data);
|
||||||
|
|
||||||
@ -132,7 +132,6 @@ pub(super) fn render_note(
|
|||||||
as_reply_to,
|
as_reply_to,
|
||||||
&None,
|
&None,
|
||||||
);
|
);
|
||||||
}
|
|
||||||
});
|
});
|
||||||
})
|
})
|
||||||
});
|
});
|
||||||
@ -142,8 +141,7 @@ pub(super) fn render_note(
|
|||||||
app.height.insert(id, bottom.y - top.y);
|
app.height.insert(id, bottom.y - top.y);
|
||||||
|
|
||||||
// Mark post as viewed if hovered AND we are not scrolling
|
// 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);
|
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.
|
// FIXME, create some way to limit the arguments here.
|
||||||
fn render_note_inner(
|
fn render_note_inner(
|
||||||
|
Loading…
Reference in New Issue
Block a user