Skip to content
Snippets Groups Projects
Commit 93a889df authored by MeiMei's avatar MeiMei Committed by syuilo
Browse files

Preserve the attached order in AP (#5561)

* Preserve the attached order in AP

* Revert "Preserve the attached order in AP"

This reverts commit 8ac09cc81b1c216edccd2eba4bbdf0a194320883.

* use IN
parent 0c1d3e18
No related branches found
Tags 11.0.0-beta.3
No related merge requests found
......@@ -13,9 +13,11 @@ import { Poll } from '../../../models/entities/poll';
import { ensure } from '../../../prelude/ensure';
export default async function renderNote(note: Note, dive = true, isTalk = false): Promise<any> {
const promisedFiles: Promise<DriveFile[]> = note.fileIds.length > 0
? DriveFiles.find({ id: In(note.fileIds) })
: Promise.resolve([]);
const getPromisedFiles = async (ids: string[]) => {
if (!ids || ids.length === 0) return [];
const items = await DriveFiles.find({ id: In(ids) });
return ids.map(id => items.find(item => item.id === id)).filter(item => item != null) as DriveFile[];
};
let inReplyTo;
let inReplyToNote: Note | undefined;
......@@ -81,7 +83,7 @@ export default async function renderNote(note: Note, dive = true, isTalk = false
const hashtagTags = (note.tags || []).map(tag => renderHashtag(tag));
const mentionTags = mentionedUsers.map(u => renderMention(u));
const files = await promisedFiles;
const files = await getPromisedFiles(note.fileIds);
let text = note.text;
let poll: Poll | undefined;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment