diff --git a/packages/backend/src/core/AccountMoveService.ts b/packages/backend/src/core/AccountMoveService.ts index de721961b0..84cc5def1f 100644 --- a/packages/backend/src/core/AccountMoveService.ts +++ b/packages/backend/src/core/AccountMoveService.ts @@ -9,7 +9,7 @@ import { IsNull, In, MoreThan, Not } from 'typeorm'; import { bindThis } from '@/decorators.js'; import { DI } from '@/di-symbols.js'; import type { MiLocalUser, MiRemoteUser, MiUser } from '@/models/entities/User.js'; -import type { MiBlockingsRepository, MiFollowingsRepository, MiInstancesRepository, MiMutingsRepository, MiUserListJoiningsRepository, MiUsersRepository } from '@/models/index.js'; +import type { BlockingsRepository, FollowingsRepository, InstancesRepository, MutingsRepository, UserListJoiningsRepository, UsersRepository } from '@/models/index.js'; import type { RelationshipJobData, ThinUser } from '@/queue/types.js'; import { IdService } from '@/core/IdService.js'; @@ -31,22 +31,22 @@ import PerUserFollowingChart from '@/core/chart/charts/per-user-following.js'; export class AccountMoveService { constructor( @Inject(DI.usersRepository) - private usersRepository: MiUsersRepository, + private usersRepository: UsersRepository, @Inject(DI.followingsRepository) - private followingsRepository: MiFollowingsRepository, + private followingsRepository: FollowingsRepository, @Inject(DI.blockingsRepository) - private blockingsRepository: MiBlockingsRepository, + private blockingsRepository: BlockingsRepository, @Inject(DI.mutingsRepository) - private mutingsRepository: MiMutingsRepository, + private mutingsRepository: MutingsRepository, @Inject(DI.userListJoiningsRepository) - private userListJoiningsRepository: MiUserListJoiningsRepository, + private userListJoiningsRepository: UserListJoiningsRepository, @Inject(DI.instancesRepository) - private instancesRepository: MiInstancesRepository, + private instancesRepository: InstancesRepository, private userEntityService: UserEntityService, private idService: IdService, diff --git a/packages/backend/src/core/AccountUpdateService.ts b/packages/backend/src/core/AccountUpdateService.ts index 9632eb3b10..6a796407dc 100644 --- a/packages/backend/src/core/AccountUpdateService.ts +++ b/packages/backend/src/core/AccountUpdateService.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { DI } from '@/di-symbols.js'; -import type { MiUsersRepository } from '@/models/index.js'; +import type { UsersRepository } from '@/models/index.js'; import type { MiUser } from '@/models/entities/User.js'; import { ApRendererService } from '@/core/activitypub/ApRendererService.js'; import { RelayService } from '@/core/RelayService.js'; @@ -17,7 +17,7 @@ import { bindThis } from '@/decorators.js'; export class AccountUpdateService { constructor( @Inject(DI.usersRepository) - private usersRepository: MiUsersRepository, + private usersRepository: UsersRepository, private userEntityService: UserEntityService, private apRendererService: ApRendererService, diff --git a/packages/backend/src/core/AchievementService.ts b/packages/backend/src/core/AchievementService.ts index 3216d9c3d9..aa810015ed 100644 --- a/packages/backend/src/core/AchievementService.ts +++ b/packages/backend/src/core/AchievementService.ts @@ -4,7 +4,7 @@ */ import { Inject, Injectable } from '@nestjs/common'; -import type { MiUserProfilesRepository } from '@/models/index.js'; +import type { UserProfilesRepository } from '@/models/index.js'; import type { MiUser } from '@/models/entities/User.js'; import { DI } from '@/di-symbols.js'; import { bindThis } from '@/decorators.js'; @@ -91,7 +91,7 @@ export const ACHIEVEMENT_TYPES = [ export class AchievementService { constructor( @Inject(DI.userProfilesRepository) - private userProfilesRepository: MiUserProfilesRepository, + private userProfilesRepository: UserProfilesRepository, private notificationService: NotificationService, ) { diff --git a/packages/backend/src/core/AnnouncementService.ts b/packages/backend/src/core/AnnouncementService.ts index 13002a011f..64e8ae758c 100644 --- a/packages/backend/src/core/AnnouncementService.ts +++ b/packages/backend/src/core/AnnouncementService.ts @@ -7,7 +7,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Brackets } from 'typeorm'; import { DI } from '@/di-symbols.js'; import type { MiUser } from '@/models/entities/User.js'; -import type { MiAnnouncementReadsRepository, MiAnnouncementsRepository, MiAnnouncement, MiAnnouncementRead } from '@/models/index.js'; +import type { AnnouncementReadsRepository, AnnouncementsRepository, MiAnnouncement, MiAnnouncementRead } from '@/models/index.js'; import { bindThis } from '@/decorators.js'; import { Packed } from '@/misc/json-schema.js'; import { IdService } from '@/core/IdService.js'; @@ -17,10 +17,10 @@ import { GlobalEventService } from '@/core/GlobalEventService.js'; export class AnnouncementService { constructor( @Inject(DI.announcementsRepository) - private announcementsRepository: MiAnnouncementsRepository, + private announcementsRepository: AnnouncementsRepository, @Inject(DI.announcementReadsRepository) - private announcementReadsRepository: MiAnnouncementReadsRepository, + private announcementReadsRepository: AnnouncementReadsRepository, private idService: IdService, private globalEventService: GlobalEventService, diff --git a/packages/backend/src/core/AntennaService.ts b/packages/backend/src/core/AntennaService.ts index 60244803b7..c64b941413 100644 --- a/packages/backend/src/core/AntennaService.ts +++ b/packages/backend/src/core/AntennaService.ts @@ -12,7 +12,7 @@ import { GlobalEventService } from '@/core/GlobalEventService.js'; import * as Acct from '@/misc/acct.js'; import type { Packed } from '@/misc/json-schema.js'; import { DI } from '@/di-symbols.js'; -import type { MiAntennasRepository, MiUserListJoiningsRepository } from '@/models/index.js'; +import type { AntennasRepository, UserListJoiningsRepository } from '@/models/index.js'; import { UtilityService } from '@/core/UtilityService.js'; import { bindThis } from '@/decorators.js'; import { StreamMessages } from '@/server/api/stream/types.js'; @@ -31,10 +31,10 @@ export class AntennaService implements OnApplicationShutdown { private redisForSub: Redis.Redis, @Inject(DI.antennasRepository) - private antennasRepository: MiAntennasRepository, + private antennasRepository: AntennasRepository, @Inject(DI.userListJoiningsRepository) - private userListJoiningsRepository: MiUserListJoiningsRepository, + private userListJoiningsRepository: UserListJoiningsRepository, private utilityService: UtilityService, private globalEventService: GlobalEventService, diff --git a/packages/backend/src/core/CacheService.ts b/packages/backend/src/core/CacheService.ts index a19528adb6..15be5f398c 100644 --- a/packages/backend/src/core/CacheService.ts +++ b/packages/backend/src/core/CacheService.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import * as Redis from 'ioredis'; -import type { MiBlockingsRepository, MiChannelFollowingsRepository, MiFollowingsRepository, MiMutingsRepository, MiRenoteMutingsRepository, MiUserProfile, MiUserProfilesRepository, MiUsersRepository } from '@/models/index.js'; +import type { BlockingsRepository, ChannelFollowingsRepository, FollowingsRepository, MutingsRepository, RenoteMutingsRepository, MiUserProfile, UserProfilesRepository, UsersRepository } from '@/models/index.js'; import { MemoryKVCache, RedisKVCache } from '@/misc/cache.js'; import type { MiLocalUser, MiUser } from '@/models/entities/User.js'; import { DI } from '@/di-symbols.js'; @@ -36,25 +36,25 @@ export class CacheService implements OnApplicationShutdown { private redisForSub: Redis.Redis, @Inject(DI.usersRepository) - private usersRepository: MiUsersRepository, + private usersRepository: UsersRepository, @Inject(DI.userProfilesRepository) - private userProfilesRepository: MiUserProfilesRepository, + private userProfilesRepository: UserProfilesRepository, @Inject(DI.mutingsRepository) - private mutingsRepository: MiMutingsRepository, + private mutingsRepository: MutingsRepository, @Inject(DI.blockingsRepository) - private blockingsRepository: MiBlockingsRepository, + private blockingsRepository: BlockingsRepository, @Inject(DI.renoteMutingsRepository) - private renoteMutingsRepository: MiRenoteMutingsRepository, + private renoteMutingsRepository: RenoteMutingsRepository, @Inject(DI.followingsRepository) - private followingsRepository: MiFollowingsRepository, + private followingsRepository: FollowingsRepository, @Inject(DI.channelFollowingsRepository) - private channelFollowingsRepository: MiChannelFollowingsRepository, + private channelFollowingsRepository: ChannelFollowingsRepository, private userEntityService: UserEntityService, ) { diff --git a/packages/backend/src/core/CustomEmojiService.ts b/packages/backend/src/core/CustomEmojiService.ts index f12963484d..8fd993345b 100644 --- a/packages/backend/src/core/CustomEmojiService.ts +++ b/packages/backend/src/core/CustomEmojiService.ts @@ -12,7 +12,7 @@ import { EmojiEntityService } from '@/core/entities/EmojiEntityService.js'; import { GlobalEventService } from '@/core/GlobalEventService.js'; import type { MiDriveFile } from '@/models/entities/DriveFile.js'; import type { MiEmoji } from '@/models/entities/Emoji.js'; -import type { MiEmojisRepository, MiRole } from '@/models/index.js'; +import type { EmojisRepository, MiRole } from '@/models/index.js'; import { bindThis } from '@/decorators.js'; import { MemoryKVCache, RedisSingleCache } from '@/misc/cache.js'; import { UtilityService } from '@/core/UtilityService.js'; @@ -31,7 +31,7 @@ export class CustomEmojiService implements OnApplicationShutdown { private redisClient: Redis.Redis, @Inject(DI.emojisRepository) - private emojisRepository: MiEmojisRepository, + private emojisRepository: EmojisRepository, private utilityService: UtilityService, private idService: IdService, diff --git a/packages/backend/src/core/DeleteAccountService.ts b/packages/backend/src/core/DeleteAccountService.ts index 26d13d4800..3e90d39455 100644 --- a/packages/backend/src/core/DeleteAccountService.ts +++ b/packages/backend/src/core/DeleteAccountService.ts @@ -4,7 +4,7 @@ */ import { Inject, Injectable } from '@nestjs/common'; -import type { MiUsersRepository } from '@/models/index.js'; +import type { UsersRepository } from '@/models/index.js'; import { QueueService } from '@/core/QueueService.js'; import { UserSuspendService } from '@/core/UserSuspendService.js'; import { DI } from '@/di-symbols.js'; @@ -14,7 +14,7 @@ import { bindThis } from '@/decorators.js'; export class DeleteAccountService { constructor( @Inject(DI.usersRepository) - private usersRepository: MiUsersRepository, + private usersRepository: UsersRepository, private userSuspendService: UserSuspendService, private queueService: QueueService, diff --git a/packages/backend/src/core/DriveService.ts b/packages/backend/src/core/DriveService.ts index ae212f15e5..77f60bf6e9 100644 --- a/packages/backend/src/core/DriveService.ts +++ b/packages/backend/src/core/DriveService.ts @@ -11,7 +11,7 @@ import { sharpBmp } from 'sharp-read-bmp'; import { IsNull } from 'typeorm'; import { DeleteObjectCommandInput, PutObjectCommandInput, NoSuchKey } from '@aws-sdk/client-s3'; import { DI } from '@/di-symbols.js'; -import type { MiDriveFilesRepository, MiUsersRepository, MiDriveFoldersRepository, MiUserProfilesRepository } from '@/models/index.js'; +import type { DriveFilesRepository, UsersRepository, DriveFoldersRepository, UserProfilesRepository } from '@/models/index.js'; import type { Config } from '@/config.js'; import Logger from '@/logger.js'; import type { MiRemoteUser, MiUser } from '@/models/entities/User.js'; @@ -95,16 +95,16 @@ export class DriveService { private config: Config, @Inject(DI.usersRepository) - private usersRepository: MiUsersRepository, + private usersRepository: UsersRepository, @Inject(DI.userProfilesRepository) - private userProfilesRepository: MiUserProfilesRepository, + private userProfilesRepository: UserProfilesRepository, @Inject(DI.driveFilesRepository) - private driveFilesRepository: MiDriveFilesRepository, + private driveFilesRepository: DriveFilesRepository, @Inject(DI.driveFoldersRepository) - private driveFoldersRepository: MiDriveFoldersRepository, + private driveFoldersRepository: DriveFoldersRepository, private fileInfoService: FileInfoService, private userEntityService: UserEntityService, diff --git a/packages/backend/src/core/EmailService.ts b/packages/backend/src/core/EmailService.ts index 0aab443f49..162634593e 100644 --- a/packages/backend/src/core/EmailService.ts +++ b/packages/backend/src/core/EmailService.ts @@ -10,7 +10,7 @@ import { MetaService } from '@/core/MetaService.js'; import { DI } from '@/di-symbols.js'; import type { Config } from '@/config.js'; import type Logger from '@/logger.js'; -import type { MiUserProfilesRepository } from '@/models/index.js'; +import type { UserProfilesRepository } from '@/models/index.js'; import { LoggerService } from '@/core/LoggerService.js'; import { bindThis } from '@/decorators.js'; @@ -23,7 +23,7 @@ export class EmailService { private config: Config, @Inject(DI.userProfilesRepository) - private userProfilesRepository: MiUserProfilesRepository, + private userProfilesRepository: UserProfilesRepository, private metaService: MetaService, private loggerService: LoggerService, diff --git a/packages/backend/src/core/FederatedInstanceService.ts b/packages/backend/src/core/FederatedInstanceService.ts index f74b21d135..e7b85b750b 100644 --- a/packages/backend/src/core/FederatedInstanceService.ts +++ b/packages/backend/src/core/FederatedInstanceService.ts @@ -5,7 +5,7 @@ import { Inject, Injectable, OnApplicationShutdown } from '@nestjs/common'; import * as Redis from 'ioredis'; -import type { MiInstancesRepository } from '@/models/index.js'; +import type { InstancesRepository } from '@/models/index.js'; import type { MiInstance } from '@/models/entities/Instance.js'; import { MemoryKVCache, RedisKVCache } from '@/misc/cache.js'; import { IdService } from '@/core/IdService.js'; @@ -22,7 +22,7 @@ export class FederatedInstanceService implements OnApplicationShutdown { private redisClient: Redis.Redis, @Inject(DI.instancesRepository) - private instancesRepository: MiInstancesRepository, + private instancesRepository: InstancesRepository, private utilityService: UtilityService, private idService: IdService, diff --git a/packages/backend/src/core/HashtagService.ts b/packages/backend/src/core/HashtagService.ts index 7c37045b6d..eec160275f 100644 --- a/packages/backend/src/core/HashtagService.ts +++ b/packages/backend/src/core/HashtagService.ts @@ -9,7 +9,7 @@ import type { MiUser } from '@/models/entities/User.js'; import { normalizeForSearch } from '@/misc/normalize-for-search.js'; import { IdService } from '@/core/IdService.js'; import type { MiHashtag } from '@/models/entities/Hashtag.js'; -import type { MiHashtagsRepository } from '@/models/index.js'; +import type { HashtagsRepository } from '@/models/index.js'; import { UserEntityService } from '@/core/entities/UserEntityService.js'; import { bindThis } from '@/decorators.js'; @@ -17,7 +17,7 @@ import { bindThis } from '@/decorators.js'; export class HashtagService { constructor( @Inject(DI.hashtagsRepository) - private hashtagsRepository: MiHashtagsRepository, + private hashtagsRepository: HashtagsRepository, private userEntityService: UserEntityService, private idService: IdService, diff --git a/packages/backend/src/core/InstanceActorService.ts b/packages/backend/src/core/InstanceActorService.ts index 099d4d46d4..8e576774d4 100644 --- a/packages/backend/src/core/InstanceActorService.ts +++ b/packages/backend/src/core/InstanceActorService.ts @@ -6,7 +6,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { IsNull } from 'typeorm'; import type { MiLocalUser } from '@/models/entities/User.js'; -import type { MiUsersRepository } from '@/models/index.js'; +import type { UsersRepository } from '@/models/index.js'; import { MemorySingleCache } from '@/misc/cache.js'; import { DI } from '@/di-symbols.js'; import { CreateSystemUserService } from '@/core/CreateSystemUserService.js'; @@ -20,7 +20,7 @@ export class InstanceActorService { constructor( @Inject(DI.usersRepository) - private usersRepository: MiUsersRepository, + private usersRepository: UsersRepository, private createSystemUserService: CreateSystemUserService, ) { diff --git a/packages/backend/src/core/ModerationLogService.ts b/packages/backend/src/core/ModerationLogService.ts index 778b339b42..be01fbf9fa 100644 --- a/packages/backend/src/core/ModerationLogService.ts +++ b/packages/backend/src/core/ModerationLogService.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { DI } from '@/di-symbols.js'; -import type { MiModerationLogsRepository } from '@/models/index.js'; +import type { ModerationLogsRepository } from '@/models/index.js'; import type { MiUser } from '@/models/entities/User.js'; import { IdService } from '@/core/IdService.js'; import { bindThis } from '@/decorators.js'; @@ -14,7 +14,7 @@ import { bindThis } from '@/decorators.js'; export class ModerationLogService { constructor( @Inject(DI.moderationLogsRepository) - private moderationLogsRepository: MiModerationLogsRepository, + private moderationLogsRepository: ModerationLogsRepository, private idService: IdService, ) { diff --git a/packages/backend/src/core/NoteCreateService.ts b/packages/backend/src/core/NoteCreateService.ts index 6074897c44..2ccc610cf3 100644 --- a/packages/backend/src/core/NoteCreateService.ts +++ b/packages/backend/src/core/NoteCreateService.ts @@ -14,7 +14,7 @@ import { extractCustomEmojisFromMfm } from '@/misc/extract-custom-emojis-from-mf import { extractHashtags } from '@/misc/extract-hashtags.js'; import type { IMentionedRemoteUsers } from '@/models/entities/Note.js'; import { MiNote } from '@/models/entities/Note.js'; -import type { MiChannelsRepository, MiInstancesRepository, MiMutedNotesRepository, MiMutingsRepository, MiNotesRepository, MiNoteThreadMutingsRepository, MiUserProfilesRepository, MiUsersRepository } from '@/models/index.js'; +import type { ChannelsRepository, InstancesRepository, MutedNotesRepository, MutingsRepository, NotesRepository, NoteThreadMutingsRepository, UserProfilesRepository, UsersRepository } from '@/models/index.js'; import type { MiDriveFile } from '@/models/entities/DriveFile.js'; import type { MiApp } from '@/models/entities/App.js'; import { concat } from '@/misc/prelude/array.js'; @@ -67,7 +67,7 @@ class NotificationManager { }[]; constructor( - private mutingsRepository: MiMutingsRepository, + private mutingsRepository: MutingsRepository, private notificationService: NotificationService, notifier: { id: MiUser['id']; }, note: MiNote, @@ -162,28 +162,28 @@ export class NoteCreateService implements OnApplicationShutdown { private redisClient: Redis.Redis, @Inject(DI.usersRepository) - private usersRepository: MiUsersRepository, + private usersRepository: UsersRepository, @Inject(DI.notesRepository) - private notesRepository: MiNotesRepository, + private notesRepository: NotesRepository, @Inject(DI.mutingsRepository) - private mutingsRepository: MiMutingsRepository, + private mutingsRepository: MutingsRepository, @Inject(DI.instancesRepository) - private instancesRepository: MiInstancesRepository, + private instancesRepository: InstancesRepository, @Inject(DI.userProfilesRepository) - private userProfilesRepository: MiUserProfilesRepository, + private userProfilesRepository: UserProfilesRepository, @Inject(DI.mutedNotesRepository) - private mutedNotesRepository: MiMutedNotesRepository, + private mutedNotesRepository: MutedNotesRepository, @Inject(DI.channelsRepository) - private channelsRepository: MiChannelsRepository, + private channelsRepository: ChannelsRepository, @Inject(DI.noteThreadMutingsRepository) - private noteThreadMutingsRepository: MiNoteThreadMutingsRepository, + private noteThreadMutingsRepository: NoteThreadMutingsRepository, private userEntityService: UserEntityService, private noteEntityService: NoteEntityService, diff --git a/packages/backend/src/core/NoteDeleteService.ts b/packages/backend/src/core/NoteDeleteService.ts index 1a5304b3e5..07708bd028 100644 --- a/packages/backend/src/core/NoteDeleteService.ts +++ b/packages/backend/src/core/NoteDeleteService.ts @@ -7,7 +7,7 @@ import { Brackets, In } from 'typeorm'; import { Injectable, Inject } from '@nestjs/common'; import type { MiUser, MiLocalUser, MiRemoteUser } from '@/models/entities/User.js'; import type { MiNote, IMentionedRemoteUsers } from '@/models/entities/Note.js'; -import type { MiInstancesRepository, MiNotesRepository, MiUsersRepository } from '@/models/index.js'; +import type { InstancesRepository, NotesRepository, UsersRepository } from '@/models/index.js'; import { RelayService } from '@/core/RelayService.js'; import { FederatedInstanceService } from '@/core/FederatedInstanceService.js'; import { DI } from '@/di-symbols.js'; @@ -31,13 +31,13 @@ export class NoteDeleteService { private config: Config, @Inject(DI.usersRepository) - private usersRepository: MiUsersRepository, + private usersRepository: UsersRepository, @Inject(DI.notesRepository) - private notesRepository: MiNotesRepository, + private notesRepository: NotesRepository, @Inject(DI.instancesRepository) - private instancesRepository: MiInstancesRepository, + private instancesRepository: InstancesRepository, private userEntityService: UserEntityService, private noteEntityService: NoteEntityService, diff --git a/packages/backend/src/core/NotePiningService.ts b/packages/backend/src/core/NotePiningService.ts index 25ed5d1e17..7f1381a41a 100644 --- a/packages/backend/src/core/NotePiningService.ts +++ b/packages/backend/src/core/NotePiningService.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { DI } from '@/di-symbols.js'; -import type { MiNotesRepository, MiUserNotePiningsRepository, MiUsersRepository } from '@/models/index.js'; +import type { NotesRepository, UserNotePiningsRepository, UsersRepository } from '@/models/index.js'; import { IdentifiableError } from '@/misc/identifiable-error.js'; import type { MiUser } from '@/models/entities/User.js'; import type { MiNote } from '@/models/entities/Note.js'; @@ -26,13 +26,13 @@ export class NotePiningService { private config: Config, @Inject(DI.usersRepository) - private usersRepository: MiUsersRepository, + private usersRepository: UsersRepository, @Inject(DI.notesRepository) - private notesRepository: MiNotesRepository, + private notesRepository: NotesRepository, @Inject(DI.userNotePiningsRepository) - private userNotePiningsRepository: MiUserNotePiningsRepository, + private userNotePiningsRepository: UserNotePiningsRepository, private userEntityService: UserEntityService, private idService: IdService, diff --git a/packages/backend/src/core/NoteReadService.ts b/packages/backend/src/core/NoteReadService.ts index e947b02d71..0197486263 100644 --- a/packages/backend/src/core/NoteReadService.ts +++ b/packages/backend/src/core/NoteReadService.ts @@ -12,7 +12,7 @@ import type { Packed } from '@/misc/json-schema.js'; import type { MiNote } from '@/models/entities/Note.js'; import { IdService } from '@/core/IdService.js'; import { GlobalEventService } from '@/core/GlobalEventService.js'; -import type { MiNoteUnreadsRepository, MiMutingsRepository, MiNoteThreadMutingsRepository } from '@/models/index.js'; +import type { NoteUnreadsRepository, MutingsRepository, NoteThreadMutingsRepository } from '@/models/index.js'; import { bindThis } from '@/decorators.js'; @Injectable() @@ -21,13 +21,13 @@ export class NoteReadService implements OnApplicationShutdown { constructor( @Inject(DI.noteUnreadsRepository) - private noteUnreadsRepository: MiNoteUnreadsRepository, + private noteUnreadsRepository: NoteUnreadsRepository, @Inject(DI.mutingsRepository) - private mutingsRepository: MiMutingsRepository, + private mutingsRepository: MutingsRepository, @Inject(DI.noteThreadMutingsRepository) - private noteThreadMutingsRepository: MiNoteThreadMutingsRepository, + private noteThreadMutingsRepository: NoteThreadMutingsRepository, private idService: IdService, private globalEventService: GlobalEventService, diff --git a/packages/backend/src/core/NotificationService.ts b/packages/backend/src/core/NotificationService.ts index 2b04182616..02c577c199 100644 --- a/packages/backend/src/core/NotificationService.ts +++ b/packages/backend/src/core/NotificationService.ts @@ -8,7 +8,7 @@ import * as Redis from 'ioredis'; import { Inject, Injectable, OnApplicationShutdown } from '@nestjs/common'; import { In } from 'typeorm'; import { DI } from '@/di-symbols.js'; -import type { MiUsersRepository } from '@/models/index.js'; +import type { UsersRepository } from '@/models/index.js'; import type { MiUser } from '@/models/entities/User.js'; import type { MiNotification } from '@/models/entities/Notification.js'; import { bindThis } from '@/decorators.js'; @@ -27,7 +27,7 @@ export class NotificationService implements OnApplicationShutdown { private redisClient: Redis.Redis, @Inject(DI.usersRepository) - private usersRepository: MiUsersRepository, + private usersRepository: UsersRepository, private notificationEntityService: NotificationEntityService, private idService: IdService, diff --git a/packages/backend/src/core/PollService.ts b/packages/backend/src/core/PollService.ts index 26ddbb75ff..551c779769 100644 --- a/packages/backend/src/core/PollService.ts +++ b/packages/backend/src/core/PollService.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { DI } from '@/di-symbols.js'; -import type { MiNotesRepository, MiUsersRepository, MiPollsRepository, MiPollVotesRepository, MiUser } from '@/models/index.js'; +import type { NotesRepository, UsersRepository, PollsRepository, PollVotesRepository, MiUser } from '@/models/index.js'; import type { MiNote } from '@/models/entities/Note.js'; import { RelayService } from '@/core/RelayService.js'; import { IdService } from '@/core/IdService.js'; @@ -20,16 +20,16 @@ import { UserBlockingService } from '@/core/UserBlockingService.js'; export class PollService { constructor( @Inject(DI.usersRepository) - private usersRepository: MiUsersRepository, + private usersRepository: UsersRepository, @Inject(DI.notesRepository) - private notesRepository: MiNotesRepository, + private notesRepository: NotesRepository, @Inject(DI.pollsRepository) - private pollsRepository: MiPollsRepository, + private pollsRepository: PollsRepository, @Inject(DI.pollVotesRepository) - private pollVotesRepository: MiPollVotesRepository, + private pollVotesRepository: PollVotesRepository, private userEntityService: UserEntityService, private idService: IdService, diff --git a/packages/backend/src/core/ProxyAccountService.ts b/packages/backend/src/core/ProxyAccountService.ts index 7a2d795b48..9fb0a45df9 100644 --- a/packages/backend/src/core/ProxyAccountService.ts +++ b/packages/backend/src/core/ProxyAccountService.ts @@ -4,7 +4,7 @@ */ import { Inject, Injectable } from '@nestjs/common'; -import type { MiUsersRepository } from '@/models/index.js'; +import type { UsersRepository } from '@/models/index.js'; import type { MiLocalUser } from '@/models/entities/User.js'; import { DI } from '@/di-symbols.js'; import { MetaService } from '@/core/MetaService.js'; @@ -14,7 +14,7 @@ import { bindThis } from '@/decorators.js'; export class ProxyAccountService { constructor( @Inject(DI.usersRepository) - private usersRepository: MiUsersRepository, + private usersRepository: UsersRepository, private metaService: MetaService, ) { diff --git a/packages/backend/src/core/PushNotificationService.ts b/packages/backend/src/core/PushNotificationService.ts index e41ad8bb8c..93928e3cd7 100644 --- a/packages/backend/src/core/PushNotificationService.ts +++ b/packages/backend/src/core/PushNotificationService.ts @@ -10,7 +10,7 @@ import { DI } from '@/di-symbols.js'; import type { Config } from '@/config.js'; import type { Packed } from '@/misc/json-schema.js'; import { getNoteSummary } from '@/misc/get-note-summary.js'; -import type { MiSwSubscription, MiSwSubscriptionsRepository } from '@/models/index.js'; +import type { MiSwSubscription, SwSubscriptionsRepository } from '@/models/index.js'; import { MetaService } from '@/core/MetaService.js'; import { bindThis } from '@/decorators.js'; import { RedisKVCache } from '@/misc/cache.js'; @@ -58,7 +58,7 @@ export class PushNotificationService implements OnApplicationShutdown { private redisClient: Redis.Redis, @Inject(DI.swSubscriptionsRepository) - private swSubscriptionsRepository: MiSwSubscriptionsRepository, + private swSubscriptionsRepository: SwSubscriptionsRepository, private metaService: MetaService, ) { diff --git a/packages/backend/src/core/QueryService.ts b/packages/backend/src/core/QueryService.ts index cbfe5b441f..30fc671589 100644 --- a/packages/backend/src/core/QueryService.ts +++ b/packages/backend/src/core/QueryService.ts @@ -7,7 +7,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Brackets, ObjectLiteral } from 'typeorm'; import { DI } from '@/di-symbols.js'; import type { MiUser } from '@/models/entities/User.js'; -import type { MiUserProfilesRepository, MiFollowingsRepository, MiChannelFollowingsRepository, MiMutedNotesRepository, MiBlockingsRepository, MiNoteThreadMutingsRepository, MiMutingsRepository, MiRenoteMutingsRepository } from '@/models/index.js'; +import type { UserProfilesRepository, FollowingsRepository, ChannelFollowingsRepository, MutedNotesRepository, BlockingsRepository, NoteThreadMutingsRepository, MutingsRepository, RenoteMutingsRepository } from '@/models/index.js'; import { bindThis } from '@/decorators.js'; import type { SelectQueryBuilder } from 'typeorm'; @@ -15,28 +15,28 @@ import type { SelectQueryBuilder } from 'typeorm'; export class QueryService { constructor( @Inject(DI.userProfilesRepository) - private userProfilesRepository: MiUserProfilesRepository, + private userProfilesRepository: UserProfilesRepository, @Inject(DI.followingsRepository) - private followingsRepository: MiFollowingsRepository, + private followingsRepository: FollowingsRepository, @Inject(DI.channelFollowingsRepository) - private channelFollowingsRepository: MiChannelFollowingsRepository, + private channelFollowingsRepository: ChannelFollowingsRepository, @Inject(DI.mutedNotesRepository) - private mutedNotesRepository: MiMutedNotesRepository, + private mutedNotesRepository: MutedNotesRepository, @Inject(DI.blockingsRepository) - private blockingsRepository: MiBlockingsRepository, + private blockingsRepository: BlockingsRepository, @Inject(DI.noteThreadMutingsRepository) - private noteThreadMutingsRepository: MiNoteThreadMutingsRepository, + private noteThreadMutingsRepository: NoteThreadMutingsRepository, @Inject(DI.mutingsRepository) - private mutingsRepository: MiMutingsRepository, + private mutingsRepository: MutingsRepository, @Inject(DI.renoteMutingsRepository) - private renoteMutingsRepository: MiRenoteMutingsRepository, + private renoteMutingsRepository: RenoteMutingsRepository, ) { } diff --git a/packages/backend/src/core/ReactionService.ts b/packages/backend/src/core/ReactionService.ts index 2faf094811..b8bdfff02e 100644 --- a/packages/backend/src/core/ReactionService.ts +++ b/packages/backend/src/core/ReactionService.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { DI } from '@/di-symbols.js'; -import type { MiEmojisRepository, MiNoteReactionsRepository, MiUsersRepository, MiNotesRepository } from '@/models/index.js'; +import type { EmojisRepository, NoteReactionsRepository, UsersRepository, NotesRepository } from '@/models/index.js'; import { IdentifiableError } from '@/misc/identifiable-error.js'; import type { MiRemoteUser, MiUser } from '@/models/entities/User.js'; import type { MiNote } from '@/models/entities/Note.js'; @@ -67,16 +67,16 @@ const decodeCustomEmojiRegexp = /^:([\w+-]+)(?:@([\w.-]+))?:$/; export class ReactionService { constructor( @Inject(DI.usersRepository) - private usersRepository: MiUsersRepository, + private usersRepository: UsersRepository, @Inject(DI.notesRepository) - private notesRepository: MiNotesRepository, + private notesRepository: NotesRepository, @Inject(DI.noteReactionsRepository) - private noteReactionsRepository: MiNoteReactionsRepository, + private noteReactionsRepository: NoteReactionsRepository, @Inject(DI.emojisRepository) - private emojisRepository: MiEmojisRepository, + private emojisRepository: EmojisRepository, private utilityService: UtilityService, private metaService: MetaService, diff --git a/packages/backend/src/core/RelayService.ts b/packages/backend/src/core/RelayService.ts index e8108d80d3..89f245e86d 100644 --- a/packages/backend/src/core/RelayService.ts +++ b/packages/backend/src/core/RelayService.ts @@ -6,7 +6,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { IsNull } from 'typeorm'; import type { MiLocalUser, MiUser } from '@/models/entities/User.js'; -import type { MiRelaysRepository, MiUsersRepository } from '@/models/index.js'; +import type { RelaysRepository, UsersRepository } from '@/models/index.js'; import { IdService } from '@/core/IdService.js'; import { MemorySingleCache } from '@/misc/cache.js'; import type { MiRelay } from '@/models/entities/Relay.js'; @@ -25,10 +25,10 @@ export class RelayService { constructor( @Inject(DI.usersRepository) - private usersRepository: MiUsersRepository, + private usersRepository: UsersRepository, @Inject(DI.relaysRepository) - private relaysRepository: MiRelaysRepository, + private relaysRepository: RelaysRepository, private idService: IdService, private queueService: QueueService, diff --git a/packages/backend/src/core/RemoteUserResolveService.ts b/packages/backend/src/core/RemoteUserResolveService.ts index 6c8946b3a0..ca538ed6cd 100644 --- a/packages/backend/src/core/RemoteUserResolveService.ts +++ b/packages/backend/src/core/RemoteUserResolveService.ts @@ -8,7 +8,7 @@ import { Inject, Injectable } from '@nestjs/common'; import chalk from 'chalk'; import { IsNull } from 'typeorm'; import { DI } from '@/di-symbols.js'; -import type { MiUsersRepository } from '@/models/index.js'; +import type { UsersRepository } from '@/models/index.js'; import type { MiLocalUser, MiRemoteUser } from '@/models/entities/User.js'; import type { Config } from '@/config.js'; import type Logger from '@/logger.js'; @@ -28,7 +28,7 @@ export class RemoteUserResolveService { private config: Config, @Inject(DI.usersRepository) - private usersRepository: MiUsersRepository, + private usersRepository: UsersRepository, private utilityService: UtilityService, private webfingerService: WebfingerService, diff --git a/packages/backend/src/core/RoleService.ts b/packages/backend/src/core/RoleService.ts index b6bc13d990..f755f3ecfb 100644 --- a/packages/backend/src/core/RoleService.ts +++ b/packages/backend/src/core/RoleService.ts @@ -6,7 +6,7 @@ import { Inject, Injectable } from '@nestjs/common'; import * as Redis from 'ioredis'; import { In } from 'typeorm'; -import type { MiRole, MiRoleAssignment, MiRoleAssignmentsRepository, MiRolesRepository, MiUsersRepository } from '@/models/index.js'; +import type { MiRole, MiRoleAssignment, RoleAssignmentsRepository, RolesRepository, UsersRepository } from '@/models/index.js'; import { MemoryKVCache, MemorySingleCache } from '@/misc/cache.js'; import type { MiUser } from '@/models/entities/User.js'; import { DI } from '@/di-symbols.js'; @@ -85,13 +85,13 @@ export class RoleService implements OnApplicationShutdown { private redisForSub: Redis.Redis, @Inject(DI.usersRepository) - private usersRepository: MiUsersRepository, + private usersRepository: UsersRepository, @Inject(DI.rolesRepository) - private rolesRepository: MiRolesRepository, + private rolesRepository: RolesRepository, @Inject(DI.roleAssignmentsRepository) - private roleAssignmentsRepository: MiRoleAssignmentsRepository, + private roleAssignmentsRepository: RoleAssignmentsRepository, private metaService: MetaService, private cacheService: CacheService, diff --git a/packages/backend/src/core/SearchService.ts b/packages/backend/src/core/SearchService.ts index 7340ed404b..ce80744c6d 100644 --- a/packages/backend/src/core/SearchService.ts +++ b/packages/backend/src/core/SearchService.ts @@ -10,7 +10,7 @@ import type { Config } from '@/config.js'; import { bindThis } from '@/decorators.js'; import { MiNote } from '@/models/entities/Note.js'; import { MiUser } from '@/models/index.js'; -import type { MiNotesRepository } from '@/models/index.js'; +import type { NotesRepository } from '@/models/index.js'; import { sqlLikeEscape } from '@/misc/sql-like-escape.js'; import { QueryService } from '@/core/QueryService.js'; import { IdService } from '@/core/IdService.js'; @@ -68,7 +68,7 @@ export class SearchService { private meilisearch: MeiliSearch | null, @Inject(DI.notesRepository) - private notesRepository: MiNotesRepository, + private notesRepository: NotesRepository, private queryService: QueryService, private idService: IdService, diff --git a/packages/backend/src/core/SignupService.ts b/packages/backend/src/core/SignupService.ts index 8ee0064379..e719d5918e 100644 --- a/packages/backend/src/core/SignupService.ts +++ b/packages/backend/src/core/SignupService.ts @@ -8,7 +8,7 @@ import { Inject, Injectable } from '@nestjs/common'; import bcrypt from 'bcryptjs'; import { DataSource, IsNull } from 'typeorm'; import { DI } from '@/di-symbols.js'; -import type { MiUsedUsernamesRepository, MiUsersRepository } from '@/models/index.js'; +import type { UsedUsernamesRepository, UsersRepository } from '@/models/index.js'; import { MiUser } from '@/models/entities/User.js'; import { MiUserProfile } from '@/models/entities/UserProfile.js'; import { IdService } from '@/core/IdService.js'; @@ -28,10 +28,10 @@ export class SignupService { private db: DataSource, @Inject(DI.usersRepository) - private usersRepository: MiUsersRepository, + private usersRepository: UsersRepository, @Inject(DI.usedUsernamesRepository) - private usedUsernamesRepository: MiUsedUsernamesRepository, + private usedUsernamesRepository: UsedUsernamesRepository, private utilityService: UtilityService, private userEntityService: UserEntityService, diff --git a/packages/backend/src/core/UserBlockingService.ts b/packages/backend/src/core/UserBlockingService.ts index 9d987a5ed2..44e2066a11 100644 --- a/packages/backend/src/core/UserBlockingService.ts +++ b/packages/backend/src/core/UserBlockingService.ts @@ -11,7 +11,7 @@ import type { MiBlocking } from '@/models/entities/Blocking.js'; import { QueueService } from '@/core/QueueService.js'; import { GlobalEventService } from '@/core/GlobalEventService.js'; import { DI } from '@/di-symbols.js'; -import type { MiFollowRequestsRepository, MiBlockingsRepository, MiUserListsRepository, MiUserListJoiningsRepository } from '@/models/index.js'; +import type { FollowRequestsRepository, BlockingsRepository, UserListsRepository, UserListJoiningsRepository } from '@/models/index.js'; import Logger from '@/logger.js'; import { UserEntityService } from '@/core/entities/UserEntityService.js'; import { ApRendererService } from '@/core/activitypub/ApRendererService.js'; @@ -30,16 +30,16 @@ export class UserBlockingService implements OnModuleInit { private moduleRef: ModuleRef, @Inject(DI.followRequestsRepository) - private followRequestsRepository: MiFollowRequestsRepository, + private followRequestsRepository: FollowRequestsRepository, @Inject(DI.blockingsRepository) - private blockingsRepository: MiBlockingsRepository, + private blockingsRepository: BlockingsRepository, @Inject(DI.userListsRepository) - private userListsRepository: MiUserListsRepository, + private userListsRepository: UserListsRepository, @Inject(DI.userListJoiningsRepository) - private userListJoiningsRepository: MiUserListJoiningsRepository, + private userListJoiningsRepository: UserListJoiningsRepository, private cacheService: CacheService, private userEntityService: UserEntityService, diff --git a/packages/backend/src/core/UserFollowingService.ts b/packages/backend/src/core/UserFollowingService.ts index 6fc5d4bf2c..c99a3e6a11 100644 --- a/packages/backend/src/core/UserFollowingService.ts +++ b/packages/backend/src/core/UserFollowingService.ts @@ -19,7 +19,7 @@ import { FederatedInstanceService } from '@/core/FederatedInstanceService.js'; import { WebhookService } from '@/core/WebhookService.js'; import { NotificationService } from '@/core/NotificationService.js'; import { DI } from '@/di-symbols.js'; -import type { MiFollowingsRepository, MiFollowRequestsRepository, MiInstancesRepository, MiUserProfilesRepository, MiUsersRepository } from '@/models/index.js'; +import type { FollowingsRepository, FollowRequestsRepository, InstancesRepository, UserProfilesRepository, UsersRepository } from '@/models/index.js'; import { UserEntityService } from '@/core/entities/UserEntityService.js'; import { ApRendererService } from '@/core/activitypub/ApRendererService.js'; import { bindThis } from '@/decorators.js'; @@ -56,19 +56,19 @@ export class UserFollowingService implements OnModuleInit { private config: Config, @Inject(DI.usersRepository) - private usersRepository: MiUsersRepository, + private usersRepository: UsersRepository, @Inject(DI.userProfilesRepository) - private userProfilesRepository: MiUserProfilesRepository, + private userProfilesRepository: UserProfilesRepository, @Inject(DI.followingsRepository) - private followingsRepository: MiFollowingsRepository, + private followingsRepository: FollowingsRepository, @Inject(DI.followRequestsRepository) - private followRequestsRepository: MiFollowRequestsRepository, + private followRequestsRepository: FollowRequestsRepository, @Inject(DI.instancesRepository) - private instancesRepository: MiInstancesRepository, + private instancesRepository: InstancesRepository, private cacheService: CacheService, private userEntityService: UserEntityService, diff --git a/packages/backend/src/core/UserKeypairService.ts b/packages/backend/src/core/UserKeypairService.ts index 13fcd01d3a..f321727601 100644 --- a/packages/backend/src/core/UserKeypairService.ts +++ b/packages/backend/src/core/UserKeypairService.ts @@ -6,7 +6,7 @@ import { Inject, Injectable, OnApplicationShutdown } from '@nestjs/common'; import * as Redis from 'ioredis'; import type { MiUser } from '@/models/entities/User.js'; -import type { MiUserKeypairsRepository } from '@/models/index.js'; +import type { UserKeypairsRepository } from '@/models/index.js'; import { RedisKVCache } from '@/misc/cache.js'; import type { MiUserKeypair } from '@/models/entities/UserKeypair.js'; import { DI } from '@/di-symbols.js'; @@ -21,7 +21,7 @@ export class UserKeypairService implements OnApplicationShutdown { private redisClient: Redis.Redis, @Inject(DI.userKeypairsRepository) - private userKeypairsRepository: MiUserKeypairsRepository, + private userKeypairsRepository: UserKeypairsRepository, ) { this.cache = new RedisKVCache(this.redisClient, 'userKeypair', { lifetime: 1000 * 60 * 60 * 24, // 24h diff --git a/packages/backend/src/core/UserListService.ts b/packages/backend/src/core/UserListService.ts index 8411c2a95f..3a56a2e96c 100644 --- a/packages/backend/src/core/UserListService.ts +++ b/packages/backend/src/core/UserListService.ts @@ -4,7 +4,7 @@ */ import { Inject, Injectable } from '@nestjs/common'; -import type { MiUserListJoiningsRepository } from '@/models/index.js'; +import type { UserListJoiningsRepository } from '@/models/index.js'; import type { MiUser } from '@/models/entities/User.js'; import type { MiUserList } from '@/models/entities/UserList.js'; import type { MiUserListJoining } from '@/models/entities/UserListJoining.js'; @@ -23,7 +23,7 @@ export class UserListService { constructor( @Inject(DI.userListJoiningsRepository) - private userListJoiningsRepository: MiUserListJoiningsRepository, + private userListJoiningsRepository: UserListJoiningsRepository, private userEntityService: UserEntityService, private idService: IdService, diff --git a/packages/backend/src/core/UserMutingService.ts b/packages/backend/src/core/UserMutingService.ts index 23aa5e3fb7..1f0b2c215b 100644 --- a/packages/backend/src/core/UserMutingService.ts +++ b/packages/backend/src/core/UserMutingService.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { In } from 'typeorm'; -import type { MiMutingsRepository, MiMuting } from '@/models/index.js'; +import type { MutingsRepository, MiMuting } from '@/models/index.js'; import { IdService } from '@/core/IdService.js'; import type { MiUser } from '@/models/entities/User.js'; import { DI } from '@/di-symbols.js'; @@ -16,7 +16,7 @@ import { CacheService } from '@/core/CacheService.js'; export class UserMutingService { constructor( @Inject(DI.mutingsRepository) - private mutingsRepository: MiMutingsRepository, + private mutingsRepository: MutingsRepository, private idService: IdService, private cacheService: CacheService, diff --git a/packages/backend/src/core/UserSuspendService.ts b/packages/backend/src/core/UserSuspendService.ts index 1a00f7328a..938aeb600c 100644 --- a/packages/backend/src/core/UserSuspendService.ts +++ b/packages/backend/src/core/UserSuspendService.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Not, IsNull } from 'typeorm'; -import type { MiFollowingsRepository } from '@/models/index.js'; +import type { FollowingsRepository } from '@/models/index.js'; import type { MiUser } from '@/models/entities/User.js'; import { QueueService } from '@/core/QueueService.js'; import { GlobalEventService } from '@/core/GlobalEventService.js'; @@ -18,7 +18,7 @@ import { bindThis } from '@/decorators.js'; export class UserSuspendService { constructor( @Inject(DI.followingsRepository) - private followingsRepository: MiFollowingsRepository, + private followingsRepository: FollowingsRepository, private userEntityService: UserEntityService, private queueService: QueueService, diff --git a/packages/backend/src/core/WebhookService.ts b/packages/backend/src/core/WebhookService.ts index 268e62b34d..3b43c1224c 100644 --- a/packages/backend/src/core/WebhookService.ts +++ b/packages/backend/src/core/WebhookService.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import * as Redis from 'ioredis'; -import type { MiWebhooksRepository } from '@/models/index.js'; +import type { WebhooksRepository } from '@/models/index.js'; import type { MiWebhook } from '@/models/entities/Webhook.js'; import { DI } from '@/di-symbols.js'; import { bindThis } from '@/decorators.js'; @@ -22,7 +22,7 @@ export class WebhookService implements OnApplicationShutdown { private redisForSub: Redis.Redis, @Inject(DI.webhooksRepository) - private webhooksRepository: MiWebhooksRepository, + private webhooksRepository: WebhooksRepository, ) { //this.onMessage = this.onMessage.bind(this); this.redisForSub.on('message', this.onMessage); diff --git a/packages/backend/src/core/activitypub/ApDbResolverService.ts b/packages/backend/src/core/activitypub/ApDbResolverService.ts index 5a0ab0ca24..b691588320 100644 --- a/packages/backend/src/core/activitypub/ApDbResolverService.ts +++ b/packages/backend/src/core/activitypub/ApDbResolverService.ts @@ -5,7 +5,7 @@ import { Inject, Injectable, OnApplicationShutdown } from '@nestjs/common'; import { DI } from '@/di-symbols.js'; -import type { MiNotesRepository, MiUserPublickeysRepository, MiUsersRepository } from '@/models/index.js'; +import type { NotesRepository, UserPublickeysRepository, UsersRepository } from '@/models/index.js'; import type { Config } from '@/config.js'; import { MemoryKVCache } from '@/misc/cache.js'; import type { MiUserPublickey } from '@/models/entities/UserPublickey.js'; @@ -43,13 +43,13 @@ export class ApDbResolverService implements OnApplicationShutdown { private config: Config, @Inject(DI.usersRepository) - private usersRepository: MiUsersRepository, + private usersRepository: UsersRepository, @Inject(DI.notesRepository) - private notesRepository: MiNotesRepository, + private notesRepository: NotesRepository, @Inject(DI.userPublickeysRepository) - private userPublickeysRepository: MiUserPublickeysRepository, + private userPublickeysRepository: UserPublickeysRepository, private cacheService: CacheService, private apPersonService: ApPersonService, diff --git a/packages/backend/src/core/activitypub/ApDeliverManagerService.ts b/packages/backend/src/core/activitypub/ApDeliverManagerService.ts index 47f7d3948c..da1e171063 100644 --- a/packages/backend/src/core/activitypub/ApDeliverManagerService.ts +++ b/packages/backend/src/core/activitypub/ApDeliverManagerService.ts @@ -6,7 +6,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { IsNull, Not } from 'typeorm'; import { DI } from '@/di-symbols.js'; -import type { MiFollowingsRepository } from '@/models/index.js'; +import type { FollowingsRepository } from '@/models/index.js'; import type { MiLocalUser, MiRemoteUser, MiUser } from '@/models/entities/User.js'; import { QueueService } from '@/core/QueueService.js'; import { UserEntityService } from '@/core/entities/UserEntityService.js'; @@ -48,7 +48,7 @@ class DeliverManager { */ constructor( private userEntityService: UserEntityService, - private followingsRepository: MiFollowingsRepository, + private followingsRepository: FollowingsRepository, private queueService: QueueService, actor: { id: MiUser['id']; host: null; }, @@ -152,7 +152,7 @@ class DeliverManager { export class ApDeliverManagerService { constructor( @Inject(DI.followingsRepository) - private followingsRepository: MiFollowingsRepository, + private followingsRepository: FollowingsRepository, private userEntityService: UserEntityService, private queueService: QueueService, diff --git a/packages/backend/src/core/activitypub/ApInboxService.ts b/packages/backend/src/core/activitypub/ApInboxService.ts index 5e1e214a6d..d29e2cd687 100644 --- a/packages/backend/src/core/activitypub/ApInboxService.ts +++ b/packages/backend/src/core/activitypub/ApInboxService.ts @@ -24,7 +24,7 @@ import { UtilityService } from '@/core/UtilityService.js'; import { NoteEntityService } from '@/core/entities/NoteEntityService.js'; import { UserEntityService } from '@/core/entities/UserEntityService.js'; import { QueueService } from '@/core/QueueService.js'; -import type { MiUsersRepository, MiNotesRepository, MiFollowingsRepository, MiAbuseUserReportsRepository, MiFollowRequestsRepository } from '@/models/index.js'; +import type { UsersRepository, NotesRepository, FollowingsRepository, AbuseUserReportsRepository, FollowRequestsRepository } from '@/models/index.js'; import { bindThis } from '@/decorators.js'; import type { MiRemoteUser } from '@/models/entities/User.js'; import { getApHrefNullable, getApId, getApIds, getApType, isAccept, isActor, isAdd, isAnnounce, isBlock, isCollection, isCollectionOrOrderedCollection, isCreate, isDelete, isFlag, isFollow, isLike, isMove, isPost, isReject, isRemove, isTombstone, isUndo, isUpdate, validActor, validPost } from './type.js'; @@ -47,19 +47,19 @@ export class ApInboxService { private config: Config, @Inject(DI.usersRepository) - private usersRepository: MiUsersRepository, + private usersRepository: UsersRepository, @Inject(DI.notesRepository) - private notesRepository: MiNotesRepository, + private notesRepository: NotesRepository, @Inject(DI.followingsRepository) - private followingsRepository: MiFollowingsRepository, + private followingsRepository: FollowingsRepository, @Inject(DI.abuseUserReportsRepository) - private abuseUserReportsRepository: MiAbuseUserReportsRepository, + private abuseUserReportsRepository: AbuseUserReportsRepository, @Inject(DI.followRequestsRepository) - private followRequestsRepository: MiFollowRequestsRepository, + private followRequestsRepository: FollowRequestsRepository, private userEntityService: UserEntityService, private noteEntityService: NoteEntityService, diff --git a/packages/backend/src/core/activitypub/ApRendererService.ts b/packages/backend/src/core/activitypub/ApRendererService.ts index 8674e0cce6..f345494edb 100644 --- a/packages/backend/src/core/activitypub/ApRendererService.ts +++ b/packages/backend/src/core/activitypub/ApRendererService.ts @@ -23,7 +23,7 @@ import { MfmService } from '@/core/MfmService.js'; import { UserEntityService } from '@/core/entities/UserEntityService.js'; import { DriveFileEntityService } from '@/core/entities/DriveFileEntityService.js'; import type { MiUserKeypair } from '@/models/entities/UserKeypair.js'; -import type { MiUsersRepository, MiUserProfilesRepository, MiNotesRepository, MiDriveFilesRepository, MiPollsRepository } from '@/models/index.js'; +import type { UsersRepository, UserProfilesRepository, NotesRepository, DriveFilesRepository, PollsRepository } from '@/models/index.js'; import { bindThis } from '@/decorators.js'; import { CustomEmojiService } from '@/core/CustomEmojiService.js'; import { isNotNull } from '@/misc/is-not-null.js'; @@ -38,19 +38,19 @@ export class ApRendererService { private config: Config, @Inject(DI.usersRepository) - private usersRepository: MiUsersRepository, + private usersRepository: UsersRepository, @Inject(DI.userProfilesRepository) - private userProfilesRepository: MiUserProfilesRepository, + private userProfilesRepository: UserProfilesRepository, @Inject(DI.notesRepository) - private notesRepository: MiNotesRepository, + private notesRepository: NotesRepository, @Inject(DI.driveFilesRepository) - private driveFilesRepository: MiDriveFilesRepository, + private driveFilesRepository: DriveFilesRepository, @Inject(DI.pollsRepository) - private pollsRepository: MiPollsRepository, + private pollsRepository: PollsRepository, private customEmojiService: CustomEmojiService, private userEntityService: UserEntityService, diff --git a/packages/backend/src/core/activitypub/ApResolverService.ts b/packages/backend/src/core/activitypub/ApResolverService.ts index d92eadaf7c..34913fabe8 100644 --- a/packages/backend/src/core/activitypub/ApResolverService.ts +++ b/packages/backend/src/core/activitypub/ApResolverService.ts @@ -6,7 +6,7 @@ import { Inject, Injectable } from '@nestjs/common'; import type { MiLocalUser, MiRemoteUser } from '@/models/entities/User.js'; import { InstanceActorService } from '@/core/InstanceActorService.js'; -import type { MiNotesRepository, MiPollsRepository, MiNoteReactionsRepository, MiUsersRepository } from '@/models/index.js'; +import type { NotesRepository, PollsRepository, NoteReactionsRepository, UsersRepository } from '@/models/index.js'; import type { Config } from '@/config.js'; import { MetaService } from '@/core/MetaService.js'; import { HttpRequestService } from '@/core/HttpRequestService.js'; @@ -28,10 +28,10 @@ export class Resolver { constructor( private config: Config, - private usersRepository: MiUsersRepository, - private notesRepository: MiNotesRepository, - private pollsRepository: MiPollsRepository, - private noteReactionsRepository: MiNoteReactionsRepository, + private usersRepository: UsersRepository, + private notesRepository: NotesRepository, + private pollsRepository: PollsRepository, + private noteReactionsRepository: NoteReactionsRepository, private utilityService: UtilityService, private instanceActorService: InstanceActorService, private metaService: MetaService, @@ -166,16 +166,16 @@ export class ApResolverService { private config: Config, @Inject(DI.usersRepository) - private usersRepository: MiUsersRepository, + private usersRepository: UsersRepository, @Inject(DI.notesRepository) - private notesRepository: MiNotesRepository, + private notesRepository: NotesRepository, @Inject(DI.pollsRepository) - private pollsRepository: MiPollsRepository, + private pollsRepository: PollsRepository, @Inject(DI.noteReactionsRepository) - private noteReactionsRepository: MiNoteReactionsRepository, + private noteReactionsRepository: NoteReactionsRepository, private utilityService: UtilityService, private instanceActorService: InstanceActorService, diff --git a/packages/backend/src/core/activitypub/models/ApImageService.ts b/packages/backend/src/core/activitypub/models/ApImageService.ts index 819da3609f..fa17a778bf 100644 --- a/packages/backend/src/core/activitypub/models/ApImageService.ts +++ b/packages/backend/src/core/activitypub/models/ApImageService.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { DI } from '@/di-symbols.js'; -import type { MiDriveFilesRepository } from '@/models/index.js'; +import type { DriveFilesRepository } from '@/models/index.js'; import type { MiRemoteUser } from '@/models/entities/User.js'; import type { MiDriveFile } from '@/models/entities/DriveFile.js'; import { MetaService } from '@/core/MetaService.js'; @@ -25,7 +25,7 @@ export class ApImageService { constructor( @Inject(DI.driveFilesRepository) - private driveFilesRepository: MiDriveFilesRepository, + private driveFilesRepository: DriveFilesRepository, private metaService: MetaService, private apResolverService: ApResolverService, diff --git a/packages/backend/src/core/activitypub/models/ApNoteService.ts b/packages/backend/src/core/activitypub/models/ApNoteService.ts index eb93f238dc..6a9c69696f 100644 --- a/packages/backend/src/core/activitypub/models/ApNoteService.ts +++ b/packages/backend/src/core/activitypub/models/ApNoteService.ts @@ -7,7 +7,7 @@ import { forwardRef, Inject, Injectable } from '@nestjs/common'; import promiseLimit from 'promise-limit'; import { In } from 'typeorm'; import { DI } from '@/di-symbols.js'; -import type { MiPollsRepository, MiEmojisRepository } from '@/models/index.js'; +import type { PollsRepository, EmojisRepository } from '@/models/index.js'; import type { Config } from '@/config.js'; import type { MiRemoteUser } from '@/models/entities/User.js'; import type { MiNote } from '@/models/entities/Note.js'; @@ -47,10 +47,10 @@ export class ApNoteService { private config: Config, @Inject(DI.pollsRepository) - private pollsRepository: MiPollsRepository, + private pollsRepository: PollsRepository, @Inject(DI.emojisRepository) - private emojisRepository: MiEmojisRepository, + private emojisRepository: EmojisRepository, private idService: IdService, private apMfmService: ApMfmService, diff --git a/packages/backend/src/core/activitypub/models/ApPersonService.ts b/packages/backend/src/core/activitypub/models/ApPersonService.ts index e5e3fd7857..ff0133993f 100644 --- a/packages/backend/src/core/activitypub/models/ApPersonService.ts +++ b/packages/backend/src/core/activitypub/models/ApPersonService.ts @@ -8,7 +8,7 @@ import promiseLimit from 'promise-limit'; import { DataSource } from 'typeorm'; import { ModuleRef } from '@nestjs/core'; import { DI } from '@/di-symbols.js'; -import type { MiFollowingsRepository, MiInstancesRepository, MiUserProfilesRepository, MiUserPublickeysRepository, MiUsersRepository } from '@/models/index.js'; +import type { FollowingsRepository, InstancesRepository, UserProfilesRepository, UserPublickeysRepository, UsersRepository } from '@/models/index.js'; import type { Config } from '@/config.js'; import type { MiLocalUser, MiRemoteUser } from '@/models/entities/User.js'; import { MiUser } from '@/models/entities/User.js'; @@ -87,19 +87,19 @@ export class ApPersonService implements OnModuleInit { private db: DataSource, @Inject(DI.usersRepository) - private usersRepository: MiUsersRepository, + private usersRepository: UsersRepository, @Inject(DI.userProfilesRepository) - private userProfilesRepository: MiUserProfilesRepository, + private userProfilesRepository: UserProfilesRepository, @Inject(DI.userPublickeysRepository) - private userPublickeysRepository: MiUserPublickeysRepository, + private userPublickeysRepository: UserPublickeysRepository, @Inject(DI.instancesRepository) - private instancesRepository: MiInstancesRepository, + private instancesRepository: InstancesRepository, @Inject(DI.followingsRepository) - private followingsRepository: MiFollowingsRepository, + private followingsRepository: FollowingsRepository, ) { } diff --git a/packages/backend/src/core/activitypub/models/ApQuestionService.ts b/packages/backend/src/core/activitypub/models/ApQuestionService.ts index 91c262f270..8d8c0a5811 100644 --- a/packages/backend/src/core/activitypub/models/ApQuestionService.ts +++ b/packages/backend/src/core/activitypub/models/ApQuestionService.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { DI } from '@/di-symbols.js'; -import type { MiNotesRepository, MiPollsRepository } from '@/models/index.js'; +import type { NotesRepository, PollsRepository } from '@/models/index.js'; import type { Config } from '@/config.js'; import type { IPoll } from '@/models/entities/Poll.js'; import type Logger from '@/logger.js'; @@ -25,10 +25,10 @@ export class ApQuestionService { private config: Config, @Inject(DI.notesRepository) - private notesRepository: MiNotesRepository, + private notesRepository: NotesRepository, @Inject(DI.pollsRepository) - private pollsRepository: MiPollsRepository, + private pollsRepository: PollsRepository, private apResolverService: ApResolverService, private apLoggerService: ApLoggerService, diff --git a/packages/backend/src/core/chart/charts/federation.ts b/packages/backend/src/core/chart/charts/federation.ts index b619fa3f42..6d42dab9b4 100644 --- a/packages/backend/src/core/chart/charts/federation.ts +++ b/packages/backend/src/core/chart/charts/federation.ts @@ -5,7 +5,7 @@ import { Injectable, Inject } from '@nestjs/common'; import { DataSource } from 'typeorm'; -import type { MiFollowingsRepository, MiInstancesRepository } from '@/models/index.js'; +import type { FollowingsRepository, InstancesRepository } from '@/models/index.js'; import { AppLockService } from '@/core/AppLockService.js'; import { DI } from '@/di-symbols.js'; import { MetaService } from '@/core/MetaService.js'; @@ -26,10 +26,10 @@ export default class FederationChart extends Chart { private db: DataSource, @Inject(DI.followingsRepository) - private followingsRepository: MiFollowingsRepository, + private followingsRepository: FollowingsRepository, @Inject(DI.instancesRepository) - private instancesRepository: MiInstancesRepository, + private instancesRepository: InstancesRepository, private metaService: MetaService, private appLockService: AppLockService, diff --git a/packages/backend/src/core/chart/charts/instance.ts b/packages/backend/src/core/chart/charts/instance.ts index da3455cffa..a780e59eb9 100644 --- a/packages/backend/src/core/chart/charts/instance.ts +++ b/packages/backend/src/core/chart/charts/instance.ts @@ -5,7 +5,7 @@ import { Injectable, Inject } from '@nestjs/common'; import { DataSource } from 'typeorm'; -import type { MiDriveFilesRepository, MiFollowingsRepository, MiUsersRepository, MiNotesRepository } from '@/models/index.js'; +import type { DriveFilesRepository, FollowingsRepository, UsersRepository, NotesRepository } from '@/models/index.js'; import type { MiDriveFile } from '@/models/entities/DriveFile.js'; import type { MiNote } from '@/models/entities/Note.js'; import { AppLockService } from '@/core/AppLockService.js'; @@ -28,16 +28,16 @@ export default class InstanceChart extends Chart { private db: DataSource, @Inject(DI.usersRepository) - private usersRepository: MiUsersRepository, + private usersRepository: UsersRepository, @Inject(DI.notesRepository) - private notesRepository: MiNotesRepository, + private notesRepository: NotesRepository, @Inject(DI.driveFilesRepository) - private driveFilesRepository: MiDriveFilesRepository, + private driveFilesRepository: DriveFilesRepository, @Inject(DI.followingsRepository) - private followingsRepository: MiFollowingsRepository, + private followingsRepository: FollowingsRepository, private utilityService: UtilityService, private appLockService: AppLockService, diff --git a/packages/backend/src/core/chart/charts/notes.ts b/packages/backend/src/core/chart/charts/notes.ts index 09b130bc56..5a4226911c 100644 --- a/packages/backend/src/core/chart/charts/notes.ts +++ b/packages/backend/src/core/chart/charts/notes.ts @@ -5,7 +5,7 @@ import { Injectable, Inject } from '@nestjs/common'; import { Not, IsNull, DataSource } from 'typeorm'; -import type { MiNotesRepository } from '@/models/index.js'; +import type { NotesRepository } from '@/models/index.js'; import type { MiNote } from '@/models/entities/Note.js'; import { AppLockService } from '@/core/AppLockService.js'; import { DI } from '@/di-symbols.js'; @@ -26,7 +26,7 @@ export default class NotesChart extends Chart { private db: DataSource, @Inject(DI.notesRepository) - private notesRepository: MiNotesRepository, + private notesRepository: NotesRepository, private appLockService: AppLockService, private chartLoggerService: ChartLoggerService, 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 fc02ff4986..89822479c6 100644 --- a/packages/backend/src/core/chart/charts/per-user-drive.ts +++ b/packages/backend/src/core/chart/charts/per-user-drive.ts @@ -5,7 +5,7 @@ import { Injectable, Inject } from '@nestjs/common'; import { DataSource } from 'typeorm'; -import type { MiDriveFilesRepository } from '@/models/index.js'; +import type { DriveFilesRepository } from '@/models/index.js'; import type { MiDriveFile } from '@/models/entities/DriveFile.js'; import { AppLockService } from '@/core/AppLockService.js'; import { DI } from '@/di-symbols.js'; @@ -27,7 +27,7 @@ export default class PerUserDriveChart extends Chart { private db: DataSource, @Inject(DI.driveFilesRepository) - private driveFilesRepository: MiDriveFilesRepository, + private driveFilesRepository: DriveFilesRepository, private appLockService: AppLockService, private driveFileEntityService: DriveFileEntityService, 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 f7f82378e4..f195585b3c 100644 --- a/packages/backend/src/core/chart/charts/per-user-following.ts +++ b/packages/backend/src/core/chart/charts/per-user-following.ts @@ -9,7 +9,7 @@ import type { MiUser } from '@/models/entities/User.js'; import { AppLockService } from '@/core/AppLockService.js'; import { DI } from '@/di-symbols.js'; import { UserEntityService } from '@/core/entities/UserEntityService.js'; -import type { MiFollowingsRepository } from '@/models/index.js'; +import type { FollowingsRepository } from '@/models/index.js'; import { bindThis } from '@/decorators.js'; import Chart from '../core.js'; import { ChartLoggerService } from '../ChartLoggerService.js'; @@ -27,7 +27,7 @@ export default class PerUserFollowingChart extends Chart { private db: DataSource, @Inject(DI.followingsRepository) - private followingsRepository: MiFollowingsRepository, + private followingsRepository: FollowingsRepository, private appLockService: AppLockService, private userEntityService: UserEntityService, 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 15f7d83ec2..3ab72bc1d0 100644 --- a/packages/backend/src/core/chart/charts/per-user-notes.ts +++ b/packages/backend/src/core/chart/charts/per-user-notes.ts @@ -9,7 +9,7 @@ import type { MiUser } from '@/models/entities/User.js'; import type { MiNote } from '@/models/entities/Note.js'; import { AppLockService } from '@/core/AppLockService.js'; import { DI } from '@/di-symbols.js'; -import type { MiNotesRepository } from '@/models/index.js'; +import type { NotesRepository } from '@/models/index.js'; import { bindThis } from '@/decorators.js'; import Chart from '../core.js'; import { ChartLoggerService } from '../ChartLoggerService.js'; @@ -27,7 +27,7 @@ export default class PerUserNotesChart extends Chart { private db: DataSource, @Inject(DI.notesRepository) - private notesRepository: MiNotesRepository, + private notesRepository: NotesRepository, private appLockService: AppLockService, private chartLoggerService: ChartLoggerService, diff --git a/packages/backend/src/core/chart/charts/users.ts b/packages/backend/src/core/chart/charts/users.ts index ef33a80057..86d530a7bb 100644 --- a/packages/backend/src/core/chart/charts/users.ts +++ b/packages/backend/src/core/chart/charts/users.ts @@ -9,7 +9,7 @@ import type { MiUser } from '@/models/entities/User.js'; import { AppLockService } from '@/core/AppLockService.js'; import { DI } from '@/di-symbols.js'; import { UserEntityService } from '@/core/entities/UserEntityService.js'; -import type { MiUsersRepository } from '@/models/index.js'; +import type { UsersRepository } from '@/models/index.js'; import { bindThis } from '@/decorators.js'; import Chart from '../core.js'; import { ChartLoggerService } from '../ChartLoggerService.js'; @@ -27,7 +27,7 @@ export default class UsersChart extends Chart { private db: DataSource, @Inject(DI.usersRepository) - private usersRepository: MiUsersRepository, + private usersRepository: UsersRepository, private appLockService: AppLockService, private userEntityService: UserEntityService, diff --git a/packages/backend/src/core/entities/AbuseUserReportEntityService.ts b/packages/backend/src/core/entities/AbuseUserReportEntityService.ts index 19661b1fef..f9f11a62b0 100644 --- a/packages/backend/src/core/entities/AbuseUserReportEntityService.ts +++ b/packages/backend/src/core/entities/AbuseUserReportEntityService.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { DI } from '@/di-symbols.js'; -import type { MiAbuseUserReportsRepository } from '@/models/index.js'; +import type { AbuseUserReportsRepository } from '@/models/index.js'; import { awaitAll } from '@/misc/prelude/await-all.js'; import type { MiAbuseUserReport } from '@/models/entities/AbuseUserReport.js'; import { bindThis } from '@/decorators.js'; @@ -15,7 +15,7 @@ import { UserEntityService } from './UserEntityService.js'; export class AbuseUserReportEntityService { constructor( @Inject(DI.abuseUserReportsRepository) - private abuseUserReportsRepository: MiAbuseUserReportsRepository, + private abuseUserReportsRepository: AbuseUserReportsRepository, private userEntityService: UserEntityService, ) { diff --git a/packages/backend/src/core/entities/AntennaEntityService.ts b/packages/backend/src/core/entities/AntennaEntityService.ts index 8136af95f8..7826ca5d70 100644 --- a/packages/backend/src/core/entities/AntennaEntityService.ts +++ b/packages/backend/src/core/entities/AntennaEntityService.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { DI } from '@/di-symbols.js'; -import type { MiAntennasRepository } from '@/models/index.js'; +import type { AntennasRepository } from '@/models/index.js'; import type { Packed } from '@/misc/json-schema.js'; import type { MiAntenna } from '@/models/entities/Antenna.js'; import { bindThis } from '@/decorators.js'; @@ -14,7 +14,7 @@ import { bindThis } from '@/decorators.js'; export class AntennaEntityService { constructor( @Inject(DI.antennasRepository) - private antennasRepository: MiAntennasRepository, + private antennasRepository: AntennasRepository, ) { } diff --git a/packages/backend/src/core/entities/AppEntityService.ts b/packages/backend/src/core/entities/AppEntityService.ts index 4637dc9d85..cdcbc635a0 100644 --- a/packages/backend/src/core/entities/AppEntityService.ts +++ b/packages/backend/src/core/entities/AppEntityService.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { DI } from '@/di-symbols.js'; -import type { MiAccessTokensRepository, MiAppsRepository } from '@/models/index.js'; +import type { AccessTokensRepository, AppsRepository } from '@/models/index.js'; import type { Packed } from '@/misc/json-schema.js'; import type { MiApp } from '@/models/entities/App.js'; import type { MiUser } from '@/models/entities/User.js'; @@ -15,10 +15,10 @@ import { bindThis } from '@/decorators.js'; export class AppEntityService { constructor( @Inject(DI.appsRepository) - private appsRepository: MiAppsRepository, + private appsRepository: AppsRepository, @Inject(DI.accessTokensRepository) - private accessTokensRepository: MiAccessTokensRepository, + private accessTokensRepository: AccessTokensRepository, ) { } diff --git a/packages/backend/src/core/entities/AuthSessionEntityService.ts b/packages/backend/src/core/entities/AuthSessionEntityService.ts index 010c004d3f..f6bac7f046 100644 --- a/packages/backend/src/core/entities/AuthSessionEntityService.ts +++ b/packages/backend/src/core/entities/AuthSessionEntityService.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { DI } from '@/di-symbols.js'; -import type { MiAuthSessionsRepository } from '@/models/index.js'; +import type { AuthSessionsRepository } from '@/models/index.js'; import { awaitAll } from '@/misc/prelude/await-all.js'; import type { MiAuthSession } from '@/models/entities/AuthSession.js'; import type { MiUser } from '@/models/entities/User.js'; @@ -16,7 +16,7 @@ import { AppEntityService } from './AppEntityService.js'; export class AuthSessionEntityService { constructor( @Inject(DI.authSessionsRepository) - private authSessionsRepository: MiAuthSessionsRepository, + private authSessionsRepository: AuthSessionsRepository, private appEntityService: AppEntityService, ) { diff --git a/packages/backend/src/core/entities/BlockingEntityService.ts b/packages/backend/src/core/entities/BlockingEntityService.ts index a545de4526..4a810a2f00 100644 --- a/packages/backend/src/core/entities/BlockingEntityService.ts +++ b/packages/backend/src/core/entities/BlockingEntityService.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { DI } from '@/di-symbols.js'; -import type { MiBlockingsRepository } from '@/models/index.js'; +import type { BlockingsRepository } from '@/models/index.js'; import { awaitAll } from '@/misc/prelude/await-all.js'; import type { Packed } from '@/misc/json-schema.js'; import type { MiBlocking } from '@/models/entities/Blocking.js'; @@ -17,7 +17,7 @@ import { UserEntityService } from './UserEntityService.js'; export class BlockingEntityService { constructor( @Inject(DI.blockingsRepository) - private blockingsRepository: MiBlockingsRepository, + private blockingsRepository: BlockingsRepository, private userEntityService: UserEntityService, ) { diff --git a/packages/backend/src/core/entities/ChannelEntityService.ts b/packages/backend/src/core/entities/ChannelEntityService.ts index 8942901376..e4586d1944 100644 --- a/packages/backend/src/core/entities/ChannelEntityService.ts +++ b/packages/backend/src/core/entities/ChannelEntityService.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { DI } from '@/di-symbols.js'; -import type { MiChannelFavoritesRepository, MiChannelFollowingsRepository, MiChannelsRepository, MiDriveFilesRepository, MiNoteUnreadsRepository, MiNotesRepository } from '@/models/index.js'; +import type { ChannelFavoritesRepository, ChannelFollowingsRepository, ChannelsRepository, DriveFilesRepository, NoteUnreadsRepository, NotesRepository } from '@/models/index.js'; import type { Packed } from '@/misc/json-schema.js'; import type { } from '@/models/entities/Blocking.js'; import type { MiUser } from '@/models/entities/User.js'; @@ -19,22 +19,22 @@ import { In } from 'typeorm'; export class ChannelEntityService { constructor( @Inject(DI.channelsRepository) - private channelsRepository: MiChannelsRepository, + private channelsRepository: ChannelsRepository, @Inject(DI.channelFollowingsRepository) - private channelFollowingsRepository: MiChannelFollowingsRepository, + private channelFollowingsRepository: ChannelFollowingsRepository, @Inject(DI.channelFavoritesRepository) - private channelFavoritesRepository: MiChannelFavoritesRepository, + private channelFavoritesRepository: ChannelFavoritesRepository, @Inject(DI.notesRepository) - private notesRepository: MiNotesRepository, + private notesRepository: NotesRepository, @Inject(DI.noteUnreadsRepository) - private noteUnreadsRepository: MiNoteUnreadsRepository, + private noteUnreadsRepository: NoteUnreadsRepository, @Inject(DI.driveFilesRepository) - private driveFilesRepository: MiDriveFilesRepository, + private driveFilesRepository: DriveFilesRepository, private noteEntityService: NoteEntityService, private driveFileEntityService: DriveFileEntityService, diff --git a/packages/backend/src/core/entities/ClipEntityService.ts b/packages/backend/src/core/entities/ClipEntityService.ts index 8c944ac284..63619ac9d3 100644 --- a/packages/backend/src/core/entities/ClipEntityService.ts +++ b/packages/backend/src/core/entities/ClipEntityService.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { DI } from '@/di-symbols.js'; -import type { MiClipFavoritesRepository, MiClipsRepository, MiUser } from '@/models/index.js'; +import type { ClipFavoritesRepository, ClipsRepository, MiUser } from '@/models/index.js'; import { awaitAll } from '@/misc/prelude/await-all.js'; import type { Packed } from '@/misc/json-schema.js'; import type { } from '@/models/entities/Blocking.js'; @@ -17,10 +17,10 @@ import { UserEntityService } from './UserEntityService.js'; export class ClipEntityService { constructor( @Inject(DI.clipsRepository) - private clipsRepository: MiClipsRepository, + private clipsRepository: ClipsRepository, @Inject(DI.clipFavoritesRepository) - private clipFavoritesRepository: MiClipFavoritesRepository, + private clipFavoritesRepository: ClipFavoritesRepository, private userEntityService: UserEntityService, ) { diff --git a/packages/backend/src/core/entities/DriveFileEntityService.ts b/packages/backend/src/core/entities/DriveFileEntityService.ts index 8cae08d373..a09de58b4f 100644 --- a/packages/backend/src/core/entities/DriveFileEntityService.ts +++ b/packages/backend/src/core/entities/DriveFileEntityService.ts @@ -6,7 +6,7 @@ import { forwardRef, Inject, Injectable } from '@nestjs/common'; import { In } from 'typeorm'; import { DI } from '@/di-symbols.js'; -import type { MiDriveFilesRepository } from '@/models/index.js'; +import type { DriveFilesRepository } from '@/models/index.js'; import type { Config } from '@/config.js'; import type { Packed } from '@/misc/json-schema.js'; import { awaitAll } from '@/misc/prelude/await-all.js'; @@ -35,7 +35,7 @@ export class DriveFileEntityService { private config: Config, @Inject(DI.driveFilesRepository) - private driveFilesRepository: MiDriveFilesRepository, + private driveFilesRepository: DriveFilesRepository, // 循環参照のため / for circular dependency @Inject(forwardRef(() => UserEntityService)) diff --git a/packages/backend/src/core/entities/DriveFolderEntityService.ts b/packages/backend/src/core/entities/DriveFolderEntityService.ts index 3e39489c6a..da401c41fc 100644 --- a/packages/backend/src/core/entities/DriveFolderEntityService.ts +++ b/packages/backend/src/core/entities/DriveFolderEntityService.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { DI } from '@/di-symbols.js'; -import type { MiDriveFilesRepository, MiDriveFoldersRepository } from '@/models/index.js'; +import type { DriveFilesRepository, DriveFoldersRepository } from '@/models/index.js'; import { awaitAll } from '@/misc/prelude/await-all.js'; import type { Packed } from '@/misc/json-schema.js'; import type { } from '@/models/entities/Blocking.js'; @@ -16,10 +16,10 @@ import { bindThis } from '@/decorators.js'; export class DriveFolderEntityService { constructor( @Inject(DI.driveFoldersRepository) - private driveFoldersRepository: MiDriveFoldersRepository, + private driveFoldersRepository: DriveFoldersRepository, @Inject(DI.driveFilesRepository) - private driveFilesRepository: MiDriveFilesRepository, + private driveFilesRepository: DriveFilesRepository, ) { } diff --git a/packages/backend/src/core/entities/EmojiEntityService.ts b/packages/backend/src/core/entities/EmojiEntityService.ts index 07ffc26e6c..cabd46b950 100644 --- a/packages/backend/src/core/entities/EmojiEntityService.ts +++ b/packages/backend/src/core/entities/EmojiEntityService.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { DI } from '@/di-symbols.js'; -import type { MiEmojisRepository } from '@/models/index.js'; +import type { EmojisRepository } from '@/models/index.js'; import type { Packed } from '@/misc/json-schema.js'; import type { } from '@/models/entities/Blocking.js'; import type { MiEmoji } from '@/models/entities/Emoji.js'; @@ -15,7 +15,7 @@ import { bindThis } from '@/decorators.js'; export class EmojiEntityService { constructor( @Inject(DI.emojisRepository) - private emojisRepository: MiEmojisRepository, + private emojisRepository: EmojisRepository, ) { } diff --git a/packages/backend/src/core/entities/FlashEntityService.ts b/packages/backend/src/core/entities/FlashEntityService.ts index 9e9ea81b60..be0d176af5 100644 --- a/packages/backend/src/core/entities/FlashEntityService.ts +++ b/packages/backend/src/core/entities/FlashEntityService.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { DI } from '@/di-symbols.js'; -import type { MiFlashsRepository, MiFlashLikesRepository } from '@/models/index.js'; +import type { FlashsRepository, FlashLikesRepository } from '@/models/index.js'; import { awaitAll } from '@/misc/prelude/await-all.js'; import type { Packed } from '@/misc/json-schema.js'; import type { } from '@/models/entities/Blocking.js'; @@ -18,10 +18,10 @@ import { UserEntityService } from './UserEntityService.js'; export class FlashEntityService { constructor( @Inject(DI.flashsRepository) - private flashsRepository: MiFlashsRepository, + private flashsRepository: FlashsRepository, @Inject(DI.flashLikesRepository) - private flashLikesRepository: MiFlashLikesRepository, + private flashLikesRepository: FlashLikesRepository, private userEntityService: UserEntityService, ) { diff --git a/packages/backend/src/core/entities/FlashLikeEntityService.ts b/packages/backend/src/core/entities/FlashLikeEntityService.ts index 9ece99465d..0db82fee00 100644 --- a/packages/backend/src/core/entities/FlashLikeEntityService.ts +++ b/packages/backend/src/core/entities/FlashLikeEntityService.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { DI } from '@/di-symbols.js'; -import type { MiFlashLikesRepository } from '@/models/index.js'; +import type { FlashLikesRepository } from '@/models/index.js'; import type { } from '@/models/entities/Blocking.js'; import type { MiUser } from '@/models/entities/User.js'; import type { MiFlashLike } from '@/models/entities/FlashLike.js'; @@ -16,7 +16,7 @@ import { FlashEntityService } from './FlashEntityService.js'; export class FlashLikeEntityService { constructor( @Inject(DI.flashLikesRepository) - private flashLikesRepository: MiFlashLikesRepository, + private flashLikesRepository: FlashLikesRepository, private flashEntityService: FlashEntityService, ) { diff --git a/packages/backend/src/core/entities/FollowRequestEntityService.ts b/packages/backend/src/core/entities/FollowRequestEntityService.ts index 231a5fc85c..bcf0deb5b1 100644 --- a/packages/backend/src/core/entities/FollowRequestEntityService.ts +++ b/packages/backend/src/core/entities/FollowRequestEntityService.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { DI } from '@/di-symbols.js'; -import type { MiFollowRequestsRepository } from '@/models/index.js'; +import type { FollowRequestsRepository } from '@/models/index.js'; import type { } from '@/models/entities/Blocking.js'; import type { MiUser } from '@/models/entities/User.js'; import type { MiFollowRequest } from '@/models/entities/FollowRequest.js'; @@ -16,7 +16,7 @@ import { UserEntityService } from './UserEntityService.js'; export class FollowRequestEntityService { constructor( @Inject(DI.followRequestsRepository) - private followRequestsRepository: MiFollowRequestsRepository, + private followRequestsRepository: FollowRequestsRepository, private userEntityService: UserEntityService, ) { diff --git a/packages/backend/src/core/entities/FollowingEntityService.ts b/packages/backend/src/core/entities/FollowingEntityService.ts index 8d7f8ca3bd..d292584ac8 100644 --- a/packages/backend/src/core/entities/FollowingEntityService.ts +++ b/packages/backend/src/core/entities/FollowingEntityService.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { DI } from '@/di-symbols.js'; -import type { MiFollowingsRepository } from '@/models/index.js'; +import type { FollowingsRepository } from '@/models/index.js'; import { awaitAll } from '@/misc/prelude/await-all.js'; import type { Packed } from '@/misc/json-schema.js'; import type { } from '@/models/entities/Blocking.js'; @@ -42,7 +42,7 @@ type RemoteFolloweeFollowing = MiFollowing & { export class FollowingEntityService { constructor( @Inject(DI.followingsRepository) - private followingsRepository: MiFollowingsRepository, + private followingsRepository: FollowingsRepository, private userEntityService: UserEntityService, ) { diff --git a/packages/backend/src/core/entities/GalleryLikeEntityService.ts b/packages/backend/src/core/entities/GalleryLikeEntityService.ts index 3a5c9f7296..68d50606f1 100644 --- a/packages/backend/src/core/entities/GalleryLikeEntityService.ts +++ b/packages/backend/src/core/entities/GalleryLikeEntityService.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { DI } from '@/di-symbols.js'; -import type { MiGalleryLikesRepository } from '@/models/index.js'; +import type { GalleryLikesRepository } from '@/models/index.js'; import type { } from '@/models/entities/Blocking.js'; import type { MiGalleryLike } from '@/models/entities/GalleryLike.js'; import { bindThis } from '@/decorators.js'; @@ -15,7 +15,7 @@ import { GalleryPostEntityService } from './GalleryPostEntityService.js'; export class GalleryLikeEntityService { constructor( @Inject(DI.galleryLikesRepository) - private galleryLikesRepository: MiGalleryLikesRepository, + private galleryLikesRepository: GalleryLikesRepository, private galleryPostEntityService: GalleryPostEntityService, ) { diff --git a/packages/backend/src/core/entities/GalleryPostEntityService.ts b/packages/backend/src/core/entities/GalleryPostEntityService.ts index d5b7972752..35d1a11f5c 100644 --- a/packages/backend/src/core/entities/GalleryPostEntityService.ts +++ b/packages/backend/src/core/entities/GalleryPostEntityService.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { DI } from '@/di-symbols.js'; -import type { MiGalleryLikesRepository, MiGalleryPostsRepository } from '@/models/index.js'; +import type { GalleryLikesRepository, GalleryPostsRepository } from '@/models/index.js'; import { awaitAll } from '@/misc/prelude/await-all.js'; import type { Packed } from '@/misc/json-schema.js'; import type { } from '@/models/entities/Blocking.js'; @@ -19,10 +19,10 @@ import { DriveFileEntityService } from './DriveFileEntityService.js'; export class GalleryPostEntityService { constructor( @Inject(DI.galleryPostsRepository) - private galleryPostsRepository: MiGalleryPostsRepository, + private galleryPostsRepository: GalleryPostsRepository, @Inject(DI.galleryLikesRepository) - private galleryLikesRepository: MiGalleryLikesRepository, + private galleryLikesRepository: GalleryLikesRepository, private userEntityService: UserEntityService, private driveFileEntityService: DriveFileEntityService, diff --git a/packages/backend/src/core/entities/InviteCodeEntityService.ts b/packages/backend/src/core/entities/InviteCodeEntityService.ts index 63ce090712..03248ada72 100644 --- a/packages/backend/src/core/entities/InviteCodeEntityService.ts +++ b/packages/backend/src/core/entities/InviteCodeEntityService.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { DI } from '@/di-symbols.js'; -import type { MiRegistrationTicketsRepository } from '@/models/index.js'; +import type { RegistrationTicketsRepository } from '@/models/index.js'; import { awaitAll } from '@/misc/prelude/await-all.js'; import type { Packed } from '@/misc/json-schema.js'; import type { MiUser } from '@/models/entities/User.js'; @@ -17,7 +17,7 @@ import { UserEntityService } from './UserEntityService.js'; export class InviteCodeEntityService { constructor( @Inject(DI.registrationTicketsRepository) - private registrationTicketsRepository: MiRegistrationTicketsRepository, + private registrationTicketsRepository: RegistrationTicketsRepository, private userEntityService: UserEntityService, ) { diff --git a/packages/backend/src/core/entities/ModerationLogEntityService.ts b/packages/backend/src/core/entities/ModerationLogEntityService.ts index 7a132057f3..399de8d4d9 100644 --- a/packages/backend/src/core/entities/ModerationLogEntityService.ts +++ b/packages/backend/src/core/entities/ModerationLogEntityService.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { DI } from '@/di-symbols.js'; -import type { MiModerationLogsRepository } from '@/models/index.js'; +import type { ModerationLogsRepository } from '@/models/index.js'; import { awaitAll } from '@/misc/prelude/await-all.js'; import type { } from '@/models/entities/Blocking.js'; import type { MiModerationLog } from '@/models/entities/ModerationLog.js'; @@ -16,7 +16,7 @@ import { UserEntityService } from './UserEntityService.js'; export class ModerationLogEntityService { constructor( @Inject(DI.moderationLogsRepository) - private moderationLogsRepository: MiModerationLogsRepository, + private moderationLogsRepository: ModerationLogsRepository, private userEntityService: UserEntityService, ) { diff --git a/packages/backend/src/core/entities/MutingEntityService.ts b/packages/backend/src/core/entities/MutingEntityService.ts index a3b0277d12..4239044106 100644 --- a/packages/backend/src/core/entities/MutingEntityService.ts +++ b/packages/backend/src/core/entities/MutingEntityService.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { DI } from '@/di-symbols.js'; -import type { MiMutingsRepository } from '@/models/index.js'; +import type { MutingsRepository } from '@/models/index.js'; import { awaitAll } from '@/misc/prelude/await-all.js'; import type { Packed } from '@/misc/json-schema.js'; import type { } from '@/models/entities/Blocking.js'; @@ -18,7 +18,7 @@ import { UserEntityService } from './UserEntityService.js'; export class MutingEntityService { constructor( @Inject(DI.mutingsRepository) - private mutingsRepository: MiMutingsRepository, + private mutingsRepository: MutingsRepository, private userEntityService: UserEntityService, ) { diff --git a/packages/backend/src/core/entities/NoteEntityService.ts b/packages/backend/src/core/entities/NoteEntityService.ts index 701df74871..52c1378b67 100644 --- a/packages/backend/src/core/entities/NoteEntityService.ts +++ b/packages/backend/src/core/entities/NoteEntityService.ts @@ -14,7 +14,7 @@ import { awaitAll } from '@/misc/prelude/await-all.js'; import type { MiUser } from '@/models/entities/User.js'; import type { MiNote } from '@/models/entities/Note.js'; import type { MiNoteReaction } from '@/models/entities/NoteReaction.js'; -import type { MiUsersRepository, MiNotesRepository, MiFollowingsRepository, MiPollsRepository, MiPollVotesRepository, MiNoteReactionsRepository, MiChannelsRepository } from '@/models/index.js'; +import type { UsersRepository, NotesRepository, FollowingsRepository, PollsRepository, PollVotesRepository, NoteReactionsRepository, ChannelsRepository } from '@/models/index.js'; import { bindThis } from '@/decorators.js'; import { isNotNull } from '@/misc/is-not-null.js'; import type { OnModuleInit } from '@nestjs/common'; @@ -34,25 +34,25 @@ export class NoteEntityService implements OnModuleInit { private moduleRef: ModuleRef, @Inject(DI.usersRepository) - private usersRepository: MiUsersRepository, + private usersRepository: UsersRepository, @Inject(DI.notesRepository) - private notesRepository: MiNotesRepository, + private notesRepository: NotesRepository, @Inject(DI.followingsRepository) - private followingsRepository: MiFollowingsRepository, + private followingsRepository: FollowingsRepository, @Inject(DI.pollsRepository) - private pollsRepository: MiPollsRepository, + private pollsRepository: PollsRepository, @Inject(DI.pollVotesRepository) - private pollVotesRepository: MiPollVotesRepository, + private pollVotesRepository: PollVotesRepository, @Inject(DI.noteReactionsRepository) - private noteReactionsRepository: MiNoteReactionsRepository, + private noteReactionsRepository: NoteReactionsRepository, @Inject(DI.channelsRepository) - private channelsRepository: MiChannelsRepository, + private channelsRepository: ChannelsRepository, //private userEntityService: UserEntityService, //private driveFileEntityService: DriveFileEntityService, diff --git a/packages/backend/src/core/entities/NoteFavoriteEntityService.ts b/packages/backend/src/core/entities/NoteFavoriteEntityService.ts index 75a816ebda..c0f43cac96 100644 --- a/packages/backend/src/core/entities/NoteFavoriteEntityService.ts +++ b/packages/backend/src/core/entities/NoteFavoriteEntityService.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { DI } from '@/di-symbols.js'; -import type { MiNoteFavoritesRepository } from '@/models/index.js'; +import type { NoteFavoritesRepository } from '@/models/index.js'; import type { } from '@/models/entities/Blocking.js'; import type { MiUser } from '@/models/entities/User.js'; import type { MiNoteFavorite } from '@/models/entities/NoteFavorite.js'; @@ -16,7 +16,7 @@ import { NoteEntityService } from './NoteEntityService.js'; export class NoteFavoriteEntityService { constructor( @Inject(DI.noteFavoritesRepository) - private noteFavoritesRepository: MiNoteFavoritesRepository, + private noteFavoritesRepository: NoteFavoritesRepository, private noteEntityService: NoteEntityService, ) { diff --git a/packages/backend/src/core/entities/NoteReactionEntityService.ts b/packages/backend/src/core/entities/NoteReactionEntityService.ts index b4ff7419fc..c50533a32f 100644 --- a/packages/backend/src/core/entities/NoteReactionEntityService.ts +++ b/packages/backend/src/core/entities/NoteReactionEntityService.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { DI } from '@/di-symbols.js'; -import type { MiNoteReactionsRepository } from '@/models/index.js'; +import type { NoteReactionsRepository } from '@/models/index.js'; import type { Packed } from '@/misc/json-schema.js'; import { bindThis } from '@/decorators.js'; import type { OnModuleInit } from '@nestjs/common'; @@ -27,7 +27,7 @@ export class NoteReactionEntityService implements OnModuleInit { private moduleRef: ModuleRef, @Inject(DI.noteReactionsRepository) - private noteReactionsRepository: MiNoteReactionsRepository, + private noteReactionsRepository: NoteReactionsRepository, //private userEntityService: UserEntityService, //private noteEntityService: NoteEntityService, diff --git a/packages/backend/src/core/entities/NotificationEntityService.ts b/packages/backend/src/core/entities/NotificationEntityService.ts index ee4a802e0d..42419d61a1 100644 --- a/packages/backend/src/core/entities/NotificationEntityService.ts +++ b/packages/backend/src/core/entities/NotificationEntityService.ts @@ -7,7 +7,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { ModuleRef } from '@nestjs/core'; import { In } from 'typeorm'; import { DI } from '@/di-symbols.js'; -import type { MiAccessTokensRepository, MiFollowRequestsRepository, MiNotesRepository, MiUser, MiUsersRepository } from '@/models/index.js'; +import type { AccessTokensRepository, FollowRequestsRepository, NotesRepository, MiUser, UsersRepository } from '@/models/index.js'; import { awaitAll } from '@/misc/prelude/await-all.js'; import type { MiNotification } from '@/models/entities/Notification.js'; import type { MiNote } from '@/models/entities/Note.js'; @@ -32,16 +32,16 @@ export class NotificationEntityService implements OnModuleInit { private moduleRef: ModuleRef, @Inject(DI.notesRepository) - private notesRepository: MiNotesRepository, + private notesRepository: NotesRepository, @Inject(DI.usersRepository) - private usersRepository: MiUsersRepository, + private usersRepository: UsersRepository, @Inject(DI.followRequestsRepository) - private followRequestsRepository: MiFollowRequestsRepository, + private followRequestsRepository: FollowRequestsRepository, @Inject(DI.accessTokensRepository) - private accessTokensRepository: MiAccessTokensRepository, + private accessTokensRepository: AccessTokensRepository, //private userEntityService: UserEntityService, //private noteEntityService: NoteEntityService, diff --git a/packages/backend/src/core/entities/PageEntityService.ts b/packages/backend/src/core/entities/PageEntityService.ts index e03f7a4ce6..382ff31b4c 100644 --- a/packages/backend/src/core/entities/PageEntityService.ts +++ b/packages/backend/src/core/entities/PageEntityService.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { DI } from '@/di-symbols.js'; -import type { MiDriveFilesRepository, MiPagesRepository, MiPageLikesRepository } from '@/models/index.js'; +import type { DriveFilesRepository, PagesRepository, PageLikesRepository } from '@/models/index.js'; import { awaitAll } from '@/misc/prelude/await-all.js'; import type { Packed } from '@/misc/json-schema.js'; import type { } from '@/models/entities/Blocking.js'; @@ -20,13 +20,13 @@ import { DriveFileEntityService } from './DriveFileEntityService.js'; export class PageEntityService { constructor( @Inject(DI.pagesRepository) - private pagesRepository: MiPagesRepository, + private pagesRepository: PagesRepository, @Inject(DI.pageLikesRepository) - private pageLikesRepository: MiPageLikesRepository, + private pageLikesRepository: PageLikesRepository, @Inject(DI.driveFilesRepository) - private driveFilesRepository: MiDriveFilesRepository, + private driveFilesRepository: DriveFilesRepository, private userEntityService: UserEntityService, private driveFileEntityService: DriveFileEntityService, diff --git a/packages/backend/src/core/entities/PageLikeEntityService.ts b/packages/backend/src/core/entities/PageLikeEntityService.ts index d202fc5285..4af0deb069 100644 --- a/packages/backend/src/core/entities/PageLikeEntityService.ts +++ b/packages/backend/src/core/entities/PageLikeEntityService.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { DI } from '@/di-symbols.js'; -import type { MiPageLikesRepository } from '@/models/index.js'; +import type { PageLikesRepository } from '@/models/index.js'; import type { } from '@/models/entities/Blocking.js'; import type { MiUser } from '@/models/entities/User.js'; import type { MiPageLike } from '@/models/entities/PageLike.js'; @@ -16,7 +16,7 @@ import { PageEntityService } from './PageEntityService.js'; export class PageLikeEntityService { constructor( @Inject(DI.pageLikesRepository) - private pageLikesRepository: MiPageLikesRepository, + private pageLikesRepository: PageLikesRepository, private pageEntityService: PageEntityService, ) { diff --git a/packages/backend/src/core/entities/RenoteMutingEntityService.ts b/packages/backend/src/core/entities/RenoteMutingEntityService.ts index 8dab4943a8..ddc5b971c3 100644 --- a/packages/backend/src/core/entities/RenoteMutingEntityService.ts +++ b/packages/backend/src/core/entities/RenoteMutingEntityService.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { DI } from '@/di-symbols.js'; -import type { MiRenoteMutingsRepository } from '@/models/index.js'; +import type { RenoteMutingsRepository } from '@/models/index.js'; import { awaitAll } from '@/misc/prelude/await-all.js'; import type { Packed } from '@/misc/json-schema.js'; import type { } from '@/models/entities/Blocking.js'; @@ -18,7 +18,7 @@ import { UserEntityService } from './UserEntityService.js'; export class RenoteMutingEntityService { constructor( @Inject(DI.renoteMutingsRepository) - private renoteMutingsRepository: MiRenoteMutingsRepository, + private renoteMutingsRepository: RenoteMutingsRepository, private userEntityService: UserEntityService, ) { diff --git a/packages/backend/src/core/entities/RoleEntityService.ts b/packages/backend/src/core/entities/RoleEntityService.ts index 1d58713c36..cd6ecee4c6 100644 --- a/packages/backend/src/core/entities/RoleEntityService.ts +++ b/packages/backend/src/core/entities/RoleEntityService.ts @@ -6,7 +6,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Brackets } from 'typeorm'; import { DI } from '@/di-symbols.js'; -import type { MiRoleAssignmentsRepository, MiRolesRepository } from '@/models/index.js'; +import type { RoleAssignmentsRepository, RolesRepository } from '@/models/index.js'; import { awaitAll } from '@/misc/prelude/await-all.js'; import type { MiUser } from '@/models/entities/User.js'; import type { MiRole } from '@/models/entities/Role.js'; @@ -17,10 +17,10 @@ import { DEFAULT_POLICIES } from '@/core/RoleService.js'; export class RoleEntityService { constructor( @Inject(DI.rolesRepository) - private rolesRepository: MiRolesRepository, + private rolesRepository: RolesRepository, @Inject(DI.roleAssignmentsRepository) - private roleAssignmentsRepository: MiRoleAssignmentsRepository, + private roleAssignmentsRepository: RoleAssignmentsRepository, ) { } diff --git a/packages/backend/src/core/entities/UserEntityService.ts b/packages/backend/src/core/entities/UserEntityService.ts index 13d6043974..236ee9f0b4 100644 --- a/packages/backend/src/core/entities/UserEntityService.ts +++ b/packages/backend/src/core/entities/UserEntityService.ts @@ -15,7 +15,7 @@ import { awaitAll } from '@/misc/prelude/await-all.js'; import { USER_ACTIVE_THRESHOLD, USER_ONLINE_THRESHOLD } from '@/const.js'; import type { MiLocalUser, MiPartialLocalUser, MiPartialRemoteUser, MiRemoteUser, MiUser } from '@/models/entities/User.js'; import { birthdaySchema, descriptionSchema, localUsernameSchema, locationSchema, nameSchema, passwordSchema } from '@/models/entities/User.js'; -import type { MiUsersRepository, MiUserSecurityKeysRepository, MiFollowingsRepository, MiFollowRequestsRepository, MiBlockingsRepository, MiMutingsRepository, MiDriveFilesRepository, MiNoteUnreadsRepository, MiUserNotePiningsRepository, MiUserProfilesRepository, MiAnnouncementReadsRepository, MiAnnouncementsRepository, MiUserProfile, MiRenoteMutingsRepository, MiUserMemoRepository } from '@/models/index.js'; +import type { UsersRepository, UserSecurityKeysRepository, FollowingsRepository, FollowRequestsRepository, BlockingsRepository, MutingsRepository, DriveFilesRepository, NoteUnreadsRepository, UserNotePiningsRepository, UserProfilesRepository, AnnouncementReadsRepository, AnnouncementsRepository, MiUserProfile, RenoteMutingsRepository, UserMemoRepository } from '@/models/index.js'; import { bindThis } from '@/decorators.js'; import { RoleService } from '@/core/RoleService.js'; import { ApPersonService } from '@/core/activitypub/models/ApPersonService.js'; @@ -71,46 +71,46 @@ export class UserEntityService implements OnModuleInit { private redisClient: Redis.Redis, @Inject(DI.usersRepository) - private usersRepository: MiUsersRepository, + private usersRepository: UsersRepository, @Inject(DI.userSecurityKeysRepository) - private userSecurityKeysRepository: MiUserSecurityKeysRepository, + private userSecurityKeysRepository: UserSecurityKeysRepository, @Inject(DI.followingsRepository) - private followingsRepository: MiFollowingsRepository, + private followingsRepository: FollowingsRepository, @Inject(DI.followRequestsRepository) - private followRequestsRepository: MiFollowRequestsRepository, + private followRequestsRepository: FollowRequestsRepository, @Inject(DI.blockingsRepository) - private blockingsRepository: MiBlockingsRepository, + private blockingsRepository: BlockingsRepository, @Inject(DI.mutingsRepository) - private mutingsRepository: MiMutingsRepository, + private mutingsRepository: MutingsRepository, @Inject(DI.renoteMutingsRepository) - private renoteMutingsRepository: MiRenoteMutingsRepository, + private renoteMutingsRepository: RenoteMutingsRepository, @Inject(DI.driveFilesRepository) - private driveFilesRepository: MiDriveFilesRepository, + private driveFilesRepository: DriveFilesRepository, @Inject(DI.noteUnreadsRepository) - private noteUnreadsRepository: MiNoteUnreadsRepository, + private noteUnreadsRepository: NoteUnreadsRepository, @Inject(DI.userNotePiningsRepository) - private userNotePiningsRepository: MiUserNotePiningsRepository, + private userNotePiningsRepository: UserNotePiningsRepository, @Inject(DI.userProfilesRepository) - private userProfilesRepository: MiUserProfilesRepository, + private userProfilesRepository: UserProfilesRepository, @Inject(DI.announcementReadsRepository) - private announcementReadsRepository: MiAnnouncementReadsRepository, + private announcementReadsRepository: AnnouncementReadsRepository, @Inject(DI.announcementsRepository) - private announcementsRepository: MiAnnouncementsRepository, + private announcementsRepository: AnnouncementsRepository, @Inject(DI.userMemosRepository) - private userMemosRepository: MiUserMemoRepository, + private userMemosRepository: UserMemoRepository, //private noteEntityService: NoteEntityService, //private driveFileEntityService: DriveFileEntityService, diff --git a/packages/backend/src/core/entities/UserListEntityService.ts b/packages/backend/src/core/entities/UserListEntityService.ts index 41fa7edf60..d1d9838dfa 100644 --- a/packages/backend/src/core/entities/UserListEntityService.ts +++ b/packages/backend/src/core/entities/UserListEntityService.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { DI } from '@/di-symbols.js'; -import type { MiUserListJoiningsRepository, MiUserListsRepository } from '@/models/index.js'; +import type { UserListJoiningsRepository, UserListsRepository } from '@/models/index.js'; import type { Packed } from '@/misc/json-schema.js'; import type { } from '@/models/entities/Blocking.js'; import type { MiUserList } from '@/models/entities/UserList.js'; @@ -15,10 +15,10 @@ import { bindThis } from '@/decorators.js'; export class UserListEntityService { constructor( @Inject(DI.userListsRepository) - private userListsRepository: MiUserListsRepository, + private userListsRepository: UserListsRepository, @Inject(DI.userListJoiningsRepository) - private userListJoiningsRepository: MiUserListJoiningsRepository, + private userListJoiningsRepository: UserListJoiningsRepository, ) { } diff --git a/packages/backend/src/daemons/JanitorService.ts b/packages/backend/src/daemons/JanitorService.ts index e5d1f5ef4b..6f5e5a7f3b 100644 --- a/packages/backend/src/daemons/JanitorService.ts +++ b/packages/backend/src/daemons/JanitorService.ts @@ -6,7 +6,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { LessThan } from 'typeorm'; import { DI } from '@/di-symbols.js'; -import type { MiAttestationChallengesRepository } from '@/models/index.js'; +import type { AttestationChallengesRepository } from '@/models/index.js'; import { bindThis } from '@/decorators.js'; import type { OnApplicationShutdown } from '@nestjs/common'; @@ -18,7 +18,7 @@ export class JanitorService implements OnApplicationShutdown { constructor( @Inject(DI.attestationChallengesRepository) - private attestationChallengesRepository: MiAttestationChallengesRepository, + private attestationChallengesRepository: AttestationChallengesRepository, ) { } diff --git a/packages/backend/src/models/index.ts b/packages/backend/src/models/index.ts index a97338916c..d14234b792 100644 --- a/packages/backend/src/models/index.ts +++ b/packages/backend/src/models/index.ts @@ -140,69 +140,69 @@ export { MiUserMemo, }; -export type MiAbuseUserReportsRepository = Repository; -export type MiAccessTokensRepository = Repository; -export type MiAdsRepository = Repository; -export type MiAnnouncementsRepository = Repository; -export type MiAnnouncementReadsRepository = Repository; -export type MiAntennasRepository = Repository; -export type MiAppsRepository = Repository; -export type MiAttestationChallengesRepository = Repository; -export type MiAuthSessionsRepository = Repository; -export type MiBlockingsRepository = Repository; -export type MiChannelFollowingsRepository = Repository; -export type MiChannelFavoritesRepository = Repository; -export type MiClipsRepository = Repository; -export type MiClipNotesRepository = Repository; -export type MiClipFavoritesRepository = Repository; -export type MiDriveFilesRepository = Repository; -export type MiDriveFoldersRepository = Repository; -export type MiEmojisRepository = Repository; -export type MiFollowingsRepository = Repository; -export type MiFollowRequestsRepository = Repository; -export type MiGalleryLikesRepository = Repository; -export type MiGalleryPostsRepository = Repository; -export type MiHashtagsRepository = Repository; -export type MiInstancesRepository = Repository; -export type MiMetasRepository = Repository; -export type MiModerationLogsRepository = Repository; -export type MiMutedNotesRepository = Repository; -export type MiMutingsRepository = Repository; -export type MiRenoteMutingsRepository = Repository; -export type MiNotesRepository = Repository; -export type MiNoteFavoritesRepository = Repository; -export type MiNoteReactionsRepository = Repository; -export type MiNoteThreadMutingsRepository = Repository; -export type MiNoteUnreadsRepository = Repository; -export type MiPagesRepository = Repository; -export type MiPageLikesRepository = Repository; -export type MiPasswordResetRequestsRepository = Repository; -export type MiPollsRepository = Repository; -export type MiPollVotesRepository = Repository; -export type MiPromoNotesRepository = Repository; -export type MiPromoReadsRepository = Repository; -export type MiRegistrationTicketsRepository = Repository; -export type MiRegistryItemsRepository = Repository; -export type MiRelaysRepository = Repository; -export type MiSigninsRepository = Repository; -export type MiSwSubscriptionsRepository = Repository; -export type MiUsedUsernamesRepository = Repository; -export type MiUsersRepository = Repository; -export type MiUserIpsRepository = Repository; -export type MiUserKeypairsRepository = Repository; -export type MiUserListsRepository = Repository; -export type MiUserListFavoritesRepository = Repository; -export type MiUserListJoiningsRepository = Repository; -export type MiUserNotePiningsRepository = Repository; -export type MiUserPendingsRepository = Repository; -export type MiUserProfilesRepository = Repository; -export type MiUserPublickeysRepository = Repository; -export type MiUserSecurityKeysRepository = Repository; -export type MiWebhooksRepository = Repository; -export type MiChannelsRepository = Repository; -export type MiRetentionAggregationsRepository = Repository; -export type MiRolesRepository = Repository; -export type MiRoleAssignmentsRepository = Repository; -export type MiFlashsRepository = Repository; -export type MiFlashLikesRepository = Repository; -export type MiUserMemoRepository = Repository; +export type AbuseUserReportsRepository = Repository; +export type AccessTokensRepository = Repository; +export type AdsRepository = Repository; +export type AnnouncementsRepository = Repository; +export type AnnouncementReadsRepository = Repository; +export type AntennasRepository = Repository; +export type AppsRepository = Repository; +export type AttestationChallengesRepository = Repository; +export type AuthSessionsRepository = Repository; +export type BlockingsRepository = Repository; +export type ChannelFollowingsRepository = Repository; +export type ChannelFavoritesRepository = Repository; +export type ClipsRepository = Repository; +export type ClipNotesRepository = Repository; +export type ClipFavoritesRepository = Repository; +export type DriveFilesRepository = Repository; +export type DriveFoldersRepository = Repository; +export type EmojisRepository = Repository; +export type FollowingsRepository = Repository; +export type FollowRequestsRepository = Repository; +export type GalleryLikesRepository = Repository; +export type GalleryPostsRepository = Repository; +export type HashtagsRepository = Repository; +export type InstancesRepository = Repository; +export type MetasRepository = Repository; +export type ModerationLogsRepository = Repository; +export type MutedNotesRepository = Repository; +export type MutingsRepository = Repository; +export type RenoteMutingsRepository = Repository; +export type NotesRepository = Repository; +export type NoteFavoritesRepository = Repository; +export type NoteReactionsRepository = Repository; +export type NoteThreadMutingsRepository = Repository; +export type NoteUnreadsRepository = Repository; +export type PagesRepository = Repository; +export type PageLikesRepository = Repository; +export type PasswordResetRequestsRepository = Repository; +export type PollsRepository = Repository; +export type PollVotesRepository = Repository; +export type PromoNotesRepository = Repository; +export type PromoReadsRepository = Repository; +export type RegistrationTicketsRepository = Repository; +export type RegistryItemsRepository = Repository; +export type RelaysRepository = Repository; +export type SigninsRepository = Repository; +export type SwSubscriptionsRepository = Repository; +export type UsedUsernamesRepository = Repository; +export type UsersRepository = Repository; +export type UserIpsRepository = Repository; +export type UserKeypairsRepository = Repository; +export type UserListsRepository = Repository; +export type UserListFavoritesRepository = Repository; +export type UserListJoiningsRepository = Repository; +export type UserNotePiningsRepository = Repository; +export type UserPendingsRepository = Repository; +export type UserProfilesRepository = Repository; +export type UserPublickeysRepository = Repository; +export type UserSecurityKeysRepository = Repository; +export type WebhooksRepository = Repository; +export type ChannelsRepository = Repository; +export type RetentionAggregationsRepository = Repository; +export type RolesRepository = Repository; +export type RoleAssignmentsRepository = Repository; +export type FlashsRepository = Repository; +export type FlashLikesRepository = Repository; +export type UserMemoRepository = Repository; diff --git a/packages/backend/src/queue/processors/AggregateRetentionProcessorService.ts b/packages/backend/src/queue/processors/AggregateRetentionProcessorService.ts index bd4f256e53..757bfa3079 100644 --- a/packages/backend/src/queue/processors/AggregateRetentionProcessorService.ts +++ b/packages/backend/src/queue/processors/AggregateRetentionProcessorService.ts @@ -8,7 +8,7 @@ import { IsNull, MoreThan } from 'typeorm'; import { DI } from '@/di-symbols.js'; import type Logger from '@/logger.js'; import { bindThis } from '@/decorators.js'; -import type { MiRetentionAggregationsRepository, MiUsersRepository } from '@/models/index.js'; +import type { RetentionAggregationsRepository, UsersRepository } from '@/models/index.js'; import { deepClone } from '@/misc/clone.js'; import { IdService } from '@/core/IdService.js'; import { isDuplicateKeyValueError } from '@/misc/is-duplicate-key-value-error.js'; @@ -21,10 +21,10 @@ export class AggregateRetentionProcessorService { constructor( @Inject(DI.usersRepository) - private usersRepository: MiUsersRepository, + private usersRepository: UsersRepository, @Inject(DI.retentionAggregationsRepository) - private retentionAggregationsRepository: MiRetentionAggregationsRepository, + private retentionAggregationsRepository: RetentionAggregationsRepository, private idService: IdService, private queueLoggerService: QueueLoggerService, diff --git a/packages/backend/src/queue/processors/CheckExpiredMutingsProcessorService.ts b/packages/backend/src/queue/processors/CheckExpiredMutingsProcessorService.ts index f938ac8591..d87f4537c8 100644 --- a/packages/backend/src/queue/processors/CheckExpiredMutingsProcessorService.ts +++ b/packages/backend/src/queue/processors/CheckExpiredMutingsProcessorService.ts @@ -6,7 +6,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { In } from 'typeorm'; import { DI } from '@/di-symbols.js'; -import type { MiMutingsRepository } from '@/models/index.js'; +import type { MutingsRepository } from '@/models/index.js'; import type Logger from '@/logger.js'; import { bindThis } from '@/decorators.js'; import { UserMutingService } from '@/core/UserMutingService.js'; @@ -19,7 +19,7 @@ export class CheckExpiredMutingsProcessorService { constructor( @Inject(DI.mutingsRepository) - private mutingsRepository: MiMutingsRepository, + private mutingsRepository: MutingsRepository, private userMutingService: UserMutingService, private queueLoggerService: QueueLoggerService, diff --git a/packages/backend/src/queue/processors/CleanProcessorService.ts b/packages/backend/src/queue/processors/CleanProcessorService.ts index 7ad6974537..03a33e76ac 100644 --- a/packages/backend/src/queue/processors/CleanProcessorService.ts +++ b/packages/backend/src/queue/processors/CleanProcessorService.ts @@ -6,7 +6,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { In, LessThan } from 'typeorm'; import { DI } from '@/di-symbols.js'; -import type { MiAntennasRepository, MiMutedNotesRepository, MiRoleAssignmentsRepository, MiUserIpsRepository } from '@/models/index.js'; +import type { AntennasRepository, MutedNotesRepository, RoleAssignmentsRepository, UserIpsRepository } from '@/models/index.js'; import type Logger from '@/logger.js'; import { bindThis } from '@/decorators.js'; import { IdService } from '@/core/IdService.js'; @@ -19,16 +19,16 @@ export class CleanProcessorService { constructor( @Inject(DI.userIpsRepository) - private userIpsRepository: MiUserIpsRepository, + private userIpsRepository: UserIpsRepository, @Inject(DI.mutedNotesRepository) - private mutedNotesRepository: MiMutedNotesRepository, + private mutedNotesRepository: MutedNotesRepository, @Inject(DI.antennasRepository) - private antennasRepository: MiAntennasRepository, + private antennasRepository: AntennasRepository, @Inject(DI.roleAssignmentsRepository) - private roleAssignmentsRepository: MiRoleAssignmentsRepository, + private roleAssignmentsRepository: RoleAssignmentsRepository, private queueLoggerService: QueueLoggerService, private idService: IdService, diff --git a/packages/backend/src/queue/processors/CleanRemoteFilesProcessorService.ts b/packages/backend/src/queue/processors/CleanRemoteFilesProcessorService.ts index 22d3b5ba77..12cedd7d3d 100644 --- a/packages/backend/src/queue/processors/CleanRemoteFilesProcessorService.ts +++ b/packages/backend/src/queue/processors/CleanRemoteFilesProcessorService.ts @@ -6,7 +6,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { IsNull, MoreThan, Not } from 'typeorm'; import { DI } from '@/di-symbols.js'; -import type { MiDriveFile, MiDriveFilesRepository } from '@/models/index.js'; +import type { MiDriveFile, DriveFilesRepository } from '@/models/index.js'; import type Logger from '@/logger.js'; import { DriveService } from '@/core/DriveService.js'; import { bindThis } from '@/decorators.js'; @@ -19,7 +19,7 @@ export class CleanRemoteFilesProcessorService { constructor( @Inject(DI.driveFilesRepository) - private driveFilesRepository: MiDriveFilesRepository, + private driveFilesRepository: DriveFilesRepository, private driveService: DriveService, private queueLoggerService: QueueLoggerService, diff --git a/packages/backend/src/queue/processors/DeleteAccountProcessorService.ts b/packages/backend/src/queue/processors/DeleteAccountProcessorService.ts index c5133b24dc..39155bf383 100644 --- a/packages/backend/src/queue/processors/DeleteAccountProcessorService.ts +++ b/packages/backend/src/queue/processors/DeleteAccountProcessorService.ts @@ -6,7 +6,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { MoreThan } from 'typeorm'; import { DI } from '@/di-symbols.js'; -import type { MiDriveFilesRepository, MiNotesRepository, MiUserProfilesRepository, MiUsersRepository } from '@/models/index.js'; +import type { DriveFilesRepository, NotesRepository, UserProfilesRepository, UsersRepository } from '@/models/index.js'; import type Logger from '@/logger.js'; import { DriveService } from '@/core/DriveService.js'; import type { MiDriveFile } from '@/models/entities/DriveFile.js'; @@ -24,16 +24,16 @@ export class DeleteAccountProcessorService { constructor( @Inject(DI.usersRepository) - private usersRepository: MiUsersRepository, + private usersRepository: UsersRepository, @Inject(DI.userProfilesRepository) - private userProfilesRepository: MiUserProfilesRepository, + private userProfilesRepository: UserProfilesRepository, @Inject(DI.notesRepository) - private notesRepository: MiNotesRepository, + private notesRepository: NotesRepository, @Inject(DI.driveFilesRepository) - private driveFilesRepository: MiDriveFilesRepository, + private driveFilesRepository: DriveFilesRepository, private driveService: DriveService, private emailService: EmailService, diff --git a/packages/backend/src/queue/processors/DeleteDriveFilesProcessorService.ts b/packages/backend/src/queue/processors/DeleteDriveFilesProcessorService.ts index 1d2297ad70..ae395f540d 100644 --- a/packages/backend/src/queue/processors/DeleteDriveFilesProcessorService.ts +++ b/packages/backend/src/queue/processors/DeleteDriveFilesProcessorService.ts @@ -6,7 +6,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { MoreThan } from 'typeorm'; import { DI } from '@/di-symbols.js'; -import type { MiUsersRepository, MiDriveFilesRepository, MiDriveFile } from '@/models/index.js'; +import type { UsersRepository, DriveFilesRepository, MiDriveFile } from '@/models/index.js'; import type Logger from '@/logger.js'; import { DriveService } from '@/core/DriveService.js'; import { bindThis } from '@/decorators.js'; @@ -20,10 +20,10 @@ export class DeleteDriveFilesProcessorService { constructor( @Inject(DI.usersRepository) - private usersRepository: MiUsersRepository, + private usersRepository: UsersRepository, @Inject(DI.driveFilesRepository) - private driveFilesRepository: MiDriveFilesRepository, + private driveFilesRepository: DriveFilesRepository, private driveService: DriveService, private queueLoggerService: QueueLoggerService, diff --git a/packages/backend/src/queue/processors/DeliverProcessorService.ts b/packages/backend/src/queue/processors/DeliverProcessorService.ts index f89f808917..17fa32c2a1 100644 --- a/packages/backend/src/queue/processors/DeliverProcessorService.ts +++ b/packages/backend/src/queue/processors/DeliverProcessorService.ts @@ -6,7 +6,7 @@ import { Inject, Injectable } from '@nestjs/common'; import * as Bull from 'bullmq'; import { DI } from '@/di-symbols.js'; -import type { MiInstancesRepository } from '@/models/index.js'; +import type { InstancesRepository } from '@/models/index.js'; import type Logger from '@/logger.js'; import { MetaService } from '@/core/MetaService.js'; import { ApRequestService } from '@/core/activitypub/ApRequestService.js'; @@ -31,7 +31,7 @@ export class DeliverProcessorService { constructor( @Inject(DI.instancesRepository) - private instancesRepository: MiInstancesRepository, + private instancesRepository: InstancesRepository, private metaService: MetaService, private utilityService: UtilityService, diff --git a/packages/backend/src/queue/processors/EndedPollNotificationProcessorService.ts b/packages/backend/src/queue/processors/EndedPollNotificationProcessorService.ts index f9149d2333..d855ee5707 100644 --- a/packages/backend/src/queue/processors/EndedPollNotificationProcessorService.ts +++ b/packages/backend/src/queue/processors/EndedPollNotificationProcessorService.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { DI } from '@/di-symbols.js'; -import type { MiPollVotesRepository, MiNotesRepository } from '@/models/index.js'; +import type { PollVotesRepository, NotesRepository } from '@/models/index.js'; import type Logger from '@/logger.js'; import { NotificationService } from '@/core/NotificationService.js'; import { bindThis } from '@/decorators.js'; @@ -19,10 +19,10 @@ export class EndedPollNotificationProcessorService { constructor( @Inject(DI.notesRepository) - private notesRepository: MiNotesRepository, + private notesRepository: NotesRepository, @Inject(DI.pollVotesRepository) - private pollVotesRepository: MiPollVotesRepository, + private pollVotesRepository: PollVotesRepository, private notificationService: NotificationService, private queueLoggerService: QueueLoggerService, diff --git a/packages/backend/src/queue/processors/ExportAntennasProcessorService.ts b/packages/backend/src/queue/processors/ExportAntennasProcessorService.ts index 79869a0bb3..243a4f97f2 100644 --- a/packages/backend/src/queue/processors/ExportAntennasProcessorService.ts +++ b/packages/backend/src/queue/processors/ExportAntennasProcessorService.ts @@ -8,7 +8,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { format as DateFormat } from 'date-fns'; import { In } from 'typeorm'; import { DI } from '@/di-symbols.js'; -import type { MiAntennasRepository, MiUsersRepository, MiUserListJoiningsRepository, MiUser } from '@/models/index.js'; +import type { AntennasRepository, UsersRepository, UserListJoiningsRepository, MiUser } from '@/models/index.js'; import Logger from '@/logger.js'; import { DriveService } from '@/core/DriveService.js'; import { bindThis } from '@/decorators.js'; @@ -24,13 +24,13 @@ export class ExportAntennasProcessorService { constructor ( @Inject(DI.usersRepository) - private usersRepository: MiUsersRepository, + private usersRepository: UsersRepository, @Inject(DI.antennasRepository) - private antennsRepository: MiAntennasRepository, + private antennsRepository: AntennasRepository, @Inject(DI.userListJoiningsRepository) - private userListJoiningsRepository: MiUserListJoiningsRepository, + private userListJoiningsRepository: UserListJoiningsRepository, private driveService: DriveService, private utilityService: UtilityService, diff --git a/packages/backend/src/queue/processors/ExportBlockingProcessorService.ts b/packages/backend/src/queue/processors/ExportBlockingProcessorService.ts index 04ec1e6b03..8e27cacb58 100644 --- a/packages/backend/src/queue/processors/ExportBlockingProcessorService.ts +++ b/packages/backend/src/queue/processors/ExportBlockingProcessorService.ts @@ -8,7 +8,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { MoreThan } from 'typeorm'; import { format as dateFormat } from 'date-fns'; import { DI } from '@/di-symbols.js'; -import type { MiUsersRepository, MiBlockingsRepository, MiBlocking } from '@/models/index.js'; +import type { UsersRepository, BlockingsRepository, MiBlocking } from '@/models/index.js'; import type Logger from '@/logger.js'; import { DriveService } from '@/core/DriveService.js'; import { createTemp } from '@/misc/create-temp.js'; @@ -24,10 +24,10 @@ export class ExportBlockingProcessorService { constructor( @Inject(DI.usersRepository) - private usersRepository: MiUsersRepository, + private usersRepository: UsersRepository, @Inject(DI.blockingsRepository) - private blockingsRepository: MiBlockingsRepository, + private blockingsRepository: BlockingsRepository, private utilityService: UtilityService, private driveService: DriveService, diff --git a/packages/backend/src/queue/processors/ExportCustomEmojisProcessorService.ts b/packages/backend/src/queue/processors/ExportCustomEmojisProcessorService.ts index f75859dd2c..688a0a1ccd 100644 --- a/packages/backend/src/queue/processors/ExportCustomEmojisProcessorService.ts +++ b/packages/backend/src/queue/processors/ExportCustomEmojisProcessorService.ts @@ -10,7 +10,7 @@ import { format as dateFormat } from 'date-fns'; import mime from 'mime-types'; import archiver from 'archiver'; import { DI } from '@/di-symbols.js'; -import type { MiEmojisRepository, MiUsersRepository } from '@/models/index.js'; +import type { EmojisRepository, UsersRepository } from '@/models/index.js'; import type { Config } from '@/config.js'; import type Logger from '@/logger.js'; import { DriveService } from '@/core/DriveService.js'; @@ -29,10 +29,10 @@ export class ExportCustomEmojisProcessorService { private config: Config, @Inject(DI.usersRepository) - private usersRepository: MiUsersRepository, + private usersRepository: UsersRepository, @Inject(DI.emojisRepository) - private emojisRepository: MiEmojisRepository, + private emojisRepository: EmojisRepository, private driveService: DriveService, private downloadService: DownloadService, diff --git a/packages/backend/src/queue/processors/ExportFavoritesProcessorService.ts b/packages/backend/src/queue/processors/ExportFavoritesProcessorService.ts index 5af8dc97ae..afa1fa4ce7 100644 --- a/packages/backend/src/queue/processors/ExportFavoritesProcessorService.ts +++ b/packages/backend/src/queue/processors/ExportFavoritesProcessorService.ts @@ -8,7 +8,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { MoreThan } from 'typeorm'; import { format as dateFormat } from 'date-fns'; import { DI } from '@/di-symbols.js'; -import type { MiNoteFavorite, MiNoteFavoritesRepository, MiPollsRepository, MiUser, MiUsersRepository } from '@/models/index.js'; +import type { MiNoteFavorite, NoteFavoritesRepository, PollsRepository, MiUser, UsersRepository } from '@/models/index.js'; import type Logger from '@/logger.js'; import { DriveService } from '@/core/DriveService.js'; import { createTemp } from '@/misc/create-temp.js'; @@ -25,13 +25,13 @@ export class ExportFavoritesProcessorService { constructor( @Inject(DI.usersRepository) - private usersRepository: MiUsersRepository, + private usersRepository: UsersRepository, @Inject(DI.pollsRepository) - private pollsRepository: MiPollsRepository, + private pollsRepository: PollsRepository, @Inject(DI.noteFavoritesRepository) - private noteFavoritesRepository: MiNoteFavoritesRepository, + private noteFavoritesRepository: NoteFavoritesRepository, private driveService: DriveService, private queueLoggerService: QueueLoggerService, diff --git a/packages/backend/src/queue/processors/ExportFollowingProcessorService.ts b/packages/backend/src/queue/processors/ExportFollowingProcessorService.ts index 4d23eef2cf..7f29d7299a 100644 --- a/packages/backend/src/queue/processors/ExportFollowingProcessorService.ts +++ b/packages/backend/src/queue/processors/ExportFollowingProcessorService.ts @@ -8,7 +8,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { In, MoreThan, Not } from 'typeorm'; import { format as dateFormat } from 'date-fns'; import { DI } from '@/di-symbols.js'; -import type { MiUsersRepository, MiFollowingsRepository, MiMutingsRepository } from '@/models/index.js'; +import type { UsersRepository, FollowingsRepository, MutingsRepository } from '@/models/index.js'; import type Logger from '@/logger.js'; import { DriveService } from '@/core/DriveService.js'; import { createTemp } from '@/misc/create-temp.js'; @@ -25,13 +25,13 @@ export class ExportFollowingProcessorService { constructor( @Inject(DI.usersRepository) - private usersRepository: MiUsersRepository, + private usersRepository: UsersRepository, @Inject(DI.followingsRepository) - private followingsRepository: MiFollowingsRepository, + private followingsRepository: FollowingsRepository, @Inject(DI.mutingsRepository) - private mutingsRepository: MiMutingsRepository, + private mutingsRepository: MutingsRepository, private utilityService: UtilityService, private driveService: DriveService, diff --git a/packages/backend/src/queue/processors/ExportMutingProcessorService.ts b/packages/backend/src/queue/processors/ExportMutingProcessorService.ts index b830d282a9..1bb8da06f5 100644 --- a/packages/backend/src/queue/processors/ExportMutingProcessorService.ts +++ b/packages/backend/src/queue/processors/ExportMutingProcessorService.ts @@ -8,7 +8,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { IsNull, MoreThan } from 'typeorm'; import { format as dateFormat } from 'date-fns'; import { DI } from '@/di-symbols.js'; -import type { MiMutingsRepository, MiUsersRepository, MiMuting } from '@/models/index.js'; +import type { MutingsRepository, UsersRepository, MiMuting } from '@/models/index.js'; import type Logger from '@/logger.js'; import { DriveService } from '@/core/DriveService.js'; import { createTemp } from '@/misc/create-temp.js'; @@ -24,10 +24,10 @@ export class ExportMutingProcessorService { constructor( @Inject(DI.usersRepository) - private usersRepository: MiUsersRepository, + private usersRepository: UsersRepository, @Inject(DI.mutingsRepository) - private mutingsRepository: MiMutingsRepository, + private mutingsRepository: MutingsRepository, private utilityService: UtilityService, private driveService: DriveService, diff --git a/packages/backend/src/queue/processors/ExportNotesProcessorService.ts b/packages/backend/src/queue/processors/ExportNotesProcessorService.ts index 42f0710fc1..0dcda341fd 100644 --- a/packages/backend/src/queue/processors/ExportNotesProcessorService.ts +++ b/packages/backend/src/queue/processors/ExportNotesProcessorService.ts @@ -8,7 +8,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { MoreThan } from 'typeorm'; import { format as dateFormat } from 'date-fns'; import { DI } from '@/di-symbols.js'; -import type { MiNotesRepository, MiPollsRepository, MiUsersRepository } from '@/models/index.js'; +import type { NotesRepository, PollsRepository, UsersRepository } from '@/models/index.js'; import type Logger from '@/logger.js'; import { DriveService } from '@/core/DriveService.js'; import { createTemp } from '@/misc/create-temp.js'; @@ -27,13 +27,13 @@ export class ExportNotesProcessorService { constructor( @Inject(DI.usersRepository) - private usersRepository: MiUsersRepository, + private usersRepository: UsersRepository, @Inject(DI.pollsRepository) - private pollsRepository: MiPollsRepository, + private pollsRepository: PollsRepository, @Inject(DI.notesRepository) - private notesRepository: MiNotesRepository, + private notesRepository: NotesRepository, private driveService: DriveService, private queueLoggerService: QueueLoggerService, diff --git a/packages/backend/src/queue/processors/ExportUserListsProcessorService.ts b/packages/backend/src/queue/processors/ExportUserListsProcessorService.ts index b02b2b3efd..ba3e18b563 100644 --- a/packages/backend/src/queue/processors/ExportUserListsProcessorService.ts +++ b/packages/backend/src/queue/processors/ExportUserListsProcessorService.ts @@ -8,7 +8,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { In } from 'typeorm'; import { format as dateFormat } from 'date-fns'; import { DI } from '@/di-symbols.js'; -import type { MiUserListJoiningsRepository, MiUserListsRepository, MiUsersRepository } from '@/models/index.js'; +import type { UserListJoiningsRepository, UserListsRepository, UsersRepository } from '@/models/index.js'; import type Logger from '@/logger.js'; import { DriveService } from '@/core/DriveService.js'; import { createTemp } from '@/misc/create-temp.js'; @@ -24,13 +24,13 @@ export class ExportUserListsProcessorService { constructor( @Inject(DI.usersRepository) - private usersRepository: MiUsersRepository, + private usersRepository: UsersRepository, @Inject(DI.userListsRepository) - private userListsRepository: MiUserListsRepository, + private userListsRepository: UserListsRepository, @Inject(DI.userListJoiningsRepository) - private userListJoiningsRepository: MiUserListJoiningsRepository, + private userListJoiningsRepository: UserListJoiningsRepository, private utilityService: UtilityService, private driveService: DriveService, diff --git a/packages/backend/src/queue/processors/ImportAntennasProcessorService.ts b/packages/backend/src/queue/processors/ImportAntennasProcessorService.ts index f405f98217..9ff9a8a528 100644 --- a/packages/backend/src/queue/processors/ImportAntennasProcessorService.ts +++ b/packages/backend/src/queue/processors/ImportAntennasProcessorService.ts @@ -8,7 +8,7 @@ import _Ajv from 'ajv'; import { IdService } from '@/core/IdService.js'; import { GlobalEventService } from '@/core/GlobalEventService.js'; import Logger from '@/logger.js'; -import type { MiAntennasRepository } from '@/models/index.js'; +import type { AntennasRepository } from '@/models/index.js'; import { DI } from '@/di-symbols.js'; import { bindThis } from '@/decorators.js'; import { QueueLoggerService } from '../QueueLoggerService.js'; @@ -56,7 +56,7 @@ export class ImportAntennasProcessorService { constructor ( @Inject(DI.antennasRepository) - private antennasRepository: MiAntennasRepository, + private antennasRepository: AntennasRepository, private queueLoggerService: QueueLoggerService, private idService: IdService, diff --git a/packages/backend/src/queue/processors/ImportBlockingProcessorService.ts b/packages/backend/src/queue/processors/ImportBlockingProcessorService.ts index d55bbdabd9..1d4c3d907e 100644 --- a/packages/backend/src/queue/processors/ImportBlockingProcessorService.ts +++ b/packages/backend/src/queue/processors/ImportBlockingProcessorService.ts @@ -6,7 +6,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { IsNull } from 'typeorm'; import { DI } from '@/di-symbols.js'; -import type { MiUsersRepository, MiDriveFilesRepository } from '@/models/index.js'; +import type { UsersRepository, DriveFilesRepository } from '@/models/index.js'; import type Logger from '@/logger.js'; import * as Acct from '@/misc/acct.js'; import { RemoteUserResolveService } from '@/core/RemoteUserResolveService.js'; @@ -24,10 +24,10 @@ export class ImportBlockingProcessorService { constructor( @Inject(DI.usersRepository) - private usersRepository: MiUsersRepository, + private usersRepository: UsersRepository, @Inject(DI.driveFilesRepository) - private driveFilesRepository: MiDriveFilesRepository, + private driveFilesRepository: DriveFilesRepository, private queueService: QueueService, private utilityService: UtilityService, diff --git a/packages/backend/src/queue/processors/ImportCustomEmojisProcessorService.ts b/packages/backend/src/queue/processors/ImportCustomEmojisProcessorService.ts index 7f81d5c41f..54e92d3129 100644 --- a/packages/backend/src/queue/processors/ImportCustomEmojisProcessorService.ts +++ b/packages/backend/src/queue/processors/ImportCustomEmojisProcessorService.ts @@ -7,7 +7,7 @@ import * as fs from 'node:fs'; import { Inject, Injectable } from '@nestjs/common'; import { ZipReader } from 'slacc'; import { DI } from '@/di-symbols.js'; -import type { MiEmojisRepository, MiDriveFilesRepository } from '@/models/index.js'; +import type { EmojisRepository, DriveFilesRepository } from '@/models/index.js'; import type Logger from '@/logger.js'; import { CustomEmojiService } from '@/core/CustomEmojiService.js'; import { createTempDir } from '@/misc/create-temp.js'; @@ -25,10 +25,10 @@ export class ImportCustomEmojisProcessorService { constructor( @Inject(DI.driveFilesRepository) - private driveFilesRepository: MiDriveFilesRepository, + private driveFilesRepository: DriveFilesRepository, @Inject(DI.emojisRepository) - private emojisRepository: MiEmojisRepository, + private emojisRepository: EmojisRepository, private customEmojiService: CustomEmojiService, private driveService: DriveService, diff --git a/packages/backend/src/queue/processors/ImportFollowingProcessorService.ts b/packages/backend/src/queue/processors/ImportFollowingProcessorService.ts index fb7cc65129..585311982f 100644 --- a/packages/backend/src/queue/processors/ImportFollowingProcessorService.ts +++ b/packages/backend/src/queue/processors/ImportFollowingProcessorService.ts @@ -6,7 +6,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { IsNull } from 'typeorm'; import { DI } from '@/di-symbols.js'; -import type { MiUsersRepository, MiDriveFilesRepository } from '@/models/index.js'; +import type { UsersRepository, DriveFilesRepository } from '@/models/index.js'; import type Logger from '@/logger.js'; import * as Acct from '@/misc/acct.js'; import { RemoteUserResolveService } from '@/core/RemoteUserResolveService.js'; @@ -24,10 +24,10 @@ export class ImportFollowingProcessorService { constructor( @Inject(DI.usersRepository) - private usersRepository: MiUsersRepository, + private usersRepository: UsersRepository, @Inject(DI.driveFilesRepository) - private driveFilesRepository: MiDriveFilesRepository, + private driveFilesRepository: DriveFilesRepository, private queueService: QueueService, private utilityService: UtilityService, diff --git a/packages/backend/src/queue/processors/ImportMutingProcessorService.ts b/packages/backend/src/queue/processors/ImportMutingProcessorService.ts index 5e9396a6c8..174046c561 100644 --- a/packages/backend/src/queue/processors/ImportMutingProcessorService.ts +++ b/packages/backend/src/queue/processors/ImportMutingProcessorService.ts @@ -6,7 +6,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { IsNull } from 'typeorm'; import { DI } from '@/di-symbols.js'; -import type { MiUsersRepository, MiDriveFilesRepository } from '@/models/index.js'; +import type { UsersRepository, DriveFilesRepository } from '@/models/index.js'; import type Logger from '@/logger.js'; import * as Acct from '@/misc/acct.js'; import { RemoteUserResolveService } from '@/core/RemoteUserResolveService.js'; @@ -24,10 +24,10 @@ export class ImportMutingProcessorService { constructor( @Inject(DI.usersRepository) - private usersRepository: MiUsersRepository, + private usersRepository: UsersRepository, @Inject(DI.driveFilesRepository) - private driveFilesRepository: MiDriveFilesRepository, + private driveFilesRepository: DriveFilesRepository, private utilityService: UtilityService, private userMutingService: UserMutingService, diff --git a/packages/backend/src/queue/processors/ImportUserListsProcessorService.ts b/packages/backend/src/queue/processors/ImportUserListsProcessorService.ts index 7856607e95..a434b4da95 100644 --- a/packages/backend/src/queue/processors/ImportUserListsProcessorService.ts +++ b/packages/backend/src/queue/processors/ImportUserListsProcessorService.ts @@ -6,7 +6,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { IsNull } from 'typeorm'; import { DI } from '@/di-symbols.js'; -import type { MiUsersRepository, MiDriveFilesRepository, MiUserListJoiningsRepository, MiUserListsRepository } from '@/models/index.js'; +import type { UsersRepository, DriveFilesRepository, UserListJoiningsRepository, UserListsRepository } from '@/models/index.js'; import type Logger from '@/logger.js'; import * as Acct from '@/misc/acct.js'; import { RemoteUserResolveService } from '@/core/RemoteUserResolveService.js'; @@ -25,16 +25,16 @@ export class ImportUserListsProcessorService { constructor( @Inject(DI.usersRepository) - private usersRepository: MiUsersRepository, + private usersRepository: UsersRepository, @Inject(DI.driveFilesRepository) - private driveFilesRepository: MiDriveFilesRepository, + private driveFilesRepository: DriveFilesRepository, @Inject(DI.userListsRepository) - private userListsRepository: MiUserListsRepository, + private userListsRepository: UserListsRepository, @Inject(DI.userListJoiningsRepository) - private userListJoiningsRepository: MiUserListJoiningsRepository, + private userListJoiningsRepository: UserListJoiningsRepository, private utilityService: UtilityService, private idService: IdService, diff --git a/packages/backend/src/queue/processors/RelationshipProcessorService.ts b/packages/backend/src/queue/processors/RelationshipProcessorService.ts index 24246f3527..67a50dc789 100644 --- a/packages/backend/src/queue/processors/RelationshipProcessorService.ts +++ b/packages/backend/src/queue/processors/RelationshipProcessorService.ts @@ -10,7 +10,7 @@ import { UserBlockingService } from '@/core/UserBlockingService.js'; import { bindThis } from '@/decorators.js'; import type Logger from '@/logger.js'; -import type { MiUsersRepository } from '@/models/index.js'; +import type { UsersRepository } from '@/models/index.js'; import { DI } from '@/di-symbols.js'; import { MiLocalUser, MiRemoteUser } from '@/models/entities/User.js'; import { RelationshipJobData } from '../types.js'; @@ -23,7 +23,7 @@ export class RelationshipProcessorService { constructor( @Inject(DI.usersRepository) - private usersRepository: MiUsersRepository, + private usersRepository: UsersRepository, private queueLoggerService: QueueLoggerService, private userFollowingService: UserFollowingService, diff --git a/packages/backend/src/queue/processors/WebhookDeliverProcessorService.ts b/packages/backend/src/queue/processors/WebhookDeliverProcessorService.ts index 6be2dd21b1..169df77924 100644 --- a/packages/backend/src/queue/processors/WebhookDeliverProcessorService.ts +++ b/packages/backend/src/queue/processors/WebhookDeliverProcessorService.ts @@ -6,7 +6,7 @@ import { Inject, Injectable } from '@nestjs/common'; import * as Bull from 'bullmq'; import { DI } from '@/di-symbols.js'; -import type { MiWebhooksRepository } from '@/models/index.js'; +import type { WebhooksRepository } from '@/models/index.js'; import type { Config } from '@/config.js'; import type Logger from '@/logger.js'; import { HttpRequestService } from '@/core/HttpRequestService.js'; @@ -24,7 +24,7 @@ export class WebhookDeliverProcessorService { private config: Config, @Inject(DI.webhooksRepository) - private webhooksRepository: MiWebhooksRepository, + private webhooksRepository: WebhooksRepository, private httpRequestService: HttpRequestService, private queueLoggerService: QueueLoggerService, diff --git a/packages/backend/src/server/ActivityPubServerService.ts b/packages/backend/src/server/ActivityPubServerService.ts index 04db368518..86edab396b 100644 --- a/packages/backend/src/server/ActivityPubServerService.ts +++ b/packages/backend/src/server/ActivityPubServerService.ts @@ -11,7 +11,7 @@ import { Brackets, In, IsNull, LessThan, Not } from 'typeorm'; import accepts from 'accepts'; import vary from 'vary'; import { DI } from '@/di-symbols.js'; -import type { MiFollowingsRepository, MiNotesRepository, MiEmojisRepository, MiNoteReactionsRepository, MiUserProfilesRepository, MiUserNotePiningsRepository, MiUsersRepository, MiFollowRequestsRepository } from '@/models/index.js'; +import type { FollowingsRepository, NotesRepository, EmojisRepository, NoteReactionsRepository, UserProfilesRepository, UserNotePiningsRepository, UsersRepository, FollowRequestsRepository } from '@/models/index.js'; import * as url from '@/misc/prelude/url.js'; import type { Config } from '@/config.js'; import { ApRendererService } from '@/core/activitypub/ApRendererService.js'; @@ -39,28 +39,28 @@ export class ActivityPubServerService { private config: Config, @Inject(DI.usersRepository) - private usersRepository: MiUsersRepository, + private usersRepository: UsersRepository, @Inject(DI.userProfilesRepository) - private userProfilesRepository: MiUserProfilesRepository, + private userProfilesRepository: UserProfilesRepository, @Inject(DI.notesRepository) - private notesRepository: MiNotesRepository, + private notesRepository: NotesRepository, @Inject(DI.noteReactionsRepository) - private noteReactionsRepository: MiNoteReactionsRepository, + private noteReactionsRepository: NoteReactionsRepository, @Inject(DI.emojisRepository) - private emojisRepository: MiEmojisRepository, + private emojisRepository: EmojisRepository, @Inject(DI.userNotePiningsRepository) - private userNotePiningsRepository: MiUserNotePiningsRepository, + private userNotePiningsRepository: UserNotePiningsRepository, @Inject(DI.followingsRepository) - private followingsRepository: MiFollowingsRepository, + private followingsRepository: FollowingsRepository, @Inject(DI.followRequestsRepository) - private followRequestsRepository: MiFollowRequestsRepository, + private followRequestsRepository: FollowRequestsRepository, private utilityService: UtilityService, private userEntityService: UserEntityService, diff --git a/packages/backend/src/server/FileServerService.ts b/packages/backend/src/server/FileServerService.ts index e17c092f22..9df6ba2a76 100644 --- a/packages/backend/src/server/FileServerService.ts +++ b/packages/backend/src/server/FileServerService.ts @@ -11,7 +11,7 @@ import rename from 'rename'; import sharp from 'sharp'; import { sharpBmp } from 'sharp-read-bmp'; import type { Config } from '@/config.js'; -import type { MiDriveFile, MiDriveFilesRepository } from '@/models/index.js'; +import type { MiDriveFile, DriveFilesRepository } from '@/models/index.js'; import { DI } from '@/di-symbols.js'; import { createTemp } from '@/misc/create-temp.js'; import { FILE_TYPE_BROWSERSAFE } from '@/const.js'; @@ -43,7 +43,7 @@ export class FileServerService { private config: Config, @Inject(DI.driveFilesRepository) - private driveFilesRepository: MiDriveFilesRepository, + private driveFilesRepository: DriveFilesRepository, private fileInfoService: FileInfoService, private downloadService: DownloadService, diff --git a/packages/backend/src/server/ServerService.ts b/packages/backend/src/server/ServerService.ts index 24a7346fae..b40eeb31b1 100644 --- a/packages/backend/src/server/ServerService.ts +++ b/packages/backend/src/server/ServerService.ts @@ -12,7 +12,7 @@ import fastifyStatic from '@fastify/static'; import { IsNull } from 'typeorm'; import { GlobalEventService } from '@/core/GlobalEventService.js'; import type { Config } from '@/config.js'; -import type { MiEmojisRepository, MiUserProfilesRepository, MiUsersRepository } from '@/models/index.js'; +import type { EmojisRepository, UserProfilesRepository, UsersRepository } from '@/models/index.js'; import { DI } from '@/di-symbols.js'; import type Logger from '@/logger.js'; import * as Acct from '@/misc/acct.js'; @@ -44,13 +44,13 @@ export class ServerService implements OnApplicationShutdown { private config: Config, @Inject(DI.usersRepository) - private usersRepository: MiUsersRepository, + private usersRepository: UsersRepository, @Inject(DI.userProfilesRepository) - private userProfilesRepository: MiUserProfilesRepository, + private userProfilesRepository: UserProfilesRepository, @Inject(DI.emojisRepository) - private emojisRepository: MiEmojisRepository, + private emojisRepository: EmojisRepository, private metaService: MetaService, private userEntityService: UserEntityService, diff --git a/packages/backend/src/server/WellKnownServerService.ts b/packages/backend/src/server/WellKnownServerService.ts index 40f79fd455..43c8dcf2c1 100644 --- a/packages/backend/src/server/WellKnownServerService.ts +++ b/packages/backend/src/server/WellKnownServerService.ts @@ -8,7 +8,7 @@ import { IsNull } from 'typeorm'; import vary from 'vary'; import fastifyAccepts from '@fastify/accepts'; import { DI } from '@/di-symbols.js'; -import type { MiUsersRepository } from '@/models/index.js'; +import type { UsersRepository } from '@/models/index.js'; import type { Config } from '@/config.js'; import { escapeAttribute, escapeValue } from '@/misc/prelude/xml.js'; import type { MiUser } from '@/models/entities/User.js'; @@ -26,7 +26,7 @@ export class WellKnownServerService { private config: Config, @Inject(DI.usersRepository) - private usersRepository: MiUsersRepository, + private usersRepository: UsersRepository, private nodeinfoServerService: NodeinfoServerService, private userEntityService: UserEntityService, diff --git a/packages/backend/src/server/api/ApiCallService.ts b/packages/backend/src/server/api/ApiCallService.ts index bde766a32b..5d5a8f3706 100644 --- a/packages/backend/src/server/api/ApiCallService.ts +++ b/packages/backend/src/server/api/ApiCallService.ts @@ -12,7 +12,7 @@ import { getIpHash } from '@/misc/get-ip-hash.js'; import type { MiLocalUser, MiUser } from '@/models/entities/User.js'; import type { MiAccessToken } from '@/models/entities/AccessToken.js'; import type Logger from '@/logger.js'; -import type { MiUserIpsRepository } from '@/models/index.js'; +import type { UserIpsRepository } from '@/models/index.js'; import { MetaService } from '@/core/MetaService.js'; import { createTemp } from '@/misc/create-temp.js'; import { bindThis } from '@/decorators.js'; @@ -39,7 +39,7 @@ export class ApiCallService implements OnApplicationShutdown { constructor( @Inject(DI.userIpsRepository) - private userIpsRepository: MiUserIpsRepository, + private userIpsRepository: UserIpsRepository, private metaService: MetaService, private authenticateService: AuthenticateService, diff --git a/packages/backend/src/server/api/ApiServerService.ts b/packages/backend/src/server/api/ApiServerService.ts index aad8453816..96b6a821d5 100644 --- a/packages/backend/src/server/api/ApiServerService.ts +++ b/packages/backend/src/server/api/ApiServerService.ts @@ -9,7 +9,7 @@ import multipart from '@fastify/multipart'; import fastifyCookie from '@fastify/cookie'; import { ModuleRef } from '@nestjs/core'; import type { Config } from '@/config.js'; -import type { MiInstancesRepository, MiAccessTokensRepository } from '@/models/index.js'; +import type { InstancesRepository, AccessTokensRepository } from '@/models/index.js'; import { DI } from '@/di-symbols.js'; import { UserEntityService } from '@/core/entities/UserEntityService.js'; import { bindThis } from '@/decorators.js'; @@ -28,10 +28,10 @@ export class ApiServerService { private config: Config, @Inject(DI.instancesRepository) - private instancesRepository: MiInstancesRepository, + private instancesRepository: InstancesRepository, @Inject(DI.accessTokensRepository) - private accessTokensRepository: MiAccessTokensRepository, + private accessTokensRepository: AccessTokensRepository, private userEntityService: UserEntityService, private apiCallService: ApiCallService, diff --git a/packages/backend/src/server/api/AuthenticateService.ts b/packages/backend/src/server/api/AuthenticateService.ts index 3945279caf..8b031ab334 100644 --- a/packages/backend/src/server/api/AuthenticateService.ts +++ b/packages/backend/src/server/api/AuthenticateService.ts @@ -5,7 +5,7 @@ import { Inject, Injectable, OnApplicationShutdown } from '@nestjs/common'; import { DI } from '@/di-symbols.js'; -import type { MiAccessTokensRepository, MiAppsRepository, MiUsersRepository } from '@/models/index.js'; +import type { AccessTokensRepository, AppsRepository, UsersRepository } from '@/models/index.js'; import type { MiLocalUser } from '@/models/entities/User.js'; import type { MiAccessToken } from '@/models/entities/AccessToken.js'; import { MemoryKVCache } from '@/misc/cache.js'; @@ -27,13 +27,13 @@ export class AuthenticateService implements OnApplicationShutdown { constructor( @Inject(DI.usersRepository) - private usersRepository: MiUsersRepository, + private usersRepository: UsersRepository, @Inject(DI.accessTokensRepository) - private accessTokensRepository: MiAccessTokensRepository, + private accessTokensRepository: AccessTokensRepository, @Inject(DI.appsRepository) - private appsRepository: MiAppsRepository, + private appsRepository: AppsRepository, private cacheService: CacheService, ) { diff --git a/packages/backend/src/server/api/GetterService.ts b/packages/backend/src/server/api/GetterService.ts index 1c4fdf0d84..834a6ce4ca 100644 --- a/packages/backend/src/server/api/GetterService.ts +++ b/packages/backend/src/server/api/GetterService.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { DI } from '@/di-symbols.js'; -import type { MiNotesRepository, MiUsersRepository } from '@/models/index.js'; +import type { NotesRepository, UsersRepository } from '@/models/index.js'; import { IdentifiableError } from '@/misc/identifiable-error.js'; import type { MiLocalUser, MiRemoteUser, MiUser } from '@/models/entities/User.js'; import type { MiNote } from '@/models/entities/Note.js'; @@ -16,10 +16,10 @@ import { bindThis } from '@/decorators.js'; export class GetterService { constructor( @Inject(DI.usersRepository) - private usersRepository: MiUsersRepository, + private usersRepository: UsersRepository, @Inject(DI.notesRepository) - private notesRepository: MiNotesRepository, + private notesRepository: NotesRepository, private userEntityService: UserEntityService, ) { diff --git a/packages/backend/src/server/api/SigninApiService.ts b/packages/backend/src/server/api/SigninApiService.ts index fbaf89fa28..d68b2617e3 100644 --- a/packages/backend/src/server/api/SigninApiService.ts +++ b/packages/backend/src/server/api/SigninApiService.ts @@ -9,7 +9,7 @@ import bcrypt from 'bcryptjs'; import * as OTPAuth from 'otpauth'; import { IsNull } from 'typeorm'; import { DI } from '@/di-symbols.js'; -import type { MiUserSecurityKeysRepository, MiSigninsRepository, MiUserProfilesRepository, MiAttestationChallengesRepository, MiUsersRepository } from '@/models/index.js'; +import type { UserSecurityKeysRepository, SigninsRepository, UserProfilesRepository, AttestationChallengesRepository, UsersRepository } from '@/models/index.js'; import type { Config } from '@/config.js'; import { getIpHash } from '@/misc/get-ip-hash.js'; import type { MiLocalUser } from '@/models/entities/User.js'; @@ -27,19 +27,19 @@ export class SigninApiService { private config: Config, @Inject(DI.usersRepository) - private usersRepository: MiUsersRepository, + private usersRepository: UsersRepository, @Inject(DI.userSecurityKeysRepository) - private userSecurityKeysRepository: MiUserSecurityKeysRepository, + private userSecurityKeysRepository: UserSecurityKeysRepository, @Inject(DI.userProfilesRepository) - private userProfilesRepository: MiUserProfilesRepository, + private userProfilesRepository: UserProfilesRepository, @Inject(DI.attestationChallengesRepository) - private attestationChallengesRepository: MiAttestationChallengesRepository, + private attestationChallengesRepository: AttestationChallengesRepository, @Inject(DI.signinsRepository) - private signinsRepository: MiSigninsRepository, + private signinsRepository: SigninsRepository, private idService: IdService, private rateLimiterService: RateLimiterService, diff --git a/packages/backend/src/server/api/SigninService.ts b/packages/backend/src/server/api/SigninService.ts index 4801a94b5e..9f731e01bd 100644 --- a/packages/backend/src/server/api/SigninService.ts +++ b/packages/backend/src/server/api/SigninService.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { DI } from '@/di-symbols.js'; -import type { MiSigninsRepository } from '@/models/index.js'; +import type { SigninsRepository } from '@/models/index.js'; import { IdService } from '@/core/IdService.js'; import type { MiLocalUser } from '@/models/entities/User.js'; import { GlobalEventService } from '@/core/GlobalEventService.js'; @@ -17,7 +17,7 @@ import type { FastifyRequest, FastifyReply } from 'fastify'; export class SigninService { constructor( @Inject(DI.signinsRepository) - private signinsRepository: MiSigninsRepository, + private signinsRepository: SigninsRepository, private signinEntityService: SigninEntityService, private idService: IdService, diff --git a/packages/backend/src/server/api/SignupApiService.ts b/packages/backend/src/server/api/SignupApiService.ts index 2de33ee0da..6e0351d298 100644 --- a/packages/backend/src/server/api/SignupApiService.ts +++ b/packages/backend/src/server/api/SignupApiService.ts @@ -7,7 +7,7 @@ import { Inject, Injectable } from '@nestjs/common'; import bcrypt from 'bcryptjs'; import { IsNull } from 'typeorm'; import { DI } from '@/di-symbols.js'; -import type { MiRegistrationTicketsRepository, MiUsedUsernamesRepository, MiUserPendingsRepository, MiUserProfilesRepository, MiUsersRepository, MiRegistrationTicket } from '@/models/index.js'; +import type { RegistrationTicketsRepository, UsedUsernamesRepository, UserPendingsRepository, UserProfilesRepository, UsersRepository, MiRegistrationTicket } from '@/models/index.js'; import type { Config } from '@/config.js'; import { MetaService } from '@/core/MetaService.js'; import { CaptchaService } from '@/core/CaptchaService.js'; @@ -29,19 +29,19 @@ export class SignupApiService { private config: Config, @Inject(DI.usersRepository) - private usersRepository: MiUsersRepository, + private usersRepository: UsersRepository, @Inject(DI.userProfilesRepository) - private userProfilesRepository: MiUserProfilesRepository, + private userProfilesRepository: UserProfilesRepository, @Inject(DI.userPendingsRepository) - private userPendingsRepository: MiUserPendingsRepository, + private userPendingsRepository: UserPendingsRepository, @Inject(DI.usedUsernamesRepository) - private usedUsernamesRepository: MiUsedUsernamesRepository, + private usedUsernamesRepository: UsedUsernamesRepository, @Inject(DI.registrationTicketsRepository) - private registrationTicketsRepository: MiRegistrationTicketsRepository, + private registrationTicketsRepository: RegistrationTicketsRepository, private userEntityService: UserEntityService, private idService: IdService, diff --git a/packages/backend/src/server/api/StreamingApiServerService.ts b/packages/backend/src/server/api/StreamingApiServerService.ts index 97b7f28e6c..74c4691435 100644 --- a/packages/backend/src/server/api/StreamingApiServerService.ts +++ b/packages/backend/src/server/api/StreamingApiServerService.ts @@ -8,7 +8,7 @@ import { Inject, Injectable } from '@nestjs/common'; import * as Redis from 'ioredis'; import * as WebSocket from 'ws'; import { DI } from '@/di-symbols.js'; -import type { MiUsersRepository, MiAccessToken } from '@/models/index.js'; +import type { UsersRepository, MiAccessToken } from '@/models/index.js'; import { NoteReadService } from '@/core/NoteReadService.js'; import { NotificationService } from '@/core/NotificationService.js'; import { bindThis } from '@/decorators.js'; @@ -30,7 +30,7 @@ export class StreamingApiServerService { private redisForSub: Redis.Redis, @Inject(DI.usersRepository) - private usersRepository: MiUsersRepository, + private usersRepository: UsersRepository, private cacheService: CacheService, private noteReadService: NoteReadService, diff --git a/packages/backend/src/server/api/endpoints/admin/abuse-user-reports.ts b/packages/backend/src/server/api/endpoints/admin/abuse-user-reports.ts index fd5a79b48c..6bf7818de6 100644 --- a/packages/backend/src/server/api/endpoints/admin/abuse-user-reports.ts +++ b/packages/backend/src/server/api/endpoints/admin/abuse-user-reports.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { MiAbuseUserReportsRepository } from '@/models/index.js'; +import type { AbuseUserReportsRepository } from '@/models/index.js'; import { QueryService } from '@/core/QueryService.js'; import { DI } from '@/di-symbols.js'; import { AbuseUserReportEntityService } from '@/core/entities/AbuseUserReportEntityService.js'; @@ -97,7 +97,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.abuseUserReportsRepository) - private abuseUserReportsRepository: MiAbuseUserReportsRepository, + private abuseUserReportsRepository: AbuseUserReportsRepository, private abuseUserReportEntityService: AbuseUserReportEntityService, private queryService: QueryService, diff --git a/packages/backend/src/server/api/endpoints/admin/accounts/create.ts b/packages/backend/src/server/api/endpoints/admin/accounts/create.ts index f67a79edda..b9b5f82f2a 100644 --- a/packages/backend/src/server/api/endpoints/admin/accounts/create.ts +++ b/packages/backend/src/server/api/endpoints/admin/accounts/create.ts @@ -6,7 +6,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { IsNull } from 'typeorm'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { MiUsersRepository } from '@/models/index.js'; +import type { UsersRepository } from '@/models/index.js'; import { SignupService } from '@/core/SignupService.js'; import { UserEntityService } from '@/core/entities/UserEntityService.js'; import { localUsernameSchema, passwordSchema } from '@/models/entities/User.js'; @@ -42,7 +42,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.usersRepository) - private usersRepository: MiUsersRepository, + private usersRepository: UsersRepository, private userEntityService: UserEntityService, private signupService: SignupService, diff --git a/packages/backend/src/server/api/endpoints/admin/accounts/delete.ts b/packages/backend/src/server/api/endpoints/admin/accounts/delete.ts index 31845a3a24..08e6b11d11 100644 --- a/packages/backend/src/server/api/endpoints/admin/accounts/delete.ts +++ b/packages/backend/src/server/api/endpoints/admin/accounts/delete.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { MiUsersRepository } from '@/models/index.js'; +import type { UsersRepository } from '@/models/index.js'; import { QueueService } from '@/core/QueueService.js'; import { UserSuspendService } from '@/core/UserSuspendService.js'; import { DI } from '@/di-symbols.js'; @@ -31,7 +31,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.usersRepository) - private usersRepository: MiUsersRepository, + private usersRepository: UsersRepository, private userEntityService: UserEntityService, private queueService: QueueService, diff --git a/packages/backend/src/server/api/endpoints/admin/ad/create.ts b/packages/backend/src/server/api/endpoints/admin/ad/create.ts index 172865395c..b0d6eae192 100644 --- a/packages/backend/src/server/api/endpoints/admin/ad/create.ts +++ b/packages/backend/src/server/api/endpoints/admin/ad/create.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { MiAdsRepository } from '@/models/index.js'; +import type { AdsRepository } from '@/models/index.js'; import { IdService } from '@/core/IdService.js'; import { DI } from '@/di-symbols.js'; @@ -37,7 +37,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.adsRepository) - private adsRepository: MiAdsRepository, + private adsRepository: AdsRepository, private idService: IdService, ) { diff --git a/packages/backend/src/server/api/endpoints/admin/ad/delete.ts b/packages/backend/src/server/api/endpoints/admin/ad/delete.ts index 2890fd5e7b..bebc07e0d6 100644 --- a/packages/backend/src/server/api/endpoints/admin/ad/delete.ts +++ b/packages/backend/src/server/api/endpoints/admin/ad/delete.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { MiAdsRepository } from '@/models/index.js'; +import type { AdsRepository } from '@/models/index.js'; import { DI } from '@/di-symbols.js'; import { ApiError } from '../../../error.js'; @@ -37,7 +37,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.adsRepository) - private adsRepository: MiAdsRepository, + private adsRepository: AdsRepository, ) { super(meta, paramDef, async (ps, me) => { const ad = await this.adsRepository.findOneBy({ id: ps.id }); 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 ac2638b531..b33d921c5f 100644 --- a/packages/backend/src/server/api/endpoints/admin/ad/list.ts +++ b/packages/backend/src/server/api/endpoints/admin/ad/list.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { MiAdsRepository } from '@/models/index.js'; +import type { AdsRepository } from '@/models/index.js'; import { QueryService } from '@/core/QueryService.js'; import { DI } from '@/di-symbols.js'; @@ -31,7 +31,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.adsRepository) - private adsRepository: MiAdsRepository, + private adsRepository: AdsRepository, private queryService: QueryService, ) { diff --git a/packages/backend/src/server/api/endpoints/admin/ad/update.ts b/packages/backend/src/server/api/endpoints/admin/ad/update.ts index 752b15a8e4..ada17cf04d 100644 --- a/packages/backend/src/server/api/endpoints/admin/ad/update.ts +++ b/packages/backend/src/server/api/endpoints/admin/ad/update.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { MiAdsRepository } from '@/models/index.js'; +import type { AdsRepository } from '@/models/index.js'; import { DI } from '@/di-symbols.js'; import { ApiError } from '../../../error.js'; @@ -46,7 +46,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.adsRepository) - private adsRepository: MiAdsRepository, + private adsRepository: AdsRepository, ) { super(meta, paramDef, async (ps, me) => { const ad = await this.adsRepository.findOneBy({ id: ps.id }); diff --git a/packages/backend/src/server/api/endpoints/admin/announcements/delete.ts b/packages/backend/src/server/api/endpoints/admin/announcements/delete.ts index 880a1561db..6066a3ceaf 100644 --- a/packages/backend/src/server/api/endpoints/admin/announcements/delete.ts +++ b/packages/backend/src/server/api/endpoints/admin/announcements/delete.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { MiAnnouncementsRepository } from '@/models/index.js'; +import type { AnnouncementsRepository } from '@/models/index.js'; import { DI } from '@/di-symbols.js'; import { ApiError } from '../../../error.js'; @@ -37,7 +37,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.announcementsRepository) - private announcementsRepository: MiAnnouncementsRepository, + private announcementsRepository: AnnouncementsRepository, ) { super(meta, paramDef, async (ps, me) => { const announcement = await this.announcementsRepository.findOneBy({ id: ps.id }); diff --git a/packages/backend/src/server/api/endpoints/admin/announcements/list.ts b/packages/backend/src/server/api/endpoints/admin/announcements/list.ts index a3071f10f6..4a1ea871e9 100644 --- a/packages/backend/src/server/api/endpoints/admin/announcements/list.ts +++ b/packages/backend/src/server/api/endpoints/admin/announcements/list.ts @@ -4,7 +4,7 @@ */ import { Inject, Injectable } from '@nestjs/common'; -import type { MiAnnouncementsRepository, MiAnnouncementReadsRepository } from '@/models/index.js'; +import type { AnnouncementsRepository, AnnouncementReadsRepository } from '@/models/index.js'; import type { MiAnnouncement } from '@/models/entities/Announcement.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import { QueryService } from '@/core/QueryService.js'; @@ -76,10 +76,10 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.announcementsRepository) - private announcementsRepository: MiAnnouncementsRepository, + private announcementsRepository: AnnouncementsRepository, @Inject(DI.announcementReadsRepository) - private announcementReadsRepository: MiAnnouncementReadsRepository, + private announcementReadsRepository: AnnouncementReadsRepository, private queryService: QueryService, ) { 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 072c384348..7efc7c0402 100644 --- a/packages/backend/src/server/api/endpoints/admin/announcements/update.ts +++ b/packages/backend/src/server/api/endpoints/admin/announcements/update.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { MiAnnouncementsRepository } from '@/models/index.js'; +import type { AnnouncementsRepository } from '@/models/index.js'; import { DI } from '@/di-symbols.js'; import { ApiError } from '../../../error.js'; @@ -45,7 +45,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.announcementsRepository) - private announcementsRepository: MiAnnouncementsRepository, + private announcementsRepository: AnnouncementsRepository, ) { super(meta, paramDef, async (ps, me) => { const announcement = await this.announcementsRepository.findOneBy({ id: ps.id }); diff --git a/packages/backend/src/server/api/endpoints/admin/delete-account.ts b/packages/backend/src/server/api/endpoints/admin/delete-account.ts index 33a4dbba42..32c9174073 100644 --- a/packages/backend/src/server/api/endpoints/admin/delete-account.ts +++ b/packages/backend/src/server/api/endpoints/admin/delete-account.ts @@ -4,7 +4,7 @@ */ import { Inject, Injectable } from '@nestjs/common'; -import type { MiUsersRepository } from '@/models/index.js'; +import type { UsersRepository } from '@/models/index.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import { DeleteAccountService } from '@/core/DeleteAccountService.js'; import { DI } from '@/di-symbols.js'; @@ -32,7 +32,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.usersRepository) - private usersRepository: MiUsersRepository, + private usersRepository: UsersRepository, private deleteAccountService: DeleteAccountService, ) { diff --git a/packages/backend/src/server/api/endpoints/admin/delete-all-files-of-a-user.ts b/packages/backend/src/server/api/endpoints/admin/delete-all-files-of-a-user.ts index 05f30eda3b..c88b5aad8e 100644 --- a/packages/backend/src/server/api/endpoints/admin/delete-all-files-of-a-user.ts +++ b/packages/backend/src/server/api/endpoints/admin/delete-all-files-of-a-user.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { MiDriveFilesRepository } from '@/models/index.js'; +import type { DriveFilesRepository } from '@/models/index.js'; import { DriveService } from '@/core/DriveService.js'; import { DI } from '@/di-symbols.js'; @@ -29,7 +29,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.driveFilesRepository) - private driveFilesRepository: MiDriveFilesRepository, + private driveFilesRepository: DriveFilesRepository, private driveService: DriveService, ) { diff --git a/packages/backend/src/server/api/endpoints/admin/drive/cleanup.ts b/packages/backend/src/server/api/endpoints/admin/drive/cleanup.ts index 63c6c00cd2..188de3f292 100644 --- a/packages/backend/src/server/api/endpoints/admin/drive/cleanup.ts +++ b/packages/backend/src/server/api/endpoints/admin/drive/cleanup.ts @@ -6,7 +6,7 @@ import { IsNull } from 'typeorm'; import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { MiDriveFilesRepository } from '@/models/index.js'; +import type { DriveFilesRepository } from '@/models/index.js'; import { DriveService } from '@/core/DriveService.js'; import { DI } from '@/di-symbols.js'; @@ -28,7 +28,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.driveFilesRepository) - private driveFilesRepository: MiDriveFilesRepository, + private driveFilesRepository: DriveFilesRepository, private driveService: DriveService, ) { diff --git a/packages/backend/src/server/api/endpoints/admin/drive/files.ts b/packages/backend/src/server/api/endpoints/admin/drive/files.ts index 3a9b92e526..2191a45669 100644 --- a/packages/backend/src/server/api/endpoints/admin/drive/files.ts +++ b/packages/backend/src/server/api/endpoints/admin/drive/files.ts @@ -4,7 +4,7 @@ */ import { Inject, Injectable } from '@nestjs/common'; -import type { MiDriveFilesRepository } from '@/models/index.js'; +import type { DriveFilesRepository } from '@/models/index.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import { QueryService } from '@/core/QueryService.js'; import { DI } from '@/di-symbols.js'; @@ -51,7 +51,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.driveFilesRepository) - private driveFilesRepository: MiDriveFilesRepository, + private driveFilesRepository: DriveFilesRepository, private driveFileEntityService: DriveFileEntityService, private queryService: QueryService, diff --git a/packages/backend/src/server/api/endpoints/admin/drive/show-file.ts b/packages/backend/src/server/api/endpoints/admin/drive/show-file.ts index 34bf8d93af..9cd0583049 100644 --- a/packages/backend/src/server/api/endpoints/admin/drive/show-file.ts +++ b/packages/backend/src/server/api/endpoints/admin/drive/show-file.ts @@ -4,7 +4,7 @@ */ import { Inject, Injectable } from '@nestjs/common'; -import type { MiDriveFilesRepository, MiUsersRepository } from '@/models/index.js'; +import type { DriveFilesRepository, UsersRepository } from '@/models/index.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import { DI } from '@/di-symbols.js'; import { RoleService } from '@/core/RoleService.js'; @@ -158,10 +158,10 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.driveFilesRepository) - private driveFilesRepository: MiDriveFilesRepository, + private driveFilesRepository: DriveFilesRepository, @Inject(DI.usersRepository) - private usersRepository: MiUsersRepository, + private usersRepository: UsersRepository, private roleService: RoleService, ) { diff --git a/packages/backend/src/server/api/endpoints/admin/emoji/add.ts b/packages/backend/src/server/api/endpoints/admin/emoji/add.ts index 83295b2ae4..07a9d7edba 100644 --- a/packages/backend/src/server/api/endpoints/admin/emoji/add.ts +++ b/packages/backend/src/server/api/endpoints/admin/emoji/add.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { MiDriveFilesRepository } from '@/models/index.js'; +import type { DriveFilesRepository } from '@/models/index.js'; import { DI } from '@/di-symbols.js'; import { CustomEmojiService } from '@/core/CustomEmojiService.js'; import { ModerationLogService } from '@/core/ModerationLogService.js'; @@ -57,7 +57,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.driveFilesRepository) - private driveFilesRepository: MiDriveFilesRepository, + private driveFilesRepository: DriveFilesRepository, private customEmojiService: CustomEmojiService, diff --git a/packages/backend/src/server/api/endpoints/admin/emoji/copy.ts b/packages/backend/src/server/api/endpoints/admin/emoji/copy.ts index 07054c1571..1c4af57037 100644 --- a/packages/backend/src/server/api/endpoints/admin/emoji/copy.ts +++ b/packages/backend/src/server/api/endpoints/admin/emoji/copy.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { MiEmojisRepository } from '@/models/index.js'; +import type { EmojisRepository } from '@/models/index.js'; import { IdService } from '@/core/IdService.js'; import type { MiDriveFile } from '@/models/entities/DriveFile.js'; import { DI } from '@/di-symbols.js'; @@ -56,7 +56,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.emojisRepository) - private emojisRepository: MiEmojisRepository, + private emojisRepository: EmojisRepository, private emojiEntityService: EmojiEntityService, private idService: IdService, diff --git a/packages/backend/src/server/api/endpoints/admin/emoji/list-remote.ts b/packages/backend/src/server/api/endpoints/admin/emoji/list-remote.ts index 8e146bf459..912229c1cc 100644 --- a/packages/backend/src/server/api/endpoints/admin/emoji/list-remote.ts +++ b/packages/backend/src/server/api/endpoints/admin/emoji/list-remote.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { MiEmojisRepository } from '@/models/index.js'; +import type { EmojisRepository } from '@/models/index.js'; import { QueryService } from '@/core/QueryService.js'; import { UtilityService } from '@/core/UtilityService.js'; import { EmojiEntityService } from '@/core/entities/EmojiEntityService.js'; @@ -82,7 +82,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.emojisRepository) - private emojisRepository: MiEmojisRepository, + private emojisRepository: EmojisRepository, private utilityService: UtilityService, private queryService: QueryService, diff --git a/packages/backend/src/server/api/endpoints/admin/emoji/list.ts b/packages/backend/src/server/api/endpoints/admin/emoji/list.ts index cd5914eeca..5a3263045b 100644 --- a/packages/backend/src/server/api/endpoints/admin/emoji/list.ts +++ b/packages/backend/src/server/api/endpoints/admin/emoji/list.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { MiEmojisRepository } from '@/models/index.js'; +import type { EmojisRepository } from '@/models/index.js'; import type { MiEmoji } from '@/models/entities/Emoji.js'; import { QueryService } from '@/core/QueryService.js'; import { DI } from '@/di-symbols.js'; @@ -76,7 +76,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.emojisRepository) - private emojisRepository: MiEmojisRepository, + private emojisRepository: EmojisRepository, private emojiEntityService: EmojiEntityService, private queryService: QueryService, diff --git a/packages/backend/src/server/api/endpoints/admin/emoji/update.ts b/packages/backend/src/server/api/endpoints/admin/emoji/update.ts index 03014e9f58..b08555598a 100644 --- a/packages/backend/src/server/api/endpoints/admin/emoji/update.ts +++ b/packages/backend/src/server/api/endpoints/admin/emoji/update.ts @@ -6,7 +6,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import { CustomEmojiService } from '@/core/CustomEmojiService.js'; -import type { MiDriveFilesRepository } from '@/models/index.js'; +import type { DriveFilesRepository } from '@/models/index.js'; import { DI } from '@/di-symbols.js'; import { ApiError } from '../../../error.js'; @@ -64,7 +64,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.driveFilesRepository) - private driveFilesRepository: MiDriveFilesRepository, + private driveFilesRepository: DriveFilesRepository, private customEmojiService: CustomEmojiService, ) { diff --git a/packages/backend/src/server/api/endpoints/admin/federation/delete-all-files.ts b/packages/backend/src/server/api/endpoints/admin/federation/delete-all-files.ts index b635d432a2..93a22a7dea 100644 --- a/packages/backend/src/server/api/endpoints/admin/federation/delete-all-files.ts +++ b/packages/backend/src/server/api/endpoints/admin/federation/delete-all-files.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { MiDriveFilesRepository } from '@/models/index.js'; +import type { DriveFilesRepository } from '@/models/index.js'; import { DriveService } from '@/core/DriveService.js'; import { DI } from '@/di-symbols.js'; @@ -29,7 +29,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.driveFilesRepository) - private driveFilesRepository: MiDriveFilesRepository, + private driveFilesRepository: DriveFilesRepository, private driveService: DriveService, ) { diff --git a/packages/backend/src/server/api/endpoints/admin/federation/refresh-remote-instance-metadata.ts b/packages/backend/src/server/api/endpoints/admin/federation/refresh-remote-instance-metadata.ts index d239b16b38..3bc2646370 100644 --- a/packages/backend/src/server/api/endpoints/admin/federation/refresh-remote-instance-metadata.ts +++ b/packages/backend/src/server/api/endpoints/admin/federation/refresh-remote-instance-metadata.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { MiInstancesRepository } from '@/models/index.js'; +import type { InstancesRepository } from '@/models/index.js'; import { FetchInstanceMetadataService } from '@/core/FetchInstanceMetadataService.js'; import { UtilityService } from '@/core/UtilityService.js'; import { DI } from '@/di-symbols.js'; @@ -30,7 +30,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.instancesRepository) - private instancesRepository: MiInstancesRepository, + private instancesRepository: InstancesRepository, private utilityService: UtilityService, private fetchInstanceMetadataService: FetchInstanceMetadataService, diff --git a/packages/backend/src/server/api/endpoints/admin/federation/remove-all-following.ts b/packages/backend/src/server/api/endpoints/admin/federation/remove-all-following.ts index b7844cc18e..ac60e3bcc9 100644 --- a/packages/backend/src/server/api/endpoints/admin/federation/remove-all-following.ts +++ b/packages/backend/src/server/api/endpoints/admin/federation/remove-all-following.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { MiFollowingsRepository, MiUsersRepository } from '@/models/index.js'; +import type { FollowingsRepository, UsersRepository } from '@/models/index.js'; import { DI } from '@/di-symbols.js'; import { QueueService } from '@/core/QueueService.js'; @@ -29,10 +29,10 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.usersRepository) - private usersRepository: MiUsersRepository, + private usersRepository: UsersRepository, @Inject(DI.notesRepository) - private followingsRepository: MiFollowingsRepository, + private followingsRepository: FollowingsRepository, private queueService: QueueService, ) { diff --git a/packages/backend/src/server/api/endpoints/admin/federation/update-instance.ts b/packages/backend/src/server/api/endpoints/admin/federation/update-instance.ts index 4b42e47da0..3eb1fc90a9 100644 --- a/packages/backend/src/server/api/endpoints/admin/federation/update-instance.ts +++ b/packages/backend/src/server/api/endpoints/admin/federation/update-instance.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { MiInstancesRepository } from '@/models/index.js'; +import type { InstancesRepository } from '@/models/index.js'; import { UtilityService } from '@/core/UtilityService.js'; import { DI } from '@/di-symbols.js'; import { FederatedInstanceService } from '@/core/FederatedInstanceService.js'; @@ -31,7 +31,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.instancesRepository) - private instancesRepository: MiInstancesRepository, + private instancesRepository: InstancesRepository, private utilityService: UtilityService, private federatedInstanceService: FederatedInstanceService, diff --git a/packages/backend/src/server/api/endpoints/admin/get-user-ips.ts b/packages/backend/src/server/api/endpoints/admin/get-user-ips.ts index 483ca98bc7..9e4d18e10f 100644 --- a/packages/backend/src/server/api/endpoints/admin/get-user-ips.ts +++ b/packages/backend/src/server/api/endpoints/admin/get-user-ips.ts @@ -4,7 +4,7 @@ */ import { Inject, Injectable } from '@nestjs/common'; -import type { MiUserIpsRepository } from '@/models/index.js'; +import type { UserIpsRepository } from '@/models/index.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import { DI } from '@/di-symbols.js'; @@ -28,7 +28,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.userIpsRepository) - private userIpsRepository: MiUserIpsRepository, + private userIpsRepository: UserIpsRepository, ) { super(meta, paramDef, async (ps, me) => { const ips = await this.userIpsRepository.find({ 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 9f6cc53b13..5bdca71142 100644 --- a/packages/backend/src/server/api/endpoints/admin/invite/create.ts +++ b/packages/backend/src/server/api/endpoints/admin/invite/create.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { MiRegistrationTicketsRepository } from '@/models/index.js'; +import type { RegistrationTicketsRepository } from '@/models/index.js'; import { InviteCodeEntityService } from '@/core/entities/InviteCodeEntityService.js'; import { IdService } from '@/core/IdService.js'; import { DI } from '@/di-symbols.js'; @@ -57,7 +57,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.registrationTicketsRepository) - private registrationTicketsRepository: MiRegistrationTicketsRepository, + private registrationTicketsRepository: RegistrationTicketsRepository, private inviteCodeEntityService: InviteCodeEntityService, private idService: IdService, 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 b75f7404e2..6d2874fd1f 100644 --- a/packages/backend/src/server/api/endpoints/admin/invite/list.ts +++ b/packages/backend/src/server/api/endpoints/admin/invite/list.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { MiRegistrationTicketsRepository } from '@/models/index.js'; +import type { RegistrationTicketsRepository } from '@/models/index.js'; import { InviteCodeEntityService } from '@/core/entities/InviteCodeEntityService.js'; import { DI } from '@/di-symbols.js'; @@ -41,7 +41,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.registrationTicketsRepository) - private registrationTicketsRepository: MiRegistrationTicketsRepository, + private registrationTicketsRepository: RegistrationTicketsRepository, private inviteCodeEntityService: InviteCodeEntityService, ) { diff --git a/packages/backend/src/server/api/endpoints/admin/promo/create.ts b/packages/backend/src/server/api/endpoints/admin/promo/create.ts index 9de6a1b7aa..ca7cecb08b 100644 --- a/packages/backend/src/server/api/endpoints/admin/promo/create.ts +++ b/packages/backend/src/server/api/endpoints/admin/promo/create.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { MiPromoNotesRepository } from '@/models/index.js'; +import type { PromoNotesRepository } from '@/models/index.js'; import { GetterService } from '@/server/api/GetterService.js'; import { DI } from '@/di-symbols.js'; import { ApiError } from '../../../error.js'; @@ -45,7 +45,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.promoNotesRepository) - private promoNotesRepository: MiPromoNotesRepository, + private promoNotesRepository: PromoNotesRepository, private getterService: GetterService, ) { diff --git a/packages/backend/src/server/api/endpoints/admin/reset-password.ts b/packages/backend/src/server/api/endpoints/admin/reset-password.ts index 61842e1484..6e4ba959a2 100644 --- a/packages/backend/src/server/api/endpoints/admin/reset-password.ts +++ b/packages/backend/src/server/api/endpoints/admin/reset-password.ts @@ -6,7 +6,7 @@ import { Inject, Injectable } from '@nestjs/common'; import bcrypt from 'bcryptjs'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { MiUsersRepository, MiUserProfilesRepository } from '@/models/index.js'; +import type { UsersRepository, UserProfilesRepository } from '@/models/index.js'; import { DI } from '@/di-symbols.js'; import { secureRndstr } from '@/misc/secure-rndstr.js'; @@ -43,10 +43,10 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.usersRepository) - private usersRepository: MiUsersRepository, + private usersRepository: UsersRepository, @Inject(DI.userProfilesRepository) - private userProfilesRepository: MiUserProfilesRepository, + private userProfilesRepository: UserProfilesRepository, ) { super(meta, paramDef, async (ps) => { const user = await this.usersRepository.findOneBy({ id: ps.userId }); diff --git a/packages/backend/src/server/api/endpoints/admin/resolve-abuse-user-report.ts b/packages/backend/src/server/api/endpoints/admin/resolve-abuse-user-report.ts index 0fbc1fa973..d37d46daa8 100644 --- a/packages/backend/src/server/api/endpoints/admin/resolve-abuse-user-report.ts +++ b/packages/backend/src/server/api/endpoints/admin/resolve-abuse-user-report.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { MiUsersRepository, MiAbuseUserReportsRepository } from '@/models/index.js'; +import type { UsersRepository, AbuseUserReportsRepository } from '@/models/index.js'; import { InstanceActorService } from '@/core/InstanceActorService.js'; import { QueueService } from '@/core/QueueService.js'; import { ApRendererService } from '@/core/activitypub/ApRendererService.js'; @@ -34,10 +34,10 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.usersRepository) - private usersRepository: MiUsersRepository, + private usersRepository: UsersRepository, @Inject(DI.abuseUserReportsRepository) - private abuseUserReportsRepository: MiAbuseUserReportsRepository, + private abuseUserReportsRepository: AbuseUserReportsRepository, private queueService: QueueService, private instanceActorService: InstanceActorService, 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 01925d6179..78ab13a773 100644 --- a/packages/backend/src/server/api/endpoints/admin/roles/assign.ts +++ b/packages/backend/src/server/api/endpoints/admin/roles/assign.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { MiRolesRepository, MiUsersRepository } from '@/models/index.js'; +import type { RolesRepository, UsersRepository } from '@/models/index.js'; import { DI } from '@/di-symbols.js'; import { ApiError } from '@/server/api/error.js'; import { RoleService } from '@/core/RoleService.js'; @@ -58,10 +58,10 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.usersRepository) - private usersRepository: MiUsersRepository, + private usersRepository: UsersRepository, @Inject(DI.rolesRepository) - private rolesRepository: MiRolesRepository, + private rolesRepository: RolesRepository, private roleService: RoleService, ) { diff --git a/packages/backend/src/server/api/endpoints/admin/roles/create.ts b/packages/backend/src/server/api/endpoints/admin/roles/create.ts index c0598d20c8..d4c3e4d789 100644 --- a/packages/backend/src/server/api/endpoints/admin/roles/create.ts +++ b/packages/backend/src/server/api/endpoints/admin/roles/create.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { MiRolesRepository } from '@/models/index.js'; +import type { RolesRepository } from '@/models/index.js'; import { GlobalEventService } from '@/core/GlobalEventService.js'; import { DI } from '@/di-symbols.js'; import { IdService } from '@/core/IdService.js'; @@ -60,7 +60,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.rolesRepository) - private rolesRepository: MiRolesRepository, + private rolesRepository: RolesRepository, private globalEventService: GlobalEventService, private idService: IdService, diff --git a/packages/backend/src/server/api/endpoints/admin/roles/delete.ts b/packages/backend/src/server/api/endpoints/admin/roles/delete.ts index 60cc143a16..b57cd0d5c8 100644 --- a/packages/backend/src/server/api/endpoints/admin/roles/delete.ts +++ b/packages/backend/src/server/api/endpoints/admin/roles/delete.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { MiRolesRepository } from '@/models/index.js'; +import type { RolesRepository } from '@/models/index.js'; import { GlobalEventService } from '@/core/GlobalEventService.js'; import { DI } from '@/di-symbols.js'; import { ApiError } from '@/server/api/error.js'; @@ -40,7 +40,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.rolesRepository) - private rolesRepository: MiRolesRepository, + private rolesRepository: RolesRepository, private globalEventService: GlobalEventService, ) { diff --git a/packages/backend/src/server/api/endpoints/admin/roles/list.ts b/packages/backend/src/server/api/endpoints/admin/roles/list.ts index 9967c41860..363cac7f05 100644 --- a/packages/backend/src/server/api/endpoints/admin/roles/list.ts +++ b/packages/backend/src/server/api/endpoints/admin/roles/list.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { MiRolesRepository } from '@/models/index.js'; +import type { RolesRepository } from '@/models/index.js'; import { DI } from '@/di-symbols.js'; import { RoleEntityService } from '@/core/entities/RoleEntityService.js'; @@ -29,7 +29,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.rolesRepository) - private rolesRepository: MiRolesRepository, + private rolesRepository: RolesRepository, private roleEntityService: RoleEntityService, ) { diff --git a/packages/backend/src/server/api/endpoints/admin/roles/show.ts b/packages/backend/src/server/api/endpoints/admin/roles/show.ts index 4d01bffe4c..189e40dd6f 100644 --- a/packages/backend/src/server/api/endpoints/admin/roles/show.ts +++ b/packages/backend/src/server/api/endpoints/admin/roles/show.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { MiRolesRepository } from '@/models/index.js'; +import type { RolesRepository } from '@/models/index.js'; import { DI } from '@/di-symbols.js'; import { ApiError } from '@/server/api/error.js'; import { RoleEntityService } from '@/core/entities/RoleEntityService.js'; @@ -40,7 +40,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.rolesRepository) - private rolesRepository: MiRolesRepository, + private rolesRepository: RolesRepository, private roleEntityService: RoleEntityService, ) { diff --git a/packages/backend/src/server/api/endpoints/admin/roles/unassign.ts b/packages/backend/src/server/api/endpoints/admin/roles/unassign.ts index 6efeed5eba..1b3c49571b 100644 --- a/packages/backend/src/server/api/endpoints/admin/roles/unassign.ts +++ b/packages/backend/src/server/api/endpoints/admin/roles/unassign.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { MiRolesRepository, MiUsersRepository } from '@/models/index.js'; +import type { RolesRepository, UsersRepository } from '@/models/index.js'; import { DI } from '@/di-symbols.js'; import { ApiError } from '@/server/api/error.js'; import { RoleService } from '@/core/RoleService.js'; @@ -60,10 +60,10 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.usersRepository) - private usersRepository: MiUsersRepository, + private usersRepository: UsersRepository, @Inject(DI.rolesRepository) - private rolesRepository: MiRolesRepository, + private rolesRepository: RolesRepository, private roleService: RoleService, ) { diff --git a/packages/backend/src/server/api/endpoints/admin/roles/update.ts b/packages/backend/src/server/api/endpoints/admin/roles/update.ts index 13a198eac8..f336a3f8e9 100644 --- a/packages/backend/src/server/api/endpoints/admin/roles/update.ts +++ b/packages/backend/src/server/api/endpoints/admin/roles/update.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { MiRolesRepository } from '@/models/index.js'; +import type { RolesRepository } from '@/models/index.js'; import { GlobalEventService } from '@/core/GlobalEventService.js'; import { DI } from '@/di-symbols.js'; import { ApiError } from '@/server/api/error.js'; @@ -69,7 +69,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.rolesRepository) - private rolesRepository: MiRolesRepository, + private rolesRepository: RolesRepository, private globalEventService: GlobalEventService, ) { 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 cf5d724180..89f58d036e 100644 --- a/packages/backend/src/server/api/endpoints/admin/roles/users.ts +++ b/packages/backend/src/server/api/endpoints/admin/roles/users.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Brackets } from 'typeorm'; -import type { MiRoleAssignmentsRepository, MiRolesRepository } from '@/models/index.js'; +import type { RoleAssignmentsRepository, RolesRepository } from '@/models/index.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import { QueryService } from '@/core/QueryService.js'; import { DI } from '@/di-symbols.js'; @@ -43,10 +43,10 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.rolesRepository) - private rolesRepository: MiRolesRepository, + private rolesRepository: RolesRepository, @Inject(DI.roleAssignmentsRepository) - private roleAssignmentsRepository: MiRoleAssignmentsRepository, + private roleAssignmentsRepository: RoleAssignmentsRepository, private queryService: QueryService, private userEntityService: UserEntityService, diff --git a/packages/backend/src/server/api/endpoints/admin/show-moderation-logs.ts b/packages/backend/src/server/api/endpoints/admin/show-moderation-logs.ts index 4fd3e37da4..16e424890f 100644 --- a/packages/backend/src/server/api/endpoints/admin/show-moderation-logs.ts +++ b/packages/backend/src/server/api/endpoints/admin/show-moderation-logs.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { MiModerationLogsRepository } from '@/models/index.js'; +import type { ModerationLogsRepository } from '@/models/index.js'; import { QueryService } from '@/core/QueryService.js'; import { DI } from '@/di-symbols.js'; import { ModerationLogEntityService } from '@/core/entities/ModerationLogEntityService.js'; @@ -71,7 +71,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.moderationLogsRepository) - private moderationLogsRepository: MiModerationLogsRepository, + private moderationLogsRepository: ModerationLogsRepository, private moderationLogEntityService: ModerationLogEntityService, private queryService: QueryService, diff --git a/packages/backend/src/server/api/endpoints/admin/show-user.ts b/packages/backend/src/server/api/endpoints/admin/show-user.ts index fe415397ed..1e8c38c96b 100644 --- a/packages/backend/src/server/api/endpoints/admin/show-user.ts +++ b/packages/backend/src/server/api/endpoints/admin/show-user.ts @@ -4,7 +4,7 @@ */ import { Inject, Injectable } from '@nestjs/common'; -import type { MiUsersRepository, MiSigninsRepository, MiUserProfilesRepository } from '@/models/index.js'; +import type { UsersRepository, SigninsRepository, UserProfilesRepository } from '@/models/index.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import { DI } from '@/di-symbols.js'; import { RoleService } from '@/core/RoleService.js'; @@ -35,13 +35,13 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.usersRepository) - private usersRepository: MiUsersRepository, + private usersRepository: UsersRepository, @Inject(DI.userProfilesRepository) - private userProfilesRepository: MiUserProfilesRepository, + private userProfilesRepository: UserProfilesRepository, @Inject(DI.signinsRepository) - private signinsRepository: MiSigninsRepository, + private signinsRepository: SigninsRepository, private roleService: RoleService, private roleEntityService: RoleEntityService, 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 7fcbaff2fe..cc07e77f49 100644 --- a/packages/backend/src/server/api/endpoints/admin/show-users.ts +++ b/packages/backend/src/server/api/endpoints/admin/show-users.ts @@ -4,7 +4,7 @@ */ import { Inject, Injectable } from '@nestjs/common'; -import type { MiUsersRepository } from '@/models/index.js'; +import type { UsersRepository } from '@/models/index.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import { DI } from '@/di-symbols.js'; import { UserEntityService } from '@/core/entities/UserEntityService.js'; @@ -52,7 +52,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.usersRepository) - private usersRepository: MiUsersRepository, + private usersRepository: UsersRepository, private userEntityService: UserEntityService, private roleService: RoleService, diff --git a/packages/backend/src/server/api/endpoints/admin/suspend-user.ts b/packages/backend/src/server/api/endpoints/admin/suspend-user.ts index 065ee1bfd3..e133adcbd0 100644 --- a/packages/backend/src/server/api/endpoints/admin/suspend-user.ts +++ b/packages/backend/src/server/api/endpoints/admin/suspend-user.ts @@ -6,7 +6,7 @@ import { IsNull, Not } from 'typeorm'; import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { MiUsersRepository, MiFollowingsRepository } from '@/models/index.js'; +import type { UsersRepository, FollowingsRepository } from '@/models/index.js'; import type { MiUser } from '@/models/entities/User.js'; import type { RelationshipJobData } from '@/queue/types.js'; import { ModerationLogService } from '@/core/ModerationLogService.js'; @@ -36,10 +36,10 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.usersRepository) - private usersRepository: MiUsersRepository, + private usersRepository: UsersRepository, @Inject(DI.followingsRepository) - private followingsRepository: MiFollowingsRepository, + private followingsRepository: FollowingsRepository, private userSuspendService: UserSuspendService, private roleService: RoleService, diff --git a/packages/backend/src/server/api/endpoints/admin/unsuspend-user.ts b/packages/backend/src/server/api/endpoints/admin/unsuspend-user.ts index c249afc417..984e0ee074 100644 --- a/packages/backend/src/server/api/endpoints/admin/unsuspend-user.ts +++ b/packages/backend/src/server/api/endpoints/admin/unsuspend-user.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { MiUsersRepository } from '@/models/index.js'; +import type { UsersRepository } from '@/models/index.js'; import { ModerationLogService } from '@/core/ModerationLogService.js'; import { UserSuspendService } from '@/core/UserSuspendService.js'; import { DI } from '@/di-symbols.js'; @@ -30,7 +30,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.usersRepository) - private usersRepository: MiUsersRepository, + private usersRepository: UsersRepository, private userSuspendService: UserSuspendService, private moderationLogService: ModerationLogService, diff --git a/packages/backend/src/server/api/endpoints/admin/update-user-note.ts b/packages/backend/src/server/api/endpoints/admin/update-user-note.ts index d8a93932a0..2cfd772635 100644 --- a/packages/backend/src/server/api/endpoints/admin/update-user-note.ts +++ b/packages/backend/src/server/api/endpoints/admin/update-user-note.ts @@ -4,7 +4,7 @@ */ import { Inject, Injectable } from '@nestjs/common'; -import type { MiUserProfilesRepository, MiUsersRepository } from '@/models/index.js'; +import type { UserProfilesRepository, UsersRepository } from '@/models/index.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import { DI } from '@/di-symbols.js'; @@ -29,10 +29,10 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.usersRepository) - private usersRepository: MiUsersRepository, + private usersRepository: UsersRepository, @Inject(DI.userProfilesRepository) - private userProfilesRepository: MiUserProfilesRepository, + private userProfilesRepository: UserProfilesRepository, ) { super(meta, paramDef, async (ps, me) => { const user = await this.usersRepository.findOneBy({ id: ps.userId }); diff --git a/packages/backend/src/server/api/endpoints/announcements.ts b/packages/backend/src/server/api/endpoints/announcements.ts index 1cafacb6e4..070e6f0d77 100644 --- a/packages/backend/src/server/api/endpoints/announcements.ts +++ b/packages/backend/src/server/api/endpoints/announcements.ts @@ -9,7 +9,7 @@ import { Endpoint } from '@/server/api/endpoint-base.js'; import { QueryService } from '@/core/QueryService.js'; import { AnnouncementService } from '@/core/AnnouncementService.js'; import { DI } from '@/di-symbols.js'; -import type { MiAnnouncementReadsRepository, MiAnnouncementsRepository } from '@/models/index.js'; +import type { AnnouncementReadsRepository, AnnouncementsRepository } from '@/models/index.js'; export const meta = { tags: ['meta'], @@ -43,10 +43,10 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.announcementsRepository) - private announcementsRepository: MiAnnouncementsRepository, + private announcementsRepository: AnnouncementsRepository, @Inject(DI.announcementReadsRepository) - private announcementReadsRepository: MiAnnouncementReadsRepository, + private announcementReadsRepository: AnnouncementReadsRepository, private queryService: QueryService, private announcementService: AnnouncementService, diff --git a/packages/backend/src/server/api/endpoints/antennas/create.ts b/packages/backend/src/server/api/endpoints/antennas/create.ts index bfec615ee3..8924568440 100644 --- a/packages/backend/src/server/api/endpoints/antennas/create.ts +++ b/packages/backend/src/server/api/endpoints/antennas/create.ts @@ -6,7 +6,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import { IdService } from '@/core/IdService.js'; -import type { MiUserListsRepository, MiAntennasRepository } from '@/models/index.js'; +import type { UserListsRepository, AntennasRepository } from '@/models/index.js'; import { GlobalEventService } from '@/core/GlobalEventService.js'; import { AntennaEntityService } from '@/core/entities/AntennaEntityService.js'; import { DI } from '@/di-symbols.js'; @@ -75,10 +75,10 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.antennasRepository) - private antennasRepository: MiAntennasRepository, + private antennasRepository: AntennasRepository, @Inject(DI.userListsRepository) - private userListsRepository: MiUserListsRepository, + private userListsRepository: UserListsRepository, private antennaEntityService: AntennaEntityService, private roleService: RoleService, diff --git a/packages/backend/src/server/api/endpoints/antennas/delete.ts b/packages/backend/src/server/api/endpoints/antennas/delete.ts index 4ddefc624b..59ccd724c0 100644 --- a/packages/backend/src/server/api/endpoints/antennas/delete.ts +++ b/packages/backend/src/server/api/endpoints/antennas/delete.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { MiAntennasRepository } from '@/models/index.js'; +import type { AntennasRepository } from '@/models/index.js'; import { GlobalEventService } from '@/core/GlobalEventService.js'; import { DI } from '@/di-symbols.js'; import { ApiError } from '../../error.js'; @@ -39,7 +39,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.antennasRepository) - private antennasRepository: MiAntennasRepository, + private antennasRepository: AntennasRepository, private globalEventService: GlobalEventService, ) { diff --git a/packages/backend/src/server/api/endpoints/antennas/list.ts b/packages/backend/src/server/api/endpoints/antennas/list.ts index 73222393c0..db5d65589d 100644 --- a/packages/backend/src/server/api/endpoints/antennas/list.ts +++ b/packages/backend/src/server/api/endpoints/antennas/list.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { MiAntennasRepository } from '@/models/index.js'; +import type { AntennasRepository } from '@/models/index.js'; import { AntennaEntityService } from '@/core/entities/AntennaEntityService.js'; import { DI } from '@/di-symbols.js'; @@ -38,7 +38,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.antennasRepository) - private antennasRepository: MiAntennasRepository, + private antennasRepository: AntennasRepository, private antennaEntityService: AntennaEntityService, ) { diff --git a/packages/backend/src/server/api/endpoints/antennas/notes.ts b/packages/backend/src/server/api/endpoints/antennas/notes.ts index 54eabbbbd0..145134dcf7 100644 --- a/packages/backend/src/server/api/endpoints/antennas/notes.ts +++ b/packages/backend/src/server/api/endpoints/antennas/notes.ts @@ -6,7 +6,7 @@ import { Inject, Injectable } from '@nestjs/common'; import * as Redis from 'ioredis'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { MiNotesRepository, MiAntennasRepository } from '@/models/index.js'; +import type { NotesRepository, AntennasRepository } from '@/models/index.js'; import { QueryService } from '@/core/QueryService.js'; import { NoteReadService } from '@/core/NoteReadService.js'; import { DI } from '@/di-symbols.js'; @@ -61,10 +61,10 @@ export default class extends Endpoint { private redisClient: Redis.Redis, @Inject(DI.notesRepository) - private notesRepository: MiNotesRepository, + private notesRepository: NotesRepository, @Inject(DI.antennasRepository) - private antennasRepository: MiAntennasRepository, + private antennasRepository: AntennasRepository, private idService: IdService, private noteEntityService: NoteEntityService, diff --git a/packages/backend/src/server/api/endpoints/antennas/show.ts b/packages/backend/src/server/api/endpoints/antennas/show.ts index f1d9b35eaf..48012a11ec 100644 --- a/packages/backend/src/server/api/endpoints/antennas/show.ts +++ b/packages/backend/src/server/api/endpoints/antennas/show.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { MiAntennasRepository } from '@/models/index.js'; +import type { AntennasRepository } from '@/models/index.js'; import { AntennaEntityService } from '@/core/entities/AntennaEntityService.js'; import { DI } from '@/di-symbols.js'; import { ApiError } from '../../error.js'; @@ -45,7 +45,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.antennasRepository) - private antennasRepository: MiAntennasRepository, + private antennasRepository: AntennasRepository, private antennaEntityService: AntennaEntityService, ) { diff --git a/packages/backend/src/server/api/endpoints/antennas/update.ts b/packages/backend/src/server/api/endpoints/antennas/update.ts index 418f6f0b0b..1f381caeff 100644 --- a/packages/backend/src/server/api/endpoints/antennas/update.ts +++ b/packages/backend/src/server/api/endpoints/antennas/update.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { MiAntennasRepository, MiUserListsRepository } from '@/models/index.js'; +import type { AntennasRepository, UserListsRepository } from '@/models/index.js'; import { GlobalEventService } from '@/core/GlobalEventService.js'; import { AntennaEntityService } from '@/core/entities/AntennaEntityService.js'; import { DI } from '@/di-symbols.js'; @@ -74,10 +74,10 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.antennasRepository) - private antennasRepository: MiAntennasRepository, + private antennasRepository: AntennasRepository, @Inject(DI.userListsRepository) - private userListsRepository: MiUserListsRepository, + private userListsRepository: UserListsRepository, private antennaEntityService: AntennaEntityService, private globalEventService: GlobalEventService, diff --git a/packages/backend/src/server/api/endpoints/app/create.ts b/packages/backend/src/server/api/endpoints/app/create.ts index c086907618..5e7486eaec 100644 --- a/packages/backend/src/server/api/endpoints/app/create.ts +++ b/packages/backend/src/server/api/endpoints/app/create.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { MiAppsRepository } from '@/models/index.js'; +import type { AppsRepository } from '@/models/index.js'; import { IdService } from '@/core/IdService.js'; import { unique } from '@/misc/prelude/array.js'; import { secureRndstr } from '@/misc/secure-rndstr.js'; @@ -42,7 +42,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.appsRepository) - private appsRepository: MiAppsRepository, + private appsRepository: AppsRepository, private appEntityService: AppEntityService, private idService: IdService, diff --git a/packages/backend/src/server/api/endpoints/app/show.ts b/packages/backend/src/server/api/endpoints/app/show.ts index 93c9703990..8878dc6412 100644 --- a/packages/backend/src/server/api/endpoints/app/show.ts +++ b/packages/backend/src/server/api/endpoints/app/show.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { MiAppsRepository } from '@/models/index.js'; +import type { AppsRepository } from '@/models/index.js'; import { AppEntityService } from '@/core/entities/AppEntityService.js'; import { DI } from '@/di-symbols.js'; import { ApiError } from '../../error.js'; @@ -41,7 +41,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.appsRepository) - private appsRepository: MiAppsRepository, + private appsRepository: AppsRepository, private appEntityService: AppEntityService, ) { diff --git a/packages/backend/src/server/api/endpoints/auth/accept.ts b/packages/backend/src/server/api/endpoints/auth/accept.ts index f5dbe19a0f..1070384ba3 100644 --- a/packages/backend/src/server/api/endpoints/auth/accept.ts +++ b/packages/backend/src/server/api/endpoints/auth/accept.ts @@ -6,7 +6,7 @@ import * as crypto from 'node:crypto'; import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { MiAuthSessionsRepository, MiAppsRepository, MiAccessTokensRepository } from '@/models/index.js'; +import type { AuthSessionsRepository, AppsRepository, AccessTokensRepository } from '@/models/index.js'; import { IdService } from '@/core/IdService.js'; import { secureRndstr } from '@/misc/secure-rndstr.js'; import { DI } from '@/di-symbols.js'; @@ -41,13 +41,13 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.appsRepository) - private appsRepository: MiAppsRepository, + private appsRepository: AppsRepository, @Inject(DI.authSessionsRepository) - private authSessionsRepository: MiAuthSessionsRepository, + private authSessionsRepository: AuthSessionsRepository, @Inject(DI.accessTokensRepository) - private accessTokensRepository: MiAccessTokensRepository, + private accessTokensRepository: AccessTokensRepository, private idService: IdService, ) { diff --git a/packages/backend/src/server/api/endpoints/auth/session/generate.ts b/packages/backend/src/server/api/endpoints/auth/session/generate.ts index 273cee38c0..60eebecf36 100644 --- a/packages/backend/src/server/api/endpoints/auth/session/generate.ts +++ b/packages/backend/src/server/api/endpoints/auth/session/generate.ts @@ -6,7 +6,7 @@ import { randomUUID } from 'node:crypto'; import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { MiAppsRepository, MiAuthSessionsRepository } from '@/models/index.js'; +import type { AppsRepository, AuthSessionsRepository } from '@/models/index.js'; import { IdService } from '@/core/IdService.js'; import type { Config } from '@/config.js'; import { DI } from '@/di-symbols.js'; @@ -58,10 +58,10 @@ export default class extends Endpoint { private config: Config, @Inject(DI.appsRepository) - private appsRepository: MiAppsRepository, + private appsRepository: AppsRepository, @Inject(DI.authSessionsRepository) - private authSessionsRepository: MiAuthSessionsRepository, + private authSessionsRepository: AuthSessionsRepository, private idService: IdService, ) { diff --git a/packages/backend/src/server/api/endpoints/auth/session/show.ts b/packages/backend/src/server/api/endpoints/auth/session/show.ts index ee5862b339..173f567225 100644 --- a/packages/backend/src/server/api/endpoints/auth/session/show.ts +++ b/packages/backend/src/server/api/endpoints/auth/session/show.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { MiAuthSessionsRepository } from '@/models/index.js'; +import type { AuthSessionsRepository } from '@/models/index.js'; import { AuthSessionEntityService } from '@/core/entities/AuthSessionEntityService.js'; import { DI } from '@/di-symbols.js'; import { ApiError } from '../../../error.js'; @@ -58,7 +58,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.authSessionsRepository) - private authSessionsRepository: MiAuthSessionsRepository, + private authSessionsRepository: AuthSessionsRepository, private authSessionEntityService: AuthSessionEntityService, ) { diff --git a/packages/backend/src/server/api/endpoints/auth/session/userkey.ts b/packages/backend/src/server/api/endpoints/auth/session/userkey.ts index 27c1b74454..29d82f9a5f 100644 --- a/packages/backend/src/server/api/endpoints/auth/session/userkey.ts +++ b/packages/backend/src/server/api/endpoints/auth/session/userkey.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { MiAppsRepository, MiAccessTokensRepository, MiAuthSessionsRepository } from '@/models/index.js'; +import type { AppsRepository, AccessTokensRepository, AuthSessionsRepository } from '@/models/index.js'; import { UserEntityService } from '@/core/entities/UserEntityService.js'; import { DI } from '@/di-symbols.js'; import { ApiError } from '../../../error.js'; @@ -67,13 +67,13 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.appsRepository) - private appsRepository: MiAppsRepository, + private appsRepository: AppsRepository, @Inject(DI.authSessionsRepository) - private authSessionsRepository: MiAuthSessionsRepository, + private authSessionsRepository: AuthSessionsRepository, @Inject(DI.accessTokensRepository) - private accessTokensRepository: MiAccessTokensRepository, + private accessTokensRepository: AccessTokensRepository, private userEntityService: UserEntityService, ) { diff --git a/packages/backend/src/server/api/endpoints/blocking/create.ts b/packages/backend/src/server/api/endpoints/blocking/create.ts index 0fa66f9127..f7a3a6b1ba 100644 --- a/packages/backend/src/server/api/endpoints/blocking/create.ts +++ b/packages/backend/src/server/api/endpoints/blocking/create.ts @@ -6,7 +6,7 @@ import ms from 'ms'; import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { MiUsersRepository, MiBlockingsRepository } from '@/models/index.js'; +import type { UsersRepository, BlockingsRepository } from '@/models/index.js'; import { UserEntityService } from '@/core/entities/UserEntityService.js'; import { UserBlockingService } from '@/core/UserBlockingService.js'; import { DI } from '@/di-symbols.js'; @@ -65,10 +65,10 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.usersRepository) - private usersRepository: MiUsersRepository, + private usersRepository: UsersRepository, @Inject(DI.blockingsRepository) - private blockingsRepository: MiBlockingsRepository, + private blockingsRepository: BlockingsRepository, private userEntityService: UserEntityService, private getterService: GetterService, diff --git a/packages/backend/src/server/api/endpoints/blocking/delete.ts b/packages/backend/src/server/api/endpoints/blocking/delete.ts index 37af228c3a..8ef7dd9c64 100644 --- a/packages/backend/src/server/api/endpoints/blocking/delete.ts +++ b/packages/backend/src/server/api/endpoints/blocking/delete.ts @@ -6,7 +6,7 @@ import ms from 'ms'; import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { MiUsersRepository, MiBlockingsRepository } from '@/models/index.js'; +import type { UsersRepository, BlockingsRepository } from '@/models/index.js'; import { UserEntityService } from '@/core/entities/UserEntityService.js'; import { UserBlockingService } from '@/core/UserBlockingService.js'; import { DI } from '@/di-symbols.js'; @@ -65,10 +65,10 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.usersRepository) - private usersRepository: MiUsersRepository, + private usersRepository: UsersRepository, @Inject(DI.blockingsRepository) - private blockingsRepository: MiBlockingsRepository, + private blockingsRepository: BlockingsRepository, private userEntityService: UserEntityService, private getterService: GetterService, diff --git a/packages/backend/src/server/api/endpoints/blocking/list.ts b/packages/backend/src/server/api/endpoints/blocking/list.ts index 1e012265a2..3d3e786cdb 100644 --- a/packages/backend/src/server/api/endpoints/blocking/list.ts +++ b/packages/backend/src/server/api/endpoints/blocking/list.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { MiBlockingsRepository } from '@/models/index.js'; +import type { BlockingsRepository } from '@/models/index.js'; import { QueryService } from '@/core/QueryService.js'; import { BlockingEntityService } from '@/core/entities/BlockingEntityService.js'; import { DI } from '@/di-symbols.js'; @@ -43,7 +43,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.blockingsRepository) - private blockingsRepository: MiBlockingsRepository, + private blockingsRepository: BlockingsRepository, private blockingEntityService: BlockingEntityService, private queryService: QueryService, diff --git a/packages/backend/src/server/api/endpoints/channels/create.ts b/packages/backend/src/server/api/endpoints/channels/create.ts index 4f34478586..e5a0841a55 100644 --- a/packages/backend/src/server/api/endpoints/channels/create.ts +++ b/packages/backend/src/server/api/endpoints/channels/create.ts @@ -6,7 +6,7 @@ import { Inject, Injectable } from '@nestjs/common'; import ms from 'ms'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { MiChannelsRepository, MiDriveFilesRepository } from '@/models/index.js'; +import type { ChannelsRepository, DriveFilesRepository } from '@/models/index.js'; import type { MiChannel } from '@/models/entities/Channel.js'; import { IdService } from '@/core/IdService.js'; import { ChannelEntityService } from '@/core/entities/ChannelEntityService.js'; @@ -59,10 +59,10 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.driveFilesRepository) - private driveFilesRepository: MiDriveFilesRepository, + private driveFilesRepository: DriveFilesRepository, @Inject(DI.channelsRepository) - private channelsRepository: MiChannelsRepository, + private channelsRepository: ChannelsRepository, private idService: IdService, private channelEntityService: ChannelEntityService, diff --git a/packages/backend/src/server/api/endpoints/channels/favorite.ts b/packages/backend/src/server/api/endpoints/channels/favorite.ts index 92302a8d57..ef75af4960 100644 --- a/packages/backend/src/server/api/endpoints/channels/favorite.ts +++ b/packages/backend/src/server/api/endpoints/channels/favorite.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { MiChannelFavoritesRepository, MiChannelsRepository } from '@/models/index.js'; +import type { ChannelFavoritesRepository, ChannelsRepository } from '@/models/index.js'; import { IdService } from '@/core/IdService.js'; import { DI } from '@/di-symbols.js'; import { ApiError } from '../../error.js'; @@ -41,10 +41,10 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.channelsRepository) - private channelsRepository: MiChannelsRepository, + private channelsRepository: ChannelsRepository, @Inject(DI.channelFavoritesRepository) - private channelFavoritesRepository: MiChannelFavoritesRepository, + private channelFavoritesRepository: ChannelFavoritesRepository, private idService: IdService, ) { diff --git a/packages/backend/src/server/api/endpoints/channels/featured.ts b/packages/backend/src/server/api/endpoints/channels/featured.ts index 7b3d49671b..3e26c1fdbb 100644 --- a/packages/backend/src/server/api/endpoints/channels/featured.ts +++ b/packages/backend/src/server/api/endpoints/channels/featured.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { MiChannelsRepository } from '@/models/index.js'; +import type { ChannelsRepository } from '@/models/index.js'; import { ChannelEntityService } from '@/core/entities/ChannelEntityService.js'; import { DI } from '@/di-symbols.js'; @@ -36,7 +36,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.channelsRepository) - private channelsRepository: MiChannelsRepository, + private channelsRepository: ChannelsRepository, private channelEntityService: ChannelEntityService, ) { diff --git a/packages/backend/src/server/api/endpoints/channels/follow.ts b/packages/backend/src/server/api/endpoints/channels/follow.ts index 9a937726b3..655ab39285 100644 --- a/packages/backend/src/server/api/endpoints/channels/follow.ts +++ b/packages/backend/src/server/api/endpoints/channels/follow.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { MiChannelFollowingsRepository, MiChannelsRepository } from '@/models/index.js'; +import type { ChannelFollowingsRepository, ChannelsRepository } from '@/models/index.js'; import { IdService } from '@/core/IdService.js'; import { DI } from '@/di-symbols.js'; import { ApiError } from '../../error.js'; @@ -41,10 +41,10 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.channelsRepository) - private channelsRepository: MiChannelsRepository, + private channelsRepository: ChannelsRepository, @Inject(DI.channelFollowingsRepository) - private channelFollowingsRepository: MiChannelFollowingsRepository, + private channelFollowingsRepository: ChannelFollowingsRepository, private idService: IdService, ) { diff --git a/packages/backend/src/server/api/endpoints/channels/followed.ts b/packages/backend/src/server/api/endpoints/channels/followed.ts index df7c54292b..6e4a13c1db 100644 --- a/packages/backend/src/server/api/endpoints/channels/followed.ts +++ b/packages/backend/src/server/api/endpoints/channels/followed.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { MiChannelFollowingsRepository } from '@/models/index.js'; +import type { ChannelFollowingsRepository } from '@/models/index.js'; import { QueryService } from '@/core/QueryService.js'; import { ChannelEntityService } from '@/core/entities/ChannelEntityService.js'; import { DI } from '@/di-symbols.js'; @@ -43,7 +43,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.channelFollowingsRepository) - private channelFollowingsRepository: MiChannelFollowingsRepository, + private channelFollowingsRepository: ChannelFollowingsRepository, private channelEntityService: ChannelEntityService, private queryService: QueryService, diff --git a/packages/backend/src/server/api/endpoints/channels/my-favorites.ts b/packages/backend/src/server/api/endpoints/channels/my-favorites.ts index 952f426054..e4999a395f 100644 --- a/packages/backend/src/server/api/endpoints/channels/my-favorites.ts +++ b/packages/backend/src/server/api/endpoints/channels/my-favorites.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { MiChannelFavoritesRepository } from '@/models/index.js'; +import type { ChannelFavoritesRepository } from '@/models/index.js'; import { ChannelEntityService } from '@/core/entities/ChannelEntityService.js'; import { DI } from '@/di-symbols.js'; @@ -39,7 +39,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.channelFavoritesRepository) - private channelFavoritesRepository: MiChannelFavoritesRepository, + private channelFavoritesRepository: ChannelFavoritesRepository, private channelEntityService: ChannelEntityService, ) { diff --git a/packages/backend/src/server/api/endpoints/channels/owned.ts b/packages/backend/src/server/api/endpoints/channels/owned.ts index eaa2e3c826..1b85b41543 100644 --- a/packages/backend/src/server/api/endpoints/channels/owned.ts +++ b/packages/backend/src/server/api/endpoints/channels/owned.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { MiChannelsRepository } from '@/models/index.js'; +import type { ChannelsRepository } from '@/models/index.js'; import { QueryService } from '@/core/QueryService.js'; import { ChannelEntityService } from '@/core/entities/ChannelEntityService.js'; import { DI } from '@/di-symbols.js'; @@ -43,7 +43,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.channelsRepository) - private channelsRepository: MiChannelsRepository, + private channelsRepository: ChannelsRepository, private channelEntityService: ChannelEntityService, private queryService: QueryService, diff --git a/packages/backend/src/server/api/endpoints/channels/search.ts b/packages/backend/src/server/api/endpoints/channels/search.ts index f4217d7c88..b66245c48e 100644 --- a/packages/backend/src/server/api/endpoints/channels/search.ts +++ b/packages/backend/src/server/api/endpoints/channels/search.ts @@ -7,7 +7,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Brackets } from 'typeorm'; import { Endpoint } from '@/server/api/endpoint-base.js'; import { QueryService } from '@/core/QueryService.js'; -import type { MiChannelsRepository } from '@/models/index.js'; +import type { ChannelsRepository } from '@/models/index.js'; import { ChannelEntityService } from '@/core/entities/ChannelEntityService.js'; import { DI } from '@/di-symbols.js'; import { sqlLikeEscape } from '@/misc/sql-like-escape.js'; @@ -45,7 +45,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.channelsRepository) - private channelsRepository: MiChannelsRepository, + private channelsRepository: ChannelsRepository, private channelEntityService: ChannelEntityService, private queryService: QueryService, diff --git a/packages/backend/src/server/api/endpoints/channels/show.ts b/packages/backend/src/server/api/endpoints/channels/show.ts index f286b9c3f6..1a3d95f7fd 100644 --- a/packages/backend/src/server/api/endpoints/channels/show.ts +++ b/packages/backend/src/server/api/endpoints/channels/show.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { MiChannelsRepository } from '@/models/index.js'; +import type { ChannelsRepository } from '@/models/index.js'; import { ChannelEntityService } from '@/core/entities/ChannelEntityService.js'; import { DI } from '@/di-symbols.js'; import { ApiError } from '../../error.js'; @@ -43,7 +43,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.channelsRepository) - private channelsRepository: MiChannelsRepository, + private channelsRepository: ChannelsRepository, private channelEntityService: ChannelEntityService, ) { diff --git a/packages/backend/src/server/api/endpoints/channels/timeline.ts b/packages/backend/src/server/api/endpoints/channels/timeline.ts index f13873c54b..39420b806c 100644 --- a/packages/backend/src/server/api/endpoints/channels/timeline.ts +++ b/packages/backend/src/server/api/endpoints/channels/timeline.ts @@ -6,7 +6,7 @@ import { Inject, Injectable } from '@nestjs/common'; import * as Redis from 'ioredis'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { MiChannelsRepository, MiNote, MiNotesRepository } from '@/models/index.js'; +import type { ChannelsRepository, MiNote, NotesRepository } from '@/models/index.js'; import { QueryService } from '@/core/QueryService.js'; import { NoteEntityService } from '@/core/entities/NoteEntityService.js'; import ActiveUsersChart from '@/core/chart/charts/active-users.js'; @@ -59,10 +59,10 @@ export default class extends Endpoint { private redisClient: Redis.Redis, @Inject(DI.notesRepository) - private notesRepository: MiNotesRepository, + private notesRepository: NotesRepository, @Inject(DI.channelsRepository) - private channelsRepository: MiChannelsRepository, + private channelsRepository: ChannelsRepository, private idService: IdService, private noteEntityService: NoteEntityService, diff --git a/packages/backend/src/server/api/endpoints/channels/unfavorite.ts b/packages/backend/src/server/api/endpoints/channels/unfavorite.ts index 669fffb8de..7937ef690e 100644 --- a/packages/backend/src/server/api/endpoints/channels/unfavorite.ts +++ b/packages/backend/src/server/api/endpoints/channels/unfavorite.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { MiChannelFavoritesRepository, MiChannelsRepository } from '@/models/index.js'; +import type { ChannelFavoritesRepository, ChannelsRepository } from '@/models/index.js'; import { DI } from '@/di-symbols.js'; import { ApiError } from '../../error.js'; @@ -40,10 +40,10 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.channelsRepository) - private channelsRepository: MiChannelsRepository, + private channelsRepository: ChannelsRepository, @Inject(DI.channelFavoritesRepository) - private channelFavoritesRepository: MiChannelFavoritesRepository, + private channelFavoritesRepository: ChannelFavoritesRepository, ) { super(meta, paramDef, async (ps, me) => { const channel = await this.channelsRepository.findOneBy({ diff --git a/packages/backend/src/server/api/endpoints/channels/unfollow.ts b/packages/backend/src/server/api/endpoints/channels/unfollow.ts index efc933a4e8..1b585d647f 100644 --- a/packages/backend/src/server/api/endpoints/channels/unfollow.ts +++ b/packages/backend/src/server/api/endpoints/channels/unfollow.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { MiChannelFollowingsRepository, MiChannelsRepository } from '@/models/index.js'; +import type { ChannelFollowingsRepository, ChannelsRepository } from '@/models/index.js'; import { DI } from '@/di-symbols.js'; import { ApiError } from '../../error.js'; @@ -40,10 +40,10 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.channelsRepository) - private channelsRepository: MiChannelsRepository, + private channelsRepository: ChannelsRepository, @Inject(DI.channelFollowingsRepository) - private channelFollowingsRepository: MiChannelFollowingsRepository, + private channelFollowingsRepository: ChannelFollowingsRepository, ) { super(meta, paramDef, async (ps, me) => { const channel = await this.channelsRepository.findOneBy({ diff --git a/packages/backend/src/server/api/endpoints/channels/update.ts b/packages/backend/src/server/api/endpoints/channels/update.ts index d43741a88f..528e5cb38c 100644 --- a/packages/backend/src/server/api/endpoints/channels/update.ts +++ b/packages/backend/src/server/api/endpoints/channels/update.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { MiDriveFilesRepository, MiChannelsRepository } from '@/models/index.js'; +import type { DriveFilesRepository, ChannelsRepository } from '@/models/index.js'; import { ChannelEntityService } from '@/core/entities/ChannelEntityService.js'; import { DI } from '@/di-symbols.js'; import { RoleService } from '@/core/RoleService.js'; @@ -70,10 +70,10 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.channelsRepository) - private channelsRepository: MiChannelsRepository, + private channelsRepository: ChannelsRepository, @Inject(DI.driveFilesRepository) - private driveFilesRepository: MiDriveFilesRepository, + private driveFilesRepository: DriveFilesRepository, private channelEntityService: ChannelEntityService, diff --git a/packages/backend/src/server/api/endpoints/clips/add-note.ts b/packages/backend/src/server/api/endpoints/clips/add-note.ts index 4d6ac1db47..bf7c5e7543 100644 --- a/packages/backend/src/server/api/endpoints/clips/add-note.ts +++ b/packages/backend/src/server/api/endpoints/clips/add-note.ts @@ -8,7 +8,7 @@ import ms from 'ms'; import { Endpoint } from '@/server/api/endpoint-base.js'; import { IdService } from '@/core/IdService.js'; import { DI } from '@/di-symbols.js'; -import type { MiClipNotesRepository, MiClipsRepository } from '@/models/index.js'; +import type { ClipNotesRepository, ClipsRepository } from '@/models/index.js'; import { GetterService } from '@/server/api/GetterService.js'; import { RoleService } from '@/core/RoleService.js'; import { ApiError } from '../../error.js'; @@ -68,10 +68,10 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.clipsRepository) - private clipsRepository: MiClipsRepository, + private clipsRepository: ClipsRepository, @Inject(DI.clipNotesRepository) - private clipNotesRepository: MiClipNotesRepository, + private clipNotesRepository: ClipNotesRepository, private idService: IdService, private roleService: RoleService, diff --git a/packages/backend/src/server/api/endpoints/clips/create.ts b/packages/backend/src/server/api/endpoints/clips/create.ts index 8aec4ddb8b..12e3733e1c 100644 --- a/packages/backend/src/server/api/endpoints/clips/create.ts +++ b/packages/backend/src/server/api/endpoints/clips/create.ts @@ -6,7 +6,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import { IdService } from '@/core/IdService.js'; -import type { MiClipsRepository } from '@/models/index.js'; +import type { ClipsRepository } from '@/models/index.js'; import { ClipEntityService } from '@/core/entities/ClipEntityService.js'; import { DI } from '@/di-symbols.js'; import { RoleService } from '@/core/RoleService.js'; @@ -51,7 +51,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.clipsRepository) - private clipsRepository: MiClipsRepository, + private clipsRepository: ClipsRepository, private clipEntityService: ClipEntityService, private roleService: RoleService, diff --git a/packages/backend/src/server/api/endpoints/clips/delete.ts b/packages/backend/src/server/api/endpoints/clips/delete.ts index e472106fc5..3f3976d84a 100644 --- a/packages/backend/src/server/api/endpoints/clips/delete.ts +++ b/packages/backend/src/server/api/endpoints/clips/delete.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { MiClipsRepository } from '@/models/index.js'; +import type { ClipsRepository } from '@/models/index.js'; import { DI } from '@/di-symbols.js'; import { ApiError } from '../../error.js'; @@ -38,7 +38,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.clipsRepository) - private clipsRepository: MiClipsRepository, + private clipsRepository: ClipsRepository, ) { super(meta, paramDef, async (ps, me) => { const clip = await this.clipsRepository.findOneBy({ diff --git a/packages/backend/src/server/api/endpoints/clips/favorite.ts b/packages/backend/src/server/api/endpoints/clips/favorite.ts index 34cdaa9d64..012543e675 100644 --- a/packages/backend/src/server/api/endpoints/clips/favorite.ts +++ b/packages/backend/src/server/api/endpoints/clips/favorite.ts @@ -4,7 +4,7 @@ */ import { Inject, Injectable } from '@nestjs/common'; -import type { MiClipsRepository, MiClipFavoritesRepository } from '@/models/index.js'; +import type { ClipsRepository, ClipFavoritesRepository } from '@/models/index.js'; import { IdService } from '@/core/IdService.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import { DI } from '@/di-symbols.js'; @@ -47,10 +47,10 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.clipsRepository) - private clipsRepository: MiClipsRepository, + private clipsRepository: ClipsRepository, @Inject(DI.clipFavoritesRepository) - private clipFavoritesRepository: MiClipFavoritesRepository, + private clipFavoritesRepository: ClipFavoritesRepository, private idService: IdService, ) { diff --git a/packages/backend/src/server/api/endpoints/clips/list.ts b/packages/backend/src/server/api/endpoints/clips/list.ts index 70507f903f..65289d33e6 100644 --- a/packages/backend/src/server/api/endpoints/clips/list.ts +++ b/packages/backend/src/server/api/endpoints/clips/list.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { MiClipsRepository } from '@/models/index.js'; +import type { ClipsRepository } from '@/models/index.js'; import { ClipEntityService } from '@/core/entities/ClipEntityService.js'; import { DI } from '@/di-symbols.js'; @@ -38,7 +38,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.clipsRepository) - private clipsRepository: MiClipsRepository, + private clipsRepository: ClipsRepository, private clipEntityService: ClipEntityService, ) { diff --git a/packages/backend/src/server/api/endpoints/clips/my-favorites.ts b/packages/backend/src/server/api/endpoints/clips/my-favorites.ts index 80d38b1724..b5efa56b6a 100644 --- a/packages/backend/src/server/api/endpoints/clips/my-favorites.ts +++ b/packages/backend/src/server/api/endpoints/clips/my-favorites.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { MiClipFavoritesRepository } from '@/models/index.js'; +import type { ClipFavoritesRepository } from '@/models/index.js'; import { DI } from '@/di-symbols.js'; import { ClipEntityService } from '@/core/entities/ClipEntityService.js'; @@ -39,7 +39,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.clipFavoritesRepository) - private clipFavoritesRepository: MiClipFavoritesRepository, + private clipFavoritesRepository: ClipFavoritesRepository, private clipEntityService: ClipEntityService, ) { diff --git a/packages/backend/src/server/api/endpoints/clips/notes.ts b/packages/backend/src/server/api/endpoints/clips/notes.ts index ddcaff61b2..0a35691ec0 100644 --- a/packages/backend/src/server/api/endpoints/clips/notes.ts +++ b/packages/backend/src/server/api/endpoints/clips/notes.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { MiNotesRepository, MiClipsRepository, MiClipNotesRepository } from '@/models/index.js'; +import type { NotesRepository, ClipsRepository, ClipNotesRepository } from '@/models/index.js'; import { QueryService } from '@/core/QueryService.js'; import { NoteEntityService } from '@/core/entities/NoteEntityService.js'; import { DI } from '@/di-symbols.js'; @@ -53,13 +53,13 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.clipsRepository) - private clipsRepository: MiClipsRepository, + private clipsRepository: ClipsRepository, @Inject(DI.notesRepository) - private notesRepository: MiNotesRepository, + private notesRepository: NotesRepository, @Inject(DI.clipNotesRepository) - private clipNotesRepository: MiClipNotesRepository, + private clipNotesRepository: ClipNotesRepository, private noteEntityService: NoteEntityService, private queryService: QueryService, diff --git a/packages/backend/src/server/api/endpoints/clips/remove-note.ts b/packages/backend/src/server/api/endpoints/clips/remove-note.ts index 05beb0a7e1..197a90e7f1 100644 --- a/packages/backend/src/server/api/endpoints/clips/remove-note.ts +++ b/packages/backend/src/server/api/endpoints/clips/remove-note.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { MiClipNotesRepository, MiClipsRepository } from '@/models/index.js'; +import type { ClipNotesRepository, ClipsRepository } from '@/models/index.js'; import { DI } from '@/di-symbols.js'; import { GetterService } from '@/server/api/GetterService.js'; import { ApiError } from '../../error.js'; @@ -48,10 +48,10 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.clipsRepository) - private clipsRepository: MiClipsRepository, + private clipsRepository: ClipsRepository, @Inject(DI.clipNotesRepository) - private clipNotesRepository: MiClipNotesRepository, + private clipNotesRepository: ClipNotesRepository, private getterService: GetterService, ) { diff --git a/packages/backend/src/server/api/endpoints/clips/show.ts b/packages/backend/src/server/api/endpoints/clips/show.ts index 918e171b32..0e2485dec6 100644 --- a/packages/backend/src/server/api/endpoints/clips/show.ts +++ b/packages/backend/src/server/api/endpoints/clips/show.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { MiClipsRepository } from '@/models/index.js'; +import type { ClipsRepository } from '@/models/index.js'; import { ClipEntityService } from '@/core/entities/ClipEntityService.js'; import { DI } from '@/di-symbols.js'; import { ApiError } from '../../error.js'; @@ -45,7 +45,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.clipsRepository) - private clipsRepository: MiClipsRepository, + private clipsRepository: ClipsRepository, private clipEntityService: ClipEntityService, ) { diff --git a/packages/backend/src/server/api/endpoints/clips/unfavorite.ts b/packages/backend/src/server/api/endpoints/clips/unfavorite.ts index 05787796d9..47d44da2cb 100644 --- a/packages/backend/src/server/api/endpoints/clips/unfavorite.ts +++ b/packages/backend/src/server/api/endpoints/clips/unfavorite.ts @@ -4,7 +4,7 @@ */ import { Inject, Injectable } from '@nestjs/common'; -import type { MiClipsRepository, MiClipFavoritesRepository } from '@/models/index.js'; +import type { ClipsRepository, ClipFavoritesRepository } from '@/models/index.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import { DI } from '@/di-symbols.js'; import { ApiError } from '../../error.js'; @@ -46,10 +46,10 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.clipsRepository) - private clipsRepository: MiClipsRepository, + private clipsRepository: ClipsRepository, @Inject(DI.clipFavoritesRepository) - private clipFavoritesRepository: MiClipFavoritesRepository, + private clipFavoritesRepository: ClipFavoritesRepository, ) { super(meta, paramDef, async (ps, me) => { const clip = await this.clipsRepository.findOneBy({ id: ps.clipId }); diff --git a/packages/backend/src/server/api/endpoints/clips/update.ts b/packages/backend/src/server/api/endpoints/clips/update.ts index 2dab35e6cc..5a50855542 100644 --- a/packages/backend/src/server/api/endpoints/clips/update.ts +++ b/packages/backend/src/server/api/endpoints/clips/update.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { MiClipsRepository } from '@/models/index.js'; +import type { ClipsRepository } from '@/models/index.js'; import { ClipEntityService } from '@/core/entities/ClipEntityService.js'; import { DI } from '@/di-symbols.js'; import { ApiError } from '../../error.js'; @@ -50,7 +50,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.clipsRepository) - private clipsRepository: MiClipsRepository, + private clipsRepository: ClipsRepository, private clipEntityService: ClipEntityService, ) { diff --git a/packages/backend/src/server/api/endpoints/drive/files.ts b/packages/backend/src/server/api/endpoints/drive/files.ts index 215115453c..96c51a16ad 100644 --- a/packages/backend/src/server/api/endpoints/drive/files.ts +++ b/packages/backend/src/server/api/endpoints/drive/files.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { MiDriveFilesRepository } from '@/models/index.js'; +import type { DriveFilesRepository } from '@/models/index.js'; import { QueryService } from '@/core/QueryService.js'; import { DriveFileEntityService } from '@/core/entities/DriveFileEntityService.js'; import { DI } from '@/di-symbols.js'; @@ -46,7 +46,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.driveFilesRepository) - private driveFilesRepository: MiDriveFilesRepository, + private driveFilesRepository: DriveFilesRepository, private driveFileEntityService: DriveFileEntityService, private queryService: QueryService, diff --git a/packages/backend/src/server/api/endpoints/drive/files/attached-notes.ts b/packages/backend/src/server/api/endpoints/drive/files/attached-notes.ts index 6c5d6270c0..23929bcfa7 100644 --- a/packages/backend/src/server/api/endpoints/drive/files/attached-notes.ts +++ b/packages/backend/src/server/api/endpoints/drive/files/attached-notes.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { MiNotesRepository, MiDriveFilesRepository } from '@/models/index.js'; +import type { NotesRepository, DriveFilesRepository } from '@/models/index.js'; import { NoteEntityService } from '@/core/entities/NoteEntityService.js'; import { DI } from '@/di-symbols.js'; import { ApiError } from '../../../error.js'; @@ -51,10 +51,10 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.driveFilesRepository) - private driveFilesRepository: MiDriveFilesRepository, + private driveFilesRepository: DriveFilesRepository, @Inject(DI.notesRepository) - private notesRepository: MiNotesRepository, + private notesRepository: NotesRepository, private noteEntityService: NoteEntityService, ) { diff --git a/packages/backend/src/server/api/endpoints/drive/files/check-existence.ts b/packages/backend/src/server/api/endpoints/drive/files/check-existence.ts index 16cbcd5ae9..f780cf90da 100644 --- a/packages/backend/src/server/api/endpoints/drive/files/check-existence.ts +++ b/packages/backend/src/server/api/endpoints/drive/files/check-existence.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { MiDriveFilesRepository } from '@/models/index.js'; +import type { DriveFilesRepository } from '@/models/index.js'; import { DI } from '@/di-symbols.js'; export const meta = { @@ -36,7 +36,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.driveFilesRepository) - private driveFilesRepository: MiDriveFilesRepository, + private driveFilesRepository: DriveFilesRepository, ) { super(meta, paramDef, async (ps, me) => { const exist = await this.driveFilesRepository.exist({ diff --git a/packages/backend/src/server/api/endpoints/drive/files/delete.ts b/packages/backend/src/server/api/endpoints/drive/files/delete.ts index 5b7687bd06..c04ce8313e 100644 --- a/packages/backend/src/server/api/endpoints/drive/files/delete.ts +++ b/packages/backend/src/server/api/endpoints/drive/files/delete.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { MiDriveFilesRepository } from '@/models/index.js'; +import type { DriveFilesRepository } from '@/models/index.js'; import { DriveService } from '@/core/DriveService.js'; import { GlobalEventService } from '@/core/GlobalEventService.js'; import { DI } from '@/di-symbols.js'; @@ -49,7 +49,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.driveFilesRepository) - private driveFilesRepository: MiDriveFilesRepository, + private driveFilesRepository: DriveFilesRepository, private driveService: DriveService, private roleService: RoleService, diff --git a/packages/backend/src/server/api/endpoints/drive/files/find-by-hash.ts b/packages/backend/src/server/api/endpoints/drive/files/find-by-hash.ts index ac4a6a8436..3217bd4421 100644 --- a/packages/backend/src/server/api/endpoints/drive/files/find-by-hash.ts +++ b/packages/backend/src/server/api/endpoints/drive/files/find-by-hash.ts @@ -4,7 +4,7 @@ */ import { Inject, Injectable } from '@nestjs/common'; -import type { MiDriveFilesRepository } from '@/models/index.js'; +import type { DriveFilesRepository } from '@/models/index.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import { DriveFileEntityService } from '@/core/entities/DriveFileEntityService.js'; import { DI } from '@/di-symbols.js'; @@ -42,7 +42,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.driveFilesRepository) - private driveFilesRepository: MiDriveFilesRepository, + private driveFilesRepository: DriveFilesRepository, private driveFileEntityService: DriveFileEntityService, ) { diff --git a/packages/backend/src/server/api/endpoints/drive/files/find.ts b/packages/backend/src/server/api/endpoints/drive/files/find.ts index 5ce360fb3f..ac09d82ee7 100644 --- a/packages/backend/src/server/api/endpoints/drive/files/find.ts +++ b/packages/backend/src/server/api/endpoints/drive/files/find.ts @@ -6,7 +6,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { IsNull } from 'typeorm'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { MiDriveFilesRepository } from '@/models/index.js'; +import type { DriveFilesRepository } from '@/models/index.js'; import { DriveFileEntityService } from '@/core/entities/DriveFileEntityService.js'; import { DI } from '@/di-symbols.js'; @@ -44,7 +44,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.driveFilesRepository) - private driveFilesRepository: MiDriveFilesRepository, + private driveFilesRepository: DriveFilesRepository, private driveFileEntityService: DriveFileEntityService, ) { diff --git a/packages/backend/src/server/api/endpoints/drive/files/show.ts b/packages/backend/src/server/api/endpoints/drive/files/show.ts index a39804022f..e92b7e8522 100644 --- a/packages/backend/src/server/api/endpoints/drive/files/show.ts +++ b/packages/backend/src/server/api/endpoints/drive/files/show.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import type { MiDriveFile } from '@/models/entities/DriveFile.js'; -import type { MiDriveFilesRepository } from '@/models/index.js'; +import type { DriveFilesRepository } from '@/models/index.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import { DriveFileEntityService } from '@/core/entities/DriveFileEntityService.js'; import { DI } from '@/di-symbols.js'; @@ -59,7 +59,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.driveFilesRepository) - private driveFilesRepository: MiDriveFilesRepository, + private driveFilesRepository: DriveFilesRepository, private driveFileEntityService: DriveFileEntityService, private roleService: RoleService, diff --git a/packages/backend/src/server/api/endpoints/drive/files/update.ts b/packages/backend/src/server/api/endpoints/drive/files/update.ts index b87385df26..c6fe654209 100644 --- a/packages/backend/src/server/api/endpoints/drive/files/update.ts +++ b/packages/backend/src/server/api/endpoints/drive/files/update.ts @@ -4,7 +4,7 @@ */ import { Inject, Injectable } from '@nestjs/common'; -import type { MiDriveFilesRepository, MiDriveFoldersRepository } from '@/models/index.js'; +import type { DriveFilesRepository, DriveFoldersRepository } from '@/models/index.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import { DriveFileEntityService } from '@/core/entities/DriveFileEntityService.js'; import { GlobalEventService } from '@/core/GlobalEventService.js'; @@ -76,10 +76,10 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.driveFilesRepository) - private driveFilesRepository: MiDriveFilesRepository, + private driveFilesRepository: DriveFilesRepository, @Inject(DI.driveFoldersRepository) - private driveFoldersRepository: MiDriveFoldersRepository, + private driveFoldersRepository: DriveFoldersRepository, private driveFileEntityService: DriveFileEntityService, private roleService: RoleService, diff --git a/packages/backend/src/server/api/endpoints/drive/folders.ts b/packages/backend/src/server/api/endpoints/drive/folders.ts index bb9fa3092b..a1408fd213 100644 --- a/packages/backend/src/server/api/endpoints/drive/folders.ts +++ b/packages/backend/src/server/api/endpoints/drive/folders.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { MiDriveFoldersRepository } from '@/models/index.js'; +import type { DriveFoldersRepository } from '@/models/index.js'; import { QueryService } from '@/core/QueryService.js'; import { DriveFolderEntityService } from '@/core/entities/DriveFolderEntityService.js'; import { DI } from '@/di-symbols.js'; @@ -44,7 +44,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.driveFoldersRepository) - private driveFoldersRepository: MiDriveFoldersRepository, + private driveFoldersRepository: DriveFoldersRepository, private driveFolderEntityService: DriveFolderEntityService, private queryService: QueryService, diff --git a/packages/backend/src/server/api/endpoints/drive/folders/create.ts b/packages/backend/src/server/api/endpoints/drive/folders/create.ts index 73baf38cec..6272fa683e 100644 --- a/packages/backend/src/server/api/endpoints/drive/folders/create.ts +++ b/packages/backend/src/server/api/endpoints/drive/folders/create.ts @@ -6,7 +6,7 @@ import { Inject, Injectable } from '@nestjs/common'; import ms from 'ms'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { MiDriveFoldersRepository } from '@/models/index.js'; +import type { DriveFoldersRepository } from '@/models/index.js'; import { IdService } from '@/core/IdService.js'; import { DriveFolderEntityService } from '@/core/entities/DriveFolderEntityService.js'; import { GlobalEventService } from '@/core/GlobalEventService.js'; @@ -54,7 +54,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.driveFoldersRepository) - private driveFoldersRepository: MiDriveFoldersRepository, + private driveFoldersRepository: DriveFoldersRepository, private driveFolderEntityService: DriveFolderEntityService, private idService: IdService, diff --git a/packages/backend/src/server/api/endpoints/drive/folders/delete.ts b/packages/backend/src/server/api/endpoints/drive/folders/delete.ts index d89bddda1a..50db0c2085 100644 --- a/packages/backend/src/server/api/endpoints/drive/folders/delete.ts +++ b/packages/backend/src/server/api/endpoints/drive/folders/delete.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { MiDriveFoldersRepository, MiDriveFilesRepository } from '@/models/index.js'; +import type { DriveFoldersRepository, DriveFilesRepository } from '@/models/index.js'; import { GlobalEventService } from '@/core/GlobalEventService.js'; import { DI } from '@/di-symbols.js'; import { ApiError } from '../../../error.js'; @@ -45,10 +45,10 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.driveFilesRepository) - private driveFilesRepository: MiDriveFilesRepository, + private driveFilesRepository: DriveFilesRepository, @Inject(DI.driveFoldersRepository) - private driveFoldersRepository: MiDriveFoldersRepository, + private driveFoldersRepository: DriveFoldersRepository, private globalEventService: GlobalEventService, ) { diff --git a/packages/backend/src/server/api/endpoints/drive/folders/find.ts b/packages/backend/src/server/api/endpoints/drive/folders/find.ts index cfe29ffb0d..b8af55c103 100644 --- a/packages/backend/src/server/api/endpoints/drive/folders/find.ts +++ b/packages/backend/src/server/api/endpoints/drive/folders/find.ts @@ -6,7 +6,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { IsNull } from 'typeorm'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { MiDriveFoldersRepository } from '@/models/index.js'; +import type { DriveFoldersRepository } from '@/models/index.js'; import { DriveFolderEntityService } from '@/core/entities/DriveFolderEntityService.js'; import { DI } from '@/di-symbols.js'; @@ -42,7 +42,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.driveFoldersRepository) - private driveFoldersRepository: MiDriveFoldersRepository, + private driveFoldersRepository: DriveFoldersRepository, private driveFolderEntityService: DriveFolderEntityService, ) { diff --git a/packages/backend/src/server/api/endpoints/drive/folders/show.ts b/packages/backend/src/server/api/endpoints/drive/folders/show.ts index 431591b75a..041ed371a8 100644 --- a/packages/backend/src/server/api/endpoints/drive/folders/show.ts +++ b/packages/backend/src/server/api/endpoints/drive/folders/show.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { MiDriveFoldersRepository } from '@/models/index.js'; +import type { DriveFoldersRepository } from '@/models/index.js'; import { DriveFolderEntityService } from '@/core/entities/DriveFolderEntityService.js'; import { DI } from '@/di-symbols.js'; import { ApiError } from '../../../error.js'; @@ -45,7 +45,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.driveFoldersRepository) - private driveFoldersRepository: MiDriveFoldersRepository, + private driveFoldersRepository: DriveFoldersRepository, private driveFolderEntityService: DriveFolderEntityService, ) { diff --git a/packages/backend/src/server/api/endpoints/drive/folders/update.ts b/packages/backend/src/server/api/endpoints/drive/folders/update.ts index 285e8b642f..c6f115b358 100644 --- a/packages/backend/src/server/api/endpoints/drive/folders/update.ts +++ b/packages/backend/src/server/api/endpoints/drive/folders/update.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { MiDriveFoldersRepository } from '@/models/index.js'; +import type { DriveFoldersRepository } from '@/models/index.js'; import { DriveFolderEntityService } from '@/core/entities/DriveFolderEntityService.js'; import { GlobalEventService } from '@/core/GlobalEventService.js'; import { DI } from '@/di-symbols.js'; @@ -60,7 +60,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.driveFoldersRepository) - private driveFoldersRepository: MiDriveFoldersRepository, + private driveFoldersRepository: DriveFoldersRepository, private driveFolderEntityService: DriveFolderEntityService, private globalEventService: GlobalEventService, diff --git a/packages/backend/src/server/api/endpoints/drive/stream.ts b/packages/backend/src/server/api/endpoints/drive/stream.ts index 6a0950c776..1311939e16 100644 --- a/packages/backend/src/server/api/endpoints/drive/stream.ts +++ b/packages/backend/src/server/api/endpoints/drive/stream.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { MiDriveFilesRepository } from '@/models/index.js'; +import type { DriveFilesRepository } from '@/models/index.js'; import { QueryService } from '@/core/QueryService.js'; import { DriveFileEntityService } from '@/core/entities/DriveFileEntityService.js'; import { DI } from '@/di-symbols.js'; @@ -44,7 +44,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.driveFilesRepository) - private driveFilesRepository: MiDriveFilesRepository, + private driveFilesRepository: DriveFilesRepository, private driveFileEntityService: DriveFileEntityService, private queryService: QueryService, diff --git a/packages/backend/src/server/api/endpoints/emoji.ts b/packages/backend/src/server/api/endpoints/emoji.ts index 4533a3a15b..0ab9e9b004 100644 --- a/packages/backend/src/server/api/endpoints/emoji.ts +++ b/packages/backend/src/server/api/endpoints/emoji.ts @@ -5,7 +5,7 @@ import { IsNull } from 'typeorm'; import { Inject, Injectable } from '@nestjs/common'; -import type { MiEmojisRepository } from '@/models/index.js'; +import type { EmojisRepository } from '@/models/index.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import { EmojiEntityService } from '@/core/entities/EmojiEntityService.js'; import { DI } from '@/di-symbols.js'; @@ -39,7 +39,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.emojisRepository) - private emojisRepository: MiEmojisRepository, + private emojisRepository: EmojisRepository, private emojiEntityService: EmojiEntityService, ) { diff --git a/packages/backend/src/server/api/endpoints/emojis.ts b/packages/backend/src/server/api/endpoints/emojis.ts index 1ebde241c0..7cd3eba518 100644 --- a/packages/backend/src/server/api/endpoints/emojis.ts +++ b/packages/backend/src/server/api/endpoints/emojis.ts @@ -5,7 +5,7 @@ import { IsNull } from 'typeorm'; import { Inject, Injectable } from '@nestjs/common'; -import type { MiEmojisRepository } from '@/models/index.js'; +import type { EmojisRepository } from '@/models/index.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import { EmojiEntityService } from '@/core/entities/EmojiEntityService.js'; import { DI } from '@/di-symbols.js'; @@ -46,7 +46,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.emojisRepository) - private emojisRepository: MiEmojisRepository, + private emojisRepository: EmojisRepository, private emojiEntityService: EmojiEntityService, ) { diff --git a/packages/backend/src/server/api/endpoints/federation/followers.ts b/packages/backend/src/server/api/endpoints/federation/followers.ts index 52affe57bb..9b18f9deb4 100644 --- a/packages/backend/src/server/api/endpoints/federation/followers.ts +++ b/packages/backend/src/server/api/endpoints/federation/followers.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { MiFollowingsRepository } from '@/models/index.js'; +import type { FollowingsRepository } from '@/models/index.js'; import { QueryService } from '@/core/QueryService.js'; import { FollowingEntityService } from '@/core/entities/FollowingEntityService.js'; import { DI } from '@/di-symbols.js'; @@ -42,7 +42,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.followingsRepository) - private followingsRepository: MiFollowingsRepository, + private followingsRepository: FollowingsRepository, private followingEntityService: FollowingEntityService, private queryService: QueryService, diff --git a/packages/backend/src/server/api/endpoints/federation/following.ts b/packages/backend/src/server/api/endpoints/federation/following.ts index 0b1c21f056..6e526996be 100644 --- a/packages/backend/src/server/api/endpoints/federation/following.ts +++ b/packages/backend/src/server/api/endpoints/federation/following.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { MiFollowingsRepository } from '@/models/index.js'; +import type { FollowingsRepository } from '@/models/index.js'; import { QueryService } from '@/core/QueryService.js'; import { FollowingEntityService } from '@/core/entities/FollowingEntityService.js'; import { DI } from '@/di-symbols.js'; @@ -42,7 +42,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.followingsRepository) - private followingsRepository: MiFollowingsRepository, + private followingsRepository: FollowingsRepository, private followingEntityService: FollowingEntityService, private queryService: QueryService, diff --git a/packages/backend/src/server/api/endpoints/federation/instances.ts b/packages/backend/src/server/api/endpoints/federation/instances.ts index d507e08f4d..96063403b2 100644 --- a/packages/backend/src/server/api/endpoints/federation/instances.ts +++ b/packages/backend/src/server/api/endpoints/federation/instances.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { MiInstancesRepository } from '@/models/index.js'; +import type { InstancesRepository } from '@/models/index.js'; import { InstanceEntityService } from '@/core/entities/InstanceEntityService.js'; import { MetaService } from '@/core/MetaService.js'; import { DI } from '@/di-symbols.js'; @@ -51,7 +51,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.instancesRepository) - private instancesRepository: MiInstancesRepository, + private instancesRepository: InstancesRepository, private instanceEntityService: InstanceEntityService, private metaService: MetaService, diff --git a/packages/backend/src/server/api/endpoints/federation/show-instance.ts b/packages/backend/src/server/api/endpoints/federation/show-instance.ts index 55759712e7..d76303ed45 100644 --- a/packages/backend/src/server/api/endpoints/federation/show-instance.ts +++ b/packages/backend/src/server/api/endpoints/federation/show-instance.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { MiInstancesRepository } from '@/models/index.js'; +import type { InstancesRepository } from '@/models/index.js'; import { InstanceEntityService } from '@/core/entities/InstanceEntityService.js'; import { UtilityService } from '@/core/UtilityService.js'; import { DI } from '@/di-symbols.js'; @@ -38,7 +38,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.instancesRepository) - private instancesRepository: MiInstancesRepository, + private instancesRepository: InstancesRepository, private utilityService: UtilityService, private instanceEntityService: InstanceEntityService, diff --git a/packages/backend/src/server/api/endpoints/federation/stats.ts b/packages/backend/src/server/api/endpoints/federation/stats.ts index 7416190d58..048a7ff4e3 100644 --- a/packages/backend/src/server/api/endpoints/federation/stats.ts +++ b/packages/backend/src/server/api/endpoints/federation/stats.ts @@ -5,7 +5,7 @@ import { IsNull, MoreThan, Not } from 'typeorm'; import { Inject, Injectable } from '@nestjs/common'; -import type { MiFollowingsRepository, MiInstancesRepository } from '@/models/index.js'; +import type { FollowingsRepository, InstancesRepository } from '@/models/index.js'; import { awaitAll } from '@/misc/prelude/await-all.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import { InstanceEntityService } from '@/core/entities/InstanceEntityService.js'; @@ -33,10 +33,10 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.instancesRepository) - private instancesRepository: MiInstancesRepository, + private instancesRepository: InstancesRepository, @Inject(DI.followingsRepository) - private followingsRepository: MiFollowingsRepository, + private followingsRepository: FollowingsRepository, private instanceEntityService: InstanceEntityService, ) { diff --git a/packages/backend/src/server/api/endpoints/federation/users.ts b/packages/backend/src/server/api/endpoints/federation/users.ts index b2391521a5..f284b2175c 100644 --- a/packages/backend/src/server/api/endpoints/federation/users.ts +++ b/packages/backend/src/server/api/endpoints/federation/users.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { MiUsersRepository } from '@/models/index.js'; +import type { UsersRepository } from '@/models/index.js'; import { QueryService } from '@/core/QueryService.js'; import { UserEntityService } from '@/core/entities/UserEntityService.js'; import { DI } from '@/di-symbols.js'; @@ -42,7 +42,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.usersRepository) - private usersRepository: MiUsersRepository, + private usersRepository: UsersRepository, private userEntityService: UserEntityService, private queryService: QueryService, diff --git a/packages/backend/src/server/api/endpoints/flash/create.ts b/packages/backend/src/server/api/endpoints/flash/create.ts index 48354c1be3..4a91ee2495 100644 --- a/packages/backend/src/server/api/endpoints/flash/create.ts +++ b/packages/backend/src/server/api/endpoints/flash/create.ts @@ -5,7 +5,7 @@ import ms from 'ms'; import { Inject, Injectable } from '@nestjs/common'; -import type { MiFlashsRepository } from '@/models/index.js'; +import type { FlashsRepository } from '@/models/index.js'; import { IdService } from '@/core/IdService.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import { DI } from '@/di-symbols.js'; @@ -47,7 +47,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.flashsRepository) - private flashsRepository: MiFlashsRepository, + private flashsRepository: FlashsRepository, private flashEntityService: FlashEntityService, private idService: IdService, diff --git a/packages/backend/src/server/api/endpoints/flash/delete.ts b/packages/backend/src/server/api/endpoints/flash/delete.ts index f25d72d086..b71754000a 100644 --- a/packages/backend/src/server/api/endpoints/flash/delete.ts +++ b/packages/backend/src/server/api/endpoints/flash/delete.ts @@ -4,7 +4,7 @@ */ import { Inject, Injectable } from '@nestjs/common'; -import type { MiFlashsRepository } from '@/models/index.js'; +import type { FlashsRepository } from '@/models/index.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import { DI } from '@/di-symbols.js'; import { ApiError } from '../../error.js'; @@ -44,7 +44,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.flashsRepository) - private flashsRepository: MiFlashsRepository, + private flashsRepository: FlashsRepository, ) { super(meta, paramDef, async (ps, me) => { const flash = await this.flashsRepository.findOneBy({ id: ps.flashId }); diff --git a/packages/backend/src/server/api/endpoints/flash/featured.ts b/packages/backend/src/server/api/endpoints/flash/featured.ts index c49f722653..a8f81fb380 100644 --- a/packages/backend/src/server/api/endpoints/flash/featured.ts +++ b/packages/backend/src/server/api/endpoints/flash/featured.ts @@ -4,7 +4,7 @@ */ import { Inject, Injectable } from '@nestjs/common'; -import type { MiFlashsRepository } from '@/models/index.js'; +import type { FlashsRepository } from '@/models/index.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import { FlashEntityService } from '@/core/entities/FlashEntityService.js'; import { DI } from '@/di-symbols.js'; @@ -36,7 +36,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.flashsRepository) - private flashsRepository: MiFlashsRepository, + private flashsRepository: FlashsRepository, private flashEntityService: FlashEntityService, ) { diff --git a/packages/backend/src/server/api/endpoints/flash/like.ts b/packages/backend/src/server/api/endpoints/flash/like.ts index 810964006b..2a170bf1fb 100644 --- a/packages/backend/src/server/api/endpoints/flash/like.ts +++ b/packages/backend/src/server/api/endpoints/flash/like.ts @@ -4,7 +4,7 @@ */ import { Inject, Injectable } from '@nestjs/common'; -import type { MiFlashsRepository, MiFlashLikesRepository } from '@/models/index.js'; +import type { FlashsRepository, FlashLikesRepository } from '@/models/index.js'; import { IdService } from '@/core/IdService.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import { DI } from '@/di-symbols.js'; @@ -53,10 +53,10 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.flashsRepository) - private flashsRepository: MiFlashsRepository, + private flashsRepository: FlashsRepository, @Inject(DI.flashLikesRepository) - private flashLikesRepository: MiFlashLikesRepository, + private flashLikesRepository: FlashLikesRepository, private idService: IdService, ) { diff --git a/packages/backend/src/server/api/endpoints/flash/my-likes.ts b/packages/backend/src/server/api/endpoints/flash/my-likes.ts index d07fe0c39f..ed1ee0ffde 100644 --- a/packages/backend/src/server/api/endpoints/flash/my-likes.ts +++ b/packages/backend/src/server/api/endpoints/flash/my-likes.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { MiFlashLikesRepository } from '@/models/index.js'; +import type { FlashLikesRepository } from '@/models/index.js'; import { QueryService } from '@/core/QueryService.js'; import { FlashLikeEntityService } from '@/core/entities/FlashLikeEntityService.js'; import { DI } from '@/di-symbols.js'; @@ -53,7 +53,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.flashLikesRepository) - private flashLikesRepository: MiFlashLikesRepository, + private flashLikesRepository: FlashLikesRepository, private flashLikeEntityService: FlashLikeEntityService, private queryService: QueryService, diff --git a/packages/backend/src/server/api/endpoints/flash/my.ts b/packages/backend/src/server/api/endpoints/flash/my.ts index f54dbf8c76..2417b448aa 100644 --- a/packages/backend/src/server/api/endpoints/flash/my.ts +++ b/packages/backend/src/server/api/endpoints/flash/my.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { MiFlashsRepository } from '@/models/index.js'; +import type { FlashsRepository } from '@/models/index.js'; import { QueryService } from '@/core/QueryService.js'; import { FlashEntityService } from '@/core/entities/FlashEntityService.js'; import { DI } from '@/di-symbols.js'; @@ -43,7 +43,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.flashsRepository) - private flashsRepository: MiFlashsRepository, + private flashsRepository: FlashsRepository, private flashEntityService: FlashEntityService, private queryService: QueryService, diff --git a/packages/backend/src/server/api/endpoints/flash/show.ts b/packages/backend/src/server/api/endpoints/flash/show.ts index f92955d2d9..0e6a561df7 100644 --- a/packages/backend/src/server/api/endpoints/flash/show.ts +++ b/packages/backend/src/server/api/endpoints/flash/show.ts @@ -4,7 +4,7 @@ */ import { Inject, Injectable } from '@nestjs/common'; -import type { MiFlashsRepository } from '@/models/index.js'; +import type { FlashsRepository } from '@/models/index.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import { FlashEntityService } from '@/core/entities/FlashEntityService.js'; import { DI } from '@/di-symbols.js'; @@ -43,7 +43,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.flashsRepository) - private flashsRepository: MiFlashsRepository, + private flashsRepository: FlashsRepository, private flashEntityService: FlashEntityService, ) { diff --git a/packages/backend/src/server/api/endpoints/flash/unlike.ts b/packages/backend/src/server/api/endpoints/flash/unlike.ts index e390be9615..f6fcdfdf93 100644 --- a/packages/backend/src/server/api/endpoints/flash/unlike.ts +++ b/packages/backend/src/server/api/endpoints/flash/unlike.ts @@ -4,7 +4,7 @@ */ import { Inject, Injectable } from '@nestjs/common'; -import type { MiFlashsRepository, MiFlashLikesRepository } from '@/models/index.js'; +import type { FlashsRepository, FlashLikesRepository } from '@/models/index.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import { DI } from '@/di-symbols.js'; import { ApiError } from '../../error.js'; @@ -46,10 +46,10 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.flashsRepository) - private flashsRepository: MiFlashsRepository, + private flashsRepository: FlashsRepository, @Inject(DI.flashLikesRepository) - private flashLikesRepository: MiFlashLikesRepository, + private flashLikesRepository: FlashLikesRepository, ) { super(meta, paramDef, async (ps, me) => { const flash = await this.flashsRepository.findOneBy({ id: ps.flashId }); diff --git a/packages/backend/src/server/api/endpoints/flash/update.ts b/packages/backend/src/server/api/endpoints/flash/update.ts index 3f681c4fb2..90cf302ee0 100644 --- a/packages/backend/src/server/api/endpoints/flash/update.ts +++ b/packages/backend/src/server/api/endpoints/flash/update.ts @@ -5,7 +5,7 @@ import ms from 'ms'; import { Inject, Injectable } from '@nestjs/common'; -import type { MiFlashsRepository } from '@/models/index.js'; +import type { FlashsRepository } from '@/models/index.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import { DI } from '@/di-symbols.js'; import { ApiError } from '../../error.js'; @@ -58,7 +58,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.flashsRepository) - private flashsRepository: MiFlashsRepository, + private flashsRepository: FlashsRepository, ) { super(meta, paramDef, async (ps, me) => { const flash = await this.flashsRepository.findOneBy({ id: ps.flashId }); diff --git a/packages/backend/src/server/api/endpoints/following/create.ts b/packages/backend/src/server/api/endpoints/following/create.ts index b6c81760a4..36b4e9fae4 100644 --- a/packages/backend/src/server/api/endpoints/following/create.ts +++ b/packages/backend/src/server/api/endpoints/following/create.ts @@ -6,7 +6,7 @@ import ms from 'ms'; import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { MiFollowingsRepository } from '@/models/index.js'; +import type { FollowingsRepository } from '@/models/index.js'; import { IdentifiableError } from '@/misc/identifiable-error.js'; import { UserEntityService } from '@/core/entities/UserEntityService.js'; import { UserFollowingService } from '@/core/UserFollowingService.js'; @@ -80,7 +80,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.followingsRepository) - private followingsRepository: MiFollowingsRepository, + private followingsRepository: FollowingsRepository, private userEntityService: UserEntityService, private getterService: GetterService, diff --git a/packages/backend/src/server/api/endpoints/following/delete.ts b/packages/backend/src/server/api/endpoints/following/delete.ts index f1818f723a..1d7e47a9ab 100644 --- a/packages/backend/src/server/api/endpoints/following/delete.ts +++ b/packages/backend/src/server/api/endpoints/following/delete.ts @@ -6,7 +6,7 @@ import ms from 'ms'; import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { MiFollowingsRepository } from '@/models/index.js'; +import type { FollowingsRepository } from '@/models/index.js'; import { UserEntityService } from '@/core/entities/UserEntityService.js'; import { UserFollowingService } from '@/core/UserFollowingService.js'; import { DI } from '@/di-symbols.js'; @@ -65,7 +65,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.followingsRepository) - private followingsRepository: MiFollowingsRepository, + private followingsRepository: FollowingsRepository, private userEntityService: UserEntityService, private getterService: GetterService, diff --git a/packages/backend/src/server/api/endpoints/following/invalidate.ts b/packages/backend/src/server/api/endpoints/following/invalidate.ts index b545764b02..1f4be3d518 100644 --- a/packages/backend/src/server/api/endpoints/following/invalidate.ts +++ b/packages/backend/src/server/api/endpoints/following/invalidate.ts @@ -6,7 +6,7 @@ import ms from 'ms'; import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { MiFollowingsRepository } from '@/models/index.js'; +import type { FollowingsRepository } from '@/models/index.js'; import { UserEntityService } from '@/core/entities/UserEntityService.js'; import { UserFollowingService } from '@/core/UserFollowingService.js'; import { DI } from '@/di-symbols.js'; @@ -65,7 +65,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.followingsRepository) - private followingsRepository: MiFollowingsRepository, + private followingsRepository: FollowingsRepository, private userEntityService: UserEntityService, private getterService: GetterService, diff --git a/packages/backend/src/server/api/endpoints/following/requests/list.ts b/packages/backend/src/server/api/endpoints/following/requests/list.ts index 778c411af3..26c068c646 100644 --- a/packages/backend/src/server/api/endpoints/following/requests/list.ts +++ b/packages/backend/src/server/api/endpoints/following/requests/list.ts @@ -6,7 +6,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import { QueryService } from '@/core/QueryService.js'; -import type { MiFollowRequestsRepository } from '@/models/index.js'; +import type { FollowRequestsRepository } from '@/models/index.js'; import { FollowRequestEntityService } from '@/core/entities/FollowRequestEntityService.js'; import { DI } from '@/di-symbols.js'; @@ -59,7 +59,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.followRequestsRepository) - private followRequestsRepository: MiFollowRequestsRepository, + private followRequestsRepository: FollowRequestsRepository, private followRequestEntityService: FollowRequestEntityService, private queryService: QueryService, diff --git a/packages/backend/src/server/api/endpoints/gallery/featured.ts b/packages/backend/src/server/api/endpoints/gallery/featured.ts index c339d84cc9..80cad0e5b0 100644 --- a/packages/backend/src/server/api/endpoints/gallery/featured.ts +++ b/packages/backend/src/server/api/endpoints/gallery/featured.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { MiGalleryPostsRepository } from '@/models/index.js'; +import type { GalleryPostsRepository } from '@/models/index.js'; import { GalleryPostEntityService } from '@/core/entities/GalleryPostEntityService.js'; import { DI } from '@/di-symbols.js'; @@ -36,7 +36,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.galleryPostsRepository) - private galleryPostsRepository: MiGalleryPostsRepository, + private galleryPostsRepository: GalleryPostsRepository, private galleryPostEntityService: GalleryPostEntityService, ) { diff --git a/packages/backend/src/server/api/endpoints/gallery/popular.ts b/packages/backend/src/server/api/endpoints/gallery/popular.ts index 510af3cb24..ef1d54f82c 100644 --- a/packages/backend/src/server/api/endpoints/gallery/popular.ts +++ b/packages/backend/src/server/api/endpoints/gallery/popular.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { MiGalleryPostsRepository } from '@/models/index.js'; +import type { GalleryPostsRepository } from '@/models/index.js'; import { GalleryPostEntityService } from '@/core/entities/GalleryPostEntityService.js'; import { DI } from '@/di-symbols.js'; @@ -36,7 +36,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.galleryPostsRepository) - private galleryPostsRepository: MiGalleryPostsRepository, + private galleryPostsRepository: GalleryPostsRepository, private galleryPostEntityService: GalleryPostEntityService, ) { diff --git a/packages/backend/src/server/api/endpoints/gallery/posts.ts b/packages/backend/src/server/api/endpoints/gallery/posts.ts index 480f919193..42f35f418a 100644 --- a/packages/backend/src/server/api/endpoints/gallery/posts.ts +++ b/packages/backend/src/server/api/endpoints/gallery/posts.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { MiGalleryPostsRepository } from '@/models/index.js'; +import type { GalleryPostsRepository } from '@/models/index.js'; import { QueryService } from '@/core/QueryService.js'; import { GalleryPostEntityService } from '@/core/entities/GalleryPostEntityService.js'; import { DI } from '@/di-symbols.js'; @@ -39,7 +39,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.galleryPostsRepository) - private galleryPostsRepository: MiGalleryPostsRepository, + private galleryPostsRepository: GalleryPostsRepository, private galleryPostEntityService: GalleryPostEntityService, private queryService: QueryService, 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 441a2df696..6abcdffe7c 100644 --- a/packages/backend/src/server/api/endpoints/gallery/posts/create.ts +++ b/packages/backend/src/server/api/endpoints/gallery/posts/create.ts @@ -6,7 +6,7 @@ import ms from 'ms'; import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { MiDriveFilesRepository, MiGalleryPostsRepository } from '@/models/index.js'; +import type { DriveFilesRepository, GalleryPostsRepository } from '@/models/index.js'; import { MiGalleryPost } from '@/models/entities/GalleryPost.js'; import type { MiDriveFile } from '@/models/entities/DriveFile.js'; import { IdService } from '@/core/IdService.js'; @@ -56,10 +56,10 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.galleryPostsRepository) - private galleryPostsRepository: MiGalleryPostsRepository, + private galleryPostsRepository: GalleryPostsRepository, @Inject(DI.driveFilesRepository) - private driveFilesRepository: MiDriveFilesRepository, + private driveFilesRepository: DriveFilesRepository, private galleryPostEntityService: GalleryPostEntityService, private idService: IdService, diff --git a/packages/backend/src/server/api/endpoints/gallery/posts/delete.ts b/packages/backend/src/server/api/endpoints/gallery/posts/delete.ts index cf67e6c3bb..81ed24df15 100644 --- a/packages/backend/src/server/api/endpoints/gallery/posts/delete.ts +++ b/packages/backend/src/server/api/endpoints/gallery/posts/delete.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { MiGalleryPostsRepository } from '@/models/index.js'; +import type { GalleryPostsRepository } from '@/models/index.js'; import { DI } from '@/di-symbols.js'; import { ApiError } from '../../../error.js'; @@ -38,7 +38,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.galleryPostsRepository) - private galleryPostsRepository: MiGalleryPostsRepository, + private galleryPostsRepository: GalleryPostsRepository, ) { super(meta, paramDef, async (ps, me) => { const post = await this.galleryPostsRepository.findOneBy({ 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 2a52e6e970..f12456fbdb 100644 --- a/packages/backend/src/server/api/endpoints/gallery/posts/like.ts +++ b/packages/backend/src/server/api/endpoints/gallery/posts/like.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { MiGalleryLikesRepository, MiGalleryPostsRepository } from '@/models/index.js'; +import type { GalleryLikesRepository, GalleryPostsRepository } from '@/models/index.js'; import { IdService } from '@/core/IdService.js'; import { DI } from '@/di-symbols.js'; import { ApiError } from '../../../error.js'; @@ -53,10 +53,10 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.galleryPostsRepository) - private galleryPostsRepository: MiGalleryPostsRepository, + private galleryPostsRepository: GalleryPostsRepository, @Inject(DI.galleryLikesRepository) - private galleryLikesRepository: MiGalleryLikesRepository, + private galleryLikesRepository: GalleryLikesRepository, private idService: IdService, ) { diff --git a/packages/backend/src/server/api/endpoints/gallery/posts/show.ts b/packages/backend/src/server/api/endpoints/gallery/posts/show.ts index 396538eab5..a76e52bd89 100644 --- a/packages/backend/src/server/api/endpoints/gallery/posts/show.ts +++ b/packages/backend/src/server/api/endpoints/gallery/posts/show.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { MiGalleryPostsRepository } from '@/models/index.js'; +import type { GalleryPostsRepository } from '@/models/index.js'; import { GalleryPostEntityService } from '@/core/entities/GalleryPostEntityService.js'; import { DI } from '@/di-symbols.js'; import { ApiError } from '../../../error.js'; @@ -43,7 +43,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.galleryPostsRepository) - private galleryPostsRepository: MiGalleryPostsRepository, + private galleryPostsRepository: GalleryPostsRepository, private galleryPostEntityService: GalleryPostEntityService, ) { 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 80205dd8dd..339452cdef 100644 --- a/packages/backend/src/server/api/endpoints/gallery/posts/unlike.ts +++ b/packages/backend/src/server/api/endpoints/gallery/posts/unlike.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { MiGalleryPostsRepository, MiGalleryLikesRepository } from '@/models/index.js'; +import type { GalleryPostsRepository, GalleryLikesRepository } from '@/models/index.js'; import { DI } from '@/di-symbols.js'; import { ApiError } from '../../../error.js'; @@ -46,10 +46,10 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.galleryPostsRepository) - private galleryPostsRepository: MiGalleryPostsRepository, + private galleryPostsRepository: GalleryPostsRepository, @Inject(DI.galleryLikesRepository) - private galleryLikesRepository: MiGalleryLikesRepository, + private galleryLikesRepository: GalleryLikesRepository, ) { super(meta, paramDef, async (ps, me) => { const post = await this.galleryPostsRepository.findOneBy({ id: ps.postId }); 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 9412606897..25d93962ce 100644 --- a/packages/backend/src/server/api/endpoints/gallery/posts/update.ts +++ b/packages/backend/src/server/api/endpoints/gallery/posts/update.ts @@ -6,7 +6,7 @@ import ms from 'ms'; import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { MiDriveFilesRepository, MiGalleryPostsRepository } from '@/models/index.js'; +import type { DriveFilesRepository, GalleryPostsRepository } from '@/models/index.js'; import type { MiDriveFile } from '@/models/entities/DriveFile.js'; import { GalleryPostEntityService } from '@/core/entities/GalleryPostEntityService.js'; import { DI } from '@/di-symbols.js'; @@ -55,10 +55,10 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.galleryPostsRepository) - private galleryPostsRepository: MiGalleryPostsRepository, + private galleryPostsRepository: GalleryPostsRepository, @Inject(DI.driveFilesRepository) - private driveFilesRepository: MiDriveFilesRepository, + private driveFilesRepository: DriveFilesRepository, private galleryPostEntityService: GalleryPostEntityService, ) { 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 23d4aa2459..3c265185a9 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 @@ -6,7 +6,7 @@ import { MoreThan } from 'typeorm'; import { Inject, Injectable } from '@nestjs/common'; import { USER_ONLINE_THRESHOLD } from '@/const.js'; -import type { MiUsersRepository } from '@/models/index.js'; +import type { UsersRepository } from '@/models/index.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import { DI } from '@/di-symbols.js'; @@ -29,7 +29,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.usersRepository) - private usersRepository: MiUsersRepository, + private usersRepository: UsersRepository, ) { super(meta, paramDef, async () => { const count = await this.usersRepository.countBy({ diff --git a/packages/backend/src/server/api/endpoints/hashtags/list.ts b/packages/backend/src/server/api/endpoints/hashtags/list.ts index 6b40d22fda..71400f4a23 100644 --- a/packages/backend/src/server/api/endpoints/hashtags/list.ts +++ b/packages/backend/src/server/api/endpoints/hashtags/list.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { MiHashtagsRepository } from '@/models/index.js'; +import type { HashtagsRepository } from '@/models/index.js'; import { HashtagEntityService } from '@/core/entities/HashtagEntityService.js'; import { DI } from '@/di-symbols.js'; @@ -42,7 +42,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.hashtagsRepository) - private hashtagsRepository: MiHashtagsRepository, + private hashtagsRepository: HashtagsRepository, private hashtagEntityService: HashtagEntityService, ) { diff --git a/packages/backend/src/server/api/endpoints/hashtags/search.ts b/packages/backend/src/server/api/endpoints/hashtags/search.ts index 6d3e2f5243..e9508afd32 100644 --- a/packages/backend/src/server/api/endpoints/hashtags/search.ts +++ b/packages/backend/src/server/api/endpoints/hashtags/search.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { MiHashtagsRepository } from '@/models/index.js'; +import type { HashtagsRepository } from '@/models/index.js'; import { DI } from '@/di-symbols.js'; import { sqlLikeEscape } from '@/misc/sql-like-escape.js'; @@ -39,7 +39,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.hashtagsRepository) - private hashtagsRepository: MiHashtagsRepository, + private hashtagsRepository: HashtagsRepository, ) { super(meta, paramDef, async (ps, me) => { const hashtags = await this.hashtagsRepository.createQueryBuilder('tag') diff --git a/packages/backend/src/server/api/endpoints/hashtags/show.ts b/packages/backend/src/server/api/endpoints/hashtags/show.ts index 369018438c..64a556a3c7 100644 --- a/packages/backend/src/server/api/endpoints/hashtags/show.ts +++ b/packages/backend/src/server/api/endpoints/hashtags/show.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { MiHashtagsRepository } from '@/models/index.js'; +import type { HashtagsRepository } from '@/models/index.js'; import { normalizeForSearch } from '@/misc/normalize-for-search.js'; import { HashtagEntityService } from '@/core/entities/HashtagEntityService.js'; import { DI } from '@/di-symbols.js'; @@ -44,7 +44,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.hashtagsRepository) - private hashtagsRepository: MiHashtagsRepository, + private hashtagsRepository: HashtagsRepository, private hashtagEntityService: HashtagEntityService, ) { diff --git a/packages/backend/src/server/api/endpoints/hashtags/trend.ts b/packages/backend/src/server/api/endpoints/hashtags/trend.ts index 9a88efb6d6..b4c9565e0e 100644 --- a/packages/backend/src/server/api/endpoints/hashtags/trend.ts +++ b/packages/backend/src/server/api/endpoints/hashtags/trend.ts @@ -6,7 +6,7 @@ import { Brackets } from 'typeorm'; import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { MiNotesRepository } from '@/models/index.js'; +import type { NotesRepository } from '@/models/index.js'; import type { MiNote } from '@/models/entities/Note.js'; import { safeForSql } from '@/misc/safe-for-sql.js'; import { normalizeForSearch } from '@/misc/normalize-for-search.js'; @@ -73,7 +73,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.notesRepository) - private notesRepository: MiNotesRepository, + private notesRepository: NotesRepository, private metaService: MetaService, ) { diff --git a/packages/backend/src/server/api/endpoints/hashtags/users.ts b/packages/backend/src/server/api/endpoints/hashtags/users.ts index a709aaa0dc..6a8c69351d 100644 --- a/packages/backend/src/server/api/endpoints/hashtags/users.ts +++ b/packages/backend/src/server/api/endpoints/hashtags/users.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { MiUsersRepository } from '@/models/index.js'; +import type { UsersRepository } from '@/models/index.js'; import { normalizeForSearch } from '@/misc/normalize-for-search.js'; import { UserEntityService } from '@/core/entities/UserEntityService.js'; import { DI } from '@/di-symbols.js'; @@ -43,7 +43,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.usersRepository) - private usersRepository: MiUsersRepository, + private usersRepository: UsersRepository, private userEntityService: UserEntityService, ) { diff --git a/packages/backend/src/server/api/endpoints/i.ts b/packages/backend/src/server/api/endpoints/i.ts index 69242ea875..5046c78f7d 100644 --- a/packages/backend/src/server/api/endpoints/i.ts +++ b/packages/backend/src/server/api/endpoints/i.ts @@ -4,7 +4,7 @@ */ import { Inject, Injectable } from '@nestjs/common'; -import type { MiUserProfilesRepository } from '@/models/index.js'; +import type { UserProfilesRepository } from '@/models/index.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import { UserEntityService } from '@/core/entities/UserEntityService.js'; import { DI } from '@/di-symbols.js'; @@ -42,7 +42,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.userProfilesRepository) - private userProfilesRepository: MiUserProfilesRepository, + private userProfilesRepository: UserProfilesRepository, private userEntityService: UserEntityService, ) { diff --git a/packages/backend/src/server/api/endpoints/i/2fa/done.ts b/packages/backend/src/server/api/endpoints/i/2fa/done.ts index fd199754c2..d7ba21c259 100644 --- a/packages/backend/src/server/api/endpoints/i/2fa/done.ts +++ b/packages/backend/src/server/api/endpoints/i/2fa/done.ts @@ -7,7 +7,7 @@ import * as OTPAuth from 'otpauth'; import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import { UserEntityService } from '@/core/entities/UserEntityService.js'; -import type { MiUserProfilesRepository } from '@/models/index.js'; +import type { UserProfilesRepository } from '@/models/index.js'; import { GlobalEventService } from '@/core/GlobalEventService.js'; import { DI } from '@/di-symbols.js'; @@ -30,7 +30,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.userProfilesRepository) - private userProfilesRepository: MiUserProfilesRepository, + private userProfilesRepository: UserProfilesRepository, private userEntityService: UserEntityService, private globalEventService: GlobalEventService, diff --git a/packages/backend/src/server/api/endpoints/i/2fa/key-done.ts b/packages/backend/src/server/api/endpoints/i/2fa/key-done.ts index 89a6c61082..fd6e70a9de 100644 --- a/packages/backend/src/server/api/endpoints/i/2fa/key-done.ts +++ b/packages/backend/src/server/api/endpoints/i/2fa/key-done.ts @@ -13,7 +13,7 @@ import type { Config } from '@/config.js'; import { DI } from '@/di-symbols.js'; import { GlobalEventService } from '@/core/GlobalEventService.js'; import { TwoFactorAuthenticationService } from '@/core/TwoFactorAuthenticationService.js'; -import type { MiAttestationChallengesRepository, MiUserProfilesRepository, MiUserSecurityKeysRepository } from '@/models/index.js'; +import type { AttestationChallengesRepository, UserProfilesRepository, UserSecurityKeysRepository } from '@/models/index.js'; const cborDecodeFirst = promisify(cbor.decodeFirst) as any; @@ -43,13 +43,13 @@ export default class extends Endpoint { private config: Config, @Inject(DI.userProfilesRepository) - private userProfilesRepository: MiUserProfilesRepository, + private userProfilesRepository: UserProfilesRepository, @Inject(DI.userSecurityKeysRepository) - private userSecurityKeysRepository: MiUserSecurityKeysRepository, + private userSecurityKeysRepository: UserSecurityKeysRepository, @Inject(DI.attestationChallengesRepository) - private attestationChallengesRepository: MiAttestationChallengesRepository, + private attestationChallengesRepository: AttestationChallengesRepository, private userEntityService: UserEntityService, private globalEventService: GlobalEventService, diff --git a/packages/backend/src/server/api/endpoints/i/2fa/password-less.ts b/packages/backend/src/server/api/endpoints/i/2fa/password-less.ts index 3884f35db9..4973b49c22 100644 --- a/packages/backend/src/server/api/endpoints/i/2fa/password-less.ts +++ b/packages/backend/src/server/api/endpoints/i/2fa/password-less.ts @@ -6,7 +6,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import { UserEntityService } from '@/core/entities/UserEntityService.js'; -import type { MiUserProfilesRepository, MiUserSecurityKeysRepository } from '@/models/index.js'; +import type { UserProfilesRepository, UserSecurityKeysRepository } from '@/models/index.js'; import { GlobalEventService } from '@/core/GlobalEventService.js'; import { DI } from '@/di-symbols.js'; import { ApiError } from '../../../error.js'; @@ -38,10 +38,10 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.userProfilesRepository) - private userProfilesRepository: MiUserProfilesRepository, + private userProfilesRepository: UserProfilesRepository, @Inject(DI.userSecurityKeysRepository) - private userSecurityKeysRepository: MiUserSecurityKeysRepository, + private userSecurityKeysRepository: UserSecurityKeysRepository, private userEntityService: UserEntityService, private globalEventService: GlobalEventService, diff --git a/packages/backend/src/server/api/endpoints/i/2fa/register-key.ts b/packages/backend/src/server/api/endpoints/i/2fa/register-key.ts index ef7c7c5be5..e27a5a8223 100644 --- a/packages/backend/src/server/api/endpoints/i/2fa/register-key.ts +++ b/packages/backend/src/server/api/endpoints/i/2fa/register-key.ts @@ -8,7 +8,7 @@ import * as crypto from 'node:crypto'; import bcrypt from 'bcryptjs'; import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { MiUserProfilesRepository, MiAttestationChallengesRepository } from '@/models/index.js'; +import type { UserProfilesRepository, AttestationChallengesRepository } from '@/models/index.js'; import { IdService } from '@/core/IdService.js'; import { TwoFactorAuthenticationService } from '@/core/TwoFactorAuthenticationService.js'; import { DI } from '@/di-symbols.js'; @@ -34,10 +34,10 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.userProfilesRepository) - private userProfilesRepository: MiUserProfilesRepository, + private userProfilesRepository: UserProfilesRepository, @Inject(DI.attestationChallengesRepository) - private attestationChallengesRepository: MiAttestationChallengesRepository, + private attestationChallengesRepository: AttestationChallengesRepository, private idService: IdService, private twoFactorAuthenticationService: TwoFactorAuthenticationService, diff --git a/packages/backend/src/server/api/endpoints/i/2fa/register.ts b/packages/backend/src/server/api/endpoints/i/2fa/register.ts index cd92e9ddd5..0e57f07e5e 100644 --- a/packages/backend/src/server/api/endpoints/i/2fa/register.ts +++ b/packages/backend/src/server/api/endpoints/i/2fa/register.ts @@ -7,7 +7,7 @@ import bcrypt from 'bcryptjs'; import * as OTPAuth from 'otpauth'; import * as QRCode from 'qrcode'; import { Inject, Injectable } from '@nestjs/common'; -import type { MiUserProfilesRepository } from '@/models/index.js'; +import type { UserProfilesRepository } from '@/models/index.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import { DI } from '@/di-symbols.js'; import type { Config } from '@/config.js'; @@ -34,7 +34,7 @@ export default class extends Endpoint { private config: Config, @Inject(DI.userProfilesRepository) - private userProfilesRepository: MiUserProfilesRepository, + private userProfilesRepository: UserProfilesRepository, ) { super(meta, paramDef, async (ps, me) => { const profile = await this.userProfilesRepository.findOneByOrFail({ userId: me.id }); diff --git a/packages/backend/src/server/api/endpoints/i/2fa/remove-key.ts b/packages/backend/src/server/api/endpoints/i/2fa/remove-key.ts index 0701f0ee39..6402f3440f 100644 --- a/packages/backend/src/server/api/endpoints/i/2fa/remove-key.ts +++ b/packages/backend/src/server/api/endpoints/i/2fa/remove-key.ts @@ -6,7 +6,7 @@ import bcrypt from 'bcryptjs'; import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { MiUserProfilesRepository, MiUserSecurityKeysRepository } from '@/models/index.js'; +import type { UserProfilesRepository, UserSecurityKeysRepository } from '@/models/index.js'; import { UserEntityService } from '@/core/entities/UserEntityService.js'; import { GlobalEventService } from '@/core/GlobalEventService.js'; import { DI } from '@/di-symbols.js'; @@ -31,10 +31,10 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.userSecurityKeysRepository) - private userSecurityKeysRepository: MiUserSecurityKeysRepository, + private userSecurityKeysRepository: UserSecurityKeysRepository, @Inject(DI.userProfilesRepository) - private userProfilesRepository: MiUserProfilesRepository, + private userProfilesRepository: UserProfilesRepository, private userEntityService: UserEntityService, private globalEventService: GlobalEventService, diff --git a/packages/backend/src/server/api/endpoints/i/2fa/unregister.ts b/packages/backend/src/server/api/endpoints/i/2fa/unregister.ts index d93d623c23..c0e9ff5ec0 100644 --- a/packages/backend/src/server/api/endpoints/i/2fa/unregister.ts +++ b/packages/backend/src/server/api/endpoints/i/2fa/unregister.ts @@ -7,7 +7,7 @@ import bcrypt from 'bcryptjs'; import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import { UserEntityService } from '@/core/entities/UserEntityService.js'; -import type { MiUserProfilesRepository } from '@/models/index.js'; +import type { UserProfilesRepository } from '@/models/index.js'; import { GlobalEventService } from '@/core/GlobalEventService.js'; import { DI } from '@/di-symbols.js'; @@ -30,7 +30,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.userProfilesRepository) - private userProfilesRepository: MiUserProfilesRepository, + private userProfilesRepository: UserProfilesRepository, private userEntityService: UserEntityService, private globalEventService: GlobalEventService, diff --git a/packages/backend/src/server/api/endpoints/i/2fa/update-key.ts b/packages/backend/src/server/api/endpoints/i/2fa/update-key.ts index 0c6a493fe7..535644f007 100644 --- a/packages/backend/src/server/api/endpoints/i/2fa/update-key.ts +++ b/packages/backend/src/server/api/endpoints/i/2fa/update-key.ts @@ -6,7 +6,7 @@ import bcrypt from 'bcryptjs'; import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { MiUserSecurityKeysRepository } from '@/models/index.js'; +import type { UserSecurityKeysRepository } from '@/models/index.js'; import { UserEntityService } from '@/core/entities/UserEntityService.js'; import { GlobalEventService } from '@/core/GlobalEventService.js'; import { DI } from '@/di-symbols.js'; @@ -46,7 +46,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.userSecurityKeysRepository) - private userSecurityKeysRepository: MiUserSecurityKeysRepository, + private userSecurityKeysRepository: UserSecurityKeysRepository, private userEntityService: UserEntityService, private globalEventService: GlobalEventService, diff --git a/packages/backend/src/server/api/endpoints/i/apps.ts b/packages/backend/src/server/api/endpoints/i/apps.ts index 4d844fa144..24e80390c2 100644 --- a/packages/backend/src/server/api/endpoints/i/apps.ts +++ b/packages/backend/src/server/api/endpoints/i/apps.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { MiAccessTokensRepository } from '@/models/index.js'; +import type { AccessTokensRepository } from '@/models/index.js'; import { DI } from '@/di-symbols.js'; export const meta = { @@ -27,7 +27,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.accessTokensRepository) - private accessTokensRepository: MiAccessTokensRepository, + private accessTokensRepository: AccessTokensRepository, ) { super(meta, paramDef, async (ps, me) => { const query = this.accessTokensRepository.createQueryBuilder('token') diff --git a/packages/backend/src/server/api/endpoints/i/authorized-apps.ts b/packages/backend/src/server/api/endpoints/i/authorized-apps.ts index 3a8ba8c26b..1da5479c38 100644 --- a/packages/backend/src/server/api/endpoints/i/authorized-apps.ts +++ b/packages/backend/src/server/api/endpoints/i/authorized-apps.ts @@ -6,7 +6,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { IsNull, Not } from 'typeorm'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { MiAccessTokensRepository } from '@/models/index.js'; +import type { AccessTokensRepository } from '@/models/index.js'; import { AppEntityService } from '@/core/entities/AppEntityService.js'; import { DI } from '@/di-symbols.js'; @@ -31,7 +31,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.accessTokensRepository) - private accessTokensRepository: MiAccessTokensRepository, + private accessTokensRepository: AccessTokensRepository, private appEntityService: AppEntityService, ) { diff --git a/packages/backend/src/server/api/endpoints/i/change-password.ts b/packages/backend/src/server/api/endpoints/i/change-password.ts index 7fc108530e..757a57caed 100644 --- a/packages/backend/src/server/api/endpoints/i/change-password.ts +++ b/packages/backend/src/server/api/endpoints/i/change-password.ts @@ -6,7 +6,7 @@ import bcrypt from 'bcryptjs'; import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { MiUserProfilesRepository } from '@/models/index.js'; +import type { UserProfilesRepository } from '@/models/index.js'; import { DI } from '@/di-symbols.js'; export const meta = { @@ -29,7 +29,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.userProfilesRepository) - private userProfilesRepository: MiUserProfilesRepository, + private userProfilesRepository: UserProfilesRepository, ) { super(meta, paramDef, async (ps, me) => { const profile = await this.userProfilesRepository.findOneByOrFail({ userId: me.id }); diff --git a/packages/backend/src/server/api/endpoints/i/delete-account.ts b/packages/backend/src/server/api/endpoints/i/delete-account.ts index bb89ac8804..721eb01c51 100644 --- a/packages/backend/src/server/api/endpoints/i/delete-account.ts +++ b/packages/backend/src/server/api/endpoints/i/delete-account.ts @@ -5,7 +5,7 @@ import bcrypt from 'bcryptjs'; import { Inject, Injectable } from '@nestjs/common'; -import type { MiUsersRepository, MiUserProfilesRepository } from '@/models/index.js'; +import type { UsersRepository, UserProfilesRepository } from '@/models/index.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import { DeleteAccountService } from '@/core/DeleteAccountService.js'; import { DI } from '@/di-symbols.js'; @@ -29,10 +29,10 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.usersRepository) - private usersRepository: MiUsersRepository, + private usersRepository: UsersRepository, @Inject(DI.userProfilesRepository) - private userProfilesRepository: MiUserProfilesRepository, + private userProfilesRepository: UserProfilesRepository, private deleteAccountService: DeleteAccountService, ) { diff --git a/packages/backend/src/server/api/endpoints/i/favorites.ts b/packages/backend/src/server/api/endpoints/i/favorites.ts index fd0d626183..d5b1959795 100644 --- a/packages/backend/src/server/api/endpoints/i/favorites.ts +++ b/packages/backend/src/server/api/endpoints/i/favorites.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { MiNoteFavoritesRepository } from '@/models/index.js'; +import type { NoteFavoritesRepository } from '@/models/index.js'; import { QueryService } from '@/core/QueryService.js'; import { NoteFavoriteEntityService } from '@/core/entities/NoteFavoriteEntityService.js'; import { DI } from '@/di-symbols.js'; @@ -43,7 +43,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.noteFavoritesRepository) - private noteFavoritesRepository: MiNoteFavoritesRepository, + private noteFavoritesRepository: NoteFavoritesRepository, private noteFavoriteEntityService: NoteFavoriteEntityService, private queryService: QueryService, diff --git a/packages/backend/src/server/api/endpoints/i/gallery/likes.ts b/packages/backend/src/server/api/endpoints/i/gallery/likes.ts index 9e5fcda2e7..5017d0695a 100644 --- a/packages/backend/src/server/api/endpoints/i/gallery/likes.ts +++ b/packages/backend/src/server/api/endpoints/i/gallery/likes.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { MiGalleryLikesRepository } from '@/models/index.js'; +import type { GalleryLikesRepository } from '@/models/index.js'; import { QueryService } from '@/core/QueryService.js'; import { GalleryLikeEntityService } from '@/core/entities/GalleryLikeEntityService.js'; import { DI } from '@/di-symbols.js'; @@ -54,7 +54,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.galleryLikesRepository) - private galleryLikesRepository: MiGalleryLikesRepository, + private galleryLikesRepository: GalleryLikesRepository, private galleryLikeEntityService: GalleryLikeEntityService, private queryService: QueryService, diff --git a/packages/backend/src/server/api/endpoints/i/gallery/posts.ts b/packages/backend/src/server/api/endpoints/i/gallery/posts.ts index ce5d647f5f..4e846831bd 100644 --- a/packages/backend/src/server/api/endpoints/i/gallery/posts.ts +++ b/packages/backend/src/server/api/endpoints/i/gallery/posts.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { MiGalleryPostsRepository } from '@/models/index.js'; +import type { GalleryPostsRepository } from '@/models/index.js'; import { QueryService } from '@/core/QueryService.js'; import { GalleryPostEntityService } from '@/core/entities/GalleryPostEntityService.js'; import { DI } from '@/di-symbols.js'; @@ -43,7 +43,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.galleryPostsRepository) - private galleryPostsRepository: MiGalleryPostsRepository, + private galleryPostsRepository: GalleryPostsRepository, private galleryPostEntityService: GalleryPostEntityService, private queryService: QueryService, diff --git a/packages/backend/src/server/api/endpoints/i/get-word-muted-notes-count.ts b/packages/backend/src/server/api/endpoints/i/get-word-muted-notes-count.ts index f454e60106..4022933360 100644 --- a/packages/backend/src/server/api/endpoints/i/get-word-muted-notes-count.ts +++ b/packages/backend/src/server/api/endpoints/i/get-word-muted-notes-count.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { MiMutedNotesRepository } from '@/models/index.js'; +import type { MutedNotesRepository } from '@/models/index.js'; import { DI } from '@/di-symbols.js'; export const meta = { @@ -38,7 +38,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.mutedNotesRepository) - private mutedNotesRepository: MiMutedNotesRepository, + private mutedNotesRepository: MutedNotesRepository, ) { super(meta, paramDef, async (ps, me) => { return { diff --git a/packages/backend/src/server/api/endpoints/i/import-antennas.ts b/packages/backend/src/server/api/endpoints/i/import-antennas.ts index 361bc4d427..8feb0007a0 100644 --- a/packages/backend/src/server/api/endpoints/i/import-antennas.ts +++ b/packages/backend/src/server/api/endpoints/i/import-antennas.ts @@ -7,7 +7,7 @@ import { Inject, Injectable } from '@nestjs/common'; import ms from 'ms'; import { Endpoint } from '@/server/api/endpoint-base.js'; import { QueueService } from '@/core/QueueService.js'; -import type { MiAntennasRepository, MiDriveFilesRepository, MiUsersRepository, MiAntenna as _Antenna } from '@/models/index.js'; +import type { AntennasRepository, DriveFilesRepository, UsersRepository, MiAntenna as _Antenna } from '@/models/index.js'; import { DI } from '@/di-symbols.js'; import { RoleService } from '@/core/RoleService.js'; import { DownloadService } from '@/core/DownloadService.js'; @@ -58,13 +58,13 @@ export const paramDef = { export default class extends Endpoint { constructor ( @Inject(DI.driveFilesRepository) - private driveFilesRepository: MiDriveFilesRepository, + private driveFilesRepository: DriveFilesRepository, @Inject(DI.antennasRepository) - private antennasRepository: MiAntennasRepository, + private antennasRepository: AntennasRepository, @Inject(DI.usersRepository) - private usersRepository: MiUsersRepository, + private usersRepository: UsersRepository, private roleService: RoleService, private queueService: QueueService, 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 28d7684d45..37d550c330 100644 --- a/packages/backend/src/server/api/endpoints/i/import-blocking.ts +++ b/packages/backend/src/server/api/endpoints/i/import-blocking.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 type { MiDriveFilesRepository } from '@/models/index.js'; +import type { DriveFilesRepository } from '@/models/index.js'; import { DI } from '@/di-symbols.js'; import { ApiError } from '../../error.js'; @@ -62,7 +62,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.driveFilesRepository) - private driveFilesRepository: MiDriveFilesRepository, + private driveFilesRepository: DriveFilesRepository, private queueService: QueueService, private accountMoveService: AccountMoveService, 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 ab178f6666..b29a361d0d 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 type { MiDriveFilesRepository } from '@/models/index.js'; +import type { DriveFilesRepository } from '@/models/index.js'; import { DI } from '@/di-symbols.js'; import { ApiError } from '../../error.js'; @@ -61,7 +61,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.driveFilesRepository) - private driveFilesRepository: MiDriveFilesRepository, + private driveFilesRepository: DriveFilesRepository, private queueService: QueueService, private accountMoveService: AccountMoveService, 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 6ae9644944..b148f60d86 100644 --- a/packages/backend/src/server/api/endpoints/i/import-muting.ts +++ b/packages/backend/src/server/api/endpoints/i/import-muting.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 type { MiDriveFilesRepository } from '@/models/index.js'; +import type { DriveFilesRepository } from '@/models/index.js'; import { DI } from '@/di-symbols.js'; import { ApiError } from '../../error.js'; @@ -62,7 +62,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.driveFilesRepository) - private driveFilesRepository: MiDriveFilesRepository, + private driveFilesRepository: DriveFilesRepository, private queueService: QueueService, private accountMoveService: AccountMoveService, 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 825fef8b5f..9cf54d17bf 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 @@ -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 type { MiDriveFilesRepository } from '@/models/index.js'; +import type { DriveFilesRepository } from '@/models/index.js'; import { DI } from '@/di-symbols.js'; import { ApiError } from '../../error.js'; @@ -61,7 +61,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.driveFilesRepository) - private driveFilesRepository: MiDriveFilesRepository, + private driveFilesRepository: DriveFilesRepository, private queueService: QueueService, private accountMoveService: AccountMoveService, diff --git a/packages/backend/src/server/api/endpoints/i/notifications.ts b/packages/backend/src/server/api/endpoints/i/notifications.ts index 4fdca52f46..a46abb87d8 100644 --- a/packages/backend/src/server/api/endpoints/i/notifications.ts +++ b/packages/backend/src/server/api/endpoints/i/notifications.ts @@ -6,7 +6,7 @@ import { Brackets, In } from 'typeorm'; import * as Redis from 'ioredis'; import { Inject, Injectable } from '@nestjs/common'; -import type { MiNotesRepository } from '@/models/index.js'; +import type { NotesRepository } from '@/models/index.js'; import { obsoleteNotificationTypes, notificationTypes } from '@/types.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import { NoteReadService } from '@/core/NoteReadService.js'; @@ -65,7 +65,7 @@ export default class extends Endpoint { private redisClient: Redis.Redis, @Inject(DI.notesRepository) - private notesRepository: MiNotesRepository, + private notesRepository: NotesRepository, private idService: IdService, private notificationEntityService: NotificationEntityService, diff --git a/packages/backend/src/server/api/endpoints/i/page-likes.ts b/packages/backend/src/server/api/endpoints/i/page-likes.ts index 196f98317b..7510348260 100644 --- a/packages/backend/src/server/api/endpoints/i/page-likes.ts +++ b/packages/backend/src/server/api/endpoints/i/page-likes.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { MiPageLikesRepository } from '@/models/index.js'; +import type { PageLikesRepository } from '@/models/index.js'; import { QueryService } from '@/core/QueryService.js'; import { PageLikeEntityService } from '@/core/entities/PageLikeEntityService.js'; import { DI } from '@/di-symbols.js'; @@ -53,7 +53,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.pageLikesRepository) - private pageLikesRepository: MiPageLikesRepository, + private pageLikesRepository: PageLikesRepository, private pageLikeEntityService: PageLikeEntityService, private queryService: QueryService, diff --git a/packages/backend/src/server/api/endpoints/i/pages.ts b/packages/backend/src/server/api/endpoints/i/pages.ts index a06cbc5fd5..489956b562 100644 --- a/packages/backend/src/server/api/endpoints/i/pages.ts +++ b/packages/backend/src/server/api/endpoints/i/pages.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { MiPagesRepository } from '@/models/index.js'; +import type { PagesRepository } from '@/models/index.js'; import { QueryService } from '@/core/QueryService.js'; import { PageEntityService } from '@/core/entities/PageEntityService.js'; import { DI } from '@/di-symbols.js'; @@ -43,7 +43,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.pagesRepository) - private pagesRepository: MiPagesRepository, + private pagesRepository: PagesRepository, private pageEntityService: PageEntityService, private queryService: QueryService, diff --git a/packages/backend/src/server/api/endpoints/i/read-all-unread-notes.ts b/packages/backend/src/server/api/endpoints/i/read-all-unread-notes.ts index 538830d187..d7ca50ebf6 100644 --- a/packages/backend/src/server/api/endpoints/i/read-all-unread-notes.ts +++ b/packages/backend/src/server/api/endpoints/i/read-all-unread-notes.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { MiNoteUnreadsRepository } from '@/models/index.js'; +import type { NoteUnreadsRepository } from '@/models/index.js'; import { GlobalEventService } from '@/core/GlobalEventService.js'; import { DI } from '@/di-symbols.js'; @@ -28,7 +28,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.noteUnreadsRepository) - private noteUnreadsRepository: MiNoteUnreadsRepository, + private noteUnreadsRepository: NoteUnreadsRepository, private globalEventService: GlobalEventService, ) { diff --git a/packages/backend/src/server/api/endpoints/i/regenerate-token.ts b/packages/backend/src/server/api/endpoints/i/regenerate-token.ts index fa03bbf239..190ce6e6ff 100644 --- a/packages/backend/src/server/api/endpoints/i/regenerate-token.ts +++ b/packages/backend/src/server/api/endpoints/i/regenerate-token.ts @@ -6,7 +6,7 @@ import bcrypt from 'bcryptjs'; import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { MiUsersRepository, MiUserProfilesRepository } from '@/models/index.js'; +import type { UsersRepository, UserProfilesRepository } from '@/models/index.js'; import generateUserToken from '@/misc/generate-native-user-token.js'; import { GlobalEventService } from '@/core/GlobalEventService.js'; import { DI } from '@/di-symbols.js'; @@ -30,10 +30,10 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.usersRepository) - private usersRepository: MiUsersRepository, + private usersRepository: UsersRepository, @Inject(DI.userProfilesRepository) - private userProfilesRepository: MiUserProfilesRepository, + private userProfilesRepository: UserProfilesRepository, private globalEventService: GlobalEventService, ) { diff --git a/packages/backend/src/server/api/endpoints/i/registry/get-all.ts b/packages/backend/src/server/api/endpoints/i/registry/get-all.ts index 5ee4b68297..293b67ae67 100644 --- a/packages/backend/src/server/api/endpoints/i/registry/get-all.ts +++ b/packages/backend/src/server/api/endpoints/i/registry/get-all.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { MiRegistryItemsRepository } from '@/models/index.js'; +import type { RegistryItemsRepository } from '@/models/index.js'; import { DI } from '@/di-symbols.js'; export const meta = { @@ -29,7 +29,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.registryItemsRepository) - private registryItemsRepository: MiRegistryItemsRepository, + private registryItemsRepository: RegistryItemsRepository, ) { super(meta, paramDef, async (ps, me) => { const query = this.registryItemsRepository.createQueryBuilder('item') diff --git a/packages/backend/src/server/api/endpoints/i/registry/get-detail.ts b/packages/backend/src/server/api/endpoints/i/registry/get-detail.ts index 923fa1d6c6..77cc7bab7c 100644 --- a/packages/backend/src/server/api/endpoints/i/registry/get-detail.ts +++ b/packages/backend/src/server/api/endpoints/i/registry/get-detail.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { MiRegistryItemsRepository } from '@/models/index.js'; +import type { RegistryItemsRepository } from '@/models/index.js'; import { DI } from '@/di-symbols.js'; import { ApiError } from '../../../error.js'; @@ -39,7 +39,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.registryItemsRepository) - private registryItemsRepository: MiRegistryItemsRepository, + private registryItemsRepository: RegistryItemsRepository, ) { super(meta, paramDef, async (ps, me) => { const query = this.registryItemsRepository.createQueryBuilder('item') diff --git a/packages/backend/src/server/api/endpoints/i/registry/get.ts b/packages/backend/src/server/api/endpoints/i/registry/get.ts index a041b41dc2..9b9d943e63 100644 --- a/packages/backend/src/server/api/endpoints/i/registry/get.ts +++ b/packages/backend/src/server/api/endpoints/i/registry/get.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { MiRegistryItemsRepository } from '@/models/index.js'; +import type { RegistryItemsRepository } from '@/models/index.js'; import { DI } from '@/di-symbols.js'; import { ApiError } from '../../../error.js'; @@ -39,7 +39,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.registryItemsRepository) - private registryItemsRepository: MiRegistryItemsRepository, + private registryItemsRepository: RegistryItemsRepository, ) { super(meta, paramDef, async (ps, me) => { const query = this.registryItemsRepository.createQueryBuilder('item') diff --git a/packages/backend/src/server/api/endpoints/i/registry/keys-with-type.ts b/packages/backend/src/server/api/endpoints/i/registry/keys-with-type.ts index 266152b235..39b34de108 100644 --- a/packages/backend/src/server/api/endpoints/i/registry/keys-with-type.ts +++ b/packages/backend/src/server/api/endpoints/i/registry/keys-with-type.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { MiRegistryItemsRepository } from '@/models/index.js'; +import type { RegistryItemsRepository } from '@/models/index.js'; import { DI } from '@/di-symbols.js'; export const meta = { @@ -29,7 +29,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.registryItemsRepository) - private registryItemsRepository: MiRegistryItemsRepository, + private registryItemsRepository: RegistryItemsRepository, ) { super(meta, paramDef, async (ps, me) => { const query = this.registryItemsRepository.createQueryBuilder('item') diff --git a/packages/backend/src/server/api/endpoints/i/registry/keys.ts b/packages/backend/src/server/api/endpoints/i/registry/keys.ts index b21d08e588..2becd1040a 100644 --- a/packages/backend/src/server/api/endpoints/i/registry/keys.ts +++ b/packages/backend/src/server/api/endpoints/i/registry/keys.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { MiRegistryItemsRepository } from '@/models/index.js'; +import type { RegistryItemsRepository } from '@/models/index.js'; import { DI } from '@/di-symbols.js'; export const meta = { @@ -29,7 +29,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.registryItemsRepository) - private registryItemsRepository: MiRegistryItemsRepository, + private registryItemsRepository: RegistryItemsRepository, ) { super(meta, paramDef, async (ps, me) => { const query = this.registryItemsRepository.createQueryBuilder('item') diff --git a/packages/backend/src/server/api/endpoints/i/registry/remove.ts b/packages/backend/src/server/api/endpoints/i/registry/remove.ts index fa30ac64ef..633d47eb21 100644 --- a/packages/backend/src/server/api/endpoints/i/registry/remove.ts +++ b/packages/backend/src/server/api/endpoints/i/registry/remove.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { MiRegistryItemsRepository } from '@/models/index.js'; +import type { RegistryItemsRepository } from '@/models/index.js'; import { DI } from '@/di-symbols.js'; import { ApiError } from '../../../error.js'; @@ -39,7 +39,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.registryItemsRepository) - private registryItemsRepository: MiRegistryItemsRepository, + private registryItemsRepository: RegistryItemsRepository, ) { super(meta, paramDef, async (ps, me) => { const query = this.registryItemsRepository.createQueryBuilder('item') diff --git a/packages/backend/src/server/api/endpoints/i/registry/scopes.ts b/packages/backend/src/server/api/endpoints/i/registry/scopes.ts index b94c629f2f..7cf95926fb 100644 --- a/packages/backend/src/server/api/endpoints/i/registry/scopes.ts +++ b/packages/backend/src/server/api/endpoints/i/registry/scopes.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { MiRegistryItemsRepository } from '@/models/index.js'; +import type { RegistryItemsRepository } from '@/models/index.js'; import { DI } from '@/di-symbols.js'; export const meta = { @@ -25,7 +25,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.registryItemsRepository) - private registryItemsRepository: MiRegistryItemsRepository, + private registryItemsRepository: RegistryItemsRepository, ) { super(meta, paramDef, async (ps, me) => { const query = this.registryItemsRepository.createQueryBuilder('item') diff --git a/packages/backend/src/server/api/endpoints/i/registry/set.ts b/packages/backend/src/server/api/endpoints/i/registry/set.ts index 430c0843ed..ac51ab17f6 100644 --- a/packages/backend/src/server/api/endpoints/i/registry/set.ts +++ b/packages/backend/src/server/api/endpoints/i/registry/set.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { MiRegistryItemsRepository } from '@/models/index.js'; +import type { RegistryItemsRepository } from '@/models/index.js'; import { IdService } from '@/core/IdService.js'; import { GlobalEventService } from '@/core/GlobalEventService.js'; import { DI } from '@/di-symbols.js'; @@ -33,7 +33,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.registryItemsRepository) - private registryItemsRepository: MiRegistryItemsRepository, + private registryItemsRepository: RegistryItemsRepository, private idService: IdService, private globalEventService: GlobalEventService, diff --git a/packages/backend/src/server/api/endpoints/i/revoke-token.ts b/packages/backend/src/server/api/endpoints/i/revoke-token.ts index 4d3cbafb45..76f83019b1 100644 --- a/packages/backend/src/server/api/endpoints/i/revoke-token.ts +++ b/packages/backend/src/server/api/endpoints/i/revoke-token.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { MiAccessTokensRepository } from '@/models/index.js'; +import type { AccessTokensRepository } from '@/models/index.js'; import { DI } from '@/di-symbols.js'; export const meta = { @@ -27,7 +27,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.accessTokensRepository) - private accessTokensRepository: MiAccessTokensRepository, + private accessTokensRepository: AccessTokensRepository, ) { super(meta, paramDef, async (ps, me) => { const tokenExist = await this.accessTokensRepository.exist({ where: { id: ps.tokenId } }); diff --git a/packages/backend/src/server/api/endpoints/i/signin-history.ts b/packages/backend/src/server/api/endpoints/i/signin-history.ts index c320b4ada6..55dca98ad8 100644 --- a/packages/backend/src/server/api/endpoints/i/signin-history.ts +++ b/packages/backend/src/server/api/endpoints/i/signin-history.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { MiSigninsRepository } from '@/models/index.js'; +import type { SigninsRepository } from '@/models/index.js'; import { QueryService } from '@/core/QueryService.js'; import { SigninEntityService } from '@/core/entities/SigninEntityService.js'; import { DI } from '@/di-symbols.js'; @@ -31,7 +31,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.signinsRepository) - private signinsRepository: MiSigninsRepository, + private signinsRepository: SigninsRepository, private signinEntityService: SigninEntityService, private queryService: QueryService, diff --git a/packages/backend/src/server/api/endpoints/i/update-email.ts b/packages/backend/src/server/api/endpoints/i/update-email.ts index 8b7ea7ca58..674d41c56f 100644 --- a/packages/backend/src/server/api/endpoints/i/update-email.ts +++ b/packages/backend/src/server/api/endpoints/i/update-email.ts @@ -7,7 +7,7 @@ import { Inject, Injectable } from '@nestjs/common'; import ms from 'ms'; import bcrypt from 'bcryptjs'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { MiUserProfilesRepository } from '@/models/index.js'; +import type { UserProfilesRepository } from '@/models/index.js'; import { UserEntityService } from '@/core/entities/UserEntityService.js'; import { EmailService } from '@/core/EmailService.js'; import type { Config } from '@/config.js'; @@ -58,7 +58,7 @@ export default class extends Endpoint { private config: Config, @Inject(DI.userProfilesRepository) - private userProfilesRepository: MiUserProfilesRepository, + private userProfilesRepository: UserProfilesRepository, private userEntityService: UserEntityService, private emailService: EmailService, diff --git a/packages/backend/src/server/api/endpoints/i/update.ts b/packages/backend/src/server/api/endpoints/i/update.ts index b4809099d4..0ea662d461 100644 --- a/packages/backend/src/server/api/endpoints/i/update.ts +++ b/packages/backend/src/server/api/endpoints/i/update.ts @@ -9,7 +9,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { extractCustomEmojisFromMfm } from '@/misc/extract-custom-emojis-from-mfm.js'; import { extractHashtags } from '@/misc/extract-hashtags.js'; import * as Acct from '@/misc/acct.js'; -import type { MiUsersRepository, MiDriveFilesRepository, MiUserProfilesRepository, MiPagesRepository } from '@/models/index.js'; +import type { UsersRepository, DriveFilesRepository, UserProfilesRepository, PagesRepository } from '@/models/index.js'; import type { MiUser } from '@/models/entities/User.js'; import { birthdaySchema, descriptionSchema, locationSchema, nameSchema } from '@/models/entities/User.js'; import type { MiUserProfile } from '@/models/entities/UserProfile.js'; @@ -175,16 +175,16 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.usersRepository) - private usersRepository: MiUsersRepository, + private usersRepository: UsersRepository, @Inject(DI.userProfilesRepository) - private userProfilesRepository: MiUserProfilesRepository, + private userProfilesRepository: UserProfilesRepository, @Inject(DI.driveFilesRepository) - private driveFilesRepository: MiDriveFilesRepository, + private driveFilesRepository: DriveFilesRepository, @Inject(DI.pagesRepository) - private pagesRepository: MiPagesRepository, + private pagesRepository: PagesRepository, private userEntityService: UserEntityService, private driveFileEntityService: DriveFileEntityService, diff --git a/packages/backend/src/server/api/endpoints/i/webhooks/create.ts b/packages/backend/src/server/api/endpoints/i/webhooks/create.ts index 6262eb1262..38a52c5cfd 100644 --- a/packages/backend/src/server/api/endpoints/i/webhooks/create.ts +++ b/packages/backend/src/server/api/endpoints/i/webhooks/create.ts @@ -6,7 +6,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import { IdService } from '@/core/IdService.js'; -import type { MiWebhooksRepository } from '@/models/index.js'; +import type { WebhooksRepository } from '@/models/index.js'; import { webhookEventTypes } from '@/models/entities/Webhook.js'; import { GlobalEventService } from '@/core/GlobalEventService.js'; import { DI } from '@/di-symbols.js'; @@ -49,7 +49,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.webhooksRepository) - private webhooksRepository: MiWebhooksRepository, + private webhooksRepository: WebhooksRepository, private idService: IdService, private globalEventService: GlobalEventService, diff --git a/packages/backend/src/server/api/endpoints/i/webhooks/delete.ts b/packages/backend/src/server/api/endpoints/i/webhooks/delete.ts index 0f4adee999..9d674ec020 100644 --- a/packages/backend/src/server/api/endpoints/i/webhooks/delete.ts +++ b/packages/backend/src/server/api/endpoints/i/webhooks/delete.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { MiWebhooksRepository } from '@/models/index.js'; +import type { WebhooksRepository } from '@/models/index.js'; import { GlobalEventService } from '@/core/GlobalEventService.js'; import { DI } from '@/di-symbols.js'; import { ApiError } from '../../../error.js'; @@ -41,7 +41,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.webhooksRepository) - private webhooksRepository: MiWebhooksRepository, + private webhooksRepository: WebhooksRepository, private globalEventService: GlobalEventService, ) { diff --git a/packages/backend/src/server/api/endpoints/i/webhooks/list.ts b/packages/backend/src/server/api/endpoints/i/webhooks/list.ts index 065a1831b7..7cf03bf25f 100644 --- a/packages/backend/src/server/api/endpoints/i/webhooks/list.ts +++ b/packages/backend/src/server/api/endpoints/i/webhooks/list.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { MiWebhooksRepository } from '@/models/index.js'; +import type { WebhooksRepository } from '@/models/index.js'; import { DI } from '@/di-symbols.js'; export const meta = { @@ -27,7 +27,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.webhooksRepository) - private webhooksRepository: MiWebhooksRepository, + private webhooksRepository: WebhooksRepository, ) { super(meta, paramDef, async (ps, me) => { const webhooks = await this.webhooksRepository.findBy({ diff --git a/packages/backend/src/server/api/endpoints/i/webhooks/show.ts b/packages/backend/src/server/api/endpoints/i/webhooks/show.ts index 7b5f8b1697..fbeaa38f86 100644 --- a/packages/backend/src/server/api/endpoints/i/webhooks/show.ts +++ b/packages/backend/src/server/api/endpoints/i/webhooks/show.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { MiWebhooksRepository } from '@/models/index.js'; +import type { WebhooksRepository } from '@/models/index.js'; import { DI } from '@/di-symbols.js'; import { ApiError } from '../../../error.js'; @@ -38,7 +38,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.webhooksRepository) - private webhooksRepository: MiWebhooksRepository, + private webhooksRepository: WebhooksRepository, ) { super(meta, paramDef, async (ps, me) => { const webhook = await this.webhooksRepository.findOneBy({ diff --git a/packages/backend/src/server/api/endpoints/i/webhooks/update.ts b/packages/backend/src/server/api/endpoints/i/webhooks/update.ts index 143b226d3e..d6b84c50b3 100644 --- a/packages/backend/src/server/api/endpoints/i/webhooks/update.ts +++ b/packages/backend/src/server/api/endpoints/i/webhooks/update.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { MiWebhooksRepository } from '@/models/index.js'; +import type { WebhooksRepository } from '@/models/index.js'; import { webhookEventTypes } from '@/models/entities/Webhook.js'; import { GlobalEventService } from '@/core/GlobalEventService.js'; import { DI } from '@/di-symbols.js'; @@ -50,7 +50,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.webhooksRepository) - private webhooksRepository: MiWebhooksRepository, + private webhooksRepository: WebhooksRepository, private globalEventService: GlobalEventService, ) { diff --git a/packages/backend/src/server/api/endpoints/invite/create.ts b/packages/backend/src/server/api/endpoints/invite/create.ts index 50aac9e577..eca3989ffc 100644 --- a/packages/backend/src/server/api/endpoints/invite/create.ts +++ b/packages/backend/src/server/api/endpoints/invite/create.ts @@ -6,7 +6,7 @@ import { MoreThan } from 'typeorm'; import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { MiRegistrationTicketsRepository } from '@/models/index.js'; +import type { RegistrationTicketsRepository } from '@/models/index.js'; import { InviteCodeEntityService } from '@/core/entities/InviteCodeEntityService.js'; import { IdService } from '@/core/IdService.js'; import { RoleService } from '@/core/RoleService.js'; @@ -52,7 +52,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.registrationTicketsRepository) - private registrationTicketsRepository: MiRegistrationTicketsRepository, + private registrationTicketsRepository: RegistrationTicketsRepository, private inviteCodeEntityService: InviteCodeEntityService, private idService: IdService, diff --git a/packages/backend/src/server/api/endpoints/invite/delete.ts b/packages/backend/src/server/api/endpoints/invite/delete.ts index 3b78b19cbd..901efd5237 100644 --- a/packages/backend/src/server/api/endpoints/invite/delete.ts +++ b/packages/backend/src/server/api/endpoints/invite/delete.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { MiRegistrationTicketsRepository } from '@/models/index.js'; +import type { RegistrationTicketsRepository } from '@/models/index.js'; import { RoleService } from '@/core/RoleService.js'; import { DI } from '@/di-symbols.js'; import { ApiError } from '../../error.js'; @@ -50,7 +50,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.registrationTicketsRepository) - private registrationTicketsRepository: MiRegistrationTicketsRepository, + private registrationTicketsRepository: RegistrationTicketsRepository, private roleService: RoleService, ) { diff --git a/packages/backend/src/server/api/endpoints/invite/limit.ts b/packages/backend/src/server/api/endpoints/invite/limit.ts index eed3506180..87552ff5d3 100644 --- a/packages/backend/src/server/api/endpoints/invite/limit.ts +++ b/packages/backend/src/server/api/endpoints/invite/limit.ts @@ -6,7 +6,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { MoreThan } from 'typeorm'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { MiRegistrationTicketsRepository } from '@/models/index.js'; +import type { RegistrationTicketsRepository } from '@/models/index.js'; import { RoleService } from '@/core/RoleService.js'; import { DI } from '@/di-symbols.js'; @@ -39,7 +39,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.registrationTicketsRepository) - private registrationTicketsRepository: MiRegistrationTicketsRepository, + private registrationTicketsRepository: RegistrationTicketsRepository, private roleService: RoleService, ) { diff --git a/packages/backend/src/server/api/endpoints/invite/list.ts b/packages/backend/src/server/api/endpoints/invite/list.ts index 387b193c04..f4fa82bc83 100644 --- a/packages/backend/src/server/api/endpoints/invite/list.ts +++ b/packages/backend/src/server/api/endpoints/invite/list.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { MiRegistrationTicketsRepository } from '@/models/index.js'; +import type { RegistrationTicketsRepository } from '@/models/index.js'; import { InviteCodeEntityService } from '@/core/entities/InviteCodeEntityService.js'; import { QueryService } from '@/core/QueryService.js'; import { DI } from '@/di-symbols.js'; @@ -42,7 +42,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.registrationTicketsRepository) - private registrationTicketsRepository: MiRegistrationTicketsRepository, + private registrationTicketsRepository: RegistrationTicketsRepository, private inviteCodeEntityService: InviteCodeEntityService, private queryService: QueryService, diff --git a/packages/backend/src/server/api/endpoints/meta.ts b/packages/backend/src/server/api/endpoints/meta.ts index fb13e2c05c..f6f4855346 100644 --- a/packages/backend/src/server/api/endpoints/meta.ts +++ b/packages/backend/src/server/api/endpoints/meta.ts @@ -6,7 +6,7 @@ import { IsNull, LessThanOrEqual, MoreThan, Brackets } from 'typeorm'; import { Inject, Injectable } from '@nestjs/common'; import JSON5 from 'json5'; -import type { MiAdsRepository, MiUsersRepository } from '@/models/index.js'; +import type { AdsRepository, UsersRepository } from '@/models/index.js'; import { MAX_NOTE_TEXT_LENGTH } from '@/const.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import { UserEntityService } from '@/core/entities/UserEntityService.js'; @@ -261,10 +261,10 @@ export default class extends Endpoint { private config: Config, @Inject(DI.usersRepository) - private usersRepository: MiUsersRepository, + private usersRepository: UsersRepository, @Inject(DI.adsRepository) - private adsRepository: MiAdsRepository, + private adsRepository: AdsRepository, private userEntityService: UserEntityService, private metaService: MetaService, 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 32569db769..a194b22fbf 100644 --- a/packages/backend/src/server/api/endpoints/miauth/gen-token.ts +++ b/packages/backend/src/server/api/endpoints/miauth/gen-token.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { MiAccessTokensRepository } from '@/models/index.js'; +import type { AccessTokensRepository } from '@/models/index.js'; import { IdService } from '@/core/IdService.js'; import { secureRndstr } from '@/misc/secure-rndstr.js'; import { DI } from '@/di-symbols.js'; @@ -48,7 +48,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.accessTokensRepository) - private accessTokensRepository: MiAccessTokensRepository, + private accessTokensRepository: AccessTokensRepository, private idService: IdService, ) { diff --git a/packages/backend/src/server/api/endpoints/mute/create.ts b/packages/backend/src/server/api/endpoints/mute/create.ts index f5c987d859..b74eb6733e 100644 --- a/packages/backend/src/server/api/endpoints/mute/create.ts +++ b/packages/backend/src/server/api/endpoints/mute/create.ts @@ -6,7 +6,7 @@ import { Inject, Injectable } from '@nestjs/common'; import ms from 'ms'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { MiMutingsRepository } from '@/models/index.js'; +import type { MutingsRepository } from '@/models/index.js'; import { DI } from '@/di-symbols.js'; import { GetterService } from '@/server/api/GetterService.js'; import { UserMutingService } from '@/core/UserMutingService.js'; @@ -64,7 +64,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.mutingsRepository) - private mutingsRepository: MiMutingsRepository, + private mutingsRepository: MutingsRepository, private getterService: GetterService, private userMutingService: UserMutingService, diff --git a/packages/backend/src/server/api/endpoints/mute/delete.ts b/packages/backend/src/server/api/endpoints/mute/delete.ts index 2cb9be1196..13e0018315 100644 --- a/packages/backend/src/server/api/endpoints/mute/delete.ts +++ b/packages/backend/src/server/api/endpoints/mute/delete.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { MiMutingsRepository } from '@/models/index.js'; +import type { MutingsRepository } from '@/models/index.js'; import { DI } from '@/di-symbols.js'; import { GetterService } from '@/server/api/GetterService.js'; import { UserMutingService } from '@/core/UserMutingService.js'; @@ -52,7 +52,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.mutingsRepository) - private mutingsRepository: MiMutingsRepository, + private mutingsRepository: MutingsRepository, private userMutingService: UserMutingService, private getterService: GetterService, diff --git a/packages/backend/src/server/api/endpoints/mute/list.ts b/packages/backend/src/server/api/endpoints/mute/list.ts index 1831138d3f..b458c7fd70 100644 --- a/packages/backend/src/server/api/endpoints/mute/list.ts +++ b/packages/backend/src/server/api/endpoints/mute/list.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { MiMutingsRepository } from '@/models/index.js'; +import type { MutingsRepository } from '@/models/index.js'; import { QueryService } from '@/core/QueryService.js'; import { MutingEntityService } from '@/core/entities/MutingEntityService.js'; import { DI } from '@/di-symbols.js'; @@ -43,7 +43,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.mutingsRepository) - private mutingsRepository: MiMutingsRepository, + private mutingsRepository: MutingsRepository, private mutingEntityService: MutingEntityService, private queryService: QueryService, diff --git a/packages/backend/src/server/api/endpoints/my/apps.ts b/packages/backend/src/server/api/endpoints/my/apps.ts index 14a7f7c397..37562ab9ed 100644 --- a/packages/backend/src/server/api/endpoints/my/apps.ts +++ b/packages/backend/src/server/api/endpoints/my/apps.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { MiAppsRepository } from '@/models/index.js'; +import type { AppsRepository } from '@/models/index.js'; import { AppEntityService } from '@/core/entities/AppEntityService.js'; import { DI } from '@/di-symbols.js'; @@ -39,7 +39,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.appsRepository) - private appsRepository: MiAppsRepository, + private appsRepository: AppsRepository, private appEntityService: AppEntityService, ) { diff --git a/packages/backend/src/server/api/endpoints/notes.ts b/packages/backend/src/server/api/endpoints/notes.ts index 6e665b3be5..2eea9c6a8f 100644 --- a/packages/backend/src/server/api/endpoints/notes.ts +++ b/packages/backend/src/server/api/endpoints/notes.ts @@ -4,7 +4,7 @@ */ import { Inject, Injectable } from '@nestjs/common'; -import type { MiNotesRepository } from '@/models/index.js'; +import type { NotesRepository } from '@/models/index.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import { QueryService } from '@/core/QueryService.js'; import { NoteEntityService } from '@/core/entities/NoteEntityService.js'; @@ -44,7 +44,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.notesRepository) - private notesRepository: MiNotesRepository, + private notesRepository: NotesRepository, private noteEntityService: NoteEntityService, private queryService: QueryService, diff --git a/packages/backend/src/server/api/endpoints/notes/children.ts b/packages/backend/src/server/api/endpoints/notes/children.ts index 1c96ef2669..c12af10a9d 100644 --- a/packages/backend/src/server/api/endpoints/notes/children.ts +++ b/packages/backend/src/server/api/endpoints/notes/children.ts @@ -5,7 +5,7 @@ import { Brackets } from 'typeorm'; import { Inject, Injectable } from '@nestjs/common'; -import type { MiNotesRepository } from '@/models/index.js'; +import type { NotesRepository } from '@/models/index.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import { QueryService } from '@/core/QueryService.js'; import { NoteEntityService } from '@/core/entities/NoteEntityService.js'; @@ -43,7 +43,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.notesRepository) - private notesRepository: MiNotesRepository, + private notesRepository: NotesRepository, private noteEntityService: NoteEntityService, private queryService: QueryService, diff --git a/packages/backend/src/server/api/endpoints/notes/clips.ts b/packages/backend/src/server/api/endpoints/notes/clips.ts index 048aae6f70..de36180110 100644 --- a/packages/backend/src/server/api/endpoints/notes/clips.ts +++ b/packages/backend/src/server/api/endpoints/notes/clips.ts @@ -5,7 +5,7 @@ import { In } from 'typeorm'; import { Inject, Injectable } from '@nestjs/common'; -import type { MiClipNotesRepository, MiClipsRepository } from '@/models/index.js'; +import type { ClipNotesRepository, ClipsRepository } from '@/models/index.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import { ClipEntityService } from '@/core/entities/ClipEntityService.js'; import { DI } from '@/di-symbols.js'; @@ -49,10 +49,10 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.clipsRepository) - private clipsRepository: MiClipsRepository, + private clipsRepository: ClipsRepository, @Inject(DI.clipNotesRepository) - private clipNotesRepository: MiClipNotesRepository, + private clipNotesRepository: ClipNotesRepository, private clipEntityService: ClipEntityService, private getterService: GetterService, diff --git a/packages/backend/src/server/api/endpoints/notes/conversation.ts b/packages/backend/src/server/api/endpoints/notes/conversation.ts index 2873346015..88bbf3a2ee 100644 --- a/packages/backend/src/server/api/endpoints/notes/conversation.ts +++ b/packages/backend/src/server/api/endpoints/notes/conversation.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import type { MiNote } from '@/models/entities/Note.js'; -import type { MiNotesRepository } from '@/models/index.js'; +import type { NotesRepository } from '@/models/index.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import { NoteEntityService } from '@/core/entities/NoteEntityService.js'; import { DI } from '@/di-symbols.js'; @@ -51,7 +51,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.notesRepository) - private notesRepository: MiNotesRepository, + private notesRepository: NotesRepository, private noteEntityService: NoteEntityService, private getterService: GetterService, diff --git a/packages/backend/src/server/api/endpoints/notes/create.ts b/packages/backend/src/server/api/endpoints/notes/create.ts index 1f472a5edd..1c53db9b3c 100644 --- a/packages/backend/src/server/api/endpoints/notes/create.ts +++ b/packages/backend/src/server/api/endpoints/notes/create.ts @@ -7,7 +7,7 @@ import ms from 'ms'; import { In } from 'typeorm'; import { Inject, Injectable } from '@nestjs/common'; import type { MiUser } from '@/models/entities/User.js'; -import type { MiUsersRepository, MiNotesRepository, MiBlockingsRepository, MiDriveFilesRepository, MiChannelsRepository } from '@/models/index.js'; +import type { UsersRepository, NotesRepository, BlockingsRepository, DriveFilesRepository, ChannelsRepository } from '@/models/index.js'; import type { MiDriveFile } from '@/models/entities/DriveFile.js'; import type { MiNote } from '@/models/entities/Note.js'; import type { MiChannel } from '@/models/entities/Channel.js'; @@ -167,19 +167,19 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.usersRepository) - private usersRepository: MiUsersRepository, + private usersRepository: UsersRepository, @Inject(DI.notesRepository) - private notesRepository: MiNotesRepository, + private notesRepository: NotesRepository, @Inject(DI.blockingsRepository) - private blockingsRepository: MiBlockingsRepository, + private blockingsRepository: BlockingsRepository, @Inject(DI.driveFilesRepository) - private driveFilesRepository: MiDriveFilesRepository, + private driveFilesRepository: DriveFilesRepository, @Inject(DI.channelsRepository) - private channelsRepository: MiChannelsRepository, + private channelsRepository: ChannelsRepository, private noteEntityService: NoteEntityService, private noteCreateService: NoteCreateService, diff --git a/packages/backend/src/server/api/endpoints/notes/delete.ts b/packages/backend/src/server/api/endpoints/notes/delete.ts index 514eef13d5..df4225746d 100644 --- a/packages/backend/src/server/api/endpoints/notes/delete.ts +++ b/packages/backend/src/server/api/endpoints/notes/delete.ts @@ -5,7 +5,7 @@ import ms from 'ms'; import { Inject, Injectable } from '@nestjs/common'; -import type { MiUsersRepository } from '@/models/index.js'; +import type { UsersRepository } from '@/models/index.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import { NoteDeleteService } from '@/core/NoteDeleteService.js'; import { DI } from '@/di-symbols.js'; @@ -54,7 +54,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.usersRepository) - private usersRepository: MiUsersRepository, + private usersRepository: UsersRepository, private getterService: GetterService, private roleService: RoleService, diff --git a/packages/backend/src/server/api/endpoints/notes/favorites/create.ts b/packages/backend/src/server/api/endpoints/notes/favorites/create.ts index bd4c18388f..fee398fb83 100644 --- a/packages/backend/src/server/api/endpoints/notes/favorites/create.ts +++ b/packages/backend/src/server/api/endpoints/notes/favorites/create.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import ms from 'ms'; -import type { MiNoteFavoritesRepository } from '@/models/index.js'; +import type { NoteFavoritesRepository } from '@/models/index.js'; import { IdService } from '@/core/IdService.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import { GetterService } from '@/server/api/GetterService.js'; @@ -54,7 +54,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.noteFavoritesRepository) - private noteFavoritesRepository: MiNoteFavoritesRepository, + private noteFavoritesRepository: NoteFavoritesRepository, private idService: IdService, private getterService: GetterService, diff --git a/packages/backend/src/server/api/endpoints/notes/favorites/delete.ts b/packages/backend/src/server/api/endpoints/notes/favorites/delete.ts index c36522ecb6..97f354f81b 100644 --- a/packages/backend/src/server/api/endpoints/notes/favorites/delete.ts +++ b/packages/backend/src/server/api/endpoints/notes/favorites/delete.ts @@ -7,7 +7,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import { GetterService } from '@/server/api/GetterService.js'; import { DI } from '@/di-symbols.js'; -import type { MiNoteFavoritesRepository } from '@/models/index.js'; +import type { NoteFavoritesRepository } from '@/models/index.js'; import { ApiError } from '../../../error.js'; export const meta = { @@ -45,7 +45,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.noteFavoritesRepository) - private noteFavoritesRepository: MiNoteFavoritesRepository, + private noteFavoritesRepository: NoteFavoritesRepository, private getterService: GetterService, ) { diff --git a/packages/backend/src/server/api/endpoints/notes/featured.ts b/packages/backend/src/server/api/endpoints/notes/featured.ts index 8c0d63878f..5ff9c916dc 100644 --- a/packages/backend/src/server/api/endpoints/notes/featured.ts +++ b/packages/backend/src/server/api/endpoints/notes/featured.ts @@ -4,7 +4,7 @@ */ import { Inject, Injectable } from '@nestjs/common'; -import type { MiNotesRepository } from '@/models/index.js'; +import type { NotesRepository } from '@/models/index.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import { QueryService } from '@/core/QueryService.js'; import { NoteEntityService } from '@/core/entities/NoteEntityService.js'; @@ -43,7 +43,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.notesRepository) - private notesRepository: MiNotesRepository, + private notesRepository: NotesRepository, private noteEntityService: NoteEntityService, private queryService: QueryService, diff --git a/packages/backend/src/server/api/endpoints/notes/global-timeline.ts b/packages/backend/src/server/api/endpoints/notes/global-timeline.ts index f7da2c6606..a6b0c72f58 100644 --- a/packages/backend/src/server/api/endpoints/notes/global-timeline.ts +++ b/packages/backend/src/server/api/endpoints/notes/global-timeline.ts @@ -4,7 +4,7 @@ */ import { Inject, Injectable } from '@nestjs/common'; -import type { MiNotesRepository } from '@/models/index.js'; +import type { NotesRepository } from '@/models/index.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import { QueryService } from '@/core/QueryService.js'; import { NoteEntityService } from '@/core/entities/NoteEntityService.js'; @@ -54,7 +54,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.notesRepository) - private notesRepository: MiNotesRepository, + private notesRepository: NotesRepository, private noteEntityService: NoteEntityService, private queryService: QueryService, diff --git a/packages/backend/src/server/api/endpoints/notes/hybrid-timeline.ts b/packages/backend/src/server/api/endpoints/notes/hybrid-timeline.ts index 3612e1ac2c..a0256f6c03 100644 --- a/packages/backend/src/server/api/endpoints/notes/hybrid-timeline.ts +++ b/packages/backend/src/server/api/endpoints/notes/hybrid-timeline.ts @@ -5,7 +5,7 @@ import { Brackets } from 'typeorm'; import { Inject, Injectable } from '@nestjs/common'; -import type { MiNotesRepository, MiFollowingsRepository } from '@/models/index.js'; +import type { NotesRepository, FollowingsRepository } from '@/models/index.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import { QueryService } from '@/core/QueryService.js'; import ActiveUsersChart from '@/core/chart/charts/active-users.js'; @@ -61,10 +61,10 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.notesRepository) - private notesRepository: MiNotesRepository, + private notesRepository: NotesRepository, @Inject(DI.followingsRepository) - private followingsRepository: MiFollowingsRepository, + private followingsRepository: FollowingsRepository, private noteEntityService: NoteEntityService, private queryService: QueryService, diff --git a/packages/backend/src/server/api/endpoints/notes/local-timeline.ts b/packages/backend/src/server/api/endpoints/notes/local-timeline.ts index 28e933c8df..07404fd458 100644 --- a/packages/backend/src/server/api/endpoints/notes/local-timeline.ts +++ b/packages/backend/src/server/api/endpoints/notes/local-timeline.ts @@ -5,7 +5,7 @@ import { Brackets } from 'typeorm'; import { Inject, Injectable } from '@nestjs/common'; -import type { MiNotesRepository } from '@/models/index.js'; +import type { NotesRepository } from '@/models/index.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import { QueryService } from '@/core/QueryService.js'; import { NoteEntityService } from '@/core/entities/NoteEntityService.js'; @@ -60,7 +60,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.notesRepository) - private notesRepository: MiNotesRepository, + private notesRepository: NotesRepository, private noteEntityService: NoteEntityService, private queryService: QueryService, diff --git a/packages/backend/src/server/api/endpoints/notes/mentions.ts b/packages/backend/src/server/api/endpoints/notes/mentions.ts index cdb3603f22..6c2900a706 100644 --- a/packages/backend/src/server/api/endpoints/notes/mentions.ts +++ b/packages/backend/src/server/api/endpoints/notes/mentions.ts @@ -5,7 +5,7 @@ import { Brackets } from 'typeorm'; import { Inject, Injectable } from '@nestjs/common'; -import type { MiNotesRepository, MiFollowingsRepository } from '@/models/index.js'; +import type { NotesRepository, FollowingsRepository } from '@/models/index.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import { QueryService } from '@/core/QueryService.js'; import { NoteEntityService } from '@/core/entities/NoteEntityService.js'; @@ -45,10 +45,10 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.notesRepository) - private notesRepository: MiNotesRepository, + private notesRepository: NotesRepository, @Inject(DI.followingsRepository) - private followingsRepository: MiFollowingsRepository, + private followingsRepository: FollowingsRepository, private noteEntityService: NoteEntityService, private queryService: QueryService, 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 c9b542b666..9802ae0cab 100644 --- a/packages/backend/src/server/api/endpoints/notes/polls/recommendation.ts +++ b/packages/backend/src/server/api/endpoints/notes/polls/recommendation.ts @@ -5,7 +5,7 @@ import { Brackets, In } from 'typeorm'; import { Inject, Injectable } from '@nestjs/common'; -import type { MiNotesRepository, MiMutingsRepository, MiPollsRepository, MiPollVotesRepository } from '@/models/index.js'; +import type { NotesRepository, MutingsRepository, PollsRepository, PollVotesRepository } from '@/models/index.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import { NoteEntityService } from '@/core/entities/NoteEntityService.js'; import { DI } from '@/di-symbols.js'; @@ -40,16 +40,16 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.notesRepository) - private notesRepository: MiNotesRepository, + private notesRepository: NotesRepository, @Inject(DI.pollsRepository) - private pollsRepository: MiPollsRepository, + private pollsRepository: PollsRepository, @Inject(DI.pollVotesRepository) - private pollVotesRepository: MiPollVotesRepository, + private pollVotesRepository: PollVotesRepository, @Inject(DI.mutingsRepository) - private mutingsRepository: MiMutingsRepository, + private mutingsRepository: MutingsRepository, private noteEntityService: NoteEntityService, ) { 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 12aad3c330..0bcd80bb0a 100644 --- a/packages/backend/src/server/api/endpoints/notes/polls/vote.ts +++ b/packages/backend/src/server/api/endpoints/notes/polls/vote.ts @@ -4,7 +4,7 @@ */ import { Inject, Injectable } from '@nestjs/common'; -import type { MiUsersRepository, MiPollsRepository, MiPollVotesRepository } from '@/models/index.js'; +import type { UsersRepository, PollsRepository, PollVotesRepository } from '@/models/index.js'; import type { MiRemoteUser } from '@/models/entities/User.js'; import { IdService } from '@/core/IdService.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; @@ -81,13 +81,13 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.usersRepository) - private usersRepository: MiUsersRepository, + private usersRepository: UsersRepository, @Inject(DI.pollsRepository) - private pollsRepository: MiPollsRepository, + private pollsRepository: PollsRepository, @Inject(DI.pollVotesRepository) - private pollVotesRepository: MiPollVotesRepository, + private pollVotesRepository: PollVotesRepository, private idService: IdService, private getterService: GetterService, diff --git a/packages/backend/src/server/api/endpoints/notes/reactions.ts b/packages/backend/src/server/api/endpoints/notes/reactions.ts index 6ecf10b3ae..8f5e7d024b 100644 --- a/packages/backend/src/server/api/endpoints/notes/reactions.ts +++ b/packages/backend/src/server/api/endpoints/notes/reactions.ts @@ -4,7 +4,7 @@ */ import { Inject, Injectable } from '@nestjs/common'; -import type { MiNoteReactionsRepository } from '@/models/index.js'; +import type { NoteReactionsRepository } from '@/models/index.js'; import type { MiNoteReaction } from '@/models/entities/NoteReaction.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import { NoteReactionEntityService } from '@/core/entities/NoteReactionEntityService.js'; @@ -56,7 +56,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.noteReactionsRepository) - private noteReactionsRepository: MiNoteReactionsRepository, + private noteReactionsRepository: NoteReactionsRepository, private noteReactionEntityService: NoteReactionEntityService, ) { diff --git a/packages/backend/src/server/api/endpoints/notes/renotes.ts b/packages/backend/src/server/api/endpoints/notes/renotes.ts index a2902073cc..c5c2bc227d 100644 --- a/packages/backend/src/server/api/endpoints/notes/renotes.ts +++ b/packages/backend/src/server/api/endpoints/notes/renotes.ts @@ -4,7 +4,7 @@ */ import { Inject, Injectable } from '@nestjs/common'; -import type { MiNotesRepository } from '@/models/index.js'; +import type { NotesRepository } from '@/models/index.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import { QueryService } from '@/core/QueryService.js'; import { NoteEntityService } from '@/core/entities/NoteEntityService.js'; @@ -52,7 +52,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.notesRepository) - private notesRepository: MiNotesRepository, + private notesRepository: NotesRepository, private noteEntityService: NoteEntityService, private queryService: QueryService, diff --git a/packages/backend/src/server/api/endpoints/notes/replies.ts b/packages/backend/src/server/api/endpoints/notes/replies.ts index 44fb83acb7..706e65fc78 100644 --- a/packages/backend/src/server/api/endpoints/notes/replies.ts +++ b/packages/backend/src/server/api/endpoints/notes/replies.ts @@ -4,7 +4,7 @@ */ import { Inject, Injectable } from '@nestjs/common'; -import type { MiNotesRepository } from '@/models/index.js'; +import type { NotesRepository } from '@/models/index.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import { QueryService } from '@/core/QueryService.js'; import { NoteEntityService } from '@/core/entities/NoteEntityService.js'; @@ -42,7 +42,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.notesRepository) - private notesRepository: MiNotesRepository, + private notesRepository: NotesRepository, private noteEntityService: NoteEntityService, private queryService: QueryService, diff --git a/packages/backend/src/server/api/endpoints/notes/search-by-tag.ts b/packages/backend/src/server/api/endpoints/notes/search-by-tag.ts index 84aaad9d89..94ab6a4f26 100644 --- a/packages/backend/src/server/api/endpoints/notes/search-by-tag.ts +++ b/packages/backend/src/server/api/endpoints/notes/search-by-tag.ts @@ -5,7 +5,7 @@ import { Brackets } from 'typeorm'; import { Inject, Injectable } from '@nestjs/common'; -import type { MiNotesRepository } from '@/models/index.js'; +import type { NotesRepository } from '@/models/index.js'; import { safeForSql } from '@/misc/safe-for-sql.js'; import { normalizeForSearch } from '@/misc/normalize-for-search.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; @@ -68,7 +68,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.notesRepository) - private notesRepository: MiNotesRepository, + private notesRepository: NotesRepository, private noteEntityService: NoteEntityService, private queryService: QueryService, diff --git a/packages/backend/src/server/api/endpoints/notes/state.ts b/packages/backend/src/server/api/endpoints/notes/state.ts index 7d6a80cfba..b95e966de4 100644 --- a/packages/backend/src/server/api/endpoints/notes/state.ts +++ b/packages/backend/src/server/api/endpoints/notes/state.ts @@ -4,7 +4,7 @@ */ import { Inject, Injectable } from '@nestjs/common'; -import type { MiNotesRepository, MiNoteThreadMutingsRepository, MiNoteFavoritesRepository } from '@/models/index.js'; +import type { NotesRepository, NoteThreadMutingsRepository, NoteFavoritesRepository } from '@/models/index.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import { DI } from '@/di-symbols.js'; @@ -42,13 +42,13 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.notesRepository) - private notesRepository: MiNotesRepository, + private notesRepository: NotesRepository, @Inject(DI.noteThreadMutingsRepository) - private noteThreadMutingsRepository: MiNoteThreadMutingsRepository, + private noteThreadMutingsRepository: NoteThreadMutingsRepository, @Inject(DI.noteFavoritesRepository) - private noteFavoritesRepository: MiNoteFavoritesRepository, + private noteFavoritesRepository: NoteFavoritesRepository, ) { super(meta, paramDef, async (ps, me) => { const note = await this.notesRepository.findOneByOrFail({ id: ps.noteId }); diff --git a/packages/backend/src/server/api/endpoints/notes/thread-muting/create.ts b/packages/backend/src/server/api/endpoints/notes/thread-muting/create.ts index e07ff7ff73..fb4e15f330 100644 --- a/packages/backend/src/server/api/endpoints/notes/thread-muting/create.ts +++ b/packages/backend/src/server/api/endpoints/notes/thread-muting/create.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import ms from 'ms'; -import type { MiNotesRepository, MiNoteThreadMutingsRepository } from '@/models/index.js'; +import type { NotesRepository, NoteThreadMutingsRepository } from '@/models/index.js'; import { IdService } from '@/core/IdService.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import { GetterService } from '@/server/api/GetterService.js'; @@ -47,10 +47,10 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.notesRepository) - private notesRepository: MiNotesRepository, + private notesRepository: NotesRepository, @Inject(DI.noteThreadMutingsRepository) - private noteThreadMutingsRepository: MiNoteThreadMutingsRepository, + private noteThreadMutingsRepository: NoteThreadMutingsRepository, private getterService: GetterService, private noteReadService: NoteReadService, diff --git a/packages/backend/src/server/api/endpoints/notes/thread-muting/delete.ts b/packages/backend/src/server/api/endpoints/notes/thread-muting/delete.ts index 62b217987f..740b5f656c 100644 --- a/packages/backend/src/server/api/endpoints/notes/thread-muting/delete.ts +++ b/packages/backend/src/server/api/endpoints/notes/thread-muting/delete.ts @@ -4,7 +4,7 @@ */ import { Inject, Injectable } from '@nestjs/common'; -import type { MiNoteThreadMutingsRepository } from '@/models/index.js'; +import type { NoteThreadMutingsRepository } from '@/models/index.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import { GetterService } from '@/server/api/GetterService.js'; import { DI } from '@/di-symbols.js'; @@ -39,7 +39,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.noteThreadMutingsRepository) - private noteThreadMutingsRepository: MiNoteThreadMutingsRepository, + private noteThreadMutingsRepository: NoteThreadMutingsRepository, private getterService: GetterService, ) { diff --git a/packages/backend/src/server/api/endpoints/notes/timeline.ts b/packages/backend/src/server/api/endpoints/notes/timeline.ts index 9e6046e149..0d61ef9813 100644 --- a/packages/backend/src/server/api/endpoints/notes/timeline.ts +++ b/packages/backend/src/server/api/endpoints/notes/timeline.ts @@ -5,7 +5,7 @@ import { Brackets } from 'typeorm'; import { Inject, Injectable } from '@nestjs/common'; -import type { MiNotesRepository, MiFollowingsRepository } from '@/models/index.js'; +import type { NotesRepository, FollowingsRepository } from '@/models/index.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import { QueryService } from '@/core/QueryService.js'; import ActiveUsersChart from '@/core/chart/charts/active-users.js'; @@ -51,10 +51,10 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.notesRepository) - private notesRepository: MiNotesRepository, + private notesRepository: NotesRepository, @Inject(DI.followingsRepository) - private followingsRepository: MiFollowingsRepository, + private followingsRepository: FollowingsRepository, private noteEntityService: NoteEntityService, private queryService: QueryService, diff --git a/packages/backend/src/server/api/endpoints/notes/unrenote.ts b/packages/backend/src/server/api/endpoints/notes/unrenote.ts index 8c75677bfc..1689d814fd 100644 --- a/packages/backend/src/server/api/endpoints/notes/unrenote.ts +++ b/packages/backend/src/server/api/endpoints/notes/unrenote.ts @@ -5,7 +5,7 @@ import ms from 'ms'; import { Inject, Injectable } from '@nestjs/common'; -import type { MiUsersRepository, MiNotesRepository } from '@/models/index.js'; +import type { UsersRepository, NotesRepository } from '@/models/index.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import { NoteDeleteService } from '@/core/NoteDeleteService.js'; import { DI } from '@/di-symbols.js'; @@ -47,10 +47,10 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.usersRepository) - private usersRepository: MiUsersRepository, + private usersRepository: UsersRepository, @Inject(DI.notesRepository) - private notesRepository: MiNotesRepository, + private notesRepository: NotesRepository, private getterService: GetterService, private noteDeleteService: NoteDeleteService, diff --git a/packages/backend/src/server/api/endpoints/notes/user-list-timeline.ts b/packages/backend/src/server/api/endpoints/notes/user-list-timeline.ts index c7996e4e7f..d4ec328721 100644 --- a/packages/backend/src/server/api/endpoints/notes/user-list-timeline.ts +++ b/packages/backend/src/server/api/endpoints/notes/user-list-timeline.ts @@ -5,7 +5,7 @@ import { Brackets } from 'typeorm'; import { Inject, Injectable } from '@nestjs/common'; -import type { MiNotesRepository, MiUserListsRepository, MiUserListJoiningsRepository } from '@/models/index.js'; +import type { NotesRepository, UserListsRepository, UserListJoiningsRepository } from '@/models/index.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import { QueryService } from '@/core/QueryService.js'; import { NoteEntityService } from '@/core/entities/NoteEntityService.js'; @@ -63,13 +63,13 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.notesRepository) - private notesRepository: MiNotesRepository, + private notesRepository: NotesRepository, @Inject(DI.userListsRepository) - private userListsRepository: MiUserListsRepository, + private userListsRepository: UserListsRepository, @Inject(DI.userListJoiningsRepository) - private userListJoiningsRepository: MiUserListJoiningsRepository, + private userListJoiningsRepository: UserListJoiningsRepository, private noteEntityService: NoteEntityService, private queryService: QueryService, diff --git a/packages/backend/src/server/api/endpoints/page-push.ts b/packages/backend/src/server/api/endpoints/page-push.ts index 1cc75e3ec9..cbb45ca60d 100644 --- a/packages/backend/src/server/api/endpoints/page-push.ts +++ b/packages/backend/src/server/api/endpoints/page-push.ts @@ -4,7 +4,7 @@ */ import { Inject, Injectable } from '@nestjs/common'; -import type { MiPagesRepository } from '@/models/index.js'; +import type { PagesRepository } from '@/models/index.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import { UserEntityService } from '@/core/entities/UserEntityService.js'; import { GlobalEventService } from '@/core/GlobalEventService.js'; @@ -39,7 +39,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.pagesRepository) - private pagesRepository: MiPagesRepository, + private pagesRepository: PagesRepository, private userEntityService: UserEntityService, private globalEventService: GlobalEventService, diff --git a/packages/backend/src/server/api/endpoints/pages/create.ts b/packages/backend/src/server/api/endpoints/pages/create.ts index 52a36f9f3a..28c7f22550 100644 --- a/packages/backend/src/server/api/endpoints/pages/create.ts +++ b/packages/backend/src/server/api/endpoints/pages/create.ts @@ -5,7 +5,7 @@ import ms from 'ms'; import { Inject, Injectable } from '@nestjs/common'; -import type { MiDriveFilesRepository, MiPagesRepository } from '@/models/index.js'; +import type { DriveFilesRepository, PagesRepository } from '@/models/index.js'; import { IdService } from '@/core/IdService.js'; import { MiPage } from '@/models/entities/Page.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; @@ -73,10 +73,10 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.pagesRepository) - private pagesRepository: MiPagesRepository, + private pagesRepository: PagesRepository, @Inject(DI.driveFilesRepository) - private driveFilesRepository: MiDriveFilesRepository, + private driveFilesRepository: DriveFilesRepository, private pageEntityService: PageEntityService, private idService: IdService, diff --git a/packages/backend/src/server/api/endpoints/pages/delete.ts b/packages/backend/src/server/api/endpoints/pages/delete.ts index 948f80e8c4..a0aa72a697 100644 --- a/packages/backend/src/server/api/endpoints/pages/delete.ts +++ b/packages/backend/src/server/api/endpoints/pages/delete.ts @@ -4,7 +4,7 @@ */ import { Inject, Injectable } from '@nestjs/common'; -import type { MiPagesRepository } from '@/models/index.js'; +import type { PagesRepository } from '@/models/index.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import { DI } from '@/di-symbols.js'; import { ApiError } from '../../error.js'; @@ -44,7 +44,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.pagesRepository) - private pagesRepository: MiPagesRepository, + private pagesRepository: PagesRepository, ) { super(meta, paramDef, async (ps, me) => { const page = await this.pagesRepository.findOneBy({ id: ps.pageId }); diff --git a/packages/backend/src/server/api/endpoints/pages/featured.ts b/packages/backend/src/server/api/endpoints/pages/featured.ts index 27ffab9675..386fdc0d1a 100644 --- a/packages/backend/src/server/api/endpoints/pages/featured.ts +++ b/packages/backend/src/server/api/endpoints/pages/featured.ts @@ -4,7 +4,7 @@ */ import { Inject, Injectable } from '@nestjs/common'; -import type { MiPagesRepository } from '@/models/index.js'; +import type { PagesRepository } from '@/models/index.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import { PageEntityService } from '@/core/entities/PageEntityService.js'; import { DI } from '@/di-symbols.js'; @@ -36,7 +36,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.pagesRepository) - private pagesRepository: MiPagesRepository, + private pagesRepository: PagesRepository, private pageEntityService: PageEntityService, ) { diff --git a/packages/backend/src/server/api/endpoints/pages/like.ts b/packages/backend/src/server/api/endpoints/pages/like.ts index abb7fd5f39..0504be20ed 100644 --- a/packages/backend/src/server/api/endpoints/pages/like.ts +++ b/packages/backend/src/server/api/endpoints/pages/like.ts @@ -4,7 +4,7 @@ */ import { Inject, Injectable } from '@nestjs/common'; -import type { MiPagesRepository, MiPageLikesRepository } from '@/models/index.js'; +import type { PagesRepository, PageLikesRepository } from '@/models/index.js'; import { IdService } from '@/core/IdService.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import { DI } from '@/di-symbols.js'; @@ -53,10 +53,10 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.pagesRepository) - private pagesRepository: MiPagesRepository, + private pagesRepository: PagesRepository, @Inject(DI.pageLikesRepository) - private pageLikesRepository: MiPageLikesRepository, + private pageLikesRepository: PageLikesRepository, private idService: IdService, ) { diff --git a/packages/backend/src/server/api/endpoints/pages/show.ts b/packages/backend/src/server/api/endpoints/pages/show.ts index a62a3b8e35..652a4faef1 100644 --- a/packages/backend/src/server/api/endpoints/pages/show.ts +++ b/packages/backend/src/server/api/endpoints/pages/show.ts @@ -5,7 +5,7 @@ import { IsNull } from 'typeorm'; import { Inject, Injectable } from '@nestjs/common'; -import type { MiUsersRepository, MiPagesRepository } from '@/models/index.js'; +import type { UsersRepository, PagesRepository } from '@/models/index.js'; import type { MiPage } from '@/models/entities/Page.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import { PageEntityService } from '@/core/entities/PageEntityService.js'; @@ -50,10 +50,10 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.usersRepository) - private usersRepository: MiUsersRepository, + private usersRepository: UsersRepository, @Inject(DI.pagesRepository) - private pagesRepository: MiPagesRepository, + private pagesRepository: PagesRepository, private pageEntityService: PageEntityService, ) { diff --git a/packages/backend/src/server/api/endpoints/pages/unlike.ts b/packages/backend/src/server/api/endpoints/pages/unlike.ts index 9001d8eb11..b913fc7249 100644 --- a/packages/backend/src/server/api/endpoints/pages/unlike.ts +++ b/packages/backend/src/server/api/endpoints/pages/unlike.ts @@ -4,7 +4,7 @@ */ import { Inject, Injectable } from '@nestjs/common'; -import type { MiPagesRepository, MiPageLikesRepository } from '@/models/index.js'; +import type { PagesRepository, PageLikesRepository } from '@/models/index.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import { DI } from '@/di-symbols.js'; import { ApiError } from '../../error.js'; @@ -46,10 +46,10 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.pagesRepository) - private pagesRepository: MiPagesRepository, + private pagesRepository: PagesRepository, @Inject(DI.pageLikesRepository) - private pageLikesRepository: MiPageLikesRepository, + private pageLikesRepository: PageLikesRepository, ) { super(meta, paramDef, async (ps, me) => { const page = await this.pagesRepository.findOneBy({ id: ps.pageId }); diff --git a/packages/backend/src/server/api/endpoints/pages/update.ts b/packages/backend/src/server/api/endpoints/pages/update.ts index b47eebb13d..679b1ed464 100644 --- a/packages/backend/src/server/api/endpoints/pages/update.ts +++ b/packages/backend/src/server/api/endpoints/pages/update.ts @@ -6,7 +6,7 @@ import ms from 'ms'; import { Not } from 'typeorm'; import { Inject, Injectable } from '@nestjs/common'; -import type { MiPagesRepository, MiDriveFilesRepository } from '@/models/index.js'; +import type { PagesRepository, DriveFilesRepository } from '@/models/index.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import { DI } from '@/di-symbols.js'; import { ApiError } from '../../error.js'; @@ -78,10 +78,10 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.pagesRepository) - private pagesRepository: MiPagesRepository, + private pagesRepository: PagesRepository, @Inject(DI.driveFilesRepository) - private driveFilesRepository: MiDriveFilesRepository, + private driveFilesRepository: DriveFilesRepository, ) { super(meta, paramDef, async (ps, me) => { const page = await this.pagesRepository.findOneBy({ id: ps.pageId }); diff --git a/packages/backend/src/server/api/endpoints/pinned-users.ts b/packages/backend/src/server/api/endpoints/pinned-users.ts index 3394e572f3..74ac6bbee4 100644 --- a/packages/backend/src/server/api/endpoints/pinned-users.ts +++ b/packages/backend/src/server/api/endpoints/pinned-users.ts @@ -5,7 +5,7 @@ import { IsNull } from 'typeorm'; import { Inject, Injectable } from '@nestjs/common'; -import type { MiUsersRepository } from '@/models/index.js'; +import type { UsersRepository } from '@/models/index.js'; import * as Acct from '@/misc/acct.js'; import type { MiUser } from '@/models/entities/User.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; @@ -40,7 +40,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.usersRepository) - private usersRepository: MiUsersRepository, + private usersRepository: UsersRepository, private metaService: MetaService, private userEntityService: UserEntityService, diff --git a/packages/backend/src/server/api/endpoints/promo/read.ts b/packages/backend/src/server/api/endpoints/promo/read.ts index 9bbcfce031..4c99f14bd4 100644 --- a/packages/backend/src/server/api/endpoints/promo/read.ts +++ b/packages/backend/src/server/api/endpoints/promo/read.ts @@ -4,7 +4,7 @@ */ import { Inject, Injectable } from '@nestjs/common'; -import type { MiPromoReadsRepository } from '@/models/index.js'; +import type { PromoReadsRepository } from '@/models/index.js'; import { IdService } from '@/core/IdService.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import { DI } from '@/di-symbols.js'; @@ -38,7 +38,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.promoReadsRepository) - private promoReadsRepository: MiPromoReadsRepository, + private promoReadsRepository: PromoReadsRepository, private idService: IdService, private getterService: GetterService, diff --git a/packages/backend/src/server/api/endpoints/renote-mute/create.ts b/packages/backend/src/server/api/endpoints/renote-mute/create.ts index e311a9fbe2..30bfd3d24d 100644 --- a/packages/backend/src/server/api/endpoints/renote-mute/create.ts +++ b/packages/backend/src/server/api/endpoints/renote-mute/create.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 type { MiRenoteMutingsRepository } from '@/models/index.js'; +import type { RenoteMutingsRepository } from '@/models/index.js'; import type { MiRenoteMuting } from '@/models/entities/RenoteMuting.js'; import { DI } from '@/di-symbols.js'; import { GetterService } from '@/server/api/GetterService.js'; @@ -60,7 +60,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.renoteMutingsRepository) - private renoteMutingsRepository: MiRenoteMutingsRepository, + private renoteMutingsRepository: RenoteMutingsRepository, private getterService: GetterService, private idService: IdService, diff --git a/packages/backend/src/server/api/endpoints/renote-mute/delete.ts b/packages/backend/src/server/api/endpoints/renote-mute/delete.ts index 93c182d386..373f805fa4 100644 --- a/packages/backend/src/server/api/endpoints/renote-mute/delete.ts +++ b/packages/backend/src/server/api/endpoints/renote-mute/delete.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { MiRenoteMutingsRepository } from '@/models/index.js'; +import type { RenoteMutingsRepository } from '@/models/index.js'; import { DI } from '@/di-symbols.js'; import { GetterService } from '@/server/api/GetterService.js'; import { ApiError } from '../../error.js'; @@ -51,7 +51,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.renoteMutingsRepository) - private renoteMutingsRepository: MiRenoteMutingsRepository, + private renoteMutingsRepository: RenoteMutingsRepository, private getterService: GetterService, ) { diff --git a/packages/backend/src/server/api/endpoints/renote-mute/list.ts b/packages/backend/src/server/api/endpoints/renote-mute/list.ts index 5b279db2d8..c7da5479ed 100644 --- a/packages/backend/src/server/api/endpoints/renote-mute/list.ts +++ b/packages/backend/src/server/api/endpoints/renote-mute/list.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { MiRenoteMutingsRepository } from '@/models/index.js'; +import type { RenoteMutingsRepository } from '@/models/index.js'; import { QueryService } from '@/core/QueryService.js'; import { RenoteMutingEntityService } from '@/core/entities/RenoteMutingEntityService.js'; import { DI } from '@/di-symbols.js'; @@ -43,7 +43,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.renoteMutingsRepository) - private renoteMutingsRepository: MiRenoteMutingsRepository, + private renoteMutingsRepository: RenoteMutingsRepository, private renoteMutingEntityService: RenoteMutingEntityService, private queryService: QueryService, diff --git a/packages/backend/src/server/api/endpoints/request-reset-password.ts b/packages/backend/src/server/api/endpoints/request-reset-password.ts index 9269c28057..2e1085f78e 100644 --- a/packages/backend/src/server/api/endpoints/request-reset-password.ts +++ b/packages/backend/src/server/api/endpoints/request-reset-password.ts @@ -6,7 +6,7 @@ import ms from 'ms'; import { IsNull } from 'typeorm'; import { Inject, Injectable } from '@nestjs/common'; -import type { MiPasswordResetRequestsRepository, MiUserProfilesRepository, MiUsersRepository } from '@/models/index.js'; +import type { PasswordResetRequestsRepository, UserProfilesRepository, UsersRepository } from '@/models/index.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import { IdService } from '@/core/IdService.js'; import type { Config } from '@/config.js'; @@ -48,13 +48,13 @@ export default class extends Endpoint { private config: Config, @Inject(DI.usersRepository) - private usersRepository: MiUsersRepository, + private usersRepository: UsersRepository, @Inject(DI.userProfilesRepository) - private userProfilesRepository: MiUserProfilesRepository, + private userProfilesRepository: UserProfilesRepository, @Inject(DI.passwordResetRequestsRepository) - private passwordResetRequestsRepository: MiPasswordResetRequestsRepository, + private passwordResetRequestsRepository: PasswordResetRequestsRepository, private idService: IdService, private emailService: EmailService, diff --git a/packages/backend/src/server/api/endpoints/reset-password.ts b/packages/backend/src/server/api/endpoints/reset-password.ts index 8e29eb0df2..4bbd3d0ef1 100644 --- a/packages/backend/src/server/api/endpoints/reset-password.ts +++ b/packages/backend/src/server/api/endpoints/reset-password.ts @@ -5,7 +5,7 @@ import bcrypt from 'bcryptjs'; import { Inject, Injectable } from '@nestjs/common'; -import type { MiUserProfilesRepository, MiPasswordResetRequestsRepository } from '@/models/index.js'; +import type { UserProfilesRepository, PasswordResetRequestsRepository } from '@/models/index.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import { DI } from '@/di-symbols.js'; @@ -35,10 +35,10 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.passwordResetRequestsRepository) - private passwordResetRequestsRepository: MiPasswordResetRequestsRepository, + private passwordResetRequestsRepository: PasswordResetRequestsRepository, @Inject(DI.userProfilesRepository) - private userProfilesRepository: MiUserProfilesRepository, + private userProfilesRepository: UserProfilesRepository, ) { super(meta, paramDef, async (ps, me) => { const req = await this.passwordResetRequestsRepository.findOneByOrFail({ diff --git a/packages/backend/src/server/api/endpoints/retention.ts b/packages/backend/src/server/api/endpoints/retention.ts index 805880f604..34e584b985 100644 --- a/packages/backend/src/server/api/endpoints/retention.ts +++ b/packages/backend/src/server/api/endpoints/retention.ts @@ -4,7 +4,7 @@ */ import { Inject, Injectable } from '@nestjs/common'; -import type { MiRetentionAggregationsRepository } from '@/models/index.js'; +import type { RetentionAggregationsRepository } from '@/models/index.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import { DI } from '@/di-symbols.js'; @@ -31,7 +31,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.retentionAggregationsRepository) - private retentionAggregationsRepository: MiRetentionAggregationsRepository, + private retentionAggregationsRepository: RetentionAggregationsRepository, ) { super(meta, paramDef, async (ps, me) => { const records = await this.retentionAggregationsRepository.find({ diff --git a/packages/backend/src/server/api/endpoints/roles/list.ts b/packages/backend/src/server/api/endpoints/roles/list.ts index 11c8610f68..ee17b46a2a 100644 --- a/packages/backend/src/server/api/endpoints/roles/list.ts +++ b/packages/backend/src/server/api/endpoints/roles/list.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { MiRolesRepository } from '@/models/index.js'; +import type { RolesRepository } from '@/models/index.js'; import { DI } from '@/di-symbols.js'; import { RoleEntityService } from '@/core/entities/RoleEntityService.js'; @@ -28,7 +28,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.rolesRepository) - private rolesRepository: MiRolesRepository, + private rolesRepository: RolesRepository, private roleEntityService: RoleEntityService, ) { diff --git a/packages/backend/src/server/api/endpoints/roles/notes.ts b/packages/backend/src/server/api/endpoints/roles/notes.ts index c0400da54a..fe0354d545 100644 --- a/packages/backend/src/server/api/endpoints/roles/notes.ts +++ b/packages/backend/src/server/api/endpoints/roles/notes.ts @@ -6,7 +6,7 @@ import { Inject, Injectable } from '@nestjs/common'; import * as Redis from 'ioredis'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { MiNotesRepository, MiRolesRepository } from '@/models/index.js'; +import type { NotesRepository, RolesRepository } from '@/models/index.js'; import { QueryService } from '@/core/QueryService.js'; import { DI } from '@/di-symbols.js'; import { NoteEntityService } from '@/core/entities/NoteEntityService.js'; @@ -58,10 +58,10 @@ export default class extends Endpoint { private redisClient: Redis.Redis, @Inject(DI.notesRepository) - private notesRepository: MiNotesRepository, + private notesRepository: NotesRepository, @Inject(DI.rolesRepository) - private rolesRepository: MiRolesRepository, + private rolesRepository: RolesRepository, private idService: IdService, private noteEntityService: NoteEntityService, diff --git a/packages/backend/src/server/api/endpoints/roles/show.ts b/packages/backend/src/server/api/endpoints/roles/show.ts index b4e95cc1f3..742c6f950d 100644 --- a/packages/backend/src/server/api/endpoints/roles/show.ts +++ b/packages/backend/src/server/api/endpoints/roles/show.ts @@ -4,7 +4,7 @@ */ import { Inject, Injectable } from '@nestjs/common'; -import type { MiRolesRepository } from '@/models/index.js'; +import type { RolesRepository } from '@/models/index.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import { DI } from '@/di-symbols.js'; import { RoleEntityService } from '@/core/entities/RoleEntityService.js'; @@ -37,7 +37,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.rolesRepository) - private rolesRepository: MiRolesRepository, + private rolesRepository: RolesRepository, private roleEntityService: RoleEntityService, ) { diff --git a/packages/backend/src/server/api/endpoints/roles/users.ts b/packages/backend/src/server/api/endpoints/roles/users.ts index 6aff6e926a..4bb962c4a6 100644 --- a/packages/backend/src/server/api/endpoints/roles/users.ts +++ b/packages/backend/src/server/api/endpoints/roles/users.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Brackets } from 'typeorm'; -import type { MiRoleAssignmentsRepository, MiRolesRepository } from '@/models/index.js'; +import type { RoleAssignmentsRepository, RolesRepository } from '@/models/index.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import { QueryService } from '@/core/QueryService.js'; import { DI } from '@/di-symbols.js'; @@ -42,10 +42,10 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.rolesRepository) - private rolesRepository: MiRolesRepository, + private rolesRepository: RolesRepository, @Inject(DI.roleAssignmentsRepository) - private roleAssignmentsRepository: MiRoleAssignmentsRepository, + private roleAssignmentsRepository: RoleAssignmentsRepository, private queryService: QueryService, private userEntityService: UserEntityService, diff --git a/packages/backend/src/server/api/endpoints/stats.ts b/packages/backend/src/server/api/endpoints/stats.ts index e5976b850a..6174d39aed 100644 --- a/packages/backend/src/server/api/endpoints/stats.ts +++ b/packages/backend/src/server/api/endpoints/stats.ts @@ -4,7 +4,7 @@ */ import { Inject, Injectable } from '@nestjs/common'; -import type { MiInstancesRepository, MiNoteReactionsRepository } from '@/models/index.js'; +import type { InstancesRepository, NoteReactionsRepository } from '@/models/index.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import { DI } from '@/di-symbols.js'; import NotesChart from '@/core/chart/charts/notes.js'; @@ -62,10 +62,10 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.instancesRepository) - private instancesRepository: MiInstancesRepository, + private instancesRepository: InstancesRepository, @Inject(DI.noteReactionsRepository) - private noteReactionsRepository: MiNoteReactionsRepository, + private noteReactionsRepository: NoteReactionsRepository, private notesChart: NotesChart, private usersChart: UsersChart, diff --git a/packages/backend/src/server/api/endpoints/sw/register.ts b/packages/backend/src/server/api/endpoints/sw/register.ts index ad5947d1bf..7a979ea306 100644 --- a/packages/backend/src/server/api/endpoints/sw/register.ts +++ b/packages/backend/src/server/api/endpoints/sw/register.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { IdService } from '@/core/IdService.js'; -import type { MiSwSubscriptionsRepository } from '@/models/index.js'; +import type { SwSubscriptionsRepository } from '@/models/index.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import { MetaService } from '@/core/MetaService.js'; import { DI } from '@/di-symbols.js'; @@ -62,7 +62,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.swSubscriptionsRepository) - private swSubscriptionsRepository: MiSwSubscriptionsRepository, + private swSubscriptionsRepository: SwSubscriptionsRepository, private idService: IdService, private metaService: MetaService, diff --git a/packages/backend/src/server/api/endpoints/sw/show-registration.ts b/packages/backend/src/server/api/endpoints/sw/show-registration.ts index 3eccface4b..90800f4b64 100644 --- a/packages/backend/src/server/api/endpoints/sw/show-registration.ts +++ b/packages/backend/src/server/api/endpoints/sw/show-registration.ts @@ -4,7 +4,7 @@ */ import { Inject, Injectable } from '@nestjs/common'; -import type { MiSwSubscriptionsRepository } from '@/models/index.js'; +import type { SwSubscriptionsRepository } from '@/models/index.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import { DI } from '@/di-symbols.js'; @@ -48,7 +48,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.swSubscriptionsRepository) - private swSubscriptionsRepository: MiSwSubscriptionsRepository, + private swSubscriptionsRepository: SwSubscriptionsRepository, ) { super(meta, paramDef, async (ps, me) => { // if already subscribed diff --git a/packages/backend/src/server/api/endpoints/sw/unregister.ts b/packages/backend/src/server/api/endpoints/sw/unregister.ts index c7f777801d..7b948988a6 100644 --- a/packages/backend/src/server/api/endpoints/sw/unregister.ts +++ b/packages/backend/src/server/api/endpoints/sw/unregister.ts @@ -4,7 +4,7 @@ */ import { Inject, Injectable } from '@nestjs/common'; -import type { MiSwSubscriptionsRepository } from '@/models/index.js'; +import type { SwSubscriptionsRepository } from '@/models/index.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import { DI } from '@/di-symbols.js'; @@ -29,7 +29,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.swSubscriptionsRepository) - private swSubscriptionsRepository: MiSwSubscriptionsRepository, + private swSubscriptionsRepository: SwSubscriptionsRepository, ) { super(meta, paramDef, async (ps, me) => { await this.swSubscriptionsRepository.delete({ diff --git a/packages/backend/src/server/api/endpoints/sw/update-registration.ts b/packages/backend/src/server/api/endpoints/sw/update-registration.ts index d0f24d98e5..061d180f57 100644 --- a/packages/backend/src/server/api/endpoints/sw/update-registration.ts +++ b/packages/backend/src/server/api/endpoints/sw/update-registration.ts @@ -4,7 +4,7 @@ */ import { Inject, Injectable } from '@nestjs/common'; -import type { MiSwSubscriptionsRepository } from '@/models/index.js'; +import type { SwSubscriptionsRepository } from '@/models/index.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import { DI } from '@/di-symbols.js'; import { ApiError } from '../../error.js'; @@ -57,7 +57,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.swSubscriptionsRepository) - private swSubscriptionsRepository: MiSwSubscriptionsRepository, + private swSubscriptionsRepository: SwSubscriptionsRepository, ) { super(meta, paramDef, async (ps, me) => { const swSubscription = await this.swSubscriptionsRepository.findOneBy({ diff --git a/packages/backend/src/server/api/endpoints/username/available.ts b/packages/backend/src/server/api/endpoints/username/available.ts index a9c4075488..38036a3244 100644 --- a/packages/backend/src/server/api/endpoints/username/available.ts +++ b/packages/backend/src/server/api/endpoints/username/available.ts @@ -5,7 +5,7 @@ import { IsNull } from 'typeorm'; import { Inject, Injectable } from '@nestjs/common'; -import type { MiUsedUsernamesRepository, MiUsersRepository } from '@/models/index.js'; +import type { UsedUsernamesRepository, UsersRepository } from '@/models/index.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import { localUsernameSchema } from '@/models/entities/User.js'; import { DI } from '@/di-symbols.js'; @@ -41,10 +41,10 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.usersRepository) - private usersRepository: MiUsersRepository, + private usersRepository: UsersRepository, @Inject(DI.usedUsernamesRepository) - private usedUsernamesRepository: MiUsedUsernamesRepository, + private usedUsernamesRepository: UsedUsernamesRepository, private metaService: MetaService, ) { diff --git a/packages/backend/src/server/api/endpoints/users.ts b/packages/backend/src/server/api/endpoints/users.ts index 5558275d36..95ff7c9759 100644 --- a/packages/backend/src/server/api/endpoints/users.ts +++ b/packages/backend/src/server/api/endpoints/users.ts @@ -4,7 +4,7 @@ */ import { Inject, Injectable } from '@nestjs/common'; -import type { MiUsersRepository } from '@/models/index.js'; +import type { UsersRepository } from '@/models/index.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import { QueryService } from '@/core/QueryService.js'; import { UserEntityService } from '@/core/entities/UserEntityService.js'; @@ -49,7 +49,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.usersRepository) - private usersRepository: MiUsersRepository, + private usersRepository: UsersRepository, private userEntityService: UserEntityService, private queryService: QueryService, diff --git a/packages/backend/src/server/api/endpoints/users/achievements.ts b/packages/backend/src/server/api/endpoints/users/achievements.ts index b354872546..0eaff724b1 100644 --- a/packages/backend/src/server/api/endpoints/users/achievements.ts +++ b/packages/backend/src/server/api/endpoints/users/achievements.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { MiUserProfilesRepository } from '@/models/index.js'; +import type { UserProfilesRepository } from '@/models/index.js'; import { DI } from '@/di-symbols.js'; export const meta = { @@ -25,7 +25,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.userProfilesRepository) - private userProfilesRepository: MiUserProfilesRepository, + private userProfilesRepository: UserProfilesRepository, ) { super(meta, paramDef, async (ps, me) => { const profile = await this.userProfilesRepository.findOneByOrFail({ userId: ps.userId }); diff --git a/packages/backend/src/server/api/endpoints/users/clips.ts b/packages/backend/src/server/api/endpoints/users/clips.ts index 6db7feb57a..747f15f394 100644 --- a/packages/backend/src/server/api/endpoints/users/clips.ts +++ b/packages/backend/src/server/api/endpoints/users/clips.ts @@ -4,7 +4,7 @@ */ import { Inject, Injectable } from '@nestjs/common'; -import type { MiClipsRepository } from '@/models/index.js'; +import type { ClipsRepository } from '@/models/index.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import { QueryService } from '@/core/QueryService.js'; import { ClipEntityService } from '@/core/entities/ClipEntityService.js'; @@ -42,7 +42,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.clipsRepository) - private clipsRepository: MiClipsRepository, + private clipsRepository: ClipsRepository, private clipEntityService: ClipEntityService, private queryService: QueryService, diff --git a/packages/backend/src/server/api/endpoints/users/followers.ts b/packages/backend/src/server/api/endpoints/users/followers.ts index e16beacdbc..2684446fc9 100644 --- a/packages/backend/src/server/api/endpoints/users/followers.ts +++ b/packages/backend/src/server/api/endpoints/users/followers.ts @@ -5,7 +5,7 @@ import { IsNull } from 'typeorm'; import { Inject, Injectable } from '@nestjs/common'; -import type { MiUsersRepository, MiFollowingsRepository, MiUserProfilesRepository } from '@/models/index.js'; +import type { UsersRepository, FollowingsRepository, UserProfilesRepository } from '@/models/index.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import { QueryService } from '@/core/QueryService.js'; import { FollowingEntityService } from '@/core/entities/FollowingEntityService.js'; @@ -71,13 +71,13 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.usersRepository) - private usersRepository: MiUsersRepository, + private usersRepository: UsersRepository, @Inject(DI.userProfilesRepository) - private userProfilesRepository: MiUserProfilesRepository, + private userProfilesRepository: UserProfilesRepository, @Inject(DI.followingsRepository) - private followingsRepository: MiFollowingsRepository, + private followingsRepository: FollowingsRepository, private utilityService: UtilityService, private followingEntityService: FollowingEntityService, diff --git a/packages/backend/src/server/api/endpoints/users/following.ts b/packages/backend/src/server/api/endpoints/users/following.ts index 66b30ea1cf..926aacdb98 100644 --- a/packages/backend/src/server/api/endpoints/users/following.ts +++ b/packages/backend/src/server/api/endpoints/users/following.ts @@ -5,7 +5,7 @@ import { IsNull } from 'typeorm'; import { Inject, Injectable } from '@nestjs/common'; -import type { MiUsersRepository, MiFollowingsRepository, MiUserProfilesRepository } from '@/models/index.js'; +import type { UsersRepository, FollowingsRepository, UserProfilesRepository } from '@/models/index.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import { QueryService } from '@/core/QueryService.js'; import { FollowingEntityService } from '@/core/entities/FollowingEntityService.js'; @@ -71,13 +71,13 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.usersRepository) - private usersRepository: MiUsersRepository, + private usersRepository: UsersRepository, @Inject(DI.userProfilesRepository) - private userProfilesRepository: MiUserProfilesRepository, + private userProfilesRepository: UserProfilesRepository, @Inject(DI.followingsRepository) - private followingsRepository: MiFollowingsRepository, + private followingsRepository: FollowingsRepository, private utilityService: UtilityService, private followingEntityService: FollowingEntityService, diff --git a/packages/backend/src/server/api/endpoints/users/gallery/posts.ts b/packages/backend/src/server/api/endpoints/users/gallery/posts.ts index 97b354486f..2aa14ed25d 100644 --- a/packages/backend/src/server/api/endpoints/users/gallery/posts.ts +++ b/packages/backend/src/server/api/endpoints/users/gallery/posts.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { MiGalleryPostsRepository } from '@/models/index.js'; +import type { GalleryPostsRepository } from '@/models/index.js'; import { QueryService } from '@/core/QueryService.js'; import { GalleryPostEntityService } from '@/core/entities/GalleryPostEntityService.js'; import { DI } from '@/di-symbols.js'; @@ -42,7 +42,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.galleryPostsRepository) - private galleryPostsRepository: MiGalleryPostsRepository, + private galleryPostsRepository: GalleryPostsRepository, private galleryPostEntityService: GalleryPostEntityService, private queryService: QueryService, diff --git a/packages/backend/src/server/api/endpoints/users/get-frequently-replied-users.ts b/packages/backend/src/server/api/endpoints/users/get-frequently-replied-users.ts index 15d7684b47..d3e324d508 100644 --- a/packages/backend/src/server/api/endpoints/users/get-frequently-replied-users.ts +++ b/packages/backend/src/server/api/endpoints/users/get-frequently-replied-users.ts @@ -6,7 +6,7 @@ import { Not, In, IsNull } from 'typeorm'; import { Inject, Injectable } from '@nestjs/common'; import { maximum } from '@/misc/prelude/array.js'; -import type { MiNotesRepository } from '@/models/index.js'; +import type { NotesRepository } from '@/models/index.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import { UserEntityService } from '@/core/entities/UserEntityService.js'; import { DI } from '@/di-symbols.js'; @@ -63,7 +63,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.notesRepository) - private notesRepository: MiNotesRepository, + private notesRepository: NotesRepository, private userEntityService: UserEntityService, private getterService: GetterService, diff --git a/packages/backend/src/server/api/endpoints/users/lists/create-from-public.ts b/packages/backend/src/server/api/endpoints/users/lists/create-from-public.ts index fb38ed628a..4f3a64537d 100644 --- a/packages/backend/src/server/api/endpoints/users/lists/create-from-public.ts +++ b/packages/backend/src/server/api/endpoints/users/lists/create-from-public.ts @@ -4,7 +4,7 @@ */ import { Inject, Injectable } from '@nestjs/common'; -import type { MiUserListsRepository, MiUserListJoiningsRepository, MiBlockingsRepository } from '@/models/index.js'; +import type { UserListsRepository, UserListJoiningsRepository, BlockingsRepository } from '@/models/index.js'; import { IdService } from '@/core/IdService.js'; import type { MiUserList } from '@/models/entities/UserList.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; @@ -74,13 +74,13 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.userListsRepository) - private userListsRepository: MiUserListsRepository, + private userListsRepository: UserListsRepository, @Inject(DI.userListJoiningsRepository) - private userListJoiningsRepository: MiUserListJoiningsRepository, + private userListJoiningsRepository: UserListJoiningsRepository, @Inject(DI.blockingsRepository) - private blockingsRepository: MiBlockingsRepository, + private blockingsRepository: BlockingsRepository, private userListService: UserListService, private userListEntityService: UserListEntityService, diff --git a/packages/backend/src/server/api/endpoints/users/lists/create.ts b/packages/backend/src/server/api/endpoints/users/lists/create.ts index 29f67a99aa..4c04d35906 100644 --- a/packages/backend/src/server/api/endpoints/users/lists/create.ts +++ b/packages/backend/src/server/api/endpoints/users/lists/create.ts @@ -4,7 +4,7 @@ */ import { Inject, Injectable } from '@nestjs/common'; -import type { MiUserListsRepository } from '@/models/index.js'; +import type { UserListsRepository } from '@/models/index.js'; import { IdService } from '@/core/IdService.js'; import type { MiUserList } from '@/models/entities/UserList.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; @@ -52,7 +52,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.userListsRepository) - private userListsRepository: MiUserListsRepository, + private userListsRepository: UserListsRepository, private userListEntityService: UserListEntityService, private idService: IdService, diff --git a/packages/backend/src/server/api/endpoints/users/lists/delete.ts b/packages/backend/src/server/api/endpoints/users/lists/delete.ts index 639843cfac..adfd396d06 100644 --- a/packages/backend/src/server/api/endpoints/users/lists/delete.ts +++ b/packages/backend/src/server/api/endpoints/users/lists/delete.ts @@ -4,7 +4,7 @@ */ import { Inject, Injectable } from '@nestjs/common'; -import type { MiUserListsRepository } from '@/models/index.js'; +import type { UserListsRepository } from '@/models/index.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import { DI } from '@/di-symbols.js'; import { ApiError } from '../../../error.js'; @@ -40,7 +40,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.userListsRepository) - private userListsRepository: MiUserListsRepository, + private userListsRepository: UserListsRepository, ) { super(meta, paramDef, async (ps, me) => { const userList = await this.userListsRepository.findOneBy({ diff --git a/packages/backend/src/server/api/endpoints/users/lists/favorite.ts b/packages/backend/src/server/api/endpoints/users/lists/favorite.ts index 63e51fbb4b..0c4a965605 100644 --- a/packages/backend/src/server/api/endpoints/users/lists/favorite.ts +++ b/packages/backend/src/server/api/endpoints/users/lists/favorite.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { MiUserListFavoritesRepository, MiUserListsRepository } from '@/models/index.js'; +import type { UserListFavoritesRepository, UserListsRepository } from '@/models/index.js'; import { IdService } from '@/core/IdService.js'; import { ApiError } from '@/server/api/error.js'; import { DI } from '@/di-symbols.js'; @@ -39,10 +39,10 @@ export const paramDef = { export default class extends Endpoint { constructor ( @Inject(DI.userListsRepository) - private userListsRepository: MiUserListsRepository, + private userListsRepository: UserListsRepository, @Inject(DI.userListFavoritesRepository) - private userListFavoritesRepository: MiUserListFavoritesRepository, + private userListFavoritesRepository: UserListFavoritesRepository, private idService: IdService, ) { super(meta, paramDef, async (ps, me) => { diff --git a/packages/backend/src/server/api/endpoints/users/lists/list.ts b/packages/backend/src/server/api/endpoints/users/lists/list.ts index 7a783e598f..db481fc2e4 100644 --- a/packages/backend/src/server/api/endpoints/users/lists/list.ts +++ b/packages/backend/src/server/api/endpoints/users/lists/list.ts @@ -4,7 +4,7 @@ */ import { Inject, Injectable } from '@nestjs/common'; -import type { MiUserListsRepository, MiUsersRepository } from '@/models/index.js'; +import type { UserListsRepository, UsersRepository } from '@/models/index.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import { UserListEntityService } from '@/core/entities/UserListEntityService.js'; import { ApiError } from '@/server/api/error.js'; @@ -59,10 +59,10 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.usersRepository) - private usersRepository: MiUsersRepository, + private usersRepository: UsersRepository, @Inject(DI.userListsRepository) - private userListsRepository: MiUserListsRepository, + private userListsRepository: UserListsRepository, private userListEntityService: UserListEntityService, ) { diff --git a/packages/backend/src/server/api/endpoints/users/lists/pull.ts b/packages/backend/src/server/api/endpoints/users/lists/pull.ts index 5210f47924..59e765d5d0 100644 --- a/packages/backend/src/server/api/endpoints/users/lists/pull.ts +++ b/packages/backend/src/server/api/endpoints/users/lists/pull.ts @@ -4,7 +4,7 @@ */ import { Inject, Injectable } from '@nestjs/common'; -import type { MiUserListsRepository, MiUserListJoiningsRepository } from '@/models/index.js'; +import type { UserListsRepository, UserListJoiningsRepository } from '@/models/index.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import { UserEntityService } from '@/core/entities/UserEntityService.js'; import { GetterService } from '@/server/api/GetterService.js'; @@ -52,10 +52,10 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.userListsRepository) - private userListsRepository: MiUserListsRepository, + private userListsRepository: UserListsRepository, @Inject(DI.userListJoiningsRepository) - private userListJoiningsRepository: MiUserListJoiningsRepository, + private userListJoiningsRepository: UserListJoiningsRepository, private userEntityService: UserEntityService, private getterService: GetterService, diff --git a/packages/backend/src/server/api/endpoints/users/lists/push.ts b/packages/backend/src/server/api/endpoints/users/lists/push.ts index 2b5b2a345e..831c0f6837 100644 --- a/packages/backend/src/server/api/endpoints/users/lists/push.ts +++ b/packages/backend/src/server/api/endpoints/users/lists/push.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import ms from 'ms'; -import type { MiUserListsRepository, MiUserListJoiningsRepository, MiBlockingsRepository } from '@/models/index.js'; +import type { UserListsRepository, UserListJoiningsRepository, BlockingsRepository } from '@/models/index.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import { GetterService } from '@/server/api/GetterService.js'; import { UserListService } from '@/core/UserListService.js'; @@ -75,13 +75,13 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.userListsRepository) - private userListsRepository: MiUserListsRepository, + private userListsRepository: UserListsRepository, @Inject(DI.userListJoiningsRepository) - private userListJoiningsRepository: MiUserListJoiningsRepository, + private userListJoiningsRepository: UserListJoiningsRepository, @Inject(DI.blockingsRepository) - private blockingsRepository: MiBlockingsRepository, + private blockingsRepository: BlockingsRepository, private getterService: GetterService, private userListService: UserListService, diff --git a/packages/backend/src/server/api/endpoints/users/lists/show.ts b/packages/backend/src/server/api/endpoints/users/lists/show.ts index b1c37e1898..cb86e25d92 100644 --- a/packages/backend/src/server/api/endpoints/users/lists/show.ts +++ b/packages/backend/src/server/api/endpoints/users/lists/show.ts @@ -4,7 +4,7 @@ */ import { Inject, Injectable } from '@nestjs/common'; -import type { MiUserListsRepository, MiUserListFavoritesRepository } from '@/models/index.js'; +import type { UserListsRepository, UserListFavoritesRepository } from '@/models/index.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import { UserListEntityService } from '@/core/entities/UserListEntityService.js'; import { DI } from '@/di-symbols.js'; @@ -47,10 +47,10 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.userListsRepository) - private userListsRepository: MiUserListsRepository, + private userListsRepository: UserListsRepository, @Inject(DI.userListFavoritesRepository) - private userListFavoritesRepository: MiUserListFavoritesRepository, + private userListFavoritesRepository: UserListFavoritesRepository, private userListEntityService: UserListEntityService, ) { diff --git a/packages/backend/src/server/api/endpoints/users/lists/unfavorite.ts b/packages/backend/src/server/api/endpoints/users/lists/unfavorite.ts index 2b0d13a6b3..280a062855 100644 --- a/packages/backend/src/server/api/endpoints/users/lists/unfavorite.ts +++ b/packages/backend/src/server/api/endpoints/users/lists/unfavorite.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { MiUserListFavoritesRepository, MiUserListsRepository } from '@/models/index.js'; +import type { UserListFavoritesRepository, UserListsRepository } from '@/models/index.js'; import { ApiError } from '@/server/api/error.js'; import { DI } from '@/di-symbols.js'; @@ -38,10 +38,10 @@ export const paramDef = { export default class extends Endpoint { constructor ( @Inject(DI.userListsRepository) - private userListsRepository: MiUserListsRepository, + private userListsRepository: UserListsRepository, @Inject(DI.userListFavoritesRepository) - private userListFavoritesRepository: MiUserListFavoritesRepository, + private userListFavoritesRepository: UserListFavoritesRepository, ) { super(meta, paramDef, async (ps, me) => { const userListExist = await this.userListsRepository.exist({ diff --git a/packages/backend/src/server/api/endpoints/users/lists/update.ts b/packages/backend/src/server/api/endpoints/users/lists/update.ts index 97a6a30677..cbc18c8da8 100644 --- a/packages/backend/src/server/api/endpoints/users/lists/update.ts +++ b/packages/backend/src/server/api/endpoints/users/lists/update.ts @@ -4,7 +4,7 @@ */ import { Inject, Injectable } from '@nestjs/common'; -import type { MiUserListsRepository } from '@/models/index.js'; +import type { UserListsRepository } from '@/models/index.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import { UserListEntityService } from '@/core/entities/UserListEntityService.js'; import { DI } from '@/di-symbols.js'; @@ -49,7 +49,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.userListsRepository) - private userListsRepository: MiUserListsRepository, + private userListsRepository: UserListsRepository, private userListEntityService: UserListEntityService, ) { diff --git a/packages/backend/src/server/api/endpoints/users/notes.ts b/packages/backend/src/server/api/endpoints/users/notes.ts index 38188b97fe..1bd849284a 100644 --- a/packages/backend/src/server/api/endpoints/users/notes.ts +++ b/packages/backend/src/server/api/endpoints/users/notes.ts @@ -5,7 +5,7 @@ import { Brackets } from 'typeorm'; import { Inject, Injectable } from '@nestjs/common'; -import type { MiNotesRepository } from '@/models/index.js'; +import type { NotesRepository } from '@/models/index.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import { QueryService } from '@/core/QueryService.js'; import { NoteEntityService } from '@/core/entities/NoteEntityService.js'; @@ -62,7 +62,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.notesRepository) - private notesRepository: MiNotesRepository, + private notesRepository: NotesRepository, private noteEntityService: NoteEntityService, private queryService: QueryService, diff --git a/packages/backend/src/server/api/endpoints/users/pages.ts b/packages/backend/src/server/api/endpoints/users/pages.ts index b5649bd86e..48c2b12303 100644 --- a/packages/backend/src/server/api/endpoints/users/pages.ts +++ b/packages/backend/src/server/api/endpoints/users/pages.ts @@ -7,7 +7,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import { QueryService } from '@/core/QueryService.js'; import { PageEntityService } from '@/core/entities/PageEntityService.js'; -import type { MiPagesRepository } from '@/models/index.js'; +import type { PagesRepository } from '@/models/index.js'; import { DI } from '@/di-symbols.js'; export const meta = { @@ -42,7 +42,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.pagesRepository) - private pagesRepository: MiPagesRepository, + private pagesRepository: PagesRepository, private pageEntityService: PageEntityService, private queryService: QueryService, diff --git a/packages/backend/src/server/api/endpoints/users/reactions.ts b/packages/backend/src/server/api/endpoints/users/reactions.ts index fc8a61ab89..d65cdcfdb9 100644 --- a/packages/backend/src/server/api/endpoints/users/reactions.ts +++ b/packages/backend/src/server/api/endpoints/users/reactions.ts @@ -4,7 +4,7 @@ */ import { Inject, Injectable } from '@nestjs/common'; -import type { MiUserProfilesRepository, MiNoteReactionsRepository } from '@/models/index.js'; +import type { UserProfilesRepository, NoteReactionsRepository } from '@/models/index.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import { QueryService } from '@/core/QueryService.js'; import { NoteReactionEntityService } from '@/core/entities/NoteReactionEntityService.js'; @@ -55,10 +55,10 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.userProfilesRepository) - private userProfilesRepository: MiUserProfilesRepository, + private userProfilesRepository: UserProfilesRepository, @Inject(DI.noteReactionsRepository) - private noteReactionsRepository: MiNoteReactionsRepository, + private noteReactionsRepository: NoteReactionsRepository, private noteReactionEntityService: NoteReactionEntityService, private queryService: QueryService, diff --git a/packages/backend/src/server/api/endpoints/users/recommendation.ts b/packages/backend/src/server/api/endpoints/users/recommendation.ts index 0fa21c7b92..1988d9795d 100644 --- a/packages/backend/src/server/api/endpoints/users/recommendation.ts +++ b/packages/backend/src/server/api/endpoints/users/recommendation.ts @@ -5,7 +5,7 @@ import ms from 'ms'; import { Inject, Injectable } from '@nestjs/common'; -import type { MiUsersRepository, MiFollowingsRepository } from '@/models/index.js'; +import type { UsersRepository, FollowingsRepository } from '@/models/index.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import { QueryService } from '@/core/QueryService.js'; import { UserEntityService } from '@/core/entities/UserEntityService.js'; @@ -45,10 +45,10 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.usersRepository) - private usersRepository: MiUsersRepository, + private usersRepository: UsersRepository, @Inject(DI.followingsRepository) - private followingsRepository: MiFollowingsRepository, + private followingsRepository: FollowingsRepository, private userEntityService: UserEntityService, private queryService: QueryService, diff --git a/packages/backend/src/server/api/endpoints/users/report-abuse.ts b/packages/backend/src/server/api/endpoints/users/report-abuse.ts index b522427d37..03bcc14f76 100644 --- a/packages/backend/src/server/api/endpoints/users/report-abuse.ts +++ b/packages/backend/src/server/api/endpoints/users/report-abuse.ts @@ -5,7 +5,7 @@ import sanitizeHtml from 'sanitize-html'; import { Inject, Injectable } from '@nestjs/common'; -import type { MiAbuseUserReportsRepository } from '@/models/index.js'; +import type { AbuseUserReportsRepository } from '@/models/index.js'; import { IdService } from '@/core/IdService.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import { GlobalEventService } from '@/core/GlobalEventService.js'; @@ -58,7 +58,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.abuseUserReportsRepository) - private abuseUserReportsRepository: MiAbuseUserReportsRepository, + private abuseUserReportsRepository: AbuseUserReportsRepository, private idService: IdService, private metaService: MetaService, diff --git a/packages/backend/src/server/api/endpoints/users/search-by-username-and-host.ts b/packages/backend/src/server/api/endpoints/users/search-by-username-and-host.ts index 057f1ebee8..ee35d298a4 100644 --- a/packages/backend/src/server/api/endpoints/users/search-by-username-and-host.ts +++ b/packages/backend/src/server/api/endpoints/users/search-by-username-and-host.ts @@ -5,7 +5,7 @@ import { Brackets } from 'typeorm'; import { Inject, Injectable } from '@nestjs/common'; -import type { MiUsersRepository, MiFollowingsRepository } from '@/models/index.js'; +import type { UsersRepository, FollowingsRepository } from '@/models/index.js'; import type { Config } from '@/config.js'; import type { MiUser } from '@/models/entities/User.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; @@ -54,10 +54,10 @@ export default class extends Endpoint { private config: Config, @Inject(DI.usersRepository) - private usersRepository: MiUsersRepository, + private usersRepository: UsersRepository, @Inject(DI.followingsRepository) - private followingsRepository: MiFollowingsRepository, + private followingsRepository: FollowingsRepository, private userEntityService: UserEntityService, ) { diff --git a/packages/backend/src/server/api/endpoints/users/search.ts b/packages/backend/src/server/api/endpoints/users/search.ts index fd7046b018..3d6aa1ac9e 100644 --- a/packages/backend/src/server/api/endpoints/users/search.ts +++ b/packages/backend/src/server/api/endpoints/users/search.ts @@ -5,7 +5,7 @@ import { Brackets } from 'typeorm'; import { Inject, Injectable } from '@nestjs/common'; -import type { MiUsersRepository, MiUserProfilesRepository } from '@/models/index.js'; +import type { UsersRepository, UserProfilesRepository } from '@/models/index.js'; import type { MiUser } from '@/models/entities/User.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import { UserEntityService } from '@/core/entities/UserEntityService.js'; @@ -47,10 +47,10 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.usersRepository) - private usersRepository: MiUsersRepository, + private usersRepository: UsersRepository, @Inject(DI.userProfilesRepository) - private userProfilesRepository: MiUserProfilesRepository, + private userProfilesRepository: UserProfilesRepository, private userEntityService: UserEntityService, ) { diff --git a/packages/backend/src/server/api/endpoints/users/show.ts b/packages/backend/src/server/api/endpoints/users/show.ts index 569bdc1a5e..fb8a5c5941 100644 --- a/packages/backend/src/server/api/endpoints/users/show.ts +++ b/packages/backend/src/server/api/endpoints/users/show.ts @@ -5,7 +5,7 @@ import { In, IsNull } from 'typeorm'; import { Inject, Injectable } from '@nestjs/common'; -import type { MiUsersRepository } from '@/models/index.js'; +import type { UsersRepository } from '@/models/index.js'; import type { MiUser } from '@/models/entities/User.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import { UserEntityService } from '@/core/entities/UserEntityService.js'; @@ -84,7 +84,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.usersRepository) - private usersRepository: MiUsersRepository, + private usersRepository: UsersRepository, private userEntityService: UserEntityService, private remoteUserResolveService: RemoteUserResolveService, diff --git a/packages/backend/src/server/api/endpoints/users/update-memo.ts b/packages/backend/src/server/api/endpoints/users/update-memo.ts index 399420b057..a100c3aa9c 100644 --- a/packages/backend/src/server/api/endpoints/users/update-memo.ts +++ b/packages/backend/src/server/api/endpoints/users/update-memo.ts @@ -6,7 +6,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import { IdService } from '@/core/IdService.js'; -import type { MiUserMemoRepository } from '@/models/index.js'; +import type { UserMemoRepository } from '@/models/index.js'; import { DI } from '@/di-symbols.js'; import { GetterService } from '@/server/api/GetterService.js'; import { ApiError } from '../../error.js'; @@ -45,7 +45,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.userMemosRepository) - private userMemosRepository: MiUserMemoRepository, + private userMemosRepository: UserMemoRepository, private getterService: GetterService, private idService: IdService, ) { diff --git a/packages/backend/src/server/api/stream/channels/user-list.ts b/packages/backend/src/server/api/stream/channels/user-list.ts index 825e521df6..557b934722 100644 --- a/packages/backend/src/server/api/stream/channels/user-list.ts +++ b/packages/backend/src/server/api/stream/channels/user-list.ts @@ -4,7 +4,7 @@ */ import { Inject, Injectable } from '@nestjs/common'; -import type { MiUserListJoiningsRepository, MiUserListsRepository } from '@/models/index.js'; +import type { UserListJoiningsRepository, UserListsRepository } from '@/models/index.js'; import type { MiUser } from '@/models/entities/User.js'; import { isUserRelated } from '@/misc/is-user-related.js'; import type { Packed } from '@/misc/json-schema.js'; @@ -22,8 +22,8 @@ class UserListChannel extends Channel { private listUsersClock: NodeJS.Timer; constructor( - private userListsRepository: MiUserListsRepository, - private userListJoiningsRepository: MiUserListJoiningsRepository, + private userListsRepository: UserListsRepository, + private userListJoiningsRepository: UserListJoiningsRepository, private noteEntityService: NoteEntityService, id: string, @@ -122,10 +122,10 @@ export class UserListChannelService { constructor( @Inject(DI.userListsRepository) - private userListsRepository: MiUserListsRepository, + private userListsRepository: UserListsRepository, @Inject(DI.userListJoiningsRepository) - private userListJoiningsRepository: MiUserListJoiningsRepository, + private userListJoiningsRepository: UserListJoiningsRepository, private noteEntityService: NoteEntityService, ) { diff --git a/packages/backend/src/server/oauth/OAuth2ProviderService.ts b/packages/backend/src/server/oauth/OAuth2ProviderService.ts index 623996cda1..6ad8da0ced 100644 --- a/packages/backend/src/server/oauth/OAuth2ProviderService.ts +++ b/packages/backend/src/server/oauth/OAuth2ProviderService.ts @@ -23,7 +23,7 @@ import { kinds } from '@/misc/api-permissions.js'; import type { Config } from '@/config.js'; import { DI } from '@/di-symbols.js'; import { bindThis } from '@/decorators.js'; -import type { MiAccessTokensRepository, MiUsersRepository } from '@/models/index.js'; +import type { AccessTokensRepository, UsersRepository } from '@/models/index.js'; import { IdService } from '@/core/IdService.js'; import { CacheService } from '@/core/CacheService.js'; import type { MiLocalUser } from '@/models/entities/User.js'; @@ -236,10 +236,10 @@ export class OAuth2ProviderService { private config: Config, private httpRequestService: HttpRequestService, @Inject(DI.accessTokensRepository) - accessTokensRepository: MiAccessTokensRepository, + accessTokensRepository: AccessTokensRepository, idService: IdService, @Inject(DI.usersRepository) - private usersRepository: MiUsersRepository, + private usersRepository: UsersRepository, private cacheService: CacheService, loggerService: LoggerService, ) { diff --git a/packages/backend/src/server/web/ClientServerService.ts b/packages/backend/src/server/web/ClientServerService.ts index b5e280e648..b2b443cf36 100644 --- a/packages/backend/src/server/web/ClientServerService.ts +++ b/packages/backend/src/server/web/ClientServerService.ts @@ -31,7 +31,7 @@ import { PageEntityService } from '@/core/entities/PageEntityService.js'; import { GalleryPostEntityService } from '@/core/entities/GalleryPostEntityService.js'; import { ClipEntityService } from '@/core/entities/ClipEntityService.js'; import { ChannelEntityService } from '@/core/entities/ChannelEntityService.js'; -import type { MiChannelsRepository, MiClipsRepository, MiFlashsRepository, MiGalleryPostsRepository, MiMeta, MiNotesRepository, MiPagesRepository, MiUserProfilesRepository, MiUsersRepository } from '@/models/index.js'; +import type { ChannelsRepository, ClipsRepository, FlashsRepository, GalleryPostsRepository, MiMeta, NotesRepository, PagesRepository, UserProfilesRepository, UsersRepository } from '@/models/index.js'; import type Logger from '@/logger.js'; import { deepClone } from '@/misc/clone.js'; import { bindThis } from '@/decorators.js'; @@ -61,28 +61,28 @@ export class ClientServerService { private config: Config, @Inject(DI.usersRepository) - private usersRepository: MiUsersRepository, + private usersRepository: UsersRepository, @Inject(DI.userProfilesRepository) - private userProfilesRepository: MiUserProfilesRepository, + private userProfilesRepository: UserProfilesRepository, @Inject(DI.notesRepository) - private notesRepository: MiNotesRepository, + private notesRepository: NotesRepository, @Inject(DI.galleryPostsRepository) - private galleryPostsRepository: MiGalleryPostsRepository, + private galleryPostsRepository: GalleryPostsRepository, @Inject(DI.channelsRepository) - private channelsRepository: MiChannelsRepository, + private channelsRepository: ChannelsRepository, @Inject(DI.clipsRepository) - private clipsRepository: MiClipsRepository, + private clipsRepository: ClipsRepository, @Inject(DI.pagesRepository) - private pagesRepository: MiPagesRepository, + private pagesRepository: PagesRepository, @Inject(DI.flashsRepository) - private flashsRepository: MiFlashsRepository, + private flashsRepository: FlashsRepository, private flashEntityService: FlashEntityService, private userEntityService: UserEntityService, diff --git a/packages/backend/src/server/web/FeedService.ts b/packages/backend/src/server/web/FeedService.ts index 920a6a1079..27e8431839 100644 --- a/packages/backend/src/server/web/FeedService.ts +++ b/packages/backend/src/server/web/FeedService.ts @@ -7,7 +7,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { In, IsNull } from 'typeorm'; import { Feed } from 'feed'; import { DI } from '@/di-symbols.js'; -import type { MiDriveFilesRepository, MiNotesRepository, MiUserProfilesRepository } from '@/models/index.js'; +import type { DriveFilesRepository, NotesRepository, UserProfilesRepository } from '@/models/index.js'; import type { Config } from '@/config.js'; import type { MiUser } from '@/models/entities/User.js'; import { UserEntityService } from '@/core/entities/UserEntityService.js'; @@ -21,13 +21,13 @@ export class FeedService { private config: Config, @Inject(DI.userProfilesRepository) - private userProfilesRepository: MiUserProfilesRepository, + private userProfilesRepository: UserProfilesRepository, @Inject(DI.notesRepository) - private notesRepository: MiNotesRepository, + private notesRepository: NotesRepository, @Inject(DI.driveFilesRepository) - private driveFilesRepository: MiDriveFilesRepository, + private driveFilesRepository: DriveFilesRepository, private userEntityService: UserEntityService, private driveFileEntityService: DriveFileEntityService,