Kieran/snort
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug: unwrap function loses this context

Browse Source
This commit is contained in:
Kieran 2023-05-04 14:30:56 +01:00
parent e42325f3b5
commit 32bb686405
No known key found for this signature in database
GPG Key ID: DE71CEB3925BE941
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
packages/app/src/System/EventPublisher.ts
View File

@ -96,7 +96,7 @@ export class EventPublisher {
if (nip7PubKey !== this.#pubKey) { if (nip7PubKey !== this.#pubKey) {
throw new Error("Can't encrypt content, NIP-07 pubkey does not match"); throw new Error("Can't encrypt content, NIP-07 pubkey does not match");
} }
return await barrierNip07(() => unwrap(window.nostr?.nip04?.encrypt)(key, content)); return await barrierNip07(() => unwrap(window.nostr?.nip04?.encrypt).call(window.nostr?.nip04, key, content));
} else if (this.#privateKey) { } else if (this.#privateKey) {
return await EventExt.encryptData(content, key, this.#privateKey); return await EventExt.encryptData(content, key, this.#privateKey);
} else { } else {
@ -105,8 +105,10 @@ export class EventPublisher {
} }
async nip4Decrypt(content: string, otherKey: HexKey) { async nip4Decrypt(content: string, otherKey: HexKey) {
if (this.#hasNip07 && !this.#privateKey) { if (this.#hasNip07 && !this.#privateKey && window.nostr?.nip04?.decrypt) {
return await barrierNip07(() => unwrap(window.nostr?.nip04?.decrypt)(otherKey, content)); return await barrierNip07(() =>
unwrap(window.nostr?.nip04?.decrypt).call(window.nostr?.nip04, otherKey, content)
);
} else if (this.#privateKey) { } else if (this.#privateKey) {
return await EventExt.decryptDm(content, this.#privateKey, otherKey); return await EventExt.decryptDm(content, this.#privateKey, otherKey);
} else { } else {