summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsyuilo <Syuilotan@yahoo.co.jp>2022-04-08 19:01:38 +0900
committersyuilo <Syuilotan@yahoo.co.jp>2022-04-08 19:01:38 +0900
commit9f7cdb4bc734e02be0acc03bfae5abe94ac7466c (patch)
tree75aecef60cdaba29ebb9db0a866b4f6423d99b3b
parentfix(api): parameter validation of users/show was wrong (diff)
downloadsharkey-9f7cdb4bc734e02be0acc03bfae5abe94ac7466c.tar.gz
sharkey-9f7cdb4bc734e02be0acc03bfae5abe94ac7466c.tar.bz2
sharkey-9f7cdb4bc734e02be0acc03bfae5abe94ac7466c.zip
refactor
-rw-r--r--packages/backend/src/server/api/endpoints/notes/create.ts16
1 files 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;