2 files changed, 32 insertions, 3 deletions

diff --git a/src/remote/activitypub/db-resolver.ts b/src/remote/activitypub/db-resolver.ts
index 6f1cb1e110..cad2212b70 100644
--- a/src/remote/activitypub/db-resolver.ts
+++ b/src/remote/activitypub/db-resolver.ts
@@ -2,7 +2,8 @@ import config from '../../config';
 import { Note } from '../../models/entities/note';
 import { User, IRemoteUser } from '../../models/entities/user';
 import { UserPublickey } from '../../models/entities/user-publickey';
-import { Notes, Users, UserPublickeys } from '../../models';
+import { MessagingMessage } from '../../models/entities/messaging-message';
+import { Notes, Users, UserPublickeys, MessagingMessages } from '../../models';
 import { IObject, getApId } from './type';
 import { resolvePerson } from './models/person';
 import { ensure } from '../../prelude/ensure';
@@ -33,6 +34,24 @@ export default class DbResolver {
 		return null;
 	}
 
+	public async getMessageFromApId(value: string | IObject): Promise<MessagingMessage | null> {
+		const parsed = this.parseUri(value);
+
+		if (parsed.id) {
+			return (await MessagingMessages.findOne({
+				id: parsed.id
+			})) || null;
+		}
+
+		if (parsed.uri) {
+			return (await MessagingMessages.findOne({
+				uri: parsed.uri
+			})) || null;
+		}
+
+		return null;
+	}
+
 	/**
 	 * AP Person => Misskey User in DB
 	 */
diff --git a/src/remote/activitypub/kernel/delete/note.ts b/src/remote/activitypub/kernel/delete/note.ts
index 9d7574c29b..8fa2285dba 100644
--- a/src/remote/activitypub/kernel/delete/note.ts
+++ b/src/remote/activitypub/kernel/delete/note.ts
@@ -3,6 +3,7 @@ import deleteNode from '../../../../services/note/delete';
 import { apLogger } from '../../logger';
 import DbResolver from '../../db-resolver';
 import { getApLock } from '../../../../misc/app-lock';
+import { deleteMessage } from '../../../../services/messages/delete';
 
 const logger = apLogger;
 
@@ -16,7 +17,16 @@ export default async function(actor: IRemoteUser, uri: string): Promise<string>
 		const note = await dbResolver.getNoteFromApId(uri);
 
 		if (note == null) {
-			return 'note not found';
+			const message = await dbResolver.getMessageFromApId(uri);
+			if (message == null) return 'message not found';
+
+			if (message.userId !== actor.id) {
+				return '投稿を削除しようとしているユーザーは投稿の作成者ではありません';
+			}
+
+			await deleteMessage(message);
+
+			return 'ok: message deleted';
 		}
 
 		if (note.userId !== actor.id) {
@@ -24,7 +34,7 @@ export default async function(actor: IRemoteUser, uri: string): Promise<string>
 		}
 
 		await deleteNode(actor, note);
-		return 'ok: deleted';
+		return 'ok: note deleted';
 	} finally {
 		unlock();
 	}