From 3b9ba9314ad657bf3955fca721c5436f00ce6bd0 Mon Sep 17 00:00:00 2001
From: penginn-net <121443048+penginn-net@users.noreply.github.com>
Date: Wed, 25 Sep 2024 02:56:17 +0900
Subject: [PATCH] fix

---
 .../backend/src/core/AdvancedSearchService.ts |  9 ++++++---
 .../server/api/endpoints/admin/full-index.ts  | 20 +++++++++++--------
 2 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/packages/backend/src/core/AdvancedSearchService.ts b/packages/backend/src/core/AdvancedSearchService.ts
index 82ebe37c63..c6b428c517 100644
--- a/packages/backend/src/core/AdvancedSearchService.ts
+++ b/packages/backend/src/core/AdvancedSearchService.ts
@@ -919,11 +919,14 @@ export class AdvancedSearchService {
 		}
 
 		const user = await this.cacheService.findUserById(Note._source.userId);
- 		if (!user.isIndexable) { //検索許可されていないが、
-			if (!this.opensearch || !meUserId) {
+		if (!user) return null;
+ 		if (user.isIndexable === false) { //検索許可されていないが、
+			if (meUserId) {
+				return null;
+			}
+			if (!this.opensearch) {
 				return null;
 			}
-
 			const Option = {
 				index: this.reactionIndex,
 				body: {
diff --git a/packages/backend/src/server/api/endpoints/admin/full-index.ts b/packages/backend/src/server/api/endpoints/admin/full-index.ts
index af726dd79a..049f9e2a54 100644
--- a/packages/backend/src/server/api/endpoints/admin/full-index.ts
+++ b/packages/backend/src/server/api/endpoints/admin/full-index.ts
@@ -33,14 +33,18 @@ export default class extends Endpoint<typeof meta, typeof paramDef> {
 		private advancedSearchService: AdvancedSearchService,
 	) {
 		super(meta, paramDef, async (ps, me) => {
-			if (ps.index === 'notes') {
-				this.advancedSearchService.fullIndexNote();
-			} else if (ps.index === 'reaction') {
-				this.advancedSearchService.fullIndexReaction();
-			// eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
-			} else if (ps.index === 'pollVote') {
-				this.advancedSearchService.fullIndexPollVote();
+			switch (ps.index) {
+				case 'notes':
+					this.advancedSearchService.fullIndexNote();
+					break;
+				case 'reaction':
+					this.advancedSearchService.fullIndexReaction();
+					break;
+				case 'pollVote':
+					this.advancedSearchService.fullIndexPollVote();
+					break;
 			}
-		});
+		},
+		);
 	}
 }