From e14509574d534a74fcebf9515146b028bbdec153 Mon Sep 17 00:00:00 2001
From: MeiMei <30769358+mei23@users.noreply.github.com>
Date: Fri, 27 Sep 2019 04:58:28 +0900
Subject: AP featured collectionの修正 / Collection Activityの対応 /
 typeの修正など (#5460)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* resolver type / fix updateFeatured

* type ApObject

* fix strange type

* AP Activity

* Collection Activityが失敗したらとりあえず無視
---
 src/remote/activitypub/kernel/block/index.ts | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'src/remote/activitypub/kernel/block')

diff --git a/src/remote/activitypub/kernel/block/index.ts b/src/remote/activitypub/kernel/block/index.ts
index 5c247326cb..24bc9d524f 100644
--- a/src/remote/activitypub/kernel/block/index.ts
+++ b/src/remote/activitypub/kernel/block/index.ts
@@ -1,5 +1,5 @@
 import config from '../../../../config';
-import { IBlock } from '../../type';
+import { IBlock, getApId } from '../../type';
 import block from '../../../../services/blocking/create';
 import { apLogger } from '../../logger';
 import { Users } from '../../../../models';
@@ -8,10 +8,9 @@ import { IRemoteUser } from '../../../../models/entities/user';
 const logger = apLogger;
 
 export default async (actor: IRemoteUser, activity: IBlock): Promise<void> => {
-	const id = typeof activity.object == 'string' ? activity.object : activity.object.id;
-	if (id == null) throw new Error('missing id');
+	const id = getApId(activity.object);
 
-	const uri = activity.id || activity;
+	const uri = getApId(activity);
 
 	logger.info(`Block: ${uri}`);
 
-- 
cgit v1.2.3-freya