Madeorsk/rudeshark.net
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'fix/timeline-query' into 'develop'

Browse Source 
fix: ⚗️ Fix variables?


See merge request firefish/firefish!10594
This commit is contained in:
Kainoa Kanter 2023-09-19 22:36:05 +00:00
commit e07c9e9e50
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
packages/backend/src/server/api/endpoints/notes/timeline.ts
View File

@ -87,8 +87,12 @@ export default define(meta, paramDef, async (ps, user) => {
.andWhere( .andWhere(
new Brackets((qb) => { new Brackets((qb) => {
qb.where("note.userId = :meId", { meId: user.id }); qb.where("note.userId = :meId", { meId: user.id });
if (hasFollowing) if (hasFollowing) {
qb.orWhere(`note.userId IN (${followingQuery.getQuery()})`); qb.orWhere(
`note.userId IN (${followingQuery.getQuery()})`,
followingQuery.getParameters(),
);
}
}), }),
) )
.innerJoinAndSelect("note.user", "user") .innerJoinAndSelect("note.user", "user")