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

fix: type assertions in EventsDB

Browse source
This commit is contained in:
P. Reis 2024-10-08 11:01:34 -03:00
parent 6c93153117
commit 3f00f255a5
2 changed files with 3 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/db/DittoTables.ts
View file

@ -1,5 +1,3 @@
import { Nullable } from 'kysely';
import { NPostgresSchema } from '@nostrify/db'; import { NPostgresSchema } from '@nostrify/db';
export interface DittoTables extends NPostgresSchema { export interface DittoTables extends NPostgresSchema {
@ -12,7 +10,7 @@ export interface DittoTables extends NPostgresSchema {
} }
type NostrEventsRow = NPostgresSchema['nostr_events'] & { type NostrEventsRow = NPostgresSchema['nostr_events'] & {
language: Nullable<string>; language: string | null;
}; };
interface AuthorStatsRow { interface AuthorStatsRow {

6
src/storages/EventsDB.ts
View file

@ -146,16 +146,14 @@ class EventsDB extends NPostgres {
} }
} }
// @ts-ignore The type is correct, but NPostgres doesn't realize it. I don't think it's solvable without modifying NPostgres again, which I don't think is worth it for this.
protected override getFilterQuery(trx: Kysely<NPostgresSchema>, filter: NostrFilter) { protected override getFilterQuery(trx: Kysely<NPostgresSchema>, filter: NostrFilter) {
if (filter.search) { if (filter.search) {
const tokens = NIP50.parseInput(filter.search); const tokens = NIP50.parseInput(filter.search);
// @ts-ignore The type is correct, but NPostgres doesn't realize it. I don't think it's solvable without modifying NPostgres again, which I don't think is worth it for this.
let query = super.getFilterQuery(trx, { let query = super.getFilterQuery(trx, {
...filter, ...filter,
search: tokens.filter((t) => typeof t === 'string').join(' '), search: tokens.filter((t) => typeof t === 'string').join(' '),
}) as SelectQueryBuilder<DittoTables, 'nostr_events', Pick<DittoTables['nostr_events'], keyof NostrEvent>>; }) as SelectQueryBuilder<DittoTables, 'nostr_events', DittoTables['nostr_events']>;
const languages = new Set<string>(); const languages = new Set<string>();
@ -204,7 +202,7 @@ class EventsDB extends NPostgres {
} }
/** Parse an event row from the database. */ /** Parse an event row from the database. */
protected override parseEventRow(row: Pick<DittoTables['nostr_events'], keyof NostrEvent | 'language'>): DittoEvent { protected override parseEventRow(row: DittoTables['nostr_events']): DittoEvent {
return { return {
id: row.id, id: row.id,
kind: row.kind, kind: row.kind,