diff options
| author | PrivateGER <privateger@privateger.me> | 2024-10-06 23:13:10 +0200 |
|---|---|---|
| committer | PrivateGER <privateger@privateger.me> | 2024-10-06 23:13:10 +0200 |
| commit | fadae347ffd52a3610ef2e6ce160ade32d3dac31 (patch) | |
| tree | 2731c25215245ba6c9cf4b8738f6868cf33afb78 /packages/backend/src/server/api/endpoints/admin/federation | |
| parent | Move text into translation files (diff) | |
| parent | merge: Add option to reject reports from an instance (Resolves #579, #715, #7... (diff) | |
| download | sharkey-fadae347ffd52a3610ef2e6ce160ade32d3dac31.tar.gz sharkey-fadae347ffd52a3610ef2e6ce160ade32d3dac31.tar.bz2 sharkey-fadae347ffd52a3610ef2e6ce160ade32d3dac31.zip | |
Merge branch 'develop' of https://activitypub.software/TransFem-org/Sharkey into feat/instance-admin-ui
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 | 18 |
1 files changed, 18 insertions, 0 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 8b142910a6..daf19c4435 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 @@ -25,6 +25,7 @@ export const paramDef = { host: { type: 'string' }, isSuspended: { type: 'boolean' }, isNSFW: { type: 'boolean' }, + rejectReports: { type: 'boolean' }, moderationNote: { type: 'string' }, }, required: ['host'], @@ -57,6 +58,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint- await this.federatedInstanceService.update(instance.id, { suspensionState, isNSFW: ps.isNSFW, + rejectReports: ps.rejectReports, moderationNote: ps.moderationNote, }); @@ -74,6 +76,22 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint- } } + if (ps.isNSFW != null && instance.isNSFW !== ps.isNSFW) { + const message = ps.rejectReports ? 'setRemoteInstanceNSFW' : 'unsetRemoteInstanceNSFW'; + this.moderationLogService.log(me, message, { + id: instance.id, + host: instance.host, + }); + } + + if (ps.rejectReports != null && instance.rejectReports !== ps.rejectReports) { + const message = ps.rejectReports ? 'rejectRemoteInstanceReports' : 'acceptRemoteInstanceReports'; + this.moderationLogService.log(me, message, { + id: instance.id, + host: instance.host, + }); + } + if (ps.moderationNote != null && instance.moderationNote !== ps.moderationNote) { this.moderationLogService.log(me, 'updateRemoteInstanceNote', { id: instance.id, |