From 0141affe056e2b7103f67088f6f5bdb276c8d5d3 Mon Sep 17 00:00:00 2001
From: MeiMei <30769358+mei23@users.noreply.github.com>
Date: Fri, 28 Jun 2019 18:54:10 +0900
Subject: Fix: AP object / actor type (#5086)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

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

* Renote, Reply 対応

* 表示をいい感じに

* fix type

* revert as const

* Fix Note / Question type

* attributedToのtypeで複合配列を想定する
---
 src/remote/activitypub/kernel/delete/index.ts | 26 ++++++--------------------
 1 file changed, 6 insertions(+), 20 deletions(-)

(limited to 'src/remote/activitypub/kernel/delete/index.ts')

diff --git a/src/remote/activitypub/kernel/delete/index.ts b/src/remote/activitypub/kernel/delete/index.ts
index 199a6a6187..be7779e026 100644
--- a/src/remote/activitypub/kernel/delete/index.ts
+++ b/src/remote/activitypub/kernel/delete/index.ts
@@ -1,9 +1,8 @@
 import Resolver from '../../resolver';
 import deleteNote from './note';
 import { IRemoteUser } from '../../../../models/entities/user';
-import { IDelete } from '../../type';
+import { IDelete, getApId, validPost } from '../../type';
 import { apLogger } from '../../logger';
-import { Notes } from '../../../../models';
 
 /**
  * 削除アクティビティを捌きます
@@ -17,24 +16,11 @@ export default async (actor: IRemoteUser, activity: IDelete): Promise<void> => {
 
 	const object = await resolver.resolve(activity.object);
 
-	const uri = (object as any).id;
+	const uri = getApId(object);
 
-	switch (object.type) {
-		case 'Note':
-		case 'Question':
-		case 'Article':
-			deleteNote(actor, uri);
-			break;
-
-		case 'Tombstone':
-			const note = await Notes.findOne({ uri });
-			if (note != null) {
-				deleteNote(actor, uri);
-			}
-			break;
-
-		default:
-			apLogger.warn(`Unknown type: ${object.type}`);
-			break;
+	if (validPost.includes(object.type) || object.type === 'Tombstone') {
+		deleteNote(actor, uri);
+	} else {
+		apLogger.warn(`Unknown type: ${object.type}`);
 	}
 };
-- 
cgit v1.2.3-freya