Add an EventStore interface, refactor eventsDB

fixtures/events/55920b75.json

@@ -1,15 +0,0 @@
-{
-  "kind": 1,
-  "content": "I'm vegan btw",
-  "tags": [
-    [
-      "proxy",
-      "https://gleasonator.com/objects/8f6fac53-4f66-4c6e-ac7d-92e5e78c3e79",
-      "activitypub"
-    ]
-  ],
-  "pubkey": "79c2cae114ea28a981e7559b4fe7854a473521a8d22a66bbab9fa248eb820ff6",
-  "created_at": 1691091365,
-  "id": "55920b758b9c7b17854b6e3d44e6a02a83d1cb49e1227e75a30426dea94d4cb2",
-  "sig": "a72f12c08f18e85d98fb92ae89e2fe63e48b8864c5e10fbdd5335f3c9f936397a6b0a7350efe251f8168b1601d7012d4a6d0ee6eec958067cf22a14f5a5ea579"
-}

src/controllers/api/accounts.ts

@@ -1,6 +1,6 @@
 import { type AppController } from '@/app.ts';
 import { Conf } from '@/config.ts';
-import * as eventsDB from '@/db/events.ts';
+import { eventsDB } from '@/db/events.ts';
 import { insertUser } from '@/db/users.ts';
 import { findReplyTag, nip19, z } from '@/deps.ts';
 import { type DittoFilter } from '@/filter.ts';
@@ -151,7 +151,7 @@ const accountStatusesController: AppController = async (c) => {
     filter['#t'] = [tagged];
   }
 
-  let events = await eventsDB.getFilters([filter]);
+  let events = await eventsDB.getEvents([filter]);
 
   if (exclude_replies) {
     events = events.filter((event) => !findReplyTag(event));
@@ -256,7 +256,7 @@ const favouritesController: AppController = async (c) => {
   const pubkey = c.get('pubkey')!;
   const params = paginationSchema.parse(c.req.query());
 
-  const events7 = await eventsDB.getFilters(
+  const events7 = await eventsDB.getEvents(
     [{ kinds: [7], authors: [pubkey], ...params }],
     { signal: AbortSignal.timeout(1000) },
   );
@@ -265,7 +265,7 @@ const favouritesController: AppController = async (c) => {
     .map((event) => event.tags.find((tag) => tag[0] === 'e')?.[1])
     .filter((id): id is string => !!id);
 
-  const events1 = await eventsDB.getFilters(
+  const events1 = await eventsDB.getEvents(
     [{ kinds: [1], ids, relations: ['author', 'event_stats', 'author_stats'] }],
     {
       signal: AbortSignal.timeout(1000),

src/controllers/api/notifications.ts

@@ -1,5 +1,5 @@
 import { type AppController } from '@/app.ts';
-import * as eventsDB from '@/db/events.ts';
+import { eventsDB } from '@/db/events.ts';
 import { paginated, paginationSchema } from '@/utils/web.ts';
 import { renderNotification } from '@/views/mastodon/notifications.ts';
 
@@ -7,7 +7,7 @@ const notificationsController: AppController = async (c) => {
   const pubkey = c.get('pubkey')!;
   const { since, until } = paginationSchema.parse(c.req.query());
 
-  const events = await eventsDB.getFilters(
+  const events = await eventsDB.getEvents(
     [{ kinds: [1], '#p': [pubkey], since, until }],
     { signal: AbortSignal.timeout(3000) },
   );

src/controllers/api/pleroma.ts

@@ -1,12 +1,12 @@
 import { type AppController } from '@/app.ts';
-import * as eventsDB from '@/db/events.ts';
+import { eventsDB } from '@/db/events.ts';
 import { z } from '@/deps.ts';
 import { configSchema, elixirTupleSchema } from '@/schemas/pleroma-api.ts';
 import { createAdminEvent } from '@/utils/web.ts';
 import { Conf } from '@/config.ts';
 
 const frontendConfigController: AppController = async (c) => {
-  const [event] = await eventsDB.getFilters([{
+  const [event] = await eventsDB.getEvents([{
     kinds: [30078],
     authors: [Conf.pubkey],
     '#d': ['pub.ditto.frontendConfig'],

src/controllers/api/search.ts

@@ -1,5 +1,5 @@
 import { AppController } from '@/app.ts';
-import * as eventsDB from '@/db/events.ts';
+import { eventsDB } from '@/db/events.ts';
 import { type Event, nip19, z } from '@/deps.ts';
 import { type DittoFilter } from '@/filter.ts';
 import { booleanParamSchema } from '@/schema.ts';
@@ -76,7 +76,7 @@ function searchEvents({ q, type, limit, account_id }: SearchQuery): Promise<Even
     filter.authors = [account_id];
   }
 
-  return eventsDB.getFilters([filter]);
+  return eventsDB.getEvents([filter]);
 }
 
 /** Get event kinds to search from `type` query param. */
@@ -94,7 +94,7 @@ function typeToKinds(type: SearchQuery['type']): number[] {
 /** Resolve a searched value into an event, if applicable. */
 async function lookupEvent(query: SearchQuery, signal = AbortSignal.timeout(1000)): Promise<Event | undefined> {
   const filters = await getLookupFilters(query);
-  const [event] = await eventsDB.getFilters(filters, { limit: 1, signal });
+  const [event] = await eventsDB.getEvents(filters, { limit: 1, signal });
   return event;
 }
 

src/controllers/api/timelines.ts

@@ -1,4 +1,4 @@
-import * as eventsDB from '@/db/events.ts';
+import { eventsDB } from '@/db/events.ts';
 import { z } from '@/deps.ts';
 import { type DittoFilter } from '@/filter.ts';
 import { getFeedPubkeys } from '@/queries.ts';
@@ -33,7 +33,7 @@ const hashtagTimelineController: AppController = (c) => {
 
 /** Render statuses for timelines. */
 async function renderStatuses(c: AppContext, filters: DittoFilter<1>[], signal = AbortSignal.timeout(1000)) {
-  const events = await eventsDB.getFilters(
+  const events = await eventsDB.getEvents(
     filters.map((filter) => ({ ...filter, relations: ['author', 'event_stats', 'author_stats'] })),
     { signal },
   );

src/controllers/nostr/relay.ts

@@ -1,5 +1,5 @@
 import { relayInfoController } from '@/controllers/nostr/relay-info.ts';
-import * as eventsDB from '@/db/events.ts';
+import { eventsDB } from '@/db/events.ts';
 import * as pipeline from '@/pipeline.ts';
 import { jsonSchema } from '@/schema.ts';
 import {
@@ -63,7 +63,7 @@ function connectStream(socket: WebSocket) {
   async function handleReq([_, subId, ...rest]: ClientREQ): Promise<void> {
     const filters = prepareFilters(rest);
 
-    for (const event of await eventsDB.getFilters(filters, { limit: FILTER_LIMIT })) {
+    for (const event of await eventsDB.getEvents(filters, { limit: FILTER_LIMIT })) {
       send(['EVENT', subId, event]);
     }
 

src/db/events.test.ts

@@ -1,49 +1,50 @@
-import event55920b75 from '~/fixtures/events/55920b75.json' assert { type: 'json' };
 import { assertEquals } from '@/deps-test.ts';
-
-import { countFilters, deleteFilters, getFilters, insertEvent } from './events.ts';
 import { insertUser } from '@/db/users.ts';
 
+import event1 from '~/fixtures/events/event-1.json' assert { type: 'json' };
+
+import { eventsDB as db } from './events.ts';
+
 Deno.test('count filters', async () => {
-  assertEquals(await countFilters([{ kinds: [1] }]), 0);
+  assertEquals(await db.countEvents([{ kinds: [1] }]), 0);
-  await insertEvent(event55920b75, { user: undefined });
+  await db.storeEvent(event1, { user: undefined });
-  assertEquals(await countFilters([{ kinds: [1] }]), 1);
+  assertEquals(await db.countEvents([{ kinds: [1] }]), 1);
 });
 
 Deno.test('insert and filter events', async () => {
-  await insertEvent(event55920b75, { user: undefined });
+  await db.storeEvent(event1, { user: undefined });
 
-  assertEquals(await getFilters([{ kinds: [1] }]), [event55920b75]);
+  assertEquals(await db.getEvents([{ kinds: [1] }]), [event1]);
-  assertEquals(await getFilters([{ kinds: [3] }]), []);
+  assertEquals(await db.getEvents([{ kinds: [3] }]), []);
-  assertEquals(await getFilters([{ since: 1691091000 }]), [event55920b75]);
+  assertEquals(await db.getEvents([{ since: 1691091000 }]), [event1]);
-  assertEquals(await getFilters([{ until: 1691091000 }]), []);
+  assertEquals(await db.getEvents([{ until: 1691091000 }]), []);
   assertEquals(
-    await getFilters([{ '#proxy': ['https://gleasonator.com/objects/8f6fac53-4f66-4c6e-ac7d-92e5e78c3e79'] }]),
+    await db.getEvents([{ '#proxy': ['https://gleasonator.com/objects/8f6fac53-4f66-4c6e-ac7d-92e5e78c3e79'] }]),
-    [event55920b75],
+    [event1],
   );
 });
 
 Deno.test('delete events', async () => {
-  await insertEvent(event55920b75, { user: undefined });
+  await db.storeEvent(event1, { user: undefined });
-  assertEquals(await getFilters([{ kinds: [1] }]), [event55920b75]);
+  assertEquals(await db.getEvents([{ kinds: [1] }]), [event1]);
-  await deleteFilters([{ kinds: [1] }]);
+  await db.deleteEvents([{ kinds: [1] }]);
-  assertEquals(await getFilters([{ kinds: [1] }]), []);
+  assertEquals(await db.getEvents([{ kinds: [1] }]), []);
 });
 
 Deno.test('query events with local filter', async () => {
-  await insertEvent(event55920b75, { user: undefined });
+  await db.storeEvent(event1, { user: undefined });
 
-  assertEquals(await getFilters([{}]), [event55920b75]);
+  assertEquals(await db.getEvents([{}]), [event1]);
-  assertEquals(await getFilters([{ local: true }]), []);
+  assertEquals(await db.getEvents([{ local: true }]), []);
-  assertEquals(await getFilters([{ local: false }]), [event55920b75]);
+  assertEquals(await db.getEvents([{ local: false }]), [event1]);
 
   await insertUser({
     username: 'alex',
-    pubkey: event55920b75.pubkey,
+    pubkey: event1.pubkey,
     inserted_at: new Date(),
     admin: 0,
   });
 
-  assertEquals(await getFilters([{ local: true }]), [event55920b75]);
+  assertEquals(await db.getEvents([{ local: true }]), [event1]);
-  assertEquals(await getFilters([{ local: false }]), []);
+  assertEquals(await db.getEvents([{ local: false }]), []);
 });

src/db/events.ts

@@ -1,12 +1,12 @@
 import { db, type DittoDB } from '@/db.ts';
 import { Debug, type Event, type SelectQueryBuilder } from '@/deps.ts';
+import { type DittoFilter } from '@/filter.ts';
 import { isParameterizedReplaceableKind } from '@/kinds.ts';
 import { jsonMetaContentSchema } from '@/schemas/nostr.ts';
+import { type DittoEvent, EventStore, type GetEventsOpts } from '@/store.ts';
 import { EventData } from '@/types.ts';
 import { isNostrId, isURL } from '@/utils.ts';
 
-import type { DittoFilter, GetFiltersOpts } from '@/filter.ts';
-
 const debug = Debug('ditto:db:events');
 
 /** Function to decide whether or not to index a tag. */
@@ -29,8 +29,8 @@ const tagConditions: Record<string, TagCondition> = {
 };
 
 /** Insert an event (and its tags) into the database. */
-function insertEvent(event: Event, data: EventData): Promise<void> {
+function storeEvent(event: Event, data: EventData): Promise<void> {
-  debug('insertEvent', JSON.stringify(event));
+  debug('EVENT', JSON.stringify(event));
 
   return db.transaction().execute(async (trx) => {
     /** Insert the event into the database. */
@@ -207,29 +207,20 @@ function getFilterQuery(filter: DittoFilter): EventQuery {
 }
 
 /** Combine filter queries into a single union query. */
-function getFiltersQuery(filters: DittoFilter[]) {
+function getEventsQuery(filters: DittoFilter[]) {
   return filters
     .map((filter) => db.selectFrom(() => getFilterQuery(filter).as('events')).selectAll())
     .reduce((result, query) => result.unionAll(query));
 }
 
-type AuthorStats = Omit<DittoDB['author_stats'], 'pubkey'>;
-type EventStats = Omit<DittoDB['event_stats'], 'event_id'>;
-
-interface DittoEvent<K extends number = number> extends Event<K> {
-  author?: DittoEvent<0>;
-  author_stats?: AuthorStats;
-  event_stats?: EventStats;
-}
-
 /** Get events for filters from the database. */
-async function getFilters<K extends number>(
+async function getEvents<K extends number>(
   filters: DittoFilter<K>[],
-  opts: GetFiltersOpts = {},
+  opts: GetEventsOpts = {},
 ): Promise<DittoEvent<K>[]> {
   if (!filters.length) return Promise.resolve([]);
   debug('REQ', JSON.stringify(filters));
-  let query = getFiltersQuery(filters);
+  let query = getEventsQuery(filters);
 
   if (typeof opts.limit === 'number') {
     query = query.limit(opts.limit);
@@ -279,12 +270,12 @@ async function getFilters<K extends number>(
 }
 
 /** Delete events based on filters from the database. */
-function deleteFilters<K extends number>(filters: DittoFilter<K>[]) {
+async function deleteEvents<K extends number>(filters: DittoFilter<K>[]): Promise<void> {
-  if (!filters.length) return Promise.resolve([]);
+  if (!filters.length) return Promise.resolve();
-  debug('deleteFilters', JSON.stringify(filters));
+  debug('DELETE', JSON.stringify(filters));
 
-  return db.transaction().execute(async (trx) => {
+  await db.transaction().execute(async (trx) => {
-    const query = getFiltersQuery(filters).clearSelect().select('id');
+    const query = getEventsQuery(filters).clearSelect().select('id');
 
     await trx.deleteFrom('events_fts')
       .where('id', 'in', () => query)
@@ -297,10 +288,10 @@ function deleteFilters<K extends number>(filters: DittoFilter<K>[]) {
 }
 
 /** Get number of events that would be returned by filters. */
-async function countFilters<K extends number>(filters: DittoFilter<K>[]): Promise<number> {
+async function countEvents<K extends number>(filters: DittoFilter<K>[]): Promise<number> {
   if (!filters.length) return Promise.resolve(0);
-  debug('countFilters', JSON.stringify(filters));
+  debug('COUNT', JSON.stringify(filters));
-  const query = getFiltersQuery(filters);
+  const query = getEventsQuery(filters);
 
   const [{ count }] = await query
     .clearSelect()
@@ -362,4 +353,12 @@ function buildUserSearchContent(event: Event<0>): string {
   return [name, nip05, about].filter(Boolean).join('\n');
 }
 
-export { countFilters, deleteFilters, type DittoEvent, getFilters, insertEvent };
+/** SQLite database storage adapter for Nostr events. */
+const eventsDB: EventStore = {
+  storeEvent,
+  getEvents,
+  countEvents,
+  deleteEvents,
+};
+
+export { eventsDB };

src/pipeline.ts

@@ -1,5 +1,5 @@
 import { Conf } from '@/config.ts';
-import * as eventsDB from '@/db/events.ts';
+import { eventsDB } from '@/db/events.ts';
 import { memorelay } from '@/db/memorelay.ts';
 import { addRelays } from '@/db/relays.ts';
 import { deleteAttachedMedia } from '@/db/unattached-media.ts';
@@ -69,7 +69,7 @@ async function storeEvent(event: Event, data: EventData, opts: StoreEventOpts =
   const { force = false } = opts;
 
   if (force || data.user || isAdminEvent(event) || await isLocallyFollowed(event.pubkey)) {
-    const [deletion] = await eventsDB.getFilters(
+    const [deletion] = await eventsDB.getEvents(
       [{ kinds: [5], authors: [event.pubkey], '#e': [event.id], limit: 1 }],
       { limit: 1, signal: AbortSignal.timeout(Time.seconds(1)) },
     );
@@ -78,7 +78,7 @@ async function storeEvent(event: Event, data: EventData, opts: StoreEventOpts =
       return Promise.reject(new RelayError('blocked', 'event was deleted'));
     } else {
       await Promise.all([
-        eventsDB.insertEvent(event, data).catch(debug),
+        eventsDB.storeEvent(event, data).catch(debug),
         updateStats(event).catch(debug),
       ]);
     }
@@ -91,13 +91,13 @@ async function storeEvent(event: Event, data: EventData, opts: StoreEventOpts =
 async function processDeletions(event: Event): Promise<void> {
   if (event.kind === 5) {
     const ids = getTagSet(event.tags, 'e');
-    const events = await eventsDB.getFilters([{ ids: [...ids] }]);
+    const events = await eventsDB.getEvents([{ ids: [...ids] }]);
 
     const deleteIds = events
       .filter(({ pubkey, id }) => pubkey === event.pubkey && ids.has(id))
       .map((event) => event.id);
 
-    await eventsDB.deleteFilters([{ ids: deleteIds }]);
+    await eventsDB.deleteEvents([{ ids: deleteIds }]);
   }
 }
 

src/queries.ts

@@ -1,8 +1,9 @@
-import * as eventsDB from '@/db/events.ts';
+import { eventsDB } from '@/db/events.ts';
+import { memorelay } from '@/db/memorelay.ts';
 import { type Event, findReplyTag } from '@/deps.ts';
 import { type AuthorMicrofilter, type DittoFilter, type IdMicrofilter, type Relation } from '@/filter.ts';
 import { reqmeister } from '@/reqmeister.ts';
-import { memorelay } from '@/db/memorelay.ts';
+import { type DittoEvent } from '@/store.ts';
 
 interface GetEventOpts<K extends number> {
   /** Signal to abort the request. */
@@ -21,7 +22,7 @@ const getEvent = async <K extends number = number>(
   const { kind, relations, signal = AbortSignal.timeout(1000) } = opts;
   const microfilter: IdMicrofilter = { ids: [id] };
 
-  const [memoryEvent] = await memorelay.getFilters([microfilter], opts) as eventsDB.DittoEvent<K>[];
+  const [memoryEvent] = await memorelay.getFilters([microfilter], opts) as DittoEvent<K>[];
 
   if (memoryEvent && !relations) {
     return memoryEvent;
@@ -32,7 +33,7 @@ const getEvent = async <K extends number = number>(
     filter.kinds = [kind];
   }
 
-  const dbEvent = await eventsDB.getFilters([filter], { limit: 1, signal })
+  const dbEvent = await eventsDB.getEvents([filter], { limit: 1, signal })
     .then(([event]) => event);
 
   // TODO: make this DRY-er.
@@ -65,7 +66,7 @@ const getAuthor = async (pubkey: string, opts: GetEventOpts<0> = {}): Promise<Ev
     return memoryEvent;
   }
 
-  const dbEvent = await eventsDB.getFilters(
+  const dbEvent = await eventsDB.getEvents(
     [{ authors: [pubkey], relations, kinds: [0], limit: 1 }],
     { limit: 1, signal },
   ).then(([event]) => event);
@@ -78,7 +79,7 @@ const getAuthor = async (pubkey: string, opts: GetEventOpts<0> = {}): Promise<Ev
 
 /** Get users the given pubkey follows. */
 const getFollows = async (pubkey: string, signal = AbortSignal.timeout(1000)): Promise<Event<3> | undefined> => {
-  const [event] = await eventsDB.getFilters([{ authors: [pubkey], kinds: [3], limit: 1 }], { limit: 1, signal });
+  const [event] = await eventsDB.getEvents([{ authors: [pubkey], kinds: [3], limit: 1 }], { limit: 1, signal });
   return event;
 };
 
@@ -117,7 +118,7 @@ async function getAncestors(event: Event<1>, result = [] as Event<1>[]): Promise
 }
 
 function getDescendants(eventId: string, signal = AbortSignal.timeout(2000)): Promise<Event<1>[]> {
-  return eventsDB.getFilters(
+  return eventsDB.getEvents(
     [{ kinds: [1], '#e': [eventId], relations: ['author', 'event_stats', 'author_stats'] }],
     { limit: 200, signal },
   );
@@ -125,7 +126,7 @@ function getDescendants(eventId: string, signal = AbortSignal.timeout(2000)): Pr
 
 /** Returns whether the pubkey is followed by a local user. */
 async function isLocallyFollowed(pubkey: string): Promise<boolean> {
-  const [event] = await eventsDB.getFilters([{ kinds: [3], '#p': [pubkey], local: true, limit: 1 }], { limit: 1 });
+  const [event] = await eventsDB.getEvents([{ kinds: [3], '#p': [pubkey], local: true, limit: 1 }], { limit: 1 });
   return Boolean(event);
 }
 

src/stats.ts

@@ -1,5 +1,5 @@
 import { type AuthorStatsRow, db, type DittoDB, type EventStatsRow } from '@/db.ts';
-import * as eventsDB from '@/db/events.ts';
+import { eventsDB } from '@/db/events.ts';
 import { Debug, type Event, findReplyTag, type InsertQueryBuilder } from '@/deps.ts';
 
 type AuthorStat = keyof Omit<AuthorStatsRow, 'pubkey'>;
@@ -125,7 +125,7 @@ function eventStatsQuery(diffs: EventStatDiff[]) {
 
 /** Get the last version of the event, if any. */
 async function maybeGetPrev<K extends number>(event: Event<K>): Promise<Event<K>> {
-  const [prev] = await eventsDB.getFilters([
+  const [prev] = await eventsDB.getEvents([
     { kinds: [event.kind], authors: [event.pubkey], limit: 1 },
   ]);
 

src/store.ts

@@ -0,0 +1,38 @@
+import { type DittoDB } from '@/db.ts';
+import { type Event } from '@/deps.ts';
+import { type DittoFilter } from '@/filter.ts';
+import { type EventData } from '@/types.ts';
+
+/** Additional options to apply to the whole subscription. */
+interface GetEventsOpts {
+  /** Signal to abort the request. */
+  signal?: AbortSignal;
+  /** Event limit for the whole subscription. */
+  limit?: number;
+  /** Relays to use, if applicable. */
+  relays?: WebSocket['url'][];
+}
+
+type AuthorStats = Omit<DittoDB['author_stats'], 'pubkey'>;
+type EventStats = Omit<DittoDB['event_stats'], 'event_id'>;
+
+/** Internal Event representation used by Ditto, including extra keys. */
+interface DittoEvent<K extends number = number> extends Event<K> {
+  author?: DittoEvent<0>;
+  author_stats?: AuthorStats;
+  event_stats?: EventStats;
+}
+
+/** Storage interface for Nostr events. */
+interface EventStore {
+  /** Add an event to the store. */
+  storeEvent(event: Event, data?: EventData): Promise<void>;
+  /** Get events from filters. */
+  getEvents<K extends number>(filters: DittoFilter<K>[], opts?: GetEventsOpts): Promise<DittoEvent<K>[]>;
+  /** Get the number of events from filters. */
+  countEvents<K extends number>(filters: DittoFilter<K>[]): Promise<number>;
+  /** Delete events from filters. */
+  deleteEvents<K extends number>(filters: DittoFilter<K>[]): Promise<void>;
+}
+
+export type { DittoEvent, EventStore, GetEventsOpts };

src/views.ts

@@ -1,5 +1,5 @@
 import { AppContext } from '@/app.ts';
-import * as eventsDB from '@/db/events.ts';
+import { eventsDB } from '@/db/events.ts';
 import { type Filter } from '@/deps.ts';
 import { getAuthor } from '@/queries.ts';
 import { renderAccount } from '@/views/mastodon/accounts.ts';
@@ -7,7 +7,7 @@ import { paginated } from '@/utils/web.ts';
 
 /** Render account objects for the author of each event. */
 async function renderEventAccounts(c: AppContext, filters: Filter[]) {
-  const events = await eventsDB.getFilters(filters);
+  const events = await eventsDB.getEvents(filters);
   const pubkeys = new Set(events.map(({ pubkey }) => pubkey));
 
   if (!pubkeys.size) {

src/views/mastodon/statuses.ts

@@ -1,7 +1,7 @@
 import { isCWTag } from 'https://gitlab.com/soapbox-pub/mostr/-/raw/c67064aee5ade5e01597c6d23e22e53c628ef0e2/src/nostr/tags.ts';
 
 import { Conf } from '@/config.ts';
-import * as eventsDB from '@/db/events.ts';
+import { eventsDB } from '@/db/events.ts';
 import { findReplyTag, nip19 } from '@/deps.ts';
 import { getMediaLinks, parseNoteContent } from '@/note.ts';
 import { getAuthor } from '@/queries.ts';
@@ -33,12 +33,8 @@ async function renderStatus(event: eventsDB.DittoEvent<1>, viewerPubkey?: string
     .all([
       Promise.all(mentionedPubkeys.map(toMention)),
       firstUrl ? unfurlCardCached(firstUrl) : null,
-      viewerPubkey
+      viewerPubkey ? eventsDB.getEvents([{ kinds: [6], '#e': [event.id], authors: [viewerPubkey] }], { limit: 1 }) : [],
-        ? eventsDB.getFilters([{ kinds: [6], '#e': [event.id], authors: [viewerPubkey] }], { limit: 1 })
+      viewerPubkey ? eventsDB.getEvents([{ kinds: [7], '#e': [event.id], authors: [viewerPubkey] }], { limit: 1 }) : [],
-        : [],
-      viewerPubkey
-        ? eventsDB.getFilters([{ kinds: [7], '#e': [event.id], authors: [viewerPubkey] }], { limit: 1 })
-        : [],
     ]);
 
   const content = buildInlineRecipients(mentions) + html;