From 26b560664f2a22f514f283bb47bb96a53e1b0bd4 Mon Sep 17 00:00:00 2001
From: mei23 <m@m544.net>
Date: Mon, 21 Jan 2019 04:54:43 +0900
Subject: [PATCH] Revert "Recv Update"

This reverts commit ffda39c0936d8e023f64603edabeb8e0eb9fc370.
---
 src/queue/processors/http/process-inbox.ts    | 19 ++++++-----
 src/remote/activitypub/kernel/index.ts        |  5 ---
 src/remote/activitypub/kernel/update/index.ts | 34 -------------------
 3 files changed, 10 insertions(+), 48 deletions(-)
 delete mode 100644 src/remote/activitypub/kernel/update/index.ts

diff --git a/src/queue/processors/http/process-inbox.ts b/src/queue/processors/http/process-inbox.ts
index e28f356922..1ab5f094ee 100644
--- a/src/queue/processors/http/process-inbox.ts
+++ b/src/queue/processors/http/process-inbox.ts
@@ -62,15 +62,16 @@ export default async (job: bq.Job, done: any): Promise<void> => {
 		}) as IRemoteUser;
 	}
 
-	// Update<Person> activityの場合は、ここで署名検証/更新処理まで実施して終了
-	if (activity.type === 'Update'
-		&& activity.object && activity.object.type === 'Person') {
-		if (user == null) {
-			console.warn('Update activity received, but user not registed.');
-		} else if (!httpSignature.verifySignature(signature, user.publicKey.publicKeyPem)) {
-			console.warn('Update activity received, but signature verification failed.');
-		} else {
-			updatePerson(activity.actor, null, activity.object);
+	// Update activityの場合は、ここで署名検証/更新処理まで実施して終了
+	if (activity.type === 'Update') {
+		if (activity.object && activity.object.type === 'Person') {
+			if (user == null) {
+				console.warn('Update activity received, but user not registed.');
+			} else if (!httpSignature.verifySignature(signature, user.publicKey.publicKeyPem)) {
+				console.warn('Update activity received, but signature verification failed.');
+			} else {
+				updatePerson(activity.actor, null, activity.object);
+			}
 		}
 		done();
 		return;
diff --git a/src/remote/activitypub/kernel/index.ts b/src/remote/activitypub/kernel/index.ts
index b7ac358cfc..61bb89f5e9 100644
--- a/src/remote/activitypub/kernel/index.ts
+++ b/src/remote/activitypub/kernel/index.ts
@@ -11,7 +11,6 @@ import reject from './reject';
 import add from './add';
 import remove from './remove';
 import block from './block';
-import update from './update';
 
 const self = async (actor: IRemoteUser, activity: Object): Promise<void> => {
 	switch (activity.type) {
@@ -59,10 +58,6 @@ const self = async (actor: IRemoteUser, activity: Object): Promise<void> => {
 		await block(actor, activity);
 		break;
 
-	case 'Update':
-		await update(actor, activity);
-		break;
-
 	case 'Collection':
 	case 'OrderedCollection':
 		// TODO
diff --git a/src/remote/activitypub/kernel/update/index.ts b/src/remote/activitypub/kernel/update/index.ts
deleted file mode 100644
index b3c68ab6da..0000000000
--- a/src/remote/activitypub/kernel/update/index.ts
+++ /dev/null
@@ -1,34 +0,0 @@
-import { IRemoteUser } from '../../../../models/user';
-import * as debug from 'debug';
-import { IUpdate } from '../../type';
-import { extractPollFromQuestion } from '../../models/question';
-import Note from '../../../../models/note';
-
-const log = debug('misskey:activitypub');
-
-export default async (actor: IRemoteUser, activity: IUpdate): Promise<void> => {
-	const id = typeof activity.object == 'string' ? activity.object : activity.object.id;
-	const type = (activity.object as any).type;
-
-	log(`Update<${type}>: ${id}`);
-
-	switch (type) {
-		case 'Question':
-			const note = await Note.findOne({
-				questionUri: id
-			});
-
-			if (note === null) throw 'note not found';
-
-			const poll = await extractPollFromQuestion(id);
-
-			await Note.update({
-				_id: note._id
-			}, {
-				$set: {
-					poll
-				}
-			});
-			break;
-	}
-};