Mizah/mizzkey
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

wip

Browse source
This commit is contained in:
syuilo 2023-08-16 15:31:34 +09:00
parent 36c7c6355f
commit c1c13b37d2
389 changed files with 1130 additions and 1130 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
packages/backend/src/core/AccountMoveService.ts
View file

@ -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 { BlockingsRepository, FollowingsRepository, InstancesRepository, MutingsRepository, UserListJoiningsRepository, UsersRepository } from '@/models/index.js';
import type { MiBlockingsRepository, MiFollowingsRepository, MiInstancesRepository, MiMutingsRepository, MiUserListJoiningsRepository, MiUsersRepository } 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: UsersRepository,
private usersRepository: MiUsersRepository,
@Inject(DI.followingsRepository)
private followingsRepository: FollowingsRepository,
private followingsRepository: MiFollowingsRepository,
@Inject(DI.blockingsRepository)
private blockingsRepository: BlockingsRepository,
private blockingsRepository: MiBlockingsRepository,
@Inject(DI.mutingsRepository)
private mutingsRepository: MutingsRepository,
private mutingsRepository: MiMutingsRepository,
@Inject(DI.userListJoiningsRepository)
private userListJoiningsRepository: UserListJoiningsRepository,
private userListJoiningsRepository: MiUserListJoiningsRepository,
@Inject(DI.instancesRepository)
private instancesRepository: InstancesRepository,
private instancesRepository: MiInstancesRepository,
private userEntityService: UserEntityService,
private idService: IdService,

4
packages/backend/src/core/AccountUpdateService.ts
View file

@ -5,7 +5,7 @@
import { Inject, Injectable } from '@nestjs/common';
import { DI } from '@/di-symbols.js';
import type { UsersRepository } from '@/models/index.js';
import type { MiUsersRepository } 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: UsersRepository,
private usersRepository: MiUsersRepository,
private userEntityService: UserEntityService,
private apRendererService: ApRendererService,

4
packages/backend/src/core/AchievementService.ts
View file

@ -4,7 +4,7 @@
*/
import { Inject, Injectable } from '@nestjs/common';
import type { UserProfilesRepository } from '@/models/index.js';
import type { MiUserProfilesRepository } 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: UserProfilesRepository,
private userProfilesRepository: MiUserProfilesRepository,
private notificationService: NotificationService,
) {

6
packages/backend/src/core/AnnouncementService.ts
View file

@ -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 { AnnouncementReadsRepository, AnnouncementsRepository, MiAnnouncement, MiAnnouncementRead } from '@/models/index.js';
import type { MiAnnouncementReadsRepository, MiAnnouncementsRepository, 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: AnnouncementsRepository,
private announcementsRepository: MiAnnouncementsRepository,
@Inject(DI.announcementReadsRepository)
private announcementReadsRepository: AnnouncementReadsRepository,
private announcementReadsRepository: MiAnnouncementReadsRepository,
private idService: IdService,
private globalEventService: GlobalEventService,

6
packages/backend/src/core/AntennaService.ts
View file

@ -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 { AntennasRepository, UserListJoiningsRepository } from '@/models/index.js';
import type { MiAntennasRepository, MiUserListJoiningsRepository } 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: AntennasRepository,
private antennasRepository: MiAntennasRepository,
@Inject(DI.userListJoiningsRepository)
private userListJoiningsRepository: UserListJoiningsRepository,
private userListJoiningsRepository: MiUserListJoiningsRepository,
private utilityService: UtilityService,
private globalEventService: GlobalEventService,

16
packages/backend/src/core/CacheService.ts
View file

@ -5,7 +5,7 @@
import { Inject, Injectable } from '@nestjs/common';
import * as Redis from 'ioredis';
import type { BlockingsRepository, ChannelFollowingsRepository, FollowingsRepository, MutingsRepository, RenoteMutingsRepository, MiUserProfile, UserProfilesRepository, UsersRepository } from '@/models/index.js';
import type { MiBlockingsRepository, MiChannelFollowingsRepository, MiFollowingsRepository, MiMutingsRepository, MiRenoteMutingsRepository, MiUserProfile, MiUserProfilesRepository, MiUsersRepository } 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: UsersRepository,
private usersRepository: MiUsersRepository,
@Inject(DI.userProfilesRepository)
private userProfilesRepository: UserProfilesRepository,
private userProfilesRepository: MiUserProfilesRepository,
@Inject(DI.mutingsRepository)
private mutingsRepository: MutingsRepository,
private mutingsRepository: MiMutingsRepository,
@Inject(DI.blockingsRepository)
private blockingsRepository: BlockingsRepository,
private blockingsRepository: MiBlockingsRepository,
@Inject(DI.renoteMutingsRepository)
private renoteMutingsRepository: RenoteMutingsRepository,
private renoteMutingsRepository: MiRenoteMutingsRepository,
@Inject(DI.followingsRepository)
private followingsRepository: FollowingsRepository,
private followingsRepository: MiFollowingsRepository,
@Inject(DI.channelFollowingsRepository)
private channelFollowingsRepository: ChannelFollowingsRepository,
private channelFollowingsRepository: MiChannelFollowingsRepository,
private userEntityService: UserEntityService,
) {

4
packages/backend/src/core/CustomEmojiService.ts
View file

@ -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 { EmojisRepository, MiRole } from '@/models/index.js';
import type { MiEmojisRepository, 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: EmojisRepository,
private emojisRepository: MiEmojisRepository,
private utilityService: UtilityService,
private idService: IdService,

4
packages/backend/src/core/DeleteAccountService.ts
View file

@ -4,7 +4,7 @@
*/
import { Inject, Injectable } from '@nestjs/common';
import type { UsersRepository } from '@/models/index.js';
import type { MiUsersRepository } 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: UsersRepository,
private usersRepository: MiUsersRepository,
private userSuspendService: UserSuspendService,
private queueService: QueueService,

10
packages/backend/src/core/DriveService.ts
View file

@ -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 { DriveFilesRepository, UsersRepository, DriveFoldersRepository, UserProfilesRepository } from '@/models/index.js';
import type { MiDriveFilesRepository, MiUsersRepository, MiDriveFoldersRepository, MiUserProfilesRepository } 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: UsersRepository,
private usersRepository: MiUsersRepository,
@Inject(DI.userProfilesRepository)
private userProfilesRepository: UserProfilesRepository,
private userProfilesRepository: MiUserProfilesRepository,
@Inject(DI.driveFilesRepository)
private driveFilesRepository: DriveFilesRepository,
private driveFilesRepository: MiDriveFilesRepository,
@Inject(DI.driveFoldersRepository)
private driveFoldersRepository: DriveFoldersRepository,
private driveFoldersRepository: MiDriveFoldersRepository,
private fileInfoService: FileInfoService,
private userEntityService: UserEntityService,

4
packages/backend/src/core/EmailService.ts
View file

@ -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 { UserProfilesRepository } from '@/models/index.js';
import type { MiUserProfilesRepository } 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: UserProfilesRepository,
private userProfilesRepository: MiUserProfilesRepository,
private metaService: MetaService,
private loggerService: LoggerService,

4
packages/backend/src/core/FederatedInstanceService.ts
View file

@ -5,7 +5,7 @@
import { Inject, Injectable, OnApplicationShutdown } from '@nestjs/common';
import * as Redis from 'ioredis';
import type { InstancesRepository } from '@/models/index.js';
import type { MiInstancesRepository } 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: InstancesRepository,
private instancesRepository: MiInstancesRepository,
private utilityService: UtilityService,
private idService: IdService,

4
packages/backend/src/core/HashtagService.ts
View file

@ -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 { HashtagsRepository } from '@/models/index.js';
import type { MiHashtagsRepository } 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: HashtagsRepository,
private hashtagsRepository: MiHashtagsRepository,
private userEntityService: UserEntityService,
private idService: IdService,

4
packages/backend/src/core/InstanceActorService.ts
View file

@ -6,7 +6,7 @@
import { Inject, Injectable } from '@nestjs/common';
import { IsNull } from 'typeorm';
import type { MiLocalUser } from '@/models/entities/User.js';
import type { UsersRepository } from '@/models/index.js';
import type { MiUsersRepository } 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: UsersRepository,
private usersRepository: MiUsersRepository,
private createSystemUserService: CreateSystemUserService,
) {

4
packages/backend/src/core/ModerationLogService.ts
View file

@ -5,7 +5,7 @@
import { Inject, Injectable } from '@nestjs/common';
import { DI } from '@/di-symbols.js';
import type { ModerationLogsRepository } from '@/models/index.js';
import type { MiModerationLogsRepository } 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: ModerationLogsRepository,
private moderationLogsRepository: MiModerationLogsRepository,
private idService: IdService,
) {

20
packages/backend/src/core/NoteCreateService.ts
View file

@ -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 { ChannelsRepository, InstancesRepository, MutedNotesRepository, MutingsRepository, NotesRepository, NoteThreadMutingsRepository, UserProfilesRepository, UsersRepository } from '@/models/index.js';
import type { MiChannelsRepository, MiInstancesRepository, MiMutedNotesRepository, MiMutingsRepository, MiNotesRepository, MiNoteThreadMutingsRepository, MiUserProfilesRepository, MiUsersRepository } 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: MutingsRepository,
private mutingsRepository: MiMutingsRepository,
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: UsersRepository,
private usersRepository: MiUsersRepository,
@Inject(DI.notesRepository)
private notesRepository: NotesRepository,
private notesRepository: MiNotesRepository,
@Inject(DI.mutingsRepository)
private mutingsRepository: MutingsRepository,
private mutingsRepository: MiMutingsRepository,
@Inject(DI.instancesRepository)
private instancesRepository: InstancesRepository,
private instancesRepository: MiInstancesRepository,
@Inject(DI.userProfilesRepository)
private userProfilesRepository: UserProfilesRepository,
private userProfilesRepository: MiUserProfilesRepository,
@Inject(DI.mutedNotesRepository)
private mutedNotesRepository: MutedNotesRepository,
private mutedNotesRepository: MiMutedNotesRepository,
@Inject(DI.channelsRepository)
private channelsRepository: ChannelsRepository,
private channelsRepository: MiChannelsRepository,
@Inject(DI.noteThreadMutingsRepository)
private noteThreadMutingsRepository: NoteThreadMutingsRepository,
private noteThreadMutingsRepository: MiNoteThreadMutingsRepository,
private userEntityService: UserEntityService,
private noteEntityService: NoteEntityService,

8
packages/backend/src/core/NoteDeleteService.ts
View file

@ -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 { InstancesRepository, NotesRepository, UsersRepository } from '@/models/index.js';
import type { MiInstancesRepository, MiNotesRepository, MiUsersRepository } 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: UsersRepository,
private usersRepository: MiUsersRepository,
@Inject(DI.notesRepository)
private notesRepository: NotesRepository,
private notesRepository: MiNotesRepository,
@Inject(DI.instancesRepository)
private instancesRepository: InstancesRepository,
private instancesRepository: MiInstancesRepository,
private userEntityService: UserEntityService,
private noteEntityService: NoteEntityService,

8
packages/backend/src/core/NotePiningService.ts
View file

@ -5,7 +5,7 @@
import { Inject, Injectable } from '@nestjs/common';
import { DI } from '@/di-symbols.js';
import type { NotesRepository, UserNotePiningsRepository, UsersRepository } from '@/models/index.js';
import type { MiNotesRepository, MiUserNotePiningsRepository, MiUsersRepository } 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: UsersRepository,
private usersRepository: MiUsersRepository,
@Inject(DI.notesRepository)
private notesRepository: NotesRepository,
private notesRepository: MiNotesRepository,
@Inject(DI.userNotePiningsRepository)
private userNotePiningsRepository: UserNotePiningsRepository,
private userNotePiningsRepository: MiUserNotePiningsRepository,
private userEntityService: UserEntityService,
private idService: IdService,

8
packages/backend/src/core/NoteReadService.ts
View file

@ -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 { NoteUnreadsRepository, MutingsRepository, NoteThreadMutingsRepository } from '@/models/index.js';
import type { MiNoteUnreadsRepository, MiMutingsRepository, MiNoteThreadMutingsRepository } 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: NoteUnreadsRepository,
private noteUnreadsRepository: MiNoteUnreadsRepository,
@Inject(DI.mutingsRepository)
private mutingsRepository: MutingsRepository,
private mutingsRepository: MiMutingsRepository,
@Inject(DI.noteThreadMutingsRepository)
private noteThreadMutingsRepository: NoteThreadMutingsRepository,
private noteThreadMutingsRepository: MiNoteThreadMutingsRepository,
private idService: IdService,
private globalEventService: GlobalEventService,

4
packages/backend/src/core/NotificationService.ts
View file

@ -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 { UsersRepository } from '@/models/index.js';
import type { MiUsersRepository } 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: UsersRepository,
private usersRepository: MiUsersRepository,
private notificationEntityService: NotificationEntityService,
private idService: IdService,

10
packages/backend/src/core/PollService.ts
View file

@ -5,7 +5,7 @@
import { Inject, Injectable } from '@nestjs/common';
import { DI } from '@/di-symbols.js';
import type { NotesRepository, UsersRepository, PollsRepository, PollVotesRepository, MiUser } from '@/models/index.js';
import type { MiNotesRepository, MiUsersRepository, MiPollsRepository, MiPollVotesRepository, 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: UsersRepository,
private usersRepository: MiUsersRepository,
@Inject(DI.notesRepository)
private notesRepository: NotesRepository,
private notesRepository: MiNotesRepository,
@Inject(DI.pollsRepository)
private pollsRepository: PollsRepository,
private pollsRepository: MiPollsRepository,
@Inject(DI.pollVotesRepository)
private pollVotesRepository: PollVotesRepository,
private pollVotesRepository: MiPollVotesRepository,
private userEntityService: UserEntityService,
private idService: IdService,

4
packages/backend/src/core/ProxyAccountService.ts
View file

@ -4,7 +4,7 @@
*/
import { Inject, Injectable } from '@nestjs/common';
import type { UsersRepository } from '@/models/index.js';
import type { MiUsersRepository } 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: UsersRepository,
private usersRepository: MiUsersRepository,
private metaService: MetaService,
) {

4
packages/backend/src/core/PushNotificationService.ts
View file

@ -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, SwSubscriptionsRepository } from '@/models/index.js';
import type { MiSwSubscription, MiSwSubscriptionsRepository } 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: SwSubscriptionsRepository,
private swSubscriptionsRepository: MiSwSubscriptionsRepository,
private metaService: MetaService,
) {

18
packages/backend/src/core/QueryService.ts
View file

@ -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 { UserProfilesRepository, FollowingsRepository, ChannelFollowingsRepository, MutedNotesRepository, BlockingsRepository, NoteThreadMutingsRepository, MutingsRepository, RenoteMutingsRepository } from '@/models/index.js';
import type { MiUserProfilesRepository, MiFollowingsRepository, MiChannelFollowingsRepository, MiMutedNotesRepository, MiBlockingsRepository, MiNoteThreadMutingsRepository, MiMutingsRepository, MiRenoteMutingsRepository } 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: UserProfilesRepository,
private userProfilesRepository: MiUserProfilesRepository,
@Inject(DI.followingsRepository)
private followingsRepository: FollowingsRepository,
private followingsRepository: MiFollowingsRepository,
@Inject(DI.channelFollowingsRepository)
private channelFollowingsRepository: ChannelFollowingsRepository,
private channelFollowingsRepository: MiChannelFollowingsRepository,
@Inject(DI.mutedNotesRepository)
private mutedNotesRepository: MutedNotesRepository,
private mutedNotesRepository: MiMutedNotesRepository,
@Inject(DI.blockingsRepository)
private blockingsRepository: BlockingsRepository,
private blockingsRepository: MiBlockingsRepository,
@Inject(DI.noteThreadMutingsRepository)
private noteThreadMutingsRepository: NoteThreadMutingsRepository,
private noteThreadMutingsRepository: MiNoteThreadMutingsRepository,
@Inject(DI.mutingsRepository)
private mutingsRepository: MutingsRepository,
private mutingsRepository: MiMutingsRepository,
@Inject(DI.renoteMutingsRepository)
private renoteMutingsRepository: RenoteMutingsRepository,
private renoteMutingsRepository: MiRenoteMutingsRepository,
) {
}

10
packages/backend/src/core/ReactionService.ts
View file

@ -5,7 +5,7 @@
import { Inject, Injectable } from '@nestjs/common';
import { DI } from '@/di-symbols.js';
import type { EmojisRepository, NoteReactionsRepository, UsersRepository, NotesRepository } from '@/models/index.js';
import type { MiEmojisRepository, MiNoteReactionsRepository, MiUsersRepository, MiNotesRepository } 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: UsersRepository,
private usersRepository: MiUsersRepository,
@Inject(DI.notesRepository)
private notesRepository: NotesRepository,
private notesRepository: MiNotesRepository,
@Inject(DI.noteReactionsRepository)
private noteReactionsRepository: NoteReactionsRepository,
private noteReactionsRepository: MiNoteReactionsRepository,
@Inject(DI.emojisRepository)
private emojisRepository: EmojisRepository,
private emojisRepository: MiEmojisRepository,
private utilityService: UtilityService,
private metaService: MetaService,

6
packages/backend/src/core/RelayService.ts
View file

@ -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 { RelaysRepository, UsersRepository } from '@/models/index.js';
import type { MiRelaysRepository, MiUsersRepository } 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: UsersRepository,
private usersRepository: MiUsersRepository,
@Inject(DI.relaysRepository)
private relaysRepository: RelaysRepository,
private relaysRepository: MiRelaysRepository,
private idService: IdService,
private queueService: QueueService,

4
packages/backend/src/core/RemoteUserResolveService.ts
View file

@ -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 { UsersRepository } from '@/models/index.js';
import type { MiUsersRepository } 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: UsersRepository,
private usersRepository: MiUsersRepository,
private utilityService: UtilityService,
private webfingerService: WebfingerService,

8
packages/backend/src/core/RoleService.ts
View file

@ -6,7 +6,7 @@
import { Inject, Injectable } from '@nestjs/common';
import * as Redis from 'ioredis';
import { In } from 'typeorm';
import type { MiRole, MiRoleAssignment, RoleAssignmentsRepository, RolesRepository, UsersRepository } from '@/models/index.js';
import type { MiRole, MiRoleAssignment, MiRoleAssignmentsRepository, MiRolesRepository, MiUsersRepository } 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: UsersRepository,
private usersRepository: MiUsersRepository,
@Inject(DI.rolesRepository)
private rolesRepository: RolesRepository,
private rolesRepository: MiRolesRepository,
@Inject(DI.roleAssignmentsRepository)
private roleAssignmentsRepository: RoleAssignmentsRepository,
private roleAssignmentsRepository: MiRoleAssignmentsRepository,
private metaService: MetaService,
private cacheService: CacheService,

4
packages/backend/src/core/SearchService.ts
View file

@ -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 { NotesRepository } from '@/models/index.js';
import type { MiNotesRepository } 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: NotesRepository,
private notesRepository: MiNotesRepository,
private queryService: QueryService,
private idService: IdService,

6
packages/backend/src/core/SignupService.ts
View file

@ -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 { UsedUsernamesRepository, UsersRepository } from '@/models/index.js';
import type { MiUsedUsernamesRepository, MiUsersRepository } 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: UsersRepository,
private usersRepository: MiUsersRepository,
@Inject(DI.usedUsernamesRepository)
private usedUsernamesRepository: UsedUsernamesRepository,
private usedUsernamesRepository: MiUsedUsernamesRepository,
private utilityService: UtilityService,
private userEntityService: UserEntityService,

10
packages/backend/src/core/UserBlockingService.ts
View file

@ -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 { FollowRequestsRepository, BlockingsRepository, UserListsRepository, UserListJoiningsRepository } from '@/models/index.js';
import type { MiFollowRequestsRepository, MiBlockingsRepository, MiUserListsRepository, MiUserListJoiningsRepository } 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: FollowRequestsRepository,
private followRequestsRepository: MiFollowRequestsRepository,
@Inject(DI.blockingsRepository)
private blockingsRepository: BlockingsRepository,
private blockingsRepository: MiBlockingsRepository,
@Inject(DI.userListsRepository)
private userListsRepository: UserListsRepository,
private userListsRepository: MiUserListsRepository,
@Inject(DI.userListJoiningsRepository)
private userListJoiningsRepository: UserListJoiningsRepository,
private userListJoiningsRepository: MiUserListJoiningsRepository,
private cacheService: CacheService,
private userEntityService: UserEntityService,

12
packages/backend/src/core/UserFollowingService.ts
View file

@ -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 { FollowingsRepository, FollowRequestsRepository, InstancesRepository, UserProfilesRepository, UsersRepository } from '@/models/index.js';
import type { MiFollowingsRepository, MiFollowRequestsRepository, MiInstancesRepository, MiUserProfilesRepository, MiUsersRepository } 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: UsersRepository,
private usersRepository: MiUsersRepository,
@Inject(DI.userProfilesRepository)
private userProfilesRepository: UserProfilesRepository,
private userProfilesRepository: MiUserProfilesRepository,
@Inject(DI.followingsRepository)
private followingsRepository: FollowingsRepository,
private followingsRepository: MiFollowingsRepository,
@Inject(DI.followRequestsRepository)
private followRequestsRepository: FollowRequestsRepository,
private followRequestsRepository: MiFollowRequestsRepository,
@Inject(DI.instancesRepository)
private instancesRepository: InstancesRepository,
private instancesRepository: MiInstancesRepository,
private cacheService: CacheService,
private userEntityService: UserEntityService,

4
packages/backend/src/core/UserKeypairService.ts
View file

@ -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 { UserKeypairsRepository } from '@/models/index.js';
import type { MiUserKeypairsRepository } 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: UserKeypairsRepository,
private userKeypairsRepository: MiUserKeypairsRepository,
) {
this.cache = new RedisKVCache<MiUserKeypair>(this.redisClient, 'userKeypair', {
lifetime: 1000 * 60 * 60 * 24, // 24h

4
packages/backend/src/core/UserListService.ts
View file

@ -4,7 +4,7 @@
*/
import { Inject, Injectable } from '@nestjs/common';
import type { UserListJoiningsRepository } from '@/models/index.js';
import type { MiUserListJoiningsRepository } 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: UserListJoiningsRepository,
private userListJoiningsRepository: MiUserListJoiningsRepository,
private userEntityService: UserEntityService,
private idService: IdService,

4
packages/backend/src/core/UserMutingService.ts
View file

@ -5,7 +5,7 @@
import { Inject, Injectable } from '@nestjs/common';
import { In } from 'typeorm';
import type { MutingsRepository, MiMuting } from '@/models/index.js';
import type { MiMutingsRepository, 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: MutingsRepository,
private mutingsRepository: MiMutingsRepository,
private idService: IdService,
private cacheService: CacheService,

4
packages/backend/src/core/UserSuspendService.ts
View file

@ -5,7 +5,7 @@
import { Inject, Injectable } from '@nestjs/common';
import { Not, IsNull } from 'typeorm';
import type { FollowingsRepository } from '@/models/index.js';
import type { MiFollowingsRepository } 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: FollowingsRepository,
private followingsRepository: MiFollowingsRepository,
private userEntityService: UserEntityService,
private queueService: QueueService,

4
packages/backend/src/core/WebhookService.ts
View file

@ -5,7 +5,7 @@
import { Inject, Injectable } from '@nestjs/common';
import * as Redis from 'ioredis';
import type { WebhooksRepository } from '@/models/index.js';
import type { MiWebhooksRepository } 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: WebhooksRepository,
private webhooksRepository: MiWebhooksRepository,
) {
//this.onMessage = this.onMessage.bind(this);
this.redisForSub.on('message', this.onMessage);

8
packages/backend/src/core/activitypub/ApDbResolverService.ts
View file

@ -5,7 +5,7 @@
import { Inject, Injectable, OnApplicationShutdown } from '@nestjs/common';
import { DI } from '@/di-symbols.js';
import type { NotesRepository, UserPublickeysRepository, UsersRepository } from '@/models/index.js';
import type { MiNotesRepository, MiUserPublickeysRepository, MiUsersRepository } 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: UsersRepository,
private usersRepository: MiUsersRepository,
@Inject(DI.notesRepository)
private notesRepository: NotesRepository,
private notesRepository: MiNotesRepository,
@Inject(DI.userPublickeysRepository)
private userPublickeysRepository: UserPublickeysRepository,
private userPublickeysRepository: MiUserPublickeysRepository,
private cacheService: CacheService,
private apPersonService: ApPersonService,

6
packages/backend/src/core/activitypub/ApDeliverManagerService.ts
View file

@ -6,7 +6,7 @@
import { Inject, Injectable } from '@nestjs/common';
import { IsNull, Not } from 'typeorm';
import { DI } from '@/di-symbols.js';
import type { FollowingsRepository } from '@/models/index.js';
import type { MiFollowingsRepository } 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: FollowingsRepository,
private followingsRepository: MiFollowingsRepository,
private queueService: QueueService,
actor: { id: MiUser['id']; host: null; },
@ -152,7 +152,7 @@ class DeliverManager {
export class ApDeliverManagerService {
constructor(
@Inject(DI.followingsRepository)
private followingsRepository: FollowingsRepository,
private followingsRepository: MiFollowingsRepository,
private userEntityService: UserEntityService,
private queueService: QueueService,

12
packages/backend/src/core/activitypub/ApInboxService.ts
View file

@ -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 { UsersRepository, NotesRepository, FollowingsRepository, AbuseUserReportsRepository, FollowRequestsRepository } from '@/models/index.js';
import type { MiUsersRepository, MiNotesRepository, MiFollowingsRepository, MiAbuseUserReportsRepository, MiFollowRequestsRepository } 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: UsersRepository,
private usersRepository: MiUsersRepository,
@Inject(DI.notesRepository)
private notesRepository: NotesRepository,
private notesRepository: MiNotesRepository,
@Inject(DI.followingsRepository)
private followingsRepository: FollowingsRepository,
private followingsRepository: MiFollowingsRepository,
@Inject(DI.abuseUserReportsRepository)
private abuseUserReportsRepository: AbuseUserReportsRepository,
private abuseUserReportsRepository: MiAbuseUserReportsRepository,
@Inject(DI.followRequestsRepository)
private followRequestsRepository: FollowRequestsRepository,
private followRequestsRepository: MiFollowRequestsRepository,
private userEntityService: UserEntityService,
private noteEntityService: NoteEntityService,

12
packages/backend/src/core/activitypub/ApRendererService.ts
View file

@ -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 { UsersRepository, UserProfilesRepository, NotesRepository, DriveFilesRepository, PollsRepository } from '@/models/index.js';
import type { MiUsersRepository, MiUserProfilesRepository, MiNotesRepository, MiDriveFilesRepository, MiPollsRepository } 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: UsersRepository,
private usersRepository: MiUsersRepository,
@Inject(DI.userProfilesRepository)
private userProfilesRepository: UserProfilesRepository,
private userProfilesRepository: MiUserProfilesRepository,
@Inject(DI.notesRepository)
private notesRepository: NotesRepository,
private notesRepository: MiNotesRepository,
@Inject(DI.driveFilesRepository)
private driveFilesRepository: DriveFilesRepository,
private driveFilesRepository: MiDriveFilesRepository,
@Inject(DI.pollsRepository)
private pollsRepository: PollsRepository,
private pollsRepository: MiPollsRepository,
private customEmojiService: CustomEmojiService,
private userEntityService: UserEntityService,

18
packages/backend/src/core/activitypub/ApResolverService.ts
View file

@ -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 { NotesRepository, PollsRepository, NoteReactionsRepository, UsersRepository } from '@/models/index.js';
import type { MiNotesRepository, MiPollsRepository, MiNoteReactionsRepository, MiUsersRepository } 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: UsersRepository,
private notesRepository: NotesRepository,
private pollsRepository: PollsRepository,
private noteReactionsRepository: NoteReactionsRepository,
private usersRepository: MiUsersRepository,
private notesRepository: MiNotesRepository,
private pollsRepository: MiPollsRepository,
private noteReactionsRepository: MiNoteReactionsRepository,
private utilityService: UtilityService,
private instanceActorService: InstanceActorService,
private metaService: MetaService,
@ -166,16 +166,16 @@ export class ApResolverService {
private config: Config,
@Inject(DI.usersRepository)
private usersRepository: UsersRepository,
private usersRepository: MiUsersRepository,
@Inject(DI.notesRepository)
private notesRepository: NotesRepository,
private notesRepository: MiNotesRepository,
@Inject(DI.pollsRepository)
private pollsRepository: PollsRepository,
private pollsRepository: MiPollsRepository,
@Inject(DI.noteReactionsRepository)
private noteReactionsRepository: NoteReactionsRepository,
private noteReactionsRepository: MiNoteReactionsRepository,
private utilityService: UtilityService,
private instanceActorService: InstanceActorService,

4
packages/backend/src/core/activitypub/models/ApImageService.ts
View file

@ -5,7 +5,7 @@
import { Inject, Injectable } from '@nestjs/common';
import { DI } from '@/di-symbols.js';
import type { DriveFilesRepository } from '@/models/index.js';
import type { MiDriveFilesRepository } 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: DriveFilesRepository,
private driveFilesRepository: MiDriveFilesRepository,
private metaService: MetaService,
private apResolverService: ApResolverService,

6
packages/backend/src/core/activitypub/models/ApNoteService.ts
View file

@ -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 { PollsRepository, EmojisRepository } from '@/models/index.js';
import type { MiPollsRepository, MiEmojisRepository } 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: PollsRepository,
private pollsRepository: MiPollsRepository,
@Inject(DI.emojisRepository)
private emojisRepository: EmojisRepository,
private emojisRepository: MiEmojisRepository,
private idService: IdService,
private apMfmService: ApMfmService,

12
packages/backend/src/core/activitypub/models/ApPersonService.ts
View file

@ -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 { FollowingsRepository, InstancesRepository, UserProfilesRepository, UserPublickeysRepository, UsersRepository } from '@/models/index.js';
import type { MiFollowingsRepository, MiInstancesRepository, MiUserProfilesRepository, MiUserPublickeysRepository, MiUsersRepository } 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: UsersRepository,
private usersRepository: MiUsersRepository,
@Inject(DI.userProfilesRepository)
private userProfilesRepository: UserProfilesRepository,
private userProfilesRepository: MiUserProfilesRepository,
@Inject(DI.userPublickeysRepository)
private userPublickeysRepository: UserPublickeysRepository,
private userPublickeysRepository: MiUserPublickeysRepository,
@Inject(DI.instancesRepository)
private instancesRepository: InstancesRepository,
private instancesRepository: MiInstancesRepository,
@Inject(DI.followingsRepository)
private followingsRepository: FollowingsRepository,
private followingsRepository: MiFollowingsRepository,
) {
}

6
packages/backend/src/core/activitypub/models/ApQuestionService.ts
View file

@ -5,7 +5,7 @@
import { Inject, Injectable } from '@nestjs/common';
import { DI } from '@/di-symbols.js';
import type { NotesRepository, PollsRepository } from '@/models/index.js';
import type { MiNotesRepository, MiPollsRepository } 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: NotesRepository,
private notesRepository: MiNotesRepository,
@Inject(DI.pollsRepository)
private pollsRepository: PollsRepository,
private pollsRepository: MiPollsRepository,
private apResolverService: ApResolverService,
private apLoggerService: ApLoggerService,

6
packages/backend/src/core/chart/charts/federation.ts
View file

@ -5,7 +5,7 @@
import { Injectable, Inject } from '@nestjs/common';
import { DataSource } from 'typeorm';
import type { FollowingsRepository, InstancesRepository } from '@/models/index.js';
import type { MiFollowingsRepository, MiInstancesRepository } 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<typeof schema> {
private db: DataSource,
@Inject(DI.followingsRepository)
private followingsRepository: FollowingsRepository,
private followingsRepository: MiFollowingsRepository,
@Inject(DI.instancesRepository)
private instancesRepository: InstancesRepository,
private instancesRepository: MiInstancesRepository,
private metaService: MetaService,
private appLockService: AppLockService,

10
packages/backend/src/core/chart/charts/instance.ts
View file

@ -5,7 +5,7 @@
import { Injectable, Inject } from '@nestjs/common';
import { DataSource } from 'typeorm';
import type { DriveFilesRepository, FollowingsRepository, UsersRepository, NotesRepository } from '@/models/index.js';
import type { MiDriveFilesRepository, MiFollowingsRepository, MiUsersRepository, MiNotesRepository } 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<typeof schema> {
private db: DataSource,
@Inject(DI.usersRepository)
private usersRepository: UsersRepository,
private usersRepository: MiUsersRepository,
@Inject(DI.notesRepository)
private notesRepository: NotesRepository,
private notesRepository: MiNotesRepository,
@Inject(DI.driveFilesRepository)
private driveFilesRepository: DriveFilesRepository,
private driveFilesRepository: MiDriveFilesRepository,
@Inject(DI.followingsRepository)
private followingsRepository: FollowingsRepository,
private followingsRepository: MiFollowingsRepository,
private utilityService: UtilityService,
private appLockService: AppLockService,

4
packages/backend/src/core/chart/charts/notes.ts
View file

@ -5,7 +5,7 @@
import { Injectable, Inject } from '@nestjs/common';
import { Not, IsNull, DataSource } from 'typeorm';
import type { NotesRepository } from '@/models/index.js';
import type { MiNotesRepository } 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<typeof schema> {
private db: DataSource,
@Inject(DI.notesRepository)
private notesRepository: NotesRepository,
private notesRepository: MiNotesRepository,
private appLockService: AppLockService,
private chartLoggerService: ChartLoggerService,

4
packages/backend/src/core/chart/charts/per-user-drive.ts
View file

@ -5,7 +5,7 @@
import { Injectable, Inject } from '@nestjs/common';
import { DataSource } from 'typeorm';
import type { DriveFilesRepository } from '@/models/index.js';
import type { MiDriveFilesRepository } 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<typeof schema> {
private db: DataSource,
@Inject(DI.driveFilesRepository)
private driveFilesRepository: DriveFilesRepository,
private driveFilesRepository: MiDriveFilesRepository,
private appLockService: AppLockService,
private driveFileEntityService: DriveFileEntityService,

4
packages/backend/src/core/chart/charts/per-user-following.ts
View file

@ -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 { FollowingsRepository } from '@/models/index.js';
import type { MiFollowingsRepository } 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<typeof schema> {
private db: DataSource,
@Inject(DI.followingsRepository)
private followingsRepository: FollowingsRepository,
private followingsRepository: MiFollowingsRepository,
private appLockService: AppLockService,
private userEntityService: UserEntityService,

4
packages/backend/src/core/chart/charts/per-user-notes.ts
View file

@ -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 { NotesRepository } from '@/models/index.js';
import type { MiNotesRepository } 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<typeof schema> {
private db: DataSource,
@Inject(DI.notesRepository)
private notesRepository: NotesRepository,
private notesRepository: MiNotesRepository,
private appLockService: AppLockService,
private chartLoggerService: ChartLoggerService,

4
packages/backend/src/core/chart/charts/users.ts
View file

@ -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 { UsersRepository } from '@/models/index.js';
import type { MiUsersRepository } 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<typeof schema> {
private db: DataSource,
@Inject(DI.usersRepository)
private usersRepository: UsersRepository,
private usersRepository: MiUsersRepository,
private appLockService: AppLockService,
private userEntityService: UserEntityService,

4
packages/backend/src/core/entities/AbuseUserReportEntityService.ts
View file

@ -5,7 +5,7 @@
import { Inject, Injectable } from '@nestjs/common';
import { DI } from '@/di-symbols.js';
import type { AbuseUserReportsRepository } from '@/models/index.js';
import type { MiAbuseUserReportsRepository } 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: AbuseUserReportsRepository,
private abuseUserReportsRepository: MiAbuseUserReportsRepository,
private userEntityService: UserEntityService,
) {

4
packages/backend/src/core/entities/AntennaEntityService.ts
View file

@ -5,7 +5,7 @@
import { Inject, Injectable } from '@nestjs/common';
import { DI } from '@/di-symbols.js';
import type { AntennasRepository } from '@/models/index.js';
import type { MiAntennasRepository } 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: AntennasRepository,
private antennasRepository: MiAntennasRepository,
) {
}

6
packages/backend/src/core/entities/AppEntityService.ts
View file

@ -5,7 +5,7 @@
import { Inject, Injectable } from '@nestjs/common';
import { DI } from '@/di-symbols.js';
import type { AccessTokensRepository, AppsRepository } from '@/models/index.js';
import type { MiAccessTokensRepository, MiAppsRepository } 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: AppsRepository,
private appsRepository: MiAppsRepository,
@Inject(DI.accessTokensRepository)
private accessTokensRepository: AccessTokensRepository,
private accessTokensRepository: MiAccessTokensRepository,
) {
}

4
packages/backend/src/core/entities/AuthSessionEntityService.ts
View file

@ -5,7 +5,7 @@
import { Inject, Injectable } from '@nestjs/common';
import { DI } from '@/di-symbols.js';
import type { AuthSessionsRepository } from '@/models/index.js';
import type { MiAuthSessionsRepository } 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: AuthSessionsRepository,
private authSessionsRepository: MiAuthSessionsRepository,
private appEntityService: AppEntityService,
) {

4
packages/backend/src/core/entities/BlockingEntityService.ts
View file

@ -5,7 +5,7 @@
import { Inject, Injectable } from '@nestjs/common';
import { DI } from '@/di-symbols.js';
import type { BlockingsRepository } from '@/models/index.js';
import type { MiBlockingsRepository } 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: BlockingsRepository,
private blockingsRepository: MiBlockingsRepository,
private userEntityService: UserEntityService,
) {

14
packages/backend/src/core/entities/ChannelEntityService.ts
View file

@ -5,7 +5,7 @@
import { Inject, Injectable } from '@nestjs/common';
import { DI } from '@/di-symbols.js';
import type { ChannelFavoritesRepository, ChannelFollowingsRepository, ChannelsRepository, DriveFilesRepository, NoteUnreadsRepository, NotesRepository } from '@/models/index.js';
import type { MiChannelFavoritesRepository, MiChannelFollowingsRepository, MiChannelsRepository, MiDriveFilesRepository, MiNoteUnreadsRepository, MiNotesRepository } 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: ChannelsRepository,
private channelsRepository: MiChannelsRepository,
@Inject(DI.channelFollowingsRepository)
private channelFollowingsRepository: ChannelFollowingsRepository,
private channelFollowingsRepository: MiChannelFollowingsRepository,
@Inject(DI.channelFavoritesRepository)
private channelFavoritesRepository: ChannelFavoritesRepository,
private channelFavoritesRepository: MiChannelFavoritesRepository,
@Inject(DI.notesRepository)
private notesRepository: NotesRepository,
private notesRepository: MiNotesRepository,
@Inject(DI.noteUnreadsRepository)
private noteUnreadsRepository: NoteUnreadsRepository,
private noteUnreadsRepository: MiNoteUnreadsRepository,
@Inject(DI.driveFilesRepository)
private driveFilesRepository: DriveFilesRepository,
private driveFilesRepository: MiDriveFilesRepository,
private noteEntityService: NoteEntityService,
private driveFileEntityService: DriveFileEntityService,

6
packages/backend/src/core/entities/ClipEntityService.ts
View file

@ -5,7 +5,7 @@
import { Inject, Injectable } from '@nestjs/common';
import { DI } from '@/di-symbols.js';
import type { ClipFavoritesRepository, ClipsRepository, MiUser } from '@/models/index.js';
import type { MiClipFavoritesRepository, MiClipsRepository, 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: ClipsRepository,
private clipsRepository: MiClipsRepository,
@Inject(DI.clipFavoritesRepository)
private clipFavoritesRepository: ClipFavoritesRepository,
private clipFavoritesRepository: MiClipFavoritesRepository,
private userEntityService: UserEntityService,
) {

4
packages/backend/src/core/entities/DriveFileEntityService.ts
View file

@ -6,7 +6,7 @@
import { forwardRef, Inject, Injectable } from '@nestjs/common';
import { In } from 'typeorm';
import { DI } from '@/di-symbols.js';
import type { DriveFilesRepository } from '@/models/index.js';
import type { MiDriveFilesRepository } 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: DriveFilesRepository,
private driveFilesRepository: MiDriveFilesRepository,
// 循環参照のため / for circular dependency
@Inject(forwardRef(() => UserEntityService))

6
packages/backend/src/core/entities/DriveFolderEntityService.ts
View file

@ -5,7 +5,7 @@
import { Inject, Injectable } from '@nestjs/common';
import { DI } from '@/di-symbols.js';
import type { DriveFilesRepository, DriveFoldersRepository } from '@/models/index.js';
import type { MiDriveFilesRepository, MiDriveFoldersRepository } 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: DriveFoldersRepository,
private driveFoldersRepository: MiDriveFoldersRepository,
@Inject(DI.driveFilesRepository)
private driveFilesRepository: DriveFilesRepository,
private driveFilesRepository: MiDriveFilesRepository,
) {
}

4
packages/backend/src/core/entities/EmojiEntityService.ts
View file

@ -5,7 +5,7 @@
import { Inject, Injectable } from '@nestjs/common';
import { DI } from '@/di-symbols.js';
import type { EmojisRepository } from '@/models/index.js';
import type { MiEmojisRepository } 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: EmojisRepository,
private emojisRepository: MiEmojisRepository,
) {
}

6
packages/backend/src/core/entities/FlashEntityService.ts
View file

@ -5,7 +5,7 @@
import { Inject, Injectable } from '@nestjs/common';
import { DI } from '@/di-symbols.js';
import type { FlashsRepository, FlashLikesRepository } from '@/models/index.js';
import type { MiFlashsRepository, MiFlashLikesRepository } 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: FlashsRepository,
private flashsRepository: MiFlashsRepository,
@Inject(DI.flashLikesRepository)
private flashLikesRepository: FlashLikesRepository,
private flashLikesRepository: MiFlashLikesRepository,
private userEntityService: UserEntityService,
) {

4
packages/backend/src/core/entities/FlashLikeEntityService.ts
View file

@ -5,7 +5,7 @@
import { Inject, Injectable } from '@nestjs/common';
import { DI } from '@/di-symbols.js';
import type { FlashLikesRepository } from '@/models/index.js';
import type { MiFlashLikesRepository } 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: FlashLikesRepository,
private flashLikesRepository: MiFlashLikesRepository,
private flashEntityService: FlashEntityService,
) {

4
packages/backend/src/core/entities/FollowRequestEntityService.ts
View file

@ -5,7 +5,7 @@
import { Inject, Injectable } from '@nestjs/common';
import { DI } from '@/di-symbols.js';
import type { FollowRequestsRepository } from '@/models/index.js';
import type { MiFollowRequestsRepository } 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: FollowRequestsRepository,
private followRequestsRepository: MiFollowRequestsRepository,
private userEntityService: UserEntityService,
) {

4
packages/backend/src/core/entities/FollowingEntityService.ts
View file

@ -5,7 +5,7 @@
import { Inject, Injectable } from '@nestjs/common';
import { DI } from '@/di-symbols.js';
import type { FollowingsRepository } from '@/models/index.js';
import type { MiFollowingsRepository } 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: FollowingsRepository,
private followingsRepository: MiFollowingsRepository,
private userEntityService: UserEntityService,
) {

4
packages/backend/src/core/entities/GalleryLikeEntityService.ts
View file

@ -5,7 +5,7 @@
import { Inject, Injectable } from '@nestjs/common';
import { DI } from '@/di-symbols.js';
import type { GalleryLikesRepository } from '@/models/index.js';
import type { MiGalleryLikesRepository } 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: GalleryLikesRepository,
private galleryLikesRepository: MiGalleryLikesRepository,
private galleryPostEntityService: GalleryPostEntityService,
) {

6
packages/backend/src/core/entities/GalleryPostEntityService.ts
View file

@ -5,7 +5,7 @@
import { Inject, Injectable } from '@nestjs/common';
import { DI } from '@/di-symbols.js';
import type { GalleryLikesRepository, GalleryPostsRepository } from '@/models/index.js';
import type { MiGalleryLikesRepository, MiGalleryPostsRepository } 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: GalleryPostsRepository,
private galleryPostsRepository: MiGalleryPostsRepository,
@Inject(DI.galleryLikesRepository)
private galleryLikesRepository: GalleryLikesRepository,
private galleryLikesRepository: MiGalleryLikesRepository,
private userEntityService: UserEntityService,
private driveFileEntityService: DriveFileEntityService,

4
packages/backend/src/core/entities/InviteCodeEntityService.ts
View file

@ -5,7 +5,7 @@
import { Inject, Injectable } from '@nestjs/common';
import { DI } from '@/di-symbols.js';
import type { RegistrationTicketsRepository } from '@/models/index.js';
import type { MiRegistrationTicketsRepository } 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: RegistrationTicketsRepository,
private registrationTicketsRepository: MiRegistrationTicketsRepository,
private userEntityService: UserEntityService,
) {

4
packages/backend/src/core/entities/ModerationLogEntityService.ts
View file

@ -5,7 +5,7 @@
import { Inject, Injectable } from '@nestjs/common';
import { DI } from '@/di-symbols.js';
import type { ModerationLogsRepository } from '@/models/index.js';
import type { MiModerationLogsRepository } 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: ModerationLogsRepository,
private moderationLogsRepository: MiModerationLogsRepository,
private userEntityService: UserEntityService,
) {

4
packages/backend/src/core/entities/MutingEntityService.ts
View file

@ -5,7 +5,7 @@
import { Inject, Injectable } from '@nestjs/common';
import { DI } from '@/di-symbols.js';
import type { MutingsRepository } from '@/models/index.js';
import type { MiMutingsRepository } 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: MutingsRepository,
private mutingsRepository: MiMutingsRepository,
private userEntityService: UserEntityService,
) {

16
packages/backend/src/core/entities/NoteEntityService.ts
View file

@ -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 { UsersRepository, NotesRepository, FollowingsRepository, PollsRepository, PollVotesRepository, NoteReactionsRepository, ChannelsRepository } from '@/models/index.js';
import type { MiUsersRepository, MiNotesRepository, MiFollowingsRepository, MiPollsRepository, MiPollVotesRepository, MiNoteReactionsRepository, MiChannelsRepository } 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: UsersRepository,
private usersRepository: MiUsersRepository,
@Inject(DI.notesRepository)
private notesRepository: NotesRepository,
private notesRepository: MiNotesRepository,
@Inject(DI.followingsRepository)
private followingsRepository: FollowingsRepository,
private followingsRepository: MiFollowingsRepository,
@Inject(DI.pollsRepository)
private pollsRepository: PollsRepository,
private pollsRepository: MiPollsRepository,
@Inject(DI.pollVotesRepository)
private pollVotesRepository: PollVotesRepository,
private pollVotesRepository: MiPollVotesRepository,
@Inject(DI.noteReactionsRepository)
private noteReactionsRepository: NoteReactionsRepository,
private noteReactionsRepository: MiNoteReactionsRepository,
@Inject(DI.channelsRepository)
private channelsRepository: ChannelsRepository,
private channelsRepository: MiChannelsRepository,
//private userEntityService: UserEntityService,
//private driveFileEntityService: DriveFileEntityService,

4
packages/backend/src/core/entities/NoteFavoriteEntityService.ts
View file

@ -5,7 +5,7 @@
import { Inject, Injectable } from '@nestjs/common';
import { DI } from '@/di-symbols.js';
import type { NoteFavoritesRepository } from '@/models/index.js';
import type { MiNoteFavoritesRepository } 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: NoteFavoritesRepository,
private noteFavoritesRepository: MiNoteFavoritesRepository,
private noteEntityService: NoteEntityService,
) {

4
packages/backend/src/core/entities/NoteReactionEntityService.ts
View file

@ -5,7 +5,7 @@
import { Inject, Injectable } from '@nestjs/common';
import { DI } from '@/di-symbols.js';
import type { NoteReactionsRepository } from '@/models/index.js';
import type { MiNoteReactionsRepository } 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: NoteReactionsRepository,
private noteReactionsRepository: MiNoteReactionsRepository,
//private userEntityService: UserEntityService,
//private noteEntityService: NoteEntityService,

10
packages/backend/src/core/entities/NotificationEntityService.ts
View file

@ -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 { AccessTokensRepository, FollowRequestsRepository, NotesRepository, MiUser, UsersRepository } from '@/models/index.js';
import type { MiAccessTokensRepository, MiFollowRequestsRepository, MiNotesRepository, MiUser, MiUsersRepository } 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: NotesRepository,
private notesRepository: MiNotesRepository,
@Inject(DI.usersRepository)
private usersRepository: UsersRepository,
private usersRepository: MiUsersRepository,
@Inject(DI.followRequestsRepository)
private followRequestsRepository: FollowRequestsRepository,
private followRequestsRepository: MiFollowRequestsRepository,
@Inject(DI.accessTokensRepository)
private accessTokensRepository: AccessTokensRepository,
private accessTokensRepository: MiAccessTokensRepository,
//private userEntityService: UserEntityService,
//private noteEntityService: NoteEntityService,

8
packages/backend/src/core/entities/PageEntityService.ts
View file

@ -5,7 +5,7 @@
import { Inject, Injectable } from '@nestjs/common';
import { DI } from '@/di-symbols.js';
import type { DriveFilesRepository, PagesRepository, PageLikesRepository } from '@/models/index.js';
import type { MiDriveFilesRepository, MiPagesRepository, MiPageLikesRepository } 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: PagesRepository,
private pagesRepository: MiPagesRepository,
@Inject(DI.pageLikesRepository)
private pageLikesRepository: PageLikesRepository,
private pageLikesRepository: MiPageLikesRepository,
@Inject(DI.driveFilesRepository)
private driveFilesRepository: DriveFilesRepository,
private driveFilesRepository: MiDriveFilesRepository,
private userEntityService: UserEntityService,
private driveFileEntityService: DriveFileEntityService,

4
packages/backend/src/core/entities/PageLikeEntityService.ts
View file

@ -5,7 +5,7 @@
import { Inject, Injectable } from '@nestjs/common';
import { DI } from '@/di-symbols.js';
import type { PageLikesRepository } from '@/models/index.js';
import type { MiPageLikesRepository } 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: PageLikesRepository,
private pageLikesRepository: MiPageLikesRepository,
private pageEntityService: PageEntityService,
) {

4
packages/backend/src/core/entities/RenoteMutingEntityService.ts
View file

@ -5,7 +5,7 @@
import { Inject, Injectable } from '@nestjs/common';
import { DI } from '@/di-symbols.js';
import type { RenoteMutingsRepository } from '@/models/index.js';
import type { MiRenoteMutingsRepository } 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: RenoteMutingsRepository,
private renoteMutingsRepository: MiRenoteMutingsRepository,
private userEntityService: UserEntityService,
) {

6
packages/backend/src/core/entities/RoleEntityService.ts
View file

@ -6,7 +6,7 @@
import { Inject, Injectable } from '@nestjs/common';
import { Brackets } from 'typeorm';
import { DI } from '@/di-symbols.js';
import type { RoleAssignmentsRepository, RolesRepository } from '@/models/index.js';
import type { MiRoleAssignmentsRepository, MiRolesRepository } 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: RolesRepository,
private rolesRepository: MiRolesRepository,
@Inject(DI.roleAssignmentsRepository)
private roleAssignmentsRepository: RoleAssignmentsRepository,
private roleAssignmentsRepository: MiRoleAssignmentsRepository,
) {
}

30
packages/backend/src/core/entities/UserEntityService.ts
View file

@ -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 { UsersRepository, UserSecurityKeysRepository, FollowingsRepository, FollowRequestsRepository, BlockingsRepository, MutingsRepository, DriveFilesRepository, NoteUnreadsRepository, UserNotePiningsRepository, UserProfilesRepository, AnnouncementReadsRepository, AnnouncementsRepository, MiUserProfile, RenoteMutingsRepository, UserMemoRepository } from '@/models/index.js';
import type { MiUsersRepository, MiUserSecurityKeysRepository, MiFollowingsRepository, MiFollowRequestsRepository, MiBlockingsRepository, MiMutingsRepository, MiDriveFilesRepository, MiNoteUnreadsRepository, MiUserNotePiningsRepository, MiUserProfilesRepository, MiAnnouncementReadsRepository, MiAnnouncementsRepository, MiUserProfile, MiRenoteMutingsRepository, MiUserMemoRepository } 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: UsersRepository,
private usersRepository: MiUsersRepository,
@Inject(DI.userSecurityKeysRepository)
private userSecurityKeysRepository: UserSecurityKeysRepository,
private userSecurityKeysRepository: MiUserSecurityKeysRepository,
@Inject(DI.followingsRepository)
private followingsRepository: FollowingsRepository,
private followingsRepository: MiFollowingsRepository,
@Inject(DI.followRequestsRepository)
private followRequestsRepository: FollowRequestsRepository,
private followRequestsRepository: MiFollowRequestsRepository,
@Inject(DI.blockingsRepository)
private blockingsRepository: BlockingsRepository,
private blockingsRepository: MiBlockingsRepository,
@Inject(DI.mutingsRepository)
private mutingsRepository: MutingsRepository,
private mutingsRepository: MiMutingsRepository,
@Inject(DI.renoteMutingsRepository)
private renoteMutingsRepository: RenoteMutingsRepository,
private renoteMutingsRepository: MiRenoteMutingsRepository,
@Inject(DI.driveFilesRepository)
private driveFilesRepository: DriveFilesRepository,
private driveFilesRepository: MiDriveFilesRepository,
@Inject(DI.noteUnreadsRepository)
private noteUnreadsRepository: NoteUnreadsRepository,
private noteUnreadsRepository: MiNoteUnreadsRepository,
@Inject(DI.userNotePiningsRepository)
private userNotePiningsRepository: UserNotePiningsRepository,
private userNotePiningsRepository: MiUserNotePiningsRepository,
@Inject(DI.userProfilesRepository)
private userProfilesRepository: UserProfilesRepository,
private userProfilesRepository: MiUserProfilesRepository,
@Inject(DI.announcementReadsRepository)
private announcementReadsRepository: AnnouncementReadsRepository,
private announcementReadsRepository: MiAnnouncementReadsRepository,
@Inject(DI.announcementsRepository)
private announcementsRepository: AnnouncementsRepository,
private announcementsRepository: MiAnnouncementsRepository,
@Inject(DI.userMemosRepository)
private userMemosRepository: UserMemoRepository,
private userMemosRepository: MiUserMemoRepository,
//private noteEntityService: NoteEntityService,
//private driveFileEntityService: DriveFileEntityService,

6
packages/backend/src/core/entities/UserListEntityService.ts
View file

@ -5,7 +5,7 @@
import { Inject, Injectable } from '@nestjs/common';
import { DI } from '@/di-symbols.js';
import type { UserListJoiningsRepository, UserListsRepository } from '@/models/index.js';
import type { MiUserListJoiningsRepository, MiUserListsRepository } 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: UserListsRepository,
private userListsRepository: MiUserListsRepository,
@Inject(DI.userListJoiningsRepository)
private userListJoiningsRepository: UserListJoiningsRepository,
private userListJoiningsRepository: MiUserListJoiningsRepository,
) {
}

4
packages/backend/src/daemons/JanitorService.ts
View file

@ -6,7 +6,7 @@
import { Inject, Injectable } from '@nestjs/common';
import { LessThan } from 'typeorm';
import { DI } from '@/di-symbols.js';
import type { AttestationChallengesRepository } from '@/models/index.js';
import type { MiAttestationChallengesRepository } 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: AttestationChallengesRepository,
private attestationChallengesRepository: MiAttestationChallengesRepository,
) {
}

132
packages/backend/src/models/index.ts
View file

@ -140,69 +140,69 @@ export {
MiUserMemo,
};
export type AbuseUserReportsRepository = Repository<MiAbuseUserReport>;
export type AccessTokensRepository = Repository<MiAccessToken>;
export type AdsRepository = Repository<MiAd>;
export type AnnouncementsRepository = Repository<MiAnnouncement>;
export type AnnouncementReadsRepository = Repository<MiAnnouncementRead>;
export type AntennasRepository = Repository<MiAntenna>;
export type AppsRepository = Repository<MiApp>;
export type AttestationChallengesRepository = Repository<MiAttestationChallenge>;
export type AuthSessionsRepository = Repository<MiAuthSession>;
export type BlockingsRepository = Repository<MiBlocking>;
export type ChannelFollowingsRepository = Repository<MiChannelFollowing>;
export type ChannelFavoritesRepository = Repository<MiChannelFavorite>;
export type ClipsRepository = Repository<MiClip>;
export type ClipNotesRepository = Repository<MiClipNote>;
export type ClipFavoritesRepository = Repository<MiClipFavorite>;
export type DriveFilesRepository = Repository<MiDriveFile>;
export type DriveFoldersRepository = Repository<MiDriveFolder>;
export type EmojisRepository = Repository<MiEmoji>;
export type FollowingsRepository = Repository<MiFollowing>;
export type FollowRequestsRepository = Repository<MiFollowRequest>;
export type GalleryLikesRepository = Repository<MiGalleryLike>;
export type GalleryPostsRepository = Repository<MiGalleryPost>;
export type HashtagsRepository = Repository<MiHashtag>;
export type InstancesRepository = Repository<MiInstance>;
export type MetasRepository = Repository<MiMeta>;
export type ModerationLogsRepository = Repository<MiModerationLog>;
export type MutedNotesRepository = Repository<MiMutedNote>;
export type MutingsRepository = Repository<MiMuting>;
export type RenoteMutingsRepository = Repository<MiRenoteMuting>;
export type NotesRepository = Repository<MiNote>;
export type NoteFavoritesRepository = Repository<MiNoteFavorite>;
export type NoteReactionsRepository = Repository<MiNoteReaction>;
export type NoteThreadMutingsRepository = Repository<MiNoteThreadMuting>;
export type NoteUnreadsRepository = Repository<MiNoteUnread>;
export type PagesRepository = Repository<MiPage>;
export type PageLikesRepository = Repository<MiPageLike>;
export type PasswordResetRequestsRepository = Repository<MiPasswordResetRequest>;
export type PollsRepository = Repository<MiPoll>;
export type PollVotesRepository = Repository<MiPollVote>;
export type PromoNotesRepository = Repository<MiPromoNote>;
export type PromoReadsRepository = Repository<MiPromoRead>;
export type RegistrationTicketsRepository = Repository<MiRegistrationTicket>;
export type RegistryItemsRepository = Repository<MiRegistryItem>;
export type RelaysRepository = Repository<MiRelay>;
export type SigninsRepository = Repository<MiSignin>;
export type SwSubscriptionsRepository = Repository<MiSwSubscription>;
export type UsedUsernamesRepository = Repository<MiUsedUsername>;
export type UsersRepository = Repository<MiUser>;
export type UserIpsRepository = Repository<MiUserIp>;
export type UserKeypairsRepository = Repository<MiUserKeypair>;
export type UserListsRepository = Repository<MiUserList>;
export type UserListFavoritesRepository = Repository<MiUserListFavorite>;
export type UserListJoiningsRepository = Repository<MiUserListJoining>;
export type UserNotePiningsRepository = Repository<MiUserNotePining>;
export type UserPendingsRepository = Repository<MiUserPending>;
export type UserProfilesRepository = Repository<MiUserProfile>;
export type UserPublickeysRepository = Repository<MiUserPublickey>;
export type UserSecurityKeysRepository = Repository<MiUserSecurityKey>;
export type WebhooksRepository = Repository<MiWebhook>;
export type ChannelsRepository = Repository<MiChannel>;
export type RetentionAggregationsRepository = Repository<MiRetentionAggregation>;
export type RolesRepository = Repository<MiRole>;
export type RoleAssignmentsRepository = Repository<MiRoleAssignment>;
export type FlashsRepository = Repository<MiFlash>;
export type FlashLikesRepository = Repository<MiFlashLike>;
export type UserMemoRepository = Repository<MiUserMemo>;
export type MiAbuseUserReportsRepository = Repository<MiAbuseUserReport>;
export type MiAccessTokensRepository = Repository<MiAccessToken>;
export type MiAdsRepository = Repository<MiAd>;
export type MiAnnouncementsRepository = Repository<MiAnnouncement>;
export type MiAnnouncementReadsRepository = Repository<MiAnnouncementRead>;
export type MiAntennasRepository = Repository<MiAntenna>;
export type MiAppsRepository = Repository<MiApp>;
export type MiAttestationChallengesRepository = Repository<MiAttestationChallenge>;
export type MiAuthSessionsRepository = Repository<MiAuthSession>;
export type MiBlockingsRepository = Repository<MiBlocking>;
export type MiChannelFollowingsRepository = Repository<MiChannelFollowing>;
export type MiChannelFavoritesRepository = Repository<MiChannelFavorite>;
export type MiClipsRepository = Repository<MiClip>;
export type MiClipNotesRepository = Repository<MiClipNote>;
export type MiClipFavoritesRepository = Repository<MiClipFavorite>;
export type MiDriveFilesRepository = Repository<MiDriveFile>;
export type MiDriveFoldersRepository = Repository<MiDriveFolder>;
export type MiEmojisRepository = Repository<MiEmoji>;
export type MiFollowingsRepository = Repository<MiFollowing>;
export type MiFollowRequestsRepository = Repository<MiFollowRequest>;
export type MiGalleryLikesRepository = Repository<MiGalleryLike>;
export type MiGalleryPostsRepository = Repository<MiGalleryPost>;
export type MiHashtagsRepository = Repository<MiHashtag>;
export type MiInstancesRepository = Repository<MiInstance>;
export type MiMetasRepository = Repository<MiMeta>;
export type MiModerationLogsRepository = Repository<MiModerationLog>;
export type MiMutedNotesRepository = Repository<MiMutedNote>;
export type MiMutingsRepository = Repository<MiMuting>;
export type MiRenoteMutingsRepository = Repository<MiRenoteMuting>;
export type MiNotesRepository = Repository<MiNote>;
export type MiNoteFavoritesRepository = Repository<MiNoteFavorite>;
export type MiNoteReactionsRepository = Repository<MiNoteReaction>;
export type MiNoteThreadMutingsRepository = Repository<MiNoteThreadMuting>;
export type MiNoteUnreadsRepository = Repository<MiNoteUnread>;
export type MiPagesRepository = Repository<MiPage>;
export type MiPageLikesRepository = Repository<MiPageLike>;
export type MiPasswordResetRequestsRepository = Repository<MiPasswordResetRequest>;
export type MiPollsRepository = Repository<MiPoll>;
export type MiPollVotesRepository = Repository<MiPollVote>;
export type MiPromoNotesRepository = Repository<MiPromoNote>;
export type MiPromoReadsRepository = Repository<MiPromoRead>;
export type MiRegistrationTicketsRepository = Repository<MiRegistrationTicket>;
export type MiRegistryItemsRepository = Repository<MiRegistryItem>;
export type MiRelaysRepository = Repository<MiRelay>;
export type MiSigninsRepository = Repository<MiSignin>;
export type MiSwSubscriptionsRepository = Repository<MiSwSubscription>;
export type MiUsedUsernamesRepository = Repository<MiUsedUsername>;
export type MiUsersRepository = Repository<MiUser>;
export type MiUserIpsRepository = Repository<MiUserIp>;
export type MiUserKeypairsRepository = Repository<MiUserKeypair>;
export type MiUserListsRepository = Repository<MiUserList>;
export type MiUserListFavoritesRepository = Repository<MiUserListFavorite>;
export type MiUserListJoiningsRepository = Repository<MiUserListJoining>;
export type MiUserNotePiningsRepository = Repository<MiUserNotePining>;
export type MiUserPendingsRepository = Repository<MiUserPending>;
export type MiUserProfilesRepository = Repository<MiUserProfile>;
export type MiUserPublickeysRepository = Repository<MiUserPublickey>;
export type MiUserSecurityKeysRepository = Repository<MiUserSecurityKey>;
export type MiWebhooksRepository = Repository<MiWebhook>;
export type MiChannelsRepository = Repository<MiChannel>;
export type MiRetentionAggregationsRepository = Repository<MiRetentionAggregation>;
export type MiRolesRepository = Repository<MiRole>;
export type MiRoleAssignmentsRepository = Repository<MiRoleAssignment>;
export type MiFlashsRepository = Repository<MiFlash>;
export type MiFlashLikesRepository = Repository<MiFlashLike>;
export type MiUserMemoRepository = Repository<MiUserMemo>;

6
packages/backend/src/queue/processors/AggregateRetentionProcessorService.ts
View file

@ -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 { RetentionAggregationsRepository, UsersRepository } from '@/models/index.js';
import type { MiRetentionAggregationsRepository, MiUsersRepository } 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: UsersRepository,
private usersRepository: MiUsersRepository,
@Inject(DI.retentionAggregationsRepository)
private retentionAggregationsRepository: RetentionAggregationsRepository,
private retentionAggregationsRepository: MiRetentionAggregationsRepository,
private idService: IdService,
private queueLoggerService: QueueLoggerService,

4
packages/backend/src/queue/processors/CheckExpiredMutingsProcessorService.ts
View file

@ -6,7 +6,7 @@
import { Inject, Injectable } from '@nestjs/common';
import { In } from 'typeorm';
import { DI } from '@/di-symbols.js';
import type { MutingsRepository } from '@/models/index.js';
import type { MiMutingsRepository } 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: MutingsRepository,
private mutingsRepository: MiMutingsRepository,
private userMutingService: UserMutingService,
private queueLoggerService: QueueLoggerService,

10
packages/backend/src/queue/processors/CleanProcessorService.ts
View file

@ -6,7 +6,7 @@
import { Inject, Injectable } from '@nestjs/common';
import { In, LessThan } from 'typeorm';
import { DI } from '@/di-symbols.js';
import type { AntennasRepository, MutedNotesRepository, RoleAssignmentsRepository, UserIpsRepository } from '@/models/index.js';
import type { MiAntennasRepository, MiMutedNotesRepository, MiRoleAssignmentsRepository, MiUserIpsRepository } 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: UserIpsRepository,
private userIpsRepository: MiUserIpsRepository,
@Inject(DI.mutedNotesRepository)
private mutedNotesRepository: MutedNotesRepository,
private mutedNotesRepository: MiMutedNotesRepository,
@Inject(DI.antennasRepository)
private antennasRepository: AntennasRepository,
private antennasRepository: MiAntennasRepository,
@Inject(DI.roleAssignmentsRepository)
private roleAssignmentsRepository: RoleAssignmentsRepository,
private roleAssignmentsRepository: MiRoleAssignmentsRepository,
private queueLoggerService: QueueLoggerService,
private idService: IdService,

4
packages/backend/src/queue/processors/CleanRemoteFilesProcessorService.ts
View file

@ -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, DriveFilesRepository } from '@/models/index.js';
import type { MiDriveFile, MiDriveFilesRepository } 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: DriveFilesRepository,
private driveFilesRepository: MiDriveFilesRepository,
private driveService: DriveService,
private queueLoggerService: QueueLoggerService,

10
packages/backend/src/queue/processors/DeleteAccountProcessorService.ts
View file

@ -6,7 +6,7 @@
import { Inject, Injectable } from '@nestjs/common';
import { MoreThan } from 'typeorm';
import { DI } from '@/di-symbols.js';
import type { DriveFilesRepository, NotesRepository, UserProfilesRepository, UsersRepository } from '@/models/index.js';
import type { MiDriveFilesRepository, MiNotesRepository, MiUserProfilesRepository, MiUsersRepository } 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: UsersRepository,
private usersRepository: MiUsersRepository,
@Inject(DI.userProfilesRepository)
private userProfilesRepository: UserProfilesRepository,
private userProfilesRepository: MiUserProfilesRepository,
@Inject(DI.notesRepository)
private notesRepository: NotesRepository,
private notesRepository: MiNotesRepository,
@Inject(DI.driveFilesRepository)
private driveFilesRepository: DriveFilesRepository,
private driveFilesRepository: MiDriveFilesRepository,
private driveService: DriveService,
private emailService: EmailService,

6
packages/backend/src/queue/processors/DeleteDriveFilesProcessorService.ts
View file

@ -6,7 +6,7 @@
import { Inject, Injectable } from '@nestjs/common';
import { MoreThan } from 'typeorm';
import { DI } from '@/di-symbols.js';
import type { UsersRepository, DriveFilesRepository, MiDriveFile } from '@/models/index.js';
import type { MiUsersRepository, MiDriveFilesRepository, 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: UsersRepository,
private usersRepository: MiUsersRepository,
@Inject(DI.driveFilesRepository)
private driveFilesRepository: DriveFilesRepository,
private driveFilesRepository: MiDriveFilesRepository,
private driveService: DriveService,
private queueLoggerService: QueueLoggerService,

4
packages/backend/src/queue/processors/DeliverProcessorService.ts
View file

@ -6,7 +6,7 @@
import { Inject, Injectable } from '@nestjs/common';
import * as Bull from 'bullmq';
import { DI } from '@/di-symbols.js';
import type { InstancesRepository } from '@/models/index.js';
import type { MiInstancesRepository } 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: InstancesRepository,
private instancesRepository: MiInstancesRepository,
private metaService: MetaService,
private utilityService: UtilityService,

6
packages/backend/src/queue/processors/EndedPollNotificationProcessorService.ts
View file

@ -5,7 +5,7 @@
import { Inject, Injectable } from '@nestjs/common';
import { DI } from '@/di-symbols.js';
import type { PollVotesRepository, NotesRepository } from '@/models/index.js';
import type { MiPollVotesRepository, MiNotesRepository } 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: NotesRepository,
private notesRepository: MiNotesRepository,
@Inject(DI.pollVotesRepository)
private pollVotesRepository: PollVotesRepository,
private pollVotesRepository: MiPollVotesRepository,
private notificationService: NotificationService,
private queueLoggerService: QueueLoggerService,

8
packages/backend/src/queue/processors/ExportAntennasProcessorService.ts
View file

@ -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 { AntennasRepository, UsersRepository, UserListJoiningsRepository, MiUser } from '@/models/index.js';
import type { MiAntennasRepository, MiUsersRepository, MiUserListJoiningsRepository, 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: UsersRepository,
private usersRepository: MiUsersRepository,
@Inject(DI.antennasRepository)
private antennsRepository: AntennasRepository,
private antennsRepository: MiAntennasRepository,
@Inject(DI.userListJoiningsRepository)
private userListJoiningsRepository: UserListJoiningsRepository,
private userListJoiningsRepository: MiUserListJoiningsRepository,
private driveService: DriveService,
private utilityService: UtilityService,

6
packages/backend/src/queue/processors/ExportBlockingProcessorService.ts
View file

@ -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 { UsersRepository, BlockingsRepository, MiBlocking } from '@/models/index.js';
import type { MiUsersRepository, MiBlockingsRepository, 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: UsersRepository,
private usersRepository: MiUsersRepository,
@Inject(DI.blockingsRepository)
private blockingsRepository: BlockingsRepository,
private blockingsRepository: MiBlockingsRepository,
private utilityService: UtilityService,
private driveService: DriveService,

6
packages/backend/src/queue/processors/ExportCustomEmojisProcessorService.ts
View file

@ -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 { EmojisRepository, UsersRepository } from '@/models/index.js';
import type { MiEmojisRepository, MiUsersRepository } 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: UsersRepository,
private usersRepository: MiUsersRepository,
@Inject(DI.emojisRepository)
private emojisRepository: EmojisRepository,
private emojisRepository: MiEmojisRepository,
private driveService: DriveService,
private downloadService: DownloadService,

8
packages/backend/src/queue/processors/ExportFavoritesProcessorService.ts
View file

@ -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, NoteFavoritesRepository, PollsRepository, MiUser, UsersRepository } from '@/models/index.js';
import type { MiNoteFavorite, MiNoteFavoritesRepository, MiPollsRepository, MiUser, MiUsersRepository } 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: UsersRepository,
private usersRepository: MiUsersRepository,
@Inject(DI.pollsRepository)
private pollsRepository: PollsRepository,
private pollsRepository: MiPollsRepository,
@Inject(DI.noteFavoritesRepository)
private noteFavoritesRepository: NoteFavoritesRepository,
private noteFavoritesRepository: MiNoteFavoritesRepository,
private driveService: DriveService,
private queueLoggerService: QueueLoggerService,

8
packages/backend/src/queue/processors/ExportFollowingProcessorService.ts
View file

@ -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 { UsersRepository, FollowingsRepository, MutingsRepository } from '@/models/index.js';
import type { MiUsersRepository, MiFollowingsRepository, MiMutingsRepository } 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: UsersRepository,
private usersRepository: MiUsersRepository,
@Inject(DI.followingsRepository)
private followingsRepository: FollowingsRepository,
private followingsRepository: MiFollowingsRepository,
@Inject(DI.mutingsRepository)
private mutingsRepository: MutingsRepository,
private mutingsRepository: MiMutingsRepository,
private utilityService: UtilityService,
private driveService: DriveService,

6
packages/backend/src/queue/processors/ExportMutingProcessorService.ts
View file

@ -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 { MutingsRepository, UsersRepository, MiMuting } from '@/models/index.js';
import type { MiMutingsRepository, MiUsersRepository, 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: UsersRepository,
private usersRepository: MiUsersRepository,
@Inject(DI.mutingsRepository)
private mutingsRepository: MutingsRepository,
private mutingsRepository: MiMutingsRepository,
private utilityService: UtilityService,
private driveService: DriveService,

8
packages/backend/src/queue/processors/ExportNotesProcessorService.ts
View file

@ -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 { NotesRepository, PollsRepository, UsersRepository } from '@/models/index.js';
import type { MiNotesRepository, MiPollsRepository, MiUsersRepository } 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: UsersRepository,
private usersRepository: MiUsersRepository,
@Inject(DI.pollsRepository)
private pollsRepository: PollsRepository,
private pollsRepository: MiPollsRepository,
@Inject(DI.notesRepository)
private notesRepository: NotesRepository,
private notesRepository: MiNotesRepository,
private driveService: DriveService,
private queueLoggerService: QueueLoggerService,

8
packages/backend/src/queue/processors/ExportUserListsProcessorService.ts
View file

@ -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 { UserListJoiningsRepository, UserListsRepository, UsersRepository } from '@/models/index.js';
import type { MiUserListJoiningsRepository, MiUserListsRepository, MiUsersRepository } 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: UsersRepository,
private usersRepository: MiUsersRepository,
@Inject(DI.userListsRepository)
private userListsRepository: UserListsRepository,
private userListsRepository: MiUserListsRepository,
@Inject(DI.userListJoiningsRepository)
private userListJoiningsRepository: UserListJoiningsRepository,
private userListJoiningsRepository: MiUserListJoiningsRepository,
private utilityService: UtilityService,
private driveService: DriveService,

4
packages/backend/src/queue/processors/ImportAntennasProcessorService.ts
View file

@ -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 { AntennasRepository } from '@/models/index.js';
import type { MiAntennasRepository } 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: AntennasRepository,
private antennasRepository: MiAntennasRepository,
private queueLoggerService: QueueLoggerService,
private idService: IdService,

Some files were not shown because too many files have changed in this diff Show more