sendnrw/misskey
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
cheery-pick from misskey-dev@792622aeadf3e36d50cddec3c64b2ff0105ea927
This commit is contained in:
まっちゃとーにゅ
2023-08-26 08:42:29 +09:00
committed by GitHub
parent 651905e08f
commit 58bbff3738
234 changed files with 2061 additions and 2061 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -6,7 +6,7 @@
import { Inject, Injectable } from '@nestjs/common';
import { IsNull, MoreThan, Not } from 'typeorm';
import { DI } from '@/di-symbols.js';
import type { DriveFile, DriveFilesRepository } from '@/models/index.js';
import type { MiDriveFile, DriveFilesRepository } from '@/models/index.js';
import type { Config } from '@/config.js';
import type Logger from '@/logger.js';
import { DriveService } from '@/core/DriveService.js';
@@ -36,7 +36,7 @@ export class CleanRemoteFilesProcessorService {
this.logger.info('Deleting cached remote files...');
let deletedCount = 0;
let cursor: DriveFile['id'] | null = null;
let cursor: MiDriveFile['id'] | null = null;
while (true) {
const files = await this.driveFilesRepository.find({

12
packages/backend/src/queue/processors/DeleteAccountProcessorService.ts
View File

@@ -10,8 +10,8 @@ import type { DriveFilesRepository, NotesRepository, UserProfilesRepository, Use
import type { Config } from '@/config.js';
import type Logger from '@/logger.js';
import { DriveService } from '@/core/DriveService.js';
import type { DriveFile } from '@/models/entities/DriveFile.js';
import type { Note } from '@/models/entities/Note.js';
import type { MiDriveFile } from '@/models/entities/DriveFile.js';
import type { MiNote } from '@/models/entities/Note.js';
import { EmailService } from '@/core/EmailService.js';
import { bindThis } from '@/decorators.js';
import { SearchService } from '@/core/SearchService.js';
@@ -57,7 +57,7 @@ export class DeleteAccountProcessorService {
}
{ // Delete notes
let cursor: Note['id'] | null = null;
let cursor: MiNote['id'] | null = null;
while (true) {
const notes = await this.notesRepository.find({
@@ -69,7 +69,7 @@ export class DeleteAccountProcessorService {
order: {
id: 1,
},
}) as Note[];
}) as MiNote[];
if (notes.length === 0) {
break;
@@ -88,7 +88,7 @@ export class DeleteAccountProcessorService {
}
{ // Delete files
let cursor: DriveFile['id'] | null = null;
let cursor: MiDriveFile['id'] | null = null;
while (true) {
const files = await this.driveFilesRepository.find({
@@ -100,7 +100,7 @@ export class DeleteAccountProcessorService {
order: {
id: 1,
},
}) as DriveFile[];
}) as MiDriveFile[];
if (files.length === 0) {
break;

4
packages/backend/src/queue/processors/DeleteDriveFilesProcessorService.ts
View File

@@ -6,7 +6,7 @@
import { Inject, Injectable } from '@nestjs/common';
import { MoreThan } from 'typeorm';
import { DI } from '@/di-symbols.js';
import type { UsersRepository, DriveFilesRepository, DriveFile } from '@/models/index.js';
import type { UsersRepository, DriveFilesRepository, MiDriveFile } from '@/models/index.js';
import type { Config } from '@/config.js';
import type Logger from '@/logger.js';
import { DriveService } from '@/core/DriveService.js';
@@ -45,7 +45,7 @@ export class DeleteDriveFilesProcessorService {
}
let deletedCount = 0;
let cursor: DriveFile['id'] | null = null;
let cursor: MiDriveFile['id'] | null = null;
while (true) {
const files = await this.driveFilesRepository.find({

6
packages/backend/src/queue/processors/DeliverProcessorService.ts
View File

@@ -14,7 +14,7 @@ import { ApRequestService } from '@/core/activitypub/ApRequestService.js';
import { FederatedInstanceService } from '@/core/FederatedInstanceService.js';
import { FetchInstanceMetadataService } from '@/core/FetchInstanceMetadataService.js';
import { MemorySingleCache } from '@/misc/cache.js';
import type { Instance } from '@/models/entities/Instance.js';
import type { MiInstance } from '@/models/entities/Instance.js';
import InstanceChart from '@/core/chart/charts/instance.js';
import ApRequestChart from '@/core/chart/charts/ap-request.js';
import FederationChart from '@/core/chart/charts/federation.js';
@@ -27,7 +27,7 @@ import type { DeliverJobData } from '../types.js';
@Injectable()
export class DeliverProcessorService {
private logger: Logger;
private suspendedHostsCache: MemorySingleCache<Instance[]>;
private suspendedHostsCache: MemorySingleCache<MiInstance[]>;
private latest: string | null;
constructor(
@@ -51,7 +51,7 @@ export class DeliverProcessorService {
private queueLoggerService: QueueLoggerService,
) {
this.logger = this.queueLoggerService.logger.createSubLogger('deliver');
this.suspendedHostsCache = new MemorySingleCache<Instance[]>(1000 * 60 * 60);
this.suspendedHostsCache = new MemorySingleCache<MiInstance[]>(1000 * 60 * 60);
}
@bindThis

4
packages/backend/src/queue/processors/ExportAntennasProcessorService.ts
View File

@@ -8,7 +8,7 @@ import { Inject, Injectable } from '@nestjs/common';
import { format as DateFormat } from 'date-fns';
import { In } from 'typeorm';
import { DI } from '@/di-symbols.js';
import type { AntennasRepository, UsersRepository, UserListJoiningsRepository, User } from '@/models/index.js';
import type { AntennasRepository, UsersRepository, UserListJoiningsRepository, MiUser } from '@/models/index.js';
import type { Config } from '@/config.js';
import Logger from '@/logger.js';
import { DriveService } from '@/core/DriveService.js';
@@ -67,7 +67,7 @@ export class ExportAntennasProcessorService {
const antennas = await this.antennsRepository.findBy({ userId: job.data.user.id });
write('[');
for (const [index, antenna] of antennas.entries()) {
let users: User[] | undefined;
let users: MiUser[] | undefined;
if (antenna.userListId !== null) {
const joinings = await this.userListJoiningsRepository.findBy({ userListId: antenna.userListId });
users = await this.usersRepository.findBy({

4
packages/backend/src/queue/processors/ExportBlockingProcessorService.ts
View File

@@ -8,7 +8,7 @@ import { Inject, Injectable } from '@nestjs/common';
import { MoreThan } from 'typeorm';
import { format as dateFormat } from 'date-fns';
import { DI } from '@/di-symbols.js';
import type { UsersRepository, BlockingsRepository, Blocking } from '@/models/index.js';
import type { UsersRepository, BlockingsRepository, MiBlocking } from '@/models/index.js';
import type { Config } from '@/config.js';
import type Logger from '@/logger.js';
import { DriveService } from '@/core/DriveService.js';
@@ -58,7 +58,7 @@ export class ExportBlockingProcessorService {
const stream = fs.createWriteStream(path, { flags: 'a' });
let exportedCount = 0;
let cursor: Blocking['id'] | null = null;
let cursor: MiBlocking['id'] | null = null;
while (true) {
const blockings = await this.blockingsRepository.find({

14
packages/backend/src/queue/processors/ExportFavoritesProcessorService.ts
View File

@@ -8,13 +8,13 @@ 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 { NoteFavorite, NoteFavoritesRepository, NotesRepository, PollsRepository, User, UsersRepository } from '@/models/index.js';
import type { MiNoteFavorite, NoteFavoritesRepository, NotesRepository, PollsRepository, MiUser, UsersRepository } from '@/models/index.js';
import type { Config } from '@/config.js';
import type Logger from '@/logger.js';
import { DriveService } from '@/core/DriveService.js';
import { createTemp } from '@/misc/create-temp.js';
import type { Poll } from '@/models/entities/Poll.js';
import type { Note } from '@/models/entities/Note.js';
import type { MiPoll } from '@/models/entities/Poll.js';
import type { MiNote } from '@/models/entities/Note.js';
import { bindThis } from '@/decorators.js';
import { QueueLoggerService } from '../QueueLoggerService.js';
import type * as Bull from 'bullmq';
@@ -79,7 +79,7 @@ export class ExportFavoritesProcessorService {
await write('[');
let exportedFavoritesCount = 0;
let cursor: NoteFavorite['id'] | null = null;
let cursor: MiNoteFavorite['id'] | null = null;
while (true) {
const favorites = await this.noteFavoritesRepository.find({
@@ -92,7 +92,7 @@ export class ExportFavoritesProcessorService {
id: 1,
},
relations: ['note', 'note.user'],
}) as (NoteFavorite & { note: Note & { user: User } })[];
}) as (MiNoteFavorite & { note: MiNote & { user: MiUser } })[];
if (favorites.length === 0) {
job.updateProgress(100);
@@ -102,7 +102,7 @@ export class ExportFavoritesProcessorService {
cursor = favorites[favorites.length - 1].id;
for (const favorite of favorites) {
let poll: Poll | undefined;
let poll: MiPoll | undefined;
if (favorite.note.hasPoll) {
poll = await this.pollsRepository.findOneByOrFail({ noteId: favorite.note.id });
}
@@ -134,7 +134,7 @@ export class ExportFavoritesProcessorService {
}
}
function serialize(favorite: NoteFavorite & { note: Note & { user: User } }, poll: Poll | null = null): Record<string, unknown> {
function serialize(favorite: MiNoteFavorite & { note: MiNote & { user: MiUser } }, poll: MiPoll | null = null): Record<string, unknown> {
return {
id: favorite.id,
createdAt: favorite.createdAt,

6
packages/backend/src/queue/processors/ExportFollowingProcessorService.ts
View File

@@ -13,7 +13,7 @@ import type { Config } from '@/config.js';
import type Logger from '@/logger.js';
import { DriveService } from '@/core/DriveService.js';
import { createTemp } from '@/misc/create-temp.js';
import type { Following } from '@/models/entities/Following.js';
import type { MiFollowing } from '@/models/entities/Following.js';
import { UtilityService } from '@/core/UtilityService.js';
import { bindThis } from '@/decorators.js';
import { QueueLoggerService } from '../QueueLoggerService.js';
@@ -61,7 +61,7 @@ export class ExportFollowingProcessorService {
try {
const stream = fs.createWriteStream(path, { flags: 'a' });
let cursor: Following['id'] | null = null;
let cursor: MiFollowing['id'] | null = null;
const mutings = job.data.excludeMuting ? await this.mutingsRepository.findBy({
muterId: user.id,
@@ -78,7 +78,7 @@ export class ExportFollowingProcessorService {
order: {
id: 1,
},
}) as Following[];
}) as MiFollowing[];
if (followings.length === 0) {
break;

4
packages/backend/src/queue/processors/ExportMutingProcessorService.ts
View File

@@ -8,7 +8,7 @@ import { Inject, Injectable } from '@nestjs/common';
import { IsNull, MoreThan } from 'typeorm';
import { format as dateFormat } from 'date-fns';
import { DI } from '@/di-symbols.js';
import type { MutingsRepository, UsersRepository, BlockingsRepository, Muting } from '@/models/index.js';
import type { MutingsRepository, UsersRepository, BlockingsRepository, MiMuting } from '@/models/index.js';
import type { Config } from '@/config.js';
import type Logger from '@/logger.js';
import { DriveService } from '@/core/DriveService.js';
@@ -61,7 +61,7 @@ export class ExportMutingProcessorService {
const stream = fs.createWriteStream(path, { flags: 'a' });
let exportedCount = 0;
let cursor: Muting['id'] | null = null;
let cursor: MiMuting['id'] | null = null;
while (true) {
const mutes = await this.mutingsRepository.find({

12
packages/backend/src/queue/processors/ExportNotesProcessorService.ts
View File

@@ -13,8 +13,8 @@ import type { Config } from '@/config.js';
import type Logger from '@/logger.js';
import { DriveService } from '@/core/DriveService.js';
import { createTemp } from '@/misc/create-temp.js';
import type { Poll } from '@/models/entities/Poll.js';
import type { Note } from '@/models/entities/Note.js';
import type { MiPoll } from '@/models/entities/Poll.js';
import type { MiNote } from '@/models/entities/Note.js';
import { bindThis } from '@/decorators.js';
import { DriveFileEntityService } from '@/core/entities/DriveFileEntityService.js';
import { Packed } from '@/misc/json-schema.js';
@@ -80,7 +80,7 @@ export class ExportNotesProcessorService {
await write('[');
let exportedNotesCount = 0;
let cursor: Note['id'] | null = null;
let cursor: MiNote['id'] | null = null;
while (true) {
const notes = await this.notesRepository.find({
@@ -92,7 +92,7 @@ export class ExportNotesProcessorService {
order: {
id: 1,
},
}) as Note[];
}) as MiNote[];
if (notes.length === 0) {
job.updateProgress(100);
@@ -102,7 +102,7 @@ export class ExportNotesProcessorService {
cursor = notes[notes.length - 1].id;
for (const note of notes) {
let poll: Poll | undefined;
let poll: MiPoll | undefined;
if (note.hasPoll) {
poll = await this.pollsRepository.findOneByOrFail({ noteId: note.id });
}
@@ -135,7 +135,7 @@ export class ExportNotesProcessorService {
}
}
function serialize(note: Note, poll: Poll | null = null, files: Packed<'DriveFile'>[]): Record<string, unknown> {
function serialize(note: MiNote, poll: MiPoll | null = null, files: Packed<'DriveFile'>[]): Record<string, unknown> {
return {
id: note.id,
text: note.text,

8
packages/backend/src/queue/processors/InboxProcessorService.ts
View File

@@ -18,8 +18,8 @@ import InstanceChart from '@/core/chart/charts/instance.js';
import ApRequestChart from '@/core/chart/charts/ap-request.js';
import FederationChart from '@/core/chart/charts/federation.js';
import { getApId } from '@/core/activitypub/type.js';
import type { RemoteUser } from '@/models/entities/User.js';
import type { UserPublickey } from '@/models/entities/UserPublickey.js';
import type { MiRemoteUser } from '@/models/entities/User.js';
import type { MiUserPublickey } from '@/models/entities/UserPublickey.js';
import { ApDbResolverService } from '@/core/activitypub/ApDbResolverService.js';
import { StatusError } from '@/misc/status-error.js';
import { UtilityService } from '@/core/UtilityService.js';
@@ -81,8 +81,8 @@ export class InboxProcessorService {
// HTTP-Signature keyIdを元にDBから取得
let authUser: {
user: RemoteUser;
key: UserPublickey | null;
user: MiRemoteUser;
key: MiUserPublickey | null;
} | null = await this.apDbResolverService.getAuthUserFromKeyId(signature.keyId);
// keyIdでわからなければ、activity.actorを元にDBから取得 || activity.actorを元にリモートから取得

4
packages/backend/src/queue/processors/RelationshipProcessorService.ts
View File

@@ -12,7 +12,7 @@ import type Logger from '@/logger.js';
import type { UsersRepository } from '@/models/index.js';
import { DI } from '@/di-symbols.js';
import { LocalUser, RemoteUser } from '@/models/entities/User.js';
import { MiLocalUser, MiRemoteUser } from '@/models/entities/User.js';
import { RelationshipJobData } from '../types.js';
import { QueueLoggerService } from '../QueueLoggerService.js';
import type * as Bull from 'bullmq';
@@ -45,7 +45,7 @@ export class RelationshipProcessorService {
const [follower, followee] = await Promise.all([
this.usersRepository.findOneByOrFail({ id: job.data.from.id }),
this.usersRepository.findOneByOrFail({ id: job.data.to.id }),
]) as [LocalUser | RemoteUser, LocalUser | RemoteUser];
]) as [MiLocalUser | MiRemoteUser, MiLocalUser | MiRemoteUser];
await this.userFollowingService.unfollow(follower, followee, job.data.silent);
return 'ok';
}

22
packages/backend/src/queue/types.ts
View File

@@ -4,11 +4,11 @@
*/
import type { Antenna } from '@/server/api/endpoints/i/import-antennas.js';
import type { DriveFile } from '@/models/entities/DriveFile.js';
import type { Note } from '@/models/entities/Note.js';
import type { User } from '@/models/entities/User.js';
import type { AbuseUserReport } from '@/models/entities/AbuseUserReport.js';
import type { Webhook } from '@/models/entities/Webhook.js';
import type { MiDriveFile } from '@/models/entities/DriveFile.js';
import type { MiNote } from '@/models/entities/Note.js';
import type { MiUser } from '@/models/entities/User.js';
import type { MiAbuseUserReport } from '@/models/entities/AbuseUserReport.js';
import type { MiWebhook } from '@/models/entities/Webhook.js';
import type { IActivity } from '@/core/activitypub/type.js';
import type httpSignature from '@peertube/http-signature';
@@ -79,7 +79,7 @@ export type DbUserDeleteJobData = {
export type DbUserImportJobData = {
user: ThinUser;
fileId: DriveFile['id'];
fileId: MiDriveFile['id'];
};
export type DBAntennaImportJobData = {
@@ -92,7 +92,7 @@ export type DbUserImportToDbJobData = {
target: string;
};
export type DbAbuseReportJobData = AbuseUserReport;
export type DbAbuseReportJobData = MiAbuseUserReport;
export type ObjectStorageJobData = ObjectStorageFileJobData | Record<string, unknown>;
@@ -101,14 +101,14 @@ export type ObjectStorageFileJobData = {
};
export type EndedPollNotificationJobData = {
noteId: Note['id'];
noteId: MiNote['id'];
};
export type WebhookDeliverJobData = {
type: string;
content: unknown;
webhookId: Webhook['id'];
userId: User['id'];
webhookId: MiWebhook['id'];
userId: MiUser['id'];
to: string;
secret: string;
createdAt: number;
@@ -116,5 +116,5 @@ export type WebhookDeliverJobData = {
};
export type ThinUser = {
id: User['id'];
id: MiUser['id'];
};