Seal with NIP-07 if available

This makes the system work with any nostr extensions you might be using.

2 files changed, 26 insertions, 5 deletions

diff --git a/src/lib/nip17.ts b/src/lib/nip17.ts
index 66f49639..e0046d47 100644
--- a/src/lib/nip17.ts
+++ b/src/lib/nip17.ts
@@ -6,9 +6,14 @@ const TWO_DAYS = 2 * 24 * 60 * 60;
 const randomTimestamp = () => Math.floor(
     Date.now() / 1000 - Math.random() * TWO_DAYS);
 
-export const createNIP17Message = (text: string, senderSK: Uint8Array, receiverPK: string) => {
+export const createNIP17Message = async (text: string, senderSK: Uint8Array, receiverPK: string) => {
     const rumour = createRumour(text, senderSK, receiverPK);
-    const sealed = sealRumour(rumour, senderSK, receiverPK);
+    let sealed;
+    if (window.nostr) {
+        sealed = await sealRumourNip07(rumour, receiverPK);
+    } else {
+        sealed = sealRumour(rumour, senderSK, receiverPK);
+    }
     const wrapped = giftWrap(sealed, receiverPK);
     return wrapped;
 }
@@ -41,6 +46,20 @@ const sealRumour = (rumour: object, senderSK: Uint8Array, receiverPK: string) =>
     return finalizeEvent(sealEvent, senderSK);
 }
 
+const sealRumourNip07 = async (rumour: object, receiverPK: string) => {
+    const encryptedRumour = await window.nostr.nip44.encrypt(
+        receiverPK, JSON.stringify(rumour));
+
+    const sealEvent = {
+        kind: 13, // seal
+        created_at: randomTimestamp(),
+        tags: [],
+        content: encryptedRumour
+    }
+
+    return window.nostr.signEvent(sealEvent);
+}
+
 const giftWrap = (event: object, receiverPK: string) => {
     const secretKey = generateSecretKey();
     const SKString = bytesToHex(secretKey);
diff --git a/src/routes/(app)/dm/[recipient]/+page.svelte b/src/routes/(app)/dm/[recipient]/+page.svelte
index 9e13ab19..33edfcc6 100644
--- a/src/routes/(app)/dm/[recipient]/+page.svelte
+++ b/src/routes/(app)/dm/[recipient]/+page.svelte
@@ -8,8 +8,6 @@
  let { data } = $props();
  const { user, recipient } = data;
 
- // console.log(sign({kind: 13, created_at: 0, tags: [], pubkey: recipient.pubkey, content: "Test"}, recipient));
-
  let senderSK = $state("");
  let overridePK = $state("");
  let text = $state("");
@@ -23,11 +21,15 @@
      const recipientPK = overridePK || recipient.pubkey;
      const skBytes = hexToBytes(senderSK);
      const event = createNIP17Message(text, skBytes, recipientPK);
-     console.log(JSON.stringify(event));
+     event.then(displayEvent);
    } catch (error) {
      console.log(error);
    }
  }
+
+ const displayEvent = (event: object) => {
+   console.log(JSON.stringify(event));
+ }
 </script>
 
 <div class="container">