From 9f7cdb4bc734e02be0acc03bfae5abe94ac7466c Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Fri, 8 Apr 2022 19:01:38 +0900
Subject: [PATCH] refactor

---
 .../src/server/api/endpoints/notes/create.ts     | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/packages/backend/src/server/api/endpoints/notes/create.ts b/packages/backend/src/server/api/endpoints/notes/create.ts
index 24d0c8134f..9de05918c0 100644
--- a/packages/backend/src/server/api/endpoints/notes/create.ts
+++ b/packages/backend/src/server/api/endpoints/notes/create.ts
@@ -9,6 +9,7 @@ import { Note } from '@/models/entities/note.js';
 import { noteVisibilities } from '../../../../types.js';
 import { Channel } from '@/models/entities/channel.js';
 import { MAX_NOTE_TEXT_LENGTH } from '@/const.js';
+import { In } from 'typeorm';
 
 export const meta = {
 	tags: ['notes'],
@@ -163,19 +164,18 @@ export const paramDef = {
 export default define(meta, paramDef, async (ps, user) => {
 	let visibleUsers: User[] = [];
 	if (ps.visibleUserIds) {
-		visibleUsers = (await Promise.all(ps.visibleUserIds.map(id => Users.findOneBy({ id }))))
-			.filter(x => x != null) as User[];
+		visibleUsers = await Users.findBy({
+			id: In(ps.visibleUserIds),
+		});
 	}
 
 	let files: DriveFile[] = [];
 	const fileIds = ps.fileIds != null ? ps.fileIds : ps.mediaIds != null ? ps.mediaIds : null;
 	if (fileIds != null) {
-		files = (await Promise.all(fileIds.map(fileId =>
-			DriveFiles.findOneBy({
-				id: fileId,
-				userId: user.id,
-			})
-		))).filter(file => file != null) as DriveFile[];
+		files = await DriveFiles.findBy({
+			userId: user.id,
+			id: In(fileIds),
+		});
 	}
 
 	let renote: Note | null;