From 0c29c89909c424d5c95ee30931d540a6f1e116d8 Mon Sep 17 00:00:00 2001 From: Ken Sedgwick Date: Mon, 16 Dec 2024 16:50:44 -0800 Subject: [PATCH] need mutable ndb reference to unsubscribe Closes: https://github.com/damus-io/notedeck/pull/584 --- crates/notedeck/src/context.rs | 2 +- crates/notedeck_chrome/src/app.rs | 2 +- crates/notedeck_columns/src/multi_subscriber.rs | 2 +- crates/notedeck_columns/src/nav.rs | 2 +- crates/notedeck_columns/src/notes_holder.rs | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/crates/notedeck/src/context.rs b/crates/notedeck/src/context.rs index 0280bf84..58632455 100644 --- a/crates/notedeck/src/context.rs +++ b/crates/notedeck/src/context.rs @@ -6,7 +6,7 @@ use nostrdb::Ndb; // TODO: make this interface more sandboxed pub struct AppContext<'a> { - pub ndb: &'a Ndb, + pub ndb: &'a mut Ndb, pub img_cache: &'a mut ImageCache, pub unknown_ids: &'a mut UnknownIds, pub pool: &'a mut RelayPool, diff --git a/crates/notedeck_chrome/src/app.rs b/crates/notedeck_chrome/src/app.rs index 35c09551..bb7f159f 100644 --- a/crates/notedeck_chrome/src/app.rs +++ b/crates/notedeck_chrome/src/app.rs @@ -162,7 +162,7 @@ impl Notedeck { pub fn app_context(&mut self) -> AppContext<'_> { AppContext { - ndb: &self.ndb, + ndb: &mut self.ndb, img_cache: &mut self.img_cache, unknown_ids: &mut self.unknown_ids, pool: &mut self.pool, diff --git a/crates/notedeck_columns/src/multi_subscriber.rs b/crates/notedeck_columns/src/multi_subscriber.rs index 27fb952e..c1eed126 100644 --- a/crates/notedeck_columns/src/multi_subscriber.rs +++ b/crates/notedeck_columns/src/multi_subscriber.rs @@ -37,7 +37,7 @@ impl MultiSubscriber { }) } - pub fn unsubscribe(&mut self, ndb: &Ndb, pool: &mut RelayPool) { + pub fn unsubscribe(&mut self, ndb: &mut Ndb, pool: &mut RelayPool) { if self.subscribers == 0 { error!("No subscribers to unsubscribe from"); return; diff --git a/crates/notedeck_columns/src/nav.rs b/crates/notedeck_columns/src/nav.rs index 127ef6f6..c6afc73c 100644 --- a/crates/notedeck_columns/src/nav.rs +++ b/crates/notedeck_columns/src/nav.rs @@ -407,7 +407,7 @@ pub fn render_nav( RenderNavResponse::new(col, nav_response) } -fn unsubscribe_timeline(ndb: &Ndb, timeline: &Timeline) { +fn unsubscribe_timeline(ndb: &mut Ndb, timeline: &Timeline) { if let Some(sub_id) = timeline.subscription { if let Err(e) = ndb.unsubscribe(sub_id) { error!("unsubscribe error: {}", e); diff --git a/crates/notedeck_columns/src/notes_holder.rs b/crates/notedeck_columns/src/notes_holder.rs index 7bd8ad1a..f5d45360 100644 --- a/crates/notedeck_columns/src/notes_holder.rs +++ b/crates/notedeck_columns/src/notes_holder.rs @@ -155,7 +155,7 @@ pub trait NotesHolder { /// Local NotesHolder unsubscribe fn unsubscribe_locally( txn: &Transaction, - ndb: &Ndb, + ndb: &mut Ndb, note_cache: &mut NoteCache, notes_holder_storage: &mut NotesHolderStorage, pool: &mut RelayPool,