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

Remove overlap setting and other dead code

Browse Source
This commit is contained in:
Mike Dilger 2024-06-10 09:47:14 +12:00
parent 39235ae0c5
commit 6f560c413f
5 changed files with 1 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
gossip-bin/src/ui/settings/content.rs
View File

@ -16,12 +16,6 @@ pub(super) fn update(app: &mut GossipUi, _ctx: &Context, _frame: &mut eframe::Fr
ui.add(Slider::new(&mut app.unsaved_settings.load_more_count, 10..=100).text("events"));
});
ui.horizontal(|ui| {
ui.label("Overlap: ").on_hover_text("If we recently loaded events up to time T, but restarted, we will now load events starting from time T minus overlap. Takes effect on restart. I recommend 300 (5 minutes).");
ui.add(Slider::new(&mut app.unsaved_settings.overlap, 0..=3600).text("seconds, "));
ui.label(secs_to_string(app.unsaved_settings.overlap));
});
ui.checkbox(
&mut app.unsaved_settings.recompute_feed_periodically,
"Recompute feed periodically. If this is off, you will get a refresh button",
@ -107,24 +101,3 @@ pub(super) fn update(app: &mut GossipUi, _ctx: &Context, _frame: &mut eframe::Fr
ui.add_space(20.0);
}
fn secs_to_string(secs: u64) -> String {
let days = secs / 86400;
let remainder = secs % 86400;
let hours = remainder / 3600;
let remainder = remainder % 3600;
let minutes = remainder / 60;
let seconds = remainder % 60;
let mut output: String = String::new();
if days > 0 {
output.push_str(&format!(" {} days", days));
}
if hours > 0 {
output.push_str(&format!(" {} hours", hours));
}
if minutes > 0 {
output.push_str(&format!(" {} minutes", minutes));
}
output.push_str(&format!(" {} seconds", seconds));
output
}

4
gossip-bin/src/unsaved_settings.rs
View File

@ -53,7 +53,6 @@ pub struct UnsavedSettings {
// Feed Settings
pub load_more_count: u64,
pub overlap: u64,
// Event Selection
pub reposts: bool,
@ -144,7 +143,6 @@ impl Default for UnsavedSettings {
num_relays_per_person: default_setting!(num_relays_per_person),
max_relays: default_setting!(max_relays),
load_more_count: default_setting!(load_more_count),
overlap: default_setting!(overlap),
reposts: default_setting!(reposts),
show_long_form: default_setting!(show_long_form),
show_mentions: default_setting!(show_mentions),
@ -229,7 +227,6 @@ impl UnsavedSettings {
num_relays_per_person: load_setting!(num_relays_per_person),
max_relays: load_setting!(max_relays),
load_more_count: load_setting!(load_more_count),
overlap: load_setting!(overlap),
reposts: load_setting!(reposts),
show_long_form: load_setting!(show_long_form),
show_mentions: load_setting!(show_mentions),
@ -310,7 +307,6 @@ impl UnsavedSettings {
save_setting!(num_relays_per_person, self, txn);
save_setting!(max_relays, self, txn);
save_setting!(load_more_count, self, txn);
save_setting!(overlap, self, txn);
save_setting!(reposts, self, txn);
save_setting!(show_long_form, self, txn);
save_setting!(show_mentions, self, txn);

29
gossip-lib/src/overlord/minion/mod.rs
View File

@ -789,7 +789,7 @@ impl Minion {
// Subscribe to the user's config (config, DMs, etc) which is on their own write relays
async fn subscribe_config(&mut self, job_id: u64) -> Result<(), Error> {
let since = self.compute_since(60 * 60 * 24 * 15);
let since = Unixtime::now().unwrap() - Duration::from_secs(60 * 60 * 24 * 15);
let filters = filter_fns::config(since);
@ -1354,31 +1354,4 @@ impl Minion {
tracing::error!("{}: ERROR bumping relay success count: {}", &self.url, e);
}
}
fn compute_since(&self, chunk_seconds: u64) -> Unixtime {
let now = Unixtime::now().unwrap();
let overlap = Duration::from_secs(GLOBALS.storage.read_setting_overlap());
let chunk = Duration::from_secs(chunk_seconds);
// FIXME - general subscription EOSE is not necessarily applicable to
// other subscriptions. BUt we don't record when we got an EOSE
// on other subscriptions.
let eose: Unixtime = match self.dbrelay.last_general_eose_at {
Some(u) => Unixtime(u as i64),
None => Unixtime(0),
};
let mut since = eose;
since = since - overlap;
// No dates before 2020:
if since.0 < 1577836800 {
since.0 = 1577836800;
}
// Do not go back by more than one chunk
let one_chunk_ago = now - chunk;
since.max(one_chunk_ago)
}
}

1
gossip-lib/src/storage/migrations/m4.rs
View File

@ -49,7 +49,6 @@ impl Storage {
)?;
self.write_setting_num_relays_per_person(&settings.num_relays_per_person, Some(rw_txn))?;
self.write_setting_max_relays(&settings.max_relays, Some(rw_txn))?;
self.write_setting_overlap(&settings.overlap, Some(rw_txn))?;
self.write_setting_reposts(&settings.reposts, Some(rw_txn))?;
self.write_setting_show_long_form(&settings.show_long_form, Some(rw_txn))?;
self.write_setting_show_mentions(&settings.show_mentions, Some(rw_txn))?;

1
gossip-lib/src/storage/mod.rs
View File

@ -585,7 +585,6 @@ impl Storage {
def_setting!(num_relays_per_person, b"num_relays_per_person", u8, 2);
def_setting!(max_relays, b"max_relays", u8, 50);
def_setting!(load_more_count, b"load_more_count", u64, 35);
def_setting!(overlap, b"overlap", u64, 300);
def_setting!(reposts, b"reposts", bool, true);
def_setting!(show_long_form, b"show_long_form", bool, false);
def_setting!(show_mentions, b"show_mentions", bool, true);