diff --git a/src/controllers/api/accounts.ts b/src/controllers/api/accounts.ts index 0ca2f714..f16f04e5 100644 --- a/src/controllers/api/accounts.ts +++ b/src/controllers/api/accounts.ts @@ -136,8 +136,8 @@ const accountSearchController: AppController = async (c) => { return c.json(pubkey ? [await accountFromPubkey(pubkey)] : []); } - const followList: Set = viewerPubkey ? await getFollowedPubkeys(viewerPubkey) : new Set(); - const pubkeys = (await getPubkeysBySearch(kysely, { q: query, limit, followList })).slice(0, limit); + const followedPubkeys: Set = viewerPubkey ? await getFollowedPubkeys(viewerPubkey) : new Set(); + const pubkeys = (await getPubkeysBySearch(kysely, { q: query, limit, followedPubkeys })).slice(0, limit); let events = event ? [event] : await store.query([{ kinds: [0], authors: pubkeys, limit }], { signal, diff --git a/src/controllers/api/search.ts b/src/controllers/api/search.ts index 358a8882..01977208 100644 --- a/src/controllers/api/search.ts +++ b/src/controllers/api/search.ts @@ -96,8 +96,8 @@ async function searchEvents( if (type === 'accounts') { const kysely = await Storages.kysely(); - const followList: Set = viewerPubkey ? await getFollowedPubkeys(viewerPubkey) : new Set(); - pubkeys.push(...(await getPubkeysBySearch(kysely, { q, limit, followList }))); + const followedPubkeys: Set = viewerPubkey ? await getFollowedPubkeys(viewerPubkey) : new Set(); + pubkeys.push(...(await getPubkeysBySearch(kysely, { q, limit, followedPubkeys }))); if (!filter?.authors) { filter.authors = pubkeys; diff --git a/src/utils/search.test.ts b/src/utils/search.test.ts index 4b9b1d30..0621fdaa 100644 --- a/src/utils/search.test.ts +++ b/src/utils/search.test.ts @@ -11,11 +11,11 @@ Deno.test('fuzzy search works', async () => { search: 'patrickReiis patrickdosreis.com', }).execute(); - assertEquals(await getPubkeysBySearch(db.kysely, { q: 'pat rick', limit: 1, followList: new Set() }), []); - assertEquals(await getPubkeysBySearch(db.kysely, { q: 'patrick dos reis', limit: 1, followList: new Set() }), [ + assertEquals(await getPubkeysBySearch(db.kysely, { q: 'pat rick', limit: 1, followedPubkeys: new Set() }), []); + assertEquals(await getPubkeysBySearch(db.kysely, { q: 'patrick dos reis', limit: 1, followedPubkeys: new Set() }), [ '47259076c85f9240e852420d7213c95e95102f1de929fb60f33a2c32570c98c4', ]); - assertEquals(await getPubkeysBySearch(db.kysely, { q: 'dosreis.com', limit: 1, followList: new Set() }), [ + assertEquals(await getPubkeysBySearch(db.kysely, { q: 'dosreis.com', limit: 1, followedPubkeys: new Set() }), [ '47259076c85f9240e852420d7213c95e95102f1de929fb60f33a2c32570c98c4', ]); }); diff --git a/src/utils/search.ts b/src/utils/search.ts index a12e8c95..40d2676e 100644 --- a/src/utils/search.ts +++ b/src/utils/search.ts @@ -5,9 +5,9 @@ import { DittoTables } from '@/db/DittoTables.ts'; /** Get pubkeys whose name and NIP-05 is similar to 'q' */ export async function getPubkeysBySearch( kysely: Kysely, - opts: { q: string; limit: number; followList: Set }, + opts: { q: string; limit: number; followedPubkeys: Set }, ) { - const { q, limit, followList } = opts; + const { q, limit, followedPubkeys } = opts; let query = kysely .selectFrom('author_search') @@ -22,8 +22,8 @@ export async function getPubkeysBySearch( const pubkeys = new Set((await query.execute()).map(({ pubkey }) => pubkey)); - if (followList.size > 0) { - query = query.where('pubkey', 'in', [...followList]); + if (followedPubkeys.size > 0) { + query = query.where('pubkey', 'in', [...followedPubkeys]); } const followingPubkeys = new Set((await query.execute()).map(({ pubkey }) => pubkey));