diff options
| author | Hazelnoot <acomputerdog@gmail.com> | 2025-02-15 11:39:57 -0500 |
|---|---|---|
| committer | Hazelnoot <acomputerdog@gmail.com> | 2025-02-16 19:20:42 -0500 |
| commit | 86b26fb58ea8264523f468131cd87d0a43aea9fe (patch) | |
| tree | e00121fc132f2a8ec9a5cdfc59206df50380942b /packages/backend/src/core/NoteEditService.ts | |
| parent | fix type errors in NoteCreateService.ts (diff) | |
| download | sharkey-86b26fb58ea8264523f468131cd87d0a43aea9fe.tar.gz sharkey-86b26fb58ea8264523f468131cd87d0a43aea9fe.tar.bz2 sharkey-86b26fb58ea8264523f468131cd87d0a43aea9fe.zip | |
adjust types to avoid merge conflicts in NoteCreateService.ts and NoteEditService.ts
Diffstat (limited to 'packages/backend/src/core/NoteEditService.ts')
| -rw-r--r-- | packages/backend/src/core/NoteEditService.ts | 16 |
1 files changed, 14 insertions, 2 deletions
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<MiNote> { + 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<MiNote> { 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)) { |