Preserve the attached order in AP
This commit is contained in:
parent
1e58b3daff
commit
8ac09cc81b
|
@ -13,10 +13,6 @@ import { Poll } from '../../../models/entities/poll';
|
||||||
import { ensure } from '../../../prelude/ensure';
|
import { ensure } from '../../../prelude/ensure';
|
||||||
|
|
||||||
export default async function renderNote(note: Note, dive = true): Promise<any> {
|
export default async function renderNote(note: Note, dive = true): Promise<any> {
|
||||||
const promisedFiles: Promise<DriveFile[]> = note.fileIds.length > 0
|
|
||||||
? DriveFiles.find({ id: In(note.fileIds) })
|
|
||||||
: Promise.resolve([]);
|
|
||||||
|
|
||||||
let inReplyTo;
|
let inReplyTo;
|
||||||
let inReplyToNote: Note | undefined;
|
let inReplyToNote: Note | undefined;
|
||||||
|
|
||||||
|
@ -81,7 +77,7 @@ export default async function renderNote(note: Note, dive = true): Promise<any>
|
||||||
const hashtagTags = (note.tags || []).map(tag => renderHashtag(tag));
|
const hashtagTags = (note.tags || []).map(tag => renderHashtag(tag));
|
||||||
const mentionTags = mentionedUsers.map(u => renderMention(u));
|
const mentionTags = mentionedUsers.map(u => renderMention(u));
|
||||||
|
|
||||||
const files = await promisedFiles;
|
const files = (await Promise.all((note.fileIds || []).map(x => DriveFiles.findOne(x)))).filter(x => x != null) as DriveFile[];
|
||||||
|
|
||||||
let text = note.text;
|
let text = note.text;
|
||||||
let poll: Poll | undefined;
|
let poll: Poll | undefined;
|
||||||
|
|
Loading…
Reference in New Issue