summaryrefslogtreecommitdiff
path: root/packages/backend
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--packages/backend/src/core/RoleService.ts13
-rw-r--r--packages/backend/src/server/api/endpoints/admin/roles/delete.ts11
-rw-r--r--packages/backend/src/types.ts2
3 files changed, 18 insertions, 8 deletions
diff --git a/packages/backend/src/core/RoleService.ts b/packages/backend/src/core/RoleService.ts
index 39f21ecec4..dea6dc68cd 100644
--- a/packages/backend/src/core/RoleService.ts
+++ b/packages/backend/src/core/RoleService.ts
@@ -494,6 +494,19 @@ export class RoleService implements OnApplicationShutdown {
}
@bindThis
+ public async delete(role: MiRole, moderator?: MiUser): Promise<void> {
+ await this.rolesRepository.delete({ id: role.id });
+ this.globalEventService.publishInternalEvent('roleDeleted', role);
+
+ if (moderator) {
+ this.moderationLogService.log(moderator, 'deleteRole', {
+ roleId: role.id,
+ role: role,
+ });
+ }
+ }
+
+ @bindThis
public dispose(): void {
this.redisForSub.off('message', this.onMessage);
this.roleAssignmentByUserIdCache.dispose();
diff --git a/packages/backend/src/server/api/endpoints/admin/roles/delete.ts b/packages/backend/src/server/api/endpoints/admin/roles/delete.ts
index 6e012f6428..7b989050eb 100644
--- a/packages/backend/src/server/api/endpoints/admin/roles/delete.ts
+++ b/packages/backend/src/server/api/endpoints/admin/roles/delete.ts
@@ -6,9 +6,9 @@
import { Inject, Injectable } from '@nestjs/common';
import { Endpoint } from '@/server/api/endpoint-base.js';
import type { RolesRepository } from '@/models/_.js';
-import { GlobalEventService } from '@/core/GlobalEventService.js';
import { DI } from '@/di-symbols.js';
import { ApiError } from '@/server/api/error.js';
+import { RoleService } from '@/core/RoleService.js';
export const meta = {
tags: ['admin', 'role'],
@@ -41,17 +41,14 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
@Inject(DI.rolesRepository)
private rolesRepository: RolesRepository,
- private globalEventService: GlobalEventService,
+ private roleService: RoleService,
) {
- super(meta, paramDef, async (ps) => {
+ super(meta, paramDef, async (ps, me) => {
const role = await this.rolesRepository.findOneBy({ id: ps.roleId });
if (role == null) {
throw new ApiError(meta.errors.noSuchRole);
}
- await this.rolesRepository.delete({
- id: ps.roleId,
- });
- this.globalEventService.publishInternalEvent('roleDeleted', role);
+ await this.roleService.delete(role, me);
});
}
}
diff --git a/packages/backend/src/types.ts b/packages/backend/src/types.ts
index 0a53e77b79..a58bb9585a 100644
--- a/packages/backend/src/types.ts
+++ b/packages/backend/src/types.ts
@@ -85,7 +85,7 @@ export type ModerationLogPayloads = {
};
deleteRole: {
roleId: string;
- roleName: string;
+ role: any;
};
clearQueue: Record<string, never>;
promoteQueue: Record<string, never>;