fix: アンテナで正しくindexableがfalseなユーザーを検索から除外できるように (#168)

Co-authored-by: Esurio <[email protected]>
1673beta · Sep 8, 2024 · 399fa32 · 399fa32
1 parent e9fa7e5
commit 399fa32
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/CHANGELOG_engawa.md b/CHANGELOG_engawa.md
@@ -27,6 +27,8 @@
 
 ### Server
 - fix: `ApPersonService`で`isIndexable`を考慮してなかった箇所がある問題
+- fix: `toot:indexable`がfalseなユーザーを検索できてしまっていた問題
+- fix: `toot:indexable`がfalseなユーザーがアンテナに載っていた問題
 
 ### Misc
 

diff --git a/packages/backend/src/server/api/endpoints/antennas/notes.ts b/packages/backend/src/server/api/endpoints/antennas/notes.ts
@@ -107,12 +107,11 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 
 			const query = this.notesRepository.createQueryBuilder('note')
 				.where('note.id IN (:...noteIds)', { noteIds: noteIds })
-				.innerJoinAndSelect('note.user', 'user')
+				.innerJoinAndSelect('note.user', 'user', 'user.isIndexable = true')
 				.leftJoinAndSelect('note.reply', 'reply')
 				.leftJoinAndSelect('note.renote', 'renote')
 				.leftJoinAndSelect('reply.user', 'replyUser')
-				.leftJoinAndSelect('renote.user', 'renoteUser')
-				.andWhere('user.isIndexable = true');
+				.leftJoinAndSelect('renote.user', 'renoteUser');
 
 			this.queryService.generateVisibilityQuery(query, me);
 			this.queryService.generateMutedUserQuery(query, me);