add Accounts to NoteContext

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

crates/notedeck_columns/src/ui/note/post.rs

@@ -12,7 +12,7 @@ use egui::{
     widgets::text_edit::TextEdit,
     Frame, Layout, Margin, Pos2, ScrollArea, Sense, TextBuffer,
 };
-use enostr::{FilledKeypair, FullKeypair, KeypairUnowned, NoteId, Pubkey, RelayPool};
+use enostr::{FilledKeypair, FullKeypair, NoteId, Pubkey, RelayPool};
 use nostrdb::{Ndb, Transaction};
 use notedeck_ui::{
     app_images,
@@ -352,15 +352,9 @@ impl<'a, 'd> PostView<'a, 'd> {
                             ui.vertical(|ui| {
                                 ui.set_max_width(avail_size.x * 0.8);
 
-                                let zapping_acc = self
-                                    .note_context
-                                    .current_account_has_wallet
-                                    .then(|| KeypairUnowned::from(&self.poster));
-
                                 render_note_preview(
                                     ui,
                                     self.note_context,
-                                    zapping_acc.as_ref(),
                                     txn,
                                     id.bytes(),
                                     nostrdb::NoteKey::new(0),
@@ -793,6 +787,7 @@ mod preview {
             let txn = Transaction::new(app.ndb).expect("txn");
             let mut note_context = NoteContext {
                 ndb: app.ndb,
+                accounts: app.accounts,
                 img_cache: app.img_cache,
                 note_cache: app.note_cache,
                 zaps: app.zaps,

crates/notedeck_columns/src/ui/note/reply.rs

@@ -4,7 +4,7 @@ use crate::ui::{
     note::{PostAction, PostResponse, PostType},
 };
 
-use enostr::{FilledKeypair, KeypairUnowned, NoteId};
+use enostr::{FilledKeypair, NoteId};
 use notedeck::NoteContext;
 use notedeck_ui::jobs::JobsCache;
 use notedeck_ui::{NoteOptions, NoteView, ProfilePic};
@@ -67,27 +67,16 @@ impl<'a, 'd> PostReplyView<'a, 'd> {
             let note_offset: i8 =
                 pfp_offset - ProfilePic::medium_size() / 2 - NoteView::expand_size() / 2;
 
-            let zapping_acc = self
-                .note_context
-                .current_account_has_wallet
-                .then(|| KeypairUnowned::from(&self.poster));
-
             let quoted_note = egui::Frame::NONE
                 .outer_margin(egui::Margin::same(note_offset))
                 .show(ui, |ui| {
-                    NoteView::new(
-                        self.note_context,
-                        zapping_acc.as_ref(),
-                        self.note,
-                        self.note_options,
-                        self.jobs,
-                    )
-                    .truncate(false)
-                    .selectable_text(true)
-                    .actionbar(false)
-                    .medium_pfp(true)
-                    .options_button(true)
-                    .show(ui)
+                    NoteView::new(self.note_context, self.note, self.note_options, self.jobs)
+                        .truncate(false)
+                        .selectable_text(true)
+                        .actionbar(false)
+                        .medium_pfp(true)
+                        .options_button(true)
+                        .show(ui)
                 })
                 .inner;
 

crates/notedeck_columns/src/ui/profile/mod.rs

@@ -12,7 +12,7 @@ use crate::{
     ui::timeline::{tabs_ui, TimelineTabView},
 };
 use notedeck::{
-    name::get_display_name, profile::get_profile_url, Accounts, IsFollowing, MuteFun, NoteAction,
+    name::get_display_name, profile::get_profile_url, IsFollowing, MuteFun, NoteAction,
     NoteContext, NotedeckTextStyle,
 };
 use notedeck_ui::{
@@ -24,7 +24,6 @@ use notedeck_ui::{
 
 pub struct ProfileView<'a, 'd> {
     pubkey: &'a Pubkey,
-    accounts: &'a Accounts,
     col_id: usize,
     timeline_cache: &'a mut TimelineCache,
     note_options: NoteOptions,
@@ -44,7 +43,6 @@ impl<'a, 'd> ProfileView<'a, 'd> {
     #[allow(clippy::too_many_arguments)]
     pub fn new(
         pubkey: &'a Pubkey,
-        accounts: &'a Accounts,
         col_id: usize,
         timeline_cache: &'a mut TimelineCache,
         note_options: NoteOptions,
@@ -54,7 +52,6 @@ impl<'a, 'd> ProfileView<'a, 'd> {
     ) -> Self {
         ProfileView {
             pubkey,
-            accounts,
             col_id,
             timeline_cache,
             note_options,
@@ -118,7 +115,6 @@ impl<'a, 'd> ProfileView<'a, 'd> {
                 &txn,
                 self.is_muted,
                 self.note_context,
-                &(&self.accounts.get_selected_account().key).into(),
                 self.jobs,
             )
             .show(ui)
@@ -179,7 +175,7 @@ impl<'a, 'd> ProfileView<'a, 'd> {
                         ui.add_space(24.0);
 
                         let target_key = self.pubkey;
-                        let selected = self.accounts.get_selected_account();
+                        let selected = self.note_context.accounts.get_selected_account();
 
                         let profile_type = if selected.key.secret_key.is_none() {
                             ProfileType::ReadOnly

crates/notedeck_columns/src/ui/search/mod.rs

@@ -1,5 +1,5 @@
 use egui::{vec2, Align, Color32, CornerRadius, RichText, Stroke, TextEdit};
-use enostr::{KeypairUnowned, NoteId, Pubkey};
+use enostr::{NoteId, Pubkey};
 use state::TypingType;
 
 use crate::{timeline::TimelineTab, ui::timeline::TimelineTabView};
@@ -27,7 +27,6 @@ pub struct SearchView<'a, 'd> {
     txn: &'a Transaction,
     is_muted: &'a MuteFun,
     note_context: &'a mut NoteContext<'d>,
-    cur_acc: &'a KeypairUnowned<'a>,
     jobs: &'a mut JobsCache,
 }
 
@@ -38,7 +37,6 @@ impl<'a, 'd> SearchView<'a, 'd> {
         note_options: NoteOptions,
         query: &'a mut SearchQueryState,
         note_context: &'a mut NoteContext<'d>,
-        cur_acc: &'a KeypairUnowned<'a>,
         jobs: &'a mut JobsCache,
     ) -> Self {
         Self {
@@ -47,7 +45,6 @@ impl<'a, 'd> SearchView<'a, 'd> {
             query,
             note_options,
             note_context,
-            cur_acc,
             jobs,
         }
     }
@@ -157,7 +154,6 @@ impl<'a, 'd> SearchView<'a, 'd> {
                     self.txn,
                     self.is_muted,
                     self.note_context,
-                    self.cur_acc,
                     self.jobs,
                 )
                 .show(ui)

crates/notedeck_columns/src/ui/thread.rs

@@ -1,6 +1,5 @@
 use egui::InnerResponse;
 use egui_virtual_list::VirtualList;
-use enostr::KeypairUnowned;
 use nostrdb::{Note, Transaction};
 use notedeck::note::root_note_id_from_selected_id;
 use notedeck::{MuteFun, NoteAction, NoteContext};
@@ -18,7 +17,6 @@ pub struct ThreadView<'a, 'd> {
     id_source: egui::Id,
     is_muted: &'a MuteFun,
     note_context: &'a mut NoteContext<'d>,
-    cur_acc: &'a KeypairUnowned<'a>,
     jobs: &'a mut JobsCache,
 }
 
@@ -30,7 +28,6 @@ impl<'a, 'd> ThreadView<'a, 'd> {
         note_options: NoteOptions,
         is_muted: &'a MuteFun,
         note_context: &'a mut NoteContext<'d>,
-        cur_acc: &'a KeypairUnowned<'a>,
         jobs: &'a mut JobsCache,
     ) -> Self {
         let id_source = egui::Id::new("threadscroll_threadview");
@@ -41,7 +38,6 @@ impl<'a, 'd> ThreadView<'a, 'd> {
             id_source,
             is_muted,
             note_context,
-            cur_acc,
             jobs,
             col: 0,
         }
@@ -134,17 +130,11 @@ impl<'a, 'd> ThreadView<'a, 'd> {
             ui.colored_label(ui.visuals().error_fg_color, "LOADING NOTES");
         }
 
-        let zapping_acc = self
-            .note_context
-            .current_account_has_wallet
-            .then_some(self.cur_acc);
-
         show_notes(
             ui,
             list,
             &notes,
             self.note_context,
-            zapping_acc,
             self.note_options,
             self.jobs,
             txn,
@@ -159,7 +149,6 @@ fn show_notes(
     list: &mut VirtualList,
     thread_notes: &ThreadNotes,
     note_context: &mut NoteContext<'_>,
-    zapping_acc: Option<&KeypairUnowned<'_>>,
     flags: NoteOptions,
     jobs: &mut JobsCache,
     txn: &Transaction,
@@ -190,7 +179,7 @@ fn show_notes(
             return 1;
         }
 
-        let resp = note.show(note_context, zapping_acc, flags, jobs, ui);
+        let resp = note.show(note_context, flags, jobs, ui);
 
         action = if cur_index == selected_note_index {
             resp.action.and_then(strip_note_action)
@@ -313,21 +302,14 @@ impl<'a> ThreadNote<'a> {
     fn show(
         &self,
         note_context: &'a mut NoteContext<'_>,
-        zapping_acc: Option<&'a KeypairUnowned<'a>>,
         flags: NoteOptions,
         jobs: &'a mut JobsCache,
         ui: &mut egui::Ui,
     ) -> NoteResponse {
         let inner = notedeck_ui::padding(8.0, ui, |ui| {
-            NoteView::new(
-                note_context,
-                zapping_acc,
-                &self.note,
-                self.options(flags),
-                jobs,
-            )
-            .unread_indicator(self.unread_and_have_replies)
-            .show(ui)
+            NoteView::new(note_context, &self.note, self.options(flags), jobs)
+                .unread_indicator(self.unread_and_have_replies)
+                .show(ui)
         });
 
         match self.note_type {

crates/notedeck_columns/src/ui/timeline.rs

@@ -1,7 +1,6 @@
 use egui::containers::scroll_area::ScrollBarVisibility;
 use egui::{vec2, Direction, Layout, Pos2, Stroke};
 use egui_tabs::TabColor;
-use enostr::KeypairUnowned;
 use nostrdb::Transaction;
 use notedeck::ui::is_narrow;
 use notedeck_ui::jobs::JobsCache;
@@ -22,7 +21,6 @@ pub struct TimelineView<'a, 'd> {
     reverse: bool,
     is_muted: &'a MuteFun,
     note_context: &'a mut NoteContext<'d>,
-    cur_acc: &'a KeypairUnowned<'a>,
     jobs: &'a mut JobsCache,
 }
 
@@ -34,7 +32,6 @@ impl<'a, 'd> TimelineView<'a, 'd> {
         is_muted: &'a MuteFun,
         note_context: &'a mut NoteContext<'d>,
         note_options: NoteOptions,
-        cur_acc: &'a KeypairUnowned<'a>,
         jobs: &'a mut JobsCache,
     ) -> Self {
         let reverse = false;
@@ -45,7 +42,6 @@ impl<'a, 'd> TimelineView<'a, 'd> {
             reverse,
             is_muted,
             note_context,
-            cur_acc,
             jobs,
         }
     }
@@ -59,7 +55,6 @@ impl<'a, 'd> TimelineView<'a, 'd> {
             self.note_options,
             self.is_muted,
             self.note_context,
-            self.cur_acc,
             self.jobs,
         )
     }
@@ -79,7 +74,6 @@ fn timeline_ui(
     note_options: NoteOptions,
     is_muted: &MuteFun,
     note_context: &mut NoteContext,
-    cur_acc: &KeypairUnowned,
     jobs: &mut JobsCache,
 ) -> Option<NoteAction> {
     //padding(4.0, ui, |ui| ui.heading("Notifications"));
@@ -169,7 +163,6 @@ fn timeline_ui(
             &txn,
             is_muted,
             note_context,
-            cur_acc,
             jobs,
         )
         .show(ui)
@@ -354,7 +347,6 @@ pub struct TimelineTabView<'a, 'd> {
     txn: &'a Transaction,
     is_muted: &'a MuteFun,
     note_context: &'a mut NoteContext<'d>,
-    cur_acc: &'a KeypairUnowned<'a>,
     jobs: &'a mut JobsCache,
 }
 
@@ -367,7 +359,6 @@ impl<'a, 'd> TimelineTabView<'a, 'd> {
         txn: &'a Transaction,
         is_muted: &'a MuteFun,
         note_context: &'a mut NoteContext<'d>,
-        cur_acc: &'a KeypairUnowned<'a>,
         jobs: &'a mut JobsCache,
     ) -> Self {
         Self {
@@ -377,7 +368,6 @@ impl<'a, 'd> TimelineTabView<'a, 'd> {
             txn,
             is_muted,
             note_context,
-            cur_acc,
             jobs,
         }
     }
@@ -424,21 +414,10 @@ impl<'a, 'd> TimelineTabView<'a, 'd> {
                 };
 
                 if !muted {
-                    let zapping_acc = if self.note_context.current_account_has_wallet {
-                        Some(self.cur_acc)
-                    } else {
-                        None
-                    };
-
                     notedeck_ui::padding(8.0, ui, |ui| {
-                        let resp = NoteView::new(
-                            self.note_context,
-                            zapping_acc,
-                            &note,
-                            self.note_options,
-                            self.jobs,
-                        )
-                        .show(ui);
+                        let resp =
+                            NoteView::new(self.note_context, &note, self.note_options, self.jobs)
+                                .show(ui);
 
                         if let Some(note_action) = resp.action {
                             action = Some(note_action)