From 1fc337f9d080321a7ae88ff91c9a808b48e361bc Mon Sep 17 00:00:00 2001 From: Hazelnoot Date: Thu, 6 Nov 2025 23:55:01 -0500 Subject: [PATCH] fix rebase errors --- packages/backend/src/core/RemoteUserResolveService.ts | 4 ++-- packages/backend/src/core/UtilityService.ts | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/backend/src/core/RemoteUserResolveService.ts b/packages/backend/src/core/RemoteUserResolveService.ts index 688b9d7b1f..6a0d28dcdf 100644 --- a/packages/backend/src/core/RemoteUserResolveService.ts +++ b/packages/backend/src/core/RemoteUserResolveService.ts @@ -20,10 +20,10 @@ import { ApPersonService } from '@/core/activitypub/models/ApPersonService.js'; import { bindThis } from '@/decorators.js'; import { renderInlineError } from '@/misc/render-inline-error.js'; import { CacheService } from '@/core/CacheService.js'; -import { TimeService } from '@/core/TimeService.js'; +import { TimeService } from '@/global/TimeService.js'; import * as Acct from '@/misc/acct.js'; import { IdentifiableError } from '@/misc/identifiable-error.js'; -import { InternalEventService } from '@/core/InternalEventService.js'; +import { InternalEventService } from '@/global/InternalEventService.js'; @Injectable() export class RemoteUserResolveService { diff --git a/packages/backend/src/core/UtilityService.ts b/packages/backend/src/core/UtilityService.ts index 63b16a55d8..4a8145bddd 100644 --- a/packages/backend/src/core/UtilityService.ts +++ b/packages/backend/src/core/UtilityService.ts @@ -15,6 +15,7 @@ import type { MiMeta, SoftwareSuspension } from '@/models/Meta.js'; import type { MiInstance } from '@/models/Instance.js'; import { IdentifiableError } from '@/misc/identifiable-error.js'; import { EnvService } from '@/global/EnvService.js'; +import { getApId, type IObject } from '@/core/activitypub/type.js'; export type UriParseResult = { /** wether the URI was generated by us */