moon
/
ditto
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

queries: refactor getEvent, getAuthor

This commit is contained in:
Alex Gleason 2023-12-28 00:27:25 -06:00
parent 96e6bd18b4
commit c2b25bc798
No known key found for this signature in database
GPG Key ID: 7211D1F99744FBB7
1 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/queries.ts
View File

@ -22,23 +22,24 @@ const getEvent = async <K extends number = number>(
const { kind, relations, signal = AbortSignal.timeout(1000) } = opts; const { kind, relations, signal = AbortSignal.timeout(1000) } = opts;
const microfilter: IdMicrofilter = { ids: [id] }; const microfilter: IdMicrofilter = { ids: [id] };
let event: Event<K> | undefined; const [memoryEvent] = await memorelay.getFilters([microfilter], opts) as Event<K>[];
[event] = await memorelay.getFilters([microfilter], opts); if (memoryEvent && !relations) {
return memoryEvent;
if (event && !relations) return event; }
const filter: DittoFilter<K> = { ids: [id], relations, limit: 1 }; const filter: DittoFilter<K> = { ids: [id], relations, limit: 1 };
if (kind) { if (kind) {
filter.kinds = [kind]; filter.kinds = [kind];
} }
event = await mixer.getFilters([filter], { limit: 1, signal }) const dbEvent = await eventsDB.getFilters([filter], { limit: 1, signal })
.then((events) => events[0] || event); .then(([event]) => event);
if (event) return event; if (dbEvent) return dbEvent;
if (memoryEvent) return memoryEvent;
return await reqmeister.req(microfilter).catch(() => event) as Event<K> | undefined; return await reqmeister.req(microfilter).catch(() => undefined) as Event<K> | undefined;
}; };
/** Get a Nostr `set_medatadata` event for a user's pubkey. */ /** Get a Nostr `set_medatadata` event for a user's pubkey. */
@ -46,20 +47,21 @@ const getAuthor = async (pubkey: string, opts: GetEventOpts<0> = {}): Promise<Ev
const { relations, signal = AbortSignal.timeout(1000) } = opts; const { relations, signal = AbortSignal.timeout(1000) } = opts;
const microfilter: AuthorMicrofilter = { kinds: [0], authors: [pubkey] }; const microfilter: AuthorMicrofilter = { kinds: [0], authors: [pubkey] };
let event: Event<0> | undefined; const [memoryEvent] = await memorelay.getFilters([microfilter], opts);
[event] = await memorelay.getFilters([microfilter], opts); if (memoryEvent && !relations) {
return memoryEvent;
}
if (event && !relations) return event; const dbEvent = await eventsDB.getFilters(
event = await eventsDB.getFilters(
[{ authors: [pubkey], relations, kinds: [0], limit: 1 }], [{ authors: [pubkey], relations, kinds: [0], limit: 1 }],
{ limit: 1, signal }, { limit: 1, signal },
).then((events) => events[0] || event); ).then(([event]) => event);
if (event) return event; if (dbEvent) return dbEvent;
if (memoryEvent) return memoryEvent;
return reqmeister.req(microfilter).catch(() => event); return reqmeister.req(microfilter).catch(() => undefined);
}; };
/** Get users the given pubkey follows. */ /** Get users the given pubkey follows. */