diff options
| author | syuilo <4439005+syuilo@users.noreply.github.com> | 2024-05-27 17:28:08 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-05-27 17:28:08 +0900 |
| commit | 579b88adc7d48a43ef443798f568eead1c8e9fa5 (patch) | |
| tree | 27322d181599711b8f7f35d26a1d6da046b6f63d /packages/backend/src/server/api/endpoints/admin/federation | |
| parent | Bump version to 2024.5.0-beta.3 (diff) | |
| parent | Quick action implement (#13878) (diff) | |
| download | misskey-579b88adc7d48a43ef443798f568eead1c8e9fa5.tar.gz misskey-579b88adc7d48a43ef443798f568eead1c8e9fa5.tar.bz2 misskey-579b88adc7d48a43ef443798f568eead1c8e9fa5.zip | |
Merge branch 'develop' into release/2024.5.0
Diffstat (limited to 'packages/backend/src/server/api/endpoints/admin/federation')
| -rw-r--r-- | packages/backend/src/server/api/endpoints/admin/federation/update-instance.ts | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/packages/backend/src/server/api/endpoints/admin/federation/update-instance.ts b/packages/backend/src/server/api/endpoints/admin/federation/update-instance.ts index 0bcdc2a4b8..fed7bfbbde 100644 --- a/packages/backend/src/server/api/endpoints/admin/federation/update-instance.ts +++ b/packages/backend/src/server/api/endpoints/admin/federation/update-instance.ts @@ -46,12 +46,19 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint- throw new Error('instance not found'); } + const isSuspendedBefore = instance.suspensionState !== 'none'; + let suspensionState: undefined | 'manuallySuspended' | 'none'; + + if (ps.isSuspended != null && isSuspendedBefore !== ps.isSuspended) { + suspensionState = ps.isSuspended ? 'manuallySuspended' : 'none'; + } + await this.federatedInstanceService.update(instance.id, { - isSuspended: ps.isSuspended, + suspensionState, moderationNote: ps.moderationNote, }); - if (ps.isSuspended != null && instance.isSuspended !== ps.isSuspended) { + if (ps.isSuspended != null && isSuspendedBefore !== ps.isSuspended) { if (ps.isSuspended) { this.moderationLogService.log(me, 'suspendRemoteInstance', { id: instance.id, |