summaryrefslogtreecommitdiff
path: root/src/remote
diff options
context:
space:
mode:
Diffstat (limited to 'src/remote')
-rw-r--r--src/remote/activitypub/act/create/image.ts2
-rw-r--r--src/remote/activitypub/act/create/note.ts10
2 files changed, 5 insertions, 7 deletions
diff --git a/src/remote/activitypub/act/create/image.ts b/src/remote/activitypub/act/create/image.ts
index c87423c5fd..f1462f4ee4 100644
--- a/src/remote/activitypub/act/create/image.ts
+++ b/src/remote/activitypub/act/create/image.ts
@@ -12,7 +12,7 @@ export default async function(actor: IRemoteUser, image): Promise<IDriveFile> {
throw new Error('invalid image');
}
- log(`Creating the Image: ${image.id}`);
+ log(`Creating the Image: ${image.url}`);
return await uploadFromUrl(image.url, actor);
}
diff --git a/src/remote/activitypub/act/create/note.ts b/src/remote/activitypub/act/create/note.ts
index 572a293ab4..599bc10aa8 100644
--- a/src/remote/activitypub/act/create/note.ts
+++ b/src/remote/activitypub/act/create/note.ts
@@ -37,15 +37,13 @@ export default async function createNote(resolver: Resolver, actor: IRemoteUser,
//#endergion
//#region 添付メディア
- const media = [];
+ let media = [];
if ('attachment' in note && note.attachment != null) {
// TODO: attachmentは必ずしもImageではない
// TODO: attachmentは必ずしも配列ではない
- // TODO: ループの中でawaitはすべきでない
- note.attachment.forEach(async media => {
- const created = await createImage(note.actor, media);
- media.push(created);
- });
+ media = await Promise.all(note.attachment.map(x => {
+ return createImage(actor, x);
+ }));
}
//#endregion