tyiu/notedeck
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

filter: unify nostrdb and remote limits

Browse Source 
Before we were setting filter limits in two different places. Let's
unify them so we don't have to sources of truth for filter limits.
This commit is contained in:
William Casarin
2024-03-13 13:24:06 +00:00
parent 50aa21b2f0
commit 247feb9e26
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/app.rs
View File

@@ -127,8 +127,8 @@ fn relay_setup(pool: &mut RelayPool, ctx: &egui::Context) {
} }
} }
fn get_home_filter() -> Filter { fn get_home_filter(limit: u16) -> Filter {
Filter::new().limit(100).kinds(vec![1, 42]).pubkeys( Filter::new().limit(limit).kinds(vec![1, 42]).pubkeys(
[ [
Pubkey::from_hex("32e1827635450ebb3c5a7d12c1f8e7b2b514439ac10a67eef3d9fd9c5c68e245") Pubkey::from_hex("32e1827635450ebb3c5a7d12c1f8e7b2b514439ac10a67eef3d9fd9c5c68e245")
.unwrap(), .unwrap(),
@@ -300,7 +300,11 @@ fn setup_initial_nostrdb_subs(damus: &mut Damus) -> Result<()> {
.collect(); .collect();
damus.timelines[0].subscription = Some(damus.ndb.subscribe(filters.clone())?); damus.timelines[0].subscription = Some(damus.ndb.subscribe(filters.clone())?);
let txn = Transaction::new(&damus.ndb)?; let txn = Transaction::new(&damus.ndb)?;
let res = damus.ndb.query(&txn, filters, 100)?; let res = damus.ndb.query(
&txn,
filters,
damus.initial_filter[0].limit.unwrap_or(1000) as i32,
)?;
damus.timelines[0].notes = res damus.timelines[0].notes = res
.iter() .iter()
.map(|qr| NoteRef { .map(|qr| NoteRef {
@@ -434,10 +438,11 @@ impl Damus {
egui_extras::install_image_loaders(&cc.egui_ctx); egui_extras::install_image_loaders(&cc.egui_ctx);
let initial_limit = 100;
let initial_filter = if args.len() > 1 { let initial_filter = if args.len() > 1 {
serde_json::from_str(&args[1]).unwrap() serde_json::from_str(&args[1]).unwrap()
} else { } else {
vec![get_home_filter()] vec![get_home_filter(initial_limit)]
}; };
let imgcache_dir = data_path.as_ref().join("cache/img"); let imgcache_dir = data_path.as_ref().join("cache/img");