diff options
| author | syuilo <Syuilotan@yahoo.co.jp> | 2019-10-21 00:52:50 +0900 |
|---|---|---|
| committer | syuilo <Syuilotan@yahoo.co.jp> | 2019-10-21 00:52:50 +0900 |
| commit | 7ff8fb027da0e83f1c20acfaf492889f8c97ff3e (patch) | |
| tree | 061e7cc93868a9e691a5fd1719c474b39a10d247 | |
| parent | Escでメディアビューワが閉じれるように (#5494) (diff) | |
| download | sharkey-7ff8fb027da0e83f1c20acfaf492889f8c97ff3e.tar.gz sharkey-7ff8fb027da0e83f1c20acfaf492889f8c97ff3e.tar.bz2 sharkey-7ff8fb027da0e83f1c20acfaf492889f8c97ff3e.zip | |
Fix #4731
| -rw-r--r-- | src/server/api/common/generate-mute-query.ts | 6 | ||||
| -rw-r--r-- | src/server/api/endpoints/users/notes.ts | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/server/api/common/generate-mute-query.ts b/src/server/api/common/generate-mute-query.ts index 090c14eb83..4504d23512 100644 --- a/src/server/api/common/generate-mute-query.ts +++ b/src/server/api/common/generate-mute-query.ts @@ -2,11 +2,15 @@ import { User } from '../../../models/entities/user'; import { Mutings } from '../../../models'; import { SelectQueryBuilder, Brackets } from 'typeorm'; -export function generateMuteQuery(q: SelectQueryBuilder<any>, me: User) { +export function generateMuteQuery(q: SelectQueryBuilder<any>, me: User, exclude?: User) { const mutingQuery = Mutings.createQueryBuilder('muting') .select('muting.muteeId') .where('muting.muterId = :muterId', { muterId: me.id }); + if (exclude) { + mutingQuery.andWhere('muting.muteeId != :excludeId', { excludeId: exclude.id }); + } + // 投稿の作者をミュートしていない かつ // 投稿の返信先の作者をミュートしていない かつ // 投稿の引用元の作者をミュートしていない diff --git a/src/server/api/endpoints/users/notes.ts b/src/server/api/endpoints/users/notes.ts index 4869bd09fd..49e1ab0283 100644 --- a/src/server/api/endpoints/users/notes.ts +++ b/src/server/api/endpoints/users/notes.ts @@ -134,7 +134,7 @@ export default define(meta, async (ps, me) => { .leftJoinAndSelect('note.user', 'user'); if (me) generateVisibilityQuery(query, me); - if (me) generateMuteQuery(query, me); + if (me) generateMuteQuery(query, me, user); if (ps.withFiles) { query.andWhere('note.fileIds != \'{}\''); |