diff --git a/packages/backend/src/misc/renote.ts b/packages/backend/src/misc/renote.ts index 015c26d65..758dcdd05 100644 --- a/packages/backend/src/misc/renote.ts +++ b/packages/backend/src/misc/renote.ts @@ -1,5 +1,5 @@ import { Note } from '@/models/entities/note.js'; -export function isPureRenote(note: Note): boolean { +export function isPureRenote(note: Note): note is Note & { renoteId: string, text: null, fileIds: null | never[], hasPoll: false } { return note.renoteId != null && note.text == null && (note.fileIds == null || note.fileIds.length === 0) && !note.hasPoll; } diff --git a/packages/backend/src/services/note/delete.ts b/packages/backend/src/services/note/delete.ts index c36e6c46b..68c0a8d1c 100644 --- a/packages/backend/src/services/note/delete.ts +++ b/packages/backend/src/services/note/delete.ts @@ -43,11 +43,7 @@ export default async function(user: { id: User['id']; uri: User['uri']; host: Us // if deleted note is renote if (isPureRenote(note)) { - renote = await Notes.findOneBy({ - // isPureRenote checks if note.renoteId is null already, so renoteId should be non-null. - // eslint-disable-next-line @typescript-eslint/no-non-null-assertion - id: note.renoteId!, - }); + renote = await Notes.findOneBy({ id: note.renoteId }); } const content = renderActivity(renote