notedeck

commit 91c9cfc34f858b097b52f80c5e94cd716399c2f8
parent 0a675dfff00ec3414d0a1fcd13336bb7a7f9183f
Author: kernelkind <kernelkind@gmail.com>
Date:   Sun,  1 Jun 2025 17:46:35 -0400

bugfix: txn failed

`ERROR notedeck_columns::timeline: setup_new_timeline:
database error: Transaction failed`

Reproduce by creating column, deleting it, then trying to create
it again. Before this fix, it was blank. Now it displays correctly

Signed-off-by: kernelkind <kernelkind@gmail.com>

Diffstat:
M
crates/notedeck_columns/src/timeline/mod.rs
 | 
18
+++++++++++-------
M
crates/notedeck_columns/src/ui/add_column.rs
 | 
9
+++++----

2 files changed, 16 insertions(+), 11 deletions(-)
diff --git a/crates/notedeck_columns/src/timeline/mod.rs b/crates/notedeck_columns/src/timeline/mod.rs
@@ -482,6 +482,7 @@ pub fn merge_sorted_vecs<T: Ord + Copy>(vec1: &[T], vec2: &[T]) -> (Vec<T>, Merg
 pub fn setup_new_timeline(
     timeline: &mut Timeline,
     ndb: &Ndb,
+    txn: &Transaction,
     subs: &mut Subscriptions,
     pool: &mut RelayPool,
     note_cache: &mut NoteCache,
@@ -489,7 +490,7 @@ pub fn setup_new_timeline(
 ) {
     // if we're ready, setup local subs
     if is_timeline_ready(ndb, pool, note_cache, timeline) {
-        if let Err(err) = setup_timeline_nostrdb_sub(ndb, note_cache, timeline) {
+        if let Err(err) = setup_timeline_nostrdb_sub(ndb, txn, note_cache, timeline) {
             error!("setup_new_timeline: {err}");
         }
     }
@@ -616,6 +617,7 @@ fn fetch_contact_list(
 
 fn setup_initial_timeline(
     ndb: &Ndb,
+    txn: &Transaction,
     timeline: &mut Timeline,
     note_cache: &mut NoteCache,
     filters: &[Filter],
@@ -647,14 +649,13 @@ fn setup_initial_timeline(
         lim += filter.limit().unwrap_or(1) as i32;
     }
 
-    let txn = Transaction::new(ndb)?;
     let notes: Vec<NoteRef> = ndb
-        .query(&txn, filters, lim)?
+        .query(txn, filters, lim)?
         .into_iter()
         .map(NoteRef::from_query_result)
         .collect();
 
-    timeline.insert_new(&txn, ndb, note_cache, &notes);
+    timeline.insert_new(txn, ndb, note_cache, &notes);
 
     Ok(())
 }
@@ -665,7 +666,8 @@ pub fn setup_initial_nostrdb_subs(
     timeline_cache: &mut TimelineCache,
 ) -> Result<()> {
     for (_kind, timeline) in timeline_cache.timelines.iter_mut() {
-        if let Err(err) = setup_timeline_nostrdb_sub(ndb, note_cache, timeline) {
+        let txn = Transaction::new(ndb).expect("txn");
+        if let Err(err) = setup_timeline_nostrdb_sub(ndb, &txn, note_cache, timeline) {
             error!("setup_initial_nostrdb_subs: {err}");
         }
     }
@@ -675,6 +677,7 @@ pub fn setup_initial_nostrdb_subs(
 
 fn setup_timeline_nostrdb_sub(
     ndb: &Ndb,
+    txn: &Transaction,
     note_cache: &mut NoteCache,
     timeline: &mut Timeline,
 ) -> Result<()> {
@@ -684,7 +687,7 @@ fn setup_timeline_nostrdb_sub(
         .ok_or(Error::App(notedeck::Error::empty_contact_list()))?
         .to_owned();
 
-    setup_initial_timeline(ndb, timeline, note_cache, &filter_state)?;
+    setup_initial_timeline(ndb, txn, timeline, note_cache, &filter_state)?;
 
     Ok(())
 }
@@ -754,7 +757,8 @@ pub fn is_timeline_ready(
             // we just switched to the ready state, we should send initial
             // queries and setup the local subscription
             info!("Found contact list! Setting up local and remote contact list query");
-            setup_initial_timeline(ndb, timeline, note_cache, &filter).expect("setup init");
+            let txn = Transaction::new(ndb).expect("txn");
+            setup_initial_timeline(ndb, &txn, timeline, note_cache, &filter).expect("setup init");
             timeline
                 .filter
                 .set_relay_state(relay_id, FilterState::ready(filter.clone()));
diff --git a/crates/notedeck_columns/src/ui/add_column.rs b/crates/notedeck_columns/src/ui/add_column.rs
@@ -637,6 +637,7 @@ pub fn render_add_column_routes(
                 crate::timeline::setup_new_timeline(
                     &mut timeline,
                     ctx.ndb,
+                    &txn,
                     &mut app.subscriptions,
                     ctx.pool,
                     ctx.note_cache,
@@ -669,15 +670,15 @@ pub fn render_add_column_routes(
                 // source to be, so let;s create a timeline from that and
                 // add it to our list of timelines
                 AlgoOption::LastPerPubkey(Decision::Decided(list_kind)) => {
-                    let maybe_timeline = {
-                        let txn = Transaction::new(ctx.ndb).unwrap();
-                        TimelineKind::last_per_pubkey(list_kind).into_timeline(&txn, ctx.ndb)
-                    };
+                    let txn = Transaction::new(ctx.ndb).unwrap();
+                    let maybe_timeline =
+                        TimelineKind::last_per_pubkey(list_kind).into_timeline(&txn, ctx.ndb);
 
                     if let Some(mut timeline) = maybe_timeline {
                         crate::timeline::setup_new_timeline(
                             &mut timeline,
                             ctx.ndb,
+                            &txn,
                             &mut app.subscriptions,
                             ctx.pool,
                             ctx.note_cache,