diff --git a/packages/backend/src/GlobalModule.ts b/packages/backend/src/GlobalModule.ts index 55cf77ea83..0c6e251ee3 100644 --- a/packages/backend/src/GlobalModule.ts +++ b/packages/backend/src/GlobalModule.ts @@ -10,10 +10,10 @@ import { MeiliSearch } from 'meilisearch'; import { MiMeta } from '@/models/Meta.js'; import { bindThis } from '@/decorators.js'; import { renderInlineError } from '@/misc/render-inline-error.js'; -import { TimeService, NativeTimeService } from '@/core/TimeService.js'; -import { EnvService } from '@/core/EnvService.js'; -import { CacheManagementService } from '@/core/CacheManagementService.js'; -import { InternalEventService } from '@/core/InternalEventService.js'; +import { TimeService, NativeTimeService } from '@/global/TimeService.js'; +import { EnvService } from '@/global/EnvService.js'; +import { CacheManagementService } from '@/global/CacheManagementService.js'; +import { InternalEventService } from '@/global/InternalEventService.js'; import { LoggerService } from '@/core/LoggerService.js'; import { DI } from './di-symbols.js'; import { Config, loadConfig } from './config.js'; diff --git a/packages/backend/src/core/AbuseReportNotificationService.ts b/packages/backend/src/core/AbuseReportNotificationService.ts index 70c9092777..23a0fa1c7b 100644 --- a/packages/backend/src/core/AbuseReportNotificationService.ts +++ b/packages/backend/src/core/AbuseReportNotificationService.ts @@ -23,7 +23,7 @@ import { RecipientMethod } from '@/models/AbuseReportNotificationRecipient.js'; import { ModerationLogService } from '@/core/ModerationLogService.js'; import { SystemWebhookService } from '@/core/SystemWebhookService.js'; import { UserEntityService } from '@/core/entities/UserEntityService.js'; -import { TimeService } from '@/core/TimeService.js'; +import { TimeService } from '@/global/TimeService.js'; import { IdService } from './IdService.js'; @Injectable() diff --git a/packages/backend/src/core/AccountMoveService.ts b/packages/backend/src/core/AccountMoveService.ts index 91155347b5..82e68e32aa 100644 --- a/packages/backend/src/core/AccountMoveService.ts +++ b/packages/backend/src/core/AccountMoveService.ts @@ -28,7 +28,7 @@ import { RoleService } from '@/core/RoleService.js'; import { AntennaService } from '@/core/AntennaService.js'; import { CacheService } from '@/core/CacheService.js'; import { UserListService } from '@/core/UserListService.js'; -import { TimeService } from '@/core/TimeService.js'; +import { TimeService } from '@/global/TimeService.js'; @Injectable() export class AccountMoveService { diff --git a/packages/backend/src/core/AchievementService.ts b/packages/backend/src/core/AchievementService.ts index 9da7843680..b961fac991 100644 --- a/packages/backend/src/core/AchievementService.ts +++ b/packages/backend/src/core/AchievementService.ts @@ -9,7 +9,7 @@ import type { MiUser } from '@/models/User.js'; import { DI } from '@/di-symbols.js'; import { bindThis } from '@/decorators.js'; import { NotificationService } from '@/core/NotificationService.js'; -import { TimeService } from '@/core/TimeService.js'; +import { TimeService } from '@/global/TimeService.js'; import { ACHIEVEMENT_TYPES } from '@/models/UserProfile.js'; @Injectable() diff --git a/packages/backend/src/core/AnnouncementService.ts b/packages/backend/src/core/AnnouncementService.ts index 177ea1d691..54496f9922 100644 --- a/packages/backend/src/core/AnnouncementService.ts +++ b/packages/backend/src/core/AnnouncementService.ts @@ -17,7 +17,7 @@ import { ModerationLogService } from '@/core/ModerationLogService.js'; import { IdentifiableError } from '@/misc/identifiable-error.js'; import type { Config } from '@/config.js'; import { RoleService } from '@/core/RoleService.js'; -import { TimeService } from '@/core/TimeService.js'; +import { TimeService } from '@/global/TimeService.js'; @Injectable() export class AnnouncementService { diff --git a/packages/backend/src/core/ApLogService.ts b/packages/backend/src/core/ApLogService.ts index aaddf2e4c7..89837a60d2 100644 --- a/packages/backend/src/core/ApLogService.ts +++ b/packages/backend/src/core/ApLogService.ts @@ -12,7 +12,7 @@ import type { ApContextsRepository, ApFetchLogsRepository, ApInboxLogsRepository import type { Config } from '@/config.js'; import { JsonValue } from '@/misc/json-value.js'; import { UtilityService } from '@/core/UtilityService.js'; -import { TimeService } from '@/core/TimeService.js'; +import { TimeService } from '@/global/TimeService.js'; import { IdService } from '@/core/IdService.js'; import { IActivity, IObject } from './activitypub/type.js'; diff --git a/packages/backend/src/core/AvatarDecorationService.ts b/packages/backend/src/core/AvatarDecorationService.ts index 5eded086e6..a389409b69 100644 --- a/packages/backend/src/core/AvatarDecorationService.ts +++ b/packages/backend/src/core/AvatarDecorationService.ts @@ -13,9 +13,9 @@ import { bindThis } from '@/decorators.js'; import { MemorySingleCache } from '@/misc/cache.js'; import type { GlobalEvents } from '@/core/GlobalEventService.js'; import { ModerationLogService } from '@/core/ModerationLogService.js'; -import { CacheManagementService, type ManagedMemorySingleCache } from '@/core/CacheManagementService.js'; -import { InternalEventService } from '@/core/InternalEventService.js'; -import { TimeService } from '@/core/TimeService.js'; +import { CacheManagementService, type ManagedMemorySingleCache } from '@/global/CacheManagementService.js'; +import { InternalEventService } from '@/global/InternalEventService.js'; +import { TimeService } from '@/global/TimeService.js'; @Injectable() export class AvatarDecorationService implements OnApplicationShutdown { diff --git a/packages/backend/src/core/CacheService.ts b/packages/backend/src/core/CacheService.ts index c997095eb8..6550d1a6e1 100644 --- a/packages/backend/src/core/CacheService.ts +++ b/packages/backend/src/core/CacheService.ts @@ -13,13 +13,13 @@ import { isLocalUser, isRemoteUser } from '@/models/User.js'; import { DI } from '@/di-symbols.js'; import { bindThis } from '@/decorators.js'; import type { InternalEventTypes } from '@/core/GlobalEventService.js'; -import { InternalEventService } from '@/core/InternalEventService.js'; +import { InternalEventService } from '@/global/InternalEventService.js'; import { IdentifiableError } from '@/misc/identifiable-error.js'; import { CacheManagementService, type ManagedMemoryKVCache, type ManagedQuantumKVCache, -} from '@/core/CacheManagementService.js'; +} from '@/global/CacheManagementService.js'; import type { OnApplicationShutdown } from '@nestjs/common'; export interface FollowStats { diff --git a/packages/backend/src/core/ChannelFollowingService.ts b/packages/backend/src/core/ChannelFollowingService.ts index 39e5bdedab..1c854b83fb 100644 --- a/packages/backend/src/core/ChannelFollowingService.ts +++ b/packages/backend/src/core/ChannelFollowingService.ts @@ -12,7 +12,7 @@ import { IdService } from '@/core/IdService.js'; import { GlobalEventService } from '@/core/GlobalEventService.js'; import { bindThis } from '@/decorators.js'; import type { MiLocalUser } from '@/models/User.js'; -import { InternalEventService } from './InternalEventService.js'; +import { InternalEventService } from '@/global/InternalEventService.js'; @Injectable() export class ChannelFollowingService { diff --git a/packages/backend/src/core/ChatService.ts b/packages/backend/src/core/ChatService.ts index b816a85857..cdecd41726 100644 --- a/packages/backend/src/core/ChatService.ts +++ b/packages/backend/src/core/ChatService.ts @@ -28,7 +28,7 @@ import { CustomEmojiService } from '@/core/CustomEmojiService.js'; import { emojiRegex } from '@/misc/emoji-regex.js'; import { NotificationService } from '@/core/NotificationService.js'; import { ModerationLogService } from '@/core/ModerationLogService.js'; -import { TimeService } from '@/core/TimeService.js'; +import { TimeService } from '@/global/TimeService.js'; const MAX_ROOM_MEMBERS = 30; const MAX_REACTIONS_PER_MESSAGE = 100; diff --git a/packages/backend/src/core/ClipService.ts b/packages/backend/src/core/ClipService.ts index 93e215e8b7..35b962cc04 100644 --- a/packages/backend/src/core/ClipService.ts +++ b/packages/backend/src/core/ClipService.ts @@ -12,7 +12,7 @@ import { isDuplicateKeyValueError } from '@/misc/is-duplicate-key-value-error.js import { RoleService } from '@/core/RoleService.js'; import { IdService } from '@/core/IdService.js'; import type { MiLocalUser } from '@/models/User.js'; -import { TimeService } from '@/core/TimeService.js'; +import { TimeService } from '@/global/TimeService.js'; @Injectable() export class ClipService { diff --git a/packages/backend/src/core/CustomEmojiService.ts b/packages/backend/src/core/CustomEmojiService.ts index ea2d4f1e2c..6676719ccd 100644 --- a/packages/backend/src/core/CustomEmojiService.ts +++ b/packages/backend/src/core/CustomEmojiService.ts @@ -20,8 +20,8 @@ import type { Serialized } from '@/types.js'; import { ModerationLogService } from '@/core/ModerationLogService.js'; import type { Config } from '@/config.js'; import { DriveService } from '@/core/DriveService.js'; -import { CacheManagementService, type ManagedQuantumKVCache } from '@/core/CacheManagementService.js'; -import { TimeService } from '@/core/TimeService.js'; +import { CacheManagementService, type ManagedQuantumKVCache } from '@/global/CacheManagementService.js'; +import { TimeService } from '@/global/TimeService.js'; import { LoggerService } from '@/core/LoggerService.js'; import { isRetryableSymbol } from '@/misc/is-retryable-error.js'; import { KeyNotFoundError } from '@/misc/QuantumKVCache.js'; diff --git a/packages/backend/src/core/FanoutTimelineService.ts b/packages/backend/src/core/FanoutTimelineService.ts index 630b13d352..1693fa686d 100644 --- a/packages/backend/src/core/FanoutTimelineService.ts +++ b/packages/backend/src/core/FanoutTimelineService.ts @@ -8,7 +8,7 @@ import * as Redis from 'ioredis'; import { DI } from '@/di-symbols.js'; import { bindThis } from '@/decorators.js'; import { IdService } from '@/core/IdService.js'; -import { TimeService } from '@/core/TimeService.js'; +import { TimeService } from '@/global/TimeService.js'; export type FanoutTimelineName = ( // home timeline diff --git a/packages/backend/src/core/FeaturedService.ts b/packages/backend/src/core/FeaturedService.ts index d912f3349d..e2475fff0a 100644 --- a/packages/backend/src/core/FeaturedService.ts +++ b/packages/backend/src/core/FeaturedService.ts @@ -9,7 +9,7 @@ import type { MiGalleryPost, MiNote, MiUser } from '@/models/_.js'; import { DI } from '@/di-symbols.js'; import { bindThis } from '@/decorators.js'; import { RoleService } from '@/core/RoleService.js'; -import { TimeService } from '@/core/TimeService.js'; +import { TimeService } from '@/global/TimeService.js'; const GLOBAL_NOTES_RANKING_WINDOW = 1000 * 60 * 60 * 24 * 3; // 3日ごと export const GALLERY_POSTS_RANKING_WINDOW = 1000 * 60 * 60 * 24 * 3; // 3日ごと diff --git a/packages/backend/src/core/FederatedInstanceService.ts b/packages/backend/src/core/FederatedInstanceService.ts index 9451bfa345..6cdb52299d 100644 --- a/packages/backend/src/core/FederatedInstanceService.ts +++ b/packages/backend/src/core/FederatedInstanceService.ts @@ -12,11 +12,11 @@ import type { InternalEventTypes } from '@/core/GlobalEventService.js'; import { IdService } from '@/core/IdService.js'; import { DI } from '@/di-symbols.js'; import { UtilityService } from '@/core/UtilityService.js'; -import { CacheManagementService, type ManagedQuantumKVCache } from '@/core/CacheManagementService.js'; -import { InternalEventService } from '@/core/InternalEventService.js'; +import { CacheManagementService, type ManagedQuantumKVCache } from '@/global/CacheManagementService.js'; +import { InternalEventService } from '@/global/InternalEventService.js'; import { diffArraysSimple } from '@/misc/diff-arrays.js'; import { bindThis } from '@/decorators.js'; -import { TimeService } from '@/core/TimeService.js'; +import { TimeService } from '@/global/TimeService.js'; import type { QueryDeepPartialEntity } from 'typeorm/query-builder/QueryPartialEntity.js'; @Injectable() diff --git a/packages/backend/src/core/FetchInstanceMetadataService.ts b/packages/backend/src/core/FetchInstanceMetadataService.ts index 0f16fc384d..d288c5d231 100644 --- a/packages/backend/src/core/FetchInstanceMetadataService.ts +++ b/packages/backend/src/core/FetchInstanceMetadataService.ts @@ -15,7 +15,7 @@ import { LoggerService } from '@/core/LoggerService.js'; import { HttpRequestService } from '@/core/HttpRequestService.js'; import { bindThis } from '@/decorators.js'; import { FederatedInstanceService } from '@/core/FederatedInstanceService.js'; -import { TimeService } from '@/core/TimeService.js'; +import { TimeService } from '@/global/TimeService.js'; import { renderInlineError } from '@/misc/render-inline-error.js'; import type { CheerioAPI } from 'cheerio/slim'; diff --git a/packages/backend/src/core/GlobalEventService.ts b/packages/backend/src/core/GlobalEventService.ts index 79634acb8d..658621d854 100644 --- a/packages/backend/src/core/GlobalEventService.ts +++ b/packages/backend/src/core/GlobalEventService.ts @@ -26,7 +26,7 @@ import { DI } from '@/di-symbols.js'; import type { Config } from '@/config.js'; import { bindThis } from '@/decorators.js'; import type { Serialized } from '@/types.js'; -import { InternalEventService } from '@/core/InternalEventService.js'; +import { InternalEventService } from '@/global/InternalEventService.js'; import { trackPromise } from '@/misc/promise-tracker.js'; import type Emitter from 'strict-event-emitter-types'; import type { EventEmitter } from 'events'; diff --git a/packages/backend/src/core/HashtagService.ts b/packages/backend/src/core/HashtagService.ts index ef983a084d..0035c4b0d5 100644 --- a/packages/backend/src/core/HashtagService.ts +++ b/packages/backend/src/core/HashtagService.ts @@ -15,7 +15,7 @@ import type { HashtagsRepository, MiMeta } from '@/models/_.js'; import { bindThis } from '@/decorators.js'; import { FeaturedService } from '@/core/FeaturedService.js'; import { UtilityService } from '@/core/UtilityService.js'; -import { TimeService } from '@/core/TimeService.js'; +import { TimeService } from '@/global/TimeService.js'; @Injectable() export class HashtagService { diff --git a/packages/backend/src/core/HttpRequestService.ts b/packages/backend/src/core/HttpRequestService.ts index 8000f1fd6c..a77e6a352b 100644 --- a/packages/backend/src/core/HttpRequestService.ts +++ b/packages/backend/src/core/HttpRequestService.ts @@ -19,7 +19,7 @@ import { validateContentTypeSetAsActivityPub } from '@/core/activitypub/misc/val import type { IObject, IObjectWithId } from '@/core/activitypub/type.js'; import { UtilityService } from '@/core/UtilityService.js'; import { ApUtilityService } from '@/core/activitypub/ApUtilityService.js'; -import { TimeService } from '@/core/TimeService.js'; +import { TimeService } from '@/global/TimeService.js'; import type { Response } from 'node-fetch'; import type { Socket } from 'node:net'; diff --git a/packages/backend/src/core/IdService.ts b/packages/backend/src/core/IdService.ts index 5d31665984..5bc1997a5f 100644 --- a/packages/backend/src/core/IdService.ts +++ b/packages/backend/src/core/IdService.ts @@ -7,7 +7,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { ulid } from 'ulid'; import { DI } from '@/di-symbols.js'; import type { Config } from '@/config.js'; -import { TimeService } from '@/core/TimeService.js'; +import { TimeService } from '@/global/TimeService.js'; import { genAid, isSafeAidT, parseAid, parseAidFull } from '@/misc/id/aid.js'; import { genAidx, isSafeAidxT, parseAidx, parseAidxFull } from '@/misc/id/aidx.js'; import { genMeid, isSafeMeidT, parseMeid, parseMeidFull } from '@/misc/id/meid.js'; diff --git a/packages/backend/src/core/InstanceStatsService.ts b/packages/backend/src/core/InstanceStatsService.ts index 5eb7fbf291..45a3ca9c0c 100644 --- a/packages/backend/src/core/InstanceStatsService.ts +++ b/packages/backend/src/core/InstanceStatsService.ts @@ -5,13 +5,13 @@ import { Inject, Injectable } from '@nestjs/common'; import { IsNull, MoreThan } from 'typeorm'; -import { CacheManagementService, type ManagedMemorySingleCache } from '@/core/CacheManagementService.js'; +import { CacheManagementService, type ManagedMemorySingleCache } from '@/global/CacheManagementService.js'; import NotesChart from '@/core/chart/charts/notes.js'; import UsersChart from '@/core/chart/charts/users.js'; import { DI } from '@/di-symbols.js'; import type { UsersRepository } from '@/models/_.js'; import { bindThis } from '@/decorators.js'; -import { TimeService } from '@/core/TimeService.js'; +import { TimeService } from '@/global/TimeService.js'; export interface InstanceStats { /** diff --git a/packages/backend/src/core/LoggerService.ts b/packages/backend/src/core/LoggerService.ts index a8c2f3a1ea..2fd8d76853 100644 --- a/packages/backend/src/core/LoggerService.ts +++ b/packages/backend/src/core/LoggerService.ts @@ -5,10 +5,10 @@ import { Inject, Injectable } from '@nestjs/common'; import Logger from '@/logger.js'; -import { TimeService } from '@/core/TimeService.js'; +import { TimeService } from '@/global/TimeService.js'; import { bindThis } from '@/decorators.js'; import type { KEYWORD } from 'color-convert/conversions.js'; -import { envOption } from '@/env.js'; +import { envOption } from '@/env.js'; // TODO move to envService import { DI } from '@/di-symbols.js'; import type { Config } from '@/config.js'; diff --git a/packages/backend/src/core/MetaService.ts b/packages/backend/src/core/MetaService.ts index ef8cf270a2..68902ef539 100644 --- a/packages/backend/src/core/MetaService.ts +++ b/packages/backend/src/core/MetaService.ts @@ -12,7 +12,7 @@ import { GlobalEventService } from '@/core/GlobalEventService.js'; import { bindThis } from '@/decorators.js'; import type { GlobalEvents } from '@/core/GlobalEventService.js'; import { FeaturedService } from '@/core/FeaturedService.js'; -import { TimeService, type TimerHandle } from '@/core/TimeService.js'; +import { TimeService, type TimerHandle } from '@/global/TimeService.js'; import { MiInstance } from '@/models/Instance.js'; import { diffArrays } from '@/misc/diff-arrays.js'; import type { MetasRepository } from '@/models/_.js'; diff --git a/packages/backend/src/core/NoteCreateService.ts b/packages/backend/src/core/NoteCreateService.ts index ef75644ae7..0eeb09649f 100644 --- a/packages/backend/src/core/NoteCreateService.ts +++ b/packages/backend/src/core/NoteCreateService.ts @@ -57,7 +57,7 @@ import { IdentifiableError } from '@/misc/identifiable-error.js'; import { LatestNoteService } from '@/core/LatestNoteService.js'; import { CollapsedQueue } from '@/misc/collapsed-queue.js'; import { CacheService } from '@/core/CacheService.js'; -import { TimeService } from '@/core/TimeService.js'; +import { TimeService } from '@/global/TimeService.js'; import { NoteVisibilityService } from '@/core/NoteVisibilityService.js'; import { isPureRenote } from '@/misc/is-renote.js'; diff --git a/packages/backend/src/core/NoteDeleteService.ts b/packages/backend/src/core/NoteDeleteService.ts index 8b50e1c882..95bdf85308 100644 --- a/packages/backend/src/core/NoteDeleteService.ts +++ b/packages/backend/src/core/NoteDeleteService.ts @@ -26,7 +26,7 @@ import { isQuote, isRenote } from '@/misc/is-renote.js'; import { LatestNoteService } from '@/core/LatestNoteService.js'; import { ApLogService } from '@/core/ApLogService.js'; import type Logger from '@/logger.js'; -import { TimeService } from '@/core/TimeService.js'; +import { TimeService } from '@/global/TimeService.js'; import { LoggerService } from '@/core/LoggerService.js'; @Injectable() diff --git a/packages/backend/src/core/NoteEditService.ts b/packages/backend/src/core/NoteEditService.ts index 3a1064c95f..7839040266 100644 --- a/packages/backend/src/core/NoteEditService.ts +++ b/packages/backend/src/core/NoteEditService.ts @@ -52,7 +52,7 @@ import { IdentifiableError } from '@/misc/identifiable-error.js'; import { LatestNoteService } from '@/core/LatestNoteService.js'; import { CollapsedQueue } from '@/misc/collapsed-queue.js'; import { NoteCreateService } from '@/core/NoteCreateService.js'; -import { TimeService } from '@/core/TimeService.js'; +import { TimeService } from '@/global/TimeService.js'; import { NoteVisibilityService } from '@/core/NoteVisibilityService.js'; import { isPureRenote } from '@/misc/is-renote.js'; diff --git a/packages/backend/src/core/NoteVisibilityService.ts b/packages/backend/src/core/NoteVisibilityService.ts index c6180b7de9..a0cc3a85aa 100644 --- a/packages/backend/src/core/NoteVisibilityService.ts +++ b/packages/backend/src/core/NoteVisibilityService.ts @@ -14,7 +14,7 @@ import type { Packed } from '@/misc/json-schema.js'; import { FederatedInstanceService } from '@/core/FederatedInstanceService.js'; import { CacheService } from '@/core/CacheService.js'; import { IdService } from '@/core/IdService.js'; -import { TimeService } from '@/core/TimeService.js'; +import { TimeService } from '@/global/TimeService.js'; import { bindThis } from '@/decorators.js'; import { awaitAll } from '@/misc/prelude/await-all.js'; import { DI } from '@/di-symbols.js'; diff --git a/packages/backend/src/core/NotificationService.ts b/packages/backend/src/core/NotificationService.ts index 7d718494af..9180dfa418 100644 --- a/packages/backend/src/core/NotificationService.ts +++ b/packages/backend/src/core/NotificationService.ts @@ -22,7 +22,7 @@ import type { Config } from '@/config.js'; import { UserListService } from '@/core/UserListService.js'; import { FilterUnionByProperty, groupedNotificationTypes, obsoleteNotificationTypes } from '@/types.js'; import { trackPromise } from '@/misc/promise-tracker.js'; -import { TimeService } from '@/core/TimeService.js'; +import { TimeService } from '@/global/TimeService.js'; @Injectable() export class NotificationService implements OnApplicationShutdown { diff --git a/packages/backend/src/core/PushNotificationService.ts b/packages/backend/src/core/PushNotificationService.ts index 8ead513671..f0c533d4da 100644 --- a/packages/backend/src/core/PushNotificationService.ts +++ b/packages/backend/src/core/PushNotificationService.ts @@ -12,8 +12,8 @@ import type { Packed } from '@/misc/json-schema.js'; import { getNoteSummary } from '@/misc/get-note-summary.js'; import type { MiMeta, MiSwSubscription, SwSubscriptionsRepository } from '@/models/_.js'; import { bindThis } from '@/decorators.js'; -import { CacheManagementService, type ManagedQuantumKVCache } from '@/core/CacheManagementService.js'; -import { TimeService } from '@/core/TimeService.js'; +import { CacheManagementService, type ManagedQuantumKVCache } from '@/global/CacheManagementService.js'; +import { TimeService } from '@/global/TimeService.js'; // Defined also packages/sw/types.ts#L13 type PushNotificationsTypes = { diff --git a/packages/backend/src/core/QueueService.ts b/packages/backend/src/core/QueueService.ts index 07ee8f3931..5020614676 100644 --- a/packages/backend/src/core/QueueService.ts +++ b/packages/backend/src/core/QueueService.ts @@ -16,7 +16,7 @@ import { DI } from '@/di-symbols.js'; import { bindThis } from '@/decorators.js'; import type { Antenna } from '@/server/api/endpoints/i/import-antennas.js'; import { ApRequestCreator } from '@/core/activitypub/ApRequestService.js'; -import { TimeService } from '@/core/TimeService.js'; +import { TimeService } from '@/global/TimeService.js'; import type { SystemWebhookPayload } from '@/core/SystemWebhookService.js'; import type { MiNote } from '@/models/Note.js'; import { type UserWebhookPayload } from './UserWebhookService.js'; diff --git a/packages/backend/src/core/ReactionService.ts b/packages/backend/src/core/ReactionService.ts index b4ed595095..d3ab48e3ff 100644 --- a/packages/backend/src/core/ReactionService.ts +++ b/packages/backend/src/core/ReactionService.ts @@ -32,7 +32,7 @@ import { ReactionsBufferingService } from '@/core/ReactionsBufferingService.js'; import { PER_NOTE_REACTION_USER_PAIR_CACHE_MAX } from '@/const.js'; import { CacheService } from '@/core/CacheService.js'; import { NoteVisibilityService } from '@/core/NoteVisibilityService.js'; -import { TimeService } from '@/core/TimeService.js'; +import { TimeService } from '@/global/TimeService.js'; import type { DataSource } from 'typeorm'; const FALLBACK = '\u2764'; diff --git a/packages/backend/src/core/ReactionsBufferingService.ts b/packages/backend/src/core/ReactionsBufferingService.ts index 7cb5120306..cadaba131d 100644 --- a/packages/backend/src/core/ReactionsBufferingService.ts +++ b/packages/backend/src/core/ReactionsBufferingService.ts @@ -6,7 +6,7 @@ import { Inject, Injectable } from '@nestjs/common'; import * as Redis from 'ioredis'; import { DI } from '@/di-symbols.js'; -import { TimeService } from '@/core/TimeService.js'; +import { TimeService } from '@/global/TimeService.js'; import type { MiNote } from '@/models/Note.js'; import { bindThis } from '@/decorators.js'; import type { MiUser, NotesRepository } from '@/models/_.js'; diff --git a/packages/backend/src/core/RegistryApiService.ts b/packages/backend/src/core/RegistryApiService.ts index 12cf386199..76c7d02a0e 100644 --- a/packages/backend/src/core/RegistryApiService.ts +++ b/packages/backend/src/core/RegistryApiService.ts @@ -11,7 +11,7 @@ import type { MiUser } from '@/models/User.js'; import { IdService } from '@/core/IdService.js'; import { GlobalEventService } from '@/core/GlobalEventService.js'; import { bindThis } from '@/decorators.js'; -import { TimeService } from '@/core/TimeService.js'; +import { TimeService } from '@/global/TimeService.js'; @Injectable() export class RegistryApiService { diff --git a/packages/backend/src/core/RelayService.ts b/packages/backend/src/core/RelayService.ts index 2d6048f204..268acbcf24 100644 --- a/packages/backend/src/core/RelayService.ts +++ b/packages/backend/src/core/RelayService.ts @@ -15,7 +15,7 @@ import { DI } from '@/di-symbols.js'; import { deepClone } from '@/misc/clone.js'; import { bindThis } from '@/decorators.js'; import { SystemAccountService } from '@/core/SystemAccountService.js'; -import { CacheManagementService, ManagedMemorySingleCache } from '@/core/CacheManagementService.js'; +import { CacheManagementService, ManagedMemorySingleCache } from '@/global/CacheManagementService.js'; @Injectable() export class RelayService { diff --git a/packages/backend/src/core/RemoteUserResolveService.ts b/packages/backend/src/core/RemoteUserResolveService.ts index dcea9c4f98..b65619064a 100644 --- a/packages/backend/src/core/RemoteUserResolveService.ts +++ b/packages/backend/src/core/RemoteUserResolveService.ts @@ -16,7 +16,7 @@ import { ILink, WebfingerService } from '@/core/WebfingerService.js'; import { RemoteLoggerService } from '@/core/RemoteLoggerService.js'; import { ApDbResolverService } from '@/core/activitypub/ApDbResolverService.js'; import { ApPersonService } from '@/core/activitypub/models/ApPersonService.js'; -import { TimeService } from '@/core/TimeService.js'; +import { TimeService } from '@/global/TimeService.js'; import { bindThis } from '@/decorators.js'; import { renderInlineError } from '@/misc/render-inline-error.js'; diff --git a/packages/backend/src/core/ReversiService.ts b/packages/backend/src/core/ReversiService.ts index 6a1a0c009b..2edba73677 100644 --- a/packages/backend/src/core/ReversiService.ts +++ b/packages/backend/src/core/ReversiService.ts @@ -19,7 +19,7 @@ import { bindThis } from '@/decorators.js'; import { UserEntityService } from '@/core/entities/UserEntityService.js'; import { GlobalEventService } from '@/core/GlobalEventService.js'; import { IdService } from '@/core/IdService.js'; -import { TimeService } from '@/core/TimeService.js'; +import { TimeService } from '@/global/TimeService.js'; import type { NotificationService } from '@/core/NotificationService.js'; import { Serialized } from '@/types.js'; import { ReversiGameEntityService } from './entities/ReversiGameEntityService.js'; diff --git a/packages/backend/src/core/RoleService.ts b/packages/backend/src/core/RoleService.ts index 8abaea9b4b..d096cf6b8b 100644 --- a/packages/backend/src/core/RoleService.ts +++ b/packages/backend/src/core/RoleService.ts @@ -29,12 +29,12 @@ import { ModerationLogService } from '@/core/ModerationLogService.js'; import type { Packed } from '@/misc/json-schema.js'; import { FanoutTimelineService } from '@/core/FanoutTimelineService.js'; import type { NotificationService } from '@/core/NotificationService.js'; -import { TimeService } from '@/core/TimeService.js'; +import { TimeService } from '@/global/TimeService.js'; import { CacheManagementService, type ManagedMemorySingleCache, type ManagedMemoryKVCache, -} from '@/core/CacheManagementService.js'; +} from '@/global/CacheManagementService.js'; import type { OnApplicationShutdown, OnModuleInit } from '@nestjs/common'; import { getCallerId } from '@/misc/attach-caller-id.js'; diff --git a/packages/backend/src/core/S3Service.ts b/packages/backend/src/core/S3Service.ts index 780b277299..955d778015 100644 --- a/packages/backend/src/core/S3Service.ts +++ b/packages/backend/src/core/S3Service.ts @@ -14,7 +14,7 @@ import type { MiMeta } from '@/models/Meta.js'; import { HttpRequestService } from '@/core/HttpRequestService.js'; import { bindThis } from '@/decorators.js'; import { DI } from '@/di-symbols.js'; -import { InternalEventService } from '@/core/InternalEventService.js'; +import { InternalEventService } from '@/global/InternalEventService.js'; import type { InternalEventTypes } from '@/core/GlobalEventService.js'; import type { DeleteObjectCommandInput, PutObjectCommandInput } from '@aws-sdk/client-s3'; diff --git a/packages/backend/src/core/SignupService.ts b/packages/backend/src/core/SignupService.ts index bd2357fdac..4291b32f55 100644 --- a/packages/backend/src/core/SignupService.ts +++ b/packages/backend/src/core/SignupService.ts @@ -23,7 +23,7 @@ import { UtilityService } from '@/core/UtilityService.js'; import { UserService } from '@/core/UserService.js'; import { SystemAccountService } from '@/core/SystemAccountService.js'; import { MetaService } from '@/core/MetaService.js'; -import { TimeService } from '@/core/TimeService.js'; +import { TimeService } from '@/global/TimeService.js'; @Injectable() export class SignupService { diff --git a/packages/backend/src/core/SponsorsService.ts b/packages/backend/src/core/SponsorsService.ts index b83c109985..551768bdc9 100644 --- a/packages/backend/src/core/SponsorsService.ts +++ b/packages/backend/src/core/SponsorsService.ts @@ -7,7 +7,7 @@ import { Inject, Injectable } from '@nestjs/common'; import type { MiMeta } from '@/models/_.js'; import { DI } from '@/di-symbols.js'; import { bindThis } from '@/decorators.js'; -import { CacheManagementService, type ManagedRedisKVCache } from '@/core/CacheManagementService.js'; +import { CacheManagementService, type ManagedRedisKVCache } from '@/global/CacheManagementService.js'; export interface Sponsor { MemberId: number; diff --git a/packages/backend/src/core/SystemAccountService.ts b/packages/backend/src/core/SystemAccountService.ts index cba4c7741b..d10f811e66 100644 --- a/packages/backend/src/core/SystemAccountService.ts +++ b/packages/backend/src/core/SystemAccountService.ts @@ -19,10 +19,10 @@ import { bindThis } from '@/decorators.js'; import { generateNativeUserToken } from '@/misc/token.js'; import { IdService } from '@/core/IdService.js'; import { genRsaKeyPair } from '@/misc/gen-key-pair.js'; -import { CacheManagementService, type ManagedMemoryKVCache } from '@/core/CacheManagementService.js'; +import { CacheManagementService, type ManagedMemoryKVCache } from '@/global/CacheManagementService.js'; import { CacheService } from '@/core/CacheService.js'; -import { InternalEventService } from '@/core/InternalEventService.js'; -import { TimeService } from '@/core/TimeService.js'; +import { InternalEventService } from '@/global/InternalEventService.js'; +import { TimeService } from '@/global/TimeService.js'; export const SYSTEM_ACCOUNT_TYPES = ['actor', 'relay', 'proxy'] as const; diff --git a/packages/backend/src/core/SystemWebhookService.ts b/packages/backend/src/core/SystemWebhookService.ts index b10476c6ca..683083eaed 100644 --- a/packages/backend/src/core/SystemWebhookService.ts +++ b/packages/backend/src/core/SystemWebhookService.ts @@ -18,9 +18,9 @@ import Logger from '@/logger.js'; import { Packed } from '@/misc/json-schema.js'; import { AbuseReportResolveType } from '@/models/AbuseUserReport.js'; import { ModeratorInactivityRemainingTime } from '@/queue/processors/CheckModeratorsActivityProcessorService.js'; -import { CacheManagementService, type ManagedMemorySingleCache } from '@/core/CacheManagementService.js'; -import { InternalEventService } from '@/core/InternalEventService.js'; -import { TimeService } from '@/core/TimeService.js'; +import { CacheManagementService, type ManagedMemorySingleCache } from '@/global/CacheManagementService.js'; +import { InternalEventService } from '@/global/InternalEventService.js'; +import { TimeService } from '@/global/TimeService.js'; import type { OnApplicationShutdown } from '@nestjs/common'; export type AbuseReportPayload = { diff --git a/packages/backend/src/core/UpdateInstanceQueue.ts b/packages/backend/src/core/UpdateInstanceQueue.ts index dffe4a7b62..c136241344 100644 --- a/packages/backend/src/core/UpdateInstanceQueue.ts +++ b/packages/backend/src/core/UpdateInstanceQueue.ts @@ -8,7 +8,7 @@ import { CollapsedQueue } from '@/misc/collapsed-queue.js'; import { bindThis } from '@/decorators.js'; import { MiNote } from '@/models/Note.js'; import { FederatedInstanceService } from '@/core/FederatedInstanceService.js'; -import { TimeService } from '@/core/TimeService.js'; +import { TimeService } from '@/global/TimeService.js'; type UpdateInstanceJob = { latestRequestReceivedAt: Date, diff --git a/packages/backend/src/core/UserFollowingService.ts b/packages/backend/src/core/UserFollowingService.ts index 63506eb034..833ea97193 100644 --- a/packages/backend/src/core/UserFollowingService.ts +++ b/packages/backend/src/core/UserFollowingService.ts @@ -29,7 +29,7 @@ import { AccountMoveService } from '@/core/AccountMoveService.js'; import { UtilityService } from '@/core/UtilityService.js'; import type { ThinUser } from '@/queue/types.js'; import { LoggerService } from '@/core/LoggerService.js'; -import { InternalEventService } from '@/core/InternalEventService.js'; +import { InternalEventService } from '@/global/InternalEventService.js'; import type Logger from '../logger.js'; type Local = MiLocalUser | { diff --git a/packages/backend/src/core/UserKeypairService.ts b/packages/backend/src/core/UserKeypairService.ts index 048a832908..750906891a 100644 --- a/packages/backend/src/core/UserKeypairService.ts +++ b/packages/backend/src/core/UserKeypairService.ts @@ -11,8 +11,8 @@ import type { UserKeypairsRepository } from '@/models/_.js'; import type { MiUserKeypair } from '@/models/UserKeypair.js'; import { DI } from '@/di-symbols.js'; import { bindThis } from '@/decorators.js'; -import { CacheManagementService, type ManagedQuantumKVCache } from '@/core/CacheManagementService.js'; -import { InternalEventService } from '@/core/InternalEventService.js'; +import { CacheManagementService, type ManagedQuantumKVCache } from '@/global/CacheManagementService.js'; +import { InternalEventService } from '@/global/InternalEventService.js'; import type { InternalEventTypes } from '@/core/GlobalEventService.js'; @Injectable() diff --git a/packages/backend/src/core/UserListService.ts b/packages/backend/src/core/UserListService.ts index dd09e2f039..17ecdfca54 100644 --- a/packages/backend/src/core/UserListService.ts +++ b/packages/backend/src/core/UserListService.ts @@ -19,7 +19,7 @@ import { bindThis } from '@/decorators.js'; import { QueueService } from '@/core/QueueService.js'; import type { RoleService } from '@/core/RoleService.js'; import { SystemAccountService } from '@/core/SystemAccountService.js'; -import { InternalEventService } from '@/core/InternalEventService.js'; +import { InternalEventService } from '@/global/InternalEventService.js'; import { CacheService } from '@/core/CacheService.js'; @Injectable() diff --git a/packages/backend/src/core/UserSearchService.ts b/packages/backend/src/core/UserSearchService.ts index 3a66ccff94..6c6d3a5280 100644 --- a/packages/backend/src/core/UserSearchService.ts +++ b/packages/backend/src/core/UserSearchService.ts @@ -11,7 +11,7 @@ import { bindThis } from '@/decorators.js'; import { sqlLikeEscape } from '@/misc/sql-like-escape.js'; import type { Config } from '@/config.js'; import { UserEntityService } from '@/core/entities/UserEntityService.js'; -import { TimeService } from '@/core/TimeService.js'; +import { TimeService } from '@/global/TimeService.js'; import { Packed } from '@/misc/json-schema.js'; @Injectable() diff --git a/packages/backend/src/core/UserService.ts b/packages/backend/src/core/UserService.ts index bdfbb5fe4a..34c343712c 100644 --- a/packages/backend/src/core/UserService.ts +++ b/packages/backend/src/core/UserService.ts @@ -11,7 +11,7 @@ import { bindThis } from '@/decorators.js'; import { SystemWebhookService } from '@/core/SystemWebhookService.js'; import { UserEntityService } from '@/core/entities/UserEntityService.js'; import { CacheService } from '@/core/CacheService.js'; -import { TimeService } from '@/core/TimeService.js'; +import { TimeService } from '@/global/TimeService.js'; @Injectable() export class UserService { diff --git a/packages/backend/src/core/UserSuspendService.ts b/packages/backend/src/core/UserSuspendService.ts index 5868ba6678..4e42c24383 100644 --- a/packages/backend/src/core/UserSuspendService.ts +++ b/packages/backend/src/core/UserSuspendService.ts @@ -21,7 +21,7 @@ import { LoggerService } from '@/core/LoggerService.js'; import type Logger from '@/logger.js'; import { renderInlineError } from '@/misc/render-inline-error.js'; import { trackPromise } from '@/misc/promise-tracker.js'; -import { InternalEventService } from '@/core/InternalEventService.js'; +import { InternalEventService } from '@/global/InternalEventService.js'; @Injectable() export class UserSuspendService { diff --git a/packages/backend/src/core/UserWebhookService.ts b/packages/backend/src/core/UserWebhookService.ts index edf6ed6bda..7ce46352f5 100644 --- a/packages/backend/src/core/UserWebhookService.ts +++ b/packages/backend/src/core/UserWebhookService.ts @@ -12,8 +12,8 @@ import { bindThis } from '@/decorators.js'; import type { InternalEventTypes } from '@/core/GlobalEventService.js'; import type { Packed } from '@/misc/json-schema.js'; import { QueueService } from '@/core/QueueService.js'; -import { CacheManagementService, type ManagedMemorySingleCache } from '@/core/CacheManagementService.js'; -import { InternalEventService } from '@/core/InternalEventService.js'; +import { CacheManagementService, type ManagedMemorySingleCache } from '@/global/CacheManagementService.js'; +import { InternalEventService } from '@/global/InternalEventService.js'; import type { OnApplicationShutdown } from '@nestjs/common'; export type UserWebhookPayload = diff --git a/packages/backend/src/core/UtilityService.ts b/packages/backend/src/core/UtilityService.ts index 11606e3184..8ebf7e6f52 100644 --- a/packages/backend/src/core/UtilityService.ts +++ b/packages/backend/src/core/UtilityService.ts @@ -14,7 +14,7 @@ import { bindThis } from '@/decorators.js'; 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 '@/core/EnvService.js'; +import { EnvService } from '@/global/EnvService.js'; @Injectable() export class UtilityService { diff --git a/packages/backend/src/core/WebAuthnService.ts b/packages/backend/src/core/WebAuthnService.ts index f5db1c8721..1e31dff257 100644 --- a/packages/backend/src/core/WebAuthnService.ts +++ b/packages/backend/src/core/WebAuthnService.ts @@ -18,7 +18,7 @@ import { bindThis } from '@/decorators.js'; import { MiUser } from '@/models/_.js'; import { IdentifiableError } from '@/misc/identifiable-error.js'; import { LoggerService } from '@/core/LoggerService.js'; -import { TimeService } from '@/core/TimeService.js'; +import { TimeService } from '@/global/TimeService.js'; import Logger from '@/logger.js'; import type { AuthenticationResponseJSON, diff --git a/packages/backend/src/core/WebhookTestService.ts b/packages/backend/src/core/WebhookTestService.ts index d3b2f09841..3d5b94254b 100644 --- a/packages/backend/src/core/WebhookTestService.ts +++ b/packages/backend/src/core/WebhookTestService.ts @@ -14,7 +14,7 @@ import { CustomEmojiService } from '@/core/CustomEmojiService.js'; import { type UserWebhookPayload, UserWebhookService } from '@/core/UserWebhookService.js'; import { QueueService } from '@/core/QueueService.js'; import { IdService } from '@/core/IdService.js'; -import { TimeService } from '@/core/TimeService.js'; +import { TimeService } from '@/global/TimeService.js'; import { ModeratorInactivityRemainingTime } from '@/queue/processors/CheckModeratorsActivityProcessorService.js'; const oneDayMillis = 24 * 60 * 60 * 1000; diff --git a/packages/backend/src/core/activitypub/ApInboxService.ts b/packages/backend/src/core/activitypub/ApInboxService.ts index 97fbab9e69..91eba793d6 100644 --- a/packages/backend/src/core/activitypub/ApInboxService.ts +++ b/packages/backend/src/core/activitypub/ApInboxService.ts @@ -39,7 +39,7 @@ import { FetchInstanceMetadataService } from '@/core/FetchInstanceMetadataServic import { UpdateInstanceQueue } from '@/core/UpdateInstanceQueue.js'; import { CacheService } from '@/core/CacheService.js'; import { NoteVisibilityService } from '@/core/NoteVisibilityService.js'; -import { TimeService } from '@/core/TimeService.js'; +import { TimeService } from '@/global/TimeService.js'; import { getApHrefNullable, getApId, getApIds, getApType, getNullableApId, isAccept, isActor, isAdd, isAnnounce, isApObject, isBlock, isCollectionOrOrderedCollection, isCreate, isDelete, isFlag, isFollow, isLike, isDislike, isMove, isPost, isReject, isRemove, isTombstone, isUndo, isUpdate, validActor, validPost, isActivity, IObjectWithId } from './type.js'; import { ApNoteService } from './models/ApNoteService.js'; import { ApLoggerService } from './ApLoggerService.js'; diff --git a/packages/backend/src/core/activitypub/ApRendererService.ts b/packages/backend/src/core/activitypub/ApRendererService.ts index 3eba101e1b..6fc6786bf3 100644 --- a/packages/backend/src/core/activitypub/ApRendererService.ts +++ b/packages/backend/src/core/activitypub/ApRendererService.ts @@ -35,7 +35,7 @@ import { UtilityService } from '@/core/UtilityService.js'; import { CacheService } from '@/core/CacheService.js'; import { isPureRenote, isQuote, isRenote } from '@/misc/is-renote.js'; import { FederatedInstanceService } from '@/core/FederatedInstanceService.js'; -import { TimeService } from '@/core/TimeService.js'; +import { TimeService } from '@/global/TimeService.js'; import { JsonLdService } from './JsonLdService.js'; import { ApMfmService } from './ApMfmService.js'; import { CONTEXT } from './misc/contexts.js'; diff --git a/packages/backend/src/core/activitypub/ApRequestService.ts b/packages/backend/src/core/activitypub/ApRequestService.ts index 85f4481ed2..c52f9475f0 100644 --- a/packages/backend/src/core/activitypub/ApRequestService.ts +++ b/packages/backend/src/core/activitypub/ApRequestService.ts @@ -14,7 +14,7 @@ import { UserKeypairService } from '@/core/UserKeypairService.js'; import { ApUtilityService } from '@/core/activitypub/ApUtilityService.js'; import { HttpRequestService } from '@/core/HttpRequestService.js'; import { LoggerService } from '@/core/LoggerService.js'; -import { TimeService } from '@/core/TimeService.js'; +import { TimeService } from '@/global/TimeService.js'; import { bindThis } from '@/decorators.js'; import type Logger from '@/logger.js'; import { validateContentTypeSetAsActivityPub } from '@/core/activitypub/misc/validator.js'; diff --git a/packages/backend/src/core/activitypub/JsonLdService.ts b/packages/backend/src/core/activitypub/JsonLdService.ts index 0ab37bc148..8e14e0909f 100644 --- a/packages/backend/src/core/activitypub/JsonLdService.ts +++ b/packages/backend/src/core/activitypub/JsonLdService.ts @@ -11,7 +11,7 @@ import { bindThis } from '@/decorators.js'; import Logger from '@/logger.js'; import { LoggerService } from '@/core/LoggerService.js'; import { StatusError } from '@/misc/status-error.js'; -import { TimeService } from '@/core/TimeService.js'; +import { TimeService } from '@/global/TimeService.js'; import { CONTEXT, PRELOADED_CONTEXTS } from './misc/contexts.js'; import { validateContentTypeSetAsJsonLD } from './misc/validator.js'; import type { ContextDefinition, JsonLdDocument } from 'jsonld'; diff --git a/packages/backend/src/core/activitypub/models/ApNoteService.ts b/packages/backend/src/core/activitypub/models/ApNoteService.ts index def6058c4e..2c40a6e408 100644 --- a/packages/backend/src/core/activitypub/models/ApNoteService.ts +++ b/packages/backend/src/core/activitypub/models/ApNoteService.ts @@ -33,7 +33,7 @@ import { extractMediaFromHtml } from '@/core/activitypub/misc/extract-media-from import { extractMediaFromMfm } from '@/core/activitypub/misc/extract-media-from-mfm.js'; import { getContentByType } from '@/core/activitypub/misc/get-content-by-type.js'; import { CustomEmojiService, encodeEmojiKey, isValidEmojiName } from '@/core/CustomEmojiService.js'; -import { TimeService } from '@/core/TimeService.js'; +import { TimeService } from '@/global/TimeService.js'; import { getOneApId, getApId, validPost, isEmoji, getApType, isApObject, isDocument, IApDocument, isLink } from '../type.js'; import { ApLoggerService } from '../ApLoggerService.js'; import { ApMfmService } from '../ApMfmService.js'; diff --git a/packages/backend/src/core/activitypub/models/ApPersonService.ts b/packages/backend/src/core/activitypub/models/ApPersonService.ts index 69d808b9f1..d53b04d87b 100644 --- a/packages/backend/src/core/activitypub/models/ApPersonService.ts +++ b/packages/backend/src/core/activitypub/models/ApPersonService.ts @@ -16,7 +16,7 @@ import { isRemoteUser, isLocalUser } from '@/models/User.js'; import { MiUser } from '@/models/User.js'; import { truncate } from '@/misc/truncate.js'; import type { CacheService } from '@/core/CacheService.js'; -import { CacheManagementService, type ManagedQuantumKVCache } from '@/core/CacheManagementService.js'; +import { CacheManagementService, type ManagedQuantumKVCache } from '@/global/CacheManagementService.js'; import { normalizeForSearch } from '@/misc/normalize-for-search.js'; import { isDuplicateKeyValueError } from '@/misc/is-duplicate-key-value-error.js'; import type Logger from '@/logger.js'; @@ -41,7 +41,7 @@ import type { AccountMoveService } from '@/core/AccountMoveService.js'; import { ApUtilityService } from '@/core/activitypub/ApUtilityService.js'; import { AppLockService } from '@/core/AppLockService.js'; import { HttpRequestService } from '@/core/HttpRequestService.js'; -import { TimeService } from '@/core/TimeService.js'; +import { TimeService } from '@/global/TimeService.js'; import { verifyFieldLinks } from '@/misc/verify-field-link.js'; import { isRetryableError } from '@/misc/is-retryable-error.js'; import { renderInlineError } from '@/misc/render-inline-error.js'; diff --git a/packages/backend/src/core/chart/ChartManagementService.ts b/packages/backend/src/core/chart/ChartManagementService.ts index 8919307831..95bcb22cc4 100644 --- a/packages/backend/src/core/chart/ChartManagementService.ts +++ b/packages/backend/src/core/chart/ChartManagementService.ts @@ -7,7 +7,7 @@ import { Injectable } from '@nestjs/common'; import { bindThis } from '@/decorators.js'; import { ChartLoggerService } from '@/core/chart/ChartLoggerService.js'; -import { TimeService, type TimerHandle } from '@/core/TimeService.js'; +import { TimeService, type TimerHandle } from '@/global/TimeService.js'; import Logger from '@/logger.js'; import { renderInlineError } from '@/misc/render-inline-error.js'; import FederationChart from './charts/federation.js'; diff --git a/packages/backend/src/core/chart/charts/active-users.ts b/packages/backend/src/core/chart/charts/active-users.ts index c4b4a434c1..20432fb293 100644 --- a/packages/backend/src/core/chart/charts/active-users.ts +++ b/packages/backend/src/core/chart/charts/active-users.ts @@ -10,7 +10,7 @@ import type { MiUser } from '@/models/User.js'; import { DI } from '@/di-symbols.js'; import { bindThis } from '@/decorators.js'; import { IdService } from '@/core/IdService.js'; -import { TimeService } from '@/core/TimeService.js'; +import { TimeService } from '@/global/TimeService.js'; import Chart from '../core.js'; import { ChartLoggerService } from '../ChartLoggerService.js'; import { name, schema } from './entities/active-users.js'; diff --git a/packages/backend/src/core/chart/charts/ap-request.ts b/packages/backend/src/core/chart/charts/ap-request.ts index 14e442330c..8cae5753c7 100644 --- a/packages/backend/src/core/chart/charts/ap-request.ts +++ b/packages/backend/src/core/chart/charts/ap-request.ts @@ -6,7 +6,7 @@ import { Injectable, Inject } from '@nestjs/common'; import { DataSource } from 'typeorm'; import { AppLockService } from '@/core/AppLockService.js'; -import { TimeService } from '@/core/TimeService.js'; +import { TimeService } from '@/global/TimeService.js'; import { DI } from '@/di-symbols.js'; import { bindThis } from '@/decorators.js'; import Chart from '../core.js'; diff --git a/packages/backend/src/core/chart/charts/drive.ts b/packages/backend/src/core/chart/charts/drive.ts index a693f68c5a..cce07f3b5b 100644 --- a/packages/backend/src/core/chart/charts/drive.ts +++ b/packages/backend/src/core/chart/charts/drive.ts @@ -7,7 +7,7 @@ import { Injectable, Inject } from '@nestjs/common'; import { DataSource } from 'typeorm'; import type { MiDriveFile } from '@/models/DriveFile.js'; import { AppLockService } from '@/core/AppLockService.js'; -import { TimeService } from '@/core/TimeService.js'; +import { TimeService } from '@/global/TimeService.js'; import { DI } from '@/di-symbols.js'; import { bindThis } from '@/decorators.js'; import Chart from '../core.js'; diff --git a/packages/backend/src/core/chart/charts/federation.ts b/packages/backend/src/core/chart/charts/federation.ts index fcee94cded..199c263cce 100644 --- a/packages/backend/src/core/chart/charts/federation.ts +++ b/packages/backend/src/core/chart/charts/federation.ts @@ -7,7 +7,7 @@ import { Injectable, Inject } from '@nestjs/common'; import { DataSource } from 'typeorm'; import type { FollowingsRepository, InstancesRepository, MiMeta } from '@/models/_.js'; import { AppLockService } from '@/core/AppLockService.js'; -import { TimeService } from '@/core/TimeService.js'; +import { TimeService } from '@/global/TimeService.js'; import { DI } from '@/di-symbols.js'; import { bindThis } from '@/decorators.js'; import Chart from '../core.js'; diff --git a/packages/backend/src/core/chart/charts/instance.ts b/packages/backend/src/core/chart/charts/instance.ts index 61bb824816..ca6c1c5026 100644 --- a/packages/backend/src/core/chart/charts/instance.ts +++ b/packages/backend/src/core/chart/charts/instance.ts @@ -9,7 +9,7 @@ import type { DriveFilesRepository, FollowingsRepository, UsersRepository, Notes import type { MiDriveFile } from '@/models/DriveFile.js'; import type { MiNote } from '@/models/Note.js'; import { AppLockService } from '@/core/AppLockService.js'; -import { TimeService } from '@/core/TimeService.js'; +import { TimeService } from '@/global/TimeService.js'; import { DI } from '@/di-symbols.js'; import { UtilityService } from '@/core/UtilityService.js'; import { bindThis } from '@/decorators.js'; diff --git a/packages/backend/src/core/chart/charts/notes.ts b/packages/backend/src/core/chart/charts/notes.ts index e6c8d2db12..43cabd0b98 100644 --- a/packages/backend/src/core/chart/charts/notes.ts +++ b/packages/backend/src/core/chart/charts/notes.ts @@ -8,7 +8,7 @@ import { Not, IsNull, DataSource } from 'typeorm'; import type { NotesRepository } from '@/models/_.js'; import type { MiNote } from '@/models/Note.js'; import { AppLockService } from '@/core/AppLockService.js'; -import { TimeService } from '@/core/TimeService.js'; +import { TimeService } from '@/global/TimeService.js'; import { DI } from '@/di-symbols.js'; import { bindThis } from '@/decorators.js'; import Chart from '../core.js'; diff --git a/packages/backend/src/core/chart/charts/per-user-drive.ts b/packages/backend/src/core/chart/charts/per-user-drive.ts index 3b48d8b677..663abc5f00 100644 --- a/packages/backend/src/core/chart/charts/per-user-drive.ts +++ b/packages/backend/src/core/chart/charts/per-user-drive.ts @@ -8,7 +8,7 @@ import { DataSource } from 'typeorm'; import type { DriveFilesRepository } from '@/models/_.js'; import type { MiDriveFile } from '@/models/DriveFile.js'; import { AppLockService } from '@/core/AppLockService.js'; -import { TimeService } from '@/core/TimeService.js'; +import { TimeService } from '@/global/TimeService.js'; import { DI } from '@/di-symbols.js'; import { DriveFileEntityService } from '@/core/entities/DriveFileEntityService.js'; import { bindThis } from '@/decorators.js'; diff --git a/packages/backend/src/core/chart/charts/per-user-following.ts b/packages/backend/src/core/chart/charts/per-user-following.ts index 06f6cb6fc3..71678b0573 100644 --- a/packages/backend/src/core/chart/charts/per-user-following.ts +++ b/packages/backend/src/core/chart/charts/per-user-following.ts @@ -8,7 +8,7 @@ import { Not, IsNull, DataSource } from 'typeorm'; import type { MiUser } from '@/models/User.js'; import { AppLockService } from '@/core/AppLockService.js'; import { CacheService } from '@/core/CacheService.js'; -import { TimeService } from '@/core/TimeService.js'; +import { TimeService } from '@/global/TimeService.js'; import { DI } from '@/di-symbols.js'; import { UserEntityService } from '@/core/entities/UserEntityService.js'; import type { FollowingsRepository } from '@/models/_.js'; diff --git a/packages/backend/src/core/chart/charts/per-user-notes.ts b/packages/backend/src/core/chart/charts/per-user-notes.ts index 84391994e5..1182fa2984 100644 --- a/packages/backend/src/core/chart/charts/per-user-notes.ts +++ b/packages/backend/src/core/chart/charts/per-user-notes.ts @@ -8,7 +8,7 @@ import { DataSource } from 'typeorm'; import type { MiUser } from '@/models/User.js'; import type { MiNote } from '@/models/Note.js'; import { AppLockService } from '@/core/AppLockService.js'; -import { TimeService } from '@/core/TimeService.js'; +import { TimeService } from '@/global/TimeService.js'; import { DI } from '@/di-symbols.js'; import type { NotesRepository } from '@/models/_.js'; import { bindThis } from '@/decorators.js'; diff --git a/packages/backend/src/core/chart/charts/per-user-pv.ts b/packages/backend/src/core/chart/charts/per-user-pv.ts index 298d1dc7d0..75a61aae07 100644 --- a/packages/backend/src/core/chart/charts/per-user-pv.ts +++ b/packages/backend/src/core/chart/charts/per-user-pv.ts @@ -7,7 +7,7 @@ import { Injectable, Inject } from '@nestjs/common'; import { DataSource } from 'typeorm'; import type { MiUser } from '@/models/User.js'; import { AppLockService } from '@/core/AppLockService.js'; -import { TimeService } from '@/core/TimeService.js'; +import { TimeService } from '@/global/TimeService.js'; import { DI } from '@/di-symbols.js'; import { bindThis } from '@/decorators.js'; import Chart from '../core.js'; diff --git a/packages/backend/src/core/chart/charts/per-user-reactions.ts b/packages/backend/src/core/chart/charts/per-user-reactions.ts index 12a73b094f..9fb78a28e9 100644 --- a/packages/backend/src/core/chart/charts/per-user-reactions.ts +++ b/packages/backend/src/core/chart/charts/per-user-reactions.ts @@ -8,7 +8,7 @@ import { DataSource } from 'typeorm'; import type { MiUser } from '@/models/User.js'; import type { MiNote } from '@/models/Note.js'; import { AppLockService } from '@/core/AppLockService.js'; -import { TimeService } from '@/core/TimeService.js'; +import { TimeService } from '@/global/TimeService.js'; import { DI } from '@/di-symbols.js'; import { UserEntityService } from '@/core/entities/UserEntityService.js'; import { bindThis } from '@/decorators.js'; diff --git a/packages/backend/src/core/chart/charts/test-grouped.ts b/packages/backend/src/core/chart/charts/test-grouped.ts index 6dd37ae7ed..6cc48d483d 100644 --- a/packages/backend/src/core/chart/charts/test-grouped.ts +++ b/packages/backend/src/core/chart/charts/test-grouped.ts @@ -6,7 +6,7 @@ import { Injectable, Inject } from '@nestjs/common'; import { DataSource } from 'typeorm'; import { AppLockService } from '@/core/AppLockService.js'; -import { TimeService } from '@/core/TimeService.js'; +import { TimeService } from '@/global/TimeService.js'; import { DI } from '@/di-symbols.js'; import Logger from '@/logger.js'; import { bindThis } from '@/decorators.js'; diff --git a/packages/backend/src/core/chart/charts/test-intersection.ts b/packages/backend/src/core/chart/charts/test-intersection.ts index 97b000d3e4..d0ae1dab24 100644 --- a/packages/backend/src/core/chart/charts/test-intersection.ts +++ b/packages/backend/src/core/chart/charts/test-intersection.ts @@ -6,7 +6,7 @@ import { Injectable, Inject } from '@nestjs/common'; import { DataSource } from 'typeorm'; import { AppLockService } from '@/core/AppLockService.js'; -import { TimeService } from '@/core/TimeService.js'; +import { TimeService } from '@/global/TimeService.js'; import { DI } from '@/di-symbols.js'; import Logger from '@/logger.js'; import { bindThis } from '@/decorators.js'; diff --git a/packages/backend/src/core/chart/charts/test-unique.ts b/packages/backend/src/core/chart/charts/test-unique.ts index 660a358cd5..54a081fe2a 100644 --- a/packages/backend/src/core/chart/charts/test-unique.ts +++ b/packages/backend/src/core/chart/charts/test-unique.ts @@ -6,7 +6,7 @@ import { Injectable, Inject } from '@nestjs/common'; import { DataSource } from 'typeorm'; import { AppLockService } from '@/core/AppLockService.js'; -import { TimeService } from '@/core/TimeService.js'; +import { TimeService } from '@/global/TimeService.js'; import { DI } from '@/di-symbols.js'; import Logger from '@/logger.js'; import { bindThis } from '@/decorators.js'; diff --git a/packages/backend/src/core/chart/charts/test.ts b/packages/backend/src/core/chart/charts/test.ts index c0a10c941f..e95259f3b2 100644 --- a/packages/backend/src/core/chart/charts/test.ts +++ b/packages/backend/src/core/chart/charts/test.ts @@ -9,7 +9,7 @@ import { AppLockService } from '@/core/AppLockService.js'; import { DI } from '@/di-symbols.js'; import Logger from '@/logger.js'; import { bindThis } from '@/decorators.js'; -import { TimeService } from '@/core/TimeService.js'; +import { TimeService } from '@/global/TimeService.js'; import Chart from '../core.js'; import { name, schema } from './entities/test.js'; import type { KVs } from '../core.js'; diff --git a/packages/backend/src/core/chart/charts/users.ts b/packages/backend/src/core/chart/charts/users.ts index 93170a2613..91bf972371 100644 --- a/packages/backend/src/core/chart/charts/users.ts +++ b/packages/backend/src/core/chart/charts/users.ts @@ -7,7 +7,7 @@ import { Injectable, Inject } from '@nestjs/common'; import { Not, IsNull, Like, DataSource } from 'typeorm'; import type { MiUser } from '@/models/User.js'; import { AppLockService } from '@/core/AppLockService.js'; -import { TimeService } from '@/core/TimeService.js'; +import { TimeService } from '@/global/TimeService.js'; import { DI } from '@/di-symbols.js'; import { UserEntityService } from '@/core/entities/UserEntityService.js'; import type { UsersRepository } from '@/models/_.js'; diff --git a/packages/backend/src/core/entities/MetaEntityService.ts b/packages/backend/src/core/entities/MetaEntityService.ts index ed1df73569..c09374e897 100644 --- a/packages/backend/src/core/entities/MetaEntityService.ts +++ b/packages/backend/src/core/entities/MetaEntityService.ts @@ -14,7 +14,7 @@ import { SystemAccountService } from '@/core/SystemAccountService.js'; import type { Config } from '@/config.js'; import { DI } from '@/di-symbols.js'; import { DEFAULT_POLICIES } from '@/core/RoleService.js'; -import { TimeService } from '@/core/TimeService.js'; +import { TimeService } from '@/global/TimeService.js'; @Injectable() export class MetaEntityService { diff --git a/packages/backend/src/core/entities/NoteEntityService.ts b/packages/backend/src/core/entities/NoteEntityService.ts index 3efc9cb27a..373f05332f 100644 --- a/packages/backend/src/core/entities/NoteEntityService.ts +++ b/packages/backend/src/core/entities/NoteEntityService.ts @@ -17,7 +17,7 @@ import { DebounceLoader } from '@/misc/loader.js'; import type { IdService } from '@/core/IdService.js'; import type { ReactionsBufferingService } from '@/core/ReactionsBufferingService.js'; import { QueryService } from '@/core/QueryService.js'; -import { TimeService } from '@/core/TimeService.js'; +import { TimeService } from '@/global/TimeService.js'; import type { Config } from '@/config.js'; import { NoteVisibilityService } from '@/core/NoteVisibilityService.js'; import type { NoteVisibilityData } from '@/core/NoteVisibilityService.js'; diff --git a/packages/backend/src/core/entities/RoleEntityService.ts b/packages/backend/src/core/entities/RoleEntityService.ts index 14d3bc9250..15b0f06df1 100644 --- a/packages/backend/src/core/entities/RoleEntityService.ts +++ b/packages/backend/src/core/entities/RoleEntityService.ts @@ -14,7 +14,7 @@ import { bindThis } from '@/decorators.js'; import { DEFAULT_POLICIES } from '@/core/RoleService.js'; import { IdService } from '@/core/IdService.js'; import { Packed } from '@/misc/json-schema.js'; -import { TimeService } from '@/core/TimeService.js'; +import { TimeService } from '@/global/TimeService.js'; @Injectable() export class RoleEntityService { diff --git a/packages/backend/src/core/entities/UserEntityService.ts b/packages/backend/src/core/entities/UserEntityService.ts index 4fe97c382c..be27440ba9 100644 --- a/packages/backend/src/core/entities/UserEntityService.ts +++ b/packages/backend/src/core/entities/UserEntityService.ts @@ -49,7 +49,7 @@ import type { RolePolicies, RoleService } from '@/core/RoleService.js'; import type { ApPersonService } from '@/core/activitypub/models/ApPersonService.js'; import type { FederatedInstanceService } from '@/core/FederatedInstanceService.js'; import type { IdService } from '@/core/IdService.js'; -import { TimeService } from '@/core/TimeService.js'; +import { TimeService } from '@/global/TimeService.js'; import type { AnnouncementService } from '@/core/AnnouncementService.js'; import type { CustomEmojiService } from '@/core/CustomEmojiService.js'; import type { AvatarDecorationService } from '@/core/AvatarDecorationService.js'; diff --git a/packages/backend/src/daemons/ApLogCleanupService.ts b/packages/backend/src/daemons/ApLogCleanupService.ts index 6021270293..d3f09bf660 100644 --- a/packages/backend/src/daemons/ApLogCleanupService.ts +++ b/packages/backend/src/daemons/ApLogCleanupService.ts @@ -8,7 +8,7 @@ import { bindThis } from '@/decorators.js'; import { LoggerService } from '@/core/LoggerService.js'; import Logger from '@/logger.js'; import { ApLogService } from '@/core/ApLogService.js'; -import { TimeService, type TimerHandle } from '@/core/TimeService.js'; +import { TimeService, type TimerHandle } from '@/global/TimeService.js'; // 10 minutes export const scanInterval = 1000 * 60 * 10; diff --git a/packages/backend/src/daemons/QueueStatsService.ts b/packages/backend/src/daemons/QueueStatsService.ts index eb4edc4ebf..3779172517 100644 --- a/packages/backend/src/daemons/QueueStatsService.ts +++ b/packages/backend/src/daemons/QueueStatsService.ts @@ -7,7 +7,7 @@ import { Inject, Injectable } from '@nestjs/common'; import Xev from 'xev'; import * as Bull from 'bullmq'; import { QueueService } from '@/core/QueueService.js'; -import { TimeService, type TimerHandle } from '@/core/TimeService.js'; +import { TimeService, type TimerHandle } from '@/global/TimeService.js'; import { bindThis } from '@/decorators.js'; import { DI } from '@/di-symbols.js'; import type { Config } from '@/config.js'; diff --git a/packages/backend/src/daemons/ServerStatsService.ts b/packages/backend/src/daemons/ServerStatsService.ts index 7368be1db5..8c93ad9818 100644 --- a/packages/backend/src/daemons/ServerStatsService.ts +++ b/packages/backend/src/daemons/ServerStatsService.ts @@ -11,7 +11,7 @@ import { bindThis } from '@/decorators.js'; import type { OnApplicationShutdown } from '@nestjs/common'; import { MiMeta } from '@/models/_.js'; import { DI } from '@/di-symbols.js'; -import { TimeService, type TimerHandle } from '@/core/TimeService.js'; +import { TimeService, type TimerHandle } from '@/global/TimeService.js'; export interface Stats { cpu: number, diff --git a/packages/backend/src/core/CacheManagementService.ts b/packages/backend/src/global/CacheManagementService.ts similarity index 96% rename from packages/backend/src/core/CacheManagementService.ts rename to packages/backend/src/global/CacheManagementService.ts index ab04ecbe34..fc3b1e5ad0 100644 --- a/packages/backend/src/core/CacheManagementService.ts +++ b/packages/backend/src/global/CacheManagementService.ts @@ -16,8 +16,8 @@ import { import { QuantumKVCache, type QuantumKVOpts } from '@/misc/QuantumKVCache.js'; import { bindThis } from '@/decorators.js'; import { DI } from '@/di-symbols.js'; -import { TimeService, type TimerHandle } from '@/core/TimeService.js'; -import { InternalEventService } from '@/core/InternalEventService.js'; +import { TimeService, type TimerHandle } from '@/global/TimeService.js'; +import { InternalEventService } from '@/global/InternalEventService.js'; // This is the one place that's *supposed* to new() up caches. /* eslint-disable no-restricted-syntax */ diff --git a/packages/backend/src/core/EnvService.ts b/packages/backend/src/global/EnvService.ts similarity index 97% rename from packages/backend/src/core/EnvService.ts rename to packages/backend/src/global/EnvService.ts index 29d3e78568..f185d96da1 100644 --- a/packages/backend/src/core/EnvService.ts +++ b/packages/backend/src/global/EnvService.ts @@ -7,7 +7,7 @@ import nodePath from 'node:path'; import nodeFs from 'node:fs'; import { Injectable } from '@nestjs/common'; import { bindThis } from '@/decorators.js'; -import { type ManagedMemoryKVCache, CacheManagementService } from '@/core/CacheManagementService.js'; +import { type ManagedMemoryKVCache, CacheManagementService } from '@/global/CacheManagementService.js'; /** * Provides structured, mockable access to runtime/environment details. diff --git a/packages/backend/src/core/InternalEventService.ts b/packages/backend/src/global/InternalEventService.ts similarity index 100% rename from packages/backend/src/core/InternalEventService.ts rename to packages/backend/src/global/InternalEventService.ts diff --git a/packages/backend/src/core/TimeService.ts b/packages/backend/src/global/TimeService.ts similarity index 100% rename from packages/backend/src/core/TimeService.ts rename to packages/backend/src/global/TimeService.ts diff --git a/packages/backend/src/logger.ts b/packages/backend/src/logger.ts index d9dc17d62f..b98780237f 100644 --- a/packages/backend/src/logger.ts +++ b/packages/backend/src/logger.ts @@ -8,7 +8,7 @@ import chalk from 'chalk'; import { default as convertColor } from 'color-convert'; import { format as dateFormat } from 'date-fns'; import { bindThis } from '@/decorators.js'; -import { TimeService, NativeTimeService } from '@/core/TimeService.js'; +import { TimeService, NativeTimeService } from '@/global/TimeService.js'; import { envOption } from './env.js'; import type { KEYWORD } from 'color-convert/conversions.js'; diff --git a/packages/backend/src/misc/QuantumKVCache.ts b/packages/backend/src/misc/QuantumKVCache.ts index de5863f7ec..9270028416 100644 --- a/packages/backend/src/misc/QuantumKVCache.ts +++ b/packages/backend/src/misc/QuantumKVCache.ts @@ -4,7 +4,7 @@ */ import { bindThis } from '@/decorators.js'; -import { InternalEventService } from '@/core/InternalEventService.js'; +import { InternalEventService } from '@/global/InternalEventService.js'; import type { InternalEventTypes } from '@/core/GlobalEventService.js'; import { MemoryKVCache, type MemoryCacheServices } from '@/misc/cache.js'; import { makeKVPArray, type KVPArray } from '@/misc/kvp-array.js'; diff --git a/packages/backend/src/misc/cache.ts b/packages/backend/src/misc/cache.ts index 0bf9ddc95d..f6fb195278 100644 --- a/packages/backend/src/misc/cache.ts +++ b/packages/backend/src/misc/cache.ts @@ -5,7 +5,7 @@ import * as Redis from 'ioredis'; import { bindThis } from '@/decorators.js'; -import { TimeService } from '@/core/TimeService.js'; +import { TimeService } from '@/global/TimeService.js'; export interface RedisCacheServices extends MemoryCacheServices { readonly redisClient: Redis.Redis diff --git a/packages/backend/src/misc/collapsed-queue.ts b/packages/backend/src/misc/collapsed-queue.ts index 515819305e..168a4d7680 100644 --- a/packages/backend/src/misc/collapsed-queue.ts +++ b/packages/backend/src/misc/collapsed-queue.ts @@ -3,7 +3,7 @@ * SPDX-License-Identifier: AGPL-3.0-only */ -import type { TimeService, TimerHandle } from '@/core/TimeService.js'; +import type { TimeService, TimerHandle } from '@/global/TimeService.js'; type Job = { value: V; diff --git a/packages/backend/src/queue/QueueProcessorService.ts b/packages/backend/src/queue/QueueProcessorService.ts index f20c96218d..35dc812652 100644 --- a/packages/backend/src/queue/QueueProcessorService.ts +++ b/packages/backend/src/queue/QueueProcessorService.ts @@ -11,7 +11,7 @@ import { DI } from '@/di-symbols.js'; import type Logger from '@/logger.js'; import { bindThis } from '@/decorators.js'; import { CheckModeratorsActivityProcessorService } from '@/queue/processors/CheckModeratorsActivityProcessorService.js'; -import { TimeService } from '@/core/TimeService.js'; +import { TimeService } from '@/global/TimeService.js'; import { renderFullError } from '@/misc/render-full-error.js'; import { renderInlineError } from '@/misc/render-inline-error.js'; import { UserWebhookDeliverProcessorService } from './processors/UserWebhookDeliverProcessorService.js'; diff --git a/packages/backend/src/queue/processors/AggregateRetentionProcessorService.ts b/packages/backend/src/queue/processors/AggregateRetentionProcessorService.ts index 152c6ffc16..6f71b42fa9 100644 --- a/packages/backend/src/queue/processors/AggregateRetentionProcessorService.ts +++ b/packages/backend/src/queue/processors/AggregateRetentionProcessorService.ts @@ -11,7 +11,7 @@ import { bindThis } from '@/decorators.js'; import type { RetentionAggregationsRepository, UsersRepository } from '@/models/_.js'; import { deepClone } from '@/misc/clone.js'; import { IdService } from '@/core/IdService.js'; -import { TimeService } from '@/core/TimeService.js'; +import { TimeService } from '@/global/TimeService.js'; import { isDuplicateKeyValueError } from '@/misc/is-duplicate-key-value-error.js'; import { QueueLoggerService } from '../QueueLoggerService.js'; import type * as Bull from 'bullmq'; diff --git a/packages/backend/src/queue/processors/CheckExpiredMutingsProcessorService.ts b/packages/backend/src/queue/processors/CheckExpiredMutingsProcessorService.ts index 8cf88968c5..0471e27c0e 100644 --- a/packages/backend/src/queue/processors/CheckExpiredMutingsProcessorService.ts +++ b/packages/backend/src/queue/processors/CheckExpiredMutingsProcessorService.ts @@ -10,7 +10,7 @@ import type { MutingsRepository } from '@/models/_.js'; import type Logger from '@/logger.js'; import { bindThis } from '@/decorators.js'; import { UserMutingService } from '@/core/UserMutingService.js'; -import { TimeService } from '@/core/TimeService.js'; +import { TimeService } from '@/global/TimeService.js'; import { QueueLoggerService } from '../QueueLoggerService.js'; import type * as Bull from 'bullmq'; diff --git a/packages/backend/src/queue/processors/CheckModeratorsActivityProcessorService.ts b/packages/backend/src/queue/processors/CheckModeratorsActivityProcessorService.ts index 96a51a2b43..5c94ab4e94 100644 --- a/packages/backend/src/queue/processors/CheckModeratorsActivityProcessorService.ts +++ b/packages/backend/src/queue/processors/CheckModeratorsActivityProcessorService.ts @@ -14,7 +14,7 @@ import { MiUser, type UserProfilesRepository } from '@/models/_.js'; import { DI } from '@/di-symbols.js'; import { SystemWebhookService } from '@/core/SystemWebhookService.js'; import { AnnouncementService } from '@/core/AnnouncementService.js'; -import { TimeService } from '@/core/TimeService.js'; +import { TimeService } from '@/global/TimeService.js'; import { QueueLoggerService } from '../QueueLoggerService.js'; // モデレーターが不在と判断する日付の閾値 diff --git a/packages/backend/src/queue/processors/CleanProcessorService.ts b/packages/backend/src/queue/processors/CleanProcessorService.ts index 3fc39efe4c..149d72de6a 100644 --- a/packages/backend/src/queue/processors/CleanProcessorService.ts +++ b/packages/backend/src/queue/processors/CleanProcessorService.ts @@ -12,7 +12,7 @@ import { bindThis } from '@/decorators.js'; import { IdService } from '@/core/IdService.js'; import type { Config } from '@/config.js'; import { ReversiService } from '@/core/ReversiService.js'; -import { TimeService } from '@/core/TimeService.js'; +import { TimeService } from '@/global/TimeService.js'; import { QueueLoggerService } from '../QueueLoggerService.js'; import type * as Bull from 'bullmq'; diff --git a/packages/backend/src/queue/processors/CleanRemoteFilesProcessorService.ts b/packages/backend/src/queue/processors/CleanRemoteFilesProcessorService.ts index 9729918aae..993e00bcb9 100644 --- a/packages/backend/src/queue/processors/CleanRemoteFilesProcessorService.ts +++ b/packages/backend/src/queue/processors/CleanRemoteFilesProcessorService.ts @@ -11,7 +11,7 @@ import { MiUser } from '@/models/_.js'; import type Logger from '@/logger.js'; import { DriveService } from '@/core/DriveService.js'; import { IdService } from '@/core/IdService.js'; -import { TimeService } from '@/core/TimeService.js'; +import { TimeService } from '@/global/TimeService.js'; import { bindThis } from '@/decorators.js'; import { QueueLoggerService } from '../QueueLoggerService.js'; import type * as Bull from 'bullmq'; diff --git a/packages/backend/src/queue/processors/DeliverProcessorService.ts b/packages/backend/src/queue/processors/DeliverProcessorService.ts index 548b7775d8..0b1ef03a7a 100644 --- a/packages/backend/src/queue/processors/DeliverProcessorService.ts +++ b/packages/backend/src/queue/processors/DeliverProcessorService.ts @@ -19,7 +19,7 @@ import ApRequestChart from '@/core/chart/charts/ap-request.js'; import FederationChart from '@/core/chart/charts/federation.js'; import { StatusError } from '@/misc/status-error.js'; import { UtilityService } from '@/core/UtilityService.js'; -import { TimeService } from '@/core/TimeService.js'; +import { TimeService } from '@/global/TimeService.js'; import { bindThis } from '@/decorators.js'; import { QueueLoggerService } from '../QueueLoggerService.js'; import type { DeliverJobData } from '../types.js'; diff --git a/packages/backend/src/queue/processors/ExportAccountDataProcessorService.ts b/packages/backend/src/queue/processors/ExportAccountDataProcessorService.ts index e9a912a1be..97b006755f 100644 --- a/packages/backend/src/queue/processors/ExportAccountDataProcessorService.ts +++ b/packages/backend/src/queue/processors/ExportAccountDataProcessorService.ts @@ -22,7 +22,7 @@ import { Packed } from '@/misc/json-schema.js'; import { UtilityService } from '@/core/UtilityService.js'; import { DownloadService } from '@/core/DownloadService.js'; import { EmailService } from '@/core/EmailService.js'; -import { TimeService } from '@/core/TimeService.js'; +import { TimeService } from '@/global/TimeService.js'; import { renderInlineError } from '@/misc/render-inline-error.js'; import { QueueLoggerService } from '../QueueLoggerService.js'; import type * as Bull from 'bullmq'; diff --git a/packages/backend/src/queue/processors/ExportAntennasProcessorService.ts b/packages/backend/src/queue/processors/ExportAntennasProcessorService.ts index 09e5a9cb00..352dfe5cd5 100644 --- a/packages/backend/src/queue/processors/ExportAntennasProcessorService.ts +++ b/packages/backend/src/queue/processors/ExportAntennasProcessorService.ts @@ -15,7 +15,7 @@ import { bindThis } from '@/decorators.js'; import { createTemp } from '@/misc/create-temp.js'; import { UtilityService } from '@/core/UtilityService.js'; import { NotificationService } from '@/core/NotificationService.js'; -import { TimeService } from '@/core/TimeService.js'; +import { TimeService } from '@/global/TimeService.js'; import { QueueLoggerService } from '../QueueLoggerService.js'; import type { DBExportAntennasData } from '../types.js'; import type * as Bull from 'bullmq'; diff --git a/packages/backend/src/queue/processors/ExportBlockingProcessorService.ts b/packages/backend/src/queue/processors/ExportBlockingProcessorService.ts index 6716126b0e..9323d9b41f 100644 --- a/packages/backend/src/queue/processors/ExportBlockingProcessorService.ts +++ b/packages/backend/src/queue/processors/ExportBlockingProcessorService.ts @@ -14,7 +14,7 @@ import { DriveService } from '@/core/DriveService.js'; import { createTemp } from '@/misc/create-temp.js'; import { UtilityService } from '@/core/UtilityService.js'; import { NotificationService } from '@/core/NotificationService.js'; -import { TimeService } from '@/core/TimeService.js'; +import { TimeService } from '@/global/TimeService.js'; import { bindThis } from '@/decorators.js'; import { QueueLoggerService } from '../QueueLoggerService.js'; import type * as Bull from 'bullmq'; diff --git a/packages/backend/src/queue/processors/ExportClipsProcessorService.ts b/packages/backend/src/queue/processors/ExportClipsProcessorService.ts index f2cfc88bde..3036de5125 100644 --- a/packages/backend/src/queue/processors/ExportClipsProcessorService.ts +++ b/packages/backend/src/queue/processors/ExportClipsProcessorService.ts @@ -20,7 +20,7 @@ import { DriveFileEntityService } from '@/core/entities/DriveFileEntityService.j import { Packed } from '@/misc/json-schema.js'; import { IdService } from '@/core/IdService.js'; import { NotificationService } from '@/core/NotificationService.js'; -import { TimeService } from '@/core/TimeService.js'; +import { TimeService } from '@/global/TimeService.js'; import { QueueLoggerService } from '../QueueLoggerService.js'; import type * as Bull from 'bullmq'; import type { DbJobDataWithUser } from '../types.js'; diff --git a/packages/backend/src/queue/processors/ExportCustomEmojisProcessorService.ts b/packages/backend/src/queue/processors/ExportCustomEmojisProcessorService.ts index 5f3a30ed1c..474732804d 100644 --- a/packages/backend/src/queue/processors/ExportCustomEmojisProcessorService.ts +++ b/packages/backend/src/queue/processors/ExportCustomEmojisProcessorService.ts @@ -17,7 +17,7 @@ import { DriveService } from '@/core/DriveService.js'; import { createTemp, createTempDir } from '@/misc/create-temp.js'; import { DownloadService } from '@/core/DownloadService.js'; import { NotificationService } from '@/core/NotificationService.js'; -import { TimeService } from '@/core/TimeService.js'; +import { TimeService } from '@/global/TimeService.js'; import { bindThis } from '@/decorators.js'; import { QueueLoggerService } from '../QueueLoggerService.js'; import type * as Bull from 'bullmq'; diff --git a/packages/backend/src/queue/processors/ExportFavoritesProcessorService.ts b/packages/backend/src/queue/processors/ExportFavoritesProcessorService.ts index bf1f960b79..3132577094 100644 --- a/packages/backend/src/queue/processors/ExportFavoritesProcessorService.ts +++ b/packages/backend/src/queue/processors/ExportFavoritesProcessorService.ts @@ -17,7 +17,7 @@ import type { MiNote } from '@/models/Note.js'; import { bindThis } from '@/decorators.js'; import { IdService } from '@/core/IdService.js'; import { NotificationService } from '@/core/NotificationService.js'; -import { TimeService } from '@/core/TimeService.js'; +import { TimeService } from '@/global/TimeService.js'; import { QueueLoggerService } from '../QueueLoggerService.js'; import type * as Bull from 'bullmq'; import type { DbJobDataWithUser } from '../types.js'; diff --git a/packages/backend/src/queue/processors/ExportFollowingProcessorService.ts b/packages/backend/src/queue/processors/ExportFollowingProcessorService.ts index 1e85f27b2d..45f9965417 100644 --- a/packages/backend/src/queue/processors/ExportFollowingProcessorService.ts +++ b/packages/backend/src/queue/processors/ExportFollowingProcessorService.ts @@ -15,7 +15,7 @@ import { createTemp } from '@/misc/create-temp.js'; import type { MiFollowing } from '@/models/Following.js'; import { UtilityService } from '@/core/UtilityService.js'; import { NotificationService } from '@/core/NotificationService.js'; -import { TimeService } from '@/core/TimeService.js'; +import { TimeService } from '@/global/TimeService.js'; import { bindThis } from '@/decorators.js'; import { QueueLoggerService } from '../QueueLoggerService.js'; import type * as Bull from 'bullmq'; diff --git a/packages/backend/src/queue/processors/ExportMutingProcessorService.ts b/packages/backend/src/queue/processors/ExportMutingProcessorService.ts index 56d4e12f71..bc5a311d70 100644 --- a/packages/backend/src/queue/processors/ExportMutingProcessorService.ts +++ b/packages/backend/src/queue/processors/ExportMutingProcessorService.ts @@ -15,7 +15,7 @@ import { createTemp } from '@/misc/create-temp.js'; import { UtilityService } from '@/core/UtilityService.js'; import { NotificationService } from '@/core/NotificationService.js'; import { bindThis } from '@/decorators.js'; -import { TimeService } from '@/core/TimeService.js'; +import { TimeService } from '@/global/TimeService.js'; import { QueueLoggerService } from '../QueueLoggerService.js'; import type * as Bull from 'bullmq'; import type { DbJobDataWithUser } from '../types.js'; diff --git a/packages/backend/src/queue/processors/ExportNotesProcessorService.ts b/packages/backend/src/queue/processors/ExportNotesProcessorService.ts index 27b2abb17e..8a6a13841e 100644 --- a/packages/backend/src/queue/processors/ExportNotesProcessorService.ts +++ b/packages/backend/src/queue/processors/ExportNotesProcessorService.ts @@ -21,7 +21,7 @@ import { IdService } from '@/core/IdService.js'; import { NotificationService } from '@/core/NotificationService.js'; import { JsonArrayStream } from '@/misc/JsonArrayStream.js'; import { FileWriterStream } from '@/misc/FileWriterStream.js'; -import { TimeService } from '@/core/TimeService.js'; +import { TimeService } from '@/global/TimeService.js'; import { QueueLoggerService } from '../QueueLoggerService.js'; import type * as Bull from 'bullmq'; import type { DbJobDataWithUser } from '../types.js'; diff --git a/packages/backend/src/queue/processors/ExportUserListsProcessorService.ts b/packages/backend/src/queue/processors/ExportUserListsProcessorService.ts index 5e3bc8902b..39c71334a5 100644 --- a/packages/backend/src/queue/processors/ExportUserListsProcessorService.ts +++ b/packages/backend/src/queue/processors/ExportUserListsProcessorService.ts @@ -14,7 +14,7 @@ import { DriveService } from '@/core/DriveService.js'; import { createTemp } from '@/misc/create-temp.js'; import { UtilityService } from '@/core/UtilityService.js'; import { NotificationService } from '@/core/NotificationService.js'; -import { TimeService } from '@/core/TimeService.js'; +import { TimeService } from '@/global/TimeService.js'; import { bindThis } from '@/decorators.js'; import { QueueLoggerService } from '../QueueLoggerService.js'; import type * as Bull from 'bullmq'; diff --git a/packages/backend/src/queue/processors/ImportAntennasProcessorService.ts b/packages/backend/src/queue/processors/ImportAntennasProcessorService.ts index 3060377b18..4a69c31200 100644 --- a/packages/backend/src/queue/processors/ImportAntennasProcessorService.ts +++ b/packages/backend/src/queue/processors/ImportAntennasProcessorService.ts @@ -12,7 +12,7 @@ import type { AntennasRepository, UsersRepository } from '@/models/_.js'; import { DI } from '@/di-symbols.js'; import { bindThis } from '@/decorators.js'; import { NotificationService } from '@/core/NotificationService.js'; -import { TimeService } from '@/core/TimeService.js'; +import { TimeService } from '@/global/TimeService.js'; import { QueueLoggerService } from '../QueueLoggerService.js'; import { DBAntennaImportJobData } from '../types.js'; import type * as Bull from 'bullmq'; diff --git a/packages/backend/src/queue/processors/InboxProcessorService.ts b/packages/backend/src/queue/processors/InboxProcessorService.ts index 366d759649..4efbb088c6 100644 --- a/packages/backend/src/queue/processors/InboxProcessorService.ts +++ b/packages/backend/src/queue/processors/InboxProcessorService.ts @@ -31,7 +31,7 @@ import { SkApInboxLog } from '@/models/_.js'; import type { Config } from '@/config.js'; import { ApLogService, calculateDurationSince } from '@/core/ApLogService.js'; import { UpdateInstanceQueue } from '@/core/UpdateInstanceQueue.js'; -import { TimeService } from '@/core/TimeService.js'; +import { TimeService } from '@/global/TimeService.js'; import { isRetryableError } from '@/misc/is-retryable-error.js'; import { renderInlineError } from '@/misc/render-inline-error.js'; import { QueueLoggerService } from '../QueueLoggerService.js'; diff --git a/packages/backend/src/queue/processors/ScheduleNotePostProcessorService.ts b/packages/backend/src/queue/processors/ScheduleNotePostProcessorService.ts index bc380d5848..c550106e18 100644 --- a/packages/backend/src/queue/processors/ScheduleNotePostProcessorService.ts +++ b/packages/backend/src/queue/processors/ScheduleNotePostProcessorService.ts @@ -13,7 +13,7 @@ import { NotificationService } from '@/core/NotificationService.js'; import { IdentifiableError } from '@/misc/identifiable-error.js'; import type { MiScheduleNoteType } from '@/models/NoteSchedule.js'; import { renderInlineError } from '@/misc/render-inline-error.js'; -import { TimeService } from '@/core/TimeService.js'; +import { TimeService } from '@/global/TimeService.js'; import { QueueLoggerService } from '../QueueLoggerService.js'; import type * as Bull from 'bullmq'; import type { ScheduleNotePostJobData } from '../types.js'; diff --git a/packages/backend/src/queue/processors/SystemWebhookDeliverProcessorService.ts b/packages/backend/src/queue/processors/SystemWebhookDeliverProcessorService.ts index 56138e831b..641aec9fe8 100644 --- a/packages/backend/src/queue/processors/SystemWebhookDeliverProcessorService.ts +++ b/packages/backend/src/queue/processors/SystemWebhookDeliverProcessorService.ts @@ -11,7 +11,7 @@ import type { Config } from '@/config.js'; import type Logger from '@/logger.js'; import { HttpRequestService } from '@/core/HttpRequestService.js'; import { StatusError } from '@/misc/status-error.js'; -import { TimeService } from '@/core/TimeService.js'; +import { TimeService } from '@/global/TimeService.js'; import { bindThis } from '@/decorators.js'; import { renderInlineError } from '@/misc/render-inline-error.js'; import { QueueLoggerService } from '../QueueLoggerService.js'; diff --git a/packages/backend/src/queue/processors/UserWebhookDeliverProcessorService.ts b/packages/backend/src/queue/processors/UserWebhookDeliverProcessorService.ts index e4bba87df4..6d96cfa3f4 100644 --- a/packages/backend/src/queue/processors/UserWebhookDeliverProcessorService.ts +++ b/packages/backend/src/queue/processors/UserWebhookDeliverProcessorService.ts @@ -11,7 +11,7 @@ import type { Config } from '@/config.js'; import type Logger from '@/logger.js'; import { HttpRequestService } from '@/core/HttpRequestService.js'; import { StatusError } from '@/misc/status-error.js'; -import { TimeService } from '@/core/TimeService.js'; +import { TimeService } from '@/global/TimeService.js'; import { bindThis } from '@/decorators.js'; import { QueueLoggerService } from '../QueueLoggerService.js'; import { UserWebhookDeliverJobData } from '../types.js'; diff --git a/packages/backend/src/server/SkRateLimiterService.ts b/packages/backend/src/server/SkRateLimiterService.ts index b21002a7e0..0087a7c57a 100644 --- a/packages/backend/src/server/SkRateLimiterService.ts +++ b/packages/backend/src/server/SkRateLimiterService.ts @@ -6,11 +6,11 @@ import { Inject, Injectable } from '@nestjs/common'; import Redis from 'ioredis'; import type { MiUser } from '@/models/_.js'; -import { TimeService } from '@/core/TimeService.js'; -import { EnvService } from '@/core/EnvService.js'; +import { TimeService } from '@/global/TimeService.js'; +import { EnvService } from '@/global/EnvService.js'; import { BucketRateLimit, LegacyRateLimit, LimitInfo, RateLimit, hasMinLimit, isLegacyRateLimit, Keyed, hasMaxLimit, disabledLimitInfo, MaxLegacyLimit, MinLegacyLimit } from '@/misc/rate-limit-utils.js'; import { RoleService } from '@/core/RoleService.js'; -import { CacheManagementService, type ManagedMemoryKVCache } from '@/core/CacheManagementService.js'; +import { CacheManagementService, type ManagedMemoryKVCache } from '@/global/CacheManagementService.js'; import { ConflictError } from '@/misc/errors/ConflictError.js'; import { DI } from '@/di-symbols.js'; diff --git a/packages/backend/src/server/api/ApiCallService.ts b/packages/backend/src/server/api/ApiCallService.ts index 9c79434461..6605783ff1 100644 --- a/packages/backend/src/server/api/ApiCallService.ts +++ b/packages/backend/src/server/api/ApiCallService.ts @@ -20,7 +20,7 @@ import { RoleService } from '@/core/RoleService.js'; import type { Config } from '@/config.js'; import { sendRateLimitHeaders } from '@/misc/rate-limit-utils.js'; import { SkRateLimiterService } from '@/server/SkRateLimiterService.js'; -import { TimeService, type TimerHandle } from '@/core/TimeService.js'; +import { TimeService, type TimerHandle } from '@/global/TimeService.js'; import { renderInlineError } from '@/misc/render-inline-error.js'; import { renderFullError } from '@/misc/render-full-error.js'; import { ApiError } from './error.js'; diff --git a/packages/backend/src/server/api/AuthenticateService.ts b/packages/backend/src/server/api/AuthenticateService.ts index 124c3649ff..11054319ad 100644 --- a/packages/backend/src/server/api/AuthenticateService.ts +++ b/packages/backend/src/server/api/AuthenticateService.ts @@ -14,8 +14,8 @@ import { CacheService } from '@/core/CacheService.js'; import { isNativeUserToken } from '@/misc/token.js'; import { bindThis } from '@/decorators.js'; import { attachCallerId } from '@/misc/attach-caller-id.js'; -import { CacheManagementService, type ManagedMemoryKVCache } from '@/core/CacheManagementService.js'; -import { TimeService } from '@/core/TimeService.js'; +import { CacheManagementService, type ManagedMemoryKVCache } from '@/global/CacheManagementService.js'; +import { TimeService } from '@/global/TimeService.js'; export class AuthenticationError extends Error { constructor(message: string) { diff --git a/packages/backend/src/server/api/SignupApiService.ts b/packages/backend/src/server/api/SignupApiService.ts index d3c3740b9f..efaa059d36 100644 --- a/packages/backend/src/server/api/SignupApiService.ts +++ b/packages/backend/src/server/api/SignupApiService.ts @@ -21,7 +21,7 @@ import { L_CHARS, secureRndstr } from '@/misc/secure-rndstr.js'; import { RoleService } from '@/core/RoleService.js'; import Logger from '@/logger.js'; import { LoggerService } from '@/core/LoggerService.js'; -import { TimeService } from '@/core/TimeService.js'; +import { TimeService } from '@/global/TimeService.js'; import { SigninService } from './SigninService.js'; import type { FastifyRequest, FastifyReply } from 'fastify'; diff --git a/packages/backend/src/server/api/StreamingApiServerService.ts b/packages/backend/src/server/api/StreamingApiServerService.ts index f6a8a867ef..20d8fc4ca2 100644 --- a/packages/backend/src/server/api/StreamingApiServerService.ts +++ b/packages/backend/src/server/api/StreamingApiServerService.ts @@ -24,7 +24,7 @@ import { LoggerService } from '@/core/LoggerService.js'; import type Logger from '@/logger.js'; import { SkRateLimiterService } from '@/server/SkRateLimiterService.js'; import { QueryService } from '@/core/QueryService.js'; -import { TimeService, type TimerHandle } from '@/core/TimeService.js'; +import { TimeService, type TimerHandle } from '@/global/TimeService.js'; import { AuthenticateService, AuthenticationError } from './AuthenticateService.js'; import MainStreamConnection from './stream/Connection.js'; import { ChannelsService } from './stream/ChannelsService.js'; diff --git a/packages/backend/src/server/api/endpoints/admin/ad/list.ts b/packages/backend/src/server/api/endpoints/admin/ad/list.ts index 9009ef1525..e3d40d5be4 100644 --- a/packages/backend/src/server/api/endpoints/admin/ad/list.ts +++ b/packages/backend/src/server/api/endpoints/admin/ad/list.ts @@ -8,7 +8,7 @@ import { Endpoint } from '@/server/api/endpoint-base.js'; import type { AdsRepository } from '@/models/_.js'; import { QueryService } from '@/core/QueryService.js'; import { DI } from '@/di-symbols.js'; -import { TimeService } from '@/core/TimeService.js'; +import { TimeService } from '@/global/TimeService.js'; export const meta = { tags: ['admin'], diff --git a/packages/backend/src/server/api/endpoints/admin/announcements/update.ts b/packages/backend/src/server/api/endpoints/admin/announcements/update.ts index 37351c9b73..5a0ebe64ba 100644 --- a/packages/backend/src/server/api/endpoints/admin/announcements/update.ts +++ b/packages/backend/src/server/api/endpoints/admin/announcements/update.ts @@ -9,7 +9,7 @@ import type { AnnouncementsRepository } from '@/models/_.js'; import { DI } from '@/di-symbols.js'; import { AnnouncementService } from '@/core/AnnouncementService.js'; import { IdentifiableError } from '@/misc/identifiable-error.js'; -import { TimeService } from '@/core/TimeService.js'; +import { TimeService } from '@/global/TimeService.js'; import { ApiError } from '../../../error.js'; export const meta = { diff --git a/packages/backend/src/server/api/endpoints/admin/invite/create.ts b/packages/backend/src/server/api/endpoints/admin/invite/create.ts index ff9742706f..fcdcf84b6e 100644 --- a/packages/backend/src/server/api/endpoints/admin/invite/create.ts +++ b/packages/backend/src/server/api/endpoints/admin/invite/create.ts @@ -11,7 +11,7 @@ import { IdService } from '@/core/IdService.js'; import { DI } from '@/di-symbols.js'; import { generateInviteCode } from '@/misc/generate-invite-code.js'; import { ModerationLogService } from '@/core/ModerationLogService.js'; -import { TimeService } from '@/core/TimeService.js'; +import { TimeService } from '@/global/TimeService.js'; import { ApiError } from '../../../error.js'; export const meta = { diff --git a/packages/backend/src/server/api/endpoints/admin/invite/list.ts b/packages/backend/src/server/api/endpoints/admin/invite/list.ts index 32f4c9de25..77f7291a5e 100644 --- a/packages/backend/src/server/api/endpoints/admin/invite/list.ts +++ b/packages/backend/src/server/api/endpoints/admin/invite/list.ts @@ -8,7 +8,7 @@ import { Endpoint } from '@/server/api/endpoint-base.js'; import type { RegistrationTicketsRepository } from '@/models/_.js'; import { InviteCodeEntityService } from '@/core/entities/InviteCodeEntityService.js'; import { DI } from '@/di-symbols.js'; -import { TimeService } from '@/core/TimeService.js'; +import { TimeService } from '@/global/TimeService.js'; export const meta = { tags: ['admin'], diff --git a/packages/backend/src/server/api/endpoints/admin/roles/assign.ts b/packages/backend/src/server/api/endpoints/admin/roles/assign.ts index 7080844d03..9a19be10ba 100644 --- a/packages/backend/src/server/api/endpoints/admin/roles/assign.ts +++ b/packages/backend/src/server/api/endpoints/admin/roles/assign.ts @@ -9,7 +9,7 @@ import type { RolesRepository, UsersRepository } from '@/models/_.js'; import { DI } from '@/di-symbols.js'; import { ApiError } from '@/server/api/error.js'; import { RoleService } from '@/core/RoleService.js'; -import { TimeService } from '@/core/TimeService.js'; +import { TimeService } from '@/global/TimeService.js'; export const meta = { tags: ['admin', 'role'], diff --git a/packages/backend/src/server/api/endpoints/admin/roles/users.ts b/packages/backend/src/server/api/endpoints/admin/roles/users.ts index bb40097390..db6dd1bc51 100644 --- a/packages/backend/src/server/api/endpoints/admin/roles/users.ts +++ b/packages/backend/src/server/api/endpoints/admin/roles/users.ts @@ -11,7 +11,7 @@ import { QueryService } from '@/core/QueryService.js'; import { DI } from '@/di-symbols.js'; import { UserEntityService } from '@/core/entities/UserEntityService.js'; import { IdService } from '@/core/IdService.js'; -import { TimeService } from '@/core/TimeService.js'; +import { TimeService } from '@/global/TimeService.js'; import { ApiError } from '../../../error.js'; export const meta = { diff --git a/packages/backend/src/server/api/endpoints/admin/show-users.ts b/packages/backend/src/server/api/endpoints/admin/show-users.ts index bca23bcdd6..adc5c6005d 100644 --- a/packages/backend/src/server/api/endpoints/admin/show-users.ts +++ b/packages/backend/src/server/api/endpoints/admin/show-users.ts @@ -10,7 +10,7 @@ import { DI } from '@/di-symbols.js'; import { UserEntityService } from '@/core/entities/UserEntityService.js'; import { sqlLikeEscape } from '@/misc/sql-like-escape.js'; import { RoleService } from '@/core/RoleService.js'; -import { TimeService } from '@/core/TimeService.js'; +import { TimeService } from '@/global/TimeService.js'; export const meta = { tags: ['admin'], diff --git a/packages/backend/src/server/api/endpoints/antennas/create.ts b/packages/backend/src/server/api/endpoints/antennas/create.ts index 803e83ec82..52c6dd1f4c 100644 --- a/packages/backend/src/server/api/endpoints/antennas/create.ts +++ b/packages/backend/src/server/api/endpoints/antennas/create.ts @@ -11,7 +11,7 @@ import { GlobalEventService } from '@/core/GlobalEventService.js'; import { AntennaEntityService } from '@/core/entities/AntennaEntityService.js'; import { DI } from '@/di-symbols.js'; import { RoleService } from '@/core/RoleService.js'; -import { TimeService } from '@/core/TimeService.js'; +import { TimeService } from '@/global/TimeService.js'; import { ApiError } from '../../error.js'; export const meta = { diff --git a/packages/backend/src/server/api/endpoints/antennas/notes.ts b/packages/backend/src/server/api/endpoints/antennas/notes.ts index ed20809e47..683d5b9e91 100644 --- a/packages/backend/src/server/api/endpoints/antennas/notes.ts +++ b/packages/backend/src/server/api/endpoints/antennas/notes.ts @@ -11,7 +11,7 @@ import { QueryService } from '@/core/QueryService.js'; import { DI } from '@/di-symbols.js'; import { NoteEntityService } from '@/core/entities/NoteEntityService.js'; import { IdService } from '@/core/IdService.js'; -import { TimeService } from '@/core/TimeService.js'; +import { TimeService } from '@/global/TimeService.js'; import { FanoutTimelineService } from '@/core/FanoutTimelineService.js'; import { GlobalEventService } from '@/core/GlobalEventService.js'; import { trackPromise } from '@/misc/promise-tracker.js'; diff --git a/packages/backend/src/server/api/endpoints/antennas/update.ts b/packages/backend/src/server/api/endpoints/antennas/update.ts index 44a6ed1286..6ed10cb618 100644 --- a/packages/backend/src/server/api/endpoints/antennas/update.ts +++ b/packages/backend/src/server/api/endpoints/antennas/update.ts @@ -8,7 +8,7 @@ import { Endpoint } from '@/server/api/endpoint-base.js'; import type { AntennasRepository, UserListsRepository } from '@/models/_.js'; import { GlobalEventService } from '@/core/GlobalEventService.js'; import { AntennaEntityService } from '@/core/entities/AntennaEntityService.js'; -import { TimeService } from '@/core/TimeService.js'; +import { TimeService } from '@/global/TimeService.js'; import { DI } from '@/di-symbols.js'; import { ApiError } from '../../error.js'; diff --git a/packages/backend/src/server/api/endpoints/auth/accept.ts b/packages/backend/src/server/api/endpoints/auth/accept.ts index 3d69cc178c..1a57f85f7e 100644 --- a/packages/backend/src/server/api/endpoints/auth/accept.ts +++ b/packages/backend/src/server/api/endpoints/auth/accept.ts @@ -8,7 +8,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { AuthSessionsRepository, AppsRepository, AccessTokensRepository } from '@/models/_.js'; import { IdService } from '@/core/IdService.js'; -import { TimeService } from '@/core/TimeService.js'; +import { TimeService } from '@/global/TimeService.js'; import { secureRndstr } from '@/misc/secure-rndstr.js'; import { DI } from '@/di-symbols.js'; import { ApiError } from '../../error.js'; diff --git a/packages/backend/src/server/api/endpoints/bubble-game/ranking.ts b/packages/backend/src/server/api/endpoints/bubble-game/ranking.ts index 0afd586de7..525f6672f9 100644 --- a/packages/backend/src/server/api/endpoints/bubble-game/ranking.ts +++ b/packages/backend/src/server/api/endpoints/bubble-game/ranking.ts @@ -9,7 +9,7 @@ import { Endpoint } from '@/server/api/endpoint-base.js'; import type { BubbleGameRecordsRepository } from '@/models/_.js'; import { DI } from '@/di-symbols.js'; import { UserEntityService } from '@/core/entities/UserEntityService.js'; -import { TimeService } from '@/core/TimeService.js'; +import { TimeService } from '@/global/TimeService.js'; export const meta = { allowGet: true, diff --git a/packages/backend/src/server/api/endpoints/bubble-game/register.ts b/packages/backend/src/server/api/endpoints/bubble-game/register.ts index 8d5ad64562..494c3fcfb9 100644 --- a/packages/backend/src/server/api/endpoints/bubble-game/register.ts +++ b/packages/backend/src/server/api/endpoints/bubble-game/register.ts @@ -7,7 +7,7 @@ import { Inject, Injectable } from '@nestjs/common'; import ms from 'ms'; import { Endpoint } from '@/server/api/endpoint-base.js'; import { IdService } from '@/core/IdService.js'; -import { TimeService } from '@/core/TimeService.js'; +import { TimeService } from '@/global/TimeService.js'; import type { BubbleGameRecordsRepository } from '@/models/_.js'; import { DI } from '@/di-symbols.js'; import { ApiError } from '../../error.js'; diff --git a/packages/backend/src/server/api/endpoints/emojis.ts b/packages/backend/src/server/api/endpoints/emojis.ts index 4f194be8a9..4604191e8e 100644 --- a/packages/backend/src/server/api/endpoints/emojis.ts +++ b/packages/backend/src/server/api/endpoints/emojis.ts @@ -8,7 +8,7 @@ import type { EmojisRepository, MiEmoji } from '@/models/_.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import { EmojiEntityService } from '@/core/entities/EmojiEntityService.js'; import { DI } from '@/di-symbols.js'; -import { CacheManagementService, type ManagedMemorySingleCache } from '@/core/CacheManagementService.js'; +import { CacheManagementService, type ManagedMemorySingleCache } from '@/global/CacheManagementService.js'; import { CustomEmojiService } from '@/core/CustomEmojiService.js'; export const meta = { diff --git a/packages/backend/src/server/api/endpoints/flash/create.ts b/packages/backend/src/server/api/endpoints/flash/create.ts index 25dc2a1880..10e9111344 100644 --- a/packages/backend/src/server/api/endpoints/flash/create.ts +++ b/packages/backend/src/server/api/endpoints/flash/create.ts @@ -10,7 +10,7 @@ import { IdService } from '@/core/IdService.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import { DI } from '@/di-symbols.js'; import { FlashEntityService } from '@/core/entities/FlashEntityService.js'; -import { TimeService } from '@/core/TimeService.js'; +import { TimeService } from '@/global/TimeService.js'; export const meta = { tags: ['flash'], diff --git a/packages/backend/src/server/api/endpoints/flash/update.ts b/packages/backend/src/server/api/endpoints/flash/update.ts index cbe5baa85f..58581d0904 100644 --- a/packages/backend/src/server/api/endpoints/flash/update.ts +++ b/packages/backend/src/server/api/endpoints/flash/update.ts @@ -7,7 +7,7 @@ import ms from 'ms'; import { Inject, Injectable } from '@nestjs/common'; import type { FlashsRepository } from '@/models/_.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import { TimeService } from '@/core/TimeService.js'; +import { TimeService } from '@/global/TimeService.js'; import { DI } from '@/di-symbols.js'; import { ApiError } from '../../error.js'; diff --git a/packages/backend/src/server/api/endpoints/gallery/featured.ts b/packages/backend/src/server/api/endpoints/gallery/featured.ts index b31d7de4bd..0c62332d07 100644 --- a/packages/backend/src/server/api/endpoints/gallery/featured.ts +++ b/packages/backend/src/server/api/endpoints/gallery/featured.ts @@ -9,7 +9,7 @@ import type { GalleryPostsRepository } from '@/models/_.js'; import { GalleryPostEntityService } from '@/core/entities/GalleryPostEntityService.js'; import { DI } from '@/di-symbols.js'; import { FeaturedService } from '@/core/FeaturedService.js'; -import { TimeService } from '@/core/TimeService.js'; +import { TimeService } from '@/global/TimeService.js'; export const meta = { tags: ['gallery'], diff --git a/packages/backend/src/server/api/endpoints/gallery/posts/create.ts b/packages/backend/src/server/api/endpoints/gallery/posts/create.ts index 0da88a2fdc..f280dd8986 100644 --- a/packages/backend/src/server/api/endpoints/gallery/posts/create.ts +++ b/packages/backend/src/server/api/endpoints/gallery/posts/create.ts @@ -12,7 +12,7 @@ import type { MiDriveFile } from '@/models/DriveFile.js'; import { IdService } from '@/core/IdService.js'; import { GalleryPostEntityService } from '@/core/entities/GalleryPostEntityService.js'; import { DI } from '@/di-symbols.js'; -import { TimeService } from '@/core/TimeService.js'; +import { TimeService } from '@/global/TimeService.js'; export const meta = { tags: ['gallery'], diff --git a/packages/backend/src/server/api/endpoints/gallery/posts/like.ts b/packages/backend/src/server/api/endpoints/gallery/posts/like.ts index f72aa73ba7..d96f9d8184 100644 --- a/packages/backend/src/server/api/endpoints/gallery/posts/like.ts +++ b/packages/backend/src/server/api/endpoints/gallery/posts/like.ts @@ -8,7 +8,7 @@ import { Endpoint } from '@/server/api/endpoint-base.js'; import type { GalleryLikesRepository, GalleryPostsRepository } from '@/models/_.js'; import { FeaturedService, GALLERY_POSTS_RANKING_WINDOW } from '@/core/FeaturedService.js'; import { IdService } from '@/core/IdService.js'; -import { TimeService } from '@/core/TimeService.js'; +import { TimeService } from '@/global/TimeService.js'; import { DI } from '@/di-symbols.js'; import { ApiError } from '../../../error.js'; diff --git a/packages/backend/src/server/api/endpoints/gallery/posts/unlike.ts b/packages/backend/src/server/api/endpoints/gallery/posts/unlike.ts index 25d77228ec..f5c7d9a61e 100644 --- a/packages/backend/src/server/api/endpoints/gallery/posts/unlike.ts +++ b/packages/backend/src/server/api/endpoints/gallery/posts/unlike.ts @@ -8,7 +8,7 @@ import { Endpoint } from '@/server/api/endpoint-base.js'; import type { GalleryPostsRepository, GalleryLikesRepository } from '@/models/_.js'; import { FeaturedService, GALLERY_POSTS_RANKING_WINDOW } from '@/core/FeaturedService.js'; import { IdService } from '@/core/IdService.js'; -import { TimeService } from '@/core/TimeService.js'; +import { TimeService } from '@/global/TimeService.js'; import { DI } from '@/di-symbols.js'; import { ApiError } from '../../../error.js'; diff --git a/packages/backend/src/server/api/endpoints/gallery/posts/update.ts b/packages/backend/src/server/api/endpoints/gallery/posts/update.ts index 6d0264bb67..a7dfe35aca 100644 --- a/packages/backend/src/server/api/endpoints/gallery/posts/update.ts +++ b/packages/backend/src/server/api/endpoints/gallery/posts/update.ts @@ -10,7 +10,7 @@ import type { DriveFilesRepository, GalleryPostsRepository } from '@/models/_.js import type { MiDriveFile } from '@/models/DriveFile.js'; import { GalleryPostEntityService } from '@/core/entities/GalleryPostEntityService.js'; import { DI } from '@/di-symbols.js'; -import { TimeService } from '@/core/TimeService.js'; +import { TimeService } from '@/global/TimeService.js'; export const meta = { tags: ['gallery'], diff --git a/packages/backend/src/server/api/endpoints/get-online-users-count.ts b/packages/backend/src/server/api/endpoints/get-online-users-count.ts index 939ec33dfa..307bdce1cd 100644 --- a/packages/backend/src/server/api/endpoints/get-online-users-count.ts +++ b/packages/backend/src/server/api/endpoints/get-online-users-count.ts @@ -9,7 +9,7 @@ import { USER_ONLINE_THRESHOLD } from '@/const.js'; import type { UsersRepository } from '@/models/_.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import { DI } from '@/di-symbols.js'; -import { TimeService } from '@/core/TimeService.js'; +import { TimeService } from '@/global/TimeService.js'; export const meta = { tags: ['meta'], diff --git a/packages/backend/src/server/api/endpoints/hashtags/users.ts b/packages/backend/src/server/api/endpoints/hashtags/users.ts index 7f018132dc..1be9f6a553 100644 --- a/packages/backend/src/server/api/endpoints/hashtags/users.ts +++ b/packages/backend/src/server/api/endpoints/hashtags/users.ts @@ -11,7 +11,7 @@ import { normalizeForSearch } from '@/misc/normalize-for-search.js'; import { UserEntityService } from '@/core/entities/UserEntityService.js'; import { DI } from '@/di-symbols.js'; import { RoleService } from '@/core/RoleService.js'; -import { TimeService } from '@/core/TimeService.js'; +import { TimeService } from '@/global/TimeService.js'; export const meta = { requireCredential: false, diff --git a/packages/backend/src/server/api/endpoints/i.ts b/packages/backend/src/server/api/endpoints/i.ts index 6aaf13d791..1c7e8e8bbb 100644 --- a/packages/backend/src/server/api/endpoints/i.ts +++ b/packages/backend/src/server/api/endpoints/i.ts @@ -7,7 +7,7 @@ import { Inject, Injectable } from '@nestjs/common'; import type { UserProfilesRepository } from '@/models/_.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import { UserEntityService } from '@/core/entities/UserEntityService.js'; -import { TimeService } from '@/core/TimeService.js'; +import { TimeService } from '@/global/TimeService.js'; import { DI } from '@/di-symbols.js'; import { ApiError } from '../error.js'; diff --git a/packages/backend/src/server/api/endpoints/i/import-blocking.ts b/packages/backend/src/server/api/endpoints/i/import-blocking.ts index 3d4ab91864..5cc50af1ec 100644 --- a/packages/backend/src/server/api/endpoints/i/import-blocking.ts +++ b/packages/backend/src/server/api/endpoints/i/import-blocking.ts @@ -7,7 +7,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import { QueueService } from '@/core/QueueService.js'; import { AccountMoveService } from '@/core/AccountMoveService.js'; -import { TimeService } from '@/core/TimeService.js'; +import { TimeService } from '@/global/TimeService.js'; import type { DriveFilesRepository } from '@/models/_.js'; import { DI } from '@/di-symbols.js'; import { ApiError } from '../../error.js'; diff --git a/packages/backend/src/server/api/endpoints/i/import-following.ts b/packages/backend/src/server/api/endpoints/i/import-following.ts index cfd5138dbc..bff498a62e 100644 --- a/packages/backend/src/server/api/endpoints/i/import-following.ts +++ b/packages/backend/src/server/api/endpoints/i/import-following.ts @@ -8,7 +8,7 @@ import ms from 'ms'; import { Endpoint } from '@/server/api/endpoint-base.js'; import { QueueService } from '@/core/QueueService.js'; import { AccountMoveService } from '@/core/AccountMoveService.js'; -import { TimeService } from '@/core/TimeService.js'; +import { TimeService } from '@/global/TimeService.js'; import type { DriveFilesRepository } from '@/models/_.js'; import { DI } from '@/di-symbols.js'; import { ApiError } from '../../error.js'; diff --git a/packages/backend/src/server/api/endpoints/i/import-muting.ts b/packages/backend/src/server/api/endpoints/i/import-muting.ts index f4f95ccfd2..ed74a84386 100644 --- a/packages/backend/src/server/api/endpoints/i/import-muting.ts +++ b/packages/backend/src/server/api/endpoints/i/import-muting.ts @@ -7,7 +7,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import { QueueService } from '@/core/QueueService.js'; import { AccountMoveService } from '@/core/AccountMoveService.js'; -import { TimeService } from '@/core/TimeService.js'; +import { TimeService } from '@/global/TimeService.js'; import type { DriveFilesRepository } from '@/models/_.js'; import { DI } from '@/di-symbols.js'; import { ApiError } from '../../error.js'; diff --git a/packages/backend/src/server/api/endpoints/i/import-user-lists.ts b/packages/backend/src/server/api/endpoints/i/import-user-lists.ts index 53d5f350ac..0d572a86b8 100644 --- a/packages/backend/src/server/api/endpoints/i/import-user-lists.ts +++ b/packages/backend/src/server/api/endpoints/i/import-user-lists.ts @@ -7,7 +7,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import { QueueService } from '@/core/QueueService.js'; import { AccountMoveService } from '@/core/AccountMoveService.js'; -import { TimeService } from '@/core/TimeService.js'; +import { TimeService } from '@/global/TimeService.js'; import type { DriveFilesRepository } from '@/models/_.js'; import { DI } from '@/di-symbols.js'; import { ApiError } from '../../error.js'; diff --git a/packages/backend/src/server/api/endpoints/invite/create.ts b/packages/backend/src/server/api/endpoints/invite/create.ts index 1e96157b55..5c3a71f2ed 100644 --- a/packages/backend/src/server/api/endpoints/invite/create.ts +++ b/packages/backend/src/server/api/endpoints/invite/create.ts @@ -10,7 +10,7 @@ import type { RegistrationTicketsRepository } from '@/models/_.js'; import { InviteCodeEntityService } from '@/core/entities/InviteCodeEntityService.js'; import { IdService } from '@/core/IdService.js'; import { RoleService } from '@/core/RoleService.js'; -import { TimeService } from '@/core/TimeService.js'; +import { TimeService } from '@/global/TimeService.js'; import { DI } from '@/di-symbols.js'; import { generateInviteCode } from '@/misc/generate-invite-code.js'; import { ApiError } from '../../error.js'; diff --git a/packages/backend/src/server/api/endpoints/invite/limit.ts b/packages/backend/src/server/api/endpoints/invite/limit.ts index b7bb4f1d22..2b1bc8a442 100644 --- a/packages/backend/src/server/api/endpoints/invite/limit.ts +++ b/packages/backend/src/server/api/endpoints/invite/limit.ts @@ -10,7 +10,7 @@ import type { RegistrationTicketsRepository } from '@/models/_.js'; import { RoleService } from '@/core/RoleService.js'; import { DI } from '@/di-symbols.js'; import { IdService } from '@/core/IdService.js'; -import { TimeService } from '@/core/TimeService.js'; +import { TimeService } from '@/global/TimeService.js'; export const meta = { tags: ['meta'], diff --git a/packages/backend/src/server/api/endpoints/miauth/gen-token.ts b/packages/backend/src/server/api/endpoints/miauth/gen-token.ts index 088197f487..2f2035f52b 100644 --- a/packages/backend/src/server/api/endpoints/miauth/gen-token.ts +++ b/packages/backend/src/server/api/endpoints/miauth/gen-token.ts @@ -11,7 +11,7 @@ import { IdService } from '@/core/IdService.js'; import { NotificationService } from '@/core/NotificationService.js'; import { secureRndstr } from '@/misc/secure-rndstr.js'; import { DI } from '@/di-symbols.js'; -import { TimeService } from '@/core/TimeService.js'; +import { TimeService } from '@/global/TimeService.js'; import { CacheService } from '@/core/CacheService.js'; export const meta = { diff --git a/packages/backend/src/server/api/endpoints/mute/create.ts b/packages/backend/src/server/api/endpoints/mute/create.ts index 00decb90ea..608f134b00 100644 --- a/packages/backend/src/server/api/endpoints/mute/create.ts +++ b/packages/backend/src/server/api/endpoints/mute/create.ts @@ -10,7 +10,7 @@ import type { MutingsRepository } from '@/models/_.js'; import { DI } from '@/di-symbols.js'; import { GetterService } from '@/server/api/GetterService.js'; import { UserMutingService } from '@/core/UserMutingService.js'; -import { TimeService } from '@/core/TimeService.js'; +import { TimeService } from '@/global/TimeService.js'; import { ApiError } from '../../error.js'; export const meta = { diff --git a/packages/backend/src/server/api/endpoints/notes/create.ts b/packages/backend/src/server/api/endpoints/notes/create.ts index 7077832305..72897922e2 100644 --- a/packages/backend/src/server/api/endpoints/notes/create.ts +++ b/packages/backend/src/server/api/endpoints/notes/create.ts @@ -18,7 +18,7 @@ import { NoteCreateService } from '@/core/NoteCreateService.js'; import { DI } from '@/di-symbols.js'; import { isQuote, isRenote } from '@/misc/is-renote.js'; import { IdentifiableError } from '@/misc/identifiable-error.js'; -import { TimeService } from '@/core/TimeService.js'; +import { TimeService } from '@/global/TimeService.js'; import { ApiError } from '../../error.js'; export const meta = { diff --git a/packages/backend/src/server/api/endpoints/notes/edit.ts b/packages/backend/src/server/api/endpoints/notes/edit.ts index 17bea6df3d..4ffd202eeb 100644 --- a/packages/backend/src/server/api/endpoints/notes/edit.ts +++ b/packages/backend/src/server/api/endpoints/notes/edit.ts @@ -17,7 +17,7 @@ import { NoteEditService } from '@/core/NoteEditService.js'; import { DI } from '@/di-symbols.js'; import { isQuote, isRenote } from '@/misc/is-renote.js'; import { IdentifiableError } from '@/misc/identifiable-error.js'; -import { TimeService } from '@/core/TimeService.js'; +import { TimeService } from '@/global/TimeService.js'; import { ApiError } from '../../error.js'; export const meta = { diff --git a/packages/backend/src/server/api/endpoints/notes/featured.ts b/packages/backend/src/server/api/endpoints/notes/featured.ts index 7029db567d..f20046a211 100644 --- a/packages/backend/src/server/api/endpoints/notes/featured.ts +++ b/packages/backend/src/server/api/endpoints/notes/featured.ts @@ -13,7 +13,7 @@ import { isUserRelated } from '@/misc/is-user-related.js'; import { QueryService } from '@/core/QueryService.js'; import { ApiError } from '@/server/api/error.js'; import { RoleService } from '@/core/RoleService.js'; -import { TimeService } from '@/core/TimeService.js'; +import { TimeService } from '@/global/TimeService.js'; export const meta = { tags: ['notes'], diff --git a/packages/backend/src/server/api/endpoints/notes/polls/recommendation.ts b/packages/backend/src/server/api/endpoints/notes/polls/recommendation.ts index 5a309d1e29..c2a2b16586 100644 --- a/packages/backend/src/server/api/endpoints/notes/polls/recommendation.ts +++ b/packages/backend/src/server/api/endpoints/notes/polls/recommendation.ts @@ -12,7 +12,7 @@ import { DI } from '@/di-symbols.js'; import { QueryService } from '@/core/QueryService.js'; import { RoleService } from '@/core/RoleService.js'; import { ApiError } from '@/server/api/error.js'; -import { TimeService } from '@/core/TimeService.js'; +import { TimeService } from '@/global/TimeService.js'; export const meta = { tags: ['notes'], diff --git a/packages/backend/src/server/api/endpoints/notes/polls/vote.ts b/packages/backend/src/server/api/endpoints/notes/polls/vote.ts index afa37e3204..a842347060 100644 --- a/packages/backend/src/server/api/endpoints/notes/polls/vote.ts +++ b/packages/backend/src/server/api/endpoints/notes/polls/vote.ts @@ -15,7 +15,7 @@ import { ApRendererService } from '@/core/activitypub/ApRendererService.js'; import { GlobalEventService } from '@/core/GlobalEventService.js'; import { DI } from '@/di-symbols.js'; import { UserBlockingService } from '@/core/UserBlockingService.js'; -import { TimeService } from '@/core/TimeService.js'; +import { TimeService } from '@/global/TimeService.js'; import { ApiError } from '../../../error.js'; export const meta = { diff --git a/packages/backend/src/server/api/endpoints/notes/schedule/create.ts b/packages/backend/src/server/api/endpoints/notes/schedule/create.ts index 9dc1158822..fcbae5e07c 100644 --- a/packages/backend/src/server/api/endpoints/notes/schedule/create.ts +++ b/packages/backend/src/server/api/endpoints/notes/schedule/create.ts @@ -24,7 +24,7 @@ import { QueueService } from '@/core/QueueService.js'; import { IdService } from '@/core/IdService.js'; import { MiScheduleNoteType } from '@/models/NoteSchedule.js'; import { RoleService } from '@/core/RoleService.js'; -import { TimeService } from '@/core/TimeService.js'; +import { TimeService } from '@/global/TimeService.js'; import { ApiError } from '../../../error.js'; export const meta = { diff --git a/packages/backend/src/server/api/endpoints/pages/create.ts b/packages/backend/src/server/api/endpoints/pages/create.ts index 5931003747..907fcb00e0 100644 --- a/packages/backend/src/server/api/endpoints/pages/create.ts +++ b/packages/backend/src/server/api/endpoints/pages/create.ts @@ -10,7 +10,7 @@ import { IdService } from '@/core/IdService.js'; import { MiPage, pageNameSchema } from '@/models/Page.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import { PageEntityService } from '@/core/entities/PageEntityService.js'; -import { TimeService } from '@/core/TimeService.js'; +import { TimeService } from '@/global/TimeService.js'; import { DI } from '@/di-symbols.js'; import { ApiError } from '../../error.js'; diff --git a/packages/backend/src/server/api/endpoints/pages/update.ts b/packages/backend/src/server/api/endpoints/pages/update.ts index 0ca86867b6..d149cf52c1 100644 --- a/packages/backend/src/server/api/endpoints/pages/update.ts +++ b/packages/backend/src/server/api/endpoints/pages/update.ts @@ -8,7 +8,7 @@ import { Not } from 'typeorm'; import { Inject, Injectable } from '@nestjs/common'; import type { PagesRepository, DriveFilesRepository } from '@/models/_.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import { TimeService } from '@/core/TimeService.js'; +import { TimeService } from '@/global/TimeService.js'; import { DI } from '@/di-symbols.js'; import { ApiError } from '../../error.js'; import { pageNameSchema } from '@/models/Page.js'; diff --git a/packages/backend/src/server/api/endpoints/ping.ts b/packages/backend/src/server/api/endpoints/ping.ts index f6d2177962..4cfdab9e7c 100644 --- a/packages/backend/src/server/api/endpoints/ping.ts +++ b/packages/backend/src/server/api/endpoints/ping.ts @@ -5,7 +5,7 @@ import { Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import { TimeService } from '@/core/TimeService.js'; +import { TimeService } from '@/global/TimeService.js'; export const meta = { requireCredential: false, diff --git a/packages/backend/src/server/api/endpoints/reset-password.ts b/packages/backend/src/server/api/endpoints/reset-password.ts index 7a7e1fef86..813550bbcd 100644 --- a/packages/backend/src/server/api/endpoints/reset-password.ts +++ b/packages/backend/src/server/api/endpoints/reset-password.ts @@ -9,7 +9,7 @@ import type { UserProfilesRepository, PasswordResetRequestsRepository } from '@/ import { Endpoint } from '@/server/api/endpoint-base.js'; import { DI } from '@/di-symbols.js'; import { IdService } from '@/core/IdService.js'; -import { TimeService } from '@/core/TimeService.js'; +import { TimeService } from '@/global/TimeService.js'; export const meta = { tags: ['reset password'], diff --git a/packages/backend/src/server/api/endpoints/roles/users.ts b/packages/backend/src/server/api/endpoints/roles/users.ts index 8d19ea08d2..38ce3a9be4 100644 --- a/packages/backend/src/server/api/endpoints/roles/users.ts +++ b/packages/backend/src/server/api/endpoints/roles/users.ts @@ -8,7 +8,7 @@ import { Brackets } from 'typeorm'; import type { RoleAssignmentsRepository, RolesRepository } from '@/models/_.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import { QueryService } from '@/core/QueryService.js'; -import { TimeService } from '@/core/TimeService.js'; +import { TimeService } from '@/global/TimeService.js'; import { DI } from '@/di-symbols.js'; import { UserEntityService } from '@/core/entities/UserEntityService.js'; import { ApiError } from '../../error.js'; diff --git a/packages/backend/src/server/api/endpoints/users.ts b/packages/backend/src/server/api/endpoints/users.ts index f62bb275cd..1efab2afca 100644 --- a/packages/backend/src/server/api/endpoints/users.ts +++ b/packages/backend/src/server/api/endpoints/users.ts @@ -11,7 +11,7 @@ import { QueryService } from '@/core/QueryService.js'; import { UserEntityService } from '@/core/entities/UserEntityService.js'; import { DI } from '@/di-symbols.js'; import { RoleService } from '@/core/RoleService.js'; -import { TimeService } from '@/core/TimeService.js'; +import { TimeService } from '@/global/TimeService.js'; import type { SelectQueryBuilder } from 'typeorm'; export const meta = { diff --git a/packages/backend/src/server/api/endpoints/users/recommendation.ts b/packages/backend/src/server/api/endpoints/users/recommendation.ts index bbf9279b96..c9b698b0e6 100644 --- a/packages/backend/src/server/api/endpoints/users/recommendation.ts +++ b/packages/backend/src/server/api/endpoints/users/recommendation.ts @@ -10,7 +10,7 @@ import { Endpoint } from '@/server/api/endpoint-base.js'; import { QueryService } from '@/core/QueryService.js'; import { UserEntityService } from '@/core/entities/UserEntityService.js'; import { DI } from '@/di-symbols.js'; -import { TimeService } from '@/core/TimeService.js'; +import { TimeService } from '@/global/TimeService.js'; export const meta = { tags: ['users'], diff --git a/packages/backend/src/server/api/stream/Connection.ts b/packages/backend/src/server/api/stream/Connection.ts index 76fb44997f..d7f33c53a9 100644 --- a/packages/backend/src/server/api/stream/Connection.ts +++ b/packages/backend/src/server/api/stream/Connection.ts @@ -16,7 +16,7 @@ import { ChannelFollowingService } from '@/core/ChannelFollowingService.js'; import { isJsonObject } from '@/misc/json-value.js'; import type { JsonObject, JsonValue } from '@/misc/json-value.js'; import { LoggerService } from '@/core/LoggerService.js'; -import { TimeService, type TimerHandle } from '@/core/TimeService.js'; +import { TimeService, type TimerHandle } from '@/global/TimeService.js'; import type Logger from '@/logger.js'; import { QueryService } from '@/core/QueryService.js'; import type { ChannelsService } from './ChannelsService.js'; diff --git a/packages/backend/src/server/oauth/OAuth2ProviderService.ts b/packages/backend/src/server/oauth/OAuth2ProviderService.ts index 5e8f7c3cb4..5fa31abbc4 100644 --- a/packages/backend/src/server/oauth/OAuth2ProviderService.ts +++ b/packages/backend/src/server/oauth/OAuth2ProviderService.ts @@ -11,7 +11,7 @@ import { DI } from '@/di-symbols.js'; import { MastodonClientService } from '@/server/api/mastodon/MastodonClientService.js'; import { getErrorData } from '@/server/api/mastodon/MastodonLogger.js'; import { ServerUtilityService } from '@/server/ServerUtilityService.js'; -import { TimeService } from '@/core/TimeService.js'; +import { TimeService } from '@/global/TimeService.js'; import type { FastifyInstance } from 'fastify'; const kinds = [ diff --git a/packages/backend/src/server/web/ClientServerService.ts b/packages/backend/src/server/web/ClientServerService.ts index 36f2fbcb3c..c6fd8f4fb1 100644 --- a/packages/backend/src/server/web/ClientServerService.ts +++ b/packages/backend/src/server/web/ClientServerService.ts @@ -45,7 +45,7 @@ import { handleRequestRedirectToOmitSearch } from '@/misc/fastify-hook-handlers. import { bindThis } from '@/decorators.js'; import { FlashEntityService } from '@/core/entities/FlashEntityService.js'; import { RoleService } from '@/core/RoleService.js'; -import { TimeService } from '@/core/TimeService.js'; +import { TimeService } from '@/global/TimeService.js'; import { ReversiGameEntityService } from '@/core/entities/ReversiGameEntityService.js'; import { AnnouncementEntityService } from '@/core/entities/AnnouncementEntityService.js'; import { FeedService } from './FeedService.js'; diff --git a/packages/backend/src/server/web/FeedService.ts b/packages/backend/src/server/web/FeedService.ts index 5de05057bc..e53cfc7c0c 100644 --- a/packages/backend/src/server/web/FeedService.ts +++ b/packages/backend/src/server/web/FeedService.ts @@ -16,7 +16,7 @@ import { DriveFileEntityService } from '@/core/entities/DriveFileEntityService.j import { bindThis } from '@/decorators.js'; import { IdService } from '@/core/IdService.js'; import { MfmService } from "@/core/MfmService.js"; -import { TimeService } from '@/core/TimeService.js'; +import { TimeService } from '@/global/TimeService.js'; @Injectable() export class FeedService { diff --git a/packages/backend/src/server/web/UrlPreviewService.ts b/packages/backend/src/server/web/UrlPreviewService.ts index 627446a6f5..7a98b25f4e 100644 --- a/packages/backend/src/server/web/UrlPreviewService.ts +++ b/packages/backend/src/server/web/UrlPreviewService.ts @@ -25,7 +25,7 @@ import { SystemAccountService } from '@/core/SystemAccountService.js'; import { ApNoteService } from '@/core/activitypub/models/ApNoteService.js'; import { AuthenticateService, AuthenticationError } from '@/server/api/AuthenticateService.js'; import { SkRateLimiterService } from '@/server/SkRateLimiterService.js'; -import { CacheManagementService, type ManagedRedisKVCache } from '@/core/CacheManagementService.js'; +import { CacheManagementService, type ManagedRedisKVCache } from '@/global/CacheManagementService.js'; import { BucketRateLimit, Keyed, sendRateLimitHeaders } from '@/misc/rate-limit-utils.js'; import type { MiLocalUser } from '@/models/User.js'; import { getIpHash } from '@/misc/get-ip-hash.js'; diff --git a/packages/backend/test/misc/FakeCacheManagementService.ts b/packages/backend/test/misc/FakeCacheManagementService.ts index 1b5b891e1e..ffeb416dba 100644 --- a/packages/backend/test/misc/FakeCacheManagementService.ts +++ b/packages/backend/test/misc/FakeCacheManagementService.ts @@ -10,8 +10,8 @@ import { MockInternalEventService } from './MockInternalEventService.js'; import { MockRedis } from './MockRedis.js'; import type { QuantumKVOpts } from '@/misc/QuantumKVCache.js'; import type { RedisKVCacheOpts, RedisSingleCacheOpts } from '@/misc/cache.js'; -import type { TimeService } from '@/core/TimeService.js'; -import type { InternalEventService } from '@/core/InternalEventService.js'; +import type { TimeService } from '@/global/TimeService.js'; +import type { InternalEventService } from '@/global/InternalEventService.js'; import { CacheManagementService, type ManagedMemoryKVCache, @@ -19,7 +19,7 @@ import { type ManagedRedisKVCache, type ManagedRedisSingleCache, type ManagedQuantumKVCache, -} from '@/core/CacheManagementService.js'; +} from '@/global/CacheManagementService.js'; /** * Fake implementation of cache management that suppresses all caching behavior. diff --git a/packages/backend/test/misc/GodOfTimeService.ts b/packages/backend/test/misc/GodOfTimeService.ts index 925cfa1de9..40133509d5 100644 --- a/packages/backend/test/misc/GodOfTimeService.ts +++ b/packages/backend/test/misc/GodOfTimeService.ts @@ -4,7 +4,7 @@ */ import { Injectable } from '@nestjs/common'; -import { TimeService, Timer } from '@/core/TimeService.js'; +import { TimeService, Timer } from '@/global/TimeService.js'; import { addPatch, type DatePatch } from '@/misc/patch-date.js'; /** diff --git a/packages/backend/test/misc/MockEnvService.ts b/packages/backend/test/misc/MockEnvService.ts index a947c70d44..6ec3b56d07 100644 --- a/packages/backend/test/misc/MockEnvService.ts +++ b/packages/backend/test/misc/MockEnvService.ts @@ -5,8 +5,8 @@ import process from 'node:process'; import { Injectable } from '@nestjs/common'; -import { EnvService } from '@/core/EnvService.js'; -import { CacheManagementService } from '@/core/CacheManagementService.js'; +import { EnvService } from '@/global/EnvService.js'; +import { CacheManagementService } from '@/global/CacheManagementService.js'; import { bindThis } from '@/decorators.js'; /** diff --git a/packages/backend/test/misc/MockInternalEventService.ts b/packages/backend/test/misc/MockInternalEventService.ts index 24e5be62a4..79b455cf11 100644 --- a/packages/backend/test/misc/MockInternalEventService.ts +++ b/packages/backend/test/misc/MockInternalEventService.ts @@ -5,10 +5,10 @@ import { Injectable } from '@nestjs/common'; import { MockRedis } from './MockRedis.js'; -import type { Listener, ListenerProps } from '@/core/InternalEventService.js'; +import type { Listener, ListenerProps } from '@/global/InternalEventService.js'; import type { InternalEventTypes } from '@/core/GlobalEventService.js'; import type { Config } from '@/config.js'; -import { InternalEventService } from '@/core/InternalEventService.js'; +import { InternalEventService } from '@/global/InternalEventService.js'; import { bindThis } from '@/decorators.js'; type FakeCall = [K, Parameters]; diff --git a/packages/backend/test/misc/MockLoggerService.ts b/packages/backend/test/misc/MockLoggerService.ts index 403e4a8097..df81b36ba3 100644 --- a/packages/backend/test/misc/MockLoggerService.ts +++ b/packages/backend/test/misc/MockLoggerService.ts @@ -10,7 +10,7 @@ import type { Config } from '@/config.js'; import Logger, { type Console } from '@/logger.js'; import { LoggerService } from '@/core/LoggerService.js'; import { bindThis } from '@/decorators.js'; -import { NativeTimeService, TimeService } from '@/core/TimeService.js'; +import { NativeTimeService, TimeService } from '@/global/TimeService.js'; /** * Mocked implementation of LoggerService. diff --git a/packages/backend/test/misc/MockRedis.ts b/packages/backend/test/misc/MockRedis.ts index 0483f27d83..36d22a46af 100644 --- a/packages/backend/test/misc/MockRedis.ts +++ b/packages/backend/test/misc/MockRedis.ts @@ -6,7 +6,7 @@ import { Injectable } from '@nestjs/common'; import { FakeRedis, ok, type RedisString } from './FakeRedis.js'; import type { RedisKey, RedisNumber, RedisValue, RedisCallback, Ok } from './FakeRedis.js'; -import { TimeService, NativeTimeService } from '@/core/TimeService.js'; +import { TimeService, NativeTimeService } from '@/global/TimeService.js'; import { bindThis } from '@/decorators.js'; export interface MockRedisConstructor { diff --git a/packages/backend/test/unit/AnnouncementService.ts b/packages/backend/test/unit/AnnouncementService.ts index 414b05f2fd..1fef886b80 100644 --- a/packages/backend/test/unit/AnnouncementService.ts +++ b/packages/backend/test/unit/AnnouncementService.ts @@ -10,11 +10,11 @@ import { ModuleMocker } from 'jest-mock'; import { Test } from '@nestjs/testing'; import { FakeCacheManagementService } from '../misc/FakeCacheManagementService.js'; import { MockInternalEventService } from '../misc/MockInternalEventService.js'; -import { CacheManagementService } from '@/core/CacheManagementService.js'; +import { CacheManagementService } from '@/global/CacheManagementService.js'; import { GlobalModule } from '@/GlobalModule.js'; import { AnnouncementService } from '@/core/AnnouncementService.js'; import { AnnouncementEntityService } from '@/core/entities/AnnouncementEntityService.js'; -import { InternalEventService } from '@/core/InternalEventService.js'; +import { InternalEventService } from '@/global/InternalEventService.js'; import type { AnnouncementReadsRepository, AnnouncementsRepository, diff --git a/packages/backend/test/unit/FetchInstanceMetadataService.ts b/packages/backend/test/unit/FetchInstanceMetadataService.ts index e68bec7e26..aec9313377 100644 --- a/packages/backend/test/unit/FetchInstanceMetadataService.ts +++ b/packages/backend/test/unit/FetchInstanceMetadataService.ts @@ -18,10 +18,10 @@ import { HttpRequestService } from '@/core/HttpRequestService.js'; import { LoggerService } from '@/core/LoggerService.js'; import { UtilityService } from '@/core/UtilityService.js'; import { IdService } from '@/core/IdService.js'; -import { CacheManagementService } from '@/core/CacheManagementService.js'; +import { CacheManagementService } from '@/global/CacheManagementService.js'; import { CoreModule } from '@/core/CoreModule.js'; import { DI } from '@/di-symbols.js'; -import { TimeService } from '@/core/TimeService.js'; +import { TimeService } from '@/global/TimeService.js'; describe('FetchInstanceMetadataService', () => { let app: TestingModule; diff --git a/packages/backend/test/unit/FlashService.ts b/packages/backend/test/unit/FlashService.ts index 021f668dc0..7b9be5bfe9 100644 --- a/packages/backend/test/unit/FlashService.ts +++ b/packages/backend/test/unit/FlashService.ts @@ -9,7 +9,7 @@ import { FlashService } from '@/core/FlashService.js'; import { IdService } from '@/core/IdService.js'; import { FlashsRepository, MiFlash, MiUser, UserProfilesRepository, UsersRepository } from '@/models/_.js'; import { DI } from '@/di-symbols.js'; -import { CacheManagementService } from '@/core/CacheManagementService.js'; +import { CacheManagementService } from '@/global/CacheManagementService.js'; import { GlobalModule } from '@/GlobalModule.js'; import { CoreModule } from '@/core/CoreModule.js'; diff --git a/packages/backend/test/unit/RoleService.ts b/packages/backend/test/unit/RoleService.ts index d8475ccc2b..75af74988d 100644 --- a/packages/backend/test/unit/RoleService.ts +++ b/packages/backend/test/unit/RoleService.ts @@ -11,7 +11,7 @@ import { Test } from '@nestjs/testing'; import type { TestingModule } from '@nestjs/testing'; import type { MockMetadata } from 'jest-mock'; import { GodOfTimeService } from '../misc/GodOfTimeService.js'; -import { CacheManagementService } from '@/core/CacheManagementService.js'; +import { CacheManagementService } from '@/global/CacheManagementService.js'; import { GlobalModule } from '@/GlobalModule.js'; import { RoleService } from '@/core/RoleService.js'; import { CoreModule } from '@/core/CoreModule.js'; @@ -36,8 +36,8 @@ import { secureRndstr } from '@/misc/secure-rndstr.js'; import { NotificationService } from '@/core/NotificationService.js'; import { RoleCondFormulaValue } from '@/models/Role.js'; import { UserEntityService } from '@/core/entities/UserEntityService.js'; -import { InternalEventService } from '@/core/InternalEventService.js'; -import { TimeService } from '@/core/TimeService.js'; +import { InternalEventService } from '@/global/InternalEventService.js'; +import { TimeService } from '@/global/TimeService.js'; const moduleMocker = new ModuleMocker(global); diff --git a/packages/backend/test/unit/S3Service.ts b/packages/backend/test/unit/S3Service.ts index 2d9131be13..4445b0f5f1 100644 --- a/packages/backend/test/unit/S3Service.ts +++ b/packages/backend/test/unit/S3Service.ts @@ -21,7 +21,7 @@ import { CoreModule } from '@/core/CoreModule.js'; import { S3Service } from '@/core/S3Service.js'; import { MiMeta } from '@/models/_.js'; import { HttpRequestService } from '@/core/HttpRequestService.js'; -import { InternalEventService } from '@/core/InternalEventService.js'; +import { InternalEventService } from '@/global/InternalEventService.js'; import { DI } from '@/di-symbols.js'; describe('S3Service', () => { diff --git a/packages/backend/test/unit/SigninWithPasskeyApiService.ts b/packages/backend/test/unit/SigninWithPasskeyApiService.ts index 3692e00315..2adf57ba52 100644 --- a/packages/backend/test/unit/SigninWithPasskeyApiService.ts +++ b/packages/backend/test/unit/SigninWithPasskeyApiService.ts @@ -22,7 +22,7 @@ import { WebAuthnService } from '@/core/WebAuthnService.js'; import { SigninService } from '@/server/api/SigninService.js'; import { IdentifiableError } from '@/misc/identifiable-error.js'; import { SkRateLimiterService } from '@/server/SkRateLimiterService.js'; -import { CacheManagementService } from '@/core/CacheManagementService.js'; +import { CacheManagementService } from '@/global/CacheManagementService.js'; import { ServerModule } from '@/server/ServerModule.js'; const moduleMocker = new ModuleMocker(global); diff --git a/packages/backend/test/unit/SystemWebhookService.ts b/packages/backend/test/unit/SystemWebhookService.ts index e4fc99aaf4..4b253a3d52 100644 --- a/packages/backend/test/unit/SystemWebhookService.ts +++ b/packages/backend/test/unit/SystemWebhookService.ts @@ -19,7 +19,7 @@ import { DI } from '@/di-symbols.js'; import { QueueService } from '@/core/QueueService.js'; import { LoggerService } from '@/core/LoggerService.js'; import { SystemWebhookService } from '@/core/SystemWebhookService.js'; -import { CacheManagementService } from '@/core/CacheManagementService.js'; +import { CacheManagementService } from '@/global/CacheManagementService.js'; import { CoreModule } from '@/core/CoreModule.js'; describe('SystemWebhookService', () => { diff --git a/packages/backend/test/unit/UserSearchService.ts b/packages/backend/test/unit/UserSearchService.ts index 7a58788dcc..48f9534cdc 100644 --- a/packages/backend/test/unit/UserSearchService.ts +++ b/packages/backend/test/unit/UserSearchService.ts @@ -11,7 +11,7 @@ import { FollowingsRepository, InstancesRepository, MiUser, UserProfilesReposito import { IdService } from '@/core/IdService.js'; import { GlobalModule } from '@/GlobalModule.js'; import { DI } from '@/di-symbols.js'; -import { CacheManagementService } from '@/core/CacheManagementService.js'; +import { CacheManagementService } from '@/global/CacheManagementService.js'; import { UserEntityService } from '@/core/entities/UserEntityService.js'; import { genAidx } from '@/misc/id/aidx.js'; import { CoreModule } from '@/core/CoreModule.js'; diff --git a/packages/backend/test/unit/UserWebhookService.ts b/packages/backend/test/unit/UserWebhookService.ts index 144382230f..300ab76a31 100644 --- a/packages/backend/test/unit/UserWebhookService.ts +++ b/packages/backend/test/unit/UserWebhookService.ts @@ -15,7 +15,7 @@ import { DI } from '@/di-symbols.js'; import { QueueService } from '@/core/QueueService.js'; import { LoggerService } from '@/core/LoggerService.js'; import { UserWebhookService } from '@/core/UserWebhookService.js'; -import { CacheManagementService } from '@/core/CacheManagementService.js'; +import { CacheManagementService } from '@/global/CacheManagementService.js'; import { CoreModule } from '@/core/CoreModule.js'; describe('UserWebhookService', () => { diff --git a/packages/backend/test/unit/UtilityService.ts b/packages/backend/test/unit/UtilityService.ts index 5d08829033..8c89ea28b0 100644 --- a/packages/backend/test/unit/UtilityService.ts +++ b/packages/backend/test/unit/UtilityService.ts @@ -10,7 +10,7 @@ import type { Config } from '@/config.js'; import type { SoftwareSuspension } from '@/models/Meta.js'; import type { MiInstance } from '@/models/Instance.js'; import { UtilityService } from '@/core/UtilityService.js'; -import { EnvService } from '@/core/EnvService.js'; +import { EnvService } from '@/global/EnvService.js'; describe('UtilityService', () => { let utilityService: UtilityService; diff --git a/packages/backend/test/unit/WebhookTestService.ts b/packages/backend/test/unit/WebhookTestService.ts index d43da8d7a3..b06be72c9b 100644 --- a/packages/backend/test/unit/WebhookTestService.ts +++ b/packages/backend/test/unit/WebhookTestService.ts @@ -15,7 +15,7 @@ import { IdService } from '@/core/IdService.js'; import { DI } from '@/di-symbols.js'; import { QueueService } from '@/core/QueueService.js'; import { CustomEmojiService } from '@/core/CustomEmojiService.js'; -import { CacheManagementService } from '@/core/CacheManagementService.js'; +import { CacheManagementService } from '@/global/CacheManagementService.js'; import { CoreModule } from '@/core/CoreModule.js'; describe('WebhookTestService', () => { diff --git a/packages/backend/test/unit/activitypub.ts b/packages/backend/test/unit/activitypub.ts index 396c926f2b..88ab7780a0 100644 --- a/packages/backend/test/unit/activitypub.ts +++ b/packages/backend/test/unit/activitypub.ts @@ -23,7 +23,7 @@ import { GlobalModule } from '@/GlobalModule.js'; import { CoreModule } from '@/core/CoreModule.js'; import { FederatedInstanceService } from '@/core/FederatedInstanceService.js'; import { LoggerService } from '@/core/LoggerService.js'; -import { CacheManagementService } from '@/core/CacheManagementService.js'; +import { CacheManagementService } from '@/global/CacheManagementService.js'; import { ApResolverService } from '@/core/activitypub/ApResolverService.js'; import type { IActor, IApDocument, ICollection, IObject, IPost } from '@/core/activitypub/type.js'; import { MiMeta, MiNote, MiUser, MiUserKeypair, UserProfilesRepository, UserPublickeysRepository, UserKeypairsRepository, UsersRepository, NotesRepository } from '@/models/_.js'; diff --git a/packages/backend/test/unit/chart.ts b/packages/backend/test/unit/chart.ts index 91df5e1bcb..ef2844046c 100644 --- a/packages/backend/test/unit/chart.ts +++ b/packages/backend/test/unit/chart.ts @@ -24,7 +24,7 @@ import { AppLockService } from '@/core/AppLockService.js'; import Logger from '@/logger.js'; import { CoreModule } from '@/core/CoreModule.js'; import { DI } from '@/di-symbols.js'; -import { TimeService } from '@/core/TimeService.js'; +import { TimeService } from '@/global/TimeService.js'; import { LoggerService } from '@/core/LoggerService.js'; describe('Chart', () => { diff --git a/packages/backend/test/unit/core/CacheManagementService.ts b/packages/backend/test/unit/core/CacheManagementService.ts index d60d7a8d2d..0c7b81b72b 100644 --- a/packages/backend/test/unit/core/CacheManagementService.ts +++ b/packages/backend/test/unit/core/CacheManagementService.ts @@ -7,7 +7,7 @@ import { jest } from '@jest/globals'; import { MockRedis } from '../../misc/MockRedis.js'; import { GodOfTimeService } from '../../misc/GodOfTimeService.js'; import { MockInternalEventService } from '../../misc/MockInternalEventService.js'; -import { CacheManagementService, type Manager, GC_INTERVAL } from '@/core/CacheManagementService.js'; +import { CacheManagementService, type Manager, GC_INTERVAL } from '@/global/CacheManagementService.js'; import { MemoryKVCache } from '@/misc/cache.js'; describe(CacheManagementService, () => { diff --git a/packages/backend/test/unit/core/activitypub/ApUtilityService.ts b/packages/backend/test/unit/core/activitypub/ApUtilityService.ts index 7b564b1fdd..b0f9666bb0 100644 --- a/packages/backend/test/unit/core/activitypub/ApUtilityService.ts +++ b/packages/backend/test/unit/core/activitypub/ApUtilityService.ts @@ -4,7 +4,7 @@ */ import type { IObject } from '@/core/activitypub/type.js'; -import type { EnvService } from '@/core/EnvService.js'; +import type { EnvService } from '@/global/EnvService.js'; import type { MiMeta } from '@/models/Meta.js'; import type { Config } from '@/config.js'; import type { LoggerService } from '@/core/LoggerService.js'; diff --git a/packages/backend/test/unit/entities/UserEntityService.ts b/packages/backend/test/unit/entities/UserEntityService.ts index 8b8a00ae8d..6566d6e8b3 100644 --- a/packages/backend/test/unit/entities/UserEntityService.ts +++ b/packages/backend/test/unit/entities/UserEntityService.ts @@ -5,7 +5,7 @@ import { Test, TestingModule } from '@nestjs/testing'; import type { MiUser } from '@/models/User.js'; -import { CacheManagementService } from '@/core/CacheManagementService.js'; +import { CacheManagementService } from '@/global/CacheManagementService.js'; import { UserEntityService } from '@/core/entities/UserEntityService.js'; import { GlobalModule } from '@/GlobalModule.js'; import { CoreModule } from '@/core/CoreModule.js'; diff --git a/packages/backend/test/unit/queue/processors/CheckModeratorsActivityProcessorService.ts b/packages/backend/test/unit/queue/processors/CheckModeratorsActivityProcessorService.ts index faae0f87fc..e623a547f9 100644 --- a/packages/backend/test/unit/queue/processors/CheckModeratorsActivityProcessorService.ts +++ b/packages/backend/test/unit/queue/processors/CheckModeratorsActivityProcessorService.ts @@ -20,8 +20,8 @@ import { EmailService } from '@/core/EmailService.js'; import { SystemWebhookService } from '@/core/SystemWebhookService.js'; import { AnnouncementService } from '@/core/AnnouncementService.js'; import { SystemWebhookEventType } from '@/models/SystemWebhook.js'; -import { CacheManagementService } from '@/core/CacheManagementService.js'; -import { TimeService } from '@/core/TimeService.js'; +import { CacheManagementService } from '@/global/CacheManagementService.js'; +import { TimeService } from '@/global/TimeService.js'; import { CoreModule } from '@/core/CoreModule.js'; import { QueueProcessorModule } from '@/queue/QueueProcessorModule.js'; import { LoggerService } from '@/core/LoggerService.js'; diff --git a/packages/backend/test/unit/server/api/SkRateLimiterServiceTests.ts b/packages/backend/test/unit/server/api/SkRateLimiterServiceTests.ts index 13b19ae386..54a2b78495 100644 --- a/packages/backend/test/unit/server/api/SkRateLimiterServiceTests.ts +++ b/packages/backend/test/unit/server/api/SkRateLimiterServiceTests.ts @@ -12,7 +12,7 @@ import type { RolePolicies, RoleService } from '@/core/RoleService.js'; import type { Config } from '@/config.js'; import { SkRateLimiterService } from '@/server/SkRateLimiterService.js'; import { BucketRateLimit, Keyed, LegacyRateLimit } from '@/misc/rate-limit-utils.js'; -import { CacheManagementService } from '@/core/CacheManagementService.js'; +import { CacheManagementService } from '@/global/CacheManagementService.js'; describe(SkRateLimiterService, () => { let cacheManagementService: CacheManagementService;