From c1c13b37d2aaf3c65bc148212da302b0eb7868bf Mon Sep 17 00:00:00 2001 From: syuilo Date: Wed, 16 Aug 2023 15:31:34 +0900 Subject: [PATCH] wip --- .../backend/src/core/AccountMoveService.ts | 14 +- .../backend/src/core/AccountUpdateService.ts | 4 +- .../backend/src/core/AchievementService.ts | 4 +- .../backend/src/core/AnnouncementService.ts | 6 +- packages/backend/src/core/AntennaService.ts | 6 +- packages/backend/src/core/CacheService.ts | 16 +-- .../backend/src/core/CustomEmojiService.ts | 4 +- .../backend/src/core/DeleteAccountService.ts | 4 +- packages/backend/src/core/DriveService.ts | 10 +- packages/backend/src/core/EmailService.ts | 4 +- .../src/core/FederatedInstanceService.ts | 4 +- packages/backend/src/core/HashtagService.ts | 4 +- .../backend/src/core/InstanceActorService.ts | 4 +- .../backend/src/core/ModerationLogService.ts | 4 +- .../backend/src/core/NoteCreateService.ts | 20 +-- .../backend/src/core/NoteDeleteService.ts | 8 +- .../backend/src/core/NotePiningService.ts | 8 +- packages/backend/src/core/NoteReadService.ts | 8 +- .../backend/src/core/NotificationService.ts | 4 +- packages/backend/src/core/PollService.ts | 10 +- .../backend/src/core/ProxyAccountService.ts | 4 +- .../src/core/PushNotificationService.ts | 4 +- packages/backend/src/core/QueryService.ts | 18 +-- packages/backend/src/core/ReactionService.ts | 10 +- packages/backend/src/core/RelayService.ts | 6 +- .../src/core/RemoteUserResolveService.ts | 4 +- packages/backend/src/core/RoleService.ts | 8 +- packages/backend/src/core/SearchService.ts | 4 +- packages/backend/src/core/SignupService.ts | 6 +- .../backend/src/core/UserBlockingService.ts | 10 +- .../backend/src/core/UserFollowingService.ts | 12 +- .../backend/src/core/UserKeypairService.ts | 4 +- packages/backend/src/core/UserListService.ts | 4 +- .../backend/src/core/UserMutingService.ts | 4 +- .../backend/src/core/UserSuspendService.ts | 4 +- packages/backend/src/core/WebhookService.ts | 4 +- .../core/activitypub/ApDbResolverService.ts | 8 +- .../activitypub/ApDeliverManagerService.ts | 6 +- .../src/core/activitypub/ApInboxService.ts | 12 +- .../src/core/activitypub/ApRendererService.ts | 12 +- .../src/core/activitypub/ApResolverService.ts | 18 +-- .../core/activitypub/models/ApImageService.ts | 4 +- .../core/activitypub/models/ApNoteService.ts | 6 +- .../activitypub/models/ApPersonService.ts | 12 +- .../activitypub/models/ApQuestionService.ts | 6 +- .../src/core/chart/charts/federation.ts | 6 +- .../backend/src/core/chart/charts/instance.ts | 10 +- .../backend/src/core/chart/charts/notes.ts | 4 +- .../src/core/chart/charts/per-user-drive.ts | 4 +- .../core/chart/charts/per-user-following.ts | 4 +- .../src/core/chart/charts/per-user-notes.ts | 4 +- .../backend/src/core/chart/charts/users.ts | 4 +- .../entities/AbuseUserReportEntityService.ts | 4 +- .../src/core/entities/AntennaEntityService.ts | 4 +- .../src/core/entities/AppEntityService.ts | 6 +- .../core/entities/AuthSessionEntityService.ts | 4 +- .../core/entities/BlockingEntityService.ts | 4 +- .../src/core/entities/ChannelEntityService.ts | 14 +- .../src/core/entities/ClipEntityService.ts | 6 +- .../core/entities/DriveFileEntityService.ts | 4 +- .../core/entities/DriveFolderEntityService.ts | 6 +- .../src/core/entities/EmojiEntityService.ts | 4 +- .../src/core/entities/FlashEntityService.ts | 6 +- .../core/entities/FlashLikeEntityService.ts | 4 +- .../entities/FollowRequestEntityService.ts | 4 +- .../core/entities/FollowingEntityService.ts | 4 +- .../core/entities/GalleryLikeEntityService.ts | 4 +- .../core/entities/GalleryPostEntityService.ts | 6 +- .../core/entities/InviteCodeEntityService.ts | 4 +- .../entities/ModerationLogEntityService.ts | 4 +- .../src/core/entities/MutingEntityService.ts | 4 +- .../src/core/entities/NoteEntityService.ts | 16 +-- .../entities/NoteFavoriteEntityService.ts | 4 +- .../entities/NoteReactionEntityService.ts | 4 +- .../entities/NotificationEntityService.ts | 10 +- .../src/core/entities/PageEntityService.ts | 8 +- .../core/entities/PageLikeEntityService.ts | 4 +- .../entities/RenoteMutingEntityService.ts | 4 +- .../src/core/entities/RoleEntityService.ts | 6 +- .../src/core/entities/UserEntityService.ts | 30 ++-- .../core/entities/UserListEntityService.ts | 6 +- .../backend/src/daemons/JanitorService.ts | 4 +- packages/backend/src/models/index.ts | 132 +++++++++--------- .../AggregateRetentionProcessorService.ts | 6 +- .../CheckExpiredMutingsProcessorService.ts | 4 +- .../queue/processors/CleanProcessorService.ts | 10 +- .../CleanRemoteFilesProcessorService.ts | 4 +- .../DeleteAccountProcessorService.ts | 10 +- .../DeleteDriveFilesProcessorService.ts | 6 +- .../processors/DeliverProcessorService.ts | 4 +- .../EndedPollNotificationProcessorService.ts | 6 +- .../ExportAntennasProcessorService.ts | 8 +- .../ExportBlockingProcessorService.ts | 6 +- .../ExportCustomEmojisProcessorService.ts | 6 +- .../ExportFavoritesProcessorService.ts | 8 +- .../ExportFollowingProcessorService.ts | 8 +- .../ExportMutingProcessorService.ts | 6 +- .../processors/ExportNotesProcessorService.ts | 8 +- .../ExportUserListsProcessorService.ts | 8 +- .../ImportAntennasProcessorService.ts | 4 +- .../ImportBlockingProcessorService.ts | 6 +- .../ImportCustomEmojisProcessorService.ts | 6 +- .../ImportFollowingProcessorService.ts | 6 +- .../ImportMutingProcessorService.ts | 6 +- .../ImportUserListsProcessorService.ts | 10 +- .../RelationshipProcessorService.ts | 4 +- .../WebhookDeliverProcessorService.ts | 4 +- .../src/server/ActivityPubServerService.ts | 18 +-- .../backend/src/server/FileServerService.ts | 4 +- packages/backend/src/server/ServerService.ts | 8 +- .../src/server/WellKnownServerService.ts | 4 +- .../backend/src/server/api/ApiCallService.ts | 4 +- .../src/server/api/ApiServerService.ts | 6 +- .../src/server/api/AuthenticateService.ts | 8 +- .../backend/src/server/api/GetterService.ts | 6 +- .../src/server/api/SigninApiService.ts | 12 +- .../backend/src/server/api/SigninService.ts | 4 +- .../src/server/api/SignupApiService.ts | 12 +- .../server/api/StreamingApiServerService.ts | 4 +- .../api/endpoints/admin/abuse-user-reports.ts | 4 +- .../api/endpoints/admin/accounts/create.ts | 4 +- .../api/endpoints/admin/accounts/delete.ts | 4 +- .../server/api/endpoints/admin/ad/create.ts | 4 +- .../server/api/endpoints/admin/ad/delete.ts | 4 +- .../src/server/api/endpoints/admin/ad/list.ts | 4 +- .../server/api/endpoints/admin/ad/update.ts | 4 +- .../endpoints/admin/announcements/delete.ts | 4 +- .../api/endpoints/admin/announcements/list.ts | 6 +- .../endpoints/admin/announcements/update.ts | 4 +- .../api/endpoints/admin/delete-account.ts | 4 +- .../admin/delete-all-files-of-a-user.ts | 4 +- .../api/endpoints/admin/drive/cleanup.ts | 4 +- .../server/api/endpoints/admin/drive/files.ts | 4 +- .../api/endpoints/admin/drive/show-file.ts | 6 +- .../server/api/endpoints/admin/emoji/add.ts | 4 +- .../server/api/endpoints/admin/emoji/copy.ts | 4 +- .../api/endpoints/admin/emoji/list-remote.ts | 4 +- .../server/api/endpoints/admin/emoji/list.ts | 4 +- .../api/endpoints/admin/emoji/update.ts | 4 +- .../admin/federation/delete-all-files.ts | 4 +- .../refresh-remote-instance-metadata.ts | 4 +- .../admin/federation/remove-all-following.ts | 6 +- .../admin/federation/update-instance.ts | 4 +- .../api/endpoints/admin/get-user-ips.ts | 4 +- .../api/endpoints/admin/invite/create.ts | 4 +- .../server/api/endpoints/admin/invite/list.ts | 4 +- .../api/endpoints/admin/promo/create.ts | 4 +- .../api/endpoints/admin/reset-password.ts | 6 +- .../admin/resolve-abuse-user-report.ts | 6 +- .../api/endpoints/admin/roles/assign.ts | 6 +- .../api/endpoints/admin/roles/create.ts | 4 +- .../api/endpoints/admin/roles/delete.ts | 4 +- .../server/api/endpoints/admin/roles/list.ts | 4 +- .../server/api/endpoints/admin/roles/show.ts | 4 +- .../api/endpoints/admin/roles/unassign.ts | 6 +- .../api/endpoints/admin/roles/update.ts | 4 +- .../server/api/endpoints/admin/roles/users.ts | 6 +- .../endpoints/admin/show-moderation-logs.ts | 4 +- .../server/api/endpoints/admin/show-user.ts | 8 +- .../server/api/endpoints/admin/show-users.ts | 4 +- .../api/endpoints/admin/suspend-user.ts | 6 +- .../api/endpoints/admin/unsuspend-user.ts | 4 +- .../api/endpoints/admin/update-user-note.ts | 6 +- .../src/server/api/endpoints/announcements.ts | 6 +- .../server/api/endpoints/antennas/create.ts | 6 +- .../server/api/endpoints/antennas/delete.ts | 4 +- .../src/server/api/endpoints/antennas/list.ts | 4 +- .../server/api/endpoints/antennas/notes.ts | 6 +- .../src/server/api/endpoints/antennas/show.ts | 4 +- .../server/api/endpoints/antennas/update.ts | 6 +- .../src/server/api/endpoints/app/create.ts | 4 +- .../src/server/api/endpoints/app/show.ts | 4 +- .../src/server/api/endpoints/auth/accept.ts | 8 +- .../api/endpoints/auth/session/generate.ts | 6 +- .../server/api/endpoints/auth/session/show.ts | 4 +- .../api/endpoints/auth/session/userkey.ts | 8 +- .../server/api/endpoints/blocking/create.ts | 6 +- .../server/api/endpoints/blocking/delete.ts | 6 +- .../src/server/api/endpoints/blocking/list.ts | 4 +- .../server/api/endpoints/channels/create.ts | 6 +- .../server/api/endpoints/channels/favorite.ts | 6 +- .../server/api/endpoints/channels/featured.ts | 4 +- .../server/api/endpoints/channels/follow.ts | 6 +- .../server/api/endpoints/channels/followed.ts | 4 +- .../api/endpoints/channels/my-favorites.ts | 4 +- .../server/api/endpoints/channels/owned.ts | 4 +- .../server/api/endpoints/channels/search.ts | 4 +- .../src/server/api/endpoints/channels/show.ts | 4 +- .../server/api/endpoints/channels/timeline.ts | 6 +- .../api/endpoints/channels/unfavorite.ts | 6 +- .../server/api/endpoints/channels/unfollow.ts | 6 +- .../server/api/endpoints/channels/update.ts | 6 +- .../server/api/endpoints/clips/add-note.ts | 6 +- .../src/server/api/endpoints/clips/create.ts | 4 +- .../src/server/api/endpoints/clips/delete.ts | 4 +- .../server/api/endpoints/clips/favorite.ts | 6 +- .../src/server/api/endpoints/clips/list.ts | 4 +- .../api/endpoints/clips/my-favorites.ts | 4 +- .../src/server/api/endpoints/clips/notes.ts | 8 +- .../server/api/endpoints/clips/remove-note.ts | 6 +- .../src/server/api/endpoints/clips/show.ts | 4 +- .../server/api/endpoints/clips/unfavorite.ts | 6 +- .../src/server/api/endpoints/clips/update.ts | 4 +- .../src/server/api/endpoints/drive/files.ts | 4 +- .../endpoints/drive/files/attached-notes.ts | 6 +- .../endpoints/drive/files/check-existence.ts | 4 +- .../api/endpoints/drive/files/delete.ts | 4 +- .../api/endpoints/drive/files/find-by-hash.ts | 4 +- .../server/api/endpoints/drive/files/find.ts | 4 +- .../server/api/endpoints/drive/files/show.ts | 4 +- .../api/endpoints/drive/files/update.ts | 6 +- .../src/server/api/endpoints/drive/folders.ts | 4 +- .../api/endpoints/drive/folders/create.ts | 4 +- .../api/endpoints/drive/folders/delete.ts | 6 +- .../api/endpoints/drive/folders/find.ts | 4 +- .../api/endpoints/drive/folders/show.ts | 4 +- .../api/endpoints/drive/folders/update.ts | 4 +- .../src/server/api/endpoints/drive/stream.ts | 4 +- .../backend/src/server/api/endpoints/emoji.ts | 4 +- .../src/server/api/endpoints/emojis.ts | 4 +- .../api/endpoints/federation/followers.ts | 4 +- .../api/endpoints/federation/following.ts | 4 +- .../api/endpoints/federation/instances.ts | 4 +- .../api/endpoints/federation/show-instance.ts | 4 +- .../server/api/endpoints/federation/stats.ts | 6 +- .../server/api/endpoints/federation/users.ts | 4 +- .../src/server/api/endpoints/flash/create.ts | 4 +- .../src/server/api/endpoints/flash/delete.ts | 4 +- .../server/api/endpoints/flash/featured.ts | 4 +- .../src/server/api/endpoints/flash/like.ts | 6 +- .../server/api/endpoints/flash/my-likes.ts | 4 +- .../src/server/api/endpoints/flash/my.ts | 4 +- .../src/server/api/endpoints/flash/show.ts | 4 +- .../src/server/api/endpoints/flash/unlike.ts | 6 +- .../src/server/api/endpoints/flash/update.ts | 4 +- .../server/api/endpoints/following/create.ts | 4 +- .../server/api/endpoints/following/delete.ts | 4 +- .../api/endpoints/following/invalidate.ts | 4 +- .../api/endpoints/following/requests/list.ts | 4 +- .../server/api/endpoints/gallery/featured.ts | 4 +- .../server/api/endpoints/gallery/popular.ts | 4 +- .../src/server/api/endpoints/gallery/posts.ts | 4 +- .../api/endpoints/gallery/posts/create.ts | 6 +- .../api/endpoints/gallery/posts/delete.ts | 4 +- .../api/endpoints/gallery/posts/like.ts | 6 +- .../api/endpoints/gallery/posts/show.ts | 4 +- .../api/endpoints/gallery/posts/unlike.ts | 6 +- .../api/endpoints/gallery/posts/update.ts | 6 +- .../api/endpoints/get-online-users-count.ts | 4 +- .../src/server/api/endpoints/hashtags/list.ts | 4 +- .../server/api/endpoints/hashtags/search.ts | 4 +- .../src/server/api/endpoints/hashtags/show.ts | 4 +- .../server/api/endpoints/hashtags/trend.ts | 4 +- .../server/api/endpoints/hashtags/users.ts | 4 +- .../backend/src/server/api/endpoints/i.ts | 4 +- .../src/server/api/endpoints/i/2fa/done.ts | 4 +- .../server/api/endpoints/i/2fa/key-done.ts | 8 +- .../api/endpoints/i/2fa/password-less.ts | 6 +- .../api/endpoints/i/2fa/register-key.ts | 6 +- .../server/api/endpoints/i/2fa/register.ts | 4 +- .../server/api/endpoints/i/2fa/remove-key.ts | 6 +- .../server/api/endpoints/i/2fa/unregister.ts | 4 +- .../server/api/endpoints/i/2fa/update-key.ts | 4 +- .../src/server/api/endpoints/i/apps.ts | 4 +- .../server/api/endpoints/i/authorized-apps.ts | 4 +- .../server/api/endpoints/i/change-password.ts | 4 +- .../server/api/endpoints/i/delete-account.ts | 6 +- .../src/server/api/endpoints/i/favorites.ts | 4 +- .../server/api/endpoints/i/gallery/likes.ts | 4 +- .../server/api/endpoints/i/gallery/posts.ts | 4 +- .../endpoints/i/get-word-muted-notes-count.ts | 4 +- .../server/api/endpoints/i/import-antennas.ts | 8 +- .../server/api/endpoints/i/import-blocking.ts | 4 +- .../api/endpoints/i/import-following.ts | 4 +- .../server/api/endpoints/i/import-muting.ts | 4 +- .../api/endpoints/i/import-user-lists.ts | 4 +- .../server/api/endpoints/i/notifications.ts | 4 +- .../src/server/api/endpoints/i/page-likes.ts | 4 +- .../src/server/api/endpoints/i/pages.ts | 4 +- .../api/endpoints/i/read-all-unread-notes.ts | 4 +- .../api/endpoints/i/regenerate-token.ts | 6 +- .../api/endpoints/i/registry/get-all.ts | 4 +- .../api/endpoints/i/registry/get-detail.ts | 4 +- .../server/api/endpoints/i/registry/get.ts | 4 +- .../endpoints/i/registry/keys-with-type.ts | 4 +- .../server/api/endpoints/i/registry/keys.ts | 4 +- .../server/api/endpoints/i/registry/remove.ts | 4 +- .../server/api/endpoints/i/registry/scopes.ts | 4 +- .../server/api/endpoints/i/registry/set.ts | 4 +- .../server/api/endpoints/i/revoke-token.ts | 4 +- .../server/api/endpoints/i/signin-history.ts | 4 +- .../server/api/endpoints/i/update-email.ts | 4 +- .../src/server/api/endpoints/i/update.ts | 10 +- .../server/api/endpoints/i/webhooks/create.ts | 4 +- .../server/api/endpoints/i/webhooks/delete.ts | 4 +- .../server/api/endpoints/i/webhooks/list.ts | 4 +- .../server/api/endpoints/i/webhooks/show.ts | 4 +- .../server/api/endpoints/i/webhooks/update.ts | 4 +- .../src/server/api/endpoints/invite/create.ts | 4 +- .../src/server/api/endpoints/invite/delete.ts | 4 +- .../src/server/api/endpoints/invite/limit.ts | 4 +- .../src/server/api/endpoints/invite/list.ts | 4 +- .../backend/src/server/api/endpoints/meta.ts | 6 +- .../server/api/endpoints/miauth/gen-token.ts | 4 +- .../src/server/api/endpoints/mute/create.ts | 4 +- .../src/server/api/endpoints/mute/delete.ts | 4 +- .../src/server/api/endpoints/mute/list.ts | 4 +- .../src/server/api/endpoints/my/apps.ts | 4 +- .../backend/src/server/api/endpoints/notes.ts | 4 +- .../server/api/endpoints/notes/children.ts | 4 +- .../src/server/api/endpoints/notes/clips.ts | 6 +- .../api/endpoints/notes/conversation.ts | 4 +- .../src/server/api/endpoints/notes/create.ts | 12 +- .../src/server/api/endpoints/notes/delete.ts | 4 +- .../api/endpoints/notes/favorites/create.ts | 4 +- .../api/endpoints/notes/favorites/delete.ts | 4 +- .../server/api/endpoints/notes/featured.ts | 4 +- .../api/endpoints/notes/global-timeline.ts | 4 +- .../api/endpoints/notes/hybrid-timeline.ts | 6 +- .../api/endpoints/notes/local-timeline.ts | 4 +- .../server/api/endpoints/notes/mentions.ts | 6 +- .../endpoints/notes/polls/recommendation.ts | 10 +- .../server/api/endpoints/notes/polls/vote.ts | 8 +- .../server/api/endpoints/notes/reactions.ts | 4 +- .../src/server/api/endpoints/notes/renotes.ts | 4 +- .../src/server/api/endpoints/notes/replies.ts | 4 +- .../api/endpoints/notes/search-by-tag.ts | 4 +- .../src/server/api/endpoints/notes/state.ts | 8 +- .../endpoints/notes/thread-muting/create.ts | 6 +- .../endpoints/notes/thread-muting/delete.ts | 4 +- .../server/api/endpoints/notes/timeline.ts | 6 +- .../server/api/endpoints/notes/unrenote.ts | 6 +- .../api/endpoints/notes/user-list-timeline.ts | 8 +- .../src/server/api/endpoints/page-push.ts | 4 +- .../src/server/api/endpoints/pages/create.ts | 6 +- .../src/server/api/endpoints/pages/delete.ts | 4 +- .../server/api/endpoints/pages/featured.ts | 4 +- .../src/server/api/endpoints/pages/like.ts | 6 +- .../src/server/api/endpoints/pages/show.ts | 6 +- .../src/server/api/endpoints/pages/unlike.ts | 6 +- .../src/server/api/endpoints/pages/update.ts | 6 +- .../src/server/api/endpoints/pinned-users.ts | 4 +- .../src/server/api/endpoints/promo/read.ts | 4 +- .../api/endpoints/renote-mute/create.ts | 4 +- .../api/endpoints/renote-mute/delete.ts | 4 +- .../server/api/endpoints/renote-mute/list.ts | 4 +- .../api/endpoints/request-reset-password.ts | 8 +- .../server/api/endpoints/reset-password.ts | 6 +- .../src/server/api/endpoints/retention.ts | 4 +- .../src/server/api/endpoints/roles/list.ts | 4 +- .../src/server/api/endpoints/roles/notes.ts | 6 +- .../src/server/api/endpoints/roles/show.ts | 4 +- .../src/server/api/endpoints/roles/users.ts | 6 +- .../backend/src/server/api/endpoints/stats.ts | 6 +- .../src/server/api/endpoints/sw/register.ts | 4 +- .../api/endpoints/sw/show-registration.ts | 4 +- .../src/server/api/endpoints/sw/unregister.ts | 4 +- .../api/endpoints/sw/update-registration.ts | 4 +- .../api/endpoints/username/available.ts | 6 +- .../backend/src/server/api/endpoints/users.ts | 4 +- .../api/endpoints/users/achievements.ts | 4 +- .../src/server/api/endpoints/users/clips.ts | 4 +- .../server/api/endpoints/users/followers.ts | 8 +- .../server/api/endpoints/users/following.ts | 8 +- .../api/endpoints/users/gallery/posts.ts | 4 +- .../users/get-frequently-replied-users.ts | 4 +- .../users/lists/create-from-public.ts | 8 +- .../api/endpoints/users/lists/create.ts | 4 +- .../api/endpoints/users/lists/delete.ts | 4 +- .../api/endpoints/users/lists/favorite.ts | 6 +- .../server/api/endpoints/users/lists/list.ts | 6 +- .../server/api/endpoints/users/lists/pull.ts | 6 +- .../server/api/endpoints/users/lists/push.ts | 8 +- .../server/api/endpoints/users/lists/show.ts | 6 +- .../api/endpoints/users/lists/unfavorite.ts | 6 +- .../api/endpoints/users/lists/update.ts | 4 +- .../src/server/api/endpoints/users/notes.ts | 4 +- .../src/server/api/endpoints/users/pages.ts | 4 +- .../server/api/endpoints/users/reactions.ts | 6 +- .../api/endpoints/users/recommendation.ts | 6 +- .../api/endpoints/users/report-abuse.ts | 4 +- .../users/search-by-username-and-host.ts | 6 +- .../src/server/api/endpoints/users/search.ts | 6 +- .../src/server/api/endpoints/users/show.ts | 4 +- .../server/api/endpoints/users/update-memo.ts | 4 +- .../server/api/stream/channels/user-list.ts | 10 +- .../src/server/oauth/OAuth2ProviderService.ts | 6 +- .../src/server/web/ClientServerService.ts | 18 +-- .../backend/src/server/web/FeedService.ts | 8 +- 389 files changed, 1130 insertions(+), 1130 deletions(-) diff --git a/packages/backend/src/core/AccountMoveService.ts b/packages/backend/src/core/AccountMoveService.ts index 84cc5def1f..de721961b0 100644 --- a/packages/backend/src/core/AccountMoveService.ts +++ b/packages/backend/src/core/AccountMoveService.ts @@ -9,7 +9,7 @@ import { IsNull, In, MoreThan, Not } from 'typeorm'; import { bindThis } from '@/decorators.js'; import { DI } from '@/di-symbols.js'; import type { MiLocalUser, MiRemoteUser, MiUser } from '@/models/entities/User.js'; -import type { 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, diff --git a/packages/backend/src/core/AccountUpdateService.ts b/packages/backend/src/core/AccountUpdateService.ts index 6a796407dc..9632eb3b10 100644 --- a/packages/backend/src/core/AccountUpdateService.ts +++ b/packages/backend/src/core/AccountUpdateService.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { DI } from '@/di-symbols.js'; -import type { 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, diff --git a/packages/backend/src/core/AchievementService.ts b/packages/backend/src/core/AchievementService.ts index aa810015ed..3216d9c3d9 100644 --- a/packages/backend/src/core/AchievementService.ts +++ b/packages/backend/src/core/AchievementService.ts @@ -4,7 +4,7 @@ */ import { Inject, Injectable } from '@nestjs/common'; -import type { 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, ) { diff --git a/packages/backend/src/core/AnnouncementService.ts b/packages/backend/src/core/AnnouncementService.ts index 64e8ae758c..13002a011f 100644 --- a/packages/backend/src/core/AnnouncementService.ts +++ b/packages/backend/src/core/AnnouncementService.ts @@ -7,7 +7,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Brackets } from 'typeorm'; import { DI } from '@/di-symbols.js'; import type { MiUser } from '@/models/entities/User.js'; -import type { 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, diff --git a/packages/backend/src/core/AntennaService.ts b/packages/backend/src/core/AntennaService.ts index c64b941413..60244803b7 100644 --- a/packages/backend/src/core/AntennaService.ts +++ b/packages/backend/src/core/AntennaService.ts @@ -12,7 +12,7 @@ import { GlobalEventService } from '@/core/GlobalEventService.js'; import * as Acct from '@/misc/acct.js'; import type { Packed } from '@/misc/json-schema.js'; import { DI } from '@/di-symbols.js'; -import type { 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, diff --git a/packages/backend/src/core/CacheService.ts b/packages/backend/src/core/CacheService.ts index 15be5f398c..a19528adb6 100644 --- a/packages/backend/src/core/CacheService.ts +++ b/packages/backend/src/core/CacheService.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import * as Redis from 'ioredis'; -import type { 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, ) { diff --git a/packages/backend/src/core/CustomEmojiService.ts b/packages/backend/src/core/CustomEmojiService.ts index 8fd993345b..f12963484d 100644 --- a/packages/backend/src/core/CustomEmojiService.ts +++ b/packages/backend/src/core/CustomEmojiService.ts @@ -12,7 +12,7 @@ import { EmojiEntityService } from '@/core/entities/EmojiEntityService.js'; import { GlobalEventService } from '@/core/GlobalEventService.js'; import type { MiDriveFile } from '@/models/entities/DriveFile.js'; import type { MiEmoji } from '@/models/entities/Emoji.js'; -import type { 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, diff --git a/packages/backend/src/core/DeleteAccountService.ts b/packages/backend/src/core/DeleteAccountService.ts index 3e90d39455..26d13d4800 100644 --- a/packages/backend/src/core/DeleteAccountService.ts +++ b/packages/backend/src/core/DeleteAccountService.ts @@ -4,7 +4,7 @@ */ import { Inject, Injectable } from '@nestjs/common'; -import type { 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, diff --git a/packages/backend/src/core/DriveService.ts b/packages/backend/src/core/DriveService.ts index 77f60bf6e9..ae212f15e5 100644 --- a/packages/backend/src/core/DriveService.ts +++ b/packages/backend/src/core/DriveService.ts @@ -11,7 +11,7 @@ import { sharpBmp } from 'sharp-read-bmp'; import { IsNull } from 'typeorm'; import { DeleteObjectCommandInput, PutObjectCommandInput, NoSuchKey } from '@aws-sdk/client-s3'; import { DI } from '@/di-symbols.js'; -import type { 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, diff --git a/packages/backend/src/core/EmailService.ts b/packages/backend/src/core/EmailService.ts index 162634593e..0aab443f49 100644 --- a/packages/backend/src/core/EmailService.ts +++ b/packages/backend/src/core/EmailService.ts @@ -10,7 +10,7 @@ import { MetaService } from '@/core/MetaService.js'; import { DI } from '@/di-symbols.js'; import type { Config } from '@/config.js'; import type Logger from '@/logger.js'; -import type { 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, diff --git a/packages/backend/src/core/FederatedInstanceService.ts b/packages/backend/src/core/FederatedInstanceService.ts index e7b85b750b..f74b21d135 100644 --- a/packages/backend/src/core/FederatedInstanceService.ts +++ b/packages/backend/src/core/FederatedInstanceService.ts @@ -5,7 +5,7 @@ import { Inject, Injectable, OnApplicationShutdown } from '@nestjs/common'; import * as Redis from 'ioredis'; -import type { 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, diff --git a/packages/backend/src/core/HashtagService.ts b/packages/backend/src/core/HashtagService.ts index eec160275f..7c37045b6d 100644 --- a/packages/backend/src/core/HashtagService.ts +++ b/packages/backend/src/core/HashtagService.ts @@ -9,7 +9,7 @@ import type { MiUser } from '@/models/entities/User.js'; import { normalizeForSearch } from '@/misc/normalize-for-search.js'; import { IdService } from '@/core/IdService.js'; import type { MiHashtag } from '@/models/entities/Hashtag.js'; -import type { 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, diff --git a/packages/backend/src/core/InstanceActorService.ts b/packages/backend/src/core/InstanceActorService.ts index 8e576774d4..099d4d46d4 100644 --- a/packages/backend/src/core/InstanceActorService.ts +++ b/packages/backend/src/core/InstanceActorService.ts @@ -6,7 +6,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { IsNull } from 'typeorm'; import type { MiLocalUser } from '@/models/entities/User.js'; -import type { 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, ) { diff --git a/packages/backend/src/core/ModerationLogService.ts b/packages/backend/src/core/ModerationLogService.ts index be01fbf9fa..778b339b42 100644 --- a/packages/backend/src/core/ModerationLogService.ts +++ b/packages/backend/src/core/ModerationLogService.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { DI } from '@/di-symbols.js'; -import type { 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, ) { diff --git a/packages/backend/src/core/NoteCreateService.ts b/packages/backend/src/core/NoteCreateService.ts index 2ccc610cf3..6074897c44 100644 --- a/packages/backend/src/core/NoteCreateService.ts +++ b/packages/backend/src/core/NoteCreateService.ts @@ -14,7 +14,7 @@ import { extractCustomEmojisFromMfm } from '@/misc/extract-custom-emojis-from-mf import { extractHashtags } from '@/misc/extract-hashtags.js'; import type { IMentionedRemoteUsers } from '@/models/entities/Note.js'; import { MiNote } from '@/models/entities/Note.js'; -import type { 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, diff --git a/packages/backend/src/core/NoteDeleteService.ts b/packages/backend/src/core/NoteDeleteService.ts index 07708bd028..1a5304b3e5 100644 --- a/packages/backend/src/core/NoteDeleteService.ts +++ b/packages/backend/src/core/NoteDeleteService.ts @@ -7,7 +7,7 @@ import { Brackets, In } from 'typeorm'; import { Injectable, Inject } from '@nestjs/common'; import type { MiUser, MiLocalUser, MiRemoteUser } from '@/models/entities/User.js'; import type { MiNote, IMentionedRemoteUsers } from '@/models/entities/Note.js'; -import type { 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, diff --git a/packages/backend/src/core/NotePiningService.ts b/packages/backend/src/core/NotePiningService.ts index 7f1381a41a..25ed5d1e17 100644 --- a/packages/backend/src/core/NotePiningService.ts +++ b/packages/backend/src/core/NotePiningService.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { DI } from '@/di-symbols.js'; -import type { 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, diff --git a/packages/backend/src/core/NoteReadService.ts b/packages/backend/src/core/NoteReadService.ts index 0197486263..e947b02d71 100644 --- a/packages/backend/src/core/NoteReadService.ts +++ b/packages/backend/src/core/NoteReadService.ts @@ -12,7 +12,7 @@ import type { Packed } from '@/misc/json-schema.js'; import type { MiNote } from '@/models/entities/Note.js'; import { IdService } from '@/core/IdService.js'; import { GlobalEventService } from '@/core/GlobalEventService.js'; -import type { 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, diff --git a/packages/backend/src/core/NotificationService.ts b/packages/backend/src/core/NotificationService.ts index 02c577c199..2b04182616 100644 --- a/packages/backend/src/core/NotificationService.ts +++ b/packages/backend/src/core/NotificationService.ts @@ -8,7 +8,7 @@ import * as Redis from 'ioredis'; import { Inject, Injectable, OnApplicationShutdown } from '@nestjs/common'; import { In } from 'typeorm'; import { DI } from '@/di-symbols.js'; -import type { 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, diff --git a/packages/backend/src/core/PollService.ts b/packages/backend/src/core/PollService.ts index 551c779769..26ddbb75ff 100644 --- a/packages/backend/src/core/PollService.ts +++ b/packages/backend/src/core/PollService.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { DI } from '@/di-symbols.js'; -import type { 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, diff --git a/packages/backend/src/core/ProxyAccountService.ts b/packages/backend/src/core/ProxyAccountService.ts index 9fb0a45df9..7a2d795b48 100644 --- a/packages/backend/src/core/ProxyAccountService.ts +++ b/packages/backend/src/core/ProxyAccountService.ts @@ -4,7 +4,7 @@ */ import { Inject, Injectable } from '@nestjs/common'; -import type { 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, ) { diff --git a/packages/backend/src/core/PushNotificationService.ts b/packages/backend/src/core/PushNotificationService.ts index 93928e3cd7..e41ad8bb8c 100644 --- a/packages/backend/src/core/PushNotificationService.ts +++ b/packages/backend/src/core/PushNotificationService.ts @@ -10,7 +10,7 @@ import { DI } from '@/di-symbols.js'; import type { Config } from '@/config.js'; import type { Packed } from '@/misc/json-schema.js'; import { getNoteSummary } from '@/misc/get-note-summary.js'; -import type { MiSwSubscription, 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, ) { diff --git a/packages/backend/src/core/QueryService.ts b/packages/backend/src/core/QueryService.ts index 30fc671589..cbfe5b441f 100644 --- a/packages/backend/src/core/QueryService.ts +++ b/packages/backend/src/core/QueryService.ts @@ -7,7 +7,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Brackets, ObjectLiteral } from 'typeorm'; import { DI } from '@/di-symbols.js'; import type { MiUser } from '@/models/entities/User.js'; -import type { 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, ) { } diff --git a/packages/backend/src/core/ReactionService.ts b/packages/backend/src/core/ReactionService.ts index b8bdfff02e..2faf094811 100644 --- a/packages/backend/src/core/ReactionService.ts +++ b/packages/backend/src/core/ReactionService.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { DI } from '@/di-symbols.js'; -import type { 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, diff --git a/packages/backend/src/core/RelayService.ts b/packages/backend/src/core/RelayService.ts index 89f245e86d..e8108d80d3 100644 --- a/packages/backend/src/core/RelayService.ts +++ b/packages/backend/src/core/RelayService.ts @@ -6,7 +6,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { IsNull } from 'typeorm'; import type { MiLocalUser, MiUser } from '@/models/entities/User.js'; -import type { 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, diff --git a/packages/backend/src/core/RemoteUserResolveService.ts b/packages/backend/src/core/RemoteUserResolveService.ts index ca538ed6cd..6c8946b3a0 100644 --- a/packages/backend/src/core/RemoteUserResolveService.ts +++ b/packages/backend/src/core/RemoteUserResolveService.ts @@ -8,7 +8,7 @@ import { Inject, Injectable } from '@nestjs/common'; import chalk from 'chalk'; import { IsNull } from 'typeorm'; import { DI } from '@/di-symbols.js'; -import type { 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, diff --git a/packages/backend/src/core/RoleService.ts b/packages/backend/src/core/RoleService.ts index f755f3ecfb..b6bc13d990 100644 --- a/packages/backend/src/core/RoleService.ts +++ b/packages/backend/src/core/RoleService.ts @@ -6,7 +6,7 @@ import { Inject, Injectable } from '@nestjs/common'; import * as Redis from 'ioredis'; import { In } from 'typeorm'; -import type { MiRole, MiRoleAssignment, 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, diff --git a/packages/backend/src/core/SearchService.ts b/packages/backend/src/core/SearchService.ts index ce80744c6d..7340ed404b 100644 --- a/packages/backend/src/core/SearchService.ts +++ b/packages/backend/src/core/SearchService.ts @@ -10,7 +10,7 @@ import type { Config } from '@/config.js'; import { bindThis } from '@/decorators.js'; import { MiNote } from '@/models/entities/Note.js'; import { MiUser } from '@/models/index.js'; -import type { 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, diff --git a/packages/backend/src/core/SignupService.ts b/packages/backend/src/core/SignupService.ts index e719d5918e..8ee0064379 100644 --- a/packages/backend/src/core/SignupService.ts +++ b/packages/backend/src/core/SignupService.ts @@ -8,7 +8,7 @@ import { Inject, Injectable } from '@nestjs/common'; import bcrypt from 'bcryptjs'; import { DataSource, IsNull } from 'typeorm'; import { DI } from '@/di-symbols.js'; -import type { 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, diff --git a/packages/backend/src/core/UserBlockingService.ts b/packages/backend/src/core/UserBlockingService.ts index 44e2066a11..9d987a5ed2 100644 --- a/packages/backend/src/core/UserBlockingService.ts +++ b/packages/backend/src/core/UserBlockingService.ts @@ -11,7 +11,7 @@ import type { MiBlocking } from '@/models/entities/Blocking.js'; import { QueueService } from '@/core/QueueService.js'; import { GlobalEventService } from '@/core/GlobalEventService.js'; import { DI } from '@/di-symbols.js'; -import type { 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, diff --git a/packages/backend/src/core/UserFollowingService.ts b/packages/backend/src/core/UserFollowingService.ts index c99a3e6a11..6fc5d4bf2c 100644 --- a/packages/backend/src/core/UserFollowingService.ts +++ b/packages/backend/src/core/UserFollowingService.ts @@ -19,7 +19,7 @@ import { FederatedInstanceService } from '@/core/FederatedInstanceService.js'; import { WebhookService } from '@/core/WebhookService.js'; import { NotificationService } from '@/core/NotificationService.js'; import { DI } from '@/di-symbols.js'; -import type { 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, diff --git a/packages/backend/src/core/UserKeypairService.ts b/packages/backend/src/core/UserKeypairService.ts index f321727601..13fcd01d3a 100644 --- a/packages/backend/src/core/UserKeypairService.ts +++ b/packages/backend/src/core/UserKeypairService.ts @@ -6,7 +6,7 @@ import { Inject, Injectable, OnApplicationShutdown } from '@nestjs/common'; import * as Redis from 'ioredis'; import type { MiUser } from '@/models/entities/User.js'; -import type { 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(this.redisClient, 'userKeypair', { lifetime: 1000 * 60 * 60 * 24, // 24h diff --git a/packages/backend/src/core/UserListService.ts b/packages/backend/src/core/UserListService.ts index 3a56a2e96c..8411c2a95f 100644 --- a/packages/backend/src/core/UserListService.ts +++ b/packages/backend/src/core/UserListService.ts @@ -4,7 +4,7 @@ */ import { Inject, Injectable } from '@nestjs/common'; -import type { 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, diff --git a/packages/backend/src/core/UserMutingService.ts b/packages/backend/src/core/UserMutingService.ts index 1f0b2c215b..23aa5e3fb7 100644 --- a/packages/backend/src/core/UserMutingService.ts +++ b/packages/backend/src/core/UserMutingService.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { In } from 'typeorm'; -import type { 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, diff --git a/packages/backend/src/core/UserSuspendService.ts b/packages/backend/src/core/UserSuspendService.ts index 938aeb600c..1a00f7328a 100644 --- a/packages/backend/src/core/UserSuspendService.ts +++ b/packages/backend/src/core/UserSuspendService.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Not, IsNull } from 'typeorm'; -import type { 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, diff --git a/packages/backend/src/core/WebhookService.ts b/packages/backend/src/core/WebhookService.ts index 3b43c1224c..268e62b34d 100644 --- a/packages/backend/src/core/WebhookService.ts +++ b/packages/backend/src/core/WebhookService.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import * as Redis from 'ioredis'; -import type { 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); diff --git a/packages/backend/src/core/activitypub/ApDbResolverService.ts b/packages/backend/src/core/activitypub/ApDbResolverService.ts index b691588320..5a0ab0ca24 100644 --- a/packages/backend/src/core/activitypub/ApDbResolverService.ts +++ b/packages/backend/src/core/activitypub/ApDbResolverService.ts @@ -5,7 +5,7 @@ import { Inject, Injectable, OnApplicationShutdown } from '@nestjs/common'; import { DI } from '@/di-symbols.js'; -import type { 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, diff --git a/packages/backend/src/core/activitypub/ApDeliverManagerService.ts b/packages/backend/src/core/activitypub/ApDeliverManagerService.ts index da1e171063..47f7d3948c 100644 --- a/packages/backend/src/core/activitypub/ApDeliverManagerService.ts +++ b/packages/backend/src/core/activitypub/ApDeliverManagerService.ts @@ -6,7 +6,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { IsNull, Not } from 'typeorm'; import { DI } from '@/di-symbols.js'; -import type { 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, diff --git a/packages/backend/src/core/activitypub/ApInboxService.ts b/packages/backend/src/core/activitypub/ApInboxService.ts index d29e2cd687..5e1e214a6d 100644 --- a/packages/backend/src/core/activitypub/ApInboxService.ts +++ b/packages/backend/src/core/activitypub/ApInboxService.ts @@ -24,7 +24,7 @@ import { UtilityService } from '@/core/UtilityService.js'; import { NoteEntityService } from '@/core/entities/NoteEntityService.js'; import { UserEntityService } from '@/core/entities/UserEntityService.js'; import { QueueService } from '@/core/QueueService.js'; -import type { 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, diff --git a/packages/backend/src/core/activitypub/ApRendererService.ts b/packages/backend/src/core/activitypub/ApRendererService.ts index f345494edb..8674e0cce6 100644 --- a/packages/backend/src/core/activitypub/ApRendererService.ts +++ b/packages/backend/src/core/activitypub/ApRendererService.ts @@ -23,7 +23,7 @@ import { MfmService } from '@/core/MfmService.js'; import { UserEntityService } from '@/core/entities/UserEntityService.js'; import { DriveFileEntityService } from '@/core/entities/DriveFileEntityService.js'; import type { MiUserKeypair } from '@/models/entities/UserKeypair.js'; -import type { 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, diff --git a/packages/backend/src/core/activitypub/ApResolverService.ts b/packages/backend/src/core/activitypub/ApResolverService.ts index 34913fabe8..d92eadaf7c 100644 --- a/packages/backend/src/core/activitypub/ApResolverService.ts +++ b/packages/backend/src/core/activitypub/ApResolverService.ts @@ -6,7 +6,7 @@ import { Inject, Injectable } from '@nestjs/common'; import type { MiLocalUser, MiRemoteUser } from '@/models/entities/User.js'; import { InstanceActorService } from '@/core/InstanceActorService.js'; -import type { 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, diff --git a/packages/backend/src/core/activitypub/models/ApImageService.ts b/packages/backend/src/core/activitypub/models/ApImageService.ts index fa17a778bf..819da3609f 100644 --- a/packages/backend/src/core/activitypub/models/ApImageService.ts +++ b/packages/backend/src/core/activitypub/models/ApImageService.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { DI } from '@/di-symbols.js'; -import type { 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, diff --git a/packages/backend/src/core/activitypub/models/ApNoteService.ts b/packages/backend/src/core/activitypub/models/ApNoteService.ts index 6a9c69696f..eb93f238dc 100644 --- a/packages/backend/src/core/activitypub/models/ApNoteService.ts +++ b/packages/backend/src/core/activitypub/models/ApNoteService.ts @@ -7,7 +7,7 @@ import { forwardRef, Inject, Injectable } from '@nestjs/common'; import promiseLimit from 'promise-limit'; import { In } from 'typeorm'; import { DI } from '@/di-symbols.js'; -import type { 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, diff --git a/packages/backend/src/core/activitypub/models/ApPersonService.ts b/packages/backend/src/core/activitypub/models/ApPersonService.ts index ff0133993f..e5e3fd7857 100644 --- a/packages/backend/src/core/activitypub/models/ApPersonService.ts +++ b/packages/backend/src/core/activitypub/models/ApPersonService.ts @@ -8,7 +8,7 @@ import promiseLimit from 'promise-limit'; import { DataSource } from 'typeorm'; import { ModuleRef } from '@nestjs/core'; import { DI } from '@/di-symbols.js'; -import type { 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, ) { } diff --git a/packages/backend/src/core/activitypub/models/ApQuestionService.ts b/packages/backend/src/core/activitypub/models/ApQuestionService.ts index 8d8c0a5811..91c262f270 100644 --- a/packages/backend/src/core/activitypub/models/ApQuestionService.ts +++ b/packages/backend/src/core/activitypub/models/ApQuestionService.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { DI } from '@/di-symbols.js'; -import type { 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, diff --git a/packages/backend/src/core/chart/charts/federation.ts b/packages/backend/src/core/chart/charts/federation.ts index 6d42dab9b4..b619fa3f42 100644 --- a/packages/backend/src/core/chart/charts/federation.ts +++ b/packages/backend/src/core/chart/charts/federation.ts @@ -5,7 +5,7 @@ import { Injectable, Inject } from '@nestjs/common'; import { DataSource } from 'typeorm'; -import type { 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 { 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, diff --git a/packages/backend/src/core/chart/charts/instance.ts b/packages/backend/src/core/chart/charts/instance.ts index a780e59eb9..da3455cffa 100644 --- a/packages/backend/src/core/chart/charts/instance.ts +++ b/packages/backend/src/core/chart/charts/instance.ts @@ -5,7 +5,7 @@ import { Injectable, Inject } from '@nestjs/common'; import { DataSource } from 'typeorm'; -import type { 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 { 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, diff --git a/packages/backend/src/core/chart/charts/notes.ts b/packages/backend/src/core/chart/charts/notes.ts index 5a4226911c..09b130bc56 100644 --- a/packages/backend/src/core/chart/charts/notes.ts +++ b/packages/backend/src/core/chart/charts/notes.ts @@ -5,7 +5,7 @@ import { Injectable, Inject } from '@nestjs/common'; import { Not, IsNull, DataSource } from 'typeorm'; -import type { 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 { private db: DataSource, @Inject(DI.notesRepository) - private notesRepository: NotesRepository, + private notesRepository: MiNotesRepository, private appLockService: AppLockService, private chartLoggerService: ChartLoggerService, diff --git a/packages/backend/src/core/chart/charts/per-user-drive.ts b/packages/backend/src/core/chart/charts/per-user-drive.ts index 89822479c6..fc02ff4986 100644 --- a/packages/backend/src/core/chart/charts/per-user-drive.ts +++ b/packages/backend/src/core/chart/charts/per-user-drive.ts @@ -5,7 +5,7 @@ import { Injectable, Inject } from '@nestjs/common'; import { DataSource } from 'typeorm'; -import type { 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 { private db: DataSource, @Inject(DI.driveFilesRepository) - private driveFilesRepository: DriveFilesRepository, + private driveFilesRepository: MiDriveFilesRepository, private appLockService: AppLockService, private driveFileEntityService: DriveFileEntityService, diff --git a/packages/backend/src/core/chart/charts/per-user-following.ts b/packages/backend/src/core/chart/charts/per-user-following.ts index f195585b3c..f7f82378e4 100644 --- a/packages/backend/src/core/chart/charts/per-user-following.ts +++ b/packages/backend/src/core/chart/charts/per-user-following.ts @@ -9,7 +9,7 @@ import type { MiUser } from '@/models/entities/User.js'; import { AppLockService } from '@/core/AppLockService.js'; import { DI } from '@/di-symbols.js'; import { UserEntityService } from '@/core/entities/UserEntityService.js'; -import type { 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 { private db: DataSource, @Inject(DI.followingsRepository) - private followingsRepository: FollowingsRepository, + private followingsRepository: MiFollowingsRepository, private appLockService: AppLockService, private userEntityService: UserEntityService, diff --git a/packages/backend/src/core/chart/charts/per-user-notes.ts b/packages/backend/src/core/chart/charts/per-user-notes.ts index 3ab72bc1d0..15f7d83ec2 100644 --- a/packages/backend/src/core/chart/charts/per-user-notes.ts +++ b/packages/backend/src/core/chart/charts/per-user-notes.ts @@ -9,7 +9,7 @@ import type { MiUser } from '@/models/entities/User.js'; import type { MiNote } from '@/models/entities/Note.js'; import { AppLockService } from '@/core/AppLockService.js'; import { DI } from '@/di-symbols.js'; -import type { 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 { private db: DataSource, @Inject(DI.notesRepository) - private notesRepository: NotesRepository, + private notesRepository: MiNotesRepository, private appLockService: AppLockService, private chartLoggerService: ChartLoggerService, diff --git a/packages/backend/src/core/chart/charts/users.ts b/packages/backend/src/core/chart/charts/users.ts index 86d530a7bb..ef33a80057 100644 --- a/packages/backend/src/core/chart/charts/users.ts +++ b/packages/backend/src/core/chart/charts/users.ts @@ -9,7 +9,7 @@ import type { MiUser } from '@/models/entities/User.js'; import { AppLockService } from '@/core/AppLockService.js'; import { DI } from '@/di-symbols.js'; import { UserEntityService } from '@/core/entities/UserEntityService.js'; -import type { 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 { private db: DataSource, @Inject(DI.usersRepository) - private usersRepository: UsersRepository, + private usersRepository: MiUsersRepository, private appLockService: AppLockService, private userEntityService: UserEntityService, diff --git a/packages/backend/src/core/entities/AbuseUserReportEntityService.ts b/packages/backend/src/core/entities/AbuseUserReportEntityService.ts index f9f11a62b0..19661b1fef 100644 --- a/packages/backend/src/core/entities/AbuseUserReportEntityService.ts +++ b/packages/backend/src/core/entities/AbuseUserReportEntityService.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { DI } from '@/di-symbols.js'; -import type { 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, ) { diff --git a/packages/backend/src/core/entities/AntennaEntityService.ts b/packages/backend/src/core/entities/AntennaEntityService.ts index 7826ca5d70..8136af95f8 100644 --- a/packages/backend/src/core/entities/AntennaEntityService.ts +++ b/packages/backend/src/core/entities/AntennaEntityService.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { DI } from '@/di-symbols.js'; -import type { 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, ) { } diff --git a/packages/backend/src/core/entities/AppEntityService.ts b/packages/backend/src/core/entities/AppEntityService.ts index cdcbc635a0..4637dc9d85 100644 --- a/packages/backend/src/core/entities/AppEntityService.ts +++ b/packages/backend/src/core/entities/AppEntityService.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { DI } from '@/di-symbols.js'; -import type { 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, ) { } diff --git a/packages/backend/src/core/entities/AuthSessionEntityService.ts b/packages/backend/src/core/entities/AuthSessionEntityService.ts index f6bac7f046..010c004d3f 100644 --- a/packages/backend/src/core/entities/AuthSessionEntityService.ts +++ b/packages/backend/src/core/entities/AuthSessionEntityService.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { DI } from '@/di-symbols.js'; -import type { 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, ) { diff --git a/packages/backend/src/core/entities/BlockingEntityService.ts b/packages/backend/src/core/entities/BlockingEntityService.ts index 4a810a2f00..a545de4526 100644 --- a/packages/backend/src/core/entities/BlockingEntityService.ts +++ b/packages/backend/src/core/entities/BlockingEntityService.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { DI } from '@/di-symbols.js'; -import type { 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, ) { diff --git a/packages/backend/src/core/entities/ChannelEntityService.ts b/packages/backend/src/core/entities/ChannelEntityService.ts index e4586d1944..8942901376 100644 --- a/packages/backend/src/core/entities/ChannelEntityService.ts +++ b/packages/backend/src/core/entities/ChannelEntityService.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { DI } from '@/di-symbols.js'; -import type { 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, diff --git a/packages/backend/src/core/entities/ClipEntityService.ts b/packages/backend/src/core/entities/ClipEntityService.ts index 63619ac9d3..8c944ac284 100644 --- a/packages/backend/src/core/entities/ClipEntityService.ts +++ b/packages/backend/src/core/entities/ClipEntityService.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { DI } from '@/di-symbols.js'; -import type { 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, ) { diff --git a/packages/backend/src/core/entities/DriveFileEntityService.ts b/packages/backend/src/core/entities/DriveFileEntityService.ts index a09de58b4f..8cae08d373 100644 --- a/packages/backend/src/core/entities/DriveFileEntityService.ts +++ b/packages/backend/src/core/entities/DriveFileEntityService.ts @@ -6,7 +6,7 @@ import { forwardRef, Inject, Injectable } from '@nestjs/common'; import { In } from 'typeorm'; import { DI } from '@/di-symbols.js'; -import type { 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)) diff --git a/packages/backend/src/core/entities/DriveFolderEntityService.ts b/packages/backend/src/core/entities/DriveFolderEntityService.ts index da401c41fc..3e39489c6a 100644 --- a/packages/backend/src/core/entities/DriveFolderEntityService.ts +++ b/packages/backend/src/core/entities/DriveFolderEntityService.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { DI } from '@/di-symbols.js'; -import type { 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, ) { } diff --git a/packages/backend/src/core/entities/EmojiEntityService.ts b/packages/backend/src/core/entities/EmojiEntityService.ts index cabd46b950..07ffc26e6c 100644 --- a/packages/backend/src/core/entities/EmojiEntityService.ts +++ b/packages/backend/src/core/entities/EmojiEntityService.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { DI } from '@/di-symbols.js'; -import type { 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, ) { } diff --git a/packages/backend/src/core/entities/FlashEntityService.ts b/packages/backend/src/core/entities/FlashEntityService.ts index be0d176af5..9e9ea81b60 100644 --- a/packages/backend/src/core/entities/FlashEntityService.ts +++ b/packages/backend/src/core/entities/FlashEntityService.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { DI } from '@/di-symbols.js'; -import type { 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, ) { diff --git a/packages/backend/src/core/entities/FlashLikeEntityService.ts b/packages/backend/src/core/entities/FlashLikeEntityService.ts index 0db82fee00..9ece99465d 100644 --- a/packages/backend/src/core/entities/FlashLikeEntityService.ts +++ b/packages/backend/src/core/entities/FlashLikeEntityService.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { DI } from '@/di-symbols.js'; -import type { 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, ) { diff --git a/packages/backend/src/core/entities/FollowRequestEntityService.ts b/packages/backend/src/core/entities/FollowRequestEntityService.ts index bcf0deb5b1..231a5fc85c 100644 --- a/packages/backend/src/core/entities/FollowRequestEntityService.ts +++ b/packages/backend/src/core/entities/FollowRequestEntityService.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { DI } from '@/di-symbols.js'; -import type { 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, ) { diff --git a/packages/backend/src/core/entities/FollowingEntityService.ts b/packages/backend/src/core/entities/FollowingEntityService.ts index d292584ac8..8d7f8ca3bd 100644 --- a/packages/backend/src/core/entities/FollowingEntityService.ts +++ b/packages/backend/src/core/entities/FollowingEntityService.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { DI } from '@/di-symbols.js'; -import type { 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, ) { diff --git a/packages/backend/src/core/entities/GalleryLikeEntityService.ts b/packages/backend/src/core/entities/GalleryLikeEntityService.ts index 68d50606f1..3a5c9f7296 100644 --- a/packages/backend/src/core/entities/GalleryLikeEntityService.ts +++ b/packages/backend/src/core/entities/GalleryLikeEntityService.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { DI } from '@/di-symbols.js'; -import type { 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, ) { diff --git a/packages/backend/src/core/entities/GalleryPostEntityService.ts b/packages/backend/src/core/entities/GalleryPostEntityService.ts index 35d1a11f5c..d5b7972752 100644 --- a/packages/backend/src/core/entities/GalleryPostEntityService.ts +++ b/packages/backend/src/core/entities/GalleryPostEntityService.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { DI } from '@/di-symbols.js'; -import type { 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, diff --git a/packages/backend/src/core/entities/InviteCodeEntityService.ts b/packages/backend/src/core/entities/InviteCodeEntityService.ts index 03248ada72..63ce090712 100644 --- a/packages/backend/src/core/entities/InviteCodeEntityService.ts +++ b/packages/backend/src/core/entities/InviteCodeEntityService.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { DI } from '@/di-symbols.js'; -import type { 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, ) { diff --git a/packages/backend/src/core/entities/ModerationLogEntityService.ts b/packages/backend/src/core/entities/ModerationLogEntityService.ts index 399de8d4d9..7a132057f3 100644 --- a/packages/backend/src/core/entities/ModerationLogEntityService.ts +++ b/packages/backend/src/core/entities/ModerationLogEntityService.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { DI } from '@/di-symbols.js'; -import type { 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, ) { diff --git a/packages/backend/src/core/entities/MutingEntityService.ts b/packages/backend/src/core/entities/MutingEntityService.ts index 4239044106..a3b0277d12 100644 --- a/packages/backend/src/core/entities/MutingEntityService.ts +++ b/packages/backend/src/core/entities/MutingEntityService.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { DI } from '@/di-symbols.js'; -import type { 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, ) { diff --git a/packages/backend/src/core/entities/NoteEntityService.ts b/packages/backend/src/core/entities/NoteEntityService.ts index 52c1378b67..701df74871 100644 --- a/packages/backend/src/core/entities/NoteEntityService.ts +++ b/packages/backend/src/core/entities/NoteEntityService.ts @@ -14,7 +14,7 @@ import { awaitAll } from '@/misc/prelude/await-all.js'; import type { MiUser } from '@/models/entities/User.js'; import type { MiNote } from '@/models/entities/Note.js'; import type { MiNoteReaction } from '@/models/entities/NoteReaction.js'; -import type { 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, diff --git a/packages/backend/src/core/entities/NoteFavoriteEntityService.ts b/packages/backend/src/core/entities/NoteFavoriteEntityService.ts index c0f43cac96..75a816ebda 100644 --- a/packages/backend/src/core/entities/NoteFavoriteEntityService.ts +++ b/packages/backend/src/core/entities/NoteFavoriteEntityService.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { DI } from '@/di-symbols.js'; -import type { 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, ) { diff --git a/packages/backend/src/core/entities/NoteReactionEntityService.ts b/packages/backend/src/core/entities/NoteReactionEntityService.ts index c50533a32f..b4ff7419fc 100644 --- a/packages/backend/src/core/entities/NoteReactionEntityService.ts +++ b/packages/backend/src/core/entities/NoteReactionEntityService.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { DI } from '@/di-symbols.js'; -import type { 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, diff --git a/packages/backend/src/core/entities/NotificationEntityService.ts b/packages/backend/src/core/entities/NotificationEntityService.ts index 42419d61a1..ee4a802e0d 100644 --- a/packages/backend/src/core/entities/NotificationEntityService.ts +++ b/packages/backend/src/core/entities/NotificationEntityService.ts @@ -7,7 +7,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { ModuleRef } from '@nestjs/core'; import { In } from 'typeorm'; import { DI } from '@/di-symbols.js'; -import type { 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, diff --git a/packages/backend/src/core/entities/PageEntityService.ts b/packages/backend/src/core/entities/PageEntityService.ts index 382ff31b4c..e03f7a4ce6 100644 --- a/packages/backend/src/core/entities/PageEntityService.ts +++ b/packages/backend/src/core/entities/PageEntityService.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { DI } from '@/di-symbols.js'; -import type { 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, diff --git a/packages/backend/src/core/entities/PageLikeEntityService.ts b/packages/backend/src/core/entities/PageLikeEntityService.ts index 4af0deb069..d202fc5285 100644 --- a/packages/backend/src/core/entities/PageLikeEntityService.ts +++ b/packages/backend/src/core/entities/PageLikeEntityService.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { DI } from '@/di-symbols.js'; -import type { 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, ) { diff --git a/packages/backend/src/core/entities/RenoteMutingEntityService.ts b/packages/backend/src/core/entities/RenoteMutingEntityService.ts index ddc5b971c3..8dab4943a8 100644 --- a/packages/backend/src/core/entities/RenoteMutingEntityService.ts +++ b/packages/backend/src/core/entities/RenoteMutingEntityService.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { DI } from '@/di-symbols.js'; -import type { 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, ) { diff --git a/packages/backend/src/core/entities/RoleEntityService.ts b/packages/backend/src/core/entities/RoleEntityService.ts index cd6ecee4c6..1d58713c36 100644 --- a/packages/backend/src/core/entities/RoleEntityService.ts +++ b/packages/backend/src/core/entities/RoleEntityService.ts @@ -6,7 +6,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Brackets } from 'typeorm'; import { DI } from '@/di-symbols.js'; -import type { 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, ) { } diff --git a/packages/backend/src/core/entities/UserEntityService.ts b/packages/backend/src/core/entities/UserEntityService.ts index 236ee9f0b4..13d6043974 100644 --- a/packages/backend/src/core/entities/UserEntityService.ts +++ b/packages/backend/src/core/entities/UserEntityService.ts @@ -15,7 +15,7 @@ import { awaitAll } from '@/misc/prelude/await-all.js'; import { USER_ACTIVE_THRESHOLD, USER_ONLINE_THRESHOLD } from '@/const.js'; import type { MiLocalUser, MiPartialLocalUser, MiPartialRemoteUser, MiRemoteUser, MiUser } from '@/models/entities/User.js'; import { birthdaySchema, descriptionSchema, localUsernameSchema, locationSchema, nameSchema, passwordSchema } from '@/models/entities/User.js'; -import type { 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, diff --git a/packages/backend/src/core/entities/UserListEntityService.ts b/packages/backend/src/core/entities/UserListEntityService.ts index d1d9838dfa..41fa7edf60 100644 --- a/packages/backend/src/core/entities/UserListEntityService.ts +++ b/packages/backend/src/core/entities/UserListEntityService.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { DI } from '@/di-symbols.js'; -import type { 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, ) { } diff --git a/packages/backend/src/daemons/JanitorService.ts b/packages/backend/src/daemons/JanitorService.ts index 6f5e5a7f3b..e5d1f5ef4b 100644 --- a/packages/backend/src/daemons/JanitorService.ts +++ b/packages/backend/src/daemons/JanitorService.ts @@ -6,7 +6,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { LessThan } from 'typeorm'; import { DI } from '@/di-symbols.js'; -import type { 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, ) { } diff --git a/packages/backend/src/models/index.ts b/packages/backend/src/models/index.ts index d14234b792..a97338916c 100644 --- a/packages/backend/src/models/index.ts +++ b/packages/backend/src/models/index.ts @@ -140,69 +140,69 @@ export { MiUserMemo, }; -export type AbuseUserReportsRepository = Repository; -export type AccessTokensRepository = Repository; -export type AdsRepository = Repository; -export type AnnouncementsRepository = Repository; -export type AnnouncementReadsRepository = Repository; -export type AntennasRepository = Repository; -export type AppsRepository = Repository; -export type AttestationChallengesRepository = Repository; -export type AuthSessionsRepository = Repository; -export type BlockingsRepository = Repository; -export type ChannelFollowingsRepository = Repository; -export type ChannelFavoritesRepository = Repository; -export type ClipsRepository = Repository; -export type ClipNotesRepository = Repository; -export type ClipFavoritesRepository = Repository; -export type DriveFilesRepository = Repository; -export type DriveFoldersRepository = Repository; -export type EmojisRepository = Repository; -export type FollowingsRepository = Repository; -export type FollowRequestsRepository = Repository; -export type GalleryLikesRepository = Repository; -export type GalleryPostsRepository = Repository; -export type HashtagsRepository = Repository; -export type InstancesRepository = Repository; -export type MetasRepository = Repository; -export type ModerationLogsRepository = Repository; -export type MutedNotesRepository = Repository; -export type MutingsRepository = Repository; -export type RenoteMutingsRepository = Repository; -export type NotesRepository = Repository; -export type NoteFavoritesRepository = Repository; -export type NoteReactionsRepository = Repository; -export type NoteThreadMutingsRepository = Repository; -export type NoteUnreadsRepository = Repository; -export type PagesRepository = Repository; -export type PageLikesRepository = Repository; -export type PasswordResetRequestsRepository = Repository; -export type PollsRepository = Repository; -export type PollVotesRepository = Repository; -export type PromoNotesRepository = Repository; -export type PromoReadsRepository = Repository; -export type RegistrationTicketsRepository = Repository; -export type RegistryItemsRepository = Repository; -export type RelaysRepository = Repository; -export type SigninsRepository = Repository; -export type SwSubscriptionsRepository = Repository; -export type UsedUsernamesRepository = Repository; -export type UsersRepository = Repository; -export type UserIpsRepository = Repository; -export type UserKeypairsRepository = Repository; -export type UserListsRepository = Repository; -export type UserListFavoritesRepository = Repository; -export type UserListJoiningsRepository = Repository; -export type UserNotePiningsRepository = Repository; -export type UserPendingsRepository = Repository; -export type UserProfilesRepository = Repository; -export type UserPublickeysRepository = Repository; -export type UserSecurityKeysRepository = Repository; -export type WebhooksRepository = Repository; -export type ChannelsRepository = Repository; -export type RetentionAggregationsRepository = Repository; -export type RolesRepository = Repository; -export type RoleAssignmentsRepository = Repository; -export type FlashsRepository = Repository; -export type FlashLikesRepository = Repository; -export type UserMemoRepository = Repository; +export type MiAbuseUserReportsRepository = Repository; +export type MiAccessTokensRepository = Repository; +export type MiAdsRepository = Repository; +export type MiAnnouncementsRepository = Repository; +export type MiAnnouncementReadsRepository = Repository; +export type MiAntennasRepository = Repository; +export type MiAppsRepository = Repository; +export type MiAttestationChallengesRepository = Repository; +export type MiAuthSessionsRepository = Repository; +export type MiBlockingsRepository = Repository; +export type MiChannelFollowingsRepository = Repository; +export type MiChannelFavoritesRepository = Repository; +export type MiClipsRepository = Repository; +export type MiClipNotesRepository = Repository; +export type MiClipFavoritesRepository = Repository; +export type MiDriveFilesRepository = Repository; +export type MiDriveFoldersRepository = Repository; +export type MiEmojisRepository = Repository; +export type MiFollowingsRepository = Repository; +export type MiFollowRequestsRepository = Repository; +export type MiGalleryLikesRepository = Repository; +export type MiGalleryPostsRepository = Repository; +export type MiHashtagsRepository = Repository; +export type MiInstancesRepository = Repository; +export type MiMetasRepository = Repository; +export type MiModerationLogsRepository = Repository; +export type MiMutedNotesRepository = Repository; +export type MiMutingsRepository = Repository; +export type MiRenoteMutingsRepository = Repository; +export type MiNotesRepository = Repository; +export type MiNoteFavoritesRepository = Repository; +export type MiNoteReactionsRepository = Repository; +export type MiNoteThreadMutingsRepository = Repository; +export type MiNoteUnreadsRepository = Repository; +export type MiPagesRepository = Repository; +export type MiPageLikesRepository = Repository; +export type MiPasswordResetRequestsRepository = Repository; +export type MiPollsRepository = Repository; +export type MiPollVotesRepository = Repository; +export type MiPromoNotesRepository = Repository; +export type MiPromoReadsRepository = Repository; +export type MiRegistrationTicketsRepository = Repository; +export type MiRegistryItemsRepository = Repository; +export type MiRelaysRepository = Repository; +export type MiSigninsRepository = Repository; +export type MiSwSubscriptionsRepository = Repository; +export type MiUsedUsernamesRepository = Repository; +export type MiUsersRepository = Repository; +export type MiUserIpsRepository = Repository; +export type MiUserKeypairsRepository = Repository; +export type MiUserListsRepository = Repository; +export type MiUserListFavoritesRepository = Repository; +export type MiUserListJoiningsRepository = Repository; +export type MiUserNotePiningsRepository = Repository; +export type MiUserPendingsRepository = Repository; +export type MiUserProfilesRepository = Repository; +export type MiUserPublickeysRepository = Repository; +export type MiUserSecurityKeysRepository = Repository; +export type MiWebhooksRepository = Repository; +export type MiChannelsRepository = Repository; +export type MiRetentionAggregationsRepository = Repository; +export type MiRolesRepository = Repository; +export type MiRoleAssignmentsRepository = Repository; +export type MiFlashsRepository = Repository; +export type MiFlashLikesRepository = Repository; +export type MiUserMemoRepository = Repository; diff --git a/packages/backend/src/queue/processors/AggregateRetentionProcessorService.ts b/packages/backend/src/queue/processors/AggregateRetentionProcessorService.ts index 757bfa3079..bd4f256e53 100644 --- a/packages/backend/src/queue/processors/AggregateRetentionProcessorService.ts +++ b/packages/backend/src/queue/processors/AggregateRetentionProcessorService.ts @@ -8,7 +8,7 @@ import { IsNull, MoreThan } from 'typeorm'; import { DI } from '@/di-symbols.js'; import type Logger from '@/logger.js'; import { bindThis } from '@/decorators.js'; -import type { 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, diff --git a/packages/backend/src/queue/processors/CheckExpiredMutingsProcessorService.ts b/packages/backend/src/queue/processors/CheckExpiredMutingsProcessorService.ts index d87f4537c8..f938ac8591 100644 --- a/packages/backend/src/queue/processors/CheckExpiredMutingsProcessorService.ts +++ b/packages/backend/src/queue/processors/CheckExpiredMutingsProcessorService.ts @@ -6,7 +6,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { In } from 'typeorm'; import { DI } from '@/di-symbols.js'; -import type { 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, diff --git a/packages/backend/src/queue/processors/CleanProcessorService.ts b/packages/backend/src/queue/processors/CleanProcessorService.ts index 03a33e76ac..7ad6974537 100644 --- a/packages/backend/src/queue/processors/CleanProcessorService.ts +++ b/packages/backend/src/queue/processors/CleanProcessorService.ts @@ -6,7 +6,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { In, LessThan } from 'typeorm'; import { DI } from '@/di-symbols.js'; -import type { 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, diff --git a/packages/backend/src/queue/processors/CleanRemoteFilesProcessorService.ts b/packages/backend/src/queue/processors/CleanRemoteFilesProcessorService.ts index 12cedd7d3d..22d3b5ba77 100644 --- a/packages/backend/src/queue/processors/CleanRemoteFilesProcessorService.ts +++ b/packages/backend/src/queue/processors/CleanRemoteFilesProcessorService.ts @@ -6,7 +6,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { IsNull, MoreThan, Not } from 'typeorm'; import { DI } from '@/di-symbols.js'; -import type { MiDriveFile, 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, diff --git a/packages/backend/src/queue/processors/DeleteAccountProcessorService.ts b/packages/backend/src/queue/processors/DeleteAccountProcessorService.ts index 39155bf383..c5133b24dc 100644 --- a/packages/backend/src/queue/processors/DeleteAccountProcessorService.ts +++ b/packages/backend/src/queue/processors/DeleteAccountProcessorService.ts @@ -6,7 +6,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { MoreThan } from 'typeorm'; import { DI } from '@/di-symbols.js'; -import type { 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, diff --git a/packages/backend/src/queue/processors/DeleteDriveFilesProcessorService.ts b/packages/backend/src/queue/processors/DeleteDriveFilesProcessorService.ts index ae395f540d..1d2297ad70 100644 --- a/packages/backend/src/queue/processors/DeleteDriveFilesProcessorService.ts +++ b/packages/backend/src/queue/processors/DeleteDriveFilesProcessorService.ts @@ -6,7 +6,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { MoreThan } from 'typeorm'; import { DI } from '@/di-symbols.js'; -import type { 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, diff --git a/packages/backend/src/queue/processors/DeliverProcessorService.ts b/packages/backend/src/queue/processors/DeliverProcessorService.ts index 17fa32c2a1..f89f808917 100644 --- a/packages/backend/src/queue/processors/DeliverProcessorService.ts +++ b/packages/backend/src/queue/processors/DeliverProcessorService.ts @@ -6,7 +6,7 @@ import { Inject, Injectable } from '@nestjs/common'; import * as Bull from 'bullmq'; import { DI } from '@/di-symbols.js'; -import type { 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, diff --git a/packages/backend/src/queue/processors/EndedPollNotificationProcessorService.ts b/packages/backend/src/queue/processors/EndedPollNotificationProcessorService.ts index d855ee5707..f9149d2333 100644 --- a/packages/backend/src/queue/processors/EndedPollNotificationProcessorService.ts +++ b/packages/backend/src/queue/processors/EndedPollNotificationProcessorService.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { DI } from '@/di-symbols.js'; -import type { 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, diff --git a/packages/backend/src/queue/processors/ExportAntennasProcessorService.ts b/packages/backend/src/queue/processors/ExportAntennasProcessorService.ts index 243a4f97f2..79869a0bb3 100644 --- a/packages/backend/src/queue/processors/ExportAntennasProcessorService.ts +++ b/packages/backend/src/queue/processors/ExportAntennasProcessorService.ts @@ -8,7 +8,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { format as DateFormat } from 'date-fns'; import { In } from 'typeorm'; import { DI } from '@/di-symbols.js'; -import type { 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, diff --git a/packages/backend/src/queue/processors/ExportBlockingProcessorService.ts b/packages/backend/src/queue/processors/ExportBlockingProcessorService.ts index 8e27cacb58..04ec1e6b03 100644 --- a/packages/backend/src/queue/processors/ExportBlockingProcessorService.ts +++ b/packages/backend/src/queue/processors/ExportBlockingProcessorService.ts @@ -8,7 +8,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { MoreThan } from 'typeorm'; import { format as dateFormat } from 'date-fns'; import { DI } from '@/di-symbols.js'; -import type { 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, diff --git a/packages/backend/src/queue/processors/ExportCustomEmojisProcessorService.ts b/packages/backend/src/queue/processors/ExportCustomEmojisProcessorService.ts index 688a0a1ccd..f75859dd2c 100644 --- a/packages/backend/src/queue/processors/ExportCustomEmojisProcessorService.ts +++ b/packages/backend/src/queue/processors/ExportCustomEmojisProcessorService.ts @@ -10,7 +10,7 @@ import { format as dateFormat } from 'date-fns'; import mime from 'mime-types'; import archiver from 'archiver'; import { DI } from '@/di-symbols.js'; -import type { 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, diff --git a/packages/backend/src/queue/processors/ExportFavoritesProcessorService.ts b/packages/backend/src/queue/processors/ExportFavoritesProcessorService.ts index afa1fa4ce7..5af8dc97ae 100644 --- a/packages/backend/src/queue/processors/ExportFavoritesProcessorService.ts +++ b/packages/backend/src/queue/processors/ExportFavoritesProcessorService.ts @@ -8,7 +8,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { MoreThan } from 'typeorm'; import { format as dateFormat } from 'date-fns'; import { DI } from '@/di-symbols.js'; -import type { MiNoteFavorite, 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, diff --git a/packages/backend/src/queue/processors/ExportFollowingProcessorService.ts b/packages/backend/src/queue/processors/ExportFollowingProcessorService.ts index 7f29d7299a..4d23eef2cf 100644 --- a/packages/backend/src/queue/processors/ExportFollowingProcessorService.ts +++ b/packages/backend/src/queue/processors/ExportFollowingProcessorService.ts @@ -8,7 +8,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { In, MoreThan, Not } from 'typeorm'; import { format as dateFormat } from 'date-fns'; import { DI } from '@/di-symbols.js'; -import type { 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, diff --git a/packages/backend/src/queue/processors/ExportMutingProcessorService.ts b/packages/backend/src/queue/processors/ExportMutingProcessorService.ts index 1bb8da06f5..b830d282a9 100644 --- a/packages/backend/src/queue/processors/ExportMutingProcessorService.ts +++ b/packages/backend/src/queue/processors/ExportMutingProcessorService.ts @@ -8,7 +8,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { IsNull, MoreThan } from 'typeorm'; import { format as dateFormat } from 'date-fns'; import { DI } from '@/di-symbols.js'; -import type { 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, diff --git a/packages/backend/src/queue/processors/ExportNotesProcessorService.ts b/packages/backend/src/queue/processors/ExportNotesProcessorService.ts index 0dcda341fd..42f0710fc1 100644 --- a/packages/backend/src/queue/processors/ExportNotesProcessorService.ts +++ b/packages/backend/src/queue/processors/ExportNotesProcessorService.ts @@ -8,7 +8,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { MoreThan } from 'typeorm'; import { format as dateFormat } from 'date-fns'; import { DI } from '@/di-symbols.js'; -import type { 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, diff --git a/packages/backend/src/queue/processors/ExportUserListsProcessorService.ts b/packages/backend/src/queue/processors/ExportUserListsProcessorService.ts index ba3e18b563..b02b2b3efd 100644 --- a/packages/backend/src/queue/processors/ExportUserListsProcessorService.ts +++ b/packages/backend/src/queue/processors/ExportUserListsProcessorService.ts @@ -8,7 +8,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { In } from 'typeorm'; import { format as dateFormat } from 'date-fns'; import { DI } from '@/di-symbols.js'; -import type { 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, diff --git a/packages/backend/src/queue/processors/ImportAntennasProcessorService.ts b/packages/backend/src/queue/processors/ImportAntennasProcessorService.ts index 9ff9a8a528..f405f98217 100644 --- a/packages/backend/src/queue/processors/ImportAntennasProcessorService.ts +++ b/packages/backend/src/queue/processors/ImportAntennasProcessorService.ts @@ -8,7 +8,7 @@ import _Ajv from 'ajv'; import { IdService } from '@/core/IdService.js'; import { GlobalEventService } from '@/core/GlobalEventService.js'; import Logger from '@/logger.js'; -import type { 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, diff --git a/packages/backend/src/queue/processors/ImportBlockingProcessorService.ts b/packages/backend/src/queue/processors/ImportBlockingProcessorService.ts index 1d4c3d907e..d55bbdabd9 100644 --- a/packages/backend/src/queue/processors/ImportBlockingProcessorService.ts +++ b/packages/backend/src/queue/processors/ImportBlockingProcessorService.ts @@ -6,7 +6,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { IsNull } from 'typeorm'; import { DI } from '@/di-symbols.js'; -import type { UsersRepository, DriveFilesRepository } from '@/models/index.js'; +import type { MiUsersRepository, MiDriveFilesRepository } from '@/models/index.js'; import type Logger from '@/logger.js'; import * as Acct from '@/misc/acct.js'; import { RemoteUserResolveService } from '@/core/RemoteUserResolveService.js'; @@ -24,10 +24,10 @@ export class ImportBlockingProcessorService { constructor( @Inject(DI.usersRepository) - private usersRepository: UsersRepository, + private usersRepository: MiUsersRepository, @Inject(DI.driveFilesRepository) - private driveFilesRepository: DriveFilesRepository, + private driveFilesRepository: MiDriveFilesRepository, private queueService: QueueService, private utilityService: UtilityService, diff --git a/packages/backend/src/queue/processors/ImportCustomEmojisProcessorService.ts b/packages/backend/src/queue/processors/ImportCustomEmojisProcessorService.ts index 54e92d3129..7f81d5c41f 100644 --- a/packages/backend/src/queue/processors/ImportCustomEmojisProcessorService.ts +++ b/packages/backend/src/queue/processors/ImportCustomEmojisProcessorService.ts @@ -7,7 +7,7 @@ import * as fs from 'node:fs'; import { Inject, Injectable } from '@nestjs/common'; import { ZipReader } from 'slacc'; import { DI } from '@/di-symbols.js'; -import type { EmojisRepository, DriveFilesRepository } from '@/models/index.js'; +import type { MiEmojisRepository, MiDriveFilesRepository } from '@/models/index.js'; import type Logger from '@/logger.js'; import { CustomEmojiService } from '@/core/CustomEmojiService.js'; import { createTempDir } from '@/misc/create-temp.js'; @@ -25,10 +25,10 @@ export class ImportCustomEmojisProcessorService { constructor( @Inject(DI.driveFilesRepository) - private driveFilesRepository: DriveFilesRepository, + private driveFilesRepository: MiDriveFilesRepository, @Inject(DI.emojisRepository) - private emojisRepository: EmojisRepository, + private emojisRepository: MiEmojisRepository, private customEmojiService: CustomEmojiService, private driveService: DriveService, diff --git a/packages/backend/src/queue/processors/ImportFollowingProcessorService.ts b/packages/backend/src/queue/processors/ImportFollowingProcessorService.ts index 585311982f..fb7cc65129 100644 --- a/packages/backend/src/queue/processors/ImportFollowingProcessorService.ts +++ b/packages/backend/src/queue/processors/ImportFollowingProcessorService.ts @@ -6,7 +6,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { IsNull } from 'typeorm'; import { DI } from '@/di-symbols.js'; -import type { UsersRepository, DriveFilesRepository } from '@/models/index.js'; +import type { MiUsersRepository, MiDriveFilesRepository } from '@/models/index.js'; import type Logger from '@/logger.js'; import * as Acct from '@/misc/acct.js'; import { RemoteUserResolveService } from '@/core/RemoteUserResolveService.js'; @@ -24,10 +24,10 @@ export class ImportFollowingProcessorService { constructor( @Inject(DI.usersRepository) - private usersRepository: UsersRepository, + private usersRepository: MiUsersRepository, @Inject(DI.driveFilesRepository) - private driveFilesRepository: DriveFilesRepository, + private driveFilesRepository: MiDriveFilesRepository, private queueService: QueueService, private utilityService: UtilityService, diff --git a/packages/backend/src/queue/processors/ImportMutingProcessorService.ts b/packages/backend/src/queue/processors/ImportMutingProcessorService.ts index 174046c561..5e9396a6c8 100644 --- a/packages/backend/src/queue/processors/ImportMutingProcessorService.ts +++ b/packages/backend/src/queue/processors/ImportMutingProcessorService.ts @@ -6,7 +6,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { IsNull } from 'typeorm'; import { DI } from '@/di-symbols.js'; -import type { UsersRepository, DriveFilesRepository } from '@/models/index.js'; +import type { MiUsersRepository, MiDriveFilesRepository } from '@/models/index.js'; import type Logger from '@/logger.js'; import * as Acct from '@/misc/acct.js'; import { RemoteUserResolveService } from '@/core/RemoteUserResolveService.js'; @@ -24,10 +24,10 @@ export class ImportMutingProcessorService { constructor( @Inject(DI.usersRepository) - private usersRepository: UsersRepository, + private usersRepository: MiUsersRepository, @Inject(DI.driveFilesRepository) - private driveFilesRepository: DriveFilesRepository, + private driveFilesRepository: MiDriveFilesRepository, private utilityService: UtilityService, private userMutingService: UserMutingService, diff --git a/packages/backend/src/queue/processors/ImportUserListsProcessorService.ts b/packages/backend/src/queue/processors/ImportUserListsProcessorService.ts index a434b4da95..7856607e95 100644 --- a/packages/backend/src/queue/processors/ImportUserListsProcessorService.ts +++ b/packages/backend/src/queue/processors/ImportUserListsProcessorService.ts @@ -6,7 +6,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { IsNull } from 'typeorm'; import { DI } from '@/di-symbols.js'; -import type { UsersRepository, DriveFilesRepository, UserListJoiningsRepository, UserListsRepository } from '@/models/index.js'; +import type { MiUsersRepository, MiDriveFilesRepository, MiUserListJoiningsRepository, MiUserListsRepository } from '@/models/index.js'; import type Logger from '@/logger.js'; import * as Acct from '@/misc/acct.js'; import { RemoteUserResolveService } from '@/core/RemoteUserResolveService.js'; @@ -25,16 +25,16 @@ export class ImportUserListsProcessorService { constructor( @Inject(DI.usersRepository) - private usersRepository: UsersRepository, + private usersRepository: MiUsersRepository, @Inject(DI.driveFilesRepository) - private driveFilesRepository: DriveFilesRepository, + private driveFilesRepository: MiDriveFilesRepository, @Inject(DI.userListsRepository) - private userListsRepository: UserListsRepository, + private userListsRepository: MiUserListsRepository, @Inject(DI.userListJoiningsRepository) - private userListJoiningsRepository: UserListJoiningsRepository, + private userListJoiningsRepository: MiUserListJoiningsRepository, private utilityService: UtilityService, private idService: IdService, diff --git a/packages/backend/src/queue/processors/RelationshipProcessorService.ts b/packages/backend/src/queue/processors/RelationshipProcessorService.ts index 67a50dc789..24246f3527 100644 --- a/packages/backend/src/queue/processors/RelationshipProcessorService.ts +++ b/packages/backend/src/queue/processors/RelationshipProcessorService.ts @@ -10,7 +10,7 @@ import { UserBlockingService } from '@/core/UserBlockingService.js'; import { bindThis } from '@/decorators.js'; import type Logger from '@/logger.js'; -import type { UsersRepository } from '@/models/index.js'; +import type { MiUsersRepository } from '@/models/index.js'; import { DI } from '@/di-symbols.js'; import { MiLocalUser, MiRemoteUser } from '@/models/entities/User.js'; import { RelationshipJobData } from '../types.js'; @@ -23,7 +23,7 @@ export class RelationshipProcessorService { constructor( @Inject(DI.usersRepository) - private usersRepository: UsersRepository, + private usersRepository: MiUsersRepository, private queueLoggerService: QueueLoggerService, private userFollowingService: UserFollowingService, diff --git a/packages/backend/src/queue/processors/WebhookDeliverProcessorService.ts b/packages/backend/src/queue/processors/WebhookDeliverProcessorService.ts index 169df77924..6be2dd21b1 100644 --- a/packages/backend/src/queue/processors/WebhookDeliverProcessorService.ts +++ b/packages/backend/src/queue/processors/WebhookDeliverProcessorService.ts @@ -6,7 +6,7 @@ import { Inject, Injectable } from '@nestjs/common'; import * as Bull from 'bullmq'; import { DI } from '@/di-symbols.js'; -import type { WebhooksRepository } from '@/models/index.js'; +import type { MiWebhooksRepository } from '@/models/index.js'; import type { Config } from '@/config.js'; import type Logger from '@/logger.js'; import { HttpRequestService } from '@/core/HttpRequestService.js'; @@ -24,7 +24,7 @@ export class WebhookDeliverProcessorService { private config: Config, @Inject(DI.webhooksRepository) - private webhooksRepository: WebhooksRepository, + private webhooksRepository: MiWebhooksRepository, private httpRequestService: HttpRequestService, private queueLoggerService: QueueLoggerService, diff --git a/packages/backend/src/server/ActivityPubServerService.ts b/packages/backend/src/server/ActivityPubServerService.ts index 86edab396b..04db368518 100644 --- a/packages/backend/src/server/ActivityPubServerService.ts +++ b/packages/backend/src/server/ActivityPubServerService.ts @@ -11,7 +11,7 @@ import { Brackets, In, IsNull, LessThan, Not } from 'typeorm'; import accepts from 'accepts'; import vary from 'vary'; import { DI } from '@/di-symbols.js'; -import type { FollowingsRepository, NotesRepository, EmojisRepository, NoteReactionsRepository, UserProfilesRepository, UserNotePiningsRepository, UsersRepository, FollowRequestsRepository } from '@/models/index.js'; +import type { MiFollowingsRepository, MiNotesRepository, MiEmojisRepository, MiNoteReactionsRepository, MiUserProfilesRepository, MiUserNotePiningsRepository, MiUsersRepository, MiFollowRequestsRepository } from '@/models/index.js'; import * as url from '@/misc/prelude/url.js'; import type { Config } from '@/config.js'; import { ApRendererService } from '@/core/activitypub/ApRendererService.js'; @@ -39,28 +39,28 @@ export class ActivityPubServerService { private config: Config, @Inject(DI.usersRepository) - private usersRepository: UsersRepository, + private usersRepository: MiUsersRepository, @Inject(DI.userProfilesRepository) - private userProfilesRepository: UserProfilesRepository, + private userProfilesRepository: MiUserProfilesRepository, @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, @Inject(DI.userNotePiningsRepository) - private userNotePiningsRepository: UserNotePiningsRepository, + private userNotePiningsRepository: MiUserNotePiningsRepository, @Inject(DI.followingsRepository) - private followingsRepository: FollowingsRepository, + private followingsRepository: MiFollowingsRepository, @Inject(DI.followRequestsRepository) - private followRequestsRepository: FollowRequestsRepository, + private followRequestsRepository: MiFollowRequestsRepository, private utilityService: UtilityService, private userEntityService: UserEntityService, diff --git a/packages/backend/src/server/FileServerService.ts b/packages/backend/src/server/FileServerService.ts index 9df6ba2a76..e17c092f22 100644 --- a/packages/backend/src/server/FileServerService.ts +++ b/packages/backend/src/server/FileServerService.ts @@ -11,7 +11,7 @@ import rename from 'rename'; import sharp from 'sharp'; import { sharpBmp } from 'sharp-read-bmp'; import type { Config } from '@/config.js'; -import type { MiDriveFile, DriveFilesRepository } from '@/models/index.js'; +import type { MiDriveFile, MiDriveFilesRepository } from '@/models/index.js'; import { DI } from '@/di-symbols.js'; import { createTemp } from '@/misc/create-temp.js'; import { FILE_TYPE_BROWSERSAFE } from '@/const.js'; @@ -43,7 +43,7 @@ export class FileServerService { private config: Config, @Inject(DI.driveFilesRepository) - private driveFilesRepository: DriveFilesRepository, + private driveFilesRepository: MiDriveFilesRepository, private fileInfoService: FileInfoService, private downloadService: DownloadService, diff --git a/packages/backend/src/server/ServerService.ts b/packages/backend/src/server/ServerService.ts index b40eeb31b1..24a7346fae 100644 --- a/packages/backend/src/server/ServerService.ts +++ b/packages/backend/src/server/ServerService.ts @@ -12,7 +12,7 @@ import fastifyStatic from '@fastify/static'; import { IsNull } from 'typeorm'; import { GlobalEventService } from '@/core/GlobalEventService.js'; import type { Config } from '@/config.js'; -import type { EmojisRepository, UserProfilesRepository, UsersRepository } from '@/models/index.js'; +import type { MiEmojisRepository, MiUserProfilesRepository, MiUsersRepository } from '@/models/index.js'; import { DI } from '@/di-symbols.js'; import type Logger from '@/logger.js'; import * as Acct from '@/misc/acct.js'; @@ -44,13 +44,13 @@ export class ServerService implements OnApplicationShutdown { private config: Config, @Inject(DI.usersRepository) - private usersRepository: UsersRepository, + private usersRepository: MiUsersRepository, @Inject(DI.userProfilesRepository) - private userProfilesRepository: UserProfilesRepository, + private userProfilesRepository: MiUserProfilesRepository, @Inject(DI.emojisRepository) - private emojisRepository: EmojisRepository, + private emojisRepository: MiEmojisRepository, private metaService: MetaService, private userEntityService: UserEntityService, diff --git a/packages/backend/src/server/WellKnownServerService.ts b/packages/backend/src/server/WellKnownServerService.ts index 43c8dcf2c1..40f79fd455 100644 --- a/packages/backend/src/server/WellKnownServerService.ts +++ b/packages/backend/src/server/WellKnownServerService.ts @@ -8,7 +8,7 @@ import { IsNull } from 'typeorm'; import vary from 'vary'; import fastifyAccepts from '@fastify/accepts'; import { DI } from '@/di-symbols.js'; -import type { UsersRepository } from '@/models/index.js'; +import type { MiUsersRepository } from '@/models/index.js'; import type { Config } from '@/config.js'; import { escapeAttribute, escapeValue } from '@/misc/prelude/xml.js'; import type { MiUser } from '@/models/entities/User.js'; @@ -26,7 +26,7 @@ export class WellKnownServerService { private config: Config, @Inject(DI.usersRepository) - private usersRepository: UsersRepository, + private usersRepository: MiUsersRepository, private nodeinfoServerService: NodeinfoServerService, private userEntityService: UserEntityService, diff --git a/packages/backend/src/server/api/ApiCallService.ts b/packages/backend/src/server/api/ApiCallService.ts index 5d5a8f3706..bde766a32b 100644 --- a/packages/backend/src/server/api/ApiCallService.ts +++ b/packages/backend/src/server/api/ApiCallService.ts @@ -12,7 +12,7 @@ import { getIpHash } from '@/misc/get-ip-hash.js'; import type { MiLocalUser, MiUser } from '@/models/entities/User.js'; import type { MiAccessToken } from '@/models/entities/AccessToken.js'; import type Logger from '@/logger.js'; -import type { UserIpsRepository } from '@/models/index.js'; +import type { MiUserIpsRepository } from '@/models/index.js'; import { MetaService } from '@/core/MetaService.js'; import { createTemp } from '@/misc/create-temp.js'; import { bindThis } from '@/decorators.js'; @@ -39,7 +39,7 @@ export class ApiCallService implements OnApplicationShutdown { constructor( @Inject(DI.userIpsRepository) - private userIpsRepository: UserIpsRepository, + private userIpsRepository: MiUserIpsRepository, private metaService: MetaService, private authenticateService: AuthenticateService, diff --git a/packages/backend/src/server/api/ApiServerService.ts b/packages/backend/src/server/api/ApiServerService.ts index 96b6a821d5..aad8453816 100644 --- a/packages/backend/src/server/api/ApiServerService.ts +++ b/packages/backend/src/server/api/ApiServerService.ts @@ -9,7 +9,7 @@ import multipart from '@fastify/multipart'; import fastifyCookie from '@fastify/cookie'; import { ModuleRef } from '@nestjs/core'; import type { Config } from '@/config.js'; -import type { InstancesRepository, AccessTokensRepository } from '@/models/index.js'; +import type { MiInstancesRepository, MiAccessTokensRepository } from '@/models/index.js'; import { DI } from '@/di-symbols.js'; import { UserEntityService } from '@/core/entities/UserEntityService.js'; import { bindThis } from '@/decorators.js'; @@ -28,10 +28,10 @@ export class ApiServerService { private config: Config, @Inject(DI.instancesRepository) - private instancesRepository: InstancesRepository, + private instancesRepository: MiInstancesRepository, @Inject(DI.accessTokensRepository) - private accessTokensRepository: AccessTokensRepository, + private accessTokensRepository: MiAccessTokensRepository, private userEntityService: UserEntityService, private apiCallService: ApiCallService, diff --git a/packages/backend/src/server/api/AuthenticateService.ts b/packages/backend/src/server/api/AuthenticateService.ts index 8b031ab334..3945279caf 100644 --- a/packages/backend/src/server/api/AuthenticateService.ts +++ b/packages/backend/src/server/api/AuthenticateService.ts @@ -5,7 +5,7 @@ import { Inject, Injectable, OnApplicationShutdown } from '@nestjs/common'; import { DI } from '@/di-symbols.js'; -import type { AccessTokensRepository, AppsRepository, UsersRepository } from '@/models/index.js'; +import type { MiAccessTokensRepository, MiAppsRepository, MiUsersRepository } from '@/models/index.js'; import type { MiLocalUser } from '@/models/entities/User.js'; import type { MiAccessToken } from '@/models/entities/AccessToken.js'; import { MemoryKVCache } from '@/misc/cache.js'; @@ -27,13 +27,13 @@ export class AuthenticateService implements OnApplicationShutdown { constructor( @Inject(DI.usersRepository) - private usersRepository: UsersRepository, + private usersRepository: MiUsersRepository, @Inject(DI.accessTokensRepository) - private accessTokensRepository: AccessTokensRepository, + private accessTokensRepository: MiAccessTokensRepository, @Inject(DI.appsRepository) - private appsRepository: AppsRepository, + private appsRepository: MiAppsRepository, private cacheService: CacheService, ) { diff --git a/packages/backend/src/server/api/GetterService.ts b/packages/backend/src/server/api/GetterService.ts index 834a6ce4ca..1c4fdf0d84 100644 --- a/packages/backend/src/server/api/GetterService.ts +++ b/packages/backend/src/server/api/GetterService.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { DI } from '@/di-symbols.js'; -import type { NotesRepository, UsersRepository } from '@/models/index.js'; +import type { MiNotesRepository, MiUsersRepository } from '@/models/index.js'; import { IdentifiableError } from '@/misc/identifiable-error.js'; import type { MiLocalUser, MiRemoteUser, MiUser } from '@/models/entities/User.js'; import type { MiNote } from '@/models/entities/Note.js'; @@ -16,10 +16,10 @@ import { bindThis } from '@/decorators.js'; export class GetterService { constructor( @Inject(DI.usersRepository) - private usersRepository: UsersRepository, + private usersRepository: MiUsersRepository, @Inject(DI.notesRepository) - private notesRepository: NotesRepository, + private notesRepository: MiNotesRepository, private userEntityService: UserEntityService, ) { diff --git a/packages/backend/src/server/api/SigninApiService.ts b/packages/backend/src/server/api/SigninApiService.ts index d68b2617e3..fbaf89fa28 100644 --- a/packages/backend/src/server/api/SigninApiService.ts +++ b/packages/backend/src/server/api/SigninApiService.ts @@ -9,7 +9,7 @@ import bcrypt from 'bcryptjs'; import * as OTPAuth from 'otpauth'; import { IsNull } from 'typeorm'; import { DI } from '@/di-symbols.js'; -import type { UserSecurityKeysRepository, SigninsRepository, UserProfilesRepository, AttestationChallengesRepository, UsersRepository } from '@/models/index.js'; +import type { MiUserSecurityKeysRepository, MiSigninsRepository, MiUserProfilesRepository, MiAttestationChallengesRepository, MiUsersRepository } from '@/models/index.js'; import type { Config } from '@/config.js'; import { getIpHash } from '@/misc/get-ip-hash.js'; import type { MiLocalUser } from '@/models/entities/User.js'; @@ -27,19 +27,19 @@ export class SigninApiService { private config: Config, @Inject(DI.usersRepository) - private usersRepository: UsersRepository, + private usersRepository: MiUsersRepository, @Inject(DI.userSecurityKeysRepository) - private userSecurityKeysRepository: UserSecurityKeysRepository, + private userSecurityKeysRepository: MiUserSecurityKeysRepository, @Inject(DI.userProfilesRepository) - private userProfilesRepository: UserProfilesRepository, + private userProfilesRepository: MiUserProfilesRepository, @Inject(DI.attestationChallengesRepository) - private attestationChallengesRepository: AttestationChallengesRepository, + private attestationChallengesRepository: MiAttestationChallengesRepository, @Inject(DI.signinsRepository) - private signinsRepository: SigninsRepository, + private signinsRepository: MiSigninsRepository, private idService: IdService, private rateLimiterService: RateLimiterService, diff --git a/packages/backend/src/server/api/SigninService.ts b/packages/backend/src/server/api/SigninService.ts index 9f731e01bd..4801a94b5e 100644 --- a/packages/backend/src/server/api/SigninService.ts +++ b/packages/backend/src/server/api/SigninService.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { DI } from '@/di-symbols.js'; -import type { SigninsRepository } from '@/models/index.js'; +import type { MiSigninsRepository } from '@/models/index.js'; import { IdService } from '@/core/IdService.js'; import type { MiLocalUser } from '@/models/entities/User.js'; import { GlobalEventService } from '@/core/GlobalEventService.js'; @@ -17,7 +17,7 @@ import type { FastifyRequest, FastifyReply } from 'fastify'; export class SigninService { constructor( @Inject(DI.signinsRepository) - private signinsRepository: SigninsRepository, + private signinsRepository: MiSigninsRepository, private signinEntityService: SigninEntityService, private idService: IdService, diff --git a/packages/backend/src/server/api/SignupApiService.ts b/packages/backend/src/server/api/SignupApiService.ts index 6e0351d298..2de33ee0da 100644 --- a/packages/backend/src/server/api/SignupApiService.ts +++ b/packages/backend/src/server/api/SignupApiService.ts @@ -7,7 +7,7 @@ import { Inject, Injectable } from '@nestjs/common'; import bcrypt from 'bcryptjs'; import { IsNull } from 'typeorm'; import { DI } from '@/di-symbols.js'; -import type { RegistrationTicketsRepository, UsedUsernamesRepository, UserPendingsRepository, UserProfilesRepository, UsersRepository, MiRegistrationTicket } from '@/models/index.js'; +import type { MiRegistrationTicketsRepository, MiUsedUsernamesRepository, MiUserPendingsRepository, MiUserProfilesRepository, MiUsersRepository, MiRegistrationTicket } from '@/models/index.js'; import type { Config } from '@/config.js'; import { MetaService } from '@/core/MetaService.js'; import { CaptchaService } from '@/core/CaptchaService.js'; @@ -29,19 +29,19 @@ export class SignupApiService { private config: Config, @Inject(DI.usersRepository) - private usersRepository: UsersRepository, + private usersRepository: MiUsersRepository, @Inject(DI.userProfilesRepository) - private userProfilesRepository: UserProfilesRepository, + private userProfilesRepository: MiUserProfilesRepository, @Inject(DI.userPendingsRepository) - private userPendingsRepository: UserPendingsRepository, + private userPendingsRepository: MiUserPendingsRepository, @Inject(DI.usedUsernamesRepository) - private usedUsernamesRepository: UsedUsernamesRepository, + private usedUsernamesRepository: MiUsedUsernamesRepository, @Inject(DI.registrationTicketsRepository) - private registrationTicketsRepository: RegistrationTicketsRepository, + private registrationTicketsRepository: MiRegistrationTicketsRepository, private userEntityService: UserEntityService, private idService: IdService, diff --git a/packages/backend/src/server/api/StreamingApiServerService.ts b/packages/backend/src/server/api/StreamingApiServerService.ts index 74c4691435..97b7f28e6c 100644 --- a/packages/backend/src/server/api/StreamingApiServerService.ts +++ b/packages/backend/src/server/api/StreamingApiServerService.ts @@ -8,7 +8,7 @@ import { Inject, Injectable } from '@nestjs/common'; import * as Redis from 'ioredis'; import * as WebSocket from 'ws'; import { DI } from '@/di-symbols.js'; -import type { UsersRepository, MiAccessToken } from '@/models/index.js'; +import type { MiUsersRepository, MiAccessToken } from '@/models/index.js'; import { NoteReadService } from '@/core/NoteReadService.js'; import { NotificationService } from '@/core/NotificationService.js'; import { bindThis } from '@/decorators.js'; @@ -30,7 +30,7 @@ export class StreamingApiServerService { private redisForSub: Redis.Redis, @Inject(DI.usersRepository) - private usersRepository: UsersRepository, + private usersRepository: MiUsersRepository, private cacheService: CacheService, private noteReadService: NoteReadService, diff --git a/packages/backend/src/server/api/endpoints/admin/abuse-user-reports.ts b/packages/backend/src/server/api/endpoints/admin/abuse-user-reports.ts index 6bf7818de6..fd5a79b48c 100644 --- a/packages/backend/src/server/api/endpoints/admin/abuse-user-reports.ts +++ b/packages/backend/src/server/api/endpoints/admin/abuse-user-reports.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { AbuseUserReportsRepository } from '@/models/index.js'; +import type { MiAbuseUserReportsRepository } from '@/models/index.js'; import { QueryService } from '@/core/QueryService.js'; import { DI } from '@/di-symbols.js'; import { AbuseUserReportEntityService } from '@/core/entities/AbuseUserReportEntityService.js'; @@ -97,7 +97,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.abuseUserReportsRepository) - private abuseUserReportsRepository: AbuseUserReportsRepository, + private abuseUserReportsRepository: MiAbuseUserReportsRepository, private abuseUserReportEntityService: AbuseUserReportEntityService, private queryService: QueryService, diff --git a/packages/backend/src/server/api/endpoints/admin/accounts/create.ts b/packages/backend/src/server/api/endpoints/admin/accounts/create.ts index b9b5f82f2a..f67a79edda 100644 --- a/packages/backend/src/server/api/endpoints/admin/accounts/create.ts +++ b/packages/backend/src/server/api/endpoints/admin/accounts/create.ts @@ -6,7 +6,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { IsNull } from 'typeorm'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { UsersRepository } from '@/models/index.js'; +import type { MiUsersRepository } from '@/models/index.js'; import { SignupService } from '@/core/SignupService.js'; import { UserEntityService } from '@/core/entities/UserEntityService.js'; import { localUsernameSchema, passwordSchema } from '@/models/entities/User.js'; @@ -42,7 +42,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.usersRepository) - private usersRepository: UsersRepository, + private usersRepository: MiUsersRepository, private userEntityService: UserEntityService, private signupService: SignupService, diff --git a/packages/backend/src/server/api/endpoints/admin/accounts/delete.ts b/packages/backend/src/server/api/endpoints/admin/accounts/delete.ts index 08e6b11d11..31845a3a24 100644 --- a/packages/backend/src/server/api/endpoints/admin/accounts/delete.ts +++ b/packages/backend/src/server/api/endpoints/admin/accounts/delete.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { 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'; @@ -31,7 +31,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.usersRepository) - private usersRepository: UsersRepository, + private usersRepository: MiUsersRepository, private userEntityService: UserEntityService, private queueService: QueueService, diff --git a/packages/backend/src/server/api/endpoints/admin/ad/create.ts b/packages/backend/src/server/api/endpoints/admin/ad/create.ts index b0d6eae192..172865395c 100644 --- a/packages/backend/src/server/api/endpoints/admin/ad/create.ts +++ b/packages/backend/src/server/api/endpoints/admin/ad/create.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { AdsRepository } from '@/models/index.js'; +import type { MiAdsRepository } from '@/models/index.js'; import { IdService } from '@/core/IdService.js'; import { DI } from '@/di-symbols.js'; @@ -37,7 +37,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.adsRepository) - private adsRepository: AdsRepository, + private adsRepository: MiAdsRepository, private idService: IdService, ) { diff --git a/packages/backend/src/server/api/endpoints/admin/ad/delete.ts b/packages/backend/src/server/api/endpoints/admin/ad/delete.ts index bebc07e0d6..2890fd5e7b 100644 --- a/packages/backend/src/server/api/endpoints/admin/ad/delete.ts +++ b/packages/backend/src/server/api/endpoints/admin/ad/delete.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { AdsRepository } from '@/models/index.js'; +import type { MiAdsRepository } from '@/models/index.js'; import { DI } from '@/di-symbols.js'; import { ApiError } from '../../../error.js'; @@ -37,7 +37,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.adsRepository) - private adsRepository: AdsRepository, + private adsRepository: MiAdsRepository, ) { super(meta, paramDef, async (ps, me) => { const ad = await this.adsRepository.findOneBy({ id: ps.id }); diff --git a/packages/backend/src/server/api/endpoints/admin/ad/list.ts b/packages/backend/src/server/api/endpoints/admin/ad/list.ts index b33d921c5f..ac2638b531 100644 --- a/packages/backend/src/server/api/endpoints/admin/ad/list.ts +++ b/packages/backend/src/server/api/endpoints/admin/ad/list.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { AdsRepository } from '@/models/index.js'; +import type { MiAdsRepository } from '@/models/index.js'; import { QueryService } from '@/core/QueryService.js'; import { DI } from '@/di-symbols.js'; @@ -31,7 +31,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.adsRepository) - private adsRepository: AdsRepository, + private adsRepository: MiAdsRepository, private queryService: QueryService, ) { diff --git a/packages/backend/src/server/api/endpoints/admin/ad/update.ts b/packages/backend/src/server/api/endpoints/admin/ad/update.ts index ada17cf04d..752b15a8e4 100644 --- a/packages/backend/src/server/api/endpoints/admin/ad/update.ts +++ b/packages/backend/src/server/api/endpoints/admin/ad/update.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { AdsRepository } from '@/models/index.js'; +import type { MiAdsRepository } from '@/models/index.js'; import { DI } from '@/di-symbols.js'; import { ApiError } from '../../../error.js'; @@ -46,7 +46,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.adsRepository) - private adsRepository: AdsRepository, + private adsRepository: MiAdsRepository, ) { super(meta, paramDef, async (ps, me) => { const ad = await this.adsRepository.findOneBy({ id: ps.id }); diff --git a/packages/backend/src/server/api/endpoints/admin/announcements/delete.ts b/packages/backend/src/server/api/endpoints/admin/announcements/delete.ts index 6066a3ceaf..880a1561db 100644 --- a/packages/backend/src/server/api/endpoints/admin/announcements/delete.ts +++ b/packages/backend/src/server/api/endpoints/admin/announcements/delete.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { AnnouncementsRepository } from '@/models/index.js'; +import type { MiAnnouncementsRepository } from '@/models/index.js'; import { DI } from '@/di-symbols.js'; import { ApiError } from '../../../error.js'; @@ -37,7 +37,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.announcementsRepository) - private announcementsRepository: AnnouncementsRepository, + private announcementsRepository: MiAnnouncementsRepository, ) { super(meta, paramDef, async (ps, me) => { const announcement = await this.announcementsRepository.findOneBy({ id: ps.id }); diff --git a/packages/backend/src/server/api/endpoints/admin/announcements/list.ts b/packages/backend/src/server/api/endpoints/admin/announcements/list.ts index 4a1ea871e9..a3071f10f6 100644 --- a/packages/backend/src/server/api/endpoints/admin/announcements/list.ts +++ b/packages/backend/src/server/api/endpoints/admin/announcements/list.ts @@ -4,7 +4,7 @@ */ import { Inject, Injectable } from '@nestjs/common'; -import type { AnnouncementsRepository, AnnouncementReadsRepository } from '@/models/index.js'; +import type { MiAnnouncementsRepository, MiAnnouncementReadsRepository } from '@/models/index.js'; import type { MiAnnouncement } from '@/models/entities/Announcement.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import { QueryService } from '@/core/QueryService.js'; @@ -76,10 +76,10 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.announcementsRepository) - private announcementsRepository: AnnouncementsRepository, + private announcementsRepository: MiAnnouncementsRepository, @Inject(DI.announcementReadsRepository) - private announcementReadsRepository: AnnouncementReadsRepository, + private announcementReadsRepository: MiAnnouncementReadsRepository, private queryService: QueryService, ) { diff --git a/packages/backend/src/server/api/endpoints/admin/announcements/update.ts b/packages/backend/src/server/api/endpoints/admin/announcements/update.ts index 7efc7c0402..072c384348 100644 --- a/packages/backend/src/server/api/endpoints/admin/announcements/update.ts +++ b/packages/backend/src/server/api/endpoints/admin/announcements/update.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { AnnouncementsRepository } from '@/models/index.js'; +import type { MiAnnouncementsRepository } from '@/models/index.js'; import { DI } from '@/di-symbols.js'; import { ApiError } from '../../../error.js'; @@ -45,7 +45,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.announcementsRepository) - private announcementsRepository: AnnouncementsRepository, + private announcementsRepository: MiAnnouncementsRepository, ) { super(meta, paramDef, async (ps, me) => { const announcement = await this.announcementsRepository.findOneBy({ id: ps.id }); diff --git a/packages/backend/src/server/api/endpoints/admin/delete-account.ts b/packages/backend/src/server/api/endpoints/admin/delete-account.ts index 32c9174073..33a4dbba42 100644 --- a/packages/backend/src/server/api/endpoints/admin/delete-account.ts +++ b/packages/backend/src/server/api/endpoints/admin/delete-account.ts @@ -4,7 +4,7 @@ */ import { Inject, Injectable } from '@nestjs/common'; -import type { UsersRepository } from '@/models/index.js'; +import type { MiUsersRepository } from '@/models/index.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import { DeleteAccountService } from '@/core/DeleteAccountService.js'; import { DI } from '@/di-symbols.js'; @@ -32,7 +32,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.usersRepository) - private usersRepository: UsersRepository, + private usersRepository: MiUsersRepository, private deleteAccountService: DeleteAccountService, ) { diff --git a/packages/backend/src/server/api/endpoints/admin/delete-all-files-of-a-user.ts b/packages/backend/src/server/api/endpoints/admin/delete-all-files-of-a-user.ts index c88b5aad8e..05f30eda3b 100644 --- a/packages/backend/src/server/api/endpoints/admin/delete-all-files-of-a-user.ts +++ b/packages/backend/src/server/api/endpoints/admin/delete-all-files-of-a-user.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { DriveFilesRepository } from '@/models/index.js'; +import type { MiDriveFilesRepository } from '@/models/index.js'; import { DriveService } from '@/core/DriveService.js'; import { DI } from '@/di-symbols.js'; @@ -29,7 +29,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.driveFilesRepository) - private driveFilesRepository: DriveFilesRepository, + private driveFilesRepository: MiDriveFilesRepository, private driveService: DriveService, ) { diff --git a/packages/backend/src/server/api/endpoints/admin/drive/cleanup.ts b/packages/backend/src/server/api/endpoints/admin/drive/cleanup.ts index 188de3f292..63c6c00cd2 100644 --- a/packages/backend/src/server/api/endpoints/admin/drive/cleanup.ts +++ b/packages/backend/src/server/api/endpoints/admin/drive/cleanup.ts @@ -6,7 +6,7 @@ import { IsNull } from 'typeorm'; import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { DriveFilesRepository } from '@/models/index.js'; +import type { MiDriveFilesRepository } from '@/models/index.js'; import { DriveService } from '@/core/DriveService.js'; import { DI } from '@/di-symbols.js'; @@ -28,7 +28,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.driveFilesRepository) - private driveFilesRepository: DriveFilesRepository, + private driveFilesRepository: MiDriveFilesRepository, private driveService: DriveService, ) { diff --git a/packages/backend/src/server/api/endpoints/admin/drive/files.ts b/packages/backend/src/server/api/endpoints/admin/drive/files.ts index 2191a45669..3a9b92e526 100644 --- a/packages/backend/src/server/api/endpoints/admin/drive/files.ts +++ b/packages/backend/src/server/api/endpoints/admin/drive/files.ts @@ -4,7 +4,7 @@ */ import { Inject, Injectable } from '@nestjs/common'; -import type { DriveFilesRepository } from '@/models/index.js'; +import type { MiDriveFilesRepository } from '@/models/index.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import { QueryService } from '@/core/QueryService.js'; import { DI } from '@/di-symbols.js'; @@ -51,7 +51,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.driveFilesRepository) - private driveFilesRepository: DriveFilesRepository, + private driveFilesRepository: MiDriveFilesRepository, private driveFileEntityService: DriveFileEntityService, private queryService: QueryService, diff --git a/packages/backend/src/server/api/endpoints/admin/drive/show-file.ts b/packages/backend/src/server/api/endpoints/admin/drive/show-file.ts index 9cd0583049..34bf8d93af 100644 --- a/packages/backend/src/server/api/endpoints/admin/drive/show-file.ts +++ b/packages/backend/src/server/api/endpoints/admin/drive/show-file.ts @@ -4,7 +4,7 @@ */ import { Inject, Injectable } from '@nestjs/common'; -import type { DriveFilesRepository, UsersRepository } from '@/models/index.js'; +import type { MiDriveFilesRepository, MiUsersRepository } from '@/models/index.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import { DI } from '@/di-symbols.js'; import { RoleService } from '@/core/RoleService.js'; @@ -158,10 +158,10 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.driveFilesRepository) - private driveFilesRepository: DriveFilesRepository, + private driveFilesRepository: MiDriveFilesRepository, @Inject(DI.usersRepository) - private usersRepository: UsersRepository, + private usersRepository: MiUsersRepository, private roleService: RoleService, ) { diff --git a/packages/backend/src/server/api/endpoints/admin/emoji/add.ts b/packages/backend/src/server/api/endpoints/admin/emoji/add.ts index 07a9d7edba..83295b2ae4 100644 --- a/packages/backend/src/server/api/endpoints/admin/emoji/add.ts +++ b/packages/backend/src/server/api/endpoints/admin/emoji/add.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { DriveFilesRepository } from '@/models/index.js'; +import type { MiDriveFilesRepository } from '@/models/index.js'; import { DI } from '@/di-symbols.js'; import { CustomEmojiService } from '@/core/CustomEmojiService.js'; import { ModerationLogService } from '@/core/ModerationLogService.js'; @@ -57,7 +57,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.driveFilesRepository) - private driveFilesRepository: DriveFilesRepository, + private driveFilesRepository: MiDriveFilesRepository, private customEmojiService: CustomEmojiService, diff --git a/packages/backend/src/server/api/endpoints/admin/emoji/copy.ts b/packages/backend/src/server/api/endpoints/admin/emoji/copy.ts index 1c4af57037..07054c1571 100644 --- a/packages/backend/src/server/api/endpoints/admin/emoji/copy.ts +++ b/packages/backend/src/server/api/endpoints/admin/emoji/copy.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { EmojisRepository } from '@/models/index.js'; +import type { MiEmojisRepository } from '@/models/index.js'; import { IdService } from '@/core/IdService.js'; import type { MiDriveFile } from '@/models/entities/DriveFile.js'; import { DI } from '@/di-symbols.js'; @@ -56,7 +56,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.emojisRepository) - private emojisRepository: EmojisRepository, + private emojisRepository: MiEmojisRepository, private emojiEntityService: EmojiEntityService, private idService: IdService, diff --git a/packages/backend/src/server/api/endpoints/admin/emoji/list-remote.ts b/packages/backend/src/server/api/endpoints/admin/emoji/list-remote.ts index 912229c1cc..8e146bf459 100644 --- a/packages/backend/src/server/api/endpoints/admin/emoji/list-remote.ts +++ b/packages/backend/src/server/api/endpoints/admin/emoji/list-remote.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { EmojisRepository } from '@/models/index.js'; +import type { MiEmojisRepository } from '@/models/index.js'; import { QueryService } from '@/core/QueryService.js'; import { UtilityService } from '@/core/UtilityService.js'; import { EmojiEntityService } from '@/core/entities/EmojiEntityService.js'; @@ -82,7 +82,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.emojisRepository) - private emojisRepository: EmojisRepository, + private emojisRepository: MiEmojisRepository, private utilityService: UtilityService, private queryService: QueryService, diff --git a/packages/backend/src/server/api/endpoints/admin/emoji/list.ts b/packages/backend/src/server/api/endpoints/admin/emoji/list.ts index 5a3263045b..cd5914eeca 100644 --- a/packages/backend/src/server/api/endpoints/admin/emoji/list.ts +++ b/packages/backend/src/server/api/endpoints/admin/emoji/list.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { EmojisRepository } from '@/models/index.js'; +import type { MiEmojisRepository } from '@/models/index.js'; import type { MiEmoji } from '@/models/entities/Emoji.js'; import { QueryService } from '@/core/QueryService.js'; import { DI } from '@/di-symbols.js'; @@ -76,7 +76,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.emojisRepository) - private emojisRepository: EmojisRepository, + private emojisRepository: MiEmojisRepository, private emojiEntityService: EmojiEntityService, private queryService: QueryService, diff --git a/packages/backend/src/server/api/endpoints/admin/emoji/update.ts b/packages/backend/src/server/api/endpoints/admin/emoji/update.ts index b08555598a..03014e9f58 100644 --- a/packages/backend/src/server/api/endpoints/admin/emoji/update.ts +++ b/packages/backend/src/server/api/endpoints/admin/emoji/update.ts @@ -6,7 +6,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import { CustomEmojiService } from '@/core/CustomEmojiService.js'; -import type { DriveFilesRepository } from '@/models/index.js'; +import type { MiDriveFilesRepository } from '@/models/index.js'; import { DI } from '@/di-symbols.js'; import { ApiError } from '../../../error.js'; @@ -64,7 +64,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.driveFilesRepository) - private driveFilesRepository: DriveFilesRepository, + private driveFilesRepository: MiDriveFilesRepository, private customEmojiService: CustomEmojiService, ) { diff --git a/packages/backend/src/server/api/endpoints/admin/federation/delete-all-files.ts b/packages/backend/src/server/api/endpoints/admin/federation/delete-all-files.ts index 93a22a7dea..b635d432a2 100644 --- a/packages/backend/src/server/api/endpoints/admin/federation/delete-all-files.ts +++ b/packages/backend/src/server/api/endpoints/admin/federation/delete-all-files.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { DriveFilesRepository } from '@/models/index.js'; +import type { MiDriveFilesRepository } from '@/models/index.js'; import { DriveService } from '@/core/DriveService.js'; import { DI } from '@/di-symbols.js'; @@ -29,7 +29,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.driveFilesRepository) - private driveFilesRepository: DriveFilesRepository, + private driveFilesRepository: MiDriveFilesRepository, private driveService: DriveService, ) { diff --git a/packages/backend/src/server/api/endpoints/admin/federation/refresh-remote-instance-metadata.ts b/packages/backend/src/server/api/endpoints/admin/federation/refresh-remote-instance-metadata.ts index 3bc2646370..d239b16b38 100644 --- a/packages/backend/src/server/api/endpoints/admin/federation/refresh-remote-instance-metadata.ts +++ b/packages/backend/src/server/api/endpoints/admin/federation/refresh-remote-instance-metadata.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { InstancesRepository } from '@/models/index.js'; +import type { MiInstancesRepository } from '@/models/index.js'; import { FetchInstanceMetadataService } from '@/core/FetchInstanceMetadataService.js'; import { UtilityService } from '@/core/UtilityService.js'; import { DI } from '@/di-symbols.js'; @@ -30,7 +30,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.instancesRepository) - private instancesRepository: InstancesRepository, + private instancesRepository: MiInstancesRepository, private utilityService: UtilityService, private fetchInstanceMetadataService: FetchInstanceMetadataService, diff --git a/packages/backend/src/server/api/endpoints/admin/federation/remove-all-following.ts b/packages/backend/src/server/api/endpoints/admin/federation/remove-all-following.ts index ac60e3bcc9..b7844cc18e 100644 --- a/packages/backend/src/server/api/endpoints/admin/federation/remove-all-following.ts +++ b/packages/backend/src/server/api/endpoints/admin/federation/remove-all-following.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { FollowingsRepository, UsersRepository } from '@/models/index.js'; +import type { MiFollowingsRepository, MiUsersRepository } from '@/models/index.js'; import { DI } from '@/di-symbols.js'; import { QueueService } from '@/core/QueueService.js'; @@ -29,10 +29,10 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.usersRepository) - private usersRepository: UsersRepository, + private usersRepository: MiUsersRepository, @Inject(DI.notesRepository) - private followingsRepository: FollowingsRepository, + private followingsRepository: MiFollowingsRepository, private queueService: QueueService, ) { diff --git a/packages/backend/src/server/api/endpoints/admin/federation/update-instance.ts b/packages/backend/src/server/api/endpoints/admin/federation/update-instance.ts index 3eb1fc90a9..4b42e47da0 100644 --- a/packages/backend/src/server/api/endpoints/admin/federation/update-instance.ts +++ b/packages/backend/src/server/api/endpoints/admin/federation/update-instance.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { InstancesRepository } from '@/models/index.js'; +import type { MiInstancesRepository } from '@/models/index.js'; import { UtilityService } from '@/core/UtilityService.js'; import { DI } from '@/di-symbols.js'; import { FederatedInstanceService } from '@/core/FederatedInstanceService.js'; @@ -31,7 +31,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.instancesRepository) - private instancesRepository: InstancesRepository, + private instancesRepository: MiInstancesRepository, private utilityService: UtilityService, private federatedInstanceService: FederatedInstanceService, diff --git a/packages/backend/src/server/api/endpoints/admin/get-user-ips.ts b/packages/backend/src/server/api/endpoints/admin/get-user-ips.ts index 9e4d18e10f..483ca98bc7 100644 --- a/packages/backend/src/server/api/endpoints/admin/get-user-ips.ts +++ b/packages/backend/src/server/api/endpoints/admin/get-user-ips.ts @@ -4,7 +4,7 @@ */ import { Inject, Injectable } from '@nestjs/common'; -import type { UserIpsRepository } from '@/models/index.js'; +import type { MiUserIpsRepository } from '@/models/index.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import { DI } from '@/di-symbols.js'; @@ -28,7 +28,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.userIpsRepository) - private userIpsRepository: UserIpsRepository, + private userIpsRepository: MiUserIpsRepository, ) { super(meta, paramDef, async (ps, me) => { const ips = await this.userIpsRepository.find({ diff --git a/packages/backend/src/server/api/endpoints/admin/invite/create.ts b/packages/backend/src/server/api/endpoints/admin/invite/create.ts index 5bdca71142..9f6cc53b13 100644 --- a/packages/backend/src/server/api/endpoints/admin/invite/create.ts +++ b/packages/backend/src/server/api/endpoints/admin/invite/create.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { RegistrationTicketsRepository } from '@/models/index.js'; +import type { MiRegistrationTicketsRepository } from '@/models/index.js'; import { InviteCodeEntityService } from '@/core/entities/InviteCodeEntityService.js'; import { IdService } from '@/core/IdService.js'; import { DI } from '@/di-symbols.js'; @@ -57,7 +57,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.registrationTicketsRepository) - private registrationTicketsRepository: RegistrationTicketsRepository, + private registrationTicketsRepository: MiRegistrationTicketsRepository, private inviteCodeEntityService: InviteCodeEntityService, private idService: IdService, diff --git a/packages/backend/src/server/api/endpoints/admin/invite/list.ts b/packages/backend/src/server/api/endpoints/admin/invite/list.ts index 6d2874fd1f..b75f7404e2 100644 --- a/packages/backend/src/server/api/endpoints/admin/invite/list.ts +++ b/packages/backend/src/server/api/endpoints/admin/invite/list.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { RegistrationTicketsRepository } from '@/models/index.js'; +import type { MiRegistrationTicketsRepository } from '@/models/index.js'; import { InviteCodeEntityService } from '@/core/entities/InviteCodeEntityService.js'; import { DI } from '@/di-symbols.js'; @@ -41,7 +41,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.registrationTicketsRepository) - private registrationTicketsRepository: RegistrationTicketsRepository, + private registrationTicketsRepository: MiRegistrationTicketsRepository, private inviteCodeEntityService: InviteCodeEntityService, ) { diff --git a/packages/backend/src/server/api/endpoints/admin/promo/create.ts b/packages/backend/src/server/api/endpoints/admin/promo/create.ts index ca7cecb08b..9de6a1b7aa 100644 --- a/packages/backend/src/server/api/endpoints/admin/promo/create.ts +++ b/packages/backend/src/server/api/endpoints/admin/promo/create.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { PromoNotesRepository } from '@/models/index.js'; +import type { MiPromoNotesRepository } from '@/models/index.js'; import { GetterService } from '@/server/api/GetterService.js'; import { DI } from '@/di-symbols.js'; import { ApiError } from '../../../error.js'; @@ -45,7 +45,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.promoNotesRepository) - private promoNotesRepository: PromoNotesRepository, + private promoNotesRepository: MiPromoNotesRepository, private getterService: GetterService, ) { diff --git a/packages/backend/src/server/api/endpoints/admin/reset-password.ts b/packages/backend/src/server/api/endpoints/admin/reset-password.ts index 6e4ba959a2..61842e1484 100644 --- a/packages/backend/src/server/api/endpoints/admin/reset-password.ts +++ b/packages/backend/src/server/api/endpoints/admin/reset-password.ts @@ -6,7 +6,7 @@ import { Inject, Injectable } from '@nestjs/common'; import bcrypt from 'bcryptjs'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { UsersRepository, UserProfilesRepository } from '@/models/index.js'; +import type { MiUsersRepository, MiUserProfilesRepository } from '@/models/index.js'; import { DI } from '@/di-symbols.js'; import { secureRndstr } from '@/misc/secure-rndstr.js'; @@ -43,10 +43,10 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.usersRepository) - private usersRepository: UsersRepository, + private usersRepository: MiUsersRepository, @Inject(DI.userProfilesRepository) - private userProfilesRepository: UserProfilesRepository, + private userProfilesRepository: MiUserProfilesRepository, ) { super(meta, paramDef, async (ps) => { const user = await this.usersRepository.findOneBy({ id: ps.userId }); diff --git a/packages/backend/src/server/api/endpoints/admin/resolve-abuse-user-report.ts b/packages/backend/src/server/api/endpoints/admin/resolve-abuse-user-report.ts index d37d46daa8..0fbc1fa973 100644 --- a/packages/backend/src/server/api/endpoints/admin/resolve-abuse-user-report.ts +++ b/packages/backend/src/server/api/endpoints/admin/resolve-abuse-user-report.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { UsersRepository, AbuseUserReportsRepository } from '@/models/index.js'; +import type { MiUsersRepository, MiAbuseUserReportsRepository } from '@/models/index.js'; import { InstanceActorService } from '@/core/InstanceActorService.js'; import { QueueService } from '@/core/QueueService.js'; import { ApRendererService } from '@/core/activitypub/ApRendererService.js'; @@ -34,10 +34,10 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.usersRepository) - private usersRepository: UsersRepository, + private usersRepository: MiUsersRepository, @Inject(DI.abuseUserReportsRepository) - private abuseUserReportsRepository: AbuseUserReportsRepository, + private abuseUserReportsRepository: MiAbuseUserReportsRepository, private queueService: QueueService, private instanceActorService: InstanceActorService, diff --git a/packages/backend/src/server/api/endpoints/admin/roles/assign.ts b/packages/backend/src/server/api/endpoints/admin/roles/assign.ts index 78ab13a773..01925d6179 100644 --- a/packages/backend/src/server/api/endpoints/admin/roles/assign.ts +++ b/packages/backend/src/server/api/endpoints/admin/roles/assign.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { RolesRepository, UsersRepository } from '@/models/index.js'; +import type { MiRolesRepository, MiUsersRepository } from '@/models/index.js'; import { DI } from '@/di-symbols.js'; import { ApiError } from '@/server/api/error.js'; import { RoleService } from '@/core/RoleService.js'; @@ -58,10 +58,10 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.usersRepository) - private usersRepository: UsersRepository, + private usersRepository: MiUsersRepository, @Inject(DI.rolesRepository) - private rolesRepository: RolesRepository, + private rolesRepository: MiRolesRepository, private roleService: RoleService, ) { diff --git a/packages/backend/src/server/api/endpoints/admin/roles/create.ts b/packages/backend/src/server/api/endpoints/admin/roles/create.ts index d4c3e4d789..c0598d20c8 100644 --- a/packages/backend/src/server/api/endpoints/admin/roles/create.ts +++ b/packages/backend/src/server/api/endpoints/admin/roles/create.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { RolesRepository } from '@/models/index.js'; +import type { MiRolesRepository } from '@/models/index.js'; import { GlobalEventService } from '@/core/GlobalEventService.js'; import { DI } from '@/di-symbols.js'; import { IdService } from '@/core/IdService.js'; @@ -60,7 +60,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.rolesRepository) - private rolesRepository: RolesRepository, + private rolesRepository: MiRolesRepository, private globalEventService: GlobalEventService, private idService: IdService, diff --git a/packages/backend/src/server/api/endpoints/admin/roles/delete.ts b/packages/backend/src/server/api/endpoints/admin/roles/delete.ts index b57cd0d5c8..60cc143a16 100644 --- a/packages/backend/src/server/api/endpoints/admin/roles/delete.ts +++ b/packages/backend/src/server/api/endpoints/admin/roles/delete.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { RolesRepository } from '@/models/index.js'; +import type { MiRolesRepository } from '@/models/index.js'; import { GlobalEventService } from '@/core/GlobalEventService.js'; import { DI } from '@/di-symbols.js'; import { ApiError } from '@/server/api/error.js'; @@ -40,7 +40,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.rolesRepository) - private rolesRepository: RolesRepository, + private rolesRepository: MiRolesRepository, private globalEventService: GlobalEventService, ) { diff --git a/packages/backend/src/server/api/endpoints/admin/roles/list.ts b/packages/backend/src/server/api/endpoints/admin/roles/list.ts index 363cac7f05..9967c41860 100644 --- a/packages/backend/src/server/api/endpoints/admin/roles/list.ts +++ b/packages/backend/src/server/api/endpoints/admin/roles/list.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { RolesRepository } from '@/models/index.js'; +import type { MiRolesRepository } from '@/models/index.js'; import { DI } from '@/di-symbols.js'; import { RoleEntityService } from '@/core/entities/RoleEntityService.js'; @@ -29,7 +29,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.rolesRepository) - private rolesRepository: RolesRepository, + private rolesRepository: MiRolesRepository, private roleEntityService: RoleEntityService, ) { diff --git a/packages/backend/src/server/api/endpoints/admin/roles/show.ts b/packages/backend/src/server/api/endpoints/admin/roles/show.ts index 189e40dd6f..4d01bffe4c 100644 --- a/packages/backend/src/server/api/endpoints/admin/roles/show.ts +++ b/packages/backend/src/server/api/endpoints/admin/roles/show.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { RolesRepository } from '@/models/index.js'; +import type { MiRolesRepository } from '@/models/index.js'; import { DI } from '@/di-symbols.js'; import { ApiError } from '@/server/api/error.js'; import { RoleEntityService } from '@/core/entities/RoleEntityService.js'; @@ -40,7 +40,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.rolesRepository) - private rolesRepository: RolesRepository, + private rolesRepository: MiRolesRepository, private roleEntityService: RoleEntityService, ) { diff --git a/packages/backend/src/server/api/endpoints/admin/roles/unassign.ts b/packages/backend/src/server/api/endpoints/admin/roles/unassign.ts index 1b3c49571b..6efeed5eba 100644 --- a/packages/backend/src/server/api/endpoints/admin/roles/unassign.ts +++ b/packages/backend/src/server/api/endpoints/admin/roles/unassign.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { RolesRepository, UsersRepository } from '@/models/index.js'; +import type { MiRolesRepository, MiUsersRepository } from '@/models/index.js'; import { DI } from '@/di-symbols.js'; import { ApiError } from '@/server/api/error.js'; import { RoleService } from '@/core/RoleService.js'; @@ -60,10 +60,10 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.usersRepository) - private usersRepository: UsersRepository, + private usersRepository: MiUsersRepository, @Inject(DI.rolesRepository) - private rolesRepository: RolesRepository, + private rolesRepository: MiRolesRepository, private roleService: RoleService, ) { diff --git a/packages/backend/src/server/api/endpoints/admin/roles/update.ts b/packages/backend/src/server/api/endpoints/admin/roles/update.ts index f336a3f8e9..13a198eac8 100644 --- a/packages/backend/src/server/api/endpoints/admin/roles/update.ts +++ b/packages/backend/src/server/api/endpoints/admin/roles/update.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { RolesRepository } from '@/models/index.js'; +import type { MiRolesRepository } from '@/models/index.js'; import { GlobalEventService } from '@/core/GlobalEventService.js'; import { DI } from '@/di-symbols.js'; import { ApiError } from '@/server/api/error.js'; @@ -69,7 +69,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.rolesRepository) - private rolesRepository: RolesRepository, + private rolesRepository: MiRolesRepository, private globalEventService: GlobalEventService, ) { diff --git a/packages/backend/src/server/api/endpoints/admin/roles/users.ts b/packages/backend/src/server/api/endpoints/admin/roles/users.ts index 89f58d036e..cf5d724180 100644 --- a/packages/backend/src/server/api/endpoints/admin/roles/users.ts +++ b/packages/backend/src/server/api/endpoints/admin/roles/users.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Brackets } from 'typeorm'; -import type { RoleAssignmentsRepository, RolesRepository } from '@/models/index.js'; +import type { MiRoleAssignmentsRepository, MiRolesRepository } from '@/models/index.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import { QueryService } from '@/core/QueryService.js'; import { DI } from '@/di-symbols.js'; @@ -43,10 +43,10 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.rolesRepository) - private rolesRepository: RolesRepository, + private rolesRepository: MiRolesRepository, @Inject(DI.roleAssignmentsRepository) - private roleAssignmentsRepository: RoleAssignmentsRepository, + private roleAssignmentsRepository: MiRoleAssignmentsRepository, private queryService: QueryService, private userEntityService: UserEntityService, diff --git a/packages/backend/src/server/api/endpoints/admin/show-moderation-logs.ts b/packages/backend/src/server/api/endpoints/admin/show-moderation-logs.ts index 16e424890f..4fd3e37da4 100644 --- a/packages/backend/src/server/api/endpoints/admin/show-moderation-logs.ts +++ b/packages/backend/src/server/api/endpoints/admin/show-moderation-logs.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { ModerationLogsRepository } from '@/models/index.js'; +import type { MiModerationLogsRepository } from '@/models/index.js'; import { QueryService } from '@/core/QueryService.js'; import { DI } from '@/di-symbols.js'; import { ModerationLogEntityService } from '@/core/entities/ModerationLogEntityService.js'; @@ -71,7 +71,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.moderationLogsRepository) - private moderationLogsRepository: ModerationLogsRepository, + private moderationLogsRepository: MiModerationLogsRepository, private moderationLogEntityService: ModerationLogEntityService, private queryService: QueryService, diff --git a/packages/backend/src/server/api/endpoints/admin/show-user.ts b/packages/backend/src/server/api/endpoints/admin/show-user.ts index 1e8c38c96b..fe415397ed 100644 --- a/packages/backend/src/server/api/endpoints/admin/show-user.ts +++ b/packages/backend/src/server/api/endpoints/admin/show-user.ts @@ -4,7 +4,7 @@ */ import { Inject, Injectable } from '@nestjs/common'; -import type { UsersRepository, SigninsRepository, UserProfilesRepository } from '@/models/index.js'; +import type { MiUsersRepository, MiSigninsRepository, MiUserProfilesRepository } from '@/models/index.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import { DI } from '@/di-symbols.js'; import { RoleService } from '@/core/RoleService.js'; @@ -35,13 +35,13 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.usersRepository) - private usersRepository: UsersRepository, + private usersRepository: MiUsersRepository, @Inject(DI.userProfilesRepository) - private userProfilesRepository: UserProfilesRepository, + private userProfilesRepository: MiUserProfilesRepository, @Inject(DI.signinsRepository) - private signinsRepository: SigninsRepository, + private signinsRepository: MiSigninsRepository, private roleService: RoleService, private roleEntityService: RoleEntityService, diff --git a/packages/backend/src/server/api/endpoints/admin/show-users.ts b/packages/backend/src/server/api/endpoints/admin/show-users.ts index cc07e77f49..7fcbaff2fe 100644 --- a/packages/backend/src/server/api/endpoints/admin/show-users.ts +++ b/packages/backend/src/server/api/endpoints/admin/show-users.ts @@ -4,7 +4,7 @@ */ import { Inject, Injectable } from '@nestjs/common'; -import type { UsersRepository } from '@/models/index.js'; +import type { MiUsersRepository } from '@/models/index.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import { DI } from '@/di-symbols.js'; import { UserEntityService } from '@/core/entities/UserEntityService.js'; @@ -52,7 +52,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.usersRepository) - private usersRepository: UsersRepository, + private usersRepository: MiUsersRepository, private userEntityService: UserEntityService, private roleService: RoleService, diff --git a/packages/backend/src/server/api/endpoints/admin/suspend-user.ts b/packages/backend/src/server/api/endpoints/admin/suspend-user.ts index e133adcbd0..065ee1bfd3 100644 --- a/packages/backend/src/server/api/endpoints/admin/suspend-user.ts +++ b/packages/backend/src/server/api/endpoints/admin/suspend-user.ts @@ -6,7 +6,7 @@ import { IsNull, Not } from 'typeorm'; import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { UsersRepository, FollowingsRepository } from '@/models/index.js'; +import type { MiUsersRepository, MiFollowingsRepository } from '@/models/index.js'; import type { MiUser } from '@/models/entities/User.js'; import type { RelationshipJobData } from '@/queue/types.js'; import { ModerationLogService } from '@/core/ModerationLogService.js'; @@ -36,10 +36,10 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.usersRepository) - private usersRepository: UsersRepository, + private usersRepository: MiUsersRepository, @Inject(DI.followingsRepository) - private followingsRepository: FollowingsRepository, + private followingsRepository: MiFollowingsRepository, private userSuspendService: UserSuspendService, private roleService: RoleService, diff --git a/packages/backend/src/server/api/endpoints/admin/unsuspend-user.ts b/packages/backend/src/server/api/endpoints/admin/unsuspend-user.ts index 984e0ee074..c249afc417 100644 --- a/packages/backend/src/server/api/endpoints/admin/unsuspend-user.ts +++ b/packages/backend/src/server/api/endpoints/admin/unsuspend-user.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { UsersRepository } from '@/models/index.js'; +import type { MiUsersRepository } from '@/models/index.js'; import { ModerationLogService } from '@/core/ModerationLogService.js'; import { UserSuspendService } from '@/core/UserSuspendService.js'; import { DI } from '@/di-symbols.js'; @@ -30,7 +30,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.usersRepository) - private usersRepository: UsersRepository, + private usersRepository: MiUsersRepository, private userSuspendService: UserSuspendService, private moderationLogService: ModerationLogService, diff --git a/packages/backend/src/server/api/endpoints/admin/update-user-note.ts b/packages/backend/src/server/api/endpoints/admin/update-user-note.ts index 2cfd772635..d8a93932a0 100644 --- a/packages/backend/src/server/api/endpoints/admin/update-user-note.ts +++ b/packages/backend/src/server/api/endpoints/admin/update-user-note.ts @@ -4,7 +4,7 @@ */ import { Inject, Injectable } from '@nestjs/common'; -import type { UserProfilesRepository, UsersRepository } from '@/models/index.js'; +import type { MiUserProfilesRepository, MiUsersRepository } from '@/models/index.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import { DI } from '@/di-symbols.js'; @@ -29,10 +29,10 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.usersRepository) - private usersRepository: UsersRepository, + private usersRepository: MiUsersRepository, @Inject(DI.userProfilesRepository) - private userProfilesRepository: UserProfilesRepository, + private userProfilesRepository: MiUserProfilesRepository, ) { super(meta, paramDef, async (ps, me) => { const user = await this.usersRepository.findOneBy({ id: ps.userId }); diff --git a/packages/backend/src/server/api/endpoints/announcements.ts b/packages/backend/src/server/api/endpoints/announcements.ts index 070e6f0d77..1cafacb6e4 100644 --- a/packages/backend/src/server/api/endpoints/announcements.ts +++ b/packages/backend/src/server/api/endpoints/announcements.ts @@ -9,7 +9,7 @@ import { Endpoint } from '@/server/api/endpoint-base.js'; import { QueryService } from '@/core/QueryService.js'; import { AnnouncementService } from '@/core/AnnouncementService.js'; import { DI } from '@/di-symbols.js'; -import type { AnnouncementReadsRepository, AnnouncementsRepository } from '@/models/index.js'; +import type { MiAnnouncementReadsRepository, MiAnnouncementsRepository } from '@/models/index.js'; export const meta = { tags: ['meta'], @@ -43,10 +43,10 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.announcementsRepository) - private announcementsRepository: AnnouncementsRepository, + private announcementsRepository: MiAnnouncementsRepository, @Inject(DI.announcementReadsRepository) - private announcementReadsRepository: AnnouncementReadsRepository, + private announcementReadsRepository: MiAnnouncementReadsRepository, private queryService: QueryService, private announcementService: AnnouncementService, diff --git a/packages/backend/src/server/api/endpoints/antennas/create.ts b/packages/backend/src/server/api/endpoints/antennas/create.ts index 8924568440..bfec615ee3 100644 --- a/packages/backend/src/server/api/endpoints/antennas/create.ts +++ b/packages/backend/src/server/api/endpoints/antennas/create.ts @@ -6,7 +6,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import { IdService } from '@/core/IdService.js'; -import type { UserListsRepository, AntennasRepository } from '@/models/index.js'; +import type { MiUserListsRepository, MiAntennasRepository } from '@/models/index.js'; import { GlobalEventService } from '@/core/GlobalEventService.js'; import { AntennaEntityService } from '@/core/entities/AntennaEntityService.js'; import { DI } from '@/di-symbols.js'; @@ -75,10 +75,10 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.antennasRepository) - private antennasRepository: AntennasRepository, + private antennasRepository: MiAntennasRepository, @Inject(DI.userListsRepository) - private userListsRepository: UserListsRepository, + private userListsRepository: MiUserListsRepository, private antennaEntityService: AntennaEntityService, private roleService: RoleService, diff --git a/packages/backend/src/server/api/endpoints/antennas/delete.ts b/packages/backend/src/server/api/endpoints/antennas/delete.ts index 59ccd724c0..4ddefc624b 100644 --- a/packages/backend/src/server/api/endpoints/antennas/delete.ts +++ b/packages/backend/src/server/api/endpoints/antennas/delete.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { AntennasRepository } from '@/models/index.js'; +import type { MiAntennasRepository } from '@/models/index.js'; import { GlobalEventService } from '@/core/GlobalEventService.js'; import { DI } from '@/di-symbols.js'; import { ApiError } from '../../error.js'; @@ -39,7 +39,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.antennasRepository) - private antennasRepository: AntennasRepository, + private antennasRepository: MiAntennasRepository, private globalEventService: GlobalEventService, ) { diff --git a/packages/backend/src/server/api/endpoints/antennas/list.ts b/packages/backend/src/server/api/endpoints/antennas/list.ts index db5d65589d..73222393c0 100644 --- a/packages/backend/src/server/api/endpoints/antennas/list.ts +++ b/packages/backend/src/server/api/endpoints/antennas/list.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { AntennasRepository } from '@/models/index.js'; +import type { MiAntennasRepository } from '@/models/index.js'; import { AntennaEntityService } from '@/core/entities/AntennaEntityService.js'; import { DI } from '@/di-symbols.js'; @@ -38,7 +38,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.antennasRepository) - private antennasRepository: AntennasRepository, + private antennasRepository: MiAntennasRepository, private antennaEntityService: AntennaEntityService, ) { diff --git a/packages/backend/src/server/api/endpoints/antennas/notes.ts b/packages/backend/src/server/api/endpoints/antennas/notes.ts index 145134dcf7..54eabbbbd0 100644 --- a/packages/backend/src/server/api/endpoints/antennas/notes.ts +++ b/packages/backend/src/server/api/endpoints/antennas/notes.ts @@ -6,7 +6,7 @@ import { Inject, Injectable } from '@nestjs/common'; import * as Redis from 'ioredis'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { NotesRepository, AntennasRepository } from '@/models/index.js'; +import type { MiNotesRepository, MiAntennasRepository } from '@/models/index.js'; import { QueryService } from '@/core/QueryService.js'; import { NoteReadService } from '@/core/NoteReadService.js'; import { DI } from '@/di-symbols.js'; @@ -61,10 +61,10 @@ export default class extends Endpoint { private redisClient: Redis.Redis, @Inject(DI.notesRepository) - private notesRepository: NotesRepository, + private notesRepository: MiNotesRepository, @Inject(DI.antennasRepository) - private antennasRepository: AntennasRepository, + private antennasRepository: MiAntennasRepository, private idService: IdService, private noteEntityService: NoteEntityService, diff --git a/packages/backend/src/server/api/endpoints/antennas/show.ts b/packages/backend/src/server/api/endpoints/antennas/show.ts index 48012a11ec..f1d9b35eaf 100644 --- a/packages/backend/src/server/api/endpoints/antennas/show.ts +++ b/packages/backend/src/server/api/endpoints/antennas/show.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { AntennasRepository } from '@/models/index.js'; +import type { MiAntennasRepository } from '@/models/index.js'; import { AntennaEntityService } from '@/core/entities/AntennaEntityService.js'; import { DI } from '@/di-symbols.js'; import { ApiError } from '../../error.js'; @@ -45,7 +45,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.antennasRepository) - private antennasRepository: AntennasRepository, + private antennasRepository: MiAntennasRepository, private antennaEntityService: AntennaEntityService, ) { diff --git a/packages/backend/src/server/api/endpoints/antennas/update.ts b/packages/backend/src/server/api/endpoints/antennas/update.ts index 1f381caeff..418f6f0b0b 100644 --- a/packages/backend/src/server/api/endpoints/antennas/update.ts +++ b/packages/backend/src/server/api/endpoints/antennas/update.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { AntennasRepository, UserListsRepository } from '@/models/index.js'; +import type { MiAntennasRepository, MiUserListsRepository } from '@/models/index.js'; import { GlobalEventService } from '@/core/GlobalEventService.js'; import { AntennaEntityService } from '@/core/entities/AntennaEntityService.js'; import { DI } from '@/di-symbols.js'; @@ -74,10 +74,10 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.antennasRepository) - private antennasRepository: AntennasRepository, + private antennasRepository: MiAntennasRepository, @Inject(DI.userListsRepository) - private userListsRepository: UserListsRepository, + private userListsRepository: MiUserListsRepository, private antennaEntityService: AntennaEntityService, private globalEventService: GlobalEventService, diff --git a/packages/backend/src/server/api/endpoints/app/create.ts b/packages/backend/src/server/api/endpoints/app/create.ts index 5e7486eaec..c086907618 100644 --- a/packages/backend/src/server/api/endpoints/app/create.ts +++ b/packages/backend/src/server/api/endpoints/app/create.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { AppsRepository } from '@/models/index.js'; +import type { MiAppsRepository } from '@/models/index.js'; import { IdService } from '@/core/IdService.js'; import { unique } from '@/misc/prelude/array.js'; import { secureRndstr } from '@/misc/secure-rndstr.js'; @@ -42,7 +42,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.appsRepository) - private appsRepository: AppsRepository, + private appsRepository: MiAppsRepository, private appEntityService: AppEntityService, private idService: IdService, diff --git a/packages/backend/src/server/api/endpoints/app/show.ts b/packages/backend/src/server/api/endpoints/app/show.ts index 8878dc6412..93c9703990 100644 --- a/packages/backend/src/server/api/endpoints/app/show.ts +++ b/packages/backend/src/server/api/endpoints/app/show.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { AppsRepository } from '@/models/index.js'; +import type { MiAppsRepository } from '@/models/index.js'; import { AppEntityService } from '@/core/entities/AppEntityService.js'; import { DI } from '@/di-symbols.js'; import { ApiError } from '../../error.js'; @@ -41,7 +41,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.appsRepository) - private appsRepository: AppsRepository, + private appsRepository: MiAppsRepository, private appEntityService: AppEntityService, ) { diff --git a/packages/backend/src/server/api/endpoints/auth/accept.ts b/packages/backend/src/server/api/endpoints/auth/accept.ts index 1070384ba3..f5dbe19a0f 100644 --- a/packages/backend/src/server/api/endpoints/auth/accept.ts +++ b/packages/backend/src/server/api/endpoints/auth/accept.ts @@ -6,7 +6,7 @@ import * as crypto from 'node:crypto'; import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { AuthSessionsRepository, AppsRepository, AccessTokensRepository } from '@/models/index.js'; +import type { MiAuthSessionsRepository, MiAppsRepository, MiAccessTokensRepository } from '@/models/index.js'; import { IdService } from '@/core/IdService.js'; import { secureRndstr } from '@/misc/secure-rndstr.js'; import { DI } from '@/di-symbols.js'; @@ -41,13 +41,13 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.appsRepository) - private appsRepository: AppsRepository, + private appsRepository: MiAppsRepository, @Inject(DI.authSessionsRepository) - private authSessionsRepository: AuthSessionsRepository, + private authSessionsRepository: MiAuthSessionsRepository, @Inject(DI.accessTokensRepository) - private accessTokensRepository: AccessTokensRepository, + private accessTokensRepository: MiAccessTokensRepository, private idService: IdService, ) { diff --git a/packages/backend/src/server/api/endpoints/auth/session/generate.ts b/packages/backend/src/server/api/endpoints/auth/session/generate.ts index 60eebecf36..273cee38c0 100644 --- a/packages/backend/src/server/api/endpoints/auth/session/generate.ts +++ b/packages/backend/src/server/api/endpoints/auth/session/generate.ts @@ -6,7 +6,7 @@ import { randomUUID } from 'node:crypto'; import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { AppsRepository, AuthSessionsRepository } from '@/models/index.js'; +import type { MiAppsRepository, MiAuthSessionsRepository } from '@/models/index.js'; import { IdService } from '@/core/IdService.js'; import type { Config } from '@/config.js'; import { DI } from '@/di-symbols.js'; @@ -58,10 +58,10 @@ export default class extends Endpoint { private config: Config, @Inject(DI.appsRepository) - private appsRepository: AppsRepository, + private appsRepository: MiAppsRepository, @Inject(DI.authSessionsRepository) - private authSessionsRepository: AuthSessionsRepository, + private authSessionsRepository: MiAuthSessionsRepository, private idService: IdService, ) { diff --git a/packages/backend/src/server/api/endpoints/auth/session/show.ts b/packages/backend/src/server/api/endpoints/auth/session/show.ts index 173f567225..ee5862b339 100644 --- a/packages/backend/src/server/api/endpoints/auth/session/show.ts +++ b/packages/backend/src/server/api/endpoints/auth/session/show.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { AuthSessionsRepository } from '@/models/index.js'; +import type { MiAuthSessionsRepository } from '@/models/index.js'; import { AuthSessionEntityService } from '@/core/entities/AuthSessionEntityService.js'; import { DI } from '@/di-symbols.js'; import { ApiError } from '../../../error.js'; @@ -58,7 +58,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.authSessionsRepository) - private authSessionsRepository: AuthSessionsRepository, + private authSessionsRepository: MiAuthSessionsRepository, private authSessionEntityService: AuthSessionEntityService, ) { diff --git a/packages/backend/src/server/api/endpoints/auth/session/userkey.ts b/packages/backend/src/server/api/endpoints/auth/session/userkey.ts index 29d82f9a5f..27c1b74454 100644 --- a/packages/backend/src/server/api/endpoints/auth/session/userkey.ts +++ b/packages/backend/src/server/api/endpoints/auth/session/userkey.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { AppsRepository, AccessTokensRepository, AuthSessionsRepository } from '@/models/index.js'; +import type { MiAppsRepository, MiAccessTokensRepository, MiAuthSessionsRepository } from '@/models/index.js'; import { UserEntityService } from '@/core/entities/UserEntityService.js'; import { DI } from '@/di-symbols.js'; import { ApiError } from '../../../error.js'; @@ -67,13 +67,13 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.appsRepository) - private appsRepository: AppsRepository, + private appsRepository: MiAppsRepository, @Inject(DI.authSessionsRepository) - private authSessionsRepository: AuthSessionsRepository, + private authSessionsRepository: MiAuthSessionsRepository, @Inject(DI.accessTokensRepository) - private accessTokensRepository: AccessTokensRepository, + private accessTokensRepository: MiAccessTokensRepository, private userEntityService: UserEntityService, ) { diff --git a/packages/backend/src/server/api/endpoints/blocking/create.ts b/packages/backend/src/server/api/endpoints/blocking/create.ts index f7a3a6b1ba..0fa66f9127 100644 --- a/packages/backend/src/server/api/endpoints/blocking/create.ts +++ b/packages/backend/src/server/api/endpoints/blocking/create.ts @@ -6,7 +6,7 @@ import ms from 'ms'; import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { UsersRepository, BlockingsRepository } from '@/models/index.js'; +import type { MiUsersRepository, MiBlockingsRepository } from '@/models/index.js'; import { UserEntityService } from '@/core/entities/UserEntityService.js'; import { UserBlockingService } from '@/core/UserBlockingService.js'; import { DI } from '@/di-symbols.js'; @@ -65,10 +65,10 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.usersRepository) - private usersRepository: UsersRepository, + private usersRepository: MiUsersRepository, @Inject(DI.blockingsRepository) - private blockingsRepository: BlockingsRepository, + private blockingsRepository: MiBlockingsRepository, private userEntityService: UserEntityService, private getterService: GetterService, diff --git a/packages/backend/src/server/api/endpoints/blocking/delete.ts b/packages/backend/src/server/api/endpoints/blocking/delete.ts index 8ef7dd9c64..37af228c3a 100644 --- a/packages/backend/src/server/api/endpoints/blocking/delete.ts +++ b/packages/backend/src/server/api/endpoints/blocking/delete.ts @@ -6,7 +6,7 @@ import ms from 'ms'; import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { UsersRepository, BlockingsRepository } from '@/models/index.js'; +import type { MiUsersRepository, MiBlockingsRepository } from '@/models/index.js'; import { UserEntityService } from '@/core/entities/UserEntityService.js'; import { UserBlockingService } from '@/core/UserBlockingService.js'; import { DI } from '@/di-symbols.js'; @@ -65,10 +65,10 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.usersRepository) - private usersRepository: UsersRepository, + private usersRepository: MiUsersRepository, @Inject(DI.blockingsRepository) - private blockingsRepository: BlockingsRepository, + private blockingsRepository: MiBlockingsRepository, private userEntityService: UserEntityService, private getterService: GetterService, diff --git a/packages/backend/src/server/api/endpoints/blocking/list.ts b/packages/backend/src/server/api/endpoints/blocking/list.ts index 3d3e786cdb..1e012265a2 100644 --- a/packages/backend/src/server/api/endpoints/blocking/list.ts +++ b/packages/backend/src/server/api/endpoints/blocking/list.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { BlockingsRepository } from '@/models/index.js'; +import type { MiBlockingsRepository } from '@/models/index.js'; import { QueryService } from '@/core/QueryService.js'; import { BlockingEntityService } from '@/core/entities/BlockingEntityService.js'; import { DI } from '@/di-symbols.js'; @@ -43,7 +43,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.blockingsRepository) - private blockingsRepository: BlockingsRepository, + private blockingsRepository: MiBlockingsRepository, private blockingEntityService: BlockingEntityService, private queryService: QueryService, diff --git a/packages/backend/src/server/api/endpoints/channels/create.ts b/packages/backend/src/server/api/endpoints/channels/create.ts index e5a0841a55..4f34478586 100644 --- a/packages/backend/src/server/api/endpoints/channels/create.ts +++ b/packages/backend/src/server/api/endpoints/channels/create.ts @@ -6,7 +6,7 @@ import { Inject, Injectable } from '@nestjs/common'; import ms from 'ms'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { ChannelsRepository, DriveFilesRepository } from '@/models/index.js'; +import type { MiChannelsRepository, MiDriveFilesRepository } from '@/models/index.js'; import type { MiChannel } from '@/models/entities/Channel.js'; import { IdService } from '@/core/IdService.js'; import { ChannelEntityService } from '@/core/entities/ChannelEntityService.js'; @@ -59,10 +59,10 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.driveFilesRepository) - private driveFilesRepository: DriveFilesRepository, + private driveFilesRepository: MiDriveFilesRepository, @Inject(DI.channelsRepository) - private channelsRepository: ChannelsRepository, + private channelsRepository: MiChannelsRepository, private idService: IdService, private channelEntityService: ChannelEntityService, diff --git a/packages/backend/src/server/api/endpoints/channels/favorite.ts b/packages/backend/src/server/api/endpoints/channels/favorite.ts index ef75af4960..92302a8d57 100644 --- a/packages/backend/src/server/api/endpoints/channels/favorite.ts +++ b/packages/backend/src/server/api/endpoints/channels/favorite.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { ChannelFavoritesRepository, ChannelsRepository } from '@/models/index.js'; +import type { MiChannelFavoritesRepository, MiChannelsRepository } from '@/models/index.js'; import { IdService } from '@/core/IdService.js'; import { DI } from '@/di-symbols.js'; import { ApiError } from '../../error.js'; @@ -41,10 +41,10 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.channelsRepository) - private channelsRepository: ChannelsRepository, + private channelsRepository: MiChannelsRepository, @Inject(DI.channelFavoritesRepository) - private channelFavoritesRepository: ChannelFavoritesRepository, + private channelFavoritesRepository: MiChannelFavoritesRepository, private idService: IdService, ) { diff --git a/packages/backend/src/server/api/endpoints/channels/featured.ts b/packages/backend/src/server/api/endpoints/channels/featured.ts index 3e26c1fdbb..7b3d49671b 100644 --- a/packages/backend/src/server/api/endpoints/channels/featured.ts +++ b/packages/backend/src/server/api/endpoints/channels/featured.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { ChannelsRepository } from '@/models/index.js'; +import type { MiChannelsRepository } from '@/models/index.js'; import { ChannelEntityService } from '@/core/entities/ChannelEntityService.js'; import { DI } from '@/di-symbols.js'; @@ -36,7 +36,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.channelsRepository) - private channelsRepository: ChannelsRepository, + private channelsRepository: MiChannelsRepository, private channelEntityService: ChannelEntityService, ) { diff --git a/packages/backend/src/server/api/endpoints/channels/follow.ts b/packages/backend/src/server/api/endpoints/channels/follow.ts index 655ab39285..9a937726b3 100644 --- a/packages/backend/src/server/api/endpoints/channels/follow.ts +++ b/packages/backend/src/server/api/endpoints/channels/follow.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { ChannelFollowingsRepository, ChannelsRepository } from '@/models/index.js'; +import type { MiChannelFollowingsRepository, MiChannelsRepository } from '@/models/index.js'; import { IdService } from '@/core/IdService.js'; import { DI } from '@/di-symbols.js'; import { ApiError } from '../../error.js'; @@ -41,10 +41,10 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.channelsRepository) - private channelsRepository: ChannelsRepository, + private channelsRepository: MiChannelsRepository, @Inject(DI.channelFollowingsRepository) - private channelFollowingsRepository: ChannelFollowingsRepository, + private channelFollowingsRepository: MiChannelFollowingsRepository, private idService: IdService, ) { diff --git a/packages/backend/src/server/api/endpoints/channels/followed.ts b/packages/backend/src/server/api/endpoints/channels/followed.ts index 6e4a13c1db..df7c54292b 100644 --- a/packages/backend/src/server/api/endpoints/channels/followed.ts +++ b/packages/backend/src/server/api/endpoints/channels/followed.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { ChannelFollowingsRepository } from '@/models/index.js'; +import type { MiChannelFollowingsRepository } from '@/models/index.js'; import { QueryService } from '@/core/QueryService.js'; import { ChannelEntityService } from '@/core/entities/ChannelEntityService.js'; import { DI } from '@/di-symbols.js'; @@ -43,7 +43,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.channelFollowingsRepository) - private channelFollowingsRepository: ChannelFollowingsRepository, + private channelFollowingsRepository: MiChannelFollowingsRepository, private channelEntityService: ChannelEntityService, private queryService: QueryService, diff --git a/packages/backend/src/server/api/endpoints/channels/my-favorites.ts b/packages/backend/src/server/api/endpoints/channels/my-favorites.ts index e4999a395f..952f426054 100644 --- a/packages/backend/src/server/api/endpoints/channels/my-favorites.ts +++ b/packages/backend/src/server/api/endpoints/channels/my-favorites.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { ChannelFavoritesRepository } from '@/models/index.js'; +import type { MiChannelFavoritesRepository } from '@/models/index.js'; import { ChannelEntityService } from '@/core/entities/ChannelEntityService.js'; import { DI } from '@/di-symbols.js'; @@ -39,7 +39,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.channelFavoritesRepository) - private channelFavoritesRepository: ChannelFavoritesRepository, + private channelFavoritesRepository: MiChannelFavoritesRepository, private channelEntityService: ChannelEntityService, ) { diff --git a/packages/backend/src/server/api/endpoints/channels/owned.ts b/packages/backend/src/server/api/endpoints/channels/owned.ts index 1b85b41543..eaa2e3c826 100644 --- a/packages/backend/src/server/api/endpoints/channels/owned.ts +++ b/packages/backend/src/server/api/endpoints/channels/owned.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { ChannelsRepository } from '@/models/index.js'; +import type { MiChannelsRepository } from '@/models/index.js'; import { QueryService } from '@/core/QueryService.js'; import { ChannelEntityService } from '@/core/entities/ChannelEntityService.js'; import { DI } from '@/di-symbols.js'; @@ -43,7 +43,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.channelsRepository) - private channelsRepository: ChannelsRepository, + private channelsRepository: MiChannelsRepository, private channelEntityService: ChannelEntityService, private queryService: QueryService, diff --git a/packages/backend/src/server/api/endpoints/channels/search.ts b/packages/backend/src/server/api/endpoints/channels/search.ts index b66245c48e..f4217d7c88 100644 --- a/packages/backend/src/server/api/endpoints/channels/search.ts +++ b/packages/backend/src/server/api/endpoints/channels/search.ts @@ -7,7 +7,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Brackets } from 'typeorm'; import { Endpoint } from '@/server/api/endpoint-base.js'; import { QueryService } from '@/core/QueryService.js'; -import type { ChannelsRepository } from '@/models/index.js'; +import type { MiChannelsRepository } from '@/models/index.js'; import { ChannelEntityService } from '@/core/entities/ChannelEntityService.js'; import { DI } from '@/di-symbols.js'; import { sqlLikeEscape } from '@/misc/sql-like-escape.js'; @@ -45,7 +45,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.channelsRepository) - private channelsRepository: ChannelsRepository, + private channelsRepository: MiChannelsRepository, private channelEntityService: ChannelEntityService, private queryService: QueryService, diff --git a/packages/backend/src/server/api/endpoints/channels/show.ts b/packages/backend/src/server/api/endpoints/channels/show.ts index 1a3d95f7fd..f286b9c3f6 100644 --- a/packages/backend/src/server/api/endpoints/channels/show.ts +++ b/packages/backend/src/server/api/endpoints/channels/show.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { ChannelsRepository } from '@/models/index.js'; +import type { MiChannelsRepository } from '@/models/index.js'; import { ChannelEntityService } from '@/core/entities/ChannelEntityService.js'; import { DI } from '@/di-symbols.js'; import { ApiError } from '../../error.js'; @@ -43,7 +43,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.channelsRepository) - private channelsRepository: ChannelsRepository, + private channelsRepository: MiChannelsRepository, private channelEntityService: ChannelEntityService, ) { diff --git a/packages/backend/src/server/api/endpoints/channels/timeline.ts b/packages/backend/src/server/api/endpoints/channels/timeline.ts index 39420b806c..f13873c54b 100644 --- a/packages/backend/src/server/api/endpoints/channels/timeline.ts +++ b/packages/backend/src/server/api/endpoints/channels/timeline.ts @@ -6,7 +6,7 @@ import { Inject, Injectable } from '@nestjs/common'; import * as Redis from 'ioredis'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { ChannelsRepository, MiNote, NotesRepository } from '@/models/index.js'; +import type { MiChannelsRepository, MiNote, MiNotesRepository } from '@/models/index.js'; import { QueryService } from '@/core/QueryService.js'; import { NoteEntityService } from '@/core/entities/NoteEntityService.js'; import ActiveUsersChart from '@/core/chart/charts/active-users.js'; @@ -59,10 +59,10 @@ export default class extends Endpoint { private redisClient: Redis.Redis, @Inject(DI.notesRepository) - private notesRepository: NotesRepository, + private notesRepository: MiNotesRepository, @Inject(DI.channelsRepository) - private channelsRepository: ChannelsRepository, + private channelsRepository: MiChannelsRepository, private idService: IdService, private noteEntityService: NoteEntityService, diff --git a/packages/backend/src/server/api/endpoints/channels/unfavorite.ts b/packages/backend/src/server/api/endpoints/channels/unfavorite.ts index 7937ef690e..669fffb8de 100644 --- a/packages/backend/src/server/api/endpoints/channels/unfavorite.ts +++ b/packages/backend/src/server/api/endpoints/channels/unfavorite.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { ChannelFavoritesRepository, ChannelsRepository } from '@/models/index.js'; +import type { MiChannelFavoritesRepository, MiChannelsRepository } from '@/models/index.js'; import { DI } from '@/di-symbols.js'; import { ApiError } from '../../error.js'; @@ -40,10 +40,10 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.channelsRepository) - private channelsRepository: ChannelsRepository, + private channelsRepository: MiChannelsRepository, @Inject(DI.channelFavoritesRepository) - private channelFavoritesRepository: ChannelFavoritesRepository, + private channelFavoritesRepository: MiChannelFavoritesRepository, ) { super(meta, paramDef, async (ps, me) => { const channel = await this.channelsRepository.findOneBy({ diff --git a/packages/backend/src/server/api/endpoints/channels/unfollow.ts b/packages/backend/src/server/api/endpoints/channels/unfollow.ts index 1b585d647f..efc933a4e8 100644 --- a/packages/backend/src/server/api/endpoints/channels/unfollow.ts +++ b/packages/backend/src/server/api/endpoints/channels/unfollow.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { ChannelFollowingsRepository, ChannelsRepository } from '@/models/index.js'; +import type { MiChannelFollowingsRepository, MiChannelsRepository } from '@/models/index.js'; import { DI } from '@/di-symbols.js'; import { ApiError } from '../../error.js'; @@ -40,10 +40,10 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.channelsRepository) - private channelsRepository: ChannelsRepository, + private channelsRepository: MiChannelsRepository, @Inject(DI.channelFollowingsRepository) - private channelFollowingsRepository: ChannelFollowingsRepository, + private channelFollowingsRepository: MiChannelFollowingsRepository, ) { super(meta, paramDef, async (ps, me) => { const channel = await this.channelsRepository.findOneBy({ diff --git a/packages/backend/src/server/api/endpoints/channels/update.ts b/packages/backend/src/server/api/endpoints/channels/update.ts index 528e5cb38c..d43741a88f 100644 --- a/packages/backend/src/server/api/endpoints/channels/update.ts +++ b/packages/backend/src/server/api/endpoints/channels/update.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { DriveFilesRepository, ChannelsRepository } from '@/models/index.js'; +import type { MiDriveFilesRepository, MiChannelsRepository } from '@/models/index.js'; import { ChannelEntityService } from '@/core/entities/ChannelEntityService.js'; import { DI } from '@/di-symbols.js'; import { RoleService } from '@/core/RoleService.js'; @@ -70,10 +70,10 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.channelsRepository) - private channelsRepository: ChannelsRepository, + private channelsRepository: MiChannelsRepository, @Inject(DI.driveFilesRepository) - private driveFilesRepository: DriveFilesRepository, + private driveFilesRepository: MiDriveFilesRepository, private channelEntityService: ChannelEntityService, diff --git a/packages/backend/src/server/api/endpoints/clips/add-note.ts b/packages/backend/src/server/api/endpoints/clips/add-note.ts index bf7c5e7543..4d6ac1db47 100644 --- a/packages/backend/src/server/api/endpoints/clips/add-note.ts +++ b/packages/backend/src/server/api/endpoints/clips/add-note.ts @@ -8,7 +8,7 @@ import ms from 'ms'; import { Endpoint } from '@/server/api/endpoint-base.js'; import { IdService } from '@/core/IdService.js'; import { DI } from '@/di-symbols.js'; -import type { ClipNotesRepository, ClipsRepository } from '@/models/index.js'; +import type { MiClipNotesRepository, MiClipsRepository } from '@/models/index.js'; import { GetterService } from '@/server/api/GetterService.js'; import { RoleService } from '@/core/RoleService.js'; import { ApiError } from '../../error.js'; @@ -68,10 +68,10 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.clipsRepository) - private clipsRepository: ClipsRepository, + private clipsRepository: MiClipsRepository, @Inject(DI.clipNotesRepository) - private clipNotesRepository: ClipNotesRepository, + private clipNotesRepository: MiClipNotesRepository, private idService: IdService, private roleService: RoleService, diff --git a/packages/backend/src/server/api/endpoints/clips/create.ts b/packages/backend/src/server/api/endpoints/clips/create.ts index 12e3733e1c..8aec4ddb8b 100644 --- a/packages/backend/src/server/api/endpoints/clips/create.ts +++ b/packages/backend/src/server/api/endpoints/clips/create.ts @@ -6,7 +6,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import { IdService } from '@/core/IdService.js'; -import type { ClipsRepository } from '@/models/index.js'; +import type { MiClipsRepository } from '@/models/index.js'; import { ClipEntityService } from '@/core/entities/ClipEntityService.js'; import { DI } from '@/di-symbols.js'; import { RoleService } from '@/core/RoleService.js'; @@ -51,7 +51,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.clipsRepository) - private clipsRepository: ClipsRepository, + private clipsRepository: MiClipsRepository, private clipEntityService: ClipEntityService, private roleService: RoleService, diff --git a/packages/backend/src/server/api/endpoints/clips/delete.ts b/packages/backend/src/server/api/endpoints/clips/delete.ts index 3f3976d84a..e472106fc5 100644 --- a/packages/backend/src/server/api/endpoints/clips/delete.ts +++ b/packages/backend/src/server/api/endpoints/clips/delete.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { ClipsRepository } from '@/models/index.js'; +import type { MiClipsRepository } from '@/models/index.js'; import { DI } from '@/di-symbols.js'; import { ApiError } from '../../error.js'; @@ -38,7 +38,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.clipsRepository) - private clipsRepository: ClipsRepository, + private clipsRepository: MiClipsRepository, ) { super(meta, paramDef, async (ps, me) => { const clip = await this.clipsRepository.findOneBy({ diff --git a/packages/backend/src/server/api/endpoints/clips/favorite.ts b/packages/backend/src/server/api/endpoints/clips/favorite.ts index 012543e675..34cdaa9d64 100644 --- a/packages/backend/src/server/api/endpoints/clips/favorite.ts +++ b/packages/backend/src/server/api/endpoints/clips/favorite.ts @@ -4,7 +4,7 @@ */ import { Inject, Injectable } from '@nestjs/common'; -import type { ClipsRepository, ClipFavoritesRepository } from '@/models/index.js'; +import type { MiClipsRepository, MiClipFavoritesRepository } from '@/models/index.js'; import { IdService } from '@/core/IdService.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import { DI } from '@/di-symbols.js'; @@ -47,10 +47,10 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.clipsRepository) - private clipsRepository: ClipsRepository, + private clipsRepository: MiClipsRepository, @Inject(DI.clipFavoritesRepository) - private clipFavoritesRepository: ClipFavoritesRepository, + private clipFavoritesRepository: MiClipFavoritesRepository, private idService: IdService, ) { diff --git a/packages/backend/src/server/api/endpoints/clips/list.ts b/packages/backend/src/server/api/endpoints/clips/list.ts index 65289d33e6..70507f903f 100644 --- a/packages/backend/src/server/api/endpoints/clips/list.ts +++ b/packages/backend/src/server/api/endpoints/clips/list.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { ClipsRepository } from '@/models/index.js'; +import type { MiClipsRepository } from '@/models/index.js'; import { ClipEntityService } from '@/core/entities/ClipEntityService.js'; import { DI } from '@/di-symbols.js'; @@ -38,7 +38,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.clipsRepository) - private clipsRepository: ClipsRepository, + private clipsRepository: MiClipsRepository, private clipEntityService: ClipEntityService, ) { diff --git a/packages/backend/src/server/api/endpoints/clips/my-favorites.ts b/packages/backend/src/server/api/endpoints/clips/my-favorites.ts index b5efa56b6a..80d38b1724 100644 --- a/packages/backend/src/server/api/endpoints/clips/my-favorites.ts +++ b/packages/backend/src/server/api/endpoints/clips/my-favorites.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { ClipFavoritesRepository } from '@/models/index.js'; +import type { MiClipFavoritesRepository } from '@/models/index.js'; import { DI } from '@/di-symbols.js'; import { ClipEntityService } from '@/core/entities/ClipEntityService.js'; @@ -39,7 +39,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.clipFavoritesRepository) - private clipFavoritesRepository: ClipFavoritesRepository, + private clipFavoritesRepository: MiClipFavoritesRepository, private clipEntityService: ClipEntityService, ) { diff --git a/packages/backend/src/server/api/endpoints/clips/notes.ts b/packages/backend/src/server/api/endpoints/clips/notes.ts index 0a35691ec0..ddcaff61b2 100644 --- a/packages/backend/src/server/api/endpoints/clips/notes.ts +++ b/packages/backend/src/server/api/endpoints/clips/notes.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { NotesRepository, ClipsRepository, ClipNotesRepository } from '@/models/index.js'; +import type { MiNotesRepository, MiClipsRepository, MiClipNotesRepository } from '@/models/index.js'; import { QueryService } from '@/core/QueryService.js'; import { NoteEntityService } from '@/core/entities/NoteEntityService.js'; import { DI } from '@/di-symbols.js'; @@ -53,13 +53,13 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.clipsRepository) - private clipsRepository: ClipsRepository, + private clipsRepository: MiClipsRepository, @Inject(DI.notesRepository) - private notesRepository: NotesRepository, + private notesRepository: MiNotesRepository, @Inject(DI.clipNotesRepository) - private clipNotesRepository: ClipNotesRepository, + private clipNotesRepository: MiClipNotesRepository, private noteEntityService: NoteEntityService, private queryService: QueryService, diff --git a/packages/backend/src/server/api/endpoints/clips/remove-note.ts b/packages/backend/src/server/api/endpoints/clips/remove-note.ts index 197a90e7f1..05beb0a7e1 100644 --- a/packages/backend/src/server/api/endpoints/clips/remove-note.ts +++ b/packages/backend/src/server/api/endpoints/clips/remove-note.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { ClipNotesRepository, ClipsRepository } from '@/models/index.js'; +import type { MiClipNotesRepository, MiClipsRepository } from '@/models/index.js'; import { DI } from '@/di-symbols.js'; import { GetterService } from '@/server/api/GetterService.js'; import { ApiError } from '../../error.js'; @@ -48,10 +48,10 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.clipsRepository) - private clipsRepository: ClipsRepository, + private clipsRepository: MiClipsRepository, @Inject(DI.clipNotesRepository) - private clipNotesRepository: ClipNotesRepository, + private clipNotesRepository: MiClipNotesRepository, private getterService: GetterService, ) { diff --git a/packages/backend/src/server/api/endpoints/clips/show.ts b/packages/backend/src/server/api/endpoints/clips/show.ts index 0e2485dec6..918e171b32 100644 --- a/packages/backend/src/server/api/endpoints/clips/show.ts +++ b/packages/backend/src/server/api/endpoints/clips/show.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { ClipsRepository } from '@/models/index.js'; +import type { MiClipsRepository } from '@/models/index.js'; import { ClipEntityService } from '@/core/entities/ClipEntityService.js'; import { DI } from '@/di-symbols.js'; import { ApiError } from '../../error.js'; @@ -45,7 +45,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.clipsRepository) - private clipsRepository: ClipsRepository, + private clipsRepository: MiClipsRepository, private clipEntityService: ClipEntityService, ) { diff --git a/packages/backend/src/server/api/endpoints/clips/unfavorite.ts b/packages/backend/src/server/api/endpoints/clips/unfavorite.ts index 47d44da2cb..05787796d9 100644 --- a/packages/backend/src/server/api/endpoints/clips/unfavorite.ts +++ b/packages/backend/src/server/api/endpoints/clips/unfavorite.ts @@ -4,7 +4,7 @@ */ import { Inject, Injectable } from '@nestjs/common'; -import type { ClipsRepository, ClipFavoritesRepository } from '@/models/index.js'; +import type { MiClipsRepository, MiClipFavoritesRepository } from '@/models/index.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import { DI } from '@/di-symbols.js'; import { ApiError } from '../../error.js'; @@ -46,10 +46,10 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.clipsRepository) - private clipsRepository: ClipsRepository, + private clipsRepository: MiClipsRepository, @Inject(DI.clipFavoritesRepository) - private clipFavoritesRepository: ClipFavoritesRepository, + private clipFavoritesRepository: MiClipFavoritesRepository, ) { super(meta, paramDef, async (ps, me) => { const clip = await this.clipsRepository.findOneBy({ id: ps.clipId }); diff --git a/packages/backend/src/server/api/endpoints/clips/update.ts b/packages/backend/src/server/api/endpoints/clips/update.ts index 5a50855542..2dab35e6cc 100644 --- a/packages/backend/src/server/api/endpoints/clips/update.ts +++ b/packages/backend/src/server/api/endpoints/clips/update.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { ClipsRepository } from '@/models/index.js'; +import type { MiClipsRepository } from '@/models/index.js'; import { ClipEntityService } from '@/core/entities/ClipEntityService.js'; import { DI } from '@/di-symbols.js'; import { ApiError } from '../../error.js'; @@ -50,7 +50,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.clipsRepository) - private clipsRepository: ClipsRepository, + private clipsRepository: MiClipsRepository, private clipEntityService: ClipEntityService, ) { diff --git a/packages/backend/src/server/api/endpoints/drive/files.ts b/packages/backend/src/server/api/endpoints/drive/files.ts index 96c51a16ad..215115453c 100644 --- a/packages/backend/src/server/api/endpoints/drive/files.ts +++ b/packages/backend/src/server/api/endpoints/drive/files.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { DriveFilesRepository } from '@/models/index.js'; +import type { MiDriveFilesRepository } from '@/models/index.js'; import { QueryService } from '@/core/QueryService.js'; import { DriveFileEntityService } from '@/core/entities/DriveFileEntityService.js'; import { DI } from '@/di-symbols.js'; @@ -46,7 +46,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.driveFilesRepository) - private driveFilesRepository: DriveFilesRepository, + private driveFilesRepository: MiDriveFilesRepository, private driveFileEntityService: DriveFileEntityService, private queryService: QueryService, diff --git a/packages/backend/src/server/api/endpoints/drive/files/attached-notes.ts b/packages/backend/src/server/api/endpoints/drive/files/attached-notes.ts index 23929bcfa7..6c5d6270c0 100644 --- a/packages/backend/src/server/api/endpoints/drive/files/attached-notes.ts +++ b/packages/backend/src/server/api/endpoints/drive/files/attached-notes.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { NotesRepository, DriveFilesRepository } from '@/models/index.js'; +import type { MiNotesRepository, MiDriveFilesRepository } from '@/models/index.js'; import { NoteEntityService } from '@/core/entities/NoteEntityService.js'; import { DI } from '@/di-symbols.js'; import { ApiError } from '../../../error.js'; @@ -51,10 +51,10 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.driveFilesRepository) - private driveFilesRepository: DriveFilesRepository, + private driveFilesRepository: MiDriveFilesRepository, @Inject(DI.notesRepository) - private notesRepository: NotesRepository, + private notesRepository: MiNotesRepository, private noteEntityService: NoteEntityService, ) { diff --git a/packages/backend/src/server/api/endpoints/drive/files/check-existence.ts b/packages/backend/src/server/api/endpoints/drive/files/check-existence.ts index f780cf90da..16cbcd5ae9 100644 --- a/packages/backend/src/server/api/endpoints/drive/files/check-existence.ts +++ b/packages/backend/src/server/api/endpoints/drive/files/check-existence.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { DriveFilesRepository } from '@/models/index.js'; +import type { MiDriveFilesRepository } from '@/models/index.js'; import { DI } from '@/di-symbols.js'; export const meta = { @@ -36,7 +36,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.driveFilesRepository) - private driveFilesRepository: DriveFilesRepository, + private driveFilesRepository: MiDriveFilesRepository, ) { super(meta, paramDef, async (ps, me) => { const exist = await this.driveFilesRepository.exist({ diff --git a/packages/backend/src/server/api/endpoints/drive/files/delete.ts b/packages/backend/src/server/api/endpoints/drive/files/delete.ts index c04ce8313e..5b7687bd06 100644 --- a/packages/backend/src/server/api/endpoints/drive/files/delete.ts +++ b/packages/backend/src/server/api/endpoints/drive/files/delete.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { DriveFilesRepository } from '@/models/index.js'; +import type { MiDriveFilesRepository } from '@/models/index.js'; import { DriveService } from '@/core/DriveService.js'; import { GlobalEventService } from '@/core/GlobalEventService.js'; import { DI } from '@/di-symbols.js'; @@ -49,7 +49,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.driveFilesRepository) - private driveFilesRepository: DriveFilesRepository, + private driveFilesRepository: MiDriveFilesRepository, private driveService: DriveService, private roleService: RoleService, diff --git a/packages/backend/src/server/api/endpoints/drive/files/find-by-hash.ts b/packages/backend/src/server/api/endpoints/drive/files/find-by-hash.ts index 3217bd4421..ac4a6a8436 100644 --- a/packages/backend/src/server/api/endpoints/drive/files/find-by-hash.ts +++ b/packages/backend/src/server/api/endpoints/drive/files/find-by-hash.ts @@ -4,7 +4,7 @@ */ import { Inject, Injectable } from '@nestjs/common'; -import type { DriveFilesRepository } from '@/models/index.js'; +import type { MiDriveFilesRepository } from '@/models/index.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import { DriveFileEntityService } from '@/core/entities/DriveFileEntityService.js'; import { DI } from '@/di-symbols.js'; @@ -42,7 +42,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.driveFilesRepository) - private driveFilesRepository: DriveFilesRepository, + private driveFilesRepository: MiDriveFilesRepository, private driveFileEntityService: DriveFileEntityService, ) { diff --git a/packages/backend/src/server/api/endpoints/drive/files/find.ts b/packages/backend/src/server/api/endpoints/drive/files/find.ts index ac09d82ee7..5ce360fb3f 100644 --- a/packages/backend/src/server/api/endpoints/drive/files/find.ts +++ b/packages/backend/src/server/api/endpoints/drive/files/find.ts @@ -6,7 +6,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { IsNull } from 'typeorm'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { DriveFilesRepository } from '@/models/index.js'; +import type { MiDriveFilesRepository } from '@/models/index.js'; import { DriveFileEntityService } from '@/core/entities/DriveFileEntityService.js'; import { DI } from '@/di-symbols.js'; @@ -44,7 +44,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.driveFilesRepository) - private driveFilesRepository: DriveFilesRepository, + private driveFilesRepository: MiDriveFilesRepository, private driveFileEntityService: DriveFileEntityService, ) { diff --git a/packages/backend/src/server/api/endpoints/drive/files/show.ts b/packages/backend/src/server/api/endpoints/drive/files/show.ts index e92b7e8522..a39804022f 100644 --- a/packages/backend/src/server/api/endpoints/drive/files/show.ts +++ b/packages/backend/src/server/api/endpoints/drive/files/show.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import type { MiDriveFile } from '@/models/entities/DriveFile.js'; -import type { DriveFilesRepository } from '@/models/index.js'; +import type { MiDriveFilesRepository } from '@/models/index.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import { DriveFileEntityService } from '@/core/entities/DriveFileEntityService.js'; import { DI } from '@/di-symbols.js'; @@ -59,7 +59,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.driveFilesRepository) - private driveFilesRepository: DriveFilesRepository, + private driveFilesRepository: MiDriveFilesRepository, private driveFileEntityService: DriveFileEntityService, private roleService: RoleService, diff --git a/packages/backend/src/server/api/endpoints/drive/files/update.ts b/packages/backend/src/server/api/endpoints/drive/files/update.ts index c6fe654209..b87385df26 100644 --- a/packages/backend/src/server/api/endpoints/drive/files/update.ts +++ b/packages/backend/src/server/api/endpoints/drive/files/update.ts @@ -4,7 +4,7 @@ */ import { Inject, Injectable } from '@nestjs/common'; -import type { DriveFilesRepository, DriveFoldersRepository } from '@/models/index.js'; +import type { MiDriveFilesRepository, MiDriveFoldersRepository } from '@/models/index.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import { DriveFileEntityService } from '@/core/entities/DriveFileEntityService.js'; import { GlobalEventService } from '@/core/GlobalEventService.js'; @@ -76,10 +76,10 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.driveFilesRepository) - private driveFilesRepository: DriveFilesRepository, + private driveFilesRepository: MiDriveFilesRepository, @Inject(DI.driveFoldersRepository) - private driveFoldersRepository: DriveFoldersRepository, + private driveFoldersRepository: MiDriveFoldersRepository, private driveFileEntityService: DriveFileEntityService, private roleService: RoleService, diff --git a/packages/backend/src/server/api/endpoints/drive/folders.ts b/packages/backend/src/server/api/endpoints/drive/folders.ts index a1408fd213..bb9fa3092b 100644 --- a/packages/backend/src/server/api/endpoints/drive/folders.ts +++ b/packages/backend/src/server/api/endpoints/drive/folders.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { DriveFoldersRepository } from '@/models/index.js'; +import type { MiDriveFoldersRepository } from '@/models/index.js'; import { QueryService } from '@/core/QueryService.js'; import { DriveFolderEntityService } from '@/core/entities/DriveFolderEntityService.js'; import { DI } from '@/di-symbols.js'; @@ -44,7 +44,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.driveFoldersRepository) - private driveFoldersRepository: DriveFoldersRepository, + private driveFoldersRepository: MiDriveFoldersRepository, private driveFolderEntityService: DriveFolderEntityService, private queryService: QueryService, diff --git a/packages/backend/src/server/api/endpoints/drive/folders/create.ts b/packages/backend/src/server/api/endpoints/drive/folders/create.ts index 6272fa683e..73baf38cec 100644 --- a/packages/backend/src/server/api/endpoints/drive/folders/create.ts +++ b/packages/backend/src/server/api/endpoints/drive/folders/create.ts @@ -6,7 +6,7 @@ import { Inject, Injectable } from '@nestjs/common'; import ms from 'ms'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { DriveFoldersRepository } from '@/models/index.js'; +import type { MiDriveFoldersRepository } from '@/models/index.js'; import { IdService } from '@/core/IdService.js'; import { DriveFolderEntityService } from '@/core/entities/DriveFolderEntityService.js'; import { GlobalEventService } from '@/core/GlobalEventService.js'; @@ -54,7 +54,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.driveFoldersRepository) - private driveFoldersRepository: DriveFoldersRepository, + private driveFoldersRepository: MiDriveFoldersRepository, private driveFolderEntityService: DriveFolderEntityService, private idService: IdService, diff --git a/packages/backend/src/server/api/endpoints/drive/folders/delete.ts b/packages/backend/src/server/api/endpoints/drive/folders/delete.ts index 50db0c2085..d89bddda1a 100644 --- a/packages/backend/src/server/api/endpoints/drive/folders/delete.ts +++ b/packages/backend/src/server/api/endpoints/drive/folders/delete.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { DriveFoldersRepository, DriveFilesRepository } from '@/models/index.js'; +import type { MiDriveFoldersRepository, MiDriveFilesRepository } from '@/models/index.js'; import { GlobalEventService } from '@/core/GlobalEventService.js'; import { DI } from '@/di-symbols.js'; import { ApiError } from '../../../error.js'; @@ -45,10 +45,10 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.driveFilesRepository) - private driveFilesRepository: DriveFilesRepository, + private driveFilesRepository: MiDriveFilesRepository, @Inject(DI.driveFoldersRepository) - private driveFoldersRepository: DriveFoldersRepository, + private driveFoldersRepository: MiDriveFoldersRepository, private globalEventService: GlobalEventService, ) { diff --git a/packages/backend/src/server/api/endpoints/drive/folders/find.ts b/packages/backend/src/server/api/endpoints/drive/folders/find.ts index b8af55c103..cfe29ffb0d 100644 --- a/packages/backend/src/server/api/endpoints/drive/folders/find.ts +++ b/packages/backend/src/server/api/endpoints/drive/folders/find.ts @@ -6,7 +6,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { IsNull } from 'typeorm'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { DriveFoldersRepository } from '@/models/index.js'; +import type { MiDriveFoldersRepository } from '@/models/index.js'; import { DriveFolderEntityService } from '@/core/entities/DriveFolderEntityService.js'; import { DI } from '@/di-symbols.js'; @@ -42,7 +42,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.driveFoldersRepository) - private driveFoldersRepository: DriveFoldersRepository, + private driveFoldersRepository: MiDriveFoldersRepository, private driveFolderEntityService: DriveFolderEntityService, ) { diff --git a/packages/backend/src/server/api/endpoints/drive/folders/show.ts b/packages/backend/src/server/api/endpoints/drive/folders/show.ts index 041ed371a8..431591b75a 100644 --- a/packages/backend/src/server/api/endpoints/drive/folders/show.ts +++ b/packages/backend/src/server/api/endpoints/drive/folders/show.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { DriveFoldersRepository } from '@/models/index.js'; +import type { MiDriveFoldersRepository } from '@/models/index.js'; import { DriveFolderEntityService } from '@/core/entities/DriveFolderEntityService.js'; import { DI } from '@/di-symbols.js'; import { ApiError } from '../../../error.js'; @@ -45,7 +45,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.driveFoldersRepository) - private driveFoldersRepository: DriveFoldersRepository, + private driveFoldersRepository: MiDriveFoldersRepository, private driveFolderEntityService: DriveFolderEntityService, ) { diff --git a/packages/backend/src/server/api/endpoints/drive/folders/update.ts b/packages/backend/src/server/api/endpoints/drive/folders/update.ts index c6f115b358..285e8b642f 100644 --- a/packages/backend/src/server/api/endpoints/drive/folders/update.ts +++ b/packages/backend/src/server/api/endpoints/drive/folders/update.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { DriveFoldersRepository } from '@/models/index.js'; +import type { MiDriveFoldersRepository } from '@/models/index.js'; import { DriveFolderEntityService } from '@/core/entities/DriveFolderEntityService.js'; import { GlobalEventService } from '@/core/GlobalEventService.js'; import { DI } from '@/di-symbols.js'; @@ -60,7 +60,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.driveFoldersRepository) - private driveFoldersRepository: DriveFoldersRepository, + private driveFoldersRepository: MiDriveFoldersRepository, private driveFolderEntityService: DriveFolderEntityService, private globalEventService: GlobalEventService, diff --git a/packages/backend/src/server/api/endpoints/drive/stream.ts b/packages/backend/src/server/api/endpoints/drive/stream.ts index 1311939e16..6a0950c776 100644 --- a/packages/backend/src/server/api/endpoints/drive/stream.ts +++ b/packages/backend/src/server/api/endpoints/drive/stream.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { DriveFilesRepository } from '@/models/index.js'; +import type { MiDriveFilesRepository } from '@/models/index.js'; import { QueryService } from '@/core/QueryService.js'; import { DriveFileEntityService } from '@/core/entities/DriveFileEntityService.js'; import { DI } from '@/di-symbols.js'; @@ -44,7 +44,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.driveFilesRepository) - private driveFilesRepository: DriveFilesRepository, + private driveFilesRepository: MiDriveFilesRepository, private driveFileEntityService: DriveFileEntityService, private queryService: QueryService, diff --git a/packages/backend/src/server/api/endpoints/emoji.ts b/packages/backend/src/server/api/endpoints/emoji.ts index 0ab9e9b004..4533a3a15b 100644 --- a/packages/backend/src/server/api/endpoints/emoji.ts +++ b/packages/backend/src/server/api/endpoints/emoji.ts @@ -5,7 +5,7 @@ import { IsNull } from 'typeorm'; import { Inject, Injectable } from '@nestjs/common'; -import type { EmojisRepository } from '@/models/index.js'; +import type { MiEmojisRepository } from '@/models/index.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import { EmojiEntityService } from '@/core/entities/EmojiEntityService.js'; import { DI } from '@/di-symbols.js'; @@ -39,7 +39,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.emojisRepository) - private emojisRepository: EmojisRepository, + private emojisRepository: MiEmojisRepository, private emojiEntityService: EmojiEntityService, ) { diff --git a/packages/backend/src/server/api/endpoints/emojis.ts b/packages/backend/src/server/api/endpoints/emojis.ts index 7cd3eba518..1ebde241c0 100644 --- a/packages/backend/src/server/api/endpoints/emojis.ts +++ b/packages/backend/src/server/api/endpoints/emojis.ts @@ -5,7 +5,7 @@ import { IsNull } from 'typeorm'; import { Inject, Injectable } from '@nestjs/common'; -import type { EmojisRepository } from '@/models/index.js'; +import type { MiEmojisRepository } from '@/models/index.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import { EmojiEntityService } from '@/core/entities/EmojiEntityService.js'; import { DI } from '@/di-symbols.js'; @@ -46,7 +46,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.emojisRepository) - private emojisRepository: EmojisRepository, + private emojisRepository: MiEmojisRepository, private emojiEntityService: EmojiEntityService, ) { diff --git a/packages/backend/src/server/api/endpoints/federation/followers.ts b/packages/backend/src/server/api/endpoints/federation/followers.ts index 9b18f9deb4..52affe57bb 100644 --- a/packages/backend/src/server/api/endpoints/federation/followers.ts +++ b/packages/backend/src/server/api/endpoints/federation/followers.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { FollowingsRepository } from '@/models/index.js'; +import type { MiFollowingsRepository } from '@/models/index.js'; import { QueryService } from '@/core/QueryService.js'; import { FollowingEntityService } from '@/core/entities/FollowingEntityService.js'; import { DI } from '@/di-symbols.js'; @@ -42,7 +42,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.followingsRepository) - private followingsRepository: FollowingsRepository, + private followingsRepository: MiFollowingsRepository, private followingEntityService: FollowingEntityService, private queryService: QueryService, diff --git a/packages/backend/src/server/api/endpoints/federation/following.ts b/packages/backend/src/server/api/endpoints/federation/following.ts index 6e526996be..0b1c21f056 100644 --- a/packages/backend/src/server/api/endpoints/federation/following.ts +++ b/packages/backend/src/server/api/endpoints/federation/following.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { FollowingsRepository } from '@/models/index.js'; +import type { MiFollowingsRepository } from '@/models/index.js'; import { QueryService } from '@/core/QueryService.js'; import { FollowingEntityService } from '@/core/entities/FollowingEntityService.js'; import { DI } from '@/di-symbols.js'; @@ -42,7 +42,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.followingsRepository) - private followingsRepository: FollowingsRepository, + private followingsRepository: MiFollowingsRepository, private followingEntityService: FollowingEntityService, private queryService: QueryService, diff --git a/packages/backend/src/server/api/endpoints/federation/instances.ts b/packages/backend/src/server/api/endpoints/federation/instances.ts index 96063403b2..d507e08f4d 100644 --- a/packages/backend/src/server/api/endpoints/federation/instances.ts +++ b/packages/backend/src/server/api/endpoints/federation/instances.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { InstancesRepository } from '@/models/index.js'; +import type { MiInstancesRepository } from '@/models/index.js'; import { InstanceEntityService } from '@/core/entities/InstanceEntityService.js'; import { MetaService } from '@/core/MetaService.js'; import { DI } from '@/di-symbols.js'; @@ -51,7 +51,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.instancesRepository) - private instancesRepository: InstancesRepository, + private instancesRepository: MiInstancesRepository, private instanceEntityService: InstanceEntityService, private metaService: MetaService, diff --git a/packages/backend/src/server/api/endpoints/federation/show-instance.ts b/packages/backend/src/server/api/endpoints/federation/show-instance.ts index d76303ed45..55759712e7 100644 --- a/packages/backend/src/server/api/endpoints/federation/show-instance.ts +++ b/packages/backend/src/server/api/endpoints/federation/show-instance.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { InstancesRepository } from '@/models/index.js'; +import type { MiInstancesRepository } from '@/models/index.js'; import { InstanceEntityService } from '@/core/entities/InstanceEntityService.js'; import { UtilityService } from '@/core/UtilityService.js'; import { DI } from '@/di-symbols.js'; @@ -38,7 +38,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.instancesRepository) - private instancesRepository: InstancesRepository, + private instancesRepository: MiInstancesRepository, private utilityService: UtilityService, private instanceEntityService: InstanceEntityService, diff --git a/packages/backend/src/server/api/endpoints/federation/stats.ts b/packages/backend/src/server/api/endpoints/federation/stats.ts index 048a7ff4e3..7416190d58 100644 --- a/packages/backend/src/server/api/endpoints/federation/stats.ts +++ b/packages/backend/src/server/api/endpoints/federation/stats.ts @@ -5,7 +5,7 @@ import { IsNull, MoreThan, Not } from 'typeorm'; import { Inject, Injectable } from '@nestjs/common'; -import type { FollowingsRepository, InstancesRepository } from '@/models/index.js'; +import type { MiFollowingsRepository, MiInstancesRepository } from '@/models/index.js'; import { awaitAll } from '@/misc/prelude/await-all.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import { InstanceEntityService } from '@/core/entities/InstanceEntityService.js'; @@ -33,10 +33,10 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.instancesRepository) - private instancesRepository: InstancesRepository, + private instancesRepository: MiInstancesRepository, @Inject(DI.followingsRepository) - private followingsRepository: FollowingsRepository, + private followingsRepository: MiFollowingsRepository, private instanceEntityService: InstanceEntityService, ) { diff --git a/packages/backend/src/server/api/endpoints/federation/users.ts b/packages/backend/src/server/api/endpoints/federation/users.ts index f284b2175c..b2391521a5 100644 --- a/packages/backend/src/server/api/endpoints/federation/users.ts +++ b/packages/backend/src/server/api/endpoints/federation/users.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { UsersRepository } from '@/models/index.js'; +import type { MiUsersRepository } from '@/models/index.js'; import { QueryService } from '@/core/QueryService.js'; import { UserEntityService } from '@/core/entities/UserEntityService.js'; import { DI } from '@/di-symbols.js'; @@ -42,7 +42,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.usersRepository) - private usersRepository: UsersRepository, + private usersRepository: MiUsersRepository, private userEntityService: UserEntityService, private queryService: QueryService, diff --git a/packages/backend/src/server/api/endpoints/flash/create.ts b/packages/backend/src/server/api/endpoints/flash/create.ts index 4a91ee2495..48354c1be3 100644 --- a/packages/backend/src/server/api/endpoints/flash/create.ts +++ b/packages/backend/src/server/api/endpoints/flash/create.ts @@ -5,7 +5,7 @@ import ms from 'ms'; import { Inject, Injectable } from '@nestjs/common'; -import type { FlashsRepository } from '@/models/index.js'; +import type { MiFlashsRepository } from '@/models/index.js'; import { IdService } from '@/core/IdService.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import { DI } from '@/di-symbols.js'; @@ -47,7 +47,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.flashsRepository) - private flashsRepository: FlashsRepository, + private flashsRepository: MiFlashsRepository, private flashEntityService: FlashEntityService, private idService: IdService, diff --git a/packages/backend/src/server/api/endpoints/flash/delete.ts b/packages/backend/src/server/api/endpoints/flash/delete.ts index b71754000a..f25d72d086 100644 --- a/packages/backend/src/server/api/endpoints/flash/delete.ts +++ b/packages/backend/src/server/api/endpoints/flash/delete.ts @@ -4,7 +4,7 @@ */ import { Inject, Injectable } from '@nestjs/common'; -import type { FlashsRepository } from '@/models/index.js'; +import type { MiFlashsRepository } from '@/models/index.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import { DI } from '@/di-symbols.js'; import { ApiError } from '../../error.js'; @@ -44,7 +44,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.flashsRepository) - private flashsRepository: FlashsRepository, + private flashsRepository: MiFlashsRepository, ) { super(meta, paramDef, async (ps, me) => { const flash = await this.flashsRepository.findOneBy({ id: ps.flashId }); diff --git a/packages/backend/src/server/api/endpoints/flash/featured.ts b/packages/backend/src/server/api/endpoints/flash/featured.ts index a8f81fb380..c49f722653 100644 --- a/packages/backend/src/server/api/endpoints/flash/featured.ts +++ b/packages/backend/src/server/api/endpoints/flash/featured.ts @@ -4,7 +4,7 @@ */ import { Inject, Injectable } from '@nestjs/common'; -import type { FlashsRepository } from '@/models/index.js'; +import type { MiFlashsRepository } from '@/models/index.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import { FlashEntityService } from '@/core/entities/FlashEntityService.js'; import { DI } from '@/di-symbols.js'; @@ -36,7 +36,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.flashsRepository) - private flashsRepository: FlashsRepository, + private flashsRepository: MiFlashsRepository, private flashEntityService: FlashEntityService, ) { diff --git a/packages/backend/src/server/api/endpoints/flash/like.ts b/packages/backend/src/server/api/endpoints/flash/like.ts index 2a170bf1fb..810964006b 100644 --- a/packages/backend/src/server/api/endpoints/flash/like.ts +++ b/packages/backend/src/server/api/endpoints/flash/like.ts @@ -4,7 +4,7 @@ */ import { Inject, Injectable } from '@nestjs/common'; -import type { FlashsRepository, FlashLikesRepository } from '@/models/index.js'; +import type { MiFlashsRepository, MiFlashLikesRepository } from '@/models/index.js'; import { IdService } from '@/core/IdService.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import { DI } from '@/di-symbols.js'; @@ -53,10 +53,10 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.flashsRepository) - private flashsRepository: FlashsRepository, + private flashsRepository: MiFlashsRepository, @Inject(DI.flashLikesRepository) - private flashLikesRepository: FlashLikesRepository, + private flashLikesRepository: MiFlashLikesRepository, private idService: IdService, ) { diff --git a/packages/backend/src/server/api/endpoints/flash/my-likes.ts b/packages/backend/src/server/api/endpoints/flash/my-likes.ts index ed1ee0ffde..d07fe0c39f 100644 --- a/packages/backend/src/server/api/endpoints/flash/my-likes.ts +++ b/packages/backend/src/server/api/endpoints/flash/my-likes.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { FlashLikesRepository } from '@/models/index.js'; +import type { MiFlashLikesRepository } from '@/models/index.js'; import { QueryService } from '@/core/QueryService.js'; import { FlashLikeEntityService } from '@/core/entities/FlashLikeEntityService.js'; import { DI } from '@/di-symbols.js'; @@ -53,7 +53,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.flashLikesRepository) - private flashLikesRepository: FlashLikesRepository, + private flashLikesRepository: MiFlashLikesRepository, private flashLikeEntityService: FlashLikeEntityService, private queryService: QueryService, diff --git a/packages/backend/src/server/api/endpoints/flash/my.ts b/packages/backend/src/server/api/endpoints/flash/my.ts index 2417b448aa..f54dbf8c76 100644 --- a/packages/backend/src/server/api/endpoints/flash/my.ts +++ b/packages/backend/src/server/api/endpoints/flash/my.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { FlashsRepository } from '@/models/index.js'; +import type { MiFlashsRepository } from '@/models/index.js'; import { QueryService } from '@/core/QueryService.js'; import { FlashEntityService } from '@/core/entities/FlashEntityService.js'; import { DI } from '@/di-symbols.js'; @@ -43,7 +43,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.flashsRepository) - private flashsRepository: FlashsRepository, + private flashsRepository: MiFlashsRepository, private flashEntityService: FlashEntityService, private queryService: QueryService, diff --git a/packages/backend/src/server/api/endpoints/flash/show.ts b/packages/backend/src/server/api/endpoints/flash/show.ts index 0e6a561df7..f92955d2d9 100644 --- a/packages/backend/src/server/api/endpoints/flash/show.ts +++ b/packages/backend/src/server/api/endpoints/flash/show.ts @@ -4,7 +4,7 @@ */ import { Inject, Injectable } from '@nestjs/common'; -import type { FlashsRepository } from '@/models/index.js'; +import type { MiFlashsRepository } from '@/models/index.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import { FlashEntityService } from '@/core/entities/FlashEntityService.js'; import { DI } from '@/di-symbols.js'; @@ -43,7 +43,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.flashsRepository) - private flashsRepository: FlashsRepository, + private flashsRepository: MiFlashsRepository, private flashEntityService: FlashEntityService, ) { diff --git a/packages/backend/src/server/api/endpoints/flash/unlike.ts b/packages/backend/src/server/api/endpoints/flash/unlike.ts index f6fcdfdf93..e390be9615 100644 --- a/packages/backend/src/server/api/endpoints/flash/unlike.ts +++ b/packages/backend/src/server/api/endpoints/flash/unlike.ts @@ -4,7 +4,7 @@ */ import { Inject, Injectable } from '@nestjs/common'; -import type { FlashsRepository, FlashLikesRepository } from '@/models/index.js'; +import type { MiFlashsRepository, MiFlashLikesRepository } from '@/models/index.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import { DI } from '@/di-symbols.js'; import { ApiError } from '../../error.js'; @@ -46,10 +46,10 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.flashsRepository) - private flashsRepository: FlashsRepository, + private flashsRepository: MiFlashsRepository, @Inject(DI.flashLikesRepository) - private flashLikesRepository: FlashLikesRepository, + private flashLikesRepository: MiFlashLikesRepository, ) { super(meta, paramDef, async (ps, me) => { const flash = await this.flashsRepository.findOneBy({ id: ps.flashId }); diff --git a/packages/backend/src/server/api/endpoints/flash/update.ts b/packages/backend/src/server/api/endpoints/flash/update.ts index 90cf302ee0..3f681c4fb2 100644 --- a/packages/backend/src/server/api/endpoints/flash/update.ts +++ b/packages/backend/src/server/api/endpoints/flash/update.ts @@ -5,7 +5,7 @@ import ms from 'ms'; import { Inject, Injectable } from '@nestjs/common'; -import type { FlashsRepository } from '@/models/index.js'; +import type { MiFlashsRepository } from '@/models/index.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import { DI } from '@/di-symbols.js'; import { ApiError } from '../../error.js'; @@ -58,7 +58,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.flashsRepository) - private flashsRepository: FlashsRepository, + private flashsRepository: MiFlashsRepository, ) { super(meta, paramDef, async (ps, me) => { const flash = await this.flashsRepository.findOneBy({ id: ps.flashId }); diff --git a/packages/backend/src/server/api/endpoints/following/create.ts b/packages/backend/src/server/api/endpoints/following/create.ts index 36b4e9fae4..b6c81760a4 100644 --- a/packages/backend/src/server/api/endpoints/following/create.ts +++ b/packages/backend/src/server/api/endpoints/following/create.ts @@ -6,7 +6,7 @@ import ms from 'ms'; import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { FollowingsRepository } from '@/models/index.js'; +import type { MiFollowingsRepository } from '@/models/index.js'; import { IdentifiableError } from '@/misc/identifiable-error.js'; import { UserEntityService } from '@/core/entities/UserEntityService.js'; import { UserFollowingService } from '@/core/UserFollowingService.js'; @@ -80,7 +80,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.followingsRepository) - private followingsRepository: FollowingsRepository, + private followingsRepository: MiFollowingsRepository, private userEntityService: UserEntityService, private getterService: GetterService, diff --git a/packages/backend/src/server/api/endpoints/following/delete.ts b/packages/backend/src/server/api/endpoints/following/delete.ts index 1d7e47a9ab..f1818f723a 100644 --- a/packages/backend/src/server/api/endpoints/following/delete.ts +++ b/packages/backend/src/server/api/endpoints/following/delete.ts @@ -6,7 +6,7 @@ import ms from 'ms'; import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { FollowingsRepository } from '@/models/index.js'; +import type { MiFollowingsRepository } from '@/models/index.js'; import { UserEntityService } from '@/core/entities/UserEntityService.js'; import { UserFollowingService } from '@/core/UserFollowingService.js'; import { DI } from '@/di-symbols.js'; @@ -65,7 +65,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.followingsRepository) - private followingsRepository: FollowingsRepository, + private followingsRepository: MiFollowingsRepository, private userEntityService: UserEntityService, private getterService: GetterService, diff --git a/packages/backend/src/server/api/endpoints/following/invalidate.ts b/packages/backend/src/server/api/endpoints/following/invalidate.ts index 1f4be3d518..b545764b02 100644 --- a/packages/backend/src/server/api/endpoints/following/invalidate.ts +++ b/packages/backend/src/server/api/endpoints/following/invalidate.ts @@ -6,7 +6,7 @@ import ms from 'ms'; import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { FollowingsRepository } from '@/models/index.js'; +import type { MiFollowingsRepository } from '@/models/index.js'; import { UserEntityService } from '@/core/entities/UserEntityService.js'; import { UserFollowingService } from '@/core/UserFollowingService.js'; import { DI } from '@/di-symbols.js'; @@ -65,7 +65,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.followingsRepository) - private followingsRepository: FollowingsRepository, + private followingsRepository: MiFollowingsRepository, private userEntityService: UserEntityService, private getterService: GetterService, diff --git a/packages/backend/src/server/api/endpoints/following/requests/list.ts b/packages/backend/src/server/api/endpoints/following/requests/list.ts index 26c068c646..778c411af3 100644 --- a/packages/backend/src/server/api/endpoints/following/requests/list.ts +++ b/packages/backend/src/server/api/endpoints/following/requests/list.ts @@ -6,7 +6,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import { QueryService } from '@/core/QueryService.js'; -import type { FollowRequestsRepository } from '@/models/index.js'; +import type { MiFollowRequestsRepository } from '@/models/index.js'; import { FollowRequestEntityService } from '@/core/entities/FollowRequestEntityService.js'; import { DI } from '@/di-symbols.js'; @@ -59,7 +59,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.followRequestsRepository) - private followRequestsRepository: FollowRequestsRepository, + private followRequestsRepository: MiFollowRequestsRepository, private followRequestEntityService: FollowRequestEntityService, private queryService: QueryService, diff --git a/packages/backend/src/server/api/endpoints/gallery/featured.ts b/packages/backend/src/server/api/endpoints/gallery/featured.ts index 80cad0e5b0..c339d84cc9 100644 --- a/packages/backend/src/server/api/endpoints/gallery/featured.ts +++ b/packages/backend/src/server/api/endpoints/gallery/featured.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { GalleryPostsRepository } from '@/models/index.js'; +import type { MiGalleryPostsRepository } from '@/models/index.js'; import { GalleryPostEntityService } from '@/core/entities/GalleryPostEntityService.js'; import { DI } from '@/di-symbols.js'; @@ -36,7 +36,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.galleryPostsRepository) - private galleryPostsRepository: GalleryPostsRepository, + private galleryPostsRepository: MiGalleryPostsRepository, private galleryPostEntityService: GalleryPostEntityService, ) { diff --git a/packages/backend/src/server/api/endpoints/gallery/popular.ts b/packages/backend/src/server/api/endpoints/gallery/popular.ts index ef1d54f82c..510af3cb24 100644 --- a/packages/backend/src/server/api/endpoints/gallery/popular.ts +++ b/packages/backend/src/server/api/endpoints/gallery/popular.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { GalleryPostsRepository } from '@/models/index.js'; +import type { MiGalleryPostsRepository } from '@/models/index.js'; import { GalleryPostEntityService } from '@/core/entities/GalleryPostEntityService.js'; import { DI } from '@/di-symbols.js'; @@ -36,7 +36,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.galleryPostsRepository) - private galleryPostsRepository: GalleryPostsRepository, + private galleryPostsRepository: MiGalleryPostsRepository, private galleryPostEntityService: GalleryPostEntityService, ) { diff --git a/packages/backend/src/server/api/endpoints/gallery/posts.ts b/packages/backend/src/server/api/endpoints/gallery/posts.ts index 42f35f418a..480f919193 100644 --- a/packages/backend/src/server/api/endpoints/gallery/posts.ts +++ b/packages/backend/src/server/api/endpoints/gallery/posts.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { GalleryPostsRepository } from '@/models/index.js'; +import type { MiGalleryPostsRepository } from '@/models/index.js'; import { QueryService } from '@/core/QueryService.js'; import { GalleryPostEntityService } from '@/core/entities/GalleryPostEntityService.js'; import { DI } from '@/di-symbols.js'; @@ -39,7 +39,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.galleryPostsRepository) - private galleryPostsRepository: GalleryPostsRepository, + private galleryPostsRepository: MiGalleryPostsRepository, private galleryPostEntityService: GalleryPostEntityService, private queryService: QueryService, diff --git a/packages/backend/src/server/api/endpoints/gallery/posts/create.ts b/packages/backend/src/server/api/endpoints/gallery/posts/create.ts index 6abcdffe7c..441a2df696 100644 --- a/packages/backend/src/server/api/endpoints/gallery/posts/create.ts +++ b/packages/backend/src/server/api/endpoints/gallery/posts/create.ts @@ -6,7 +6,7 @@ import ms from 'ms'; import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { DriveFilesRepository, GalleryPostsRepository } from '@/models/index.js'; +import type { MiDriveFilesRepository, MiGalleryPostsRepository } from '@/models/index.js'; import { MiGalleryPost } from '@/models/entities/GalleryPost.js'; import type { MiDriveFile } from '@/models/entities/DriveFile.js'; import { IdService } from '@/core/IdService.js'; @@ -56,10 +56,10 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.galleryPostsRepository) - private galleryPostsRepository: GalleryPostsRepository, + private galleryPostsRepository: MiGalleryPostsRepository, @Inject(DI.driveFilesRepository) - private driveFilesRepository: DriveFilesRepository, + private driveFilesRepository: MiDriveFilesRepository, private galleryPostEntityService: GalleryPostEntityService, private idService: IdService, diff --git a/packages/backend/src/server/api/endpoints/gallery/posts/delete.ts b/packages/backend/src/server/api/endpoints/gallery/posts/delete.ts index 81ed24df15..cf67e6c3bb 100644 --- a/packages/backend/src/server/api/endpoints/gallery/posts/delete.ts +++ b/packages/backend/src/server/api/endpoints/gallery/posts/delete.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { GalleryPostsRepository } from '@/models/index.js'; +import type { MiGalleryPostsRepository } from '@/models/index.js'; import { DI } from '@/di-symbols.js'; import { ApiError } from '../../../error.js'; @@ -38,7 +38,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.galleryPostsRepository) - private galleryPostsRepository: GalleryPostsRepository, + private galleryPostsRepository: MiGalleryPostsRepository, ) { super(meta, paramDef, async (ps, me) => { const post = await this.galleryPostsRepository.findOneBy({ diff --git a/packages/backend/src/server/api/endpoints/gallery/posts/like.ts b/packages/backend/src/server/api/endpoints/gallery/posts/like.ts index f12456fbdb..2a52e6e970 100644 --- a/packages/backend/src/server/api/endpoints/gallery/posts/like.ts +++ b/packages/backend/src/server/api/endpoints/gallery/posts/like.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { GalleryLikesRepository, GalleryPostsRepository } from '@/models/index.js'; +import type { MiGalleryLikesRepository, MiGalleryPostsRepository } from '@/models/index.js'; import { IdService } from '@/core/IdService.js'; import { DI } from '@/di-symbols.js'; import { ApiError } from '../../../error.js'; @@ -53,10 +53,10 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.galleryPostsRepository) - private galleryPostsRepository: GalleryPostsRepository, + private galleryPostsRepository: MiGalleryPostsRepository, @Inject(DI.galleryLikesRepository) - private galleryLikesRepository: GalleryLikesRepository, + private galleryLikesRepository: MiGalleryLikesRepository, private idService: IdService, ) { diff --git a/packages/backend/src/server/api/endpoints/gallery/posts/show.ts b/packages/backend/src/server/api/endpoints/gallery/posts/show.ts index a76e52bd89..396538eab5 100644 --- a/packages/backend/src/server/api/endpoints/gallery/posts/show.ts +++ b/packages/backend/src/server/api/endpoints/gallery/posts/show.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { GalleryPostsRepository } from '@/models/index.js'; +import type { MiGalleryPostsRepository } from '@/models/index.js'; import { GalleryPostEntityService } from '@/core/entities/GalleryPostEntityService.js'; import { DI } from '@/di-symbols.js'; import { ApiError } from '../../../error.js'; @@ -43,7 +43,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.galleryPostsRepository) - private galleryPostsRepository: GalleryPostsRepository, + private galleryPostsRepository: MiGalleryPostsRepository, private galleryPostEntityService: GalleryPostEntityService, ) { diff --git a/packages/backend/src/server/api/endpoints/gallery/posts/unlike.ts b/packages/backend/src/server/api/endpoints/gallery/posts/unlike.ts index 339452cdef..80205dd8dd 100644 --- a/packages/backend/src/server/api/endpoints/gallery/posts/unlike.ts +++ b/packages/backend/src/server/api/endpoints/gallery/posts/unlike.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { GalleryPostsRepository, GalleryLikesRepository } from '@/models/index.js'; +import type { MiGalleryPostsRepository, MiGalleryLikesRepository } from '@/models/index.js'; import { DI } from '@/di-symbols.js'; import { ApiError } from '../../../error.js'; @@ -46,10 +46,10 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.galleryPostsRepository) - private galleryPostsRepository: GalleryPostsRepository, + private galleryPostsRepository: MiGalleryPostsRepository, @Inject(DI.galleryLikesRepository) - private galleryLikesRepository: GalleryLikesRepository, + private galleryLikesRepository: MiGalleryLikesRepository, ) { super(meta, paramDef, async (ps, me) => { const post = await this.galleryPostsRepository.findOneBy({ id: ps.postId }); diff --git a/packages/backend/src/server/api/endpoints/gallery/posts/update.ts b/packages/backend/src/server/api/endpoints/gallery/posts/update.ts index 25d93962ce..9412606897 100644 --- a/packages/backend/src/server/api/endpoints/gallery/posts/update.ts +++ b/packages/backend/src/server/api/endpoints/gallery/posts/update.ts @@ -6,7 +6,7 @@ import ms from 'ms'; import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { DriveFilesRepository, GalleryPostsRepository } from '@/models/index.js'; +import type { MiDriveFilesRepository, MiGalleryPostsRepository } from '@/models/index.js'; import type { MiDriveFile } from '@/models/entities/DriveFile.js'; import { GalleryPostEntityService } from '@/core/entities/GalleryPostEntityService.js'; import { DI } from '@/di-symbols.js'; @@ -55,10 +55,10 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.galleryPostsRepository) - private galleryPostsRepository: GalleryPostsRepository, + private galleryPostsRepository: MiGalleryPostsRepository, @Inject(DI.driveFilesRepository) - private driveFilesRepository: DriveFilesRepository, + private driveFilesRepository: MiDriveFilesRepository, private galleryPostEntityService: GalleryPostEntityService, ) { diff --git a/packages/backend/src/server/api/endpoints/get-online-users-count.ts b/packages/backend/src/server/api/endpoints/get-online-users-count.ts index 3c265185a9..23d4aa2459 100644 --- a/packages/backend/src/server/api/endpoints/get-online-users-count.ts +++ b/packages/backend/src/server/api/endpoints/get-online-users-count.ts @@ -6,7 +6,7 @@ import { MoreThan } from 'typeorm'; import { Inject, Injectable } from '@nestjs/common'; import { USER_ONLINE_THRESHOLD } from '@/const.js'; -import type { UsersRepository } from '@/models/index.js'; +import type { MiUsersRepository } from '@/models/index.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import { DI } from '@/di-symbols.js'; @@ -29,7 +29,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.usersRepository) - private usersRepository: UsersRepository, + private usersRepository: MiUsersRepository, ) { super(meta, paramDef, async () => { const count = await this.usersRepository.countBy({ diff --git a/packages/backend/src/server/api/endpoints/hashtags/list.ts b/packages/backend/src/server/api/endpoints/hashtags/list.ts index 71400f4a23..6b40d22fda 100644 --- a/packages/backend/src/server/api/endpoints/hashtags/list.ts +++ b/packages/backend/src/server/api/endpoints/hashtags/list.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { HashtagsRepository } from '@/models/index.js'; +import type { MiHashtagsRepository } from '@/models/index.js'; import { HashtagEntityService } from '@/core/entities/HashtagEntityService.js'; import { DI } from '@/di-symbols.js'; @@ -42,7 +42,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.hashtagsRepository) - private hashtagsRepository: HashtagsRepository, + private hashtagsRepository: MiHashtagsRepository, private hashtagEntityService: HashtagEntityService, ) { diff --git a/packages/backend/src/server/api/endpoints/hashtags/search.ts b/packages/backend/src/server/api/endpoints/hashtags/search.ts index e9508afd32..6d3e2f5243 100644 --- a/packages/backend/src/server/api/endpoints/hashtags/search.ts +++ b/packages/backend/src/server/api/endpoints/hashtags/search.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { HashtagsRepository } from '@/models/index.js'; +import type { MiHashtagsRepository } from '@/models/index.js'; import { DI } from '@/di-symbols.js'; import { sqlLikeEscape } from '@/misc/sql-like-escape.js'; @@ -39,7 +39,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.hashtagsRepository) - private hashtagsRepository: HashtagsRepository, + private hashtagsRepository: MiHashtagsRepository, ) { super(meta, paramDef, async (ps, me) => { const hashtags = await this.hashtagsRepository.createQueryBuilder('tag') diff --git a/packages/backend/src/server/api/endpoints/hashtags/show.ts b/packages/backend/src/server/api/endpoints/hashtags/show.ts index 64a556a3c7..369018438c 100644 --- a/packages/backend/src/server/api/endpoints/hashtags/show.ts +++ b/packages/backend/src/server/api/endpoints/hashtags/show.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { HashtagsRepository } from '@/models/index.js'; +import type { MiHashtagsRepository } from '@/models/index.js'; import { normalizeForSearch } from '@/misc/normalize-for-search.js'; import { HashtagEntityService } from '@/core/entities/HashtagEntityService.js'; import { DI } from '@/di-symbols.js'; @@ -44,7 +44,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.hashtagsRepository) - private hashtagsRepository: HashtagsRepository, + private hashtagsRepository: MiHashtagsRepository, private hashtagEntityService: HashtagEntityService, ) { diff --git a/packages/backend/src/server/api/endpoints/hashtags/trend.ts b/packages/backend/src/server/api/endpoints/hashtags/trend.ts index b4c9565e0e..9a88efb6d6 100644 --- a/packages/backend/src/server/api/endpoints/hashtags/trend.ts +++ b/packages/backend/src/server/api/endpoints/hashtags/trend.ts @@ -6,7 +6,7 @@ import { Brackets } from 'typeorm'; import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { NotesRepository } from '@/models/index.js'; +import type { MiNotesRepository } from '@/models/index.js'; import type { MiNote } from '@/models/entities/Note.js'; import { safeForSql } from '@/misc/safe-for-sql.js'; import { normalizeForSearch } from '@/misc/normalize-for-search.js'; @@ -73,7 +73,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.notesRepository) - private notesRepository: NotesRepository, + private notesRepository: MiNotesRepository, private metaService: MetaService, ) { diff --git a/packages/backend/src/server/api/endpoints/hashtags/users.ts b/packages/backend/src/server/api/endpoints/hashtags/users.ts index 6a8c69351d..a709aaa0dc 100644 --- a/packages/backend/src/server/api/endpoints/hashtags/users.ts +++ b/packages/backend/src/server/api/endpoints/hashtags/users.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { UsersRepository } from '@/models/index.js'; +import type { MiUsersRepository } from '@/models/index.js'; import { normalizeForSearch } from '@/misc/normalize-for-search.js'; import { UserEntityService } from '@/core/entities/UserEntityService.js'; import { DI } from '@/di-symbols.js'; @@ -43,7 +43,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.usersRepository) - private usersRepository: UsersRepository, + private usersRepository: MiUsersRepository, private userEntityService: UserEntityService, ) { diff --git a/packages/backend/src/server/api/endpoints/i.ts b/packages/backend/src/server/api/endpoints/i.ts index 5046c78f7d..69242ea875 100644 --- a/packages/backend/src/server/api/endpoints/i.ts +++ b/packages/backend/src/server/api/endpoints/i.ts @@ -4,7 +4,7 @@ */ import { Inject, Injectable } from '@nestjs/common'; -import type { UserProfilesRepository } from '@/models/index.js'; +import type { MiUserProfilesRepository } from '@/models/index.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import { UserEntityService } from '@/core/entities/UserEntityService.js'; import { DI } from '@/di-symbols.js'; @@ -42,7 +42,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.userProfilesRepository) - private userProfilesRepository: UserProfilesRepository, + private userProfilesRepository: MiUserProfilesRepository, private userEntityService: UserEntityService, ) { diff --git a/packages/backend/src/server/api/endpoints/i/2fa/done.ts b/packages/backend/src/server/api/endpoints/i/2fa/done.ts index d7ba21c259..fd199754c2 100644 --- a/packages/backend/src/server/api/endpoints/i/2fa/done.ts +++ b/packages/backend/src/server/api/endpoints/i/2fa/done.ts @@ -7,7 +7,7 @@ import * as OTPAuth from 'otpauth'; import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import { UserEntityService } from '@/core/entities/UserEntityService.js'; -import type { UserProfilesRepository } from '@/models/index.js'; +import type { MiUserProfilesRepository } from '@/models/index.js'; import { GlobalEventService } from '@/core/GlobalEventService.js'; import { DI } from '@/di-symbols.js'; @@ -30,7 +30,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.userProfilesRepository) - private userProfilesRepository: UserProfilesRepository, + private userProfilesRepository: MiUserProfilesRepository, private userEntityService: UserEntityService, private globalEventService: GlobalEventService, diff --git a/packages/backend/src/server/api/endpoints/i/2fa/key-done.ts b/packages/backend/src/server/api/endpoints/i/2fa/key-done.ts index fd6e70a9de..89a6c61082 100644 --- a/packages/backend/src/server/api/endpoints/i/2fa/key-done.ts +++ b/packages/backend/src/server/api/endpoints/i/2fa/key-done.ts @@ -13,7 +13,7 @@ import type { Config } from '@/config.js'; import { DI } from '@/di-symbols.js'; import { GlobalEventService } from '@/core/GlobalEventService.js'; import { TwoFactorAuthenticationService } from '@/core/TwoFactorAuthenticationService.js'; -import type { AttestationChallengesRepository, UserProfilesRepository, UserSecurityKeysRepository } from '@/models/index.js'; +import type { MiAttestationChallengesRepository, MiUserProfilesRepository, MiUserSecurityKeysRepository } from '@/models/index.js'; const cborDecodeFirst = promisify(cbor.decodeFirst) as any; @@ -43,13 +43,13 @@ export default class extends Endpoint { private config: Config, @Inject(DI.userProfilesRepository) - private userProfilesRepository: UserProfilesRepository, + private userProfilesRepository: MiUserProfilesRepository, @Inject(DI.userSecurityKeysRepository) - private userSecurityKeysRepository: UserSecurityKeysRepository, + private userSecurityKeysRepository: MiUserSecurityKeysRepository, @Inject(DI.attestationChallengesRepository) - private attestationChallengesRepository: AttestationChallengesRepository, + private attestationChallengesRepository: MiAttestationChallengesRepository, private userEntityService: UserEntityService, private globalEventService: GlobalEventService, diff --git a/packages/backend/src/server/api/endpoints/i/2fa/password-less.ts b/packages/backend/src/server/api/endpoints/i/2fa/password-less.ts index 4973b49c22..3884f35db9 100644 --- a/packages/backend/src/server/api/endpoints/i/2fa/password-less.ts +++ b/packages/backend/src/server/api/endpoints/i/2fa/password-less.ts @@ -6,7 +6,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import { UserEntityService } from '@/core/entities/UserEntityService.js'; -import type { UserProfilesRepository, UserSecurityKeysRepository } from '@/models/index.js'; +import type { MiUserProfilesRepository, MiUserSecurityKeysRepository } from '@/models/index.js'; import { GlobalEventService } from '@/core/GlobalEventService.js'; import { DI } from '@/di-symbols.js'; import { ApiError } from '../../../error.js'; @@ -38,10 +38,10 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.userProfilesRepository) - private userProfilesRepository: UserProfilesRepository, + private userProfilesRepository: MiUserProfilesRepository, @Inject(DI.userSecurityKeysRepository) - private userSecurityKeysRepository: UserSecurityKeysRepository, + private userSecurityKeysRepository: MiUserSecurityKeysRepository, private userEntityService: UserEntityService, private globalEventService: GlobalEventService, diff --git a/packages/backend/src/server/api/endpoints/i/2fa/register-key.ts b/packages/backend/src/server/api/endpoints/i/2fa/register-key.ts index e27a5a8223..ef7c7c5be5 100644 --- a/packages/backend/src/server/api/endpoints/i/2fa/register-key.ts +++ b/packages/backend/src/server/api/endpoints/i/2fa/register-key.ts @@ -8,7 +8,7 @@ import * as crypto from 'node:crypto'; import bcrypt from 'bcryptjs'; import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { UserProfilesRepository, AttestationChallengesRepository } from '@/models/index.js'; +import type { MiUserProfilesRepository, MiAttestationChallengesRepository } from '@/models/index.js'; import { IdService } from '@/core/IdService.js'; import { TwoFactorAuthenticationService } from '@/core/TwoFactorAuthenticationService.js'; import { DI } from '@/di-symbols.js'; @@ -34,10 +34,10 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.userProfilesRepository) - private userProfilesRepository: UserProfilesRepository, + private userProfilesRepository: MiUserProfilesRepository, @Inject(DI.attestationChallengesRepository) - private attestationChallengesRepository: AttestationChallengesRepository, + private attestationChallengesRepository: MiAttestationChallengesRepository, private idService: IdService, private twoFactorAuthenticationService: TwoFactorAuthenticationService, diff --git a/packages/backend/src/server/api/endpoints/i/2fa/register.ts b/packages/backend/src/server/api/endpoints/i/2fa/register.ts index 0e57f07e5e..cd92e9ddd5 100644 --- a/packages/backend/src/server/api/endpoints/i/2fa/register.ts +++ b/packages/backend/src/server/api/endpoints/i/2fa/register.ts @@ -7,7 +7,7 @@ import bcrypt from 'bcryptjs'; import * as OTPAuth from 'otpauth'; import * as QRCode from 'qrcode'; import { Inject, Injectable } from '@nestjs/common'; -import type { UserProfilesRepository } from '@/models/index.js'; +import type { MiUserProfilesRepository } from '@/models/index.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import { DI } from '@/di-symbols.js'; import type { Config } from '@/config.js'; @@ -34,7 +34,7 @@ export default class extends Endpoint { private config: Config, @Inject(DI.userProfilesRepository) - private userProfilesRepository: UserProfilesRepository, + private userProfilesRepository: MiUserProfilesRepository, ) { super(meta, paramDef, async (ps, me) => { const profile = await this.userProfilesRepository.findOneByOrFail({ userId: me.id }); diff --git a/packages/backend/src/server/api/endpoints/i/2fa/remove-key.ts b/packages/backend/src/server/api/endpoints/i/2fa/remove-key.ts index 6402f3440f..0701f0ee39 100644 --- a/packages/backend/src/server/api/endpoints/i/2fa/remove-key.ts +++ b/packages/backend/src/server/api/endpoints/i/2fa/remove-key.ts @@ -6,7 +6,7 @@ import bcrypt from 'bcryptjs'; import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { UserProfilesRepository, UserSecurityKeysRepository } from '@/models/index.js'; +import type { MiUserProfilesRepository, MiUserSecurityKeysRepository } from '@/models/index.js'; import { UserEntityService } from '@/core/entities/UserEntityService.js'; import { GlobalEventService } from '@/core/GlobalEventService.js'; import { DI } from '@/di-symbols.js'; @@ -31,10 +31,10 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.userSecurityKeysRepository) - private userSecurityKeysRepository: UserSecurityKeysRepository, + private userSecurityKeysRepository: MiUserSecurityKeysRepository, @Inject(DI.userProfilesRepository) - private userProfilesRepository: UserProfilesRepository, + private userProfilesRepository: MiUserProfilesRepository, private userEntityService: UserEntityService, private globalEventService: GlobalEventService, diff --git a/packages/backend/src/server/api/endpoints/i/2fa/unregister.ts b/packages/backend/src/server/api/endpoints/i/2fa/unregister.ts index c0e9ff5ec0..d93d623c23 100644 --- a/packages/backend/src/server/api/endpoints/i/2fa/unregister.ts +++ b/packages/backend/src/server/api/endpoints/i/2fa/unregister.ts @@ -7,7 +7,7 @@ import bcrypt from 'bcryptjs'; import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import { UserEntityService } from '@/core/entities/UserEntityService.js'; -import type { UserProfilesRepository } from '@/models/index.js'; +import type { MiUserProfilesRepository } from '@/models/index.js'; import { GlobalEventService } from '@/core/GlobalEventService.js'; import { DI } from '@/di-symbols.js'; @@ -30,7 +30,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.userProfilesRepository) - private userProfilesRepository: UserProfilesRepository, + private userProfilesRepository: MiUserProfilesRepository, private userEntityService: UserEntityService, private globalEventService: GlobalEventService, diff --git a/packages/backend/src/server/api/endpoints/i/2fa/update-key.ts b/packages/backend/src/server/api/endpoints/i/2fa/update-key.ts index 535644f007..0c6a493fe7 100644 --- a/packages/backend/src/server/api/endpoints/i/2fa/update-key.ts +++ b/packages/backend/src/server/api/endpoints/i/2fa/update-key.ts @@ -6,7 +6,7 @@ import bcrypt from 'bcryptjs'; import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { UserSecurityKeysRepository } from '@/models/index.js'; +import type { MiUserSecurityKeysRepository } from '@/models/index.js'; import { UserEntityService } from '@/core/entities/UserEntityService.js'; import { GlobalEventService } from '@/core/GlobalEventService.js'; import { DI } from '@/di-symbols.js'; @@ -46,7 +46,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.userSecurityKeysRepository) - private userSecurityKeysRepository: UserSecurityKeysRepository, + private userSecurityKeysRepository: MiUserSecurityKeysRepository, private userEntityService: UserEntityService, private globalEventService: GlobalEventService, diff --git a/packages/backend/src/server/api/endpoints/i/apps.ts b/packages/backend/src/server/api/endpoints/i/apps.ts index 24e80390c2..4d844fa144 100644 --- a/packages/backend/src/server/api/endpoints/i/apps.ts +++ b/packages/backend/src/server/api/endpoints/i/apps.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { AccessTokensRepository } from '@/models/index.js'; +import type { MiAccessTokensRepository } from '@/models/index.js'; import { DI } from '@/di-symbols.js'; export const meta = { @@ -27,7 +27,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.accessTokensRepository) - private accessTokensRepository: AccessTokensRepository, + private accessTokensRepository: MiAccessTokensRepository, ) { super(meta, paramDef, async (ps, me) => { const query = this.accessTokensRepository.createQueryBuilder('token') diff --git a/packages/backend/src/server/api/endpoints/i/authorized-apps.ts b/packages/backend/src/server/api/endpoints/i/authorized-apps.ts index 1da5479c38..3a8ba8c26b 100644 --- a/packages/backend/src/server/api/endpoints/i/authorized-apps.ts +++ b/packages/backend/src/server/api/endpoints/i/authorized-apps.ts @@ -6,7 +6,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { IsNull, Not } from 'typeorm'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { AccessTokensRepository } from '@/models/index.js'; +import type { MiAccessTokensRepository } from '@/models/index.js'; import { AppEntityService } from '@/core/entities/AppEntityService.js'; import { DI } from '@/di-symbols.js'; @@ -31,7 +31,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.accessTokensRepository) - private accessTokensRepository: AccessTokensRepository, + private accessTokensRepository: MiAccessTokensRepository, private appEntityService: AppEntityService, ) { diff --git a/packages/backend/src/server/api/endpoints/i/change-password.ts b/packages/backend/src/server/api/endpoints/i/change-password.ts index 757a57caed..7fc108530e 100644 --- a/packages/backend/src/server/api/endpoints/i/change-password.ts +++ b/packages/backend/src/server/api/endpoints/i/change-password.ts @@ -6,7 +6,7 @@ import bcrypt from 'bcryptjs'; import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { UserProfilesRepository } from '@/models/index.js'; +import type { MiUserProfilesRepository } from '@/models/index.js'; import { DI } from '@/di-symbols.js'; export const meta = { @@ -29,7 +29,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.userProfilesRepository) - private userProfilesRepository: UserProfilesRepository, + private userProfilesRepository: MiUserProfilesRepository, ) { super(meta, paramDef, async (ps, me) => { const profile = await this.userProfilesRepository.findOneByOrFail({ userId: me.id }); diff --git a/packages/backend/src/server/api/endpoints/i/delete-account.ts b/packages/backend/src/server/api/endpoints/i/delete-account.ts index 721eb01c51..bb89ac8804 100644 --- a/packages/backend/src/server/api/endpoints/i/delete-account.ts +++ b/packages/backend/src/server/api/endpoints/i/delete-account.ts @@ -5,7 +5,7 @@ import bcrypt from 'bcryptjs'; import { Inject, Injectable } from '@nestjs/common'; -import type { UsersRepository, UserProfilesRepository } from '@/models/index.js'; +import type { MiUsersRepository, MiUserProfilesRepository } from '@/models/index.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import { DeleteAccountService } from '@/core/DeleteAccountService.js'; import { DI } from '@/di-symbols.js'; @@ -29,10 +29,10 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.usersRepository) - private usersRepository: UsersRepository, + private usersRepository: MiUsersRepository, @Inject(DI.userProfilesRepository) - private userProfilesRepository: UserProfilesRepository, + private userProfilesRepository: MiUserProfilesRepository, private deleteAccountService: DeleteAccountService, ) { diff --git a/packages/backend/src/server/api/endpoints/i/favorites.ts b/packages/backend/src/server/api/endpoints/i/favorites.ts index d5b1959795..fd0d626183 100644 --- a/packages/backend/src/server/api/endpoints/i/favorites.ts +++ b/packages/backend/src/server/api/endpoints/i/favorites.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { NoteFavoritesRepository } from '@/models/index.js'; +import type { MiNoteFavoritesRepository } from '@/models/index.js'; import { QueryService } from '@/core/QueryService.js'; import { NoteFavoriteEntityService } from '@/core/entities/NoteFavoriteEntityService.js'; import { DI } from '@/di-symbols.js'; @@ -43,7 +43,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.noteFavoritesRepository) - private noteFavoritesRepository: NoteFavoritesRepository, + private noteFavoritesRepository: MiNoteFavoritesRepository, private noteFavoriteEntityService: NoteFavoriteEntityService, private queryService: QueryService, diff --git a/packages/backend/src/server/api/endpoints/i/gallery/likes.ts b/packages/backend/src/server/api/endpoints/i/gallery/likes.ts index 5017d0695a..9e5fcda2e7 100644 --- a/packages/backend/src/server/api/endpoints/i/gallery/likes.ts +++ b/packages/backend/src/server/api/endpoints/i/gallery/likes.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { GalleryLikesRepository } from '@/models/index.js'; +import type { MiGalleryLikesRepository } from '@/models/index.js'; import { QueryService } from '@/core/QueryService.js'; import { GalleryLikeEntityService } from '@/core/entities/GalleryLikeEntityService.js'; import { DI } from '@/di-symbols.js'; @@ -54,7 +54,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.galleryLikesRepository) - private galleryLikesRepository: GalleryLikesRepository, + private galleryLikesRepository: MiGalleryLikesRepository, private galleryLikeEntityService: GalleryLikeEntityService, private queryService: QueryService, diff --git a/packages/backend/src/server/api/endpoints/i/gallery/posts.ts b/packages/backend/src/server/api/endpoints/i/gallery/posts.ts index 4e846831bd..ce5d647f5f 100644 --- a/packages/backend/src/server/api/endpoints/i/gallery/posts.ts +++ b/packages/backend/src/server/api/endpoints/i/gallery/posts.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { GalleryPostsRepository } from '@/models/index.js'; +import type { MiGalleryPostsRepository } from '@/models/index.js'; import { QueryService } from '@/core/QueryService.js'; import { GalleryPostEntityService } from '@/core/entities/GalleryPostEntityService.js'; import { DI } from '@/di-symbols.js'; @@ -43,7 +43,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.galleryPostsRepository) - private galleryPostsRepository: GalleryPostsRepository, + private galleryPostsRepository: MiGalleryPostsRepository, private galleryPostEntityService: GalleryPostEntityService, private queryService: QueryService, diff --git a/packages/backend/src/server/api/endpoints/i/get-word-muted-notes-count.ts b/packages/backend/src/server/api/endpoints/i/get-word-muted-notes-count.ts index 4022933360..f454e60106 100644 --- a/packages/backend/src/server/api/endpoints/i/get-word-muted-notes-count.ts +++ b/packages/backend/src/server/api/endpoints/i/get-word-muted-notes-count.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { MutedNotesRepository } from '@/models/index.js'; +import type { MiMutedNotesRepository } from '@/models/index.js'; import { DI } from '@/di-symbols.js'; export const meta = { @@ -38,7 +38,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.mutedNotesRepository) - private mutedNotesRepository: MutedNotesRepository, + private mutedNotesRepository: MiMutedNotesRepository, ) { super(meta, paramDef, async (ps, me) => { return { diff --git a/packages/backend/src/server/api/endpoints/i/import-antennas.ts b/packages/backend/src/server/api/endpoints/i/import-antennas.ts index 8feb0007a0..361bc4d427 100644 --- a/packages/backend/src/server/api/endpoints/i/import-antennas.ts +++ b/packages/backend/src/server/api/endpoints/i/import-antennas.ts @@ -7,7 +7,7 @@ import { Inject, Injectable } from '@nestjs/common'; import ms from 'ms'; import { Endpoint } from '@/server/api/endpoint-base.js'; import { QueueService } from '@/core/QueueService.js'; -import type { AntennasRepository, DriveFilesRepository, UsersRepository, MiAntenna as _Antenna } from '@/models/index.js'; +import type { MiAntennasRepository, MiDriveFilesRepository, MiUsersRepository, MiAntenna as _Antenna } from '@/models/index.js'; import { DI } from '@/di-symbols.js'; import { RoleService } from '@/core/RoleService.js'; import { DownloadService } from '@/core/DownloadService.js'; @@ -58,13 +58,13 @@ export const paramDef = { export default class extends Endpoint { constructor ( @Inject(DI.driveFilesRepository) - private driveFilesRepository: DriveFilesRepository, + private driveFilesRepository: MiDriveFilesRepository, @Inject(DI.antennasRepository) - private antennasRepository: AntennasRepository, + private antennasRepository: MiAntennasRepository, @Inject(DI.usersRepository) - private usersRepository: UsersRepository, + private usersRepository: MiUsersRepository, private roleService: RoleService, private queueService: QueueService, diff --git a/packages/backend/src/server/api/endpoints/i/import-blocking.ts b/packages/backend/src/server/api/endpoints/i/import-blocking.ts index 37d550c330..28d7684d45 100644 --- a/packages/backend/src/server/api/endpoints/i/import-blocking.ts +++ b/packages/backend/src/server/api/endpoints/i/import-blocking.ts @@ -8,7 +8,7 @@ import ms from 'ms'; import { Endpoint } from '@/server/api/endpoint-base.js'; import { QueueService } from '@/core/QueueService.js'; import { AccountMoveService } from '@/core/AccountMoveService.js'; -import type { DriveFilesRepository } from '@/models/index.js'; +import type { MiDriveFilesRepository } from '@/models/index.js'; import { DI } from '@/di-symbols.js'; import { ApiError } from '../../error.js'; @@ -62,7 +62,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.driveFilesRepository) - private driveFilesRepository: DriveFilesRepository, + private driveFilesRepository: MiDriveFilesRepository, private queueService: QueueService, private accountMoveService: AccountMoveService, diff --git a/packages/backend/src/server/api/endpoints/i/import-following.ts b/packages/backend/src/server/api/endpoints/i/import-following.ts index b29a361d0d..ab178f6666 100644 --- a/packages/backend/src/server/api/endpoints/i/import-following.ts +++ b/packages/backend/src/server/api/endpoints/i/import-following.ts @@ -8,7 +8,7 @@ import ms from 'ms'; import { Endpoint } from '@/server/api/endpoint-base.js'; import { QueueService } from '@/core/QueueService.js'; import { AccountMoveService } from '@/core/AccountMoveService.js'; -import type { DriveFilesRepository } from '@/models/index.js'; +import type { MiDriveFilesRepository } from '@/models/index.js'; import { DI } from '@/di-symbols.js'; import { ApiError } from '../../error.js'; @@ -61,7 +61,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.driveFilesRepository) - private driveFilesRepository: DriveFilesRepository, + private driveFilesRepository: MiDriveFilesRepository, private queueService: QueueService, private accountMoveService: AccountMoveService, diff --git a/packages/backend/src/server/api/endpoints/i/import-muting.ts b/packages/backend/src/server/api/endpoints/i/import-muting.ts index b148f60d86..6ae9644944 100644 --- a/packages/backend/src/server/api/endpoints/i/import-muting.ts +++ b/packages/backend/src/server/api/endpoints/i/import-muting.ts @@ -8,7 +8,7 @@ import ms from 'ms'; import { Endpoint } from '@/server/api/endpoint-base.js'; import { QueueService } from '@/core/QueueService.js'; import { AccountMoveService } from '@/core/AccountMoveService.js'; -import type { DriveFilesRepository } from '@/models/index.js'; +import type { MiDriveFilesRepository } from '@/models/index.js'; import { DI } from '@/di-symbols.js'; import { ApiError } from '../../error.js'; @@ -62,7 +62,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.driveFilesRepository) - private driveFilesRepository: DriveFilesRepository, + private driveFilesRepository: MiDriveFilesRepository, private queueService: QueueService, private accountMoveService: AccountMoveService, diff --git a/packages/backend/src/server/api/endpoints/i/import-user-lists.ts b/packages/backend/src/server/api/endpoints/i/import-user-lists.ts index 9cf54d17bf..825fef8b5f 100644 --- a/packages/backend/src/server/api/endpoints/i/import-user-lists.ts +++ b/packages/backend/src/server/api/endpoints/i/import-user-lists.ts @@ -8,7 +8,7 @@ import ms from 'ms'; import { Endpoint } from '@/server/api/endpoint-base.js'; import { QueueService } from '@/core/QueueService.js'; import { AccountMoveService } from '@/core/AccountMoveService.js'; -import type { DriveFilesRepository } from '@/models/index.js'; +import type { MiDriveFilesRepository } from '@/models/index.js'; import { DI } from '@/di-symbols.js'; import { ApiError } from '../../error.js'; @@ -61,7 +61,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.driveFilesRepository) - private driveFilesRepository: DriveFilesRepository, + private driveFilesRepository: MiDriveFilesRepository, private queueService: QueueService, private accountMoveService: AccountMoveService, diff --git a/packages/backend/src/server/api/endpoints/i/notifications.ts b/packages/backend/src/server/api/endpoints/i/notifications.ts index a46abb87d8..4fdca52f46 100644 --- a/packages/backend/src/server/api/endpoints/i/notifications.ts +++ b/packages/backend/src/server/api/endpoints/i/notifications.ts @@ -6,7 +6,7 @@ import { Brackets, In } from 'typeorm'; import * as Redis from 'ioredis'; import { Inject, Injectable } from '@nestjs/common'; -import type { NotesRepository } from '@/models/index.js'; +import type { MiNotesRepository } from '@/models/index.js'; import { obsoleteNotificationTypes, notificationTypes } from '@/types.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import { NoteReadService } from '@/core/NoteReadService.js'; @@ -65,7 +65,7 @@ export default class extends Endpoint { private redisClient: Redis.Redis, @Inject(DI.notesRepository) - private notesRepository: NotesRepository, + private notesRepository: MiNotesRepository, private idService: IdService, private notificationEntityService: NotificationEntityService, diff --git a/packages/backend/src/server/api/endpoints/i/page-likes.ts b/packages/backend/src/server/api/endpoints/i/page-likes.ts index 7510348260..196f98317b 100644 --- a/packages/backend/src/server/api/endpoints/i/page-likes.ts +++ b/packages/backend/src/server/api/endpoints/i/page-likes.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { PageLikesRepository } from '@/models/index.js'; +import type { MiPageLikesRepository } from '@/models/index.js'; import { QueryService } from '@/core/QueryService.js'; import { PageLikeEntityService } from '@/core/entities/PageLikeEntityService.js'; import { DI } from '@/di-symbols.js'; @@ -53,7 +53,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.pageLikesRepository) - private pageLikesRepository: PageLikesRepository, + private pageLikesRepository: MiPageLikesRepository, private pageLikeEntityService: PageLikeEntityService, private queryService: QueryService, diff --git a/packages/backend/src/server/api/endpoints/i/pages.ts b/packages/backend/src/server/api/endpoints/i/pages.ts index 489956b562..a06cbc5fd5 100644 --- a/packages/backend/src/server/api/endpoints/i/pages.ts +++ b/packages/backend/src/server/api/endpoints/i/pages.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { PagesRepository } from '@/models/index.js'; +import type { MiPagesRepository } from '@/models/index.js'; import { QueryService } from '@/core/QueryService.js'; import { PageEntityService } from '@/core/entities/PageEntityService.js'; import { DI } from '@/di-symbols.js'; @@ -43,7 +43,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.pagesRepository) - private pagesRepository: PagesRepository, + private pagesRepository: MiPagesRepository, private pageEntityService: PageEntityService, private queryService: QueryService, diff --git a/packages/backend/src/server/api/endpoints/i/read-all-unread-notes.ts b/packages/backend/src/server/api/endpoints/i/read-all-unread-notes.ts index d7ca50ebf6..538830d187 100644 --- a/packages/backend/src/server/api/endpoints/i/read-all-unread-notes.ts +++ b/packages/backend/src/server/api/endpoints/i/read-all-unread-notes.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { NoteUnreadsRepository } from '@/models/index.js'; +import type { MiNoteUnreadsRepository } from '@/models/index.js'; import { GlobalEventService } from '@/core/GlobalEventService.js'; import { DI } from '@/di-symbols.js'; @@ -28,7 +28,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.noteUnreadsRepository) - private noteUnreadsRepository: NoteUnreadsRepository, + private noteUnreadsRepository: MiNoteUnreadsRepository, private globalEventService: GlobalEventService, ) { diff --git a/packages/backend/src/server/api/endpoints/i/regenerate-token.ts b/packages/backend/src/server/api/endpoints/i/regenerate-token.ts index 190ce6e6ff..fa03bbf239 100644 --- a/packages/backend/src/server/api/endpoints/i/regenerate-token.ts +++ b/packages/backend/src/server/api/endpoints/i/regenerate-token.ts @@ -6,7 +6,7 @@ import bcrypt from 'bcryptjs'; import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { UsersRepository, UserProfilesRepository } from '@/models/index.js'; +import type { MiUsersRepository, MiUserProfilesRepository } from '@/models/index.js'; import generateUserToken from '@/misc/generate-native-user-token.js'; import { GlobalEventService } from '@/core/GlobalEventService.js'; import { DI } from '@/di-symbols.js'; @@ -30,10 +30,10 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.usersRepository) - private usersRepository: UsersRepository, + private usersRepository: MiUsersRepository, @Inject(DI.userProfilesRepository) - private userProfilesRepository: UserProfilesRepository, + private userProfilesRepository: MiUserProfilesRepository, private globalEventService: GlobalEventService, ) { diff --git a/packages/backend/src/server/api/endpoints/i/registry/get-all.ts b/packages/backend/src/server/api/endpoints/i/registry/get-all.ts index 293b67ae67..5ee4b68297 100644 --- a/packages/backend/src/server/api/endpoints/i/registry/get-all.ts +++ b/packages/backend/src/server/api/endpoints/i/registry/get-all.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { RegistryItemsRepository } from '@/models/index.js'; +import type { MiRegistryItemsRepository } from '@/models/index.js'; import { DI } from '@/di-symbols.js'; export const meta = { @@ -29,7 +29,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.registryItemsRepository) - private registryItemsRepository: RegistryItemsRepository, + private registryItemsRepository: MiRegistryItemsRepository, ) { super(meta, paramDef, async (ps, me) => { const query = this.registryItemsRepository.createQueryBuilder('item') diff --git a/packages/backend/src/server/api/endpoints/i/registry/get-detail.ts b/packages/backend/src/server/api/endpoints/i/registry/get-detail.ts index 77cc7bab7c..923fa1d6c6 100644 --- a/packages/backend/src/server/api/endpoints/i/registry/get-detail.ts +++ b/packages/backend/src/server/api/endpoints/i/registry/get-detail.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { RegistryItemsRepository } from '@/models/index.js'; +import type { MiRegistryItemsRepository } from '@/models/index.js'; import { DI } from '@/di-symbols.js'; import { ApiError } from '../../../error.js'; @@ -39,7 +39,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.registryItemsRepository) - private registryItemsRepository: RegistryItemsRepository, + private registryItemsRepository: MiRegistryItemsRepository, ) { super(meta, paramDef, async (ps, me) => { const query = this.registryItemsRepository.createQueryBuilder('item') diff --git a/packages/backend/src/server/api/endpoints/i/registry/get.ts b/packages/backend/src/server/api/endpoints/i/registry/get.ts index 9b9d943e63..a041b41dc2 100644 --- a/packages/backend/src/server/api/endpoints/i/registry/get.ts +++ b/packages/backend/src/server/api/endpoints/i/registry/get.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { RegistryItemsRepository } from '@/models/index.js'; +import type { MiRegistryItemsRepository } from '@/models/index.js'; import { DI } from '@/di-symbols.js'; import { ApiError } from '../../../error.js'; @@ -39,7 +39,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.registryItemsRepository) - private registryItemsRepository: RegistryItemsRepository, + private registryItemsRepository: MiRegistryItemsRepository, ) { super(meta, paramDef, async (ps, me) => { const query = this.registryItemsRepository.createQueryBuilder('item') diff --git a/packages/backend/src/server/api/endpoints/i/registry/keys-with-type.ts b/packages/backend/src/server/api/endpoints/i/registry/keys-with-type.ts index 39b34de108..266152b235 100644 --- a/packages/backend/src/server/api/endpoints/i/registry/keys-with-type.ts +++ b/packages/backend/src/server/api/endpoints/i/registry/keys-with-type.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { RegistryItemsRepository } from '@/models/index.js'; +import type { MiRegistryItemsRepository } from '@/models/index.js'; import { DI } from '@/di-symbols.js'; export const meta = { @@ -29,7 +29,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.registryItemsRepository) - private registryItemsRepository: RegistryItemsRepository, + private registryItemsRepository: MiRegistryItemsRepository, ) { super(meta, paramDef, async (ps, me) => { const query = this.registryItemsRepository.createQueryBuilder('item') diff --git a/packages/backend/src/server/api/endpoints/i/registry/keys.ts b/packages/backend/src/server/api/endpoints/i/registry/keys.ts index 2becd1040a..b21d08e588 100644 --- a/packages/backend/src/server/api/endpoints/i/registry/keys.ts +++ b/packages/backend/src/server/api/endpoints/i/registry/keys.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { RegistryItemsRepository } from '@/models/index.js'; +import type { MiRegistryItemsRepository } from '@/models/index.js'; import { DI } from '@/di-symbols.js'; export const meta = { @@ -29,7 +29,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.registryItemsRepository) - private registryItemsRepository: RegistryItemsRepository, + private registryItemsRepository: MiRegistryItemsRepository, ) { super(meta, paramDef, async (ps, me) => { const query = this.registryItemsRepository.createQueryBuilder('item') diff --git a/packages/backend/src/server/api/endpoints/i/registry/remove.ts b/packages/backend/src/server/api/endpoints/i/registry/remove.ts index 633d47eb21..fa30ac64ef 100644 --- a/packages/backend/src/server/api/endpoints/i/registry/remove.ts +++ b/packages/backend/src/server/api/endpoints/i/registry/remove.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { RegistryItemsRepository } from '@/models/index.js'; +import type { MiRegistryItemsRepository } from '@/models/index.js'; import { DI } from '@/di-symbols.js'; import { ApiError } from '../../../error.js'; @@ -39,7 +39,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.registryItemsRepository) - private registryItemsRepository: RegistryItemsRepository, + private registryItemsRepository: MiRegistryItemsRepository, ) { super(meta, paramDef, async (ps, me) => { const query = this.registryItemsRepository.createQueryBuilder('item') diff --git a/packages/backend/src/server/api/endpoints/i/registry/scopes.ts b/packages/backend/src/server/api/endpoints/i/registry/scopes.ts index 7cf95926fb..b94c629f2f 100644 --- a/packages/backend/src/server/api/endpoints/i/registry/scopes.ts +++ b/packages/backend/src/server/api/endpoints/i/registry/scopes.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { RegistryItemsRepository } from '@/models/index.js'; +import type { MiRegistryItemsRepository } from '@/models/index.js'; import { DI } from '@/di-symbols.js'; export const meta = { @@ -25,7 +25,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.registryItemsRepository) - private registryItemsRepository: RegistryItemsRepository, + private registryItemsRepository: MiRegistryItemsRepository, ) { super(meta, paramDef, async (ps, me) => { const query = this.registryItemsRepository.createQueryBuilder('item') diff --git a/packages/backend/src/server/api/endpoints/i/registry/set.ts b/packages/backend/src/server/api/endpoints/i/registry/set.ts index ac51ab17f6..430c0843ed 100644 --- a/packages/backend/src/server/api/endpoints/i/registry/set.ts +++ b/packages/backend/src/server/api/endpoints/i/registry/set.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { RegistryItemsRepository } from '@/models/index.js'; +import type { MiRegistryItemsRepository } from '@/models/index.js'; import { IdService } from '@/core/IdService.js'; import { GlobalEventService } from '@/core/GlobalEventService.js'; import { DI } from '@/di-symbols.js'; @@ -33,7 +33,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.registryItemsRepository) - private registryItemsRepository: RegistryItemsRepository, + private registryItemsRepository: MiRegistryItemsRepository, private idService: IdService, private globalEventService: GlobalEventService, diff --git a/packages/backend/src/server/api/endpoints/i/revoke-token.ts b/packages/backend/src/server/api/endpoints/i/revoke-token.ts index 76f83019b1..4d3cbafb45 100644 --- a/packages/backend/src/server/api/endpoints/i/revoke-token.ts +++ b/packages/backend/src/server/api/endpoints/i/revoke-token.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { AccessTokensRepository } from '@/models/index.js'; +import type { MiAccessTokensRepository } from '@/models/index.js'; import { DI } from '@/di-symbols.js'; export const meta = { @@ -27,7 +27,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.accessTokensRepository) - private accessTokensRepository: AccessTokensRepository, + private accessTokensRepository: MiAccessTokensRepository, ) { super(meta, paramDef, async (ps, me) => { const tokenExist = await this.accessTokensRepository.exist({ where: { id: ps.tokenId } }); diff --git a/packages/backend/src/server/api/endpoints/i/signin-history.ts b/packages/backend/src/server/api/endpoints/i/signin-history.ts index 55dca98ad8..c320b4ada6 100644 --- a/packages/backend/src/server/api/endpoints/i/signin-history.ts +++ b/packages/backend/src/server/api/endpoints/i/signin-history.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { SigninsRepository } from '@/models/index.js'; +import type { MiSigninsRepository } from '@/models/index.js'; import { QueryService } from '@/core/QueryService.js'; import { SigninEntityService } from '@/core/entities/SigninEntityService.js'; import { DI } from '@/di-symbols.js'; @@ -31,7 +31,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.signinsRepository) - private signinsRepository: SigninsRepository, + private signinsRepository: MiSigninsRepository, private signinEntityService: SigninEntityService, private queryService: QueryService, diff --git a/packages/backend/src/server/api/endpoints/i/update-email.ts b/packages/backend/src/server/api/endpoints/i/update-email.ts index 674d41c56f..8b7ea7ca58 100644 --- a/packages/backend/src/server/api/endpoints/i/update-email.ts +++ b/packages/backend/src/server/api/endpoints/i/update-email.ts @@ -7,7 +7,7 @@ import { Inject, Injectable } from '@nestjs/common'; import ms from 'ms'; import bcrypt from 'bcryptjs'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { UserProfilesRepository } from '@/models/index.js'; +import type { MiUserProfilesRepository } from '@/models/index.js'; import { UserEntityService } from '@/core/entities/UserEntityService.js'; import { EmailService } from '@/core/EmailService.js'; import type { Config } from '@/config.js'; @@ -58,7 +58,7 @@ export default class extends Endpoint { private config: Config, @Inject(DI.userProfilesRepository) - private userProfilesRepository: UserProfilesRepository, + private userProfilesRepository: MiUserProfilesRepository, private userEntityService: UserEntityService, private emailService: EmailService, diff --git a/packages/backend/src/server/api/endpoints/i/update.ts b/packages/backend/src/server/api/endpoints/i/update.ts index 0ea662d461..b4809099d4 100644 --- a/packages/backend/src/server/api/endpoints/i/update.ts +++ b/packages/backend/src/server/api/endpoints/i/update.ts @@ -9,7 +9,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { extractCustomEmojisFromMfm } from '@/misc/extract-custom-emojis-from-mfm.js'; import { extractHashtags } from '@/misc/extract-hashtags.js'; import * as Acct from '@/misc/acct.js'; -import type { UsersRepository, DriveFilesRepository, UserProfilesRepository, PagesRepository } from '@/models/index.js'; +import type { MiUsersRepository, MiDriveFilesRepository, MiUserProfilesRepository, MiPagesRepository } from '@/models/index.js'; import type { MiUser } from '@/models/entities/User.js'; import { birthdaySchema, descriptionSchema, locationSchema, nameSchema } from '@/models/entities/User.js'; import type { MiUserProfile } from '@/models/entities/UserProfile.js'; @@ -175,16 +175,16 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.usersRepository) - private usersRepository: UsersRepository, + private usersRepository: MiUsersRepository, @Inject(DI.userProfilesRepository) - private userProfilesRepository: UserProfilesRepository, + private userProfilesRepository: MiUserProfilesRepository, @Inject(DI.driveFilesRepository) - private driveFilesRepository: DriveFilesRepository, + private driveFilesRepository: MiDriveFilesRepository, @Inject(DI.pagesRepository) - private pagesRepository: PagesRepository, + private pagesRepository: MiPagesRepository, private userEntityService: UserEntityService, private driveFileEntityService: DriveFileEntityService, diff --git a/packages/backend/src/server/api/endpoints/i/webhooks/create.ts b/packages/backend/src/server/api/endpoints/i/webhooks/create.ts index 38a52c5cfd..6262eb1262 100644 --- a/packages/backend/src/server/api/endpoints/i/webhooks/create.ts +++ b/packages/backend/src/server/api/endpoints/i/webhooks/create.ts @@ -6,7 +6,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import { IdService } from '@/core/IdService.js'; -import type { WebhooksRepository } from '@/models/index.js'; +import type { MiWebhooksRepository } from '@/models/index.js'; import { webhookEventTypes } from '@/models/entities/Webhook.js'; import { GlobalEventService } from '@/core/GlobalEventService.js'; import { DI } from '@/di-symbols.js'; @@ -49,7 +49,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.webhooksRepository) - private webhooksRepository: WebhooksRepository, + private webhooksRepository: MiWebhooksRepository, private idService: IdService, private globalEventService: GlobalEventService, diff --git a/packages/backend/src/server/api/endpoints/i/webhooks/delete.ts b/packages/backend/src/server/api/endpoints/i/webhooks/delete.ts index 9d674ec020..0f4adee999 100644 --- a/packages/backend/src/server/api/endpoints/i/webhooks/delete.ts +++ b/packages/backend/src/server/api/endpoints/i/webhooks/delete.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { WebhooksRepository } from '@/models/index.js'; +import type { MiWebhooksRepository } from '@/models/index.js'; import { GlobalEventService } from '@/core/GlobalEventService.js'; import { DI } from '@/di-symbols.js'; import { ApiError } from '../../../error.js'; @@ -41,7 +41,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.webhooksRepository) - private webhooksRepository: WebhooksRepository, + private webhooksRepository: MiWebhooksRepository, private globalEventService: GlobalEventService, ) { diff --git a/packages/backend/src/server/api/endpoints/i/webhooks/list.ts b/packages/backend/src/server/api/endpoints/i/webhooks/list.ts index 7cf03bf25f..065a1831b7 100644 --- a/packages/backend/src/server/api/endpoints/i/webhooks/list.ts +++ b/packages/backend/src/server/api/endpoints/i/webhooks/list.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { WebhooksRepository } from '@/models/index.js'; +import type { MiWebhooksRepository } from '@/models/index.js'; import { DI } from '@/di-symbols.js'; export const meta = { @@ -27,7 +27,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.webhooksRepository) - private webhooksRepository: WebhooksRepository, + private webhooksRepository: MiWebhooksRepository, ) { super(meta, paramDef, async (ps, me) => { const webhooks = await this.webhooksRepository.findBy({ diff --git a/packages/backend/src/server/api/endpoints/i/webhooks/show.ts b/packages/backend/src/server/api/endpoints/i/webhooks/show.ts index fbeaa38f86..7b5f8b1697 100644 --- a/packages/backend/src/server/api/endpoints/i/webhooks/show.ts +++ b/packages/backend/src/server/api/endpoints/i/webhooks/show.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { WebhooksRepository } from '@/models/index.js'; +import type { MiWebhooksRepository } from '@/models/index.js'; import { DI } from '@/di-symbols.js'; import { ApiError } from '../../../error.js'; @@ -38,7 +38,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.webhooksRepository) - private webhooksRepository: WebhooksRepository, + private webhooksRepository: MiWebhooksRepository, ) { super(meta, paramDef, async (ps, me) => { const webhook = await this.webhooksRepository.findOneBy({ diff --git a/packages/backend/src/server/api/endpoints/i/webhooks/update.ts b/packages/backend/src/server/api/endpoints/i/webhooks/update.ts index d6b84c50b3..143b226d3e 100644 --- a/packages/backend/src/server/api/endpoints/i/webhooks/update.ts +++ b/packages/backend/src/server/api/endpoints/i/webhooks/update.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { WebhooksRepository } from '@/models/index.js'; +import type { MiWebhooksRepository } from '@/models/index.js'; import { webhookEventTypes } from '@/models/entities/Webhook.js'; import { GlobalEventService } from '@/core/GlobalEventService.js'; import { DI } from '@/di-symbols.js'; @@ -50,7 +50,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.webhooksRepository) - private webhooksRepository: WebhooksRepository, + private webhooksRepository: MiWebhooksRepository, private globalEventService: GlobalEventService, ) { diff --git a/packages/backend/src/server/api/endpoints/invite/create.ts b/packages/backend/src/server/api/endpoints/invite/create.ts index eca3989ffc..50aac9e577 100644 --- a/packages/backend/src/server/api/endpoints/invite/create.ts +++ b/packages/backend/src/server/api/endpoints/invite/create.ts @@ -6,7 +6,7 @@ import { MoreThan } from 'typeorm'; import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { RegistrationTicketsRepository } from '@/models/index.js'; +import type { MiRegistrationTicketsRepository } from '@/models/index.js'; import { InviteCodeEntityService } from '@/core/entities/InviteCodeEntityService.js'; import { IdService } from '@/core/IdService.js'; import { RoleService } from '@/core/RoleService.js'; @@ -52,7 +52,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.registrationTicketsRepository) - private registrationTicketsRepository: RegistrationTicketsRepository, + private registrationTicketsRepository: MiRegistrationTicketsRepository, private inviteCodeEntityService: InviteCodeEntityService, private idService: IdService, diff --git a/packages/backend/src/server/api/endpoints/invite/delete.ts b/packages/backend/src/server/api/endpoints/invite/delete.ts index 901efd5237..3b78b19cbd 100644 --- a/packages/backend/src/server/api/endpoints/invite/delete.ts +++ b/packages/backend/src/server/api/endpoints/invite/delete.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { RegistrationTicketsRepository } from '@/models/index.js'; +import type { MiRegistrationTicketsRepository } from '@/models/index.js'; import { RoleService } from '@/core/RoleService.js'; import { DI } from '@/di-symbols.js'; import { ApiError } from '../../error.js'; @@ -50,7 +50,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.registrationTicketsRepository) - private registrationTicketsRepository: RegistrationTicketsRepository, + private registrationTicketsRepository: MiRegistrationTicketsRepository, private roleService: RoleService, ) { diff --git a/packages/backend/src/server/api/endpoints/invite/limit.ts b/packages/backend/src/server/api/endpoints/invite/limit.ts index 87552ff5d3..eed3506180 100644 --- a/packages/backend/src/server/api/endpoints/invite/limit.ts +++ b/packages/backend/src/server/api/endpoints/invite/limit.ts @@ -6,7 +6,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { MoreThan } from 'typeorm'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { RegistrationTicketsRepository } from '@/models/index.js'; +import type { MiRegistrationTicketsRepository } from '@/models/index.js'; import { RoleService } from '@/core/RoleService.js'; import { DI } from '@/di-symbols.js'; @@ -39,7 +39,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.registrationTicketsRepository) - private registrationTicketsRepository: RegistrationTicketsRepository, + private registrationTicketsRepository: MiRegistrationTicketsRepository, private roleService: RoleService, ) { diff --git a/packages/backend/src/server/api/endpoints/invite/list.ts b/packages/backend/src/server/api/endpoints/invite/list.ts index f4fa82bc83..387b193c04 100644 --- a/packages/backend/src/server/api/endpoints/invite/list.ts +++ b/packages/backend/src/server/api/endpoints/invite/list.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { RegistrationTicketsRepository } from '@/models/index.js'; +import type { MiRegistrationTicketsRepository } from '@/models/index.js'; import { InviteCodeEntityService } from '@/core/entities/InviteCodeEntityService.js'; import { QueryService } from '@/core/QueryService.js'; import { DI } from '@/di-symbols.js'; @@ -42,7 +42,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.registrationTicketsRepository) - private registrationTicketsRepository: RegistrationTicketsRepository, + private registrationTicketsRepository: MiRegistrationTicketsRepository, private inviteCodeEntityService: InviteCodeEntityService, private queryService: QueryService, diff --git a/packages/backend/src/server/api/endpoints/meta.ts b/packages/backend/src/server/api/endpoints/meta.ts index f6f4855346..fb13e2c05c 100644 --- a/packages/backend/src/server/api/endpoints/meta.ts +++ b/packages/backend/src/server/api/endpoints/meta.ts @@ -6,7 +6,7 @@ import { IsNull, LessThanOrEqual, MoreThan, Brackets } from 'typeorm'; import { Inject, Injectable } from '@nestjs/common'; import JSON5 from 'json5'; -import type { AdsRepository, UsersRepository } from '@/models/index.js'; +import type { MiAdsRepository, MiUsersRepository } from '@/models/index.js'; import { MAX_NOTE_TEXT_LENGTH } from '@/const.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import { UserEntityService } from '@/core/entities/UserEntityService.js'; @@ -261,10 +261,10 @@ export default class extends Endpoint { private config: Config, @Inject(DI.usersRepository) - private usersRepository: UsersRepository, + private usersRepository: MiUsersRepository, @Inject(DI.adsRepository) - private adsRepository: AdsRepository, + private adsRepository: MiAdsRepository, private userEntityService: UserEntityService, private metaService: MetaService, diff --git a/packages/backend/src/server/api/endpoints/miauth/gen-token.ts b/packages/backend/src/server/api/endpoints/miauth/gen-token.ts index a194b22fbf..32569db769 100644 --- a/packages/backend/src/server/api/endpoints/miauth/gen-token.ts +++ b/packages/backend/src/server/api/endpoints/miauth/gen-token.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { AccessTokensRepository } from '@/models/index.js'; +import type { MiAccessTokensRepository } from '@/models/index.js'; import { IdService } from '@/core/IdService.js'; import { secureRndstr } from '@/misc/secure-rndstr.js'; import { DI } from '@/di-symbols.js'; @@ -48,7 +48,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.accessTokensRepository) - private accessTokensRepository: AccessTokensRepository, + private accessTokensRepository: MiAccessTokensRepository, private idService: IdService, ) { diff --git a/packages/backend/src/server/api/endpoints/mute/create.ts b/packages/backend/src/server/api/endpoints/mute/create.ts index b74eb6733e..f5c987d859 100644 --- a/packages/backend/src/server/api/endpoints/mute/create.ts +++ b/packages/backend/src/server/api/endpoints/mute/create.ts @@ -6,7 +6,7 @@ import { Inject, Injectable } from '@nestjs/common'; import ms from 'ms'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { MutingsRepository } from '@/models/index.js'; +import type { MiMutingsRepository } from '@/models/index.js'; import { DI } from '@/di-symbols.js'; import { GetterService } from '@/server/api/GetterService.js'; import { UserMutingService } from '@/core/UserMutingService.js'; @@ -64,7 +64,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.mutingsRepository) - private mutingsRepository: MutingsRepository, + private mutingsRepository: MiMutingsRepository, private getterService: GetterService, private userMutingService: UserMutingService, diff --git a/packages/backend/src/server/api/endpoints/mute/delete.ts b/packages/backend/src/server/api/endpoints/mute/delete.ts index 13e0018315..2cb9be1196 100644 --- a/packages/backend/src/server/api/endpoints/mute/delete.ts +++ b/packages/backend/src/server/api/endpoints/mute/delete.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { MutingsRepository } from '@/models/index.js'; +import type { MiMutingsRepository } from '@/models/index.js'; import { DI } from '@/di-symbols.js'; import { GetterService } from '@/server/api/GetterService.js'; import { UserMutingService } from '@/core/UserMutingService.js'; @@ -52,7 +52,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.mutingsRepository) - private mutingsRepository: MutingsRepository, + private mutingsRepository: MiMutingsRepository, private userMutingService: UserMutingService, private getterService: GetterService, diff --git a/packages/backend/src/server/api/endpoints/mute/list.ts b/packages/backend/src/server/api/endpoints/mute/list.ts index b458c7fd70..1831138d3f 100644 --- a/packages/backend/src/server/api/endpoints/mute/list.ts +++ b/packages/backend/src/server/api/endpoints/mute/list.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { MutingsRepository } from '@/models/index.js'; +import type { MiMutingsRepository } from '@/models/index.js'; import { QueryService } from '@/core/QueryService.js'; import { MutingEntityService } from '@/core/entities/MutingEntityService.js'; import { DI } from '@/di-symbols.js'; @@ -43,7 +43,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.mutingsRepository) - private mutingsRepository: MutingsRepository, + private mutingsRepository: MiMutingsRepository, private mutingEntityService: MutingEntityService, private queryService: QueryService, diff --git a/packages/backend/src/server/api/endpoints/my/apps.ts b/packages/backend/src/server/api/endpoints/my/apps.ts index 37562ab9ed..14a7f7c397 100644 --- a/packages/backend/src/server/api/endpoints/my/apps.ts +++ b/packages/backend/src/server/api/endpoints/my/apps.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { AppsRepository } from '@/models/index.js'; +import type { MiAppsRepository } from '@/models/index.js'; import { AppEntityService } from '@/core/entities/AppEntityService.js'; import { DI } from '@/di-symbols.js'; @@ -39,7 +39,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.appsRepository) - private appsRepository: AppsRepository, + private appsRepository: MiAppsRepository, private appEntityService: AppEntityService, ) { diff --git a/packages/backend/src/server/api/endpoints/notes.ts b/packages/backend/src/server/api/endpoints/notes.ts index 2eea9c6a8f..6e665b3be5 100644 --- a/packages/backend/src/server/api/endpoints/notes.ts +++ b/packages/backend/src/server/api/endpoints/notes.ts @@ -4,7 +4,7 @@ */ import { Inject, Injectable } from '@nestjs/common'; -import type { NotesRepository } from '@/models/index.js'; +import type { MiNotesRepository } from '@/models/index.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import { QueryService } from '@/core/QueryService.js'; import { NoteEntityService } from '@/core/entities/NoteEntityService.js'; @@ -44,7 +44,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.notesRepository) - private notesRepository: NotesRepository, + private notesRepository: MiNotesRepository, private noteEntityService: NoteEntityService, private queryService: QueryService, diff --git a/packages/backend/src/server/api/endpoints/notes/children.ts b/packages/backend/src/server/api/endpoints/notes/children.ts index c12af10a9d..1c96ef2669 100644 --- a/packages/backend/src/server/api/endpoints/notes/children.ts +++ b/packages/backend/src/server/api/endpoints/notes/children.ts @@ -5,7 +5,7 @@ import { Brackets } from 'typeorm'; import { Inject, Injectable } from '@nestjs/common'; -import type { NotesRepository } from '@/models/index.js'; +import type { MiNotesRepository } from '@/models/index.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import { QueryService } from '@/core/QueryService.js'; import { NoteEntityService } from '@/core/entities/NoteEntityService.js'; @@ -43,7 +43,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.notesRepository) - private notesRepository: NotesRepository, + private notesRepository: MiNotesRepository, private noteEntityService: NoteEntityService, private queryService: QueryService, diff --git a/packages/backend/src/server/api/endpoints/notes/clips.ts b/packages/backend/src/server/api/endpoints/notes/clips.ts index de36180110..048aae6f70 100644 --- a/packages/backend/src/server/api/endpoints/notes/clips.ts +++ b/packages/backend/src/server/api/endpoints/notes/clips.ts @@ -5,7 +5,7 @@ import { In } from 'typeorm'; import { Inject, Injectable } from '@nestjs/common'; -import type { ClipNotesRepository, ClipsRepository } from '@/models/index.js'; +import type { MiClipNotesRepository, MiClipsRepository } from '@/models/index.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import { ClipEntityService } from '@/core/entities/ClipEntityService.js'; import { DI } from '@/di-symbols.js'; @@ -49,10 +49,10 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.clipsRepository) - private clipsRepository: ClipsRepository, + private clipsRepository: MiClipsRepository, @Inject(DI.clipNotesRepository) - private clipNotesRepository: ClipNotesRepository, + private clipNotesRepository: MiClipNotesRepository, private clipEntityService: ClipEntityService, private getterService: GetterService, diff --git a/packages/backend/src/server/api/endpoints/notes/conversation.ts b/packages/backend/src/server/api/endpoints/notes/conversation.ts index 88bbf3a2ee..2873346015 100644 --- a/packages/backend/src/server/api/endpoints/notes/conversation.ts +++ b/packages/backend/src/server/api/endpoints/notes/conversation.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import type { MiNote } from '@/models/entities/Note.js'; -import type { NotesRepository } from '@/models/index.js'; +import type { MiNotesRepository } from '@/models/index.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import { NoteEntityService } from '@/core/entities/NoteEntityService.js'; import { DI } from '@/di-symbols.js'; @@ -51,7 +51,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.notesRepository) - private notesRepository: NotesRepository, + private notesRepository: MiNotesRepository, private noteEntityService: NoteEntityService, private getterService: GetterService, diff --git a/packages/backend/src/server/api/endpoints/notes/create.ts b/packages/backend/src/server/api/endpoints/notes/create.ts index 1c53db9b3c..1f472a5edd 100644 --- a/packages/backend/src/server/api/endpoints/notes/create.ts +++ b/packages/backend/src/server/api/endpoints/notes/create.ts @@ -7,7 +7,7 @@ import ms from 'ms'; import { In } from 'typeorm'; import { Inject, Injectable } from '@nestjs/common'; import type { MiUser } from '@/models/entities/User.js'; -import type { UsersRepository, NotesRepository, BlockingsRepository, DriveFilesRepository, ChannelsRepository } from '@/models/index.js'; +import type { MiUsersRepository, MiNotesRepository, MiBlockingsRepository, MiDriveFilesRepository, MiChannelsRepository } from '@/models/index.js'; import type { MiDriveFile } from '@/models/entities/DriveFile.js'; import type { MiNote } from '@/models/entities/Note.js'; import type { MiChannel } from '@/models/entities/Channel.js'; @@ -167,19 +167,19 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.usersRepository) - private usersRepository: UsersRepository, + private usersRepository: MiUsersRepository, @Inject(DI.notesRepository) - private notesRepository: NotesRepository, + private notesRepository: MiNotesRepository, @Inject(DI.blockingsRepository) - private blockingsRepository: BlockingsRepository, + private blockingsRepository: MiBlockingsRepository, @Inject(DI.driveFilesRepository) - private driveFilesRepository: DriveFilesRepository, + private driveFilesRepository: MiDriveFilesRepository, @Inject(DI.channelsRepository) - private channelsRepository: ChannelsRepository, + private channelsRepository: MiChannelsRepository, private noteEntityService: NoteEntityService, private noteCreateService: NoteCreateService, diff --git a/packages/backend/src/server/api/endpoints/notes/delete.ts b/packages/backend/src/server/api/endpoints/notes/delete.ts index df4225746d..514eef13d5 100644 --- a/packages/backend/src/server/api/endpoints/notes/delete.ts +++ b/packages/backend/src/server/api/endpoints/notes/delete.ts @@ -5,7 +5,7 @@ import ms from 'ms'; import { Inject, Injectable } from '@nestjs/common'; -import type { UsersRepository } from '@/models/index.js'; +import type { MiUsersRepository } from '@/models/index.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import { NoteDeleteService } from '@/core/NoteDeleteService.js'; import { DI } from '@/di-symbols.js'; @@ -54,7 +54,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.usersRepository) - private usersRepository: UsersRepository, + private usersRepository: MiUsersRepository, private getterService: GetterService, private roleService: RoleService, diff --git a/packages/backend/src/server/api/endpoints/notes/favorites/create.ts b/packages/backend/src/server/api/endpoints/notes/favorites/create.ts index fee398fb83..bd4c18388f 100644 --- a/packages/backend/src/server/api/endpoints/notes/favorites/create.ts +++ b/packages/backend/src/server/api/endpoints/notes/favorites/create.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import ms from 'ms'; -import type { NoteFavoritesRepository } from '@/models/index.js'; +import type { MiNoteFavoritesRepository } from '@/models/index.js'; import { IdService } from '@/core/IdService.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import { GetterService } from '@/server/api/GetterService.js'; @@ -54,7 +54,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.noteFavoritesRepository) - private noteFavoritesRepository: NoteFavoritesRepository, + private noteFavoritesRepository: MiNoteFavoritesRepository, private idService: IdService, private getterService: GetterService, diff --git a/packages/backend/src/server/api/endpoints/notes/favorites/delete.ts b/packages/backend/src/server/api/endpoints/notes/favorites/delete.ts index 97f354f81b..c36522ecb6 100644 --- a/packages/backend/src/server/api/endpoints/notes/favorites/delete.ts +++ b/packages/backend/src/server/api/endpoints/notes/favorites/delete.ts @@ -7,7 +7,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import { GetterService } from '@/server/api/GetterService.js'; import { DI } from '@/di-symbols.js'; -import type { NoteFavoritesRepository } from '@/models/index.js'; +import type { MiNoteFavoritesRepository } from '@/models/index.js'; import { ApiError } from '../../../error.js'; export const meta = { @@ -45,7 +45,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.noteFavoritesRepository) - private noteFavoritesRepository: NoteFavoritesRepository, + private noteFavoritesRepository: MiNoteFavoritesRepository, private getterService: GetterService, ) { diff --git a/packages/backend/src/server/api/endpoints/notes/featured.ts b/packages/backend/src/server/api/endpoints/notes/featured.ts index 5ff9c916dc..8c0d63878f 100644 --- a/packages/backend/src/server/api/endpoints/notes/featured.ts +++ b/packages/backend/src/server/api/endpoints/notes/featured.ts @@ -4,7 +4,7 @@ */ import { Inject, Injectable } from '@nestjs/common'; -import type { NotesRepository } from '@/models/index.js'; +import type { MiNotesRepository } from '@/models/index.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import { QueryService } from '@/core/QueryService.js'; import { NoteEntityService } from '@/core/entities/NoteEntityService.js'; @@ -43,7 +43,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.notesRepository) - private notesRepository: NotesRepository, + private notesRepository: MiNotesRepository, private noteEntityService: NoteEntityService, private queryService: QueryService, diff --git a/packages/backend/src/server/api/endpoints/notes/global-timeline.ts b/packages/backend/src/server/api/endpoints/notes/global-timeline.ts index a6b0c72f58..f7da2c6606 100644 --- a/packages/backend/src/server/api/endpoints/notes/global-timeline.ts +++ b/packages/backend/src/server/api/endpoints/notes/global-timeline.ts @@ -4,7 +4,7 @@ */ import { Inject, Injectable } from '@nestjs/common'; -import type { NotesRepository } from '@/models/index.js'; +import type { MiNotesRepository } from '@/models/index.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import { QueryService } from '@/core/QueryService.js'; import { NoteEntityService } from '@/core/entities/NoteEntityService.js'; @@ -54,7 +54,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.notesRepository) - private notesRepository: NotesRepository, + private notesRepository: MiNotesRepository, private noteEntityService: NoteEntityService, private queryService: QueryService, diff --git a/packages/backend/src/server/api/endpoints/notes/hybrid-timeline.ts b/packages/backend/src/server/api/endpoints/notes/hybrid-timeline.ts index a0256f6c03..3612e1ac2c 100644 --- a/packages/backend/src/server/api/endpoints/notes/hybrid-timeline.ts +++ b/packages/backend/src/server/api/endpoints/notes/hybrid-timeline.ts @@ -5,7 +5,7 @@ import { Brackets } from 'typeorm'; import { Inject, Injectable } from '@nestjs/common'; -import type { NotesRepository, FollowingsRepository } from '@/models/index.js'; +import type { MiNotesRepository, MiFollowingsRepository } from '@/models/index.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import { QueryService } from '@/core/QueryService.js'; import ActiveUsersChart from '@/core/chart/charts/active-users.js'; @@ -61,10 +61,10 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.notesRepository) - private notesRepository: NotesRepository, + private notesRepository: MiNotesRepository, @Inject(DI.followingsRepository) - private followingsRepository: FollowingsRepository, + private followingsRepository: MiFollowingsRepository, private noteEntityService: NoteEntityService, private queryService: QueryService, diff --git a/packages/backend/src/server/api/endpoints/notes/local-timeline.ts b/packages/backend/src/server/api/endpoints/notes/local-timeline.ts index 07404fd458..28e933c8df 100644 --- a/packages/backend/src/server/api/endpoints/notes/local-timeline.ts +++ b/packages/backend/src/server/api/endpoints/notes/local-timeline.ts @@ -5,7 +5,7 @@ import { Brackets } from 'typeorm'; import { Inject, Injectable } from '@nestjs/common'; -import type { NotesRepository } from '@/models/index.js'; +import type { MiNotesRepository } from '@/models/index.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import { QueryService } from '@/core/QueryService.js'; import { NoteEntityService } from '@/core/entities/NoteEntityService.js'; @@ -60,7 +60,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.notesRepository) - private notesRepository: NotesRepository, + private notesRepository: MiNotesRepository, private noteEntityService: NoteEntityService, private queryService: QueryService, diff --git a/packages/backend/src/server/api/endpoints/notes/mentions.ts b/packages/backend/src/server/api/endpoints/notes/mentions.ts index 6c2900a706..cdb3603f22 100644 --- a/packages/backend/src/server/api/endpoints/notes/mentions.ts +++ b/packages/backend/src/server/api/endpoints/notes/mentions.ts @@ -5,7 +5,7 @@ import { Brackets } from 'typeorm'; import { Inject, Injectable } from '@nestjs/common'; -import type { NotesRepository, FollowingsRepository } from '@/models/index.js'; +import type { MiNotesRepository, MiFollowingsRepository } from '@/models/index.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import { QueryService } from '@/core/QueryService.js'; import { NoteEntityService } from '@/core/entities/NoteEntityService.js'; @@ -45,10 +45,10 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.notesRepository) - private notesRepository: NotesRepository, + private notesRepository: MiNotesRepository, @Inject(DI.followingsRepository) - private followingsRepository: FollowingsRepository, + private followingsRepository: MiFollowingsRepository, private noteEntityService: NoteEntityService, private queryService: QueryService, diff --git a/packages/backend/src/server/api/endpoints/notes/polls/recommendation.ts b/packages/backend/src/server/api/endpoints/notes/polls/recommendation.ts index 9802ae0cab..c9b542b666 100644 --- a/packages/backend/src/server/api/endpoints/notes/polls/recommendation.ts +++ b/packages/backend/src/server/api/endpoints/notes/polls/recommendation.ts @@ -5,7 +5,7 @@ import { Brackets, In } from 'typeorm'; import { Inject, Injectable } from '@nestjs/common'; -import type { NotesRepository, MutingsRepository, PollsRepository, PollVotesRepository } from '@/models/index.js'; +import type { MiNotesRepository, MiMutingsRepository, MiPollsRepository, MiPollVotesRepository } from '@/models/index.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import { NoteEntityService } from '@/core/entities/NoteEntityService.js'; import { DI } from '@/di-symbols.js'; @@ -40,16 +40,16 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.notesRepository) - private notesRepository: NotesRepository, + private notesRepository: MiNotesRepository, @Inject(DI.pollsRepository) - private pollsRepository: PollsRepository, + private pollsRepository: MiPollsRepository, @Inject(DI.pollVotesRepository) - private pollVotesRepository: PollVotesRepository, + private pollVotesRepository: MiPollVotesRepository, @Inject(DI.mutingsRepository) - private mutingsRepository: MutingsRepository, + private mutingsRepository: MiMutingsRepository, private noteEntityService: NoteEntityService, ) { diff --git a/packages/backend/src/server/api/endpoints/notes/polls/vote.ts b/packages/backend/src/server/api/endpoints/notes/polls/vote.ts index 0bcd80bb0a..12aad3c330 100644 --- a/packages/backend/src/server/api/endpoints/notes/polls/vote.ts +++ b/packages/backend/src/server/api/endpoints/notes/polls/vote.ts @@ -4,7 +4,7 @@ */ import { Inject, Injectable } from '@nestjs/common'; -import type { UsersRepository, PollsRepository, PollVotesRepository } from '@/models/index.js'; +import type { MiUsersRepository, MiPollsRepository, MiPollVotesRepository } from '@/models/index.js'; import type { MiRemoteUser } from '@/models/entities/User.js'; import { IdService } from '@/core/IdService.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; @@ -81,13 +81,13 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.usersRepository) - private usersRepository: UsersRepository, + private usersRepository: MiUsersRepository, @Inject(DI.pollsRepository) - private pollsRepository: PollsRepository, + private pollsRepository: MiPollsRepository, @Inject(DI.pollVotesRepository) - private pollVotesRepository: PollVotesRepository, + private pollVotesRepository: MiPollVotesRepository, private idService: IdService, private getterService: GetterService, diff --git a/packages/backend/src/server/api/endpoints/notes/reactions.ts b/packages/backend/src/server/api/endpoints/notes/reactions.ts index 8f5e7d024b..6ecf10b3ae 100644 --- a/packages/backend/src/server/api/endpoints/notes/reactions.ts +++ b/packages/backend/src/server/api/endpoints/notes/reactions.ts @@ -4,7 +4,7 @@ */ import { Inject, Injectable } from '@nestjs/common'; -import type { NoteReactionsRepository } from '@/models/index.js'; +import type { MiNoteReactionsRepository } from '@/models/index.js'; import type { MiNoteReaction } from '@/models/entities/NoteReaction.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import { NoteReactionEntityService } from '@/core/entities/NoteReactionEntityService.js'; @@ -56,7 +56,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.noteReactionsRepository) - private noteReactionsRepository: NoteReactionsRepository, + private noteReactionsRepository: MiNoteReactionsRepository, private noteReactionEntityService: NoteReactionEntityService, ) { diff --git a/packages/backend/src/server/api/endpoints/notes/renotes.ts b/packages/backend/src/server/api/endpoints/notes/renotes.ts index c5c2bc227d..a2902073cc 100644 --- a/packages/backend/src/server/api/endpoints/notes/renotes.ts +++ b/packages/backend/src/server/api/endpoints/notes/renotes.ts @@ -4,7 +4,7 @@ */ import { Inject, Injectable } from '@nestjs/common'; -import type { NotesRepository } from '@/models/index.js'; +import type { MiNotesRepository } from '@/models/index.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import { QueryService } from '@/core/QueryService.js'; import { NoteEntityService } from '@/core/entities/NoteEntityService.js'; @@ -52,7 +52,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.notesRepository) - private notesRepository: NotesRepository, + private notesRepository: MiNotesRepository, private noteEntityService: NoteEntityService, private queryService: QueryService, diff --git a/packages/backend/src/server/api/endpoints/notes/replies.ts b/packages/backend/src/server/api/endpoints/notes/replies.ts index 706e65fc78..44fb83acb7 100644 --- a/packages/backend/src/server/api/endpoints/notes/replies.ts +++ b/packages/backend/src/server/api/endpoints/notes/replies.ts @@ -4,7 +4,7 @@ */ import { Inject, Injectable } from '@nestjs/common'; -import type { NotesRepository } from '@/models/index.js'; +import type { MiNotesRepository } from '@/models/index.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import { QueryService } from '@/core/QueryService.js'; import { NoteEntityService } from '@/core/entities/NoteEntityService.js'; @@ -42,7 +42,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.notesRepository) - private notesRepository: NotesRepository, + private notesRepository: MiNotesRepository, private noteEntityService: NoteEntityService, private queryService: QueryService, diff --git a/packages/backend/src/server/api/endpoints/notes/search-by-tag.ts b/packages/backend/src/server/api/endpoints/notes/search-by-tag.ts index 94ab6a4f26..84aaad9d89 100644 --- a/packages/backend/src/server/api/endpoints/notes/search-by-tag.ts +++ b/packages/backend/src/server/api/endpoints/notes/search-by-tag.ts @@ -5,7 +5,7 @@ import { Brackets } from 'typeorm'; import { Inject, Injectable } from '@nestjs/common'; -import type { NotesRepository } from '@/models/index.js'; +import type { MiNotesRepository } from '@/models/index.js'; import { safeForSql } from '@/misc/safe-for-sql.js'; import { normalizeForSearch } from '@/misc/normalize-for-search.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; @@ -68,7 +68,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.notesRepository) - private notesRepository: NotesRepository, + private notesRepository: MiNotesRepository, private noteEntityService: NoteEntityService, private queryService: QueryService, diff --git a/packages/backend/src/server/api/endpoints/notes/state.ts b/packages/backend/src/server/api/endpoints/notes/state.ts index b95e966de4..7d6a80cfba 100644 --- a/packages/backend/src/server/api/endpoints/notes/state.ts +++ b/packages/backend/src/server/api/endpoints/notes/state.ts @@ -4,7 +4,7 @@ */ import { Inject, Injectable } from '@nestjs/common'; -import type { NotesRepository, NoteThreadMutingsRepository, NoteFavoritesRepository } from '@/models/index.js'; +import type { MiNotesRepository, MiNoteThreadMutingsRepository, MiNoteFavoritesRepository } from '@/models/index.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import { DI } from '@/di-symbols.js'; @@ -42,13 +42,13 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.notesRepository) - private notesRepository: NotesRepository, + private notesRepository: MiNotesRepository, @Inject(DI.noteThreadMutingsRepository) - private noteThreadMutingsRepository: NoteThreadMutingsRepository, + private noteThreadMutingsRepository: MiNoteThreadMutingsRepository, @Inject(DI.noteFavoritesRepository) - private noteFavoritesRepository: NoteFavoritesRepository, + private noteFavoritesRepository: MiNoteFavoritesRepository, ) { super(meta, paramDef, async (ps, me) => { const note = await this.notesRepository.findOneByOrFail({ id: ps.noteId }); diff --git a/packages/backend/src/server/api/endpoints/notes/thread-muting/create.ts b/packages/backend/src/server/api/endpoints/notes/thread-muting/create.ts index fb4e15f330..e07ff7ff73 100644 --- a/packages/backend/src/server/api/endpoints/notes/thread-muting/create.ts +++ b/packages/backend/src/server/api/endpoints/notes/thread-muting/create.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import ms from 'ms'; -import type { NotesRepository, NoteThreadMutingsRepository } from '@/models/index.js'; +import type { MiNotesRepository, MiNoteThreadMutingsRepository } from '@/models/index.js'; import { IdService } from '@/core/IdService.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import { GetterService } from '@/server/api/GetterService.js'; @@ -47,10 +47,10 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.notesRepository) - private notesRepository: NotesRepository, + private notesRepository: MiNotesRepository, @Inject(DI.noteThreadMutingsRepository) - private noteThreadMutingsRepository: NoteThreadMutingsRepository, + private noteThreadMutingsRepository: MiNoteThreadMutingsRepository, private getterService: GetterService, private noteReadService: NoteReadService, diff --git a/packages/backend/src/server/api/endpoints/notes/thread-muting/delete.ts b/packages/backend/src/server/api/endpoints/notes/thread-muting/delete.ts index 740b5f656c..62b217987f 100644 --- a/packages/backend/src/server/api/endpoints/notes/thread-muting/delete.ts +++ b/packages/backend/src/server/api/endpoints/notes/thread-muting/delete.ts @@ -4,7 +4,7 @@ */ import { Inject, Injectable } from '@nestjs/common'; -import type { NoteThreadMutingsRepository } from '@/models/index.js'; +import type { MiNoteThreadMutingsRepository } from '@/models/index.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import { GetterService } from '@/server/api/GetterService.js'; import { DI } from '@/di-symbols.js'; @@ -39,7 +39,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.noteThreadMutingsRepository) - private noteThreadMutingsRepository: NoteThreadMutingsRepository, + private noteThreadMutingsRepository: MiNoteThreadMutingsRepository, private getterService: GetterService, ) { diff --git a/packages/backend/src/server/api/endpoints/notes/timeline.ts b/packages/backend/src/server/api/endpoints/notes/timeline.ts index 0d61ef9813..9e6046e149 100644 --- a/packages/backend/src/server/api/endpoints/notes/timeline.ts +++ b/packages/backend/src/server/api/endpoints/notes/timeline.ts @@ -5,7 +5,7 @@ import { Brackets } from 'typeorm'; import { Inject, Injectable } from '@nestjs/common'; -import type { NotesRepository, FollowingsRepository } from '@/models/index.js'; +import type { MiNotesRepository, MiFollowingsRepository } from '@/models/index.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import { QueryService } from '@/core/QueryService.js'; import ActiveUsersChart from '@/core/chart/charts/active-users.js'; @@ -51,10 +51,10 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.notesRepository) - private notesRepository: NotesRepository, + private notesRepository: MiNotesRepository, @Inject(DI.followingsRepository) - private followingsRepository: FollowingsRepository, + private followingsRepository: MiFollowingsRepository, private noteEntityService: NoteEntityService, private queryService: QueryService, diff --git a/packages/backend/src/server/api/endpoints/notes/unrenote.ts b/packages/backend/src/server/api/endpoints/notes/unrenote.ts index 1689d814fd..8c75677bfc 100644 --- a/packages/backend/src/server/api/endpoints/notes/unrenote.ts +++ b/packages/backend/src/server/api/endpoints/notes/unrenote.ts @@ -5,7 +5,7 @@ import ms from 'ms'; import { Inject, Injectable } from '@nestjs/common'; -import type { UsersRepository, NotesRepository } from '@/models/index.js'; +import type { MiUsersRepository, MiNotesRepository } from '@/models/index.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import { NoteDeleteService } from '@/core/NoteDeleteService.js'; import { DI } from '@/di-symbols.js'; @@ -47,10 +47,10 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.usersRepository) - private usersRepository: UsersRepository, + private usersRepository: MiUsersRepository, @Inject(DI.notesRepository) - private notesRepository: NotesRepository, + private notesRepository: MiNotesRepository, private getterService: GetterService, private noteDeleteService: NoteDeleteService, diff --git a/packages/backend/src/server/api/endpoints/notes/user-list-timeline.ts b/packages/backend/src/server/api/endpoints/notes/user-list-timeline.ts index d4ec328721..c7996e4e7f 100644 --- a/packages/backend/src/server/api/endpoints/notes/user-list-timeline.ts +++ b/packages/backend/src/server/api/endpoints/notes/user-list-timeline.ts @@ -5,7 +5,7 @@ import { Brackets } from 'typeorm'; import { Inject, Injectable } from '@nestjs/common'; -import type { NotesRepository, UserListsRepository, UserListJoiningsRepository } from '@/models/index.js'; +import type { MiNotesRepository, MiUserListsRepository, MiUserListJoiningsRepository } from '@/models/index.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import { QueryService } from '@/core/QueryService.js'; import { NoteEntityService } from '@/core/entities/NoteEntityService.js'; @@ -63,13 +63,13 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.notesRepository) - private notesRepository: NotesRepository, + private notesRepository: MiNotesRepository, @Inject(DI.userListsRepository) - private userListsRepository: UserListsRepository, + private userListsRepository: MiUserListsRepository, @Inject(DI.userListJoiningsRepository) - private userListJoiningsRepository: UserListJoiningsRepository, + private userListJoiningsRepository: MiUserListJoiningsRepository, private noteEntityService: NoteEntityService, private queryService: QueryService, diff --git a/packages/backend/src/server/api/endpoints/page-push.ts b/packages/backend/src/server/api/endpoints/page-push.ts index cbb45ca60d..1cc75e3ec9 100644 --- a/packages/backend/src/server/api/endpoints/page-push.ts +++ b/packages/backend/src/server/api/endpoints/page-push.ts @@ -4,7 +4,7 @@ */ import { Inject, Injectable } from '@nestjs/common'; -import type { PagesRepository } from '@/models/index.js'; +import type { MiPagesRepository } from '@/models/index.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import { UserEntityService } from '@/core/entities/UserEntityService.js'; import { GlobalEventService } from '@/core/GlobalEventService.js'; @@ -39,7 +39,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.pagesRepository) - private pagesRepository: PagesRepository, + private pagesRepository: MiPagesRepository, private userEntityService: UserEntityService, private globalEventService: GlobalEventService, diff --git a/packages/backend/src/server/api/endpoints/pages/create.ts b/packages/backend/src/server/api/endpoints/pages/create.ts index 28c7f22550..52a36f9f3a 100644 --- a/packages/backend/src/server/api/endpoints/pages/create.ts +++ b/packages/backend/src/server/api/endpoints/pages/create.ts @@ -5,7 +5,7 @@ import ms from 'ms'; import { Inject, Injectable } from '@nestjs/common'; -import type { DriveFilesRepository, PagesRepository } from '@/models/index.js'; +import type { MiDriveFilesRepository, MiPagesRepository } from '@/models/index.js'; import { IdService } from '@/core/IdService.js'; import { MiPage } from '@/models/entities/Page.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; @@ -73,10 +73,10 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.pagesRepository) - private pagesRepository: PagesRepository, + private pagesRepository: MiPagesRepository, @Inject(DI.driveFilesRepository) - private driveFilesRepository: DriveFilesRepository, + private driveFilesRepository: MiDriveFilesRepository, private pageEntityService: PageEntityService, private idService: IdService, diff --git a/packages/backend/src/server/api/endpoints/pages/delete.ts b/packages/backend/src/server/api/endpoints/pages/delete.ts index a0aa72a697..948f80e8c4 100644 --- a/packages/backend/src/server/api/endpoints/pages/delete.ts +++ b/packages/backend/src/server/api/endpoints/pages/delete.ts @@ -4,7 +4,7 @@ */ import { Inject, Injectable } from '@nestjs/common'; -import type { PagesRepository } from '@/models/index.js'; +import type { MiPagesRepository } from '@/models/index.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import { DI } from '@/di-symbols.js'; import { ApiError } from '../../error.js'; @@ -44,7 +44,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.pagesRepository) - private pagesRepository: PagesRepository, + private pagesRepository: MiPagesRepository, ) { super(meta, paramDef, async (ps, me) => { const page = await this.pagesRepository.findOneBy({ id: ps.pageId }); diff --git a/packages/backend/src/server/api/endpoints/pages/featured.ts b/packages/backend/src/server/api/endpoints/pages/featured.ts index 386fdc0d1a..27ffab9675 100644 --- a/packages/backend/src/server/api/endpoints/pages/featured.ts +++ b/packages/backend/src/server/api/endpoints/pages/featured.ts @@ -4,7 +4,7 @@ */ import { Inject, Injectable } from '@nestjs/common'; -import type { PagesRepository } from '@/models/index.js'; +import type { MiPagesRepository } from '@/models/index.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import { PageEntityService } from '@/core/entities/PageEntityService.js'; import { DI } from '@/di-symbols.js'; @@ -36,7 +36,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.pagesRepository) - private pagesRepository: PagesRepository, + private pagesRepository: MiPagesRepository, private pageEntityService: PageEntityService, ) { diff --git a/packages/backend/src/server/api/endpoints/pages/like.ts b/packages/backend/src/server/api/endpoints/pages/like.ts index 0504be20ed..abb7fd5f39 100644 --- a/packages/backend/src/server/api/endpoints/pages/like.ts +++ b/packages/backend/src/server/api/endpoints/pages/like.ts @@ -4,7 +4,7 @@ */ import { Inject, Injectable } from '@nestjs/common'; -import type { PagesRepository, PageLikesRepository } from '@/models/index.js'; +import type { MiPagesRepository, MiPageLikesRepository } from '@/models/index.js'; import { IdService } from '@/core/IdService.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import { DI } from '@/di-symbols.js'; @@ -53,10 +53,10 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.pagesRepository) - private pagesRepository: PagesRepository, + private pagesRepository: MiPagesRepository, @Inject(DI.pageLikesRepository) - private pageLikesRepository: PageLikesRepository, + private pageLikesRepository: MiPageLikesRepository, private idService: IdService, ) { diff --git a/packages/backend/src/server/api/endpoints/pages/show.ts b/packages/backend/src/server/api/endpoints/pages/show.ts index 652a4faef1..a62a3b8e35 100644 --- a/packages/backend/src/server/api/endpoints/pages/show.ts +++ b/packages/backend/src/server/api/endpoints/pages/show.ts @@ -5,7 +5,7 @@ import { IsNull } from 'typeorm'; import { Inject, Injectable } from '@nestjs/common'; -import type { UsersRepository, PagesRepository } from '@/models/index.js'; +import type { MiUsersRepository, MiPagesRepository } from '@/models/index.js'; import type { MiPage } from '@/models/entities/Page.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import { PageEntityService } from '@/core/entities/PageEntityService.js'; @@ -50,10 +50,10 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.usersRepository) - private usersRepository: UsersRepository, + private usersRepository: MiUsersRepository, @Inject(DI.pagesRepository) - private pagesRepository: PagesRepository, + private pagesRepository: MiPagesRepository, private pageEntityService: PageEntityService, ) { diff --git a/packages/backend/src/server/api/endpoints/pages/unlike.ts b/packages/backend/src/server/api/endpoints/pages/unlike.ts index b913fc7249..9001d8eb11 100644 --- a/packages/backend/src/server/api/endpoints/pages/unlike.ts +++ b/packages/backend/src/server/api/endpoints/pages/unlike.ts @@ -4,7 +4,7 @@ */ import { Inject, Injectable } from '@nestjs/common'; -import type { PagesRepository, PageLikesRepository } from '@/models/index.js'; +import type { MiPagesRepository, MiPageLikesRepository } from '@/models/index.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import { DI } from '@/di-symbols.js'; import { ApiError } from '../../error.js'; @@ -46,10 +46,10 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.pagesRepository) - private pagesRepository: PagesRepository, + private pagesRepository: MiPagesRepository, @Inject(DI.pageLikesRepository) - private pageLikesRepository: PageLikesRepository, + private pageLikesRepository: MiPageLikesRepository, ) { super(meta, paramDef, async (ps, me) => { const page = await this.pagesRepository.findOneBy({ id: ps.pageId }); diff --git a/packages/backend/src/server/api/endpoints/pages/update.ts b/packages/backend/src/server/api/endpoints/pages/update.ts index 679b1ed464..b47eebb13d 100644 --- a/packages/backend/src/server/api/endpoints/pages/update.ts +++ b/packages/backend/src/server/api/endpoints/pages/update.ts @@ -6,7 +6,7 @@ import ms from 'ms'; import { Not } from 'typeorm'; import { Inject, Injectable } from '@nestjs/common'; -import type { PagesRepository, DriveFilesRepository } from '@/models/index.js'; +import type { MiPagesRepository, MiDriveFilesRepository } from '@/models/index.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import { DI } from '@/di-symbols.js'; import { ApiError } from '../../error.js'; @@ -78,10 +78,10 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.pagesRepository) - private pagesRepository: PagesRepository, + private pagesRepository: MiPagesRepository, @Inject(DI.driveFilesRepository) - private driveFilesRepository: DriveFilesRepository, + private driveFilesRepository: MiDriveFilesRepository, ) { super(meta, paramDef, async (ps, me) => { const page = await this.pagesRepository.findOneBy({ id: ps.pageId }); diff --git a/packages/backend/src/server/api/endpoints/pinned-users.ts b/packages/backend/src/server/api/endpoints/pinned-users.ts index 74ac6bbee4..3394e572f3 100644 --- a/packages/backend/src/server/api/endpoints/pinned-users.ts +++ b/packages/backend/src/server/api/endpoints/pinned-users.ts @@ -5,7 +5,7 @@ import { IsNull } from 'typeorm'; import { Inject, Injectable } from '@nestjs/common'; -import type { UsersRepository } from '@/models/index.js'; +import type { MiUsersRepository } from '@/models/index.js'; import * as Acct from '@/misc/acct.js'; import type { MiUser } from '@/models/entities/User.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; @@ -40,7 +40,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.usersRepository) - private usersRepository: UsersRepository, + private usersRepository: MiUsersRepository, private metaService: MetaService, private userEntityService: UserEntityService, diff --git a/packages/backend/src/server/api/endpoints/promo/read.ts b/packages/backend/src/server/api/endpoints/promo/read.ts index 4c99f14bd4..9bbcfce031 100644 --- a/packages/backend/src/server/api/endpoints/promo/read.ts +++ b/packages/backend/src/server/api/endpoints/promo/read.ts @@ -4,7 +4,7 @@ */ import { Inject, Injectable } from '@nestjs/common'; -import type { PromoReadsRepository } from '@/models/index.js'; +import type { MiPromoReadsRepository } from '@/models/index.js'; import { IdService } from '@/core/IdService.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import { DI } from '@/di-symbols.js'; @@ -38,7 +38,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.promoReadsRepository) - private promoReadsRepository: PromoReadsRepository, + private promoReadsRepository: MiPromoReadsRepository, private idService: IdService, private getterService: GetterService, diff --git a/packages/backend/src/server/api/endpoints/renote-mute/create.ts b/packages/backend/src/server/api/endpoints/renote-mute/create.ts index 30bfd3d24d..e311a9fbe2 100644 --- a/packages/backend/src/server/api/endpoints/renote-mute/create.ts +++ b/packages/backend/src/server/api/endpoints/renote-mute/create.ts @@ -7,7 +7,7 @@ import { Inject, Injectable } from '@nestjs/common'; import ms from 'ms'; import { Endpoint } from '@/server/api/endpoint-base.js'; import { IdService } from '@/core/IdService.js'; -import type { RenoteMutingsRepository } from '@/models/index.js'; +import type { MiRenoteMutingsRepository } from '@/models/index.js'; import type { MiRenoteMuting } from '@/models/entities/RenoteMuting.js'; import { DI } from '@/di-symbols.js'; import { GetterService } from '@/server/api/GetterService.js'; @@ -60,7 +60,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.renoteMutingsRepository) - private renoteMutingsRepository: RenoteMutingsRepository, + private renoteMutingsRepository: MiRenoteMutingsRepository, private getterService: GetterService, private idService: IdService, diff --git a/packages/backend/src/server/api/endpoints/renote-mute/delete.ts b/packages/backend/src/server/api/endpoints/renote-mute/delete.ts index 373f805fa4..93c182d386 100644 --- a/packages/backend/src/server/api/endpoints/renote-mute/delete.ts +++ b/packages/backend/src/server/api/endpoints/renote-mute/delete.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { RenoteMutingsRepository } from '@/models/index.js'; +import type { MiRenoteMutingsRepository } from '@/models/index.js'; import { DI } from '@/di-symbols.js'; import { GetterService } from '@/server/api/GetterService.js'; import { ApiError } from '../../error.js'; @@ -51,7 +51,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.renoteMutingsRepository) - private renoteMutingsRepository: RenoteMutingsRepository, + private renoteMutingsRepository: MiRenoteMutingsRepository, private getterService: GetterService, ) { diff --git a/packages/backend/src/server/api/endpoints/renote-mute/list.ts b/packages/backend/src/server/api/endpoints/renote-mute/list.ts index c7da5479ed..5b279db2d8 100644 --- a/packages/backend/src/server/api/endpoints/renote-mute/list.ts +++ b/packages/backend/src/server/api/endpoints/renote-mute/list.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { RenoteMutingsRepository } from '@/models/index.js'; +import type { MiRenoteMutingsRepository } from '@/models/index.js'; import { QueryService } from '@/core/QueryService.js'; import { RenoteMutingEntityService } from '@/core/entities/RenoteMutingEntityService.js'; import { DI } from '@/di-symbols.js'; @@ -43,7 +43,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.renoteMutingsRepository) - private renoteMutingsRepository: RenoteMutingsRepository, + private renoteMutingsRepository: MiRenoteMutingsRepository, private renoteMutingEntityService: RenoteMutingEntityService, private queryService: QueryService, diff --git a/packages/backend/src/server/api/endpoints/request-reset-password.ts b/packages/backend/src/server/api/endpoints/request-reset-password.ts index 2e1085f78e..9269c28057 100644 --- a/packages/backend/src/server/api/endpoints/request-reset-password.ts +++ b/packages/backend/src/server/api/endpoints/request-reset-password.ts @@ -6,7 +6,7 @@ import ms from 'ms'; import { IsNull } from 'typeorm'; import { Inject, Injectable } from '@nestjs/common'; -import type { PasswordResetRequestsRepository, UserProfilesRepository, UsersRepository } from '@/models/index.js'; +import type { MiPasswordResetRequestsRepository, MiUserProfilesRepository, MiUsersRepository } from '@/models/index.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import { IdService } from '@/core/IdService.js'; import type { Config } from '@/config.js'; @@ -48,13 +48,13 @@ export default class extends Endpoint { private config: Config, @Inject(DI.usersRepository) - private usersRepository: UsersRepository, + private usersRepository: MiUsersRepository, @Inject(DI.userProfilesRepository) - private userProfilesRepository: UserProfilesRepository, + private userProfilesRepository: MiUserProfilesRepository, @Inject(DI.passwordResetRequestsRepository) - private passwordResetRequestsRepository: PasswordResetRequestsRepository, + private passwordResetRequestsRepository: MiPasswordResetRequestsRepository, private idService: IdService, private emailService: EmailService, diff --git a/packages/backend/src/server/api/endpoints/reset-password.ts b/packages/backend/src/server/api/endpoints/reset-password.ts index 4bbd3d0ef1..8e29eb0df2 100644 --- a/packages/backend/src/server/api/endpoints/reset-password.ts +++ b/packages/backend/src/server/api/endpoints/reset-password.ts @@ -5,7 +5,7 @@ import bcrypt from 'bcryptjs'; import { Inject, Injectable } from '@nestjs/common'; -import type { UserProfilesRepository, PasswordResetRequestsRepository } from '@/models/index.js'; +import type { MiUserProfilesRepository, MiPasswordResetRequestsRepository } from '@/models/index.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import { DI } from '@/di-symbols.js'; @@ -35,10 +35,10 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.passwordResetRequestsRepository) - private passwordResetRequestsRepository: PasswordResetRequestsRepository, + private passwordResetRequestsRepository: MiPasswordResetRequestsRepository, @Inject(DI.userProfilesRepository) - private userProfilesRepository: UserProfilesRepository, + private userProfilesRepository: MiUserProfilesRepository, ) { super(meta, paramDef, async (ps, me) => { const req = await this.passwordResetRequestsRepository.findOneByOrFail({ diff --git a/packages/backend/src/server/api/endpoints/retention.ts b/packages/backend/src/server/api/endpoints/retention.ts index 34e584b985..805880f604 100644 --- a/packages/backend/src/server/api/endpoints/retention.ts +++ b/packages/backend/src/server/api/endpoints/retention.ts @@ -4,7 +4,7 @@ */ import { Inject, Injectable } from '@nestjs/common'; -import type { RetentionAggregationsRepository } from '@/models/index.js'; +import type { MiRetentionAggregationsRepository } from '@/models/index.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import { DI } from '@/di-symbols.js'; @@ -31,7 +31,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.retentionAggregationsRepository) - private retentionAggregationsRepository: RetentionAggregationsRepository, + private retentionAggregationsRepository: MiRetentionAggregationsRepository, ) { super(meta, paramDef, async (ps, me) => { const records = await this.retentionAggregationsRepository.find({ diff --git a/packages/backend/src/server/api/endpoints/roles/list.ts b/packages/backend/src/server/api/endpoints/roles/list.ts index ee17b46a2a..11c8610f68 100644 --- a/packages/backend/src/server/api/endpoints/roles/list.ts +++ b/packages/backend/src/server/api/endpoints/roles/list.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { RolesRepository } from '@/models/index.js'; +import type { MiRolesRepository } from '@/models/index.js'; import { DI } from '@/di-symbols.js'; import { RoleEntityService } from '@/core/entities/RoleEntityService.js'; @@ -28,7 +28,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.rolesRepository) - private rolesRepository: RolesRepository, + private rolesRepository: MiRolesRepository, private roleEntityService: RoleEntityService, ) { diff --git a/packages/backend/src/server/api/endpoints/roles/notes.ts b/packages/backend/src/server/api/endpoints/roles/notes.ts index fe0354d545..c0400da54a 100644 --- a/packages/backend/src/server/api/endpoints/roles/notes.ts +++ b/packages/backend/src/server/api/endpoints/roles/notes.ts @@ -6,7 +6,7 @@ import { Inject, Injectable } from '@nestjs/common'; import * as Redis from 'ioredis'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { NotesRepository, RolesRepository } from '@/models/index.js'; +import type { MiNotesRepository, MiRolesRepository } from '@/models/index.js'; import { QueryService } from '@/core/QueryService.js'; import { DI } from '@/di-symbols.js'; import { NoteEntityService } from '@/core/entities/NoteEntityService.js'; @@ -58,10 +58,10 @@ export default class extends Endpoint { private redisClient: Redis.Redis, @Inject(DI.notesRepository) - private notesRepository: NotesRepository, + private notesRepository: MiNotesRepository, @Inject(DI.rolesRepository) - private rolesRepository: RolesRepository, + private rolesRepository: MiRolesRepository, private idService: IdService, private noteEntityService: NoteEntityService, diff --git a/packages/backend/src/server/api/endpoints/roles/show.ts b/packages/backend/src/server/api/endpoints/roles/show.ts index 742c6f950d..b4e95cc1f3 100644 --- a/packages/backend/src/server/api/endpoints/roles/show.ts +++ b/packages/backend/src/server/api/endpoints/roles/show.ts @@ -4,7 +4,7 @@ */ import { Inject, Injectable } from '@nestjs/common'; -import type { RolesRepository } from '@/models/index.js'; +import type { MiRolesRepository } from '@/models/index.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import { DI } from '@/di-symbols.js'; import { RoleEntityService } from '@/core/entities/RoleEntityService.js'; @@ -37,7 +37,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.rolesRepository) - private rolesRepository: RolesRepository, + private rolesRepository: MiRolesRepository, private roleEntityService: RoleEntityService, ) { diff --git a/packages/backend/src/server/api/endpoints/roles/users.ts b/packages/backend/src/server/api/endpoints/roles/users.ts index 4bb962c4a6..6aff6e926a 100644 --- a/packages/backend/src/server/api/endpoints/roles/users.ts +++ b/packages/backend/src/server/api/endpoints/roles/users.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Brackets } from 'typeorm'; -import type { RoleAssignmentsRepository, RolesRepository } from '@/models/index.js'; +import type { MiRoleAssignmentsRepository, MiRolesRepository } from '@/models/index.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import { QueryService } from '@/core/QueryService.js'; import { DI } from '@/di-symbols.js'; @@ -42,10 +42,10 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.rolesRepository) - private rolesRepository: RolesRepository, + private rolesRepository: MiRolesRepository, @Inject(DI.roleAssignmentsRepository) - private roleAssignmentsRepository: RoleAssignmentsRepository, + private roleAssignmentsRepository: MiRoleAssignmentsRepository, private queryService: QueryService, private userEntityService: UserEntityService, diff --git a/packages/backend/src/server/api/endpoints/stats.ts b/packages/backend/src/server/api/endpoints/stats.ts index 6174d39aed..e5976b850a 100644 --- a/packages/backend/src/server/api/endpoints/stats.ts +++ b/packages/backend/src/server/api/endpoints/stats.ts @@ -4,7 +4,7 @@ */ import { Inject, Injectable } from '@nestjs/common'; -import type { InstancesRepository, NoteReactionsRepository } from '@/models/index.js'; +import type { MiInstancesRepository, MiNoteReactionsRepository } from '@/models/index.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import { DI } from '@/di-symbols.js'; import NotesChart from '@/core/chart/charts/notes.js'; @@ -62,10 +62,10 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.instancesRepository) - private instancesRepository: InstancesRepository, + private instancesRepository: MiInstancesRepository, @Inject(DI.noteReactionsRepository) - private noteReactionsRepository: NoteReactionsRepository, + private noteReactionsRepository: MiNoteReactionsRepository, private notesChart: NotesChart, private usersChart: UsersChart, diff --git a/packages/backend/src/server/api/endpoints/sw/register.ts b/packages/backend/src/server/api/endpoints/sw/register.ts index 7a979ea306..ad5947d1bf 100644 --- a/packages/backend/src/server/api/endpoints/sw/register.ts +++ b/packages/backend/src/server/api/endpoints/sw/register.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { IdService } from '@/core/IdService.js'; -import type { SwSubscriptionsRepository } from '@/models/index.js'; +import type { MiSwSubscriptionsRepository } from '@/models/index.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import { MetaService } from '@/core/MetaService.js'; import { DI } from '@/di-symbols.js'; @@ -62,7 +62,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.swSubscriptionsRepository) - private swSubscriptionsRepository: SwSubscriptionsRepository, + private swSubscriptionsRepository: MiSwSubscriptionsRepository, private idService: IdService, private metaService: MetaService, diff --git a/packages/backend/src/server/api/endpoints/sw/show-registration.ts b/packages/backend/src/server/api/endpoints/sw/show-registration.ts index 90800f4b64..3eccface4b 100644 --- a/packages/backend/src/server/api/endpoints/sw/show-registration.ts +++ b/packages/backend/src/server/api/endpoints/sw/show-registration.ts @@ -4,7 +4,7 @@ */ import { Inject, Injectable } from '@nestjs/common'; -import type { SwSubscriptionsRepository } from '@/models/index.js'; +import type { MiSwSubscriptionsRepository } from '@/models/index.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import { DI } from '@/di-symbols.js'; @@ -48,7 +48,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.swSubscriptionsRepository) - private swSubscriptionsRepository: SwSubscriptionsRepository, + private swSubscriptionsRepository: MiSwSubscriptionsRepository, ) { super(meta, paramDef, async (ps, me) => { // if already subscribed diff --git a/packages/backend/src/server/api/endpoints/sw/unregister.ts b/packages/backend/src/server/api/endpoints/sw/unregister.ts index 7b948988a6..c7f777801d 100644 --- a/packages/backend/src/server/api/endpoints/sw/unregister.ts +++ b/packages/backend/src/server/api/endpoints/sw/unregister.ts @@ -4,7 +4,7 @@ */ import { Inject, Injectable } from '@nestjs/common'; -import type { SwSubscriptionsRepository } from '@/models/index.js'; +import type { MiSwSubscriptionsRepository } from '@/models/index.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import { DI } from '@/di-symbols.js'; @@ -29,7 +29,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.swSubscriptionsRepository) - private swSubscriptionsRepository: SwSubscriptionsRepository, + private swSubscriptionsRepository: MiSwSubscriptionsRepository, ) { super(meta, paramDef, async (ps, me) => { await this.swSubscriptionsRepository.delete({ diff --git a/packages/backend/src/server/api/endpoints/sw/update-registration.ts b/packages/backend/src/server/api/endpoints/sw/update-registration.ts index 061d180f57..d0f24d98e5 100644 --- a/packages/backend/src/server/api/endpoints/sw/update-registration.ts +++ b/packages/backend/src/server/api/endpoints/sw/update-registration.ts @@ -4,7 +4,7 @@ */ import { Inject, Injectable } from '@nestjs/common'; -import type { SwSubscriptionsRepository } from '@/models/index.js'; +import type { MiSwSubscriptionsRepository } from '@/models/index.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import { DI } from '@/di-symbols.js'; import { ApiError } from '../../error.js'; @@ -57,7 +57,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.swSubscriptionsRepository) - private swSubscriptionsRepository: SwSubscriptionsRepository, + private swSubscriptionsRepository: MiSwSubscriptionsRepository, ) { super(meta, paramDef, async (ps, me) => { const swSubscription = await this.swSubscriptionsRepository.findOneBy({ diff --git a/packages/backend/src/server/api/endpoints/username/available.ts b/packages/backend/src/server/api/endpoints/username/available.ts index 38036a3244..a9c4075488 100644 --- a/packages/backend/src/server/api/endpoints/username/available.ts +++ b/packages/backend/src/server/api/endpoints/username/available.ts @@ -5,7 +5,7 @@ import { IsNull } from 'typeorm'; import { Inject, Injectable } from '@nestjs/common'; -import type { UsedUsernamesRepository, UsersRepository } from '@/models/index.js'; +import type { MiUsedUsernamesRepository, MiUsersRepository } from '@/models/index.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import { localUsernameSchema } from '@/models/entities/User.js'; import { DI } from '@/di-symbols.js'; @@ -41,10 +41,10 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.usersRepository) - private usersRepository: UsersRepository, + private usersRepository: MiUsersRepository, @Inject(DI.usedUsernamesRepository) - private usedUsernamesRepository: UsedUsernamesRepository, + private usedUsernamesRepository: MiUsedUsernamesRepository, private metaService: MetaService, ) { diff --git a/packages/backend/src/server/api/endpoints/users.ts b/packages/backend/src/server/api/endpoints/users.ts index 95ff7c9759..5558275d36 100644 --- a/packages/backend/src/server/api/endpoints/users.ts +++ b/packages/backend/src/server/api/endpoints/users.ts @@ -4,7 +4,7 @@ */ import { Inject, Injectable } from '@nestjs/common'; -import type { UsersRepository } from '@/models/index.js'; +import type { MiUsersRepository } from '@/models/index.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import { QueryService } from '@/core/QueryService.js'; import { UserEntityService } from '@/core/entities/UserEntityService.js'; @@ -49,7 +49,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.usersRepository) - private usersRepository: UsersRepository, + private usersRepository: MiUsersRepository, private userEntityService: UserEntityService, private queryService: QueryService, diff --git a/packages/backend/src/server/api/endpoints/users/achievements.ts b/packages/backend/src/server/api/endpoints/users/achievements.ts index 0eaff724b1..b354872546 100644 --- a/packages/backend/src/server/api/endpoints/users/achievements.ts +++ b/packages/backend/src/server/api/endpoints/users/achievements.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { UserProfilesRepository } from '@/models/index.js'; +import type { MiUserProfilesRepository } from '@/models/index.js'; import { DI } from '@/di-symbols.js'; export const meta = { @@ -25,7 +25,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.userProfilesRepository) - private userProfilesRepository: UserProfilesRepository, + private userProfilesRepository: MiUserProfilesRepository, ) { super(meta, paramDef, async (ps, me) => { const profile = await this.userProfilesRepository.findOneByOrFail({ userId: ps.userId }); diff --git a/packages/backend/src/server/api/endpoints/users/clips.ts b/packages/backend/src/server/api/endpoints/users/clips.ts index 747f15f394..6db7feb57a 100644 --- a/packages/backend/src/server/api/endpoints/users/clips.ts +++ b/packages/backend/src/server/api/endpoints/users/clips.ts @@ -4,7 +4,7 @@ */ import { Inject, Injectable } from '@nestjs/common'; -import type { ClipsRepository } from '@/models/index.js'; +import type { MiClipsRepository } from '@/models/index.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import { QueryService } from '@/core/QueryService.js'; import { ClipEntityService } from '@/core/entities/ClipEntityService.js'; @@ -42,7 +42,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.clipsRepository) - private clipsRepository: ClipsRepository, + private clipsRepository: MiClipsRepository, private clipEntityService: ClipEntityService, private queryService: QueryService, diff --git a/packages/backend/src/server/api/endpoints/users/followers.ts b/packages/backend/src/server/api/endpoints/users/followers.ts index 2684446fc9..e16beacdbc 100644 --- a/packages/backend/src/server/api/endpoints/users/followers.ts +++ b/packages/backend/src/server/api/endpoints/users/followers.ts @@ -5,7 +5,7 @@ import { IsNull } from 'typeorm'; import { Inject, Injectable } from '@nestjs/common'; -import type { UsersRepository, FollowingsRepository, UserProfilesRepository } from '@/models/index.js'; +import type { MiUsersRepository, MiFollowingsRepository, MiUserProfilesRepository } from '@/models/index.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import { QueryService } from '@/core/QueryService.js'; import { FollowingEntityService } from '@/core/entities/FollowingEntityService.js'; @@ -71,13 +71,13 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.usersRepository) - private usersRepository: UsersRepository, + private usersRepository: MiUsersRepository, @Inject(DI.userProfilesRepository) - private userProfilesRepository: UserProfilesRepository, + private userProfilesRepository: MiUserProfilesRepository, @Inject(DI.followingsRepository) - private followingsRepository: FollowingsRepository, + private followingsRepository: MiFollowingsRepository, private utilityService: UtilityService, private followingEntityService: FollowingEntityService, diff --git a/packages/backend/src/server/api/endpoints/users/following.ts b/packages/backend/src/server/api/endpoints/users/following.ts index 926aacdb98..66b30ea1cf 100644 --- a/packages/backend/src/server/api/endpoints/users/following.ts +++ b/packages/backend/src/server/api/endpoints/users/following.ts @@ -5,7 +5,7 @@ import { IsNull } from 'typeorm'; import { Inject, Injectable } from '@nestjs/common'; -import type { UsersRepository, FollowingsRepository, UserProfilesRepository } from '@/models/index.js'; +import type { MiUsersRepository, MiFollowingsRepository, MiUserProfilesRepository } from '@/models/index.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import { QueryService } from '@/core/QueryService.js'; import { FollowingEntityService } from '@/core/entities/FollowingEntityService.js'; @@ -71,13 +71,13 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.usersRepository) - private usersRepository: UsersRepository, + private usersRepository: MiUsersRepository, @Inject(DI.userProfilesRepository) - private userProfilesRepository: UserProfilesRepository, + private userProfilesRepository: MiUserProfilesRepository, @Inject(DI.followingsRepository) - private followingsRepository: FollowingsRepository, + private followingsRepository: MiFollowingsRepository, private utilityService: UtilityService, private followingEntityService: FollowingEntityService, diff --git a/packages/backend/src/server/api/endpoints/users/gallery/posts.ts b/packages/backend/src/server/api/endpoints/users/gallery/posts.ts index 2aa14ed25d..97b354486f 100644 --- a/packages/backend/src/server/api/endpoints/users/gallery/posts.ts +++ b/packages/backend/src/server/api/endpoints/users/gallery/posts.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { GalleryPostsRepository } from '@/models/index.js'; +import type { MiGalleryPostsRepository } from '@/models/index.js'; import { QueryService } from '@/core/QueryService.js'; import { GalleryPostEntityService } from '@/core/entities/GalleryPostEntityService.js'; import { DI } from '@/di-symbols.js'; @@ -42,7 +42,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.galleryPostsRepository) - private galleryPostsRepository: GalleryPostsRepository, + private galleryPostsRepository: MiGalleryPostsRepository, private galleryPostEntityService: GalleryPostEntityService, private queryService: QueryService, diff --git a/packages/backend/src/server/api/endpoints/users/get-frequently-replied-users.ts b/packages/backend/src/server/api/endpoints/users/get-frequently-replied-users.ts index d3e324d508..15d7684b47 100644 --- a/packages/backend/src/server/api/endpoints/users/get-frequently-replied-users.ts +++ b/packages/backend/src/server/api/endpoints/users/get-frequently-replied-users.ts @@ -6,7 +6,7 @@ import { Not, In, IsNull } from 'typeorm'; import { Inject, Injectable } from '@nestjs/common'; import { maximum } from '@/misc/prelude/array.js'; -import type { NotesRepository } from '@/models/index.js'; +import type { MiNotesRepository } from '@/models/index.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import { UserEntityService } from '@/core/entities/UserEntityService.js'; import { DI } from '@/di-symbols.js'; @@ -63,7 +63,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.notesRepository) - private notesRepository: NotesRepository, + private notesRepository: MiNotesRepository, private userEntityService: UserEntityService, private getterService: GetterService, diff --git a/packages/backend/src/server/api/endpoints/users/lists/create-from-public.ts b/packages/backend/src/server/api/endpoints/users/lists/create-from-public.ts index 4f3a64537d..fb38ed628a 100644 --- a/packages/backend/src/server/api/endpoints/users/lists/create-from-public.ts +++ b/packages/backend/src/server/api/endpoints/users/lists/create-from-public.ts @@ -4,7 +4,7 @@ */ import { Inject, Injectable } from '@nestjs/common'; -import type { UserListsRepository, UserListJoiningsRepository, BlockingsRepository } from '@/models/index.js'; +import type { MiUserListsRepository, MiUserListJoiningsRepository, MiBlockingsRepository } from '@/models/index.js'; import { IdService } from '@/core/IdService.js'; import type { MiUserList } from '@/models/entities/UserList.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; @@ -74,13 +74,13 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.userListsRepository) - private userListsRepository: UserListsRepository, + private userListsRepository: MiUserListsRepository, @Inject(DI.userListJoiningsRepository) - private userListJoiningsRepository: UserListJoiningsRepository, + private userListJoiningsRepository: MiUserListJoiningsRepository, @Inject(DI.blockingsRepository) - private blockingsRepository: BlockingsRepository, + private blockingsRepository: MiBlockingsRepository, private userListService: UserListService, private userListEntityService: UserListEntityService, diff --git a/packages/backend/src/server/api/endpoints/users/lists/create.ts b/packages/backend/src/server/api/endpoints/users/lists/create.ts index 4c04d35906..29f67a99aa 100644 --- a/packages/backend/src/server/api/endpoints/users/lists/create.ts +++ b/packages/backend/src/server/api/endpoints/users/lists/create.ts @@ -4,7 +4,7 @@ */ import { Inject, Injectable } from '@nestjs/common'; -import type { UserListsRepository } from '@/models/index.js'; +import type { MiUserListsRepository } from '@/models/index.js'; import { IdService } from '@/core/IdService.js'; import type { MiUserList } from '@/models/entities/UserList.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; @@ -52,7 +52,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.userListsRepository) - private userListsRepository: UserListsRepository, + private userListsRepository: MiUserListsRepository, private userListEntityService: UserListEntityService, private idService: IdService, diff --git a/packages/backend/src/server/api/endpoints/users/lists/delete.ts b/packages/backend/src/server/api/endpoints/users/lists/delete.ts index adfd396d06..639843cfac 100644 --- a/packages/backend/src/server/api/endpoints/users/lists/delete.ts +++ b/packages/backend/src/server/api/endpoints/users/lists/delete.ts @@ -4,7 +4,7 @@ */ import { Inject, Injectable } from '@nestjs/common'; -import type { UserListsRepository } from '@/models/index.js'; +import type { MiUserListsRepository } from '@/models/index.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import { DI } from '@/di-symbols.js'; import { ApiError } from '../../../error.js'; @@ -40,7 +40,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.userListsRepository) - private userListsRepository: UserListsRepository, + private userListsRepository: MiUserListsRepository, ) { super(meta, paramDef, async (ps, me) => { const userList = await this.userListsRepository.findOneBy({ diff --git a/packages/backend/src/server/api/endpoints/users/lists/favorite.ts b/packages/backend/src/server/api/endpoints/users/lists/favorite.ts index 0c4a965605..63e51fbb4b 100644 --- a/packages/backend/src/server/api/endpoints/users/lists/favorite.ts +++ b/packages/backend/src/server/api/endpoints/users/lists/favorite.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { UserListFavoritesRepository, UserListsRepository } from '@/models/index.js'; +import type { MiUserListFavoritesRepository, MiUserListsRepository } from '@/models/index.js'; import { IdService } from '@/core/IdService.js'; import { ApiError } from '@/server/api/error.js'; import { DI } from '@/di-symbols.js'; @@ -39,10 +39,10 @@ export const paramDef = { export default class extends Endpoint { constructor ( @Inject(DI.userListsRepository) - private userListsRepository: UserListsRepository, + private userListsRepository: MiUserListsRepository, @Inject(DI.userListFavoritesRepository) - private userListFavoritesRepository: UserListFavoritesRepository, + private userListFavoritesRepository: MiUserListFavoritesRepository, private idService: IdService, ) { super(meta, paramDef, async (ps, me) => { diff --git a/packages/backend/src/server/api/endpoints/users/lists/list.ts b/packages/backend/src/server/api/endpoints/users/lists/list.ts index db481fc2e4..7a783e598f 100644 --- a/packages/backend/src/server/api/endpoints/users/lists/list.ts +++ b/packages/backend/src/server/api/endpoints/users/lists/list.ts @@ -4,7 +4,7 @@ */ import { Inject, Injectable } from '@nestjs/common'; -import type { UserListsRepository, UsersRepository } from '@/models/index.js'; +import type { MiUserListsRepository, MiUsersRepository } from '@/models/index.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import { UserListEntityService } from '@/core/entities/UserListEntityService.js'; import { ApiError } from '@/server/api/error.js'; @@ -59,10 +59,10 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.usersRepository) - private usersRepository: UsersRepository, + private usersRepository: MiUsersRepository, @Inject(DI.userListsRepository) - private userListsRepository: UserListsRepository, + private userListsRepository: MiUserListsRepository, private userListEntityService: UserListEntityService, ) { diff --git a/packages/backend/src/server/api/endpoints/users/lists/pull.ts b/packages/backend/src/server/api/endpoints/users/lists/pull.ts index 59e765d5d0..5210f47924 100644 --- a/packages/backend/src/server/api/endpoints/users/lists/pull.ts +++ b/packages/backend/src/server/api/endpoints/users/lists/pull.ts @@ -4,7 +4,7 @@ */ import { Inject, Injectable } from '@nestjs/common'; -import type { UserListsRepository, UserListJoiningsRepository } from '@/models/index.js'; +import type { MiUserListsRepository, MiUserListJoiningsRepository } from '@/models/index.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import { UserEntityService } from '@/core/entities/UserEntityService.js'; import { GetterService } from '@/server/api/GetterService.js'; @@ -52,10 +52,10 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.userListsRepository) - private userListsRepository: UserListsRepository, + private userListsRepository: MiUserListsRepository, @Inject(DI.userListJoiningsRepository) - private userListJoiningsRepository: UserListJoiningsRepository, + private userListJoiningsRepository: MiUserListJoiningsRepository, private userEntityService: UserEntityService, private getterService: GetterService, diff --git a/packages/backend/src/server/api/endpoints/users/lists/push.ts b/packages/backend/src/server/api/endpoints/users/lists/push.ts index 831c0f6837..2b5b2a345e 100644 --- a/packages/backend/src/server/api/endpoints/users/lists/push.ts +++ b/packages/backend/src/server/api/endpoints/users/lists/push.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import ms from 'ms'; -import type { UserListsRepository, UserListJoiningsRepository, BlockingsRepository } from '@/models/index.js'; +import type { MiUserListsRepository, MiUserListJoiningsRepository, MiBlockingsRepository } from '@/models/index.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import { GetterService } from '@/server/api/GetterService.js'; import { UserListService } from '@/core/UserListService.js'; @@ -75,13 +75,13 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.userListsRepository) - private userListsRepository: UserListsRepository, + private userListsRepository: MiUserListsRepository, @Inject(DI.userListJoiningsRepository) - private userListJoiningsRepository: UserListJoiningsRepository, + private userListJoiningsRepository: MiUserListJoiningsRepository, @Inject(DI.blockingsRepository) - private blockingsRepository: BlockingsRepository, + private blockingsRepository: MiBlockingsRepository, private getterService: GetterService, private userListService: UserListService, diff --git a/packages/backend/src/server/api/endpoints/users/lists/show.ts b/packages/backend/src/server/api/endpoints/users/lists/show.ts index cb86e25d92..b1c37e1898 100644 --- a/packages/backend/src/server/api/endpoints/users/lists/show.ts +++ b/packages/backend/src/server/api/endpoints/users/lists/show.ts @@ -4,7 +4,7 @@ */ import { Inject, Injectable } from '@nestjs/common'; -import type { UserListsRepository, UserListFavoritesRepository } from '@/models/index.js'; +import type { MiUserListsRepository, MiUserListFavoritesRepository } from '@/models/index.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import { UserListEntityService } from '@/core/entities/UserListEntityService.js'; import { DI } from '@/di-symbols.js'; @@ -47,10 +47,10 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.userListsRepository) - private userListsRepository: UserListsRepository, + private userListsRepository: MiUserListsRepository, @Inject(DI.userListFavoritesRepository) - private userListFavoritesRepository: UserListFavoritesRepository, + private userListFavoritesRepository: MiUserListFavoritesRepository, private userListEntityService: UserListEntityService, ) { diff --git a/packages/backend/src/server/api/endpoints/users/lists/unfavorite.ts b/packages/backend/src/server/api/endpoints/users/lists/unfavorite.ts index 280a062855..2b0d13a6b3 100644 --- a/packages/backend/src/server/api/endpoints/users/lists/unfavorite.ts +++ b/packages/backend/src/server/api/endpoints/users/lists/unfavorite.ts @@ -5,7 +5,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import type { UserListFavoritesRepository, UserListsRepository } from '@/models/index.js'; +import type { MiUserListFavoritesRepository, MiUserListsRepository } from '@/models/index.js'; import { ApiError } from '@/server/api/error.js'; import { DI } from '@/di-symbols.js'; @@ -38,10 +38,10 @@ export const paramDef = { export default class extends Endpoint { constructor ( @Inject(DI.userListsRepository) - private userListsRepository: UserListsRepository, + private userListsRepository: MiUserListsRepository, @Inject(DI.userListFavoritesRepository) - private userListFavoritesRepository: UserListFavoritesRepository, + private userListFavoritesRepository: MiUserListFavoritesRepository, ) { super(meta, paramDef, async (ps, me) => { const userListExist = await this.userListsRepository.exist({ diff --git a/packages/backend/src/server/api/endpoints/users/lists/update.ts b/packages/backend/src/server/api/endpoints/users/lists/update.ts index cbc18c8da8..97a6a30677 100644 --- a/packages/backend/src/server/api/endpoints/users/lists/update.ts +++ b/packages/backend/src/server/api/endpoints/users/lists/update.ts @@ -4,7 +4,7 @@ */ import { Inject, Injectable } from '@nestjs/common'; -import type { UserListsRepository } from '@/models/index.js'; +import type { MiUserListsRepository } from '@/models/index.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import { UserListEntityService } from '@/core/entities/UserListEntityService.js'; import { DI } from '@/di-symbols.js'; @@ -49,7 +49,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.userListsRepository) - private userListsRepository: UserListsRepository, + private userListsRepository: MiUserListsRepository, private userListEntityService: UserListEntityService, ) { diff --git a/packages/backend/src/server/api/endpoints/users/notes.ts b/packages/backend/src/server/api/endpoints/users/notes.ts index 1bd849284a..38188b97fe 100644 --- a/packages/backend/src/server/api/endpoints/users/notes.ts +++ b/packages/backend/src/server/api/endpoints/users/notes.ts @@ -5,7 +5,7 @@ import { Brackets } from 'typeorm'; import { Inject, Injectable } from '@nestjs/common'; -import type { NotesRepository } from '@/models/index.js'; +import type { MiNotesRepository } from '@/models/index.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import { QueryService } from '@/core/QueryService.js'; import { NoteEntityService } from '@/core/entities/NoteEntityService.js'; @@ -62,7 +62,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.notesRepository) - private notesRepository: NotesRepository, + private notesRepository: MiNotesRepository, private noteEntityService: NoteEntityService, private queryService: QueryService, diff --git a/packages/backend/src/server/api/endpoints/users/pages.ts b/packages/backend/src/server/api/endpoints/users/pages.ts index 48c2b12303..b5649bd86e 100644 --- a/packages/backend/src/server/api/endpoints/users/pages.ts +++ b/packages/backend/src/server/api/endpoints/users/pages.ts @@ -7,7 +7,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import { QueryService } from '@/core/QueryService.js'; import { PageEntityService } from '@/core/entities/PageEntityService.js'; -import type { PagesRepository } from '@/models/index.js'; +import type { MiPagesRepository } from '@/models/index.js'; import { DI } from '@/di-symbols.js'; export const meta = { @@ -42,7 +42,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.pagesRepository) - private pagesRepository: PagesRepository, + private pagesRepository: MiPagesRepository, private pageEntityService: PageEntityService, private queryService: QueryService, diff --git a/packages/backend/src/server/api/endpoints/users/reactions.ts b/packages/backend/src/server/api/endpoints/users/reactions.ts index d65cdcfdb9..fc8a61ab89 100644 --- a/packages/backend/src/server/api/endpoints/users/reactions.ts +++ b/packages/backend/src/server/api/endpoints/users/reactions.ts @@ -4,7 +4,7 @@ */ import { Inject, Injectable } from '@nestjs/common'; -import type { UserProfilesRepository, NoteReactionsRepository } from '@/models/index.js'; +import type { MiUserProfilesRepository, MiNoteReactionsRepository } from '@/models/index.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import { QueryService } from '@/core/QueryService.js'; import { NoteReactionEntityService } from '@/core/entities/NoteReactionEntityService.js'; @@ -55,10 +55,10 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.userProfilesRepository) - private userProfilesRepository: UserProfilesRepository, + private userProfilesRepository: MiUserProfilesRepository, @Inject(DI.noteReactionsRepository) - private noteReactionsRepository: NoteReactionsRepository, + private noteReactionsRepository: MiNoteReactionsRepository, private noteReactionEntityService: NoteReactionEntityService, private queryService: QueryService, diff --git a/packages/backend/src/server/api/endpoints/users/recommendation.ts b/packages/backend/src/server/api/endpoints/users/recommendation.ts index 1988d9795d..0fa21c7b92 100644 --- a/packages/backend/src/server/api/endpoints/users/recommendation.ts +++ b/packages/backend/src/server/api/endpoints/users/recommendation.ts @@ -5,7 +5,7 @@ import ms from 'ms'; import { Inject, Injectable } from '@nestjs/common'; -import type { UsersRepository, FollowingsRepository } from '@/models/index.js'; +import type { MiUsersRepository, MiFollowingsRepository } from '@/models/index.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import { QueryService } from '@/core/QueryService.js'; import { UserEntityService } from '@/core/entities/UserEntityService.js'; @@ -45,10 +45,10 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.usersRepository) - private usersRepository: UsersRepository, + private usersRepository: MiUsersRepository, @Inject(DI.followingsRepository) - private followingsRepository: FollowingsRepository, + private followingsRepository: MiFollowingsRepository, private userEntityService: UserEntityService, private queryService: QueryService, diff --git a/packages/backend/src/server/api/endpoints/users/report-abuse.ts b/packages/backend/src/server/api/endpoints/users/report-abuse.ts index 03bcc14f76..b522427d37 100644 --- a/packages/backend/src/server/api/endpoints/users/report-abuse.ts +++ b/packages/backend/src/server/api/endpoints/users/report-abuse.ts @@ -5,7 +5,7 @@ import sanitizeHtml from 'sanitize-html'; import { Inject, Injectable } from '@nestjs/common'; -import type { AbuseUserReportsRepository } from '@/models/index.js'; +import type { MiAbuseUserReportsRepository } from '@/models/index.js'; import { IdService } from '@/core/IdService.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import { GlobalEventService } from '@/core/GlobalEventService.js'; @@ -58,7 +58,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.abuseUserReportsRepository) - private abuseUserReportsRepository: AbuseUserReportsRepository, + private abuseUserReportsRepository: MiAbuseUserReportsRepository, private idService: IdService, private metaService: MetaService, diff --git a/packages/backend/src/server/api/endpoints/users/search-by-username-and-host.ts b/packages/backend/src/server/api/endpoints/users/search-by-username-and-host.ts index ee35d298a4..057f1ebee8 100644 --- a/packages/backend/src/server/api/endpoints/users/search-by-username-and-host.ts +++ b/packages/backend/src/server/api/endpoints/users/search-by-username-and-host.ts @@ -5,7 +5,7 @@ import { Brackets } from 'typeorm'; import { Inject, Injectable } from '@nestjs/common'; -import type { UsersRepository, FollowingsRepository } from '@/models/index.js'; +import type { MiUsersRepository, MiFollowingsRepository } from '@/models/index.js'; import type { Config } from '@/config.js'; import type { MiUser } from '@/models/entities/User.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; @@ -54,10 +54,10 @@ export default class extends Endpoint { private config: Config, @Inject(DI.usersRepository) - private usersRepository: UsersRepository, + private usersRepository: MiUsersRepository, @Inject(DI.followingsRepository) - private followingsRepository: FollowingsRepository, + private followingsRepository: MiFollowingsRepository, private userEntityService: UserEntityService, ) { diff --git a/packages/backend/src/server/api/endpoints/users/search.ts b/packages/backend/src/server/api/endpoints/users/search.ts index 3d6aa1ac9e..fd7046b018 100644 --- a/packages/backend/src/server/api/endpoints/users/search.ts +++ b/packages/backend/src/server/api/endpoints/users/search.ts @@ -5,7 +5,7 @@ import { Brackets } from 'typeorm'; import { Inject, Injectable } from '@nestjs/common'; -import type { UsersRepository, UserProfilesRepository } from '@/models/index.js'; +import type { MiUsersRepository, MiUserProfilesRepository } from '@/models/index.js'; import type { MiUser } from '@/models/entities/User.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import { UserEntityService } from '@/core/entities/UserEntityService.js'; @@ -47,10 +47,10 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.usersRepository) - private usersRepository: UsersRepository, + private usersRepository: MiUsersRepository, @Inject(DI.userProfilesRepository) - private userProfilesRepository: UserProfilesRepository, + private userProfilesRepository: MiUserProfilesRepository, private userEntityService: UserEntityService, ) { diff --git a/packages/backend/src/server/api/endpoints/users/show.ts b/packages/backend/src/server/api/endpoints/users/show.ts index fb8a5c5941..569bdc1a5e 100644 --- a/packages/backend/src/server/api/endpoints/users/show.ts +++ b/packages/backend/src/server/api/endpoints/users/show.ts @@ -5,7 +5,7 @@ import { In, IsNull } from 'typeorm'; import { Inject, Injectable } from '@nestjs/common'; -import type { UsersRepository } from '@/models/index.js'; +import type { MiUsersRepository } from '@/models/index.js'; import type { MiUser } from '@/models/entities/User.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import { UserEntityService } from '@/core/entities/UserEntityService.js'; @@ -84,7 +84,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.usersRepository) - private usersRepository: UsersRepository, + private usersRepository: MiUsersRepository, private userEntityService: UserEntityService, private remoteUserResolveService: RemoteUserResolveService, diff --git a/packages/backend/src/server/api/endpoints/users/update-memo.ts b/packages/backend/src/server/api/endpoints/users/update-memo.ts index a100c3aa9c..399420b057 100644 --- a/packages/backend/src/server/api/endpoints/users/update-memo.ts +++ b/packages/backend/src/server/api/endpoints/users/update-memo.ts @@ -6,7 +6,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import { IdService } from '@/core/IdService.js'; -import type { UserMemoRepository } from '@/models/index.js'; +import type { MiUserMemoRepository } from '@/models/index.js'; import { DI } from '@/di-symbols.js'; import { GetterService } from '@/server/api/GetterService.js'; import { ApiError } from '../../error.js'; @@ -45,7 +45,7 @@ export const paramDef = { export default class extends Endpoint { constructor( @Inject(DI.userMemosRepository) - private userMemosRepository: UserMemoRepository, + private userMemosRepository: MiUserMemoRepository, private getterService: GetterService, private idService: IdService, ) { diff --git a/packages/backend/src/server/api/stream/channels/user-list.ts b/packages/backend/src/server/api/stream/channels/user-list.ts index 557b934722..825e521df6 100644 --- a/packages/backend/src/server/api/stream/channels/user-list.ts +++ b/packages/backend/src/server/api/stream/channels/user-list.ts @@ -4,7 +4,7 @@ */ import { Inject, Injectable } from '@nestjs/common'; -import type { UserListJoiningsRepository, UserListsRepository } from '@/models/index.js'; +import type { MiUserListJoiningsRepository, MiUserListsRepository } from '@/models/index.js'; import type { MiUser } from '@/models/entities/User.js'; import { isUserRelated } from '@/misc/is-user-related.js'; import type { Packed } from '@/misc/json-schema.js'; @@ -22,8 +22,8 @@ class UserListChannel extends Channel { private listUsersClock: NodeJS.Timer; constructor( - private userListsRepository: UserListsRepository, - private userListJoiningsRepository: UserListJoiningsRepository, + private userListsRepository: MiUserListsRepository, + private userListJoiningsRepository: MiUserListJoiningsRepository, private noteEntityService: NoteEntityService, id: string, @@ -122,10 +122,10 @@ export class UserListChannelService { constructor( @Inject(DI.userListsRepository) - private userListsRepository: UserListsRepository, + private userListsRepository: MiUserListsRepository, @Inject(DI.userListJoiningsRepository) - private userListJoiningsRepository: UserListJoiningsRepository, + private userListJoiningsRepository: MiUserListJoiningsRepository, private noteEntityService: NoteEntityService, ) { diff --git a/packages/backend/src/server/oauth/OAuth2ProviderService.ts b/packages/backend/src/server/oauth/OAuth2ProviderService.ts index 6ad8da0ced..623996cda1 100644 --- a/packages/backend/src/server/oauth/OAuth2ProviderService.ts +++ b/packages/backend/src/server/oauth/OAuth2ProviderService.ts @@ -23,7 +23,7 @@ import { kinds } from '@/misc/api-permissions.js'; import type { Config } from '@/config.js'; import { DI } from '@/di-symbols.js'; import { bindThis } from '@/decorators.js'; -import type { AccessTokensRepository, UsersRepository } from '@/models/index.js'; +import type { MiAccessTokensRepository, MiUsersRepository } from '@/models/index.js'; import { IdService } from '@/core/IdService.js'; import { CacheService } from '@/core/CacheService.js'; import type { MiLocalUser } from '@/models/entities/User.js'; @@ -236,10 +236,10 @@ export class OAuth2ProviderService { private config: Config, private httpRequestService: HttpRequestService, @Inject(DI.accessTokensRepository) - accessTokensRepository: AccessTokensRepository, + accessTokensRepository: MiAccessTokensRepository, idService: IdService, @Inject(DI.usersRepository) - private usersRepository: UsersRepository, + private usersRepository: MiUsersRepository, private cacheService: CacheService, loggerService: LoggerService, ) { diff --git a/packages/backend/src/server/web/ClientServerService.ts b/packages/backend/src/server/web/ClientServerService.ts index b2b443cf36..b5e280e648 100644 --- a/packages/backend/src/server/web/ClientServerService.ts +++ b/packages/backend/src/server/web/ClientServerService.ts @@ -31,7 +31,7 @@ import { PageEntityService } from '@/core/entities/PageEntityService.js'; import { GalleryPostEntityService } from '@/core/entities/GalleryPostEntityService.js'; import { ClipEntityService } from '@/core/entities/ClipEntityService.js'; import { ChannelEntityService } from '@/core/entities/ChannelEntityService.js'; -import type { ChannelsRepository, ClipsRepository, FlashsRepository, GalleryPostsRepository, MiMeta, NotesRepository, PagesRepository, UserProfilesRepository, UsersRepository } from '@/models/index.js'; +import type { MiChannelsRepository, MiClipsRepository, MiFlashsRepository, MiGalleryPostsRepository, MiMeta, MiNotesRepository, MiPagesRepository, MiUserProfilesRepository, MiUsersRepository } from '@/models/index.js'; import type Logger from '@/logger.js'; import { deepClone } from '@/misc/clone.js'; import { bindThis } from '@/decorators.js'; @@ -61,28 +61,28 @@ export class ClientServerService { private config: Config, @Inject(DI.usersRepository) - private usersRepository: UsersRepository, + private usersRepository: MiUsersRepository, @Inject(DI.userProfilesRepository) - private userProfilesRepository: UserProfilesRepository, + private userProfilesRepository: MiUserProfilesRepository, @Inject(DI.notesRepository) - private notesRepository: NotesRepository, + private notesRepository: MiNotesRepository, @Inject(DI.galleryPostsRepository) - private galleryPostsRepository: GalleryPostsRepository, + private galleryPostsRepository: MiGalleryPostsRepository, @Inject(DI.channelsRepository) - private channelsRepository: ChannelsRepository, + private channelsRepository: MiChannelsRepository, @Inject(DI.clipsRepository) - private clipsRepository: ClipsRepository, + private clipsRepository: MiClipsRepository, @Inject(DI.pagesRepository) - private pagesRepository: PagesRepository, + private pagesRepository: MiPagesRepository, @Inject(DI.flashsRepository) - private flashsRepository: FlashsRepository, + private flashsRepository: MiFlashsRepository, private flashEntityService: FlashEntityService, private userEntityService: UserEntityService, diff --git a/packages/backend/src/server/web/FeedService.ts b/packages/backend/src/server/web/FeedService.ts index 27e8431839..920a6a1079 100644 --- a/packages/backend/src/server/web/FeedService.ts +++ b/packages/backend/src/server/web/FeedService.ts @@ -7,7 +7,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { In, IsNull } from 'typeorm'; import { Feed } from 'feed'; import { DI } from '@/di-symbols.js'; -import type { DriveFilesRepository, NotesRepository, UserProfilesRepository } from '@/models/index.js'; +import type { MiDriveFilesRepository, MiNotesRepository, MiUserProfilesRepository } from '@/models/index.js'; import type { Config } from '@/config.js'; import type { MiUser } from '@/models/entities/User.js'; import { UserEntityService } from '@/core/entities/UserEntityService.js'; @@ -21,13 +21,13 @@ export class FeedService { private config: Config, @Inject(DI.userProfilesRepository) - private userProfilesRepository: UserProfilesRepository, + private userProfilesRepository: MiUserProfilesRepository, @Inject(DI.notesRepository) - private notesRepository: NotesRepository, + private notesRepository: MiNotesRepository, @Inject(DI.driveFilesRepository) - private driveFilesRepository: DriveFilesRepository, + private driveFilesRepository: MiDriveFilesRepository, private userEntityService: UserEntityService, private driveFileEntityService: DriveFileEntityService,