Merge zap-notifications

Author: jb55

Cargo.lock

@@ -4,7 +4,7 @@ use crate::nip05::Nip05Cache;
 use crate::persist::{AppSizeHandler, SettingsHandler};
 use crate::remote_data::RemoteState;
 use crate::wallet::GlobalWallet;
-use crate::zaps::Zaps;
+use crate::zaps::{ZapVerifier, Zaps};
 use crate::NotedeckOptions;
 use crate::{
     frame_history::FrameHistory, AccountStorage, Accounts, AppContext, Args, DataPath,
@@ -108,6 +108,7 @@ pub struct Notedeck {
     unrecognized_args: BTreeSet<String>,
     clipboard: Clipboard,
     zaps: Zaps,
+    zap_verifier: ZapVerifier,
     frame_history: FrameHistory,
     job_pool: JobPool,
     media_jobs: MediaJobs,
@@ -186,6 +187,7 @@ impl Notedeck {
             self.remote.process_events(ctx, &self.ndb);
         }
         self.nip05_cache.poll();
+        self.zap_verifier.poll(&self.ndb, self.zaps.pay_cache());
         let Some(app) = &self.app else {
             self.remote
                 .request_repaint_for_next_full_history_deadline(ctx);
@@ -388,6 +390,7 @@ impl Notedeck {
             frame_history: FrameHistory::default(),
             clipboard: Clipboard::new(None),
             zaps,
+            zap_verifier: ZapVerifier::new(),
             job_pool,
             media_jobs: media_job_cache,
             nip05_cache: Nip05Cache::new(),
@@ -439,6 +442,7 @@ impl Notedeck {
                 settings: &mut self.settings,
                 clipboard: &mut self.clipboard,
                 zaps: &mut self.zaps,
+                zap_verifier: &mut self.zap_verifier,
                 frame_history: &mut self.frame_history,
                 job_pool: &mut self.job_pool,
                 media_jobs: &mut self.media_jobs,

crates/notedeck/src/app.rs

@@ -139,6 +139,8 @@ impl Args {
                 res.relays.push(relay.clone());
             } else if arg == "--no-keystore" {
                 res.options.set(NotedeckOptions::UseKeystore, false);
+            } else if arg == "--all-apps-active" {
+                res.options.set(NotedeckOptions::AllAppsActive, true);
             } else if arg == "--title" {
                 i += 1;
                 let title = if let Some(next_arg) = args.get(i) {

crates/notedeck/src/args.rs

@@ -1,7 +1,7 @@
 use crate::{
     account::accounts::Accounts, frame_history::FrameHistory, i18n::Localization,
-    nip05::Nip05Cache, sound::SoundManager, wallet::GlobalWallet, zaps::Zaps, Args, DataPath,
-    Images, JobPool, MediaJobs, NoteCache, RemoteApi, SettingsHandler, UnknownIds,
+    nip05::Nip05Cache, sound::SoundManager, wallet::GlobalWallet, zaps::ZapVerifier, zaps::Zaps,
+    Args, DataPath, Images, JobPool, MediaJobs, NoteCache, RemoteApi, SettingsHandler, UnknownIds,
 };
 use egui_winit::clipboard::Clipboard;
 use enostr::Pubkey;
@@ -27,6 +27,7 @@ pub struct AppContext<'a> {
     pub settings: &'a mut SettingsHandler,
     pub clipboard: &'a mut Clipboard,
     pub zaps: &'a mut Zaps,
+    pub zap_verifier: &'a mut ZapVerifier,
     pub frame_history: &'a mut FrameHistory,
     pub job_pool: &'a mut JobPool,
     pub media_jobs: &'a mut MediaJobs,

crates/notedeck/src/context.rs

@@ -22,6 +22,9 @@ bitflags! {
 
         /// Show the native window titlebar?
         const ShowTitle = 1 << 7;
+
+        /// Update all apps every frame, even if they haven't been opened yet
+        const AllAppsActive = 1 << 8;
     }
 }
 

crates/notedeck/src/options.rs

@@ -229,6 +229,10 @@ impl Zaps {
         });
     }
 
+    pub fn pay_cache(&mut self) -> &mut PayCache {
+        &mut self.pay_cache
+    }
+
     pub fn send_error(&mut self, sender_pubkey: &[u8; 32], target: ZapTarget, error: ZappingError) {
         let id = self.get_next_id();
         let key = ZapKey {

crates/notedeck/src/zaps/cache.rs

@@ -1,12 +1,15 @@
 mod cache;
 mod default_zap;
 mod networking;
+mod verify;
 mod zap;
 
 pub use cache::{
     AnyZapState, NoteZapTarget, NoteZapTargetOwned, ZapTarget, ZapTargetOwned, ZappingError, Zaps,
 };
 
+pub use verify::ZapVerifier;
+
 pub use default_zap::{
     get_current_default_msats, DefaultZapError, DefaultZapMsats, PendingDefaultZapState,
     UserZapMsats,

crates/notedeck/src/zaps/mod.rs

@@ -22,7 +22,7 @@ pub struct FetchedInvoiceResponse {
 
 pub type FetchingInvoice = Promise<Result<FetchedInvoiceResponse, JoinError>>;
 
-async fn fetch_pay_req_async(url: &Url) -> Result<LNUrlPayResponseRaw, ZapError> {
+pub(crate) async fn fetch_pay_req_async(url: &Url) -> Result<LNUrlPayResponseRaw, ZapError> {
     let (sender, promise) = Promise::new();
 
     let on_done = move |response: Result<ehttp::Response, String>| {
@@ -232,7 +232,7 @@ pub fn fetch_invoice_promise(
     }
 }
 
-fn convert_lnurl_to_endpoint_url(lnurl: &str) -> Result<Url, ZapError> {
+pub(crate) fn convert_lnurl_to_endpoint_url(lnurl: &str) -> Result<Url, ZapError> {
     let (_, data) = bech32::decode(lnurl).map_err(|e| ZapError::Bech(e.to_string()))?;
 
     let url_str =
@@ -345,7 +345,7 @@ async fn fetch_ln_invoice(req: &Url) -> Result<LNInvoice, ZapError> {
     tokio::task::block_in_place(|| promise.block_and_take())
 }
 
-fn generate_endpoint_url(lud16: &str) -> Result<Url, ZapError> {
+pub(crate) fn generate_endpoint_url(lud16: &str) -> Result<Url, ZapError> {
     let (user, domain, use_http) = {
         let mut split = lud16.split('@');
         let user = split