From 6614c4343f4e3ccb18455a5311d6e666b32045b6 Mon Sep 17 00:00:00 2001
From: tamaina <tamaina@hotmail.co.jp>
Date: Sat, 30 Aug 2025 20:55:04 +0900
Subject: [PATCH] acceptAcct

---
 packages/backend/src/core/activitypub/ApDbResolverService.ts | 4 ++--
 packages/backend/src/server/api/endpoints/ap/show.ts         | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/backend/src/core/activitypub/ApDbResolverService.ts b/packages/backend/src/core/activitypub/ApDbResolverService.ts
index 8e67e854b2..7ae58973df 100644
--- a/packages/backend/src/core/activitypub/ApDbResolverService.ts
+++ b/packages/backend/src/core/activitypub/ApDbResolverService.ts
@@ -128,10 +128,10 @@ export class ApDbResolverService implements OnApplicationShutdown {
 	 * AP Person => Misskey User in DB
 	 */
 	@bindThis
-	public async getUserFromApId(value: string | IObject): Promise<MiLocalUser | MiRemoteUser | null> {
+	public async getUserFromApId(value: string | IObject, acceptAcct: boolean = false): Promise<MiLocalUser | MiRemoteUser | null> {
 		const parsed = this.parseLocalUri(value);
 
-		if ('acct' in parsed) {
+		if (acceptAcct && 'acct' in parsed) {
 			return await this.usersRepository.findOneBy({
 				usernameLower: parsed.acct.username.toLowerCase(),
 				host: (parsed.acct.host == null || parsed.local) ? IsNull() : this.utilityService.toPuny(parsed.acct.host),
diff --git a/packages/backend/src/server/api/endpoints/ap/show.ts b/packages/backend/src/server/api/endpoints/ap/show.ts
index 4afed7dc5c..4b06d0785b 100644
--- a/packages/backend/src/server/api/endpoints/ap/show.ts
+++ b/packages/backend/src/server/api/endpoints/ap/show.ts
@@ -137,7 +137,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 		}
 
 		let local = await this.mergePack(me, ...await Promise.all([
-			this.apDbResolverService.getUserFromApId(uri),
+			this.apDbResolverService.getUserFromApId(uri, true),
 			this.apDbResolverService.getNoteFromApId(uri),
 		]));
 		if (local != null) return local;