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

Fix bug

This commit is contained in:
syuilo 2018-04-08 07:11:29 +09:00
parent 6e34e77372
commit 04cdb04ee2
3 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/remote/activitypub/act/create/image.ts
View File

@ -12,7 +12,7 @@ export default async function(actor: IRemoteUser, image): Promise<IDriveFile> {
throw new Error('invalid image'); throw new Error('invalid image');
} }
log(`Creating the Image: ${image.id}`); log(`Creating the Image: ${image.url}`);
return await uploadFromUrl(image.url, actor); return await uploadFromUrl(image.url, actor);
} }

10
src/remote/activitypub/act/create/note.ts
View File

@ -37,15 +37,13 @@ export default async function createNote(resolver: Resolver, actor: IRemoteUser,
//#endergion //#endergion
//#region 添付メディア //#region 添付メディア
const media = []; let media = [];
if ('attachment' in note && note.attachment != null) { if ('attachment' in note && note.attachment != null) {
// TODO: attachmentは必ずしもImageではない // TODO: attachmentは必ずしもImageではない
// TODO: attachmentは必ずしも配列ではない // TODO: attachmentは必ずしも配列ではない
// TODO: ループの中でawaitはすべきでない media = await Promise.all(note.attachment.map(x => {
note.attachment.forEach(async media => { return createImage(actor, x);
const created = await createImage(note.actor, media); }));
media.push(created);
});
} }
//#endregion //#endregion

4
src/server/api/endpoints/drive/files/upload_from_url.ts
View File

@ -7,10 +7,6 @@ import uploadFromUrl from '../../../../../services/drive/upload-from-url';
/** /**
* Create a file from a URL * Create a file from a URL
*
* @param {any} params
* @param {any} user
* @return {Promise<any>}
*/ */
module.exports = async (params, user): Promise<any> => { module.exports = async (params, user): Promise<any> => {
// Get 'url' parameter // Get 'url' parameter