Fix #3273

mei23 · Dec 5, 2021 · 0de9c2f · 0de9c2f
1 parent c010637
commit 0de9c2f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/src/queue/processors/inbox.ts b/src/queue/processors/inbox.ts
@@ -9,7 +9,7 @@ import Logger from '../../services/logger';
 import { registerOrFetchInstanceDoc } from '../../services/register-or-fetch-instance-doc';
 import Instance from '../../models/instance';
 import instanceChart from '../../services/chart/instance';
-import { getApId } from '../../remote/activitypub/type';
+import { getApId, isDelete, isUndo } from '../../remote/activitypub/type';
 import { UpdateInstanceinfo } from '../../services/update-instanceinfo';
 import { isBlockedHost } from '../../services/instance-moderation';
 import { InboxJobData } from '../types';
@@ -64,7 +64,7 @@ export const tryProcessInbox = async (data: InboxJobData, ctx?: ApContext): Prom
 	// || activity.actorを元にDBから取得 || activity.actorを元にリモートから取得
 	if (user == null) {
 		try {
-			user = await resolvePerson(getApId(activity.actor), undefined, resolver) as IRemoteUser;
+			user = await resolvePerson(getApId(activity.actor), undefined, resolver, isDelete(activity) || isUndo(activity)) as IRemoteUser;
 		} catch (e) {
 			// 対象が4xxならスキップ
 			if (e instanceof StatusError && e.isClientError) {

diff --git a/src/remote/activitypub/models/person.ts b/src/remote/activitypub/models/person.ts
@@ -422,7 +422,7 @@ export async function updatePerson(uri: string, resolver?: Resolver, hint?: IAct
  * Misskeyに対象のPersonが登録されていればそれを返し、そうでなければ
  * リモートサーバーからフェッチしてMisskeyに登録しそれを返します。
  */
-export async function resolvePerson(uri: string, verifier?: string | null, resolver?: Resolver): Promise<IUser> {
+export async function resolvePerson(uri: string, verifier?: string | null, resolver?: Resolver, noResolve = false): Promise<IUser> {
 	if (typeof uri !== 'string') throw 'uri is not string';
 
 	//#region このサーバーに既に登録されていたらそれを返す
@@ -433,6 +433,10 @@ export async function resolvePerson(uri: string, verifier?: string | null, resol
 	}
 	//#endregion
 
+	if (noResolve) {
+		throw new StatusError('Resolve skipped', 400, 'Resolve skipped');
+	}
+
 	// リモートサーバーからフェッチしてきて登録
 	if (resolver == null) resolver = new Resolver();