summaryrefslogtreecommitdiff
path: root/packages/backend/src/server/api/endpoints/notes
diff options
context:
space:
mode:
authorJohann150 <johann.galle@protonmail.com>2022-05-14 08:09:10 +0200
committerGitHub <noreply@github.com>2022-05-14 15:09:10 +0900
commit4b872856c2c79ea4e604af481cd2c78487993d88 (patch)
tree0f27a4d785722dfeda0b8fa68e88a12d48a3705e /packages/backend/src/server/api/endpoints/notes
parentenhance: Display TOTP Register URL (diff)
downloadsharkey-4b872856c2c79ea4e604af481cd2c78487993d88.tar.gz
sharkey-4b872856c2c79ea4e604af481cd2c78487993d88.tar.bz2
sharkey-4b872856c2c79ea4e604af481cd2c78487993d88.zip
fix: keep file order (#8659)
Diffstat (limited to 'packages/backend/src/server/api/endpoints/notes')
-rw-r--r--packages/backend/src/server/api/endpoints/notes/create.ts12
1 files changed, 8 insertions, 4 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..ff62841a0c 100644
--- a/packages/backend/src/server/api/endpoints/notes/create.ts
+++ b/packages/backend/src/server/api/endpoints/notes/create.ts
@@ -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")')
+ .setParameters({ fileIds })
+ .getMany();
}
let renote: Note | null = null;