usbharu
/
misskey
mirror of https://github.com/misskey-dev/misskey.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

再帰的にNoteをレンダリングするように

This commit is contained in:
syuilo 2018-04-10 04:38:02 +09:00
parent 2ffd1ea433
commit cb85d7cb14
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5,7 +5,7 @@ import DriveFile from '../../../models/drive-file';
import Note, { INote } from '../../../models/note'; import Note, { INote } from '../../../models/note';
import User from '../../../models/user'; import User from '../../../models/user';
export default async (note: INote) => { export default async function renderNote(note: INote, dive = true) {
const promisedFiles = note.mediaIds const promisedFiles = note.mediaIds
? DriveFile.find({ _id: { $in: note.mediaIds } }) ? DriveFile.find({ _id: { $in: note.mediaIds } })
: Promise.resolve([]); : Promise.resolve([]);
@ -23,7 +23,15 @@ export default async (note: INote) => {
}); });
if (inReplyToUser !== null) { if (inReplyToUser !== null) {
inReplyTo = inReplyToNote.uri || `${config.url}/notes/${inReplyToNote._id}`; if (inReplyToNote.uri) {
inReplyTo = inReplyToNote.uri;
} else {
if (dive) {
inReplyTo = await renderNote(inReplyToNote, false);
} else {
inReplyTo = `${config.url}/notes/${inReplyToNote._id}`;
}
}
} }
} }
} else { } else {
@ -48,4 +56,4 @@ export default async (note: INote) => {
attachment: (await promisedFiles).map(renderDocument), attachment: (await promisedFiles).map(renderDocument),
tag: (note.tags || []).map(renderHashtag) tag: (note.tags || []).map(renderHashtag)
}; };
}; }