summaryrefslogtreecommitdiff
path: root/packages/backend/src/server/api/endpoints/channels
diff options
context:
space:
mode:
authorkabo2468 <28654659+kabo2468@users.noreply.github.com>2023-03-03 10:30:21 +0900
committerGitHub <noreply@github.com>2023-03-03 10:30:21 +0900
commit53987fadd77231e532f9e3501152c1c8be9c25d7 (patch)
tree823eba7ed775a86a57ad90db95544a098696aced /packages/backend/src/server/api/endpoints/channels
parentUpdate CHANGELOG.md (diff)
downloadsharkey-53987fadd77231e532f9e3501152c1c8be9c25d7.tar.gz
sharkey-53987fadd77231e532f9e3501152c1c8be9c25d7.tar.bz2
sharkey-53987fadd77231e532f9e3501152c1c8be9c25d7.zip
fix(server): チャンネルでミュートが正しく機能していないのを修正 (#10166)
* fix(server): チャンネルでミュートが正しく機能していないのを修正 * Update CHANGELOG.md
Diffstat (limited to 'packages/backend/src/server/api/endpoints/channels')
-rw-r--r--packages/backend/src/server/api/endpoints/channels/timeline.ts6
1 files changed, 6 insertions, 0 deletions
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();