commit 2cbae68a7f1425997f66d5ac0662f5cfde172f4f
parent 94a1d78114dee0ee81fb7ff2e728c7b8d322a3a6
Author: William Casarin <jb55@jb55.com>
Date: Wed, 22 Jan 2025 16:04:45 -0800
Merge remote-tracking branches 'github/pr/657' and 'github/pr/658'
Diffstat:
3 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/crates/notedeck/src/app.rs b/crates/notedeck/src/app.rs
@@ -68,6 +68,9 @@ impl eframe::App for Notedeck {
#[cfg(feature = "profiling")]
puffin::GlobalProfiler::lock().new_frame();
+ // handle account updates
+ self.accounts.update(&self.ndb, &mut self.pool, ctx);
+
main_panel(&ctx.style(), crate::ui::is_narrow(ctx)).show(ctx, |ui| {
// render app
if let Some(app) = &self.app {
diff --git a/crates/notedeck/src/lib.rs b/crates/notedeck/src/lib.rs
@@ -45,3 +45,7 @@ pub use time::time_ago_since;
pub use timecache::TimeCached;
pub use unknowns::{get_unknown_note_ids, NoteRefsUnkIdAction, SingleUnkIdAction, UnknownIds};
pub use user_account::UserAccount;
+
+// export libs
+pub use enostr;
+pub use nostrdb;
diff --git a/crates/notedeck_columns/src/app.rs b/crates/notedeck_columns/src/app.rs
@@ -183,8 +183,6 @@ fn unknown_id_send(unknown_ids: &mut UnknownIds, pool: &mut RelayPool) {
}
fn update_damus(damus: &mut Damus, app_ctx: &mut AppContext<'_>, ctx: &egui::Context) {
- app_ctx.accounts.update(app_ctx.ndb, app_ctx.pool, ctx); // update user relay and mute lists
-
match damus.state {
DamusState::Initializing => {
damus.state = DamusState::Initialized;