From 822f62301842c282e91c35372fd687dc2f02178a Mon Sep 17 00:00:00 2001 From: "P. Reis" Date: Fri, 28 Feb 2025 10:19:10 -0300 Subject: [PATCH] refactor: this.handleRevokeNip05 before relay.event --- packages/ditto/storages/DittoRelayStore.ts | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/packages/ditto/storages/DittoRelayStore.ts b/packages/ditto/storages/DittoRelayStore.ts index 173d8793..d0ea76ff 100644 --- a/packages/ditto/storages/DittoRelayStore.ts +++ b/packages/ditto/storages/DittoRelayStore.ts @@ -183,13 +183,13 @@ export class DittoRelayStore implements NRelay { } try { + await this.handleRevokeNip05(event, signal); await relay.event(purifyEvent(event), { signal }); } finally { // This needs to run in steps, and should not block the API from responding. Promise.allSettled([ this.handleZaps(event), this.updateAuthorData(event, signal), - this.handleRevokeNip05(event, signal), this.prewarmLinkPreview(event, signal), this.generateSetEvents(event), ]) @@ -250,14 +250,11 @@ export class DittoRelayStore implements NRelay { private async handleRevokeNip05(event: NostrEvent, signal?: AbortSignal) { const { conf, relay } = this.opts; - if (await conf.signer.getPublicKey() !== event.pubkey) { + if (event.kind !== 5 || await conf.signer.getPublicKey() !== event.pubkey) { return; } - if (event.kind !== 5) return; - - const kind = event.tags.find(([name, value]) => name === 'k' && value === '30360')?.[1]; - if (kind !== '30360') { + if (!event.tags.some(([name, value]) => name === 'k' && value === '30360')) { return; }