From 0797cc695db1f225685d2a5dc4e5cf627acd3fdb Mon Sep 17 00:00:00 2001
From: Believethehype <1097224+believethehype@users.noreply.github.com>
Date: Mon, 7 Oct 2024 08:35:24 +0200
Subject: [PATCH] fixes for nip04 legacy messages on bot

---
 nostr_dvm/bot.py | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/nostr_dvm/bot.py b/nostr_dvm/bot.py
index 7c9a702..4433c35 100644
--- a/nostr_dvm/bot.py
+++ b/nostr_dvm/bot.py
@@ -251,7 +251,7 @@ class Bot:
                             else:
                                 #await self.client.send_direct_msg(PublicKey.parse(sender), message, None)
                                 #await self.client.send_private_msg(PublicKey.parse(sender), message, None)
-                                await send_nip04_dm(self.client, message, sender, self.dvm_config)
+                                await send_nip04_dm(self.client, message, PublicKey.parse(sender), self.dvm_config)
 
 
 
@@ -270,7 +270,7 @@ class Bot:
                             if giftwrap:
                                 await self.client.send_private_msg(PublicKey.parse(sender), message, None)
                             else:
-                                await send_nip04_dm(self.client, message, sender, self.dvm_config)
+                                await send_nip04_dm(self.client, message, PublicKey.parse(sender), self.dvm_config)
                                 #await self.client.send_direct_msg(PublicKey.parse(sender), message, None)
                                 #await self.client.send_private_msg(PublicKey.parse(sender), message, None)
                         elif decrypted_text.startswith("cashuA"):
@@ -289,19 +289,14 @@ class Bot:
                                 if giftwrap:
                                     await self.client.send_private_msg(PublicKey.parse(sender), message, None)
                                 else:
-                                   #await self.client.send_direct_msg(PublicKey.parse(sender), message, None)
-                                   #await self.client.send_private_msg(PublicKey.parse(sender), message, None)
-                                   #await send_nip04_dm(self.client, message, sender, self.keys)
-                                   await send_nip04_dm(self.client, message, sender, self.dvm_config)
+                                   await send_nip04_dm(self.client, message, PublicKey.parse(sender), self.dvm_config)
                         elif decrypted_text.lower().startswith("what's the second best"):
                             await asyncio.sleep(2.0)
                             message = "No, there is no second best.\n\nhttps://cdn.nostr.build/p/mYLv.mp4"
                             if giftwrap:
                                 await self.client.send_private_msg(PublicKey.parse(sender), message, None)
                             else:
-                                #await self.client.send_direct_msg(PublicKey.parse(sender), message,  nostr_event.id())
-                                #await self.client.send_private_msg(PublicKey.parse(sender), message, None)
-                                await send_nip04_dm(self.client, message, sender, self.dvm_config)
+                                await send_nip04_dm(self.client, message, PublicKey.parse(sender), self.dvm_config)
                         else:
 
                             # Build an overview of known DVMs and send it to the user
@@ -565,7 +560,7 @@ class Bot:
                             invoice_amount) + " Sats from " + str(
                             user.name))
                         await update_user_balance(self.dvm_config.DB, sender, invoice_amount, client=self.client,
-                                                  config=self.dvm_config)
+                                                  config=self.dvm_config, giftwrap=True)
 
                         # a regular note
                 elif not anon: