on first sync get events since last check

MutinyWallet · Apr 23, 2024 · 7815ce0 · 7815ce0
1 parent 6a4a7ec
commit 7815ce0
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 11 deletions.
diff --git a/mutiny-core/src/nostr/mod.rs b/mutiny-core/src/nostr/mod.rs
@@ -292,8 +292,9 @@ impl<S: MutinyStorage, P: PrimalApi, C: NostrClient> NostrManager<S, P, C> {
         let time_stamp = match self.storage.get_nwc_sync_time()? {
             None => {
                 let now = Timestamp::now();
-                self.storage.set_nwc_sync_time(now.as_u64())?;
-                now
+                let since_last_check = Timestamp::from(now.as_u64() - 20);
+                self.storage.set_nwc_sync_time(since_last_check.as_u64())?;
+                since_last_check
             }
             Some(time) => Timestamp::from(time + 1), // add one so we get only new events
         };

diff --git a/mutiny-core/src/nostr/nwc.rs b/mutiny-core/src/nostr/nwc.rs
@@ -421,9 +421,7 @@ impl NostrWalletConnect {
         let mut needs_save = false;
         let mut needs_delete = false;
         let mut result = None;
-        if event.kind == Kind::WalletConnectRequest
-            && event.pubkey == client_pubkey
-        {
+        if event.kind == Kind::WalletConnectRequest && event.pubkey == client_pubkey {
             let server_key = self.server_key.secret_key()?;
 
             let decrypted = decrypt(server_key, &client_pubkey, &event.content)?;
@@ -447,12 +445,14 @@ impl NostrWalletConnect {
 
             // only respond to commands sent to active profiles
             if !self.profile.active() {
-                return self.get_skipped_error_event(
-                    &event,
-                    req.method,
-                    ErrorCode::Other,
-                    "Nostr profile inactive".to_string(),
-                ).map(Some);
+                return self
+                    .get_skipped_error_event(
+                        &event,
+                        req.method,
+                        ErrorCode::Other,
+                        "Nostr profile inactive".to_string(),
+                    )
+                    .map(Some);
             }
 
             // only respond to commands that are allowed by the profile