From ceeeec03fb68a001c19f55aa4d676d5944624dfb Mon Sep 17 00:00:00 2001 From: GrapeApple0 <84321396+GrapeApple0@users.noreply.github.com> Date: Fri, 14 Jun 2024 04:54:42 +0000 Subject: [PATCH] =?UTF-8?q?wip:=20=E3=83=AA=E3=83=9D=E3=82=B8=E3=83=88?= =?UTF-8?q?=E3=83=AA=E3=81=AE=E8=A8=98=E5=85=A5=E5=BF=98=E3=82=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/backend/src/core/NoteEditService.ts | 6 +++--- packages/backend/src/models/NoteHistory.ts | 2 +- packages/backend/src/models/RepositoryModule.ts | 13 +++++++++++-- 3 files changed, 15 insertions(+), 6 deletions(-) diff --git a/packages/backend/src/core/NoteEditService.ts b/packages/backend/src/core/NoteEditService.ts index ecb17bcb17..099de8f5e9 100644 --- a/packages/backend/src/core/NoteEditService.ts +++ b/packages/backend/src/core/NoteEditService.ts @@ -88,9 +88,6 @@ export class NoteEditService implements OnApplicationShutdown { @Inject(DI.notesRepository) private notesRepository: NotesRepository, - @Inject(DI.noteHistoryRepository) - private noteHistoryRepository: NoteHistoryRepository, - @Inject(DI.instancesRepository) private instancesRepository: InstancesRepository, @@ -109,6 +106,9 @@ export class NoteEditService implements OnApplicationShutdown { @Inject(DI.driveFilesRepository) private driveFilesRepository: DriveFilesRepository, + @Inject(DI.noteHistoryRepository) + private noteHistoryRepository: NoteHistoryRepository, + private userEntityService: UserEntityService, private noteEntityService: NoteEntityService, private idService: IdService, diff --git a/packages/backend/src/models/NoteHistory.ts b/packages/backend/src/models/NoteHistory.ts index 36ea4635f4..73f21caaf5 100644 --- a/packages/backend/src/models/NoteHistory.ts +++ b/packages/backend/src/models/NoteHistory.ts @@ -9,7 +9,7 @@ import { MiUser } from './User.js'; import { MiNote } from './Note.js'; import type { MiDriveFile } from './DriveFile.js'; -@Entity('note_history') +@Entity('history') export class MiNoteHistory { @PrimaryColumn(id()) public id: string; diff --git a/packages/backend/src/models/RepositoryModule.ts b/packages/backend/src/models/RepositoryModule.ts index ea0f88baba..042f97a44f 100644 --- a/packages/backend/src/models/RepositoryModule.ts +++ b/packages/backend/src/models/RepositoryModule.ts @@ -3,7 +3,6 @@ * SPDX-License-Identifier: AGPL-3.0-only */ -import type { Provider } from '@nestjs/common'; import { Module } from '@nestjs/common'; import { DI } from '@/di-symbols.js'; import { @@ -41,6 +40,7 @@ import { MiMuting, MiNote, MiNoteFavorite, + MiNoteHistory, MiNoteReaction, MiNoteThreadMuting, MiNoteUnread, @@ -77,8 +77,9 @@ import { MiUserProfile, MiUserPublickey, MiUserSecurityKey, - MiWebhook + MiWebhook, } from './_.js'; +import type { Provider } from '@nestjs/common'; import type { DataSource } from 'typeorm'; const $usersRepository: Provider = { @@ -117,6 +118,12 @@ const $avatarDecorationsRepository: Provider = { inject: [DI.db], }; +const $noteHistoryRepository: Provider = { + provide: DI.noteHistoryRepository, + useFactory: (db: DataSource) => db.getRepository(MiNoteHistory).extend(miRepository as MiRepository), + inject: [DI.db], +}; + const $noteFavoritesRepository: Provider = { provide: DI.noteFavoritesRepository, useFactory: (db: DataSource) => db.getRepository(MiNoteFavorite).extend(miRepository as MiRepository), @@ -504,6 +511,7 @@ const $reversiGamesRepository: Provider = { $announcementReadsRepository, $appsRepository, $avatarDecorationsRepository, + $noteHistoryRepository, $noteFavoritesRepository, $noteThreadMutingsRepository, $noteReactionsRepository, @@ -575,6 +583,7 @@ const $reversiGamesRepository: Provider = { $announcementReadsRepository, $appsRepository, $avatarDecorationsRepository, + $noteHistoryRepository, $noteFavoritesRepository, $noteThreadMutingsRepository, $noteReactionsRepository,