From fdc1cc23680104b870d5c8d29215f37644cc2298 Mon Sep 17 00:00:00 2001 From: Hazelnoot Date: Mon, 15 Sep 2025 18:27:22 -0400 Subject: [PATCH] remove duplicate function from ApDbResolverService --- .../core/activitypub/ApDbResolverService.ts | 27 ++----------------- 1 file changed, 2 insertions(+), 25 deletions(-) diff --git a/packages/backend/src/core/activitypub/ApDbResolverService.ts b/packages/backend/src/core/activitypub/ApDbResolverService.ts index f79d6a86a8..87e3b7ed5f 100644 --- a/packages/backend/src/core/activitypub/ApDbResolverService.ts +++ b/packages/backend/src/core/activitypub/ApDbResolverService.ts @@ -75,31 +75,8 @@ export class ApDbResolverService implements OnApplicationShutdown { */ @bindThis public async getUserFromApId(value: string | IObject | [string | IObject]): Promise { - const parsed = this.parseUri(value); - - if (parsed.local) { - if (parsed.type !== 'users') return null; - - const u = await this.cacheService.findOptionalUserById(parsed.id); - - if (u == null || u.isDeleted) { - return null; - } - - return u as MiLocalUser | MiRemoteUser; - } else { - const uid = await this.apPersonService.uriPersonCache.fetchMaybe(parsed.uri); - if (uid == null) { - return null; - } - - const u = await this.cacheService.findOptionalUserById(uid); - if (u == null || u.isDeleted) { - return null; - } - - return u as MiLocalUser | MiRemoteUser; - } + const uri = getApId(value); + return await this.apPersonService.fetchPerson(uri); } /**