Skip to content

Commit

Permalink
Merge remote-tracking branches 'github/pr/657' and 'github/pr/658'
Browse files Browse the repository at this point in the history
  • Loading branch information
jb55 committed Jan 23, 2025
3 parents 94a1d78 + 01066bf + 0249b5a commit 2cbae68
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 2 deletions.
3 changes: 3 additions & 0 deletions crates/notedeck/src/app.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 4 additions & 0 deletions crates/notedeck/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
2 changes: 0 additions & 2 deletions crates/notedeck_columns/src/app.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 2cbae68

Please sign in to comment.