mirrors/firefish
1
0
Fork 1
mirror of https://git.joinfirefish.org/firefish/firefish.git synced 2024-05-19 21:51:11 +02:00
Code Issues 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
parent 393a3a3c1d bb7f743127
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(
new Brackets((qb) => {
qb.where("note.userId = :meId", { meId: user.id });
if (hasFollowing)
qb.orWhere(`note.userId IN (${followingQuery.getQuery()})`);
if (hasFollowing) {
qb.orWhere(
`note.userId IN (${followingQuery.getQuery()})`,
followingQuery.getParameters(),
);
}
}),
)
.innerJoinAndSelect("note.user", "user")