1 files changed, 18 insertions, 12 deletions
diff --git a/src/remote/activitypub/kernel/update/index.ts b/src/remote/activitypub/kernel/update/index.ts
index b8dff73395..ea7e6a063e 100644
--- a/src/remote/activitypub/kernel/update/index.ts
+++ b/src/remote/activitypub/kernel/update/index.ts
@@ -1,28 +1,34 @@
 import { IRemoteUser } from '../../../../models/entities/user';
-import { IUpdate, IObject } from '../../type';
+import { IUpdate, validActor } from '../../type';
 import { apLogger } from '../../logger';
 import { updateQuestion } from '../../models/question';
+import Resolver from '../../resolver';
+import { updatePerson } from '../../models/person';
 
 /**
  * Updateアクティビティを捌きます
  */
-export default async (actor: IRemoteUser, activity: IUpdate): Promise<void> => {
+export default async (actor: IRemoteUser, activity: IUpdate): Promise<string> => {
 	if ('actor' in activity && actor.uri !== activity.actor) {
-		throw new Error('invalid actor');
+		return `skip: invalid actor`;
 	}
 
 	apLogger.debug('Update');
 
-	const object = activity.object as IObject;
+	const resolver = new Resolver();
 
-	switch (object.type) {
-		case 'Question':
-			apLogger.debug('Question');
-			await updateQuestion(object).catch(e => console.log(e));
-			break;
+	const object = await resolver.resolve(activity.object).catch(e => {
+		apLogger.error(`Resolution failed: ${e}`);
+		throw e;
+	});
 
-		default:
-			apLogger.warn(`Unknown type: ${object.type}`);
-			break;
+	if (validActor.includes(object.type)) {
+		await updatePerson(actor.uri!, resolver, object);
+		return `ok: Person updated`;
+	} else if (object.type === 'Question') {
+		await updateQuestion(object).catch(e => console.log(e));
+		return `ok: Question updated`;
+	} else {
+		return `skip: Unknown type: ${object.type}`;
 	}
 };