move mandatoryCW from admin-user to PackedUserLite (public field)

packages/backend/src/core/entities/UserEntityService.ts

@@ -592,6 +592,7 @@ export class UserEntityService implements OnModuleInit {
 			isCat: user.isCat,
 			noindex: user.noindex,
 			enableRss: user.enableRss,
+			mandatoryCW: user.mandatoryCW,
 			isSilenced: user.isSilenced || this.roleService.getUserPolicies(user.id).then(r => !r.canPublicNote),
 			speakAsCat: user.speakAsCat ?? false,
 			approved: user.approved,

packages/backend/src/models/json-schema/user.ts

@@ -134,6 +134,10 @@ export const packedUserLiteSchema = {
 			type: 'boolean',
 			nullable: false, optional: false,
 		},
+		mandatoryCW: {
+			type: 'string',
+			nullable: true, optional: false,
+		},
 		isBot: {
 			type: 'boolean',
 			nullable: false, optional: true,

packages/backend/src/server/api/endpoints/admin/show-user.ts

@@ -144,10 +144,6 @@ export const meta = {
 				type: 'string',
 				optional: false, nullable: false,
 			},
-			mandatoryCW: {
-				type: 'string',
-				optional: false, nullable: true,
-			},
 			signins: {
 				type: 'array',
 				optional: false, nullable: false,
@@ -264,7 +260,6 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 				isHibernated: user.isHibernated,
 				lastActiveDate: user.lastActiveDate ? user.lastActiveDate.toISOString() : null,
 				moderationNote: profile.moderationNote ?? '',
-				mandatoryCW: user.mandatoryCW,
 				signins,
 				policies: await this.roleService.getUserPolicies(user.id),
 				roles: await this.roleEntityService.packMany(roles, me),

packages/frontend/src/pages/admin-user.vue

@@ -288,7 +288,7 @@ function createFetcher() {
 		markedAsNSFW.value = info.value.alwaysMarkNsfw;
 		suspended.value = info.value.isSuspended;
 		moderationNote.value = info.value.moderationNote;
-		mandatoryCW.value = info.value.mandatoryCW;
+		mandatoryCW.value = user.value.mandatoryCW;
 	});
 }
 

packages/misskey-js/src/autogen/types.ts

@@ -3968,6 +3968,7 @@ export type components = {
       isSystem?: boolean;
       noindex: boolean;
       enableRss: boolean;
+      mandatoryCW: string | null;
       isBot?: boolean;
       isCat?: boolean;
       speakAsCat?: boolean;