fix: keep file order (#8659)

This commit is contained in:
Johann150 2022-05-14 08:09:10 +02:00 committed by GitHub
parent 98e42ec6ff
commit 4b872856c2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -172,10 +172,14 @@ export default define(meta, paramDef, async (ps, user) => {
let files: DriveFile[] = []; let files: DriveFile[] = [];
const fileIds = ps.fileIds != null ? ps.fileIds : ps.mediaIds != null ? ps.mediaIds : null; const fileIds = ps.fileIds != null ? ps.fileIds : ps.mediaIds != null ? ps.mediaIds : null;
if (fileIds != null) { if (fileIds != null) {
files = await DriveFiles.findBy({ files = await DriveFiles.createQueryBuilder('file')
.where('file.userId = :userId AND file.id IN (:...fileIds)', {
userId: user.id, userId: user.id,
id: In(fileIds), fileIds,
}); })
.orderBy('array_position(ARRAY[:...fileIds], "id")')
.setParameters({ fileIds })
.getMany();
} }
let renote: Note | null = null; let renote: Note | null = null;