mirror/ditto
mirror/ditto
1
0
Fork 0
mirror of https://gitlab.com/soapbox-pub/ditto.git synced 2025-12-06 11:29:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

EventsDB: fix limit being passed to NDatabase

Browse source
This commit is contained in:
Alex Gleason 2024-07-01 08:53:03 +01:00
parent d062f6bbb6
commit c3ffe7c7f7
No known key found for this signature in database
GPG key ID: 7211D1F99744FBB7
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/storages/EventsDB.ts
View file

@ -51,7 +51,7 @@ class EventsDB implements NStore {
} }
/** Insert an event (and its tags) into the database. */ /** Insert an event (and its tags) into the database. */
async event(event: NostrEvent, opts?: { signal?: AbortSignal; timeout?: number }): Promise<void> { async event(event: NostrEvent, opts: { signal?: AbortSignal; timeout?: number } = {}): Promise<void> {
event = purifyEvent(event); event = purifyEvent(event);
this.console.debug('EVENT', JSON.stringify(event)); this.console.debug('EVENT', JSON.stringify(event));
dbEventCounter.inc({ kind: event.kind }); dbEventCounter.inc({ kind: event.kind });
@ -63,7 +63,7 @@ class EventsDB implements NStore {
await this.deleteEventsAdmin(event); await this.deleteEventsAdmin(event);
try { try {
await this.store.event(event, { timeout: opts?.timeout ?? 3000 }); await this.store.event(event, { ...opts, timeout: opts.timeout ?? 3000 });
} catch (e) { } catch (e) {
if (e.message === 'Cannot add a deleted event') { if (e.message === 'Cannot add a deleted event') {
throw new RelayError('blocked', 'event deleted by user'); throw new RelayError('blocked', 'event deleted by user');
@ -163,15 +163,15 @@ class EventsDB implements NStore {
this.console.debug('REQ', JSON.stringify(filters)); this.console.debug('REQ', JSON.stringify(filters));
return this.store.query(filters, { timeout: opts.timeout ?? 3000 }); return this.store.query(filters, { ...opts, timeout: opts.timeout ?? 3000 });
} }
/** Delete events based on filters from the database. */ /** Delete events based on filters from the database. */
async remove(filters: NostrFilter[], opts?: { signal?: AbortSignal; timeout?: number }): Promise<void> { async remove(filters: NostrFilter[], opts: { signal?: AbortSignal; timeout?: number } = {}): Promise<void> {
if (!filters.length) return Promise.resolve(); if (!filters.length) return Promise.resolve();
this.console.debug('DELETE', JSON.stringify(filters)); this.console.debug('DELETE', JSON.stringify(filters));
return this.store.remove(filters, opts); return this.store.remove(filters, { ...opts, timeout: opts.timeout ?? 5000 });
} }
/** Get number of events that would be returned by filters. */ /** Get number of events that would be returned by filters. */
@ -184,7 +184,7 @@ class EventsDB implements NStore {
this.console.debug('COUNT', JSON.stringify(filters)); this.console.debug('COUNT', JSON.stringify(filters));
return this.store.count(filters, { timeout: opts.timeout ?? 1000 }); return this.store.count(filters, { ...opts, timeout: opts.timeout ?? 1000 });
} }
/** Return only the tags that should be indexed. */ /** Return only the tags that should be indexed. */