summaryrefslogtreecommitdiff
path: root/src/remote/activitypub/kernel
diff options
context:
space:
mode:
authorMeiMei <30769358+mei23@users.noreply.github.com>2019-03-10 22:27:25 +0900
committersyuilo <Syuilotan@yahoo.co.jp>2019-03-10 22:27:25 +0900
commitc6cdfa2f5a0fe3b83acf25d5e27f5b6b80a3540c (patch)
treeb5589f3a0c362ae4315a892d72e467adc5376ef1 /src/remote/activitypub/kernel
parentRemove debug code (diff)
downloadsharkey-c6cdfa2f5a0fe3b83acf25d5e27f5b6b80a3540c.tar.gz
sharkey-c6cdfa2f5a0fe3b83acf25d5e27f5b6b80a3540c.tar.bz2
sharkey-c6cdfa2f5a0fe3b83acf25d5e27f5b6b80a3540c.zip
Ignore 4xx references in AP (#4463)
* Ignore 4xx references * remove unnecessary comment
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}`);