From a903d77a3f8e44bf68461960d4e799b6c99adb53 Mon Sep 17 00:00:00 2001 From: Hazelnoot Date: Wed, 9 Jul 2025 18:20:59 -0400 Subject: [PATCH] fix ImmediateApPersonService producing duplicate calls to updateFeatured --- .../test/misc/immediateBackgroundTasks.ts | 25 +++---------------- 1 file changed, 4 insertions(+), 21 deletions(-) diff --git a/packages/backend/test/misc/immediateBackgroundTasks.ts b/packages/backend/test/misc/immediateBackgroundTasks.ts index fd059e3f10..24c344da2f 100644 --- a/packages/backend/test/misc/immediateBackgroundTasks.ts +++ b/packages/backend/test/misc/immediateBackgroundTasks.ts @@ -3,42 +3,25 @@ * SPDX-License-Identifier: AGPL-3.0-only */ -import type { IObject } from '@/core/activitypub/type.js'; import { ApPersonService } from '@/core/activitypub/models/ApPersonService.js'; -import { MiRemoteUser, MiUser } from '@/models/User.js'; +import { MiUser } from '@/models/User.js'; import { FetchInstanceMetadataService } from '@/core/FetchInstanceMetadataService.js'; import { MiInstance } from '@/models/Instance.js'; import { Resolver } from '@/core/activitypub/ApResolverService.js'; import { bindThis } from '@/decorators.js'; export class ImmediateApPersonService extends ApPersonService { - @bindThis - async createPerson(uri: string, resolver?: Resolver): Promise { - const user = await super.createPerson(uri, resolver); - await this.updateFeatured(user, resolver); - return user; - } - - @bindThis - async updatePerson(uri: string, resolver?: Resolver | null, hint?: IObject, movePreventUris: string[] = []): Promise { - const result = await super.updatePerson(uri, resolver, hint, movePreventUris); - - const user = await this.fetchPerson(uri); - if (user == null) throw new Error('updated user is null, did you forget to mock out caches?'); - await this.updateFeatured(user, resolver ?? undefined); - - return result; - } + public resolver?: Resolver; @bindThis async updatePersonLazy(uriOrUser: string | MiUser): Promise { const userId = typeof(uriOrUser) === 'object' ? uriOrUser.id : uriOrUser; - await this.updatePerson(userId); + await this.updatePerson(userId, this.resolver); } @bindThis async updateFeaturedLazy(userOrId: string | MiUser): Promise { - await this.updateFeatured(userOrId); + await this.updateFeatured(userOrId, this.resolver); } }