From 9320c1699a64ddf54d5074e9dd901b9897e9f513 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Tue, 22 Mar 2022 00:07:43 +0900
Subject: [PATCH] perf(server): disable some antenna features to improve
 performance

---
 .../backend/src/misc/check-hit-antenna.ts     | 13 +++++++++++--
 packages/backend/src/services/note/create.ts  | 19 +++++--------------
 .../client/src/pages/my-antennas/editor.vue   |  6 +++---
 3 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/packages/backend/src/misc/check-hit-antenna.ts b/packages/backend/src/misc/check-hit-antenna.ts
index ceb74d6904..745db391a4 100644
--- a/packages/backend/src/misc/check-hit-antenna.ts
+++ b/packages/backend/src/misc/check-hit-antenna.ts
@@ -1,17 +1,26 @@
 import { Antenna } from '@/models/entities/antenna.js';
 import { Note } from '@/models/entities/note.js';
 import { User } from '@/models/entities/user.js';
-import { UserListJoinings, UserGroupJoinings } from '@/models/index.js';
+import { UserListJoinings, UserGroupJoinings, Blockings } from '@/models/index.js';
 import { getFullApAccount } from './convert-host.js';
 import * as Acct from '@/misc/acct.js';
 import { Packed } from './schema.js';
+import { Cache } from './cache.js';
+
+const blockingCache = new Cache<User['id'][]>(1000 * 60 * 5);
+
+// NOTE: フォローしているユーザーのノート、リストのユーザーのノート、グループのユーザーのノート指定はパフォーマンス上の理由で無効になっている
 
 /**
  * noteUserFollowers / antennaUserFollowing はどちらか一方が指定されていればよい
  */
-export async function checkHitAntenna(antenna: Antenna, note: (Note | Packed<'Note'>), noteUser: { username: string; host: string | null; }, noteUserFollowers?: User['id'][], antennaUserFollowing?: User['id'][]): Promise<boolean> {
+export async function checkHitAntenna(antenna: Antenna, note: (Note | Packed<'Note'>), noteUser: { id: User['id']; username: string; host: string | null; }, noteUserFollowers?: User['id'][], antennaUserFollowing?: User['id'][]): Promise<boolean> {
 	if (note.visibility === 'specified') return false;
 
+	// アンテナ作成者がノート作成者にブロックされていたらスキップ
+	const blockings = await blockingCache.fetch(noteUser.id, () => Blockings.find({ blockerId: noteUser.id }).then(res => res.map(x => x.blockeeId)));
+	if (blockings.some(blocking => blocking === antenna.userId)) return false;
+
 	if (note.visibility === 'followers') {
 		if (noteUserFollowers && !noteUserFollowers.includes(antenna.userId)) return false;
 		if (antennaUserFollowing && !antennaUserFollowing.includes(note.userId)) return false;
diff --git a/packages/backend/src/services/note/create.ts b/packages/backend/src/services/note/create.ts
index 2e8b2ffa0b..b295534cd2 100644
--- a/packages/backend/src/services/note/create.ts
+++ b/packages/backend/src/services/note/create.ts
@@ -275,22 +275,13 @@ export default async (user: { id: User['id']; username: User['username']; host:
 	});
 
 	// Antenna
-	 // TODO: キャッシュしたい
-	Followings.createQueryBuilder('following')
-		.andWhere(`following.followeeId = :userId`, { userId: note.userId })
-		.getMany()
-		.then(async followings => {
-			const blockings = await Blockings.find({ blockerId: user.id });
-			const followers = followings.map(f => f.followerId);
-			for (const antenna of (await getAntennas())) {
-				if (blockings.some(blocking => blocking.blockeeId === antenna.userId)) continue; // この処理は checkHitAntenna 内でやるようにしてもいいかも
-				checkHitAntenna(antenna, note, user, followers).then(hit => {
-					if (hit) {
-						addNoteToAntenna(antenna, note, user);
-					}
-				});
+	for (const antenna of (await getAntennas())) {
+		checkHitAntenna(antenna, note, user).then(hit => {
+			if (hit) {
+				addNoteToAntenna(antenna, note, user);
 			}
 		});
+	}
 
 	// Channel
 	if (note.channelId) {
diff --git a/packages/client/src/pages/my-antennas/editor.vue b/packages/client/src/pages/my-antennas/editor.vue
index 77199388c5..8c1d6148fe 100644
--- a/packages/client/src/pages/my-antennas/editor.vue
+++ b/packages/client/src/pages/my-antennas/editor.vue
@@ -7,10 +7,10 @@
 		<MkSelect v-model="src" class="_formBlock">
 			<template #label>{{ $ts.antennaSource }}</template>
 			<option value="all">{{ $ts._antennaSources.all }}</option>
-			<option value="home">{{ $ts._antennaSources.homeTimeline }}</option>
+			<!--<option value="home">{{ $ts._antennaSources.homeTimeline }}</option>-->
 			<option value="users">{{ $ts._antennaSources.users }}</option>
-			<option value="list">{{ $ts._antennaSources.userList }}</option>
-			<option value="group">{{ $ts._antennaSources.userGroup }}</option>
+			<!--<option value="list">{{ $ts._antennaSources.userList }}</option>-->
+			<!--<option value="group">{{ $ts._antennaSources.userGroup }}</option>-->
 		</MkSelect>
 		<MkSelect v-if="src === 'list'" v-model="userListId" class="_formBlock">
 			<template #label>{{ $ts.userList }}</template>