Fix: AP object / actor type (#5086)

* attributedToがArrayの場合などに対応

* attachment以外で来るDocument系のObjectに対応

* Renote, Reply 対応

* 表示をいい感じに

* fix type

* revert as const

* Fix Note / Question type

* attributedToのtypeで複合配列を想定する

2 files changed, 4 insertions, 21 deletions

diff --git a/src/remote/activitypub/kernel/create/image.ts b/src/remote/activitypub/kernel/create/image.ts
deleted file mode 100644
index 7720e8f1bd..0000000000
--- a/src/remote/activitypub/kernel/create/image.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import { IRemoteUser } from '../../../../models/entities/user';
-import { createImage } from '../../models/image';
-
-export default async function(actor: IRemoteUser, image: any): Promise<void> {
-	await createImage(image.url, actor);
-}
diff --git a/src/remote/activitypub/kernel/create/index.ts b/src/remote/activitypub/kernel/create/index.ts
index 0326b591f8..a6fa2336f3 100644
--- a/src/remote/activitypub/kernel/create/index.ts
+++ b/src/remote/activitypub/kernel/create/index.ts
@@ -1,14 +1,13 @@
 import Resolver from '../../resolver';
 import { IRemoteUser } from '../../../../models/entities/user';
-import createImage from './image';
 import createNote from './note';
-import { ICreate } from '../../type';
+import { ICreate, getApId, validPost } from '../../type';
 import { apLogger } from '../../logger';
 
 const logger = apLogger;
 
 export default async (actor: IRemoteUser, activity: ICreate): Promise<void> => {
-	const uri = activity.id || activity;
+	const uri = getApId(activity);
 
 	logger.info(`Create: ${uri}`);
 
@@ -23,19 +22,9 @@ export default async (actor: IRemoteUser, activity: ICreate): Promise<void> => {
 		throw e;
 	}
 
-	switch (object.type) {
-	case 'Image':
-		createImage(actor, object);
-		break;
-
-	case 'Note':
-	case 'Question':
-	case 'Article':
+	if (validPost.includes(object.type)) {
 		createNote(resolver, actor, object);
-		break;
-
-	default:
+	} else {
 		logger.warn(`Unknown type: ${object.type}`);
-		break;
 	}
 };