Merge branch 'fix/timeline-query' into 'develop'
fix: ⚗️ Fix variables? See merge request firefish/firefish!10594
This commit is contained in:
commit
e07c9e9e50
@ -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")
|
||||
|
Loading…
Reference in New Issue
Block a user