diff options
| author | kabo2468 <28654659+kabo2468@users.noreply.github.com> | 2023-03-03 10:30:21 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-03 10:30:21 +0900 |
| commit | 53987fadd77231e532f9e3501152c1c8be9c25d7 (patch) | |
| tree | 823eba7ed775a86a57ad90db95544a098696aced | |
| parent | Update CHANGELOG.md (diff) | |
| download | sharkey-53987fadd77231e532f9e3501152c1c8be9c25d7.tar.gz sharkey-53987fadd77231e532f9e3501152c1c8be9c25d7.tar.bz2 sharkey-53987fadd77231e532f9e3501152c1c8be9c25d7.zip | |
fix(server): チャンネルでミュートが正しく機能していないのを修正 (#10166)
* fix(server): チャンネルでミュートが正しく機能していないのを修正
* Update CHANGELOG.md
| -rw-r--r-- | CHANGELOG.md | 1 | ||||
| -rw-r--r-- | packages/backend/src/server/api/endpoints/channels/timeline.ts | 6 |
2 files changed, 7 insertions, 0 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index cbb17a0406..199660542f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -23,6 +23,7 @@ You should also include the user name that made the change. ### Bugfixes - 外部メディアプロキシ使用時にアバタークロップができない問題を修正 - fix(server): メールアドレス更新時にバリデーションが正しく行われていないのを修正 +- fix(server): チャンネルでミュートが正しく機能していないのを修正 ## 13.8.1 (2023/02/26) diff --git a/packages/backend/src/server/api/endpoints/channels/timeline.ts b/packages/backend/src/server/api/endpoints/channels/timeline.ts index 58f8835279..cdaa400137 100644 --- a/packages/backend/src/server/api/endpoints/channels/timeline.ts +++ b/packages/backend/src/server/api/endpoints/channels/timeline.ts @@ -82,6 +82,12 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { .leftJoinAndSelect('renoteUser.avatar', 'renoteUserAvatar') .leftJoinAndSelect('renoteUser.banner', 'renoteUserBanner') .leftJoinAndSelect('note.channel', 'channel'); + + if (me) { + this.queryService.generateMutedUserQuery(query, me); + this.queryService.generateMutedNoteQuery(query, me); + this.queryService.generateBlockedUserQuery(query, me); + } //#endregion const timeline = await query.take(ps.limit).getMany(); |