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

refactor(getPubkeysBySearch): rename followList to followedPubkeys

Browse source
This commit is contained in:
P. Reis 2024-09-18 11:26:30 -03:00
parent f73b20bf03
commit f1c0d8c18f
4 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/controllers/api/accounts.ts
View file

@ -136,8 +136,8 @@ const accountSearchController: AppController = async (c) => {
return c.json(pubkey ? [await accountFromPubkey(pubkey)] : []); return c.json(pubkey ? [await accountFromPubkey(pubkey)] : []);
} }
const followList: Set<string> = viewerPubkey ? await getFollowedPubkeys(viewerPubkey) : new Set(); const followedPubkeys: Set<string> = viewerPubkey ? await getFollowedPubkeys(viewerPubkey) : new Set();
const pubkeys = (await getPubkeysBySearch(kysely, { q: query, limit, followList })).slice(0, limit); const pubkeys = (await getPubkeysBySearch(kysely, { q: query, limit, followedPubkeys })).slice(0, limit);
let events = event ? [event] : await store.query([{ kinds: [0], authors: pubkeys, limit }], { let events = event ? [event] : await store.query([{ kinds: [0], authors: pubkeys, limit }], {
signal, signal,

4
src/controllers/api/search.ts
View file

@ -96,8 +96,8 @@ async function searchEvents(
if (type === 'accounts') { if (type === 'accounts') {
const kysely = await Storages.kysely(); const kysely = await Storages.kysely();
const followList: Set<string> = viewerPubkey ? await getFollowedPubkeys(viewerPubkey) : new Set(); const followedPubkeys: Set<string> = viewerPubkey ? await getFollowedPubkeys(viewerPubkey) : new Set();
pubkeys.push(...(await getPubkeysBySearch(kysely, { q, limit, followList }))); pubkeys.push(...(await getPubkeysBySearch(kysely, { q, limit, followedPubkeys })));
if (!filter?.authors) { if (!filter?.authors) {
filter.authors = pubkeys; filter.authors = pubkeys;

6
src/utils/search.test.ts
View file

@ -11,11 +11,11 @@ Deno.test('fuzzy search works', async () => {
search: 'patrickReiis patrickdosreis.com', search: 'patrickReiis patrickdosreis.com',
}).execute(); }).execute();
assertEquals(await getPubkeysBySearch(db.kysely, { q: 'pat rick', 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, followList: new Set() }), [ assertEquals(await getPubkeysBySearch(db.kysely, { q: 'patrick dos reis', limit: 1, followedPubkeys: new Set() }), [
'47259076c85f9240e852420d7213c95e95102f1de929fb60f33a2c32570c98c4', '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', '47259076c85f9240e852420d7213c95e95102f1de929fb60f33a2c32570c98c4',
]); ]);
}); });

8
src/utils/search.ts
View file

@ -5,9 +5,9 @@ import { DittoTables } from '@/db/DittoTables.ts';
/** Get pubkeys whose name and NIP-05 is similar to 'q' */ /** Get pubkeys whose name and NIP-05 is similar to 'q' */
export async function getPubkeysBySearch( export async function getPubkeysBySearch(
kysely: Kysely<DittoTables>, kysely: Kysely<DittoTables>,
opts: { q: string; limit: number; followList: Set<string> }, opts: { q: string; limit: number; followedPubkeys: Set<string> },
) { ) {
const { q, limit, followList } = opts; const { q, limit, followedPubkeys } = opts;
let query = kysely let query = kysely
.selectFrom('author_search') .selectFrom('author_search')
@ -22,8 +22,8 @@ export async function getPubkeysBySearch(
const pubkeys = new Set((await query.execute()).map(({ pubkey }) => pubkey)); const pubkeys = new Set((await query.execute()).map(({ pubkey }) => pubkey));
if (followList.size > 0) { if (followedPubkeys.size > 0) {
query = query.where('pubkey', 'in', [...followList]); query = query.where('pubkey', 'in', [...followedPubkeys]);
} }
const followingPubkeys = new Set((await query.execute()).map(({ pubkey }) => pubkey)); const followingPubkeys = new Set((await query.execute()).map(({ pubkey }) => pubkey));