From 86b26fb58ea8264523f468131cd87d0a43aea9fe Mon Sep 17 00:00:00 2001 From: Hazelnoot Date: Sat, 15 Feb 2025 11:39:57 -0500 Subject: adjust types to avoid merge conflicts in NoteCreateService.ts and NoteEditService.ts --- packages/backend/src/core/NoteEditService.ts | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) (limited to 'packages/backend/src/core/NoteEditService.ts') diff --git a/packages/backend/src/core/NoteEditService.ts b/packages/backend/src/core/NoteEditService.ts index 854112ec1d..24a99156d2 100644 --- a/packages/backend/src/core/NoteEditService.ts +++ b/packages/backend/src/core/NoteEditService.ts @@ -224,7 +224,13 @@ export class NoteEditService implements OnApplicationShutdown { } @bindThis - public async edit(user: MiUser, editid: MiNote['id'], data: Option, silent = false): Promise { + public async edit(user: MiUser & { + id: MiUser['id']; + username: MiUser['username']; + host: MiUser['host']; + isBot: MiUser['isBot']; + noindex: MiUser['noindex']; + }, editid: MiNote['id'], data: Option, silent = false): Promise { if (!editid) { throw new Error('fail'); } @@ -578,7 +584,13 @@ export class NoteEditService implements OnApplicationShutdown { } @bindThis - private async postNoteEdited(note: MiNote, oldNote: MiNote, user: MiUser, data: Option, silent: boolean, tags: string[], mentionedUsers: MinimumUser[]) { + private async postNoteEdited(note: MiNote, oldNote: MiNote, user: MiUser & { + id: MiUser['id']; + username: MiUser['username']; + host: MiUser['host']; + isBot: MiUser['isBot']; + noindex: MiUser['noindex']; + }, data: Option, silent: boolean, tags: string[], mentionedUsers: MinimumUser[]) { // Register host if (this.meta.enableStatsForFederatedInstances) { if (this.userEntityService.isRemoteUser(user)) { -- cgit v1.2.3-freya