From dbca79c616ec2fec6bae94fb33587b84e1a66055 Mon Sep 17 00:00:00 2001
From: Adam Soltys <adam@coinos.io>
Date: Thu, 23 Jan 2025 20:39:51 -0800
Subject: fix nostr connect

---
 src/lib/nostr.ts | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

(limited to 'src/lib')

diff --git a/src/lib/nostr.ts b/src/lib/nostr.ts
index a5b2d990..bfaa14c1 100644
--- a/src/lib/nostr.ts
+++ b/src/lib/nostr.ts
@@ -17,6 +17,7 @@ import {
 	nip04,
 	nip19,
 } from "nostr-tools";
+import { decrypt as nip44decrypt, getConversationKey } from "nostr-tools/nip44";
 import { Relay } from "nostr-tools/relay";
 import { get } from "svelte/store";
 
@@ -168,9 +169,13 @@ const signingMethods = {
 				async onevent(event) {
 					pk = event.pubkey;
 					try {
-						const response = JSON.parse(
-							await nip04.decrypt(sk, pk, event.content),
-						);
+						let response;
+						try {
+							response = JSON.parse(await nip04.decrypt(sk, pk, event.content));
+						} catch (e) {
+							const ck = await getConversationKey(sk, pk);
+							response = JSON.parse(await nip44decrypt(event.content, ck));
+						}
 
 						if (response.id === id) resolve(JSON.parse(response.result));
 					} catch (e) {
-- 
cgit v1.2.3