投稿直後のantennaの処理を修正

tarbo-studio · Nov 24, 2024 · 40d57e6 · 40d57e6
1 parent 7a91b4c
commit 40d57e6
Showing 1 changed file with 2 additions and 21 deletions.
diff --git a/packages/backend/src/core/AntennaService.ts b/packages/backend/src/core/AntennaService.ts
@@ -64,31 +64,12 @@ export class AntennaService {
 		if (note.visibility === "specified") return false;
 		if (note.visibility === "followers") return false;
 
-		let userIds: string[] = [];
-		if (antenna.users && antenna.users.length > 0) {
-			const users = await this.usersRepository.find({
-				where: [
-					...antenna.users.map((username) => {
-						const acct = Acct.parse(username);
-						return { username: acct.username, host: acct.host ?? IsNull() };
-					}),
-				],
-			});
-			userIds = users.map((u) => u.id);
-		}
-
-		const notes = await this.searchService.searchNote(
-			"",
+		const notes = await this.searchService.searchNoteWithFilter(
 			null,
+			[JSON.parse(antenna.filterTree ?? "{}")],
 			{
-				userIds: userIds,
-				origin: antenna.localOnly ? "local" : undefined,
-				keywords: antenna.keywords,
-				excludeKeywords: antenna.excludeKeywords,
 				checkChannelSearchable: true,
 				reverseOrder: false,
-				hasFile: antenna.withFile,
-				includeReplies: antenna.withReplies,
 			},
 			{
 				equal: note.id,