versia-pub/server
2
0
Fork 0
mirror of https://github.com/versia-pub/server.git synced 2025-12-06 08:28:19 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: 🐛 Fix v2 search API not working at all

Browse source
This commit is contained in:
Jesse Wierzbinski 2024-06-28 23:59:01 -10:00
parent 93b8609411
commit 84bdb75d77
No known key found for this signature in database
1 changed files with 43 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
server/api/api/v2/search/index.ts
View file

@ -154,33 +154,40 @@ export default (app: Hono) =>
); );
} }
const accounts = await User.manyFromSql( const accounts =
accountResults.length > 0
? await User.manyFromSql(
and( and(
inArray( inArray(
Users.id, Users.id,
accountResults.map((hit) => hit), accountResults.map((hit) => hit),
), ),
self self && following
? sql`EXISTS (SELECT 1 FROM Relationships WHERE Relationships.subjectId = ${ ? sql`EXISTS (SELECT 1 FROM "Relationships" WHERE "Relationships"."subjectId" = ${
self?.id self?.id
} AND Relationships.following = ${!!following} AND Relationships.ownerId = ${ } AND "Relationships".following = ${!!following} AND "Relationships"."ownerId" = ${
Users.id Users.id
})` })`
: undefined, : undefined,
), ),
); )
: [];
const statuses = await Note.manyFromSql( const statuses =
statusResults.length > 0
? await Note.manyFromSql(
and( and(
inArray( inArray(
Notes.id, Notes.id,
statusResults.map((hit) => hit), statusResults.map((hit) => hit),
), ),
account_id ? eq(Notes.authorId, account_id) : undefined, account_id
self ? eq(Notes.authorId, account_id)
? sql`EXISTS (SELECT 1 FROM Relationships WHERE Relationships.subjectId = ${ : undefined,
self && following
? sql`EXISTS (SELECT 1 FROM "Relationships" WHERE "Relationships"."subjectId" = ${
self?.id self?.id
} AND Relationships.following = ${!!following} AND Relationships.ownerId = ${ } AND "Relationships".following = ${!!following} AND "Relationships"."ownerId" = ${
Notes.authorId Notes.authorId
})` })`
: undefined, : undefined,
@ -189,7 +196,8 @@ export default (app: Hono) =>
undefined, undefined,
undefined, undefined,
self?.id, self?.id,
); )
: [];
return jsonResponse({ return jsonResponse({
accounts: accounts.map((account) => account.toApi()), accounts: accounts.map((account) => account.toApi()),