diff options
| author | tamaina <tamaina@hotmail.co.jp> | 2022-05-30 05:53:40 +0000 |
|---|---|---|
| committer | tamaina <tamaina@hotmail.co.jp> | 2022-05-30 05:53:40 +0000 |
| commit | 465531d56c5475f7d0be327950c33f715477c441 (patch) | |
| tree | 223baf3bb26d44fadb105b851c2695f7644afd27 /packages/backend/src/server/api/endpoints/notes/create.ts | |
| parent | chore: remove packages/sw/webpack.config.js (diff) | |
| parent | fix(client): import shared ESLint config in client package (#8761) (diff) | |
| download | misskey-465531d56c5475f7d0be327950c33f715477c441.tar.gz misskey-465531d56c5475f7d0be327950c33f715477c441.tar.bz2 misskey-465531d56c5475f7d0be327950c33f715477c441.zip | |
Merge branch 'develop' of https://github.com/misskey-dev/misskey into develop
Diffstat (limited to 'packages/backend/src/server/api/endpoints/notes/create.ts')
| -rw-r--r-- | packages/backend/src/server/api/endpoints/notes/create.ts | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/packages/backend/src/server/api/endpoints/notes/create.ts b/packages/backend/src/server/api/endpoints/notes/create.ts index 40a3ba73ca..a133294169 100644 --- a/packages/backend/src/server/api/endpoints/notes/create.ts +++ b/packages/backend/src/server/api/endpoints/notes/create.ts @@ -134,7 +134,7 @@ export const paramDef = { { // (re)note with text, files and poll are optional properties: { - text: { type: 'string', maxLength: MAX_NOTE_TEXT_LENGTH, nullable: false }, + text: { type: 'string', minLength: 1, maxLength: MAX_NOTE_TEXT_LENGTH, nullable: false }, }, required: ['text'], }, @@ -172,10 +172,14 @@ export default define(meta, paramDef, async (ps, user) => { let files: DriveFile[] = []; const fileIds = ps.fileIds != null ? ps.fileIds : ps.mediaIds != null ? ps.mediaIds : null; if (fileIds != null) { - files = await DriveFiles.findBy({ - userId: user.id, - id: In(fileIds), - }); + files = await DriveFiles.createQueryBuilder('file') + .where('file.userId = :userId AND file.id IN (:...fileIds)', { + userId: user.id, + fileIds, + }) + .orderBy('array_position(ARRAY[:...fileIds], "id"::text)') + .setParameters({ fileIds }) + .getMany(); } let renote: Note | null = null; |