From f24e388458e0de7676e4b047638245ff8178ab4f Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Sat, 23 Sep 2023 17:06:37 +0900
Subject: [PATCH] wip

---
 .../1695449023032-moderation-log-user-no-action.js  | 13 -------------
 packages/backend/src/models/ModerationLog.ts        |  2 +-
 packages/frontend/src/pages/admin/modlog.ModLog.vue |  8 ++++++++
 3 files changed, 9 insertions(+), 14 deletions(-)
 delete mode 100644 packages/backend/migration/1695449023032-moderation-log-user-no-action.js

diff --git a/packages/backend/migration/1695449023032-moderation-log-user-no-action.js b/packages/backend/migration/1695449023032-moderation-log-user-no-action.js
deleted file mode 100644
index 77bca095f3..0000000000
--- a/packages/backend/migration/1695449023032-moderation-log-user-no-action.js
+++ /dev/null
@@ -1,13 +0,0 @@
-export class ModerationLogUserNoAction1695449023032 {
-    name = 'ModerationLogUserNoAction1695449023032'
-
-    async up(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "moderation_log" DROP CONSTRAINT "FK_a08ad074601d204e0f69da9a954"`);
-        await queryRunner.query(`ALTER TABLE "moderation_log" ADD CONSTRAINT "FK_a08ad074601d204e0f69da9a954" FOREIGN KEY ("userId") REFERENCES "user"("id") ON DELETE NO ACTION ON UPDATE NO ACTION`);
-    }
-
-    async down(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "moderation_log" DROP CONSTRAINT "FK_a08ad074601d204e0f69da9a954"`);
-        await queryRunner.query(`ALTER TABLE "moderation_log" ADD CONSTRAINT "FK_a08ad074601d204e0f69da9a954" FOREIGN KEY ("userId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
-    }
-}
diff --git a/packages/backend/src/models/ModerationLog.ts b/packages/backend/src/models/ModerationLog.ts
index 6d7cd79ad7..a12b6ab614 100644
--- a/packages/backend/src/models/ModerationLog.ts
+++ b/packages/backend/src/models/ModerationLog.ts
@@ -22,7 +22,7 @@ export class MiModerationLog {
 	public userId: MiUser['id'];
 
 	@ManyToOne(type => MiUser, {
-		onDelete: 'NO ACTION',
+		onDelete: 'CASCADE',
 	})
 	@JoinColumn()
 	public user: MiUser | null;
diff --git a/packages/frontend/src/pages/admin/modlog.ModLog.vue b/packages/frontend/src/pages/admin/modlog.ModLog.vue
index f62ac36e0c..05adce0558 100644
--- a/packages/frontend/src/pages/admin/modlog.ModLog.vue
+++ b/packages/frontend/src/pages/admin/modlog.ModLog.vue
@@ -22,6 +22,14 @@ SPDX-License-Identifier: AGPL-3.0-only
 		<template v-else-if="log.type === 'unsuspend'">
 			<div>{{ i18n.ts.user }}: {{ log.info.targetId }}</div>
 		</template>
+		<template v-else-if="log.type === 'roleAssigned'">
+			<div>{{ i18n.ts.user }}: {{ log.info.userId }}</div>
+			<div>{{ i18n.ts.role }}: {{ log.info.roleName }} [{{ log.info.roleId }}]</div>
+		</template>
+		<template v-else-if="log.type === 'roleUnassigned'">
+			<div>{{ i18n.ts.user }}: {{ log.info.userId }}</div>
+			<div>{{ i18n.ts.role }}: {{ log.info.roleName }} [{{ log.info.roleId }}]</div>
+		</template>
 	</div>
 </MkFolder>
 </template>