Merge pull request #1109 from MutinyWallet/tag-npub

Tag npub if no contact
MutinyWallet · Apr 4, 2024 · 27dca41 · 27dca41
2 parents add312c + b155810
commit 27dca41
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 9 deletions.
diff --git a/mutiny-core/src/hermes.rs b/mutiny-core/src/hermes.rs
@@ -16,7 +16,7 @@ use lightning::util::logger::Logger;
 use lightning::{log_error, log_info, log_warn};
 use lightning_invoice::Bolt11Invoice;
 use nostr::prelude::decrypt_received_private_zap_message;
-use nostr::{nips::nip04::decrypt, Event, JsonUtil, Keys, Tag};
+use nostr::{nips::nip04::decrypt, Event, JsonUtil, Keys, Tag, ToBech32};
 use nostr::{Filter, Kind, Timestamp};
 use nostr_sdk::{Client, RelayPoolNotification};
 use reqwest::Method;
@@ -505,13 +505,13 @@ async fn handle_ecash_notification<S: MutinyStorage>(
                 // tag the invoice if we can
                 let mut tags = Vec::with_capacity(2);
 
-                // try to tag by npub
-                if let Some((id, _)) = npub
-                    .map(|n| storage.get_contact_for_npub(n))
-                    .transpose()?
-                    .flatten()
-                {
-                    tags.push(id);
+                // try to tag by contact by npub, otherwise tag by pubkey
+                if let Some(npub) = npub {
+                    if let Some((id, _)) = storage.get_contact_for_npub(npub)? {
+                        tags.push(id);
+                    } else {
+                        tags.push(npub.to_bech32().expect("must be valid"));
+                    }
                 }
 
                 // add message tag if we have one

diff --git a/mutiny-core/src/lib.rs b/mutiny-core/src/lib.rs
@@ -2593,7 +2593,6 @@ impl<S: MutinyStorage> MutinyWallet<S> {
                                         // Create final zap event
                                         let mut tags: Vec<Tag> = data.into();
                                         tags.push(Tag::Anon { msg: Some(msg) });
-                                        let private_zap_keys: Keys = Keys::generate();
                                         EventBuilder::new(Kind::ZapRequest, "", tags)
                                             .custom_created_at(created_at)
                                             .to_event(&private_zap_keys)?