diff --git a/packages/ditto/storages/DittoAPIStore.test.ts b/packages/ditto/storages/DittoAPIStore.test.ts index 1d51061f..5fbe5435 100644 --- a/packages/ditto/storages/DittoAPIStore.test.ts +++ b/packages/ditto/storages/DittoAPIStore.test.ts @@ -29,13 +29,13 @@ Deno.test('updateAuthorData sets nip05', async () => { const row = await db.kysely .selectFrom('author_stats') - .select(['nip05', 'nip05_domain', 'nip05_hostname']) + .selectAll() .where('pubkey', '=', getPublicKey(alex)) - .executeTakeFirstOrThrow(); + .executeTakeFirst(); - assertEquals(row.nip05, 'alex@gleasonator.dev'); - assertEquals(row.nip05_domain, 'gleasonator.dev'); - assertEquals(row.nip05_hostname, 'gleasonator.dev'); + assertEquals(row?.nip05, 'alex@gleasonator.dev'); + assertEquals(row?.nip05_domain, 'gleasonator.dev'); + assertEquals(row?.nip05_hostname, 'gleasonator.dev'); }); function setupTest(cb: (req: Request) => Response | Promise) { diff --git a/packages/ditto/storages/DittoAPIStore.ts b/packages/ditto/storages/DittoAPIStore.ts index f423eae4..b356001d 100644 --- a/packages/ditto/storages/DittoAPIStore.ts +++ b/packages/ditto/storages/DittoAPIStore.ts @@ -104,10 +104,10 @@ export class DittoAPIStore implements NRelay { } async event(event: NostrEvent, opts?: { signal?: AbortSignal }): Promise { - const { relay, pool } = this.opts; + const { pool } = this.opts; const { id, kind } = event; - await relay.event(event, opts); + await this.handleEvent(event, opts); (async () => { try { @@ -368,7 +368,7 @@ export class DittoAPIStore implements NRelay { created_at: Math.floor(Date.now() / 1000), }); - await this.handleEvent(rel, { signal: AbortSignal.timeout(1000) }); + await this.event(rel, { signal: AbortSignal.timeout(1000) }); } if (event.kind === 3036 && tagsAdmin) { @@ -384,7 +384,7 @@ export class DittoAPIStore implements NRelay { created_at: Math.floor(Date.now() / 1000), }); - await this.handleEvent(rel, { signal: AbortSignal.timeout(1000) }); + await this.event(rel, { signal: AbortSignal.timeout(1000) }); } }