misty.cafe/mistykey
1
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

rename noteEditRepository to noteEditsRepository, matching other repository names

Browse source
This commit is contained in:
Hazelnoot 2025-06-19 13:53:33 -04:00
parent dad9944e7e
commit a45e264574
7 changed files with 19 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

2
packages/backend/src/di-symbols.ts
View file

@ -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'),

2
packages/backend/src/models/RepositoryModule.ts
View file

@ -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],
};

2
packages/backend/src/models/_.ts
View file

@ -326,5 +326,5 @@ export type ChatRoomInvitationsRepository = Repository<MiChatRoomInvitation> & M
export type ChatApprovalsRepository = Repository<MiChatApproval> & MiRepository<MiChatApproval>;
export type BubbleGameRecordsRepository = Repository<MiBubbleGameRecord> & MiRepository<MiBubbleGameRecord>;
export type ReversiGamesRepository = Repository<MiReversiGame> & MiRepository<MiReversiGame>;
export type NoteEditRepository = Repository<NoteEdit> & MiRepository<NoteEdit>;
export type NoteEditsRepository = Repository<NoteEdit> & MiRepository<NoteEdit>;
export type NoteScheduleRepository = Repository<MiNoteSchedule> & MiRepository<MiNoteSchedule>;

8
packages/backend/src/queue/processors/DeleteAccountProcessorService.ts
View file

@ -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({

8
packages/backend/src/server/api/GetterService.ts
View file

@ -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`);
});

7
packages/backend/src/server/api/endpoints/notes/unrenote.ts
View file

@ -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<typeof meta, typeof paramDef> { // 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);
}
}
});

8
packages/backend/src/server/api/mastodon/MastodonConverters.ts
View file

@ -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);