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

trends: read directly from the tags table instead of doing an inner join on events

Browse source
This commit is contained in:
Alex Gleason 2024-07-29 15:33:16 -05:00
parent ece18c9bd8
commit 48a4e30e38
No known key found for this signature in database
GPG key ID: 7211D1F99744FBB7
2 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/db/migrations/029_tag_queries.ts
View file

@ -54,6 +54,12 @@ export async function up(db: Kysely<any>): Promise<void> {
.ifNotExists() .ifNotExists()
.columns(['value', 'name', 'kind', 'pubkey', 'created_at desc', 'event_id asc']) .columns(['value', 'name', 'kind', 'pubkey', 'created_at desc', 'event_id asc'])
.execute(); .execute();
await db.schema
.createIndex('nostr_tags_trends')
.on('nostr_tags')
.ifNotExists()
.columns(['created_at', 'name', 'kind'])
.execute();
} }
export async function down(db: Kysely<any>): Promise<void> { export async function down(db: Kysely<any>): Promise<void> {

11
src/trends.ts
View file

@ -22,24 +22,23 @@ export async function getTrendingTagValues(
): Promise<{ value: string; authors: number; uses: number }[]> { ): Promise<{ value: string; authors: number; uses: number }[]> {
let query = kysely let query = kysely
.selectFrom('nostr_tags') .selectFrom('nostr_tags')
.innerJoin('nostr_events', 'nostr_events.id', 'nostr_tags.event_id')
.select(({ fn }) => [ .select(({ fn }) => [
'nostr_tags.value', 'nostr_tags.value',
fn.agg<number>('count', ['nostr_events.pubkey']).distinct().as('authors'), fn.agg<number>('count', ['nostr_tags.pubkey']).distinct().as('authors'),
fn.countAll<number>().as('uses'), fn.countAll<number>().as('uses'),
]) ])
.where('nostr_tags.name', 'in', tagNames) .where('nostr_tags.name', 'in', tagNames)
.groupBy('nostr_tags.value') .groupBy('nostr_tags.value')
.orderBy((c) => c.fn.agg('count', ['nostr_events.pubkey']).distinct(), 'desc'); .orderBy((c) => c.fn.agg('count', ['nostr_tags.pubkey']).distinct(), 'desc');
if (filter.kinds) { if (filter.kinds) {
query = query.where('nostr_events.kind', 'in', filter.kinds); query = query.where('nostr_tags.kind', 'in', filter.kinds);
} }
if (typeof filter.since === 'number') { if (typeof filter.since === 'number') {
query = query.where('nostr_events.created_at', '>=', filter.since); query = query.where('nostr_tags.created_at', '>=', filter.since);
} }
if (typeof filter.until === 'number') { if (typeof filter.until === 'number') {
query = query.where('nostr_events.created_at', '<=', filter.until); query = query.where('nostr_tags.created_at', '<=', filter.until);
} }
if (typeof filter.limit === 'number') { if (typeof filter.limit === 'number') {
query = query.limit(filter.limit); query = query.limit(filter.limit);