mirrors/misskey
1
0
Fork 1
mirror of https://github.com/misskey-dev/misskey.git synced 2026-05-02 03:55:45 +02:00
Code Releases Activity

Fix #5935

Browse Source
This commit is contained in:
syuilo
2020-02-13 22:13:24 +09:00
parent a473768bef
commit d76fceae85
9 changed files with 74 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/server/api/endpoints/notes/timeline.ts
View File

@@ -110,6 +110,18 @@ export default define(meta, async (ps, user) => {
.where(`note.userId IN (${ followingQuery.getQuery() })`)
.orWhere('note.userId = :meId', { meId: user.id });
}))
.andWhere(new Brackets(qb => { qb
.where(`note.replyId IS NULL`) // 返信ではない
.orWhere('note.replyUserId = :meId', { meId: user.id }) // 返信だけど自分のノートへの返信
.orWhere(new Brackets(qb => { qb // 返信だけど自分の行った返信
.where(`note.replyId IS NOT NULL`)
.andWhere('note.userId = :meId', { meId: user.id });
}))
.orWhere(new Brackets(qb => { qb // 返信だけど投稿者自身への返信
.where(`note.replyId IS NOT NULL`)
.andWhere('note.replyUserId = note.userId', { meId: user.id });
}));
}))
.leftJoinAndSelect('note.user', 'user')
.setParameters(followingQuery.getParameters());