summaryrefslogtreecommitdiff
path: root/src/remote/activitypub/kernel
diff options
context:
space:
mode:
authorsyuilo <syuilotan@yahoo.co.jp>2019-03-11 09:59:14 +0900
committersyuilo <syuilotan@yahoo.co.jp>2019-03-11 09:59:14 +0900
commite3e08843f16a9f0f2ff04c21072a253c413097cd (patch)
tree27e977557e3753e416225ea4efcbd7d09518d824 /src/remote/activitypub/kernel
parentリストのエクスポートをできるように (diff)
parentUpdate README.md [AUTOGEN] (#4467) (diff)
downloadmisskey-e3e08843f16a9f0f2ff04c21072a253c413097cd.tar.gz
misskey-e3e08843f16a9f0f2ff04c21072a253c413097cd.tar.bz2
misskey-e3e08843f16a9f0f2ff04c21072a253c413097cd.zip
Merge branch 'develop' of https://github.com/syuilo/misskey into develop
Diffstat (limited to 'src/remote/activitypub/kernel')
-rw-r--r--src/remote/activitypub/kernel/announce/note.ts14
1 files changed, 13 insertions, 1 deletions
diff --git a/src/remote/activitypub/kernel/announce/note.ts b/src/remote/activitypub/kernel/announce/note.ts
index 128ca6da81..8d090902c0 100644
--- a/src/remote/activitypub/kernel/announce/note.ts
+++ b/src/remote/activitypub/kernel/announce/note.ts
@@ -29,7 +29,19 @@ export default async function(resolver: Resolver, actor: IRemoteUser, activity:
return;
}
- const renote = await resolveNote(note);
+ // Announce対象をresolve
+ let renote;
+ try {
+ renote = await resolveNote(note);
+ } catch (e) {
+ // 対象が4xxならスキップ
+ if (e.statusCode >= 400 && e.statusCode < 500) {
+ logger.warn(`Ignored announce target ${note.inReplyTo} - ${e.statusCode}`);
+ return;
+ }
+ logger.warn(`Error in announce target ${note.inReplyTo} - ${e.statusCode || e}`);
+ throw e;
+ }
logger.info(`Creating the (Re)Note: ${uri}`);