summaryrefslogtreecommitdiff
path: root/src/remote/activitypub/models
diff options
context:
space:
mode:
authorMeiMei <30769358+mei23@users.noreply.github.com>2018-10-21 18:35:36 +0900
committersyuilo <Syuilotan@yahoo.co.jp>2018-10-21 18:35:36 +0900
commit72754ede4ed05c71c2777ac5fc021f3b1485be7f (patch)
tree37ab9800276137c3daeaf2b1f071b0ced560ef6e /src/remote/activitypub/models
parentImprove readability (diff)
downloadmisskey-72754ede4ed05c71c2777ac5fc021f3b1485be7f.tar.gz
misskey-72754ede4ed05c71c2777ac5fc021f3b1485be7f.tar.bz2
misskey-72754ede4ed05c71c2777ac5fc021f3b1485be7f.zip
Fix several file processings (#2968)
* Ignore image error in person * Fix hang while processing empty file
Diffstat (limited to 'src/remote/activitypub/models')
-rw-r--r--src/remote/activitypub/models/person.ts4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/remote/activitypub/models/person.ts b/src/remote/activitypub/models/person.ts
index c359693c87..bf1df87918 100644
--- a/src/remote/activitypub/models/person.ts
+++ b/src/remote/activitypub/models/person.ts
@@ -190,7 +190,7 @@ export async function createPerson(uri: string, resolver?: Resolver): Promise<IU
].map(img =>
img == null
? Promise.resolve(null)
- : resolveImage(user, img)
+ : resolveImage(user, img).catch(() => null)
)));
const avatarId = avatar ? avatar._id : null;
@@ -276,7 +276,7 @@ export async function updatePerson(uri: string, resolver?: Resolver, hint?: obje
].map(img =>
img == null
? Promise.resolve(null)
- : resolveImage(exist, img)
+ : resolveImage(exist, img).catch(() => null)
)));
// Update user