From a45e264574e042f415943842356e11b7be0bdc87 Mon Sep 17 00:00:00 2001 From: Hazelnoot Date: Thu, 19 Jun 2025 13:53:33 -0400 Subject: [PATCH] rename noteEditRepository to noteEditsRepository, matching other repository names --- packages/backend/src/di-symbols.ts | 2 +- packages/backend/src/models/RepositoryModule.ts | 2 +- packages/backend/src/models/_.ts | 2 +- .../src/queue/processors/DeleteAccountProcessorService.ts | 8 ++++---- packages/backend/src/server/api/GetterService.ts | 8 ++++---- .../backend/src/server/api/endpoints/notes/unrenote.ts | 7 ++++--- .../backend/src/server/api/mastodon/MastodonConverters.ts | 8 ++++---- 7 files changed, 19 insertions(+), 18 deletions(-) diff --git a/packages/backend/src/di-symbols.ts b/packages/backend/src/di-symbols.ts index e2c73562c8..d34431cdea 100644 --- a/packages/backend/src/di-symbols.ts +++ b/packages/backend/src/di-symbols.ts @@ -93,7 +93,7 @@ export const DI = { chatRoomsRepository: Symbol('chatRoomsRepository'), chatRoomMembershipsRepository: Symbol('chatRoomMembershipsRepository'), chatRoomInvitationsRepository: Symbol('chatRoomInvitationsRepository'), - noteEditRepository: Symbol('noteEditRepository'), + noteEditsRepository: Symbol('noteEditsRepository'), bubbleGameRecordsRepository: Symbol('bubbleGameRecordsRepository'), reversiGamesRepository: Symbol('reversiGamesRepository'), noteScheduleRepository: Symbol('noteScheduleRepository'), diff --git a/packages/backend/src/models/RepositoryModule.ts b/packages/backend/src/models/RepositoryModule.ts index 5e0154fe50..476765cc37 100644 --- a/packages/backend/src/models/RepositoryModule.ts +++ b/packages/backend/src/models/RepositoryModule.ts @@ -519,7 +519,7 @@ const $userMemosRepository: Provider = { }; const $noteEditRepository: Provider = { - provide: DI.noteEditRepository, + provide: DI.noteEditsRepository, useFactory: (db: DataSource) => db.getRepository(NoteEdit), inject: [DI.db], }; diff --git a/packages/backend/src/models/_.ts b/packages/backend/src/models/_.ts index 071945646a..1e742b0bf8 100644 --- a/packages/backend/src/models/_.ts +++ b/packages/backend/src/models/_.ts @@ -326,5 +326,5 @@ export type ChatRoomInvitationsRepository = Repository & M export type ChatApprovalsRepository = Repository & MiRepository; export type BubbleGameRecordsRepository = Repository & MiRepository; export type ReversiGamesRepository = Repository & MiRepository; -export type NoteEditRepository = Repository & MiRepository; +export type NoteEditsRepository = Repository & MiRepository; export type NoteScheduleRepository = Repository & MiRepository; diff --git a/packages/backend/src/queue/processors/DeleteAccountProcessorService.ts b/packages/backend/src/queue/processors/DeleteAccountProcessorService.ts index 06a4b7ab7f..d4a32f6249 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 { In, MoreThan } from 'typeorm'; import { DI } from '@/di-symbols.js'; -import type { DriveFilesRepository, NoteReactionsRepository, NotesRepository, UserProfilesRepository, UsersRepository, NoteScheduleRepository, MiNoteSchedule, FollowingsRepository, FollowRequestsRepository, BlockingsRepository, MutingsRepository, ClipsRepository, ClipNotesRepository, LatestNotesRepository, NoteEditRepository, NoteFavoritesRepository, PollVotesRepository, PollsRepository, SigninsRepository, UserIpsRepository, RegistryItemsRepository } from '@/models/_.js'; +import type { DriveFilesRepository, NoteReactionsRepository, NotesRepository, UserProfilesRepository, UsersRepository, NoteScheduleRepository, MiNoteSchedule, FollowingsRepository, FollowRequestsRepository, BlockingsRepository, MutingsRepository, ClipsRepository, ClipNotesRepository, LatestNotesRepository, NoteEditsRepository, NoteFavoritesRepository, PollVotesRepository, PollsRepository, SigninsRepository, UserIpsRepository, RegistryItemsRepository } from '@/models/_.js'; import type Logger from '@/logger.js'; import { DriveService } from '@/core/DriveService.js'; import type { MiDriveFile } from '@/models/DriveFile.js'; @@ -69,8 +69,8 @@ export class DeleteAccountProcessorService { @Inject(DI.latestNotesRepository) private readonly latestNotesRepository: LatestNotesRepository, - @Inject(DI.noteEditRepository) - private readonly noteEditRepository: NoteEditRepository, + @Inject(DI.noteEditsRepository) + private readonly noteEditsRepository: NoteEditsRepository, @Inject(DI.noteFavoritesRepository) private readonly noteFavoritesRepository: NoteFavoritesRepository, @@ -318,7 +318,7 @@ export class DeleteAccountProcessorService { const ids = notes.map(note => note.id); - await this.noteEditRepository.delete({ + await this.noteEditsRepository.delete({ noteId: In(ids), }); await this.notesRepository.delete({ diff --git a/packages/backend/src/server/api/GetterService.ts b/packages/backend/src/server/api/GetterService.ts index edf70c0185..47b4e2f1bc 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, NoteEditRepository } from '@/models/_.js'; +import type { NotesRepository, UsersRepository, NoteEditsRepository } from '@/models/_.js'; import { IdentifiableError } from '@/misc/identifiable-error.js'; import type { MiLocalUser, MiRemoteUser, MiUser } from '@/models/User.js'; import { isRemoteUser, isLocalUser } from '@/models/User.js'; @@ -22,8 +22,8 @@ export class GetterService { @Inject(DI.notesRepository) private notesRepository: NotesRepository, - @Inject(DI.noteEditRepository) - private noteEditRepository: NoteEditRepository, + @Inject(DI.noteEditsRepository) + private noteEditsRepository: NoteEditsRepository, private readonly cacheService: CacheService, ) { @@ -59,7 +59,7 @@ export class GetterService { */ @bindThis public async getEdits(noteId: MiNote['id']) { - const edits = await this.noteEditRepository.findBy({ noteId: noteId }).catch(() => { + const edits = await this.noteEditsRepository.findBy({ noteId: noteId }).catch(() => { throw new IdentifiableError('9725d0ce-ba28-4dde-95a7-2cbb2c15de24', `Note ${noteId} does not exist`); }); diff --git a/packages/backend/src/server/api/endpoints/notes/unrenote.ts b/packages/backend/src/server/api/endpoints/notes/unrenote.ts index 4a3ca8b656..5c5bd740dc 100644 --- a/packages/backend/src/server/api/endpoints/notes/unrenote.ts +++ b/packages/backend/src/server/api/endpoints/notes/unrenote.ts @@ -10,6 +10,7 @@ import { Endpoint } from '@/server/api/endpoint-base.js'; import { NoteDeleteService } from '@/core/NoteDeleteService.js'; import { DI } from '@/di-symbols.js'; import { GetterService } from '@/server/api/GetterService.js'; +import { isQuote, Renote } from '@/misc/is-renote.js'; import { ApiError } from '../../error.js'; export const meta = { @@ -64,14 +65,14 @@ export default class extends Endpoint { // eslint- const renotes = await this.notesRepository.findBy({ userId: me.id, renoteId: note.id, - }); + }) as Renote[]; // TODO inline this into the above query for (const note of renotes) { if (ps.quote) { - if (note.text) this.noteDeleteService.delete(me, note, false); + if (isQuote(note)) await this.noteDeleteService.delete(me, note, false); } else { - if (!note.text) this.noteDeleteService.delete(me, note, false); + if (!isQuote(note)) await this.noteDeleteService.delete(me, note, false); } } }); diff --git a/packages/backend/src/server/api/mastodon/MastodonConverters.ts b/packages/backend/src/server/api/mastodon/MastodonConverters.ts index 69c7817021..963bde3726 100644 --- a/packages/backend/src/server/api/mastodon/MastodonConverters.ts +++ b/packages/backend/src/server/api/mastodon/MastodonConverters.ts @@ -13,7 +13,7 @@ import { MfmService } from '@/core/MfmService.js'; import type { Config } from '@/config.js'; import { IMentionedRemoteUsers, MiNote } from '@/models/Note.js'; import type { MiLocalUser, MiUser } from '@/models/User.js'; -import type { NoteEditRepository, UserProfilesRepository } from '@/models/_.js'; +import type { NoteEditsRepository, UserProfilesRepository } from '@/models/_.js'; import { awaitAll } from '@/misc/prelude/await-all.js'; import { CustomEmojiService } from '@/core/CustomEmojiService.js'; import { DriveFileEntityService } from '@/core/entities/DriveFileEntityService.js'; @@ -60,8 +60,8 @@ export class MastodonConverters { @Inject(DI.userProfilesRepository) private readonly userProfilesRepository: UserProfilesRepository, - @Inject(DI.noteEditRepository) - private readonly noteEditRepository: NoteEditRepository, + @Inject(DI.noteEditsRepository) + private readonly noteEditsRepository: NoteEditsRepository, private readonly mfmService: MfmService, private readonly getterService: GetterService, @@ -214,7 +214,7 @@ export class MastodonConverters { const noteUser = await this.getUser(note.userId); const noteInstance = noteUser.instance ?? (noteUser.host ? await this.federatedInstanceService.fetch(noteUser.host) : null); const account = await this.convertAccount(noteUser); - const edits = await this.noteEditRepository.find({ where: { noteId: note.id }, order: { id: 'ASC' } }); + const edits = await this.noteEditsRepository.find({ where: { noteId: note.id }, order: { id: 'ASC' } }); const history: StatusEdit[] = []; const mentionedRemoteUsers = JSON.parse(note.mentionedRemoteUsers);