From 74d4799ed5dc6d2f8cbe7c12538840c842a2f050 Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Thu, 9 Oct 2025 13:23:34 -0400
Subject: [PATCH] fix rebase errors

---
 packages/backend/src/core/AntennaService.ts                 | 2 +-
 packages/backend/src/core/CollapsedQueueService.ts          | 6 +++---
 packages/backend/src/core/UserService.ts                    | 2 +-
 .../backend/src/core/activitypub/models/ApPersonService.ts  | 2 +-
 packages/backend/src/misc/collapsed-queue.ts                | 2 +-
 .../src/queue/processors/BackgroundTaskProcessorService.ts  | 2 +-
 packages/backend/test/misc/mock-resolver.ts                 | 3 ++-
 7 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/packages/backend/src/core/AntennaService.ts b/packages/backend/src/core/AntennaService.ts
index ca451256db..fcb3650c5c 100644
--- a/packages/backend/src/core/AntennaService.ts
+++ b/packages/backend/src/core/AntennaService.ts
@@ -18,7 +18,7 @@ import type { AntennasRepository, UserListMembershipsRepository } from '@/models
 import type { MiAntenna } from '@/models/Antenna.js';
 import type { MiNote } from '@/models/Note.js';
 import type { MiUser } from '@/models/User.js';
-import { InternalEventService } from '@/core/InternalEventService.js';
+import { InternalEventService } from '@/global/InternalEventService.js';
 import { promiseMap } from '@/misc/promise-map.js';
 import { CacheService } from './CacheService.js';
 import type { OnApplicationShutdown } from '@nestjs/common';
diff --git a/packages/backend/src/core/CollapsedQueueService.ts b/packages/backend/src/core/CollapsedQueueService.ts
index e3e5229ca5..faf1cee524 100644
--- a/packages/backend/src/core/CollapsedQueueService.ts
+++ b/packages/backend/src/core/CollapsedQueueService.ts
@@ -9,14 +9,14 @@ import type Logger from '@/logger.js';
 import { CollapsedQueue } from '@/misc/collapsed-queue.js';
 import { renderInlineError } from '@/misc/render-inline-error.js';
 import { FederatedInstanceService } from '@/core/FederatedInstanceService.js';
-import { EnvService } from '@/core/EnvService.js';
+import { EnvService } from '@/global/EnvService.js';
 import { bindThis } from '@/decorators.js';
-import { InternalEventService } from '@/core/InternalEventService.js';
+import { InternalEventService } from '@/global/InternalEventService.js';
 import type { UsersRepository, NotesRepository, AccessTokensRepository, MiAntenna, FollowingsRepository } from '@/models/_.js';
 import { DI } from '@/di-symbols.js';
 import { AntennaService } from '@/core/AntennaService.js';
 import { CacheService } from '@/core/CacheService.js';
-import { TimeService } from '@/core/TimeService.js';
+import { TimeService } from '@/global/TimeService.js';
 
 export type UpdateInstanceJob = {
 	latestRequestReceivedAt?: Date,
diff --git a/packages/backend/src/core/UserService.ts b/packages/backend/src/core/UserService.ts
index 845c83effc..4e04183523 100644
--- a/packages/backend/src/core/UserService.ts
+++ b/packages/backend/src/core/UserService.ts
@@ -10,7 +10,7 @@ import { DI } from '@/di-symbols.js';
 import { bindThis } from '@/decorators.js';
 import { SystemWebhookService } from '@/core/SystemWebhookService.js';
 import { UserEntityService } from '@/core/entities/UserEntityService.js';
-import { CollapsedQueueService } from '@/global/CollapsedQueueService.js';
+import { CollapsedQueueService } from '@/core/CollapsedQueueService.js';
 import { TimeService } from '@/global/TimeService.js';
 
 @Injectable()
diff --git a/packages/backend/src/core/activitypub/models/ApPersonService.ts b/packages/backend/src/core/activitypub/models/ApPersonService.ts
index 051972af19..bce48ddd40 100644
--- a/packages/backend/src/core/activitypub/models/ApPersonService.ts
+++ b/packages/backend/src/core/activitypub/models/ApPersonService.ts
@@ -46,7 +46,7 @@ import { isRetryableError } from '@/misc/is-retryable-error.js';
 import { renderInlineError } from '@/misc/render-inline-error.js';
 import { errorCodes, IdentifiableError } from '@/misc/identifiable-error.js';
 import { QueueService } from '@/core/QueueService.js';
-import { InternalEventService } from '@/core/InternalEventService.js';
+import { InternalEventService } from '@/global/InternalEventService.js';
 import { CollapsedQueueService } from '@/core/CollapsedQueueService.js';
 import { promiseMap } from '@/misc/promise-map.js';
 import { getApId, getApType, getNullableApId, isActor, isPost, isPropertyValue } from '../type.js';
diff --git a/packages/backend/src/misc/collapsed-queue.ts b/packages/backend/src/misc/collapsed-queue.ts
index 7f7e7bb03b..d9e86dd4f5 100644
--- a/packages/backend/src/misc/collapsed-queue.ts
+++ b/packages/backend/src/misc/collapsed-queue.ts
@@ -5,7 +5,7 @@
 
 import promiseLimit from 'promise-limit';
 import type { TimeService, TimerHandle } from '@/global/TimeService.js';
-import { InternalEventService } from '@/core/InternalEventService.js';
+import { InternalEventService } from '@/global/InternalEventService.js';
 import { bindThis } from '@/decorators.js';
 import { Serialized } from '@/types.js';
 
diff --git a/packages/backend/src/queue/processors/BackgroundTaskProcessorService.ts b/packages/backend/src/queue/processors/BackgroundTaskProcessorService.ts
index 053673fa22..f4b9309991 100644
--- a/packages/backend/src/queue/processors/BackgroundTaskProcessorService.ts
+++ b/packages/backend/src/queue/processors/BackgroundTaskProcessorService.ts
@@ -30,7 +30,7 @@ import { ApLogService } from '@/core/ApLogService.js';
 import { CollapsedQueueService } from '@/core/CollapsedQueueService.js';
 import { isRemoteUser } from '@/models/User.js';
 import { errorCodes, IdentifiableError } from '@/misc/identifiable-error.js';
-import { TimeService } from '@/core/TimeService.js';
+import { TimeService } from '@/global/TimeService.js';
 
 @Injectable()
 export class BackgroundTaskProcessorService {
diff --git a/packages/backend/test/misc/mock-resolver.ts b/packages/backend/test/misc/mock-resolver.ts
index ec535751f7..04233232d9 100644
--- a/packages/backend/test/misc/mock-resolver.ts
+++ b/packages/backend/test/misc/mock-resolver.ts
@@ -22,6 +22,7 @@ import type {
 	UsersRepository,
 } from '@/models/_.js';
 import type { CacheService } from '@/core/CacheService.js';
+import type { MiLocalUser } from '@/models/User.js';
 import { ApLogService } from '@/core/ApLogService.js';
 import { LoggerService } from '@/core/LoggerService.js';
 import { ApUtilityService } from '@/core/activitypub/ApUtilityService.js';
@@ -31,7 +32,7 @@ import { bindThis } from '@/decorators.js';
 import { Resolver } from '@/core/activitypub/ApResolverService.js';
 import { DI } from '@/di-symbols.js';
 import { IdentifiableError } from '@/misc/identifiable-error.js';
-import type { MiLocalUser } from '@/models/User.js';
+import { NativeTimeService } from '@/global/TimeService.js';
 
 type MockResponse = {
 	type: string;