Skip to content

Commit

Permalink
update to latest nostrdb, adding tag support
Browse files Browse the repository at this point in the history
Signed-off-by: William Casarin <jb55@jb55.com>
  • Loading branch information
jb55 committed Apr 7, 2024
1 parent 6222a7d commit 4526434
Show file tree
Hide file tree
Showing 3 changed files with 42 additions and 41 deletions.
61 changes: 31 additions & 30 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 5 additions & 4 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@ crate-type = ["lib", "cdylib"]

[dependencies]
#egui-android = { git = "https://github.com/jb55/egui-android.git" }
egui = "0.27.1"
eframe = { version = "0.27.1", default-features = false, features = [ "glow", "wgpu", "android-native-activity" ] }
egui = "0.27.2"
eframe = { version = "0.27.2", default-features = false, features = [ "glow", "wgpu", "android-native-activity" ] }
#eframe = { version = "0.26.0", default-features = false, features = [ "glow", "android-native-activity" ] }
#eframe = "0.22.0"
egui_extras = { version = "0.27.1", features = ["all_loaders"] }
egui_extras = { version = "0.27.2", features = ["all_loaders"] }
ehttp = "0.2.0"
image = { version = "0.24", features = ["jpeg", "png", "webp"] }
log = "0.4.17"
Expand All @@ -31,7 +31,8 @@ serde_json = "1.0.89"
env_logger = "0.10.0"
puffin_egui = { version = "0.26.0", optional = true }
puffin = { version = "0.19.0", optional = true }
nostrdb = { git = "https://github.com/damus-io/nostrdb-rs", rev = "2675e7244554e40c9ee10d82b42bc647fef4c17d" }
#nostrdb = { git = "https://github.com/damus-io/nostrdb-rs", rev = "2675e7244554e40c9ee10d82b42bc647fef4c17d" }
nostrdb = "0.3.0"
hex = "0.4.3"
base32 = "0.4.0"
nostr-sdk = "0.29.0"
Expand Down
13 changes: 6 additions & 7 deletions src/app.rs
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,9 @@ fn relay_setup(pool: &mut RelayPool, ctx: &egui::Context) {
if let Err(e) = pool.add_url("wss://relay.damus.io".to_string(), wakeup.clone()) {
error!("{:?}", e)
}
if let Err(e) = pool.add_url("wss://pyramid.fiatjaf.com".to_string(), wakeup.clone()) {
error!("{:?}", e)
}
if let Err(e) = pool.add_url("wss://nos.lol".to_string(), wakeup.clone()) {
error!("{:?}", e)
}
Expand Down Expand Up @@ -253,16 +256,12 @@ fn poll_notes_for_timeline<'a>(
let new_refs = new_note_ids
.iter()
.map(|key| {
let note_key = NoteKey::new(*key);
let note = damus
.ndb
.get_note_by_key(&txn, note_key)
.expect("no note??");
let note = damus.ndb.get_note_by_key(&txn, *key).expect("no note??");

let _ = get_unknown_note_pubkeys(&damus.ndb, txn, &note, note_key, pubkeys);
let _ = get_unknown_note_pubkeys(&damus.ndb, txn, &note, *key, pubkeys);

NoteRef {
key: NoteKey::new(*key),
key: *key,
created_at: note.created_at(),
}
})
Expand Down

0 comments on commit 4526434

Please sign in to comment.