refactor: prefix Mi for all entities (misskey-dev#11719) (MisskeyIO#160)

cheery-pick from misskey-dev@792622aeadf3e36d50cddec3c64b2ff0105ea927

packages/backend/test/unit/AnnouncementService.ts

@@ -8,7 +8,7 @@ process.env.NODE_ENV = 'test';
 import { ModuleMocker } from 'jest-mock';
 import { Test } from '@nestjs/testing';
 import { jest } from '@jest/globals';
-import type { Announcement, AnnouncementsRepository, AnnouncementReadsRepository, UsersRepository, User } from '@/models/index.js';
+import type { MiAnnouncement, AnnouncementsRepository, AnnouncementReadsRepository, UsersRepository, MiUser } from '@/models/index.js';
 import { secureRndstr } from '@/misc/secure-rndstr.js';
 import { GlobalModule } from '@/GlobalModule.js';
 import { IdService } from '@/core/IdService.js';
@@ -31,7 +31,7 @@ describe('AnnouncementService', () => {
 	let announcementReadsRepository: AnnouncementReadsRepository;
 	let globalEventService: jest.Mocked<GlobalEventService>;
 
-	function createUser(data: Partial<User> = {}) {
+	function createUser(data: Partial<MiUser> = {}) {
 		const un = secureRndstr(16);
 		return usersRepository.insert({
 			id: genAid(new Date()),
@@ -43,7 +43,7 @@ describe('AnnouncementService', () => {
 			.then(x => usersRepository.findOneByOrFail(x.identifiers[0]));
 	}
 
-	function createAnnouncement(data: Partial<Announcement> = {}) {
+	function createAnnouncement(data: Partial<MiAnnouncement> = {}) {
 		return announcementsRepository.insert({
 			id: genAid(new Date()),
 			createdAt: new Date(),

packages/backend/test/unit/RoleService.ts

@@ -11,7 +11,7 @@ import { Test } from '@nestjs/testing';
 import * as lolex from '@sinonjs/fake-timers';
 import { GlobalModule } from '@/GlobalModule.js';
 import { RoleService } from '@/core/RoleService.js';
-import type { Role, RolesRepository, RoleAssignmentsRepository, UsersRepository, User } from '@/models/index.js';
+import type { MiRole, RolesRepository, RoleAssignmentsRepository, UsersRepository, MiUser } from '@/models/index.js';
 import { DI } from '@/di-symbols.js';
 import { MetaService } from '@/core/MetaService.js';
 import { genAid } from '@/misc/id/aid.js';
@@ -34,7 +34,7 @@ describe('RoleService', () => {
 	let metaService: jest.Mocked<MetaService>;
 	let clock: lolex.InstalledClock;
 
-	function createUser(data: Partial<User> = {}) {
+	function createUser(data: Partial<MiUser> = {}) {
 		const un = secureRndstr(16);
 		return usersRepository.insert({
 			id: genAid(new Date()),
@@ -46,7 +46,7 @@ describe('RoleService', () => {
 			.then(x => usersRepository.findOneByOrFail(x.identifiers[0]));
 	}
 
-	function createRole(data: Partial<Role> = {}) {
+	function createRole(data: Partial<MiRole> = {}) {
 		return rolesRepository.insert({
 			id: genAid(new Date()),
 			createdAt: new Date(),

packages/backend/test/unit/S3Service.ts

@@ -11,7 +11,7 @@ import { mockClient } from 'aws-sdk-client-mock';
 import { GlobalModule } from '@/GlobalModule.js';
 import { CoreModule } from '@/core/CoreModule.js';
 import { S3Service } from '@/core/S3Service';
-import { Meta } from '@/models';
+import { MiMeta } from '@/models';
 import type { TestingModule } from '@nestjs/testing';
 
 describe('S3Service', () => {
@@ -40,7 +40,7 @@ describe('S3Service', () => {
 		test('upload a file', async () => {
 			s3Mock.on(PutObjectCommand).resolves({});
 
-			await s3Service.upload({ objectStorageRegion: 'us-east-1' } as Meta, {
+			await s3Service.upload({ objectStorageRegion: 'us-east-1' } as MiMeta, {
 				Bucket: 'fake',
 				Key: 'fake',
 				Body: 'x',
@@ -52,7 +52,7 @@ describe('S3Service', () => {
 			s3Mock.on(UploadPartCommand).resolves({ ETag: '1' });
 			s3Mock.on(CompleteMultipartUploadCommand).resolves({ Bucket: 'fake', Key: 'fake' });
 
-			await s3Service.upload({} as Meta, {
+			await s3Service.upload({} as MiMeta, {
 				Bucket: 'fake',
 				Key: 'fake',
 				Body: 'x'.repeat(8 * 1024 * 1024 + 1), // デフォルトpartSizeにしている 8 * 1024 * 1024 を越えるサイズ
@@ -62,7 +62,7 @@ describe('S3Service', () => {
 		test('upload a file error', async () => {
 			s3Mock.on(PutObjectCommand).rejects({ name: 'Fake Error' });
 
-			await expect(s3Service.upload({ objectStorageRegion: 'us-east-1' } as Meta, {
+			await expect(s3Service.upload({ objectStorageRegion: 'us-east-1' } as MiMeta, {
 				Bucket: 'fake',
 				Key: 'fake',
 				Body: 'x',
@@ -72,7 +72,7 @@ describe('S3Service', () => {
 		test('upload a large file error', async () => {
 			s3Mock.on(UploadPartCommand).rejects();
 
-			await expect(s3Service.upload({} as Meta, {
+			await expect(s3Service.upload({} as MiMeta, {
 				Bucket: 'fake',
 				Key: 'fake',
 				Body: 'x'.repeat(8 * 1024 * 1024 + 1), // デフォルトpartSizeにしている 8 * 1024 * 1024 を越えるサイズ

packages/backend/test/unit/activitypub.ts

@@ -18,11 +18,11 @@ import { CoreModule } from '@/core/CoreModule.js';
 import { FederatedInstanceService } from '@/core/FederatedInstanceService.js';
 import { LoggerService } from '@/core/LoggerService.js';
 import type { IActor, IApDocument, ICollection, IPost } from '@/core/activitypub/type.js';
-import { Meta, Note } from '@/models/index.js';
+import { MiMeta, MiNote } from '@/models/index.js';
 import { secureRndstr } from '@/misc/secure-rndstr.js';
 import { DownloadService } from '@/core/DownloadService.js';
 import { MetaService } from '@/core/MetaService.js';
-import type { RemoteUser } from '@/models/entities/User.js';
+import type { MiRemoteUser } from '@/models/entities/User.js';
 import { MockResolver } from '../misc/mock-resolver.js';
 
 const host = 'https://host1.test';
@@ -75,7 +75,7 @@ function createRandomFeaturedCollection(actor: NonTransientIActor, length: numbe
 async function createRandomRemoteUser(
 	resolver: MockResolver,
 	personService: ApPersonService,
-): Promise<RemoteUser> {
+): Promise<MiRemoteUser> {
 	const actor = createRandomActor();
 	resolver.register(actor.id, actor);
 
@@ -94,7 +94,7 @@ describe('ActivityPub', () => {
 		cacheRemoteSensitiveFiles: true,
 		blockedHosts: [] as string[],
 		sensitiveWords: [] as string[],
-	} as Meta;
+	} as MiMeta;
 	let meta = metaInitial;
 
 	beforeAll(async () => {
@@ -109,7 +109,7 @@ describe('ActivityPub', () => {
 				},
 			})
 			.overrideProvider(MetaService).useValue({
-				async fetch(): Promise<Meta> {
+				async fetch(): Promise<MiMeta> {
 					return meta;
 				},
 			}).compile();
@@ -199,7 +199,7 @@ describe('ActivityPub', () => {
 			rendererService.renderAnnounce(null, {
 				createdAt: new Date(0),
 				visibility: 'followers',
-			} as Note);
+			} as MiNote);
 		});
 	});