oscar-surf/misskey
oscar-surf/misskey
0
0
Fork 0
Code Issues Activity

Fix #5950

Browse source
This commit is contained in:
syuilo 2020-02-15 21:39:38 +09:00
parent 43734f027b
commit d0085f00ed
5 changed files with 35 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/server/api/endpoints/notes/global-timeline.ts
View file

@ -8,6 +8,7 @@ import { Notes } from '../../../../models';
import { generateMuteQuery } from '../../common/generate-mute-query';
import { activeUsersChart } from '../../../../services/chart';
import { Brackets } from 'typeorm';
import { generateRepliesQuery } from '../../common/generate-replies-query';
export const meta = {
desc: {
@ -77,21 +78,9 @@ export default define(meta, async (ps, user) => {
const query = makePaginationQuery(Notes.createQueryBuilder('note'),
ps.sinceId, ps.untilId, ps.sinceDate, ps.untilDate)
.andWhere('note.visibility = \'public\'')
.andWhere('note.replyId IS NULL')
.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');
generateRepliesQuery(query, user);
if (user) generateMuteQuery(query, user);
if (ps.withFiles) {