From 48c66593295b575f1a455ffdffcee8321312aa5c Mon Sep 17 00:00:00 2001 From: anatawa12 Date: Fri, 9 May 2025 22:56:01 +0900 Subject: [PATCH] chore: change 3rd parameter of generateMutedUserQueryForNotes to options --- packages/backend/src/core/QueryService.ts | 14 +++++++++++--- .../src/server/api/endpoints/users/notes.ts | 2 +- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/packages/backend/src/core/QueryService.ts b/packages/backend/src/core/QueryService.ts index b9cef5b0ec..cbb671d10f 100644 --- a/packages/backend/src/core/QueryService.ts +++ b/packages/backend/src/core/QueryService.ts @@ -137,13 +137,21 @@ export class QueryService { } @bindThis - public generateMutedUserQueryForNotes(q: SelectQueryBuilder, me: { id: MiUser['id'] }, exclude?: { id: MiUser['id'] }): void { + public generateMutedUserQueryForNotes( + q: SelectQueryBuilder, + me: { id: MiUser['id'] }, + { + excludeUserFromMute, + }: { + excludeUserFromMute?: MiUser['id'], + } = {}, + ): void { const mutingQuery = this.mutingsRepository.createQueryBuilder('muting') .select('muting.muteeId') .where('muting.muterId = :muterId', { muterId: me.id }); - if (exclude) { - mutingQuery.andWhere('muting.muteeId != :excludeId', { excludeId: exclude.id }); + if (excludeUserFromMute) { + mutingQuery.andWhere('muting.muteeId != :excludeId', { excludeId: excludeUserFromMute }); } const mutingInstanceQuery = this.userProfilesRepository.createQueryBuilder('user_profile') diff --git a/packages/backend/src/server/api/endpoints/users/notes.ts b/packages/backend/src/server/api/endpoints/users/notes.ts index 0c64df569d..d6847a6ee4 100644 --- a/packages/backend/src/server/api/endpoints/users/notes.ts +++ b/packages/backend/src/server/api/endpoints/users/notes.ts @@ -189,7 +189,7 @@ export default class extends Endpoint { // eslint- this.queryService.generateBlockedHostQueryForNote(query, true); this.queryService.generateSuspendedUserQueryForNote(query, true); if (me) { - this.queryService.generateMutedUserQueryForNotes(query, me, { id: ps.userId }); + this.queryService.generateMutedUserQueryForNotes(query, me, { excludeUserFromMute: ps.userId }); this.queryService.generateBlockedUserQueryForNotes(query, me); }