From bfea056747ac1f06d25938e94973d37971e04542 Mon Sep 17 00:00:00 2001
From: Vlad Stan <stan.v.vlad@gmail.com>
Date: Wed, 8 Mar 2023 13:31:52 +0200
Subject: [PATCH] feat: base for getting out messages

---
 tasks.py                         | 33 ++++++++++++++++++++++++++++----
 templates/nostrmarket/index.html |  2 +-
 2 files changed, 30 insertions(+), 5 deletions(-)

diff --git a/tasks.py b/tasks.py
index 06e6a87..8123a8b 100644
--- a/tasks.py
+++ b/tasks.py
@@ -100,8 +100,11 @@ async def wait_for_nostr_events(recieve_event_queue: Queue, send_req_queue: Queu
     public_keys = await get_public_keys_for_merchants()
     for p in public_keys:
         await send_req_queue.put(
-            ["REQ", f"direct-messages:{p}", {"kind": 4, "#p": [p]}]
+            ["REQ", f"direct-messages-in:{p}", {"kind": 4, "#p": [p]}]
         )
+        # await send_req_queue.put(
+        #     ["REQ", f"direct-messages-out:{p}", {"kind": 4, "authors": [p]}]
+        # )
 
     while True:
         message = await recieve_event_queue.get()
@@ -111,21 +114,30 @@ async def wait_for_nostr_events(recieve_event_queue: Queue, send_req_queue: Queu
 async def handle_message(msg: str):
     try:
         type, subscription_id, event = json.loads(msg)
-        _, public_key = subscription_id.split(":")
+        subscription_name, public_key = subscription_id.split(":")
         if type.upper() == "EVENT":
             event = NostrEvent(**event)
             if event.kind == 4:
-                await handle_nip04_message(public_key, event)
+                await handle_nip04_message(subscription_name, public_key, event)
 
     except Exception as ex:
         logger.warning(ex)
 
 
-async def handle_nip04_message(public_key: str, event: NostrEvent):
+async def handle_nip04_message(
+    subscription_name: str, public_key: str, event: NostrEvent
+):
     merchant = await get_merchant_by_pubkey(public_key)
     assert merchant, f"Merchant not found for public key '{public_key}'"
 
     clear_text_msg = merchant.decrypt_message(event.content, event.pubkey)
+    if subscription_name == "direct-messages-in":
+        await handle_incoming_dms(event, merchant, clear_text_msg)
+    else:
+        await handle_outgoing_dms(event, merchant, clear_text_msg)
+
+
+async def handle_incoming_dms(event, merchant, clear_text_msg):
     dm_content = await handle_dirrect_message(
         merchant.id, event.pubkey, event.id, event.created_at, clear_text_msg
     )
@@ -134,6 +146,19 @@ async def handle_nip04_message(public_key: str, event: NostrEvent):
         await publish_nostr_event(dm_event)
 
 
+async def handle_outgoing_dms(event, merchant, clear_text_msg):
+    sent_to = event.tag_values("p")
+    if len(sent_to) != 0:
+        dm = PartialDirectMessage(
+            event_id=event.id,
+            event_created_at=event.created_at,
+            message=clear_text_msg,  # exclude if json
+            public_key=sent_to[0],
+            incoming=True,
+        )
+        await create_direct_message(merchant.id, dm)
+
+
 async def handle_dirrect_message(
     merchant_id: str, from_pubkey: str, event_id: str, event_created_at: int, msg: str
 ) -> Optional[str]:
diff --git a/templates/nostrmarket/index.html b/templates/nostrmarket/index.html
index fe7c6b0..89fc385 100644
--- a/templates/nostrmarket/index.html
+++ b/templates/nostrmarket/index.html
@@ -114,7 +114,7 @@
         </q-card-section>
       </q-card>
     </div>
-    <div  v-if="merchant && merchant.id" class="col-12">
+    <div v-if="merchant && merchant.id" class="col-12">
       <direct-messages
         :inkey="g.user.wallets[0].inkey"
         :adminkey="g.user.wallets[0].adminkey"