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

Update getIdsBySearch to use the new search extensions column

Browse source
This commit is contained in:
Alex Gleason 2025-02-02 21:26:58 -06:00
parent 4664aefa55
commit 0d718e28b4
No known key found for this signature in database
GPG key ID: 7211D1F99744FBB7
1 changed files with 15 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/utils/search.ts
View file

@ -52,7 +52,9 @@ export async function getIdsBySearch(
} }
const tokens = NIP50.parseInput(q); const tokens = NIP50.parseInput(q);
const parsedSearch = tokens.filter((t) => typeof t === 'string').join(' ');
const ext = tokens.filter((token) => typeof token === 'object');
const txt = tokens.filter((token) => typeof token === 'string').join('');
let query = kysely let query = kysely
.selectFrom('nostr_events') .selectFrom('nostr_events')
@ -62,20 +64,22 @@ export async function getIdsBySearch(
.limit(limit) .limit(limit)
.offset(offset); .offset(offset);
const languages = new Set<string>();
const domains = new Set<string>(); const domains = new Set<string>();
for (const token of tokens) { for (const token of tokens) {
if (typeof token === 'object' && token.key === 'language') {
languages.add(token.value);
}
if (typeof token === 'object' && token.key === 'domain') { if (typeof token === 'object' && token.key === 'domain') {
domains.add(token.value); domains.add(token.value);
} }
} }
if (languages.size) { if (ext.length) {
query = query.where(sql`search_ext->>'language'`, 'in', [...languages]); query = query.where((eb) =>
eb.or(
ext
.filter((token) => token.key !== 'domain')
.map(({ key, value }) => eb('search_ext', '@>', { [key]: value })),
)
);
} }
if (domains.size) { if (domains.size) {
@ -90,14 +94,14 @@ export async function getIdsBySearch(
// If there is not a specific content to search, return the query already // If there is not a specific content to search, return the query already
// This is useful if the person only makes a query search such as `domain:patrickdosreis.com` // This is useful if the person only makes a query search such as `domain:patrickdosreis.com`
if (!parsedSearch.length) { if (!txt.length) {
const ids = new Set((await query.execute()).map(({ id }) => id)); const ids = new Set((await query.execute()).map(({ id }) => id));
return ids; return ids;
} }
let fallbackQuery = query; let fallbackQuery = query;
if (parsedSearch) { if (txt) {
query = query.where('search', '@@', sql`phraseto_tsquery(${parsedSearch})`); query = query.where('search', '@@', sql`phraseto_tsquery(${txt})`);
} }
const ids = new Set((await query.execute()).map(({ id }) => id)); const ids = new Set((await query.execute()).map(({ id }) => id));
@ -107,7 +111,7 @@ export async function getIdsBySearch(
fallbackQuery = fallbackQuery.where( fallbackQuery = fallbackQuery.where(
'search', 'search',
'@@', '@@',
sql`plainto_tsquery(${parsedSearch})`, sql`plainto_tsquery(${txt})`,
); );
const ids = new Set((await fallbackQuery.execute()).map(({ id }) => id)); const ids = new Set((await fallbackQuery.execute()).map(({ id }) => id));
return ids; return ids;