natty
/
calckey
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Preserve the attached order in AP (#5561) 

* Preserve the attached order in AP

* Revert "Preserve the attached order in AP"

This reverts commit 8ac09cc81b.

* use IN
This commit is contained in:
MeiMei 2019-11-01 05:46:20 +09:00 committed by syuilo
parent 0c1d3e186b
commit 93a889df82
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/remote/activitypub/renderer/note.ts
View File

@ -13,9 +13,11 @@ 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, isTalk = false): Promise<any> { export default async function renderNote(note: Note, dive = true, isTalk = false): Promise<any> {
const promisedFiles: Promise<DriveFile[]> = note.fileIds.length > 0 const getPromisedFiles = async (ids: string[]) => {
? DriveFiles.find({ id: In(note.fileIds) }) if (!ids || ids.length === 0) return [];
: Promise.resolve([]); 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 inReplyTo;
let inReplyToNote: Note | undefined; 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 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 getPromisedFiles(note.fileIds);
let text = note.text; let text = note.text;
let poll: Poll | undefined; let poll: Poll | undefined;