From a720475d7a383b359e605b86448b13ac3f33d21f Mon Sep 17 00:00:00 2001 From: syuilo <4439005+syuilo@users.noreply.github.com> Date: Thu, 3 Apr 2025 19:06:10 +0900 Subject: [PATCH] copyOnMoveAccount -> preserveAssignmentOnMoveAccount --- locales/index.d.ts | 8 ++++---- locales/ja-JP.yml | 4 ++-- .../migration/1743558299182-RoleCopyOnMoveAccount.js | 6 ++---- packages/backend/src/core/RoleService.ts | 2 +- .../backend/src/core/entities/RoleEntityService.ts | 2 +- packages/backend/src/models/Role.ts | 3 +-- packages/backend/src/models/json-schema/role.ts | 3 +-- .../src/server/api/endpoints/admin/roles/create.ts | 2 +- .../src/server/api/endpoints/admin/roles/update.ts | 4 ++-- packages/frontend/src/pages/admin/roles.editor.vue | 6 +++--- packages/misskey-js/src/autogen/types.ts | 11 ++++------- 11 files changed, 22 insertions(+), 29 deletions(-) diff --git a/locales/index.d.ts b/locales/index.d.ts index da6d941787..afaa2d975d 100644 --- a/locales/index.d.ts +++ b/locales/index.d.ts @@ -7362,13 +7362,13 @@ export interface Locale extends ILocale { */ "descriptionOfDisplayOrder": string; /** - * アカウント移行時にコピーする + * アサイン状態を移行先アカウントにも引き継ぐ */ - "copyOnMoveAccount": string; + "preserveAssignmentOnMoveAccount": string; /** - * オンにすると、アカウントの移行が行われた際にロールを下のユーザから新しいユーザにコピーするようになります。サイレンスなどを引き継ぎたい場合に使用できます。 + * オンにすると、このロールが付与されたアカウントが移行された際に、移行先アカウントにもこのロールが引き継がれるようになります。 */ - "descriptionOfCopyOnMoveAccount": string; + "preserveAssignmentOnMoveAccount_description": string; /** * モデレーターのメンバー編集を許可 */ diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml index ab1390f4e6..323dc3a38a 100644 --- a/locales/ja-JP.yml +++ b/locales/ja-JP.yml @@ -1907,8 +1907,8 @@ _role: descriptionOfIsExplorable: "オンにすると、「みつける」でメンバー一覧が公開されるほか、ロールのタイムラインが利用可能になります。" displayOrder: "表示順" descriptionOfDisplayOrder: "数値が大きいほどUI上で先頭に表示されます。" - copyOnMoveAccount: "アカウント移行時にコピーする" - descriptionOfCopyOnMoveAccount: "オンにすると、アカウントの移行が行われた際にロールを元のユーザから新しいユーザに引き継ぐようになります。" + preserveAssignmentOnMoveAccount: "アサイン状態を移行先アカウントにも引き継ぐ" + preserveAssignmentOnMoveAccount_description: "オンにすると、このロールが付与されたアカウントが移行された際に、移行先アカウントにもこのロールが引き継がれるようになります。" canEditMembersByModerator: "モデレーターのメンバー編集を許可" descriptionOfCanEditMembersByModerator: "オンにすると、管理者に加えてモデレーターもこのロールへユーザーをアサイン/アサイン解除できるようになります。オフにすると管理者のみが行えます。" priority: "優先度" diff --git a/packages/backend/migration/1743558299182-RoleCopyOnMoveAccount.js b/packages/backend/migration/1743558299182-RoleCopyOnMoveAccount.js index 356959d85e..ff4f7a051b 100644 --- a/packages/backend/migration/1743558299182-RoleCopyOnMoveAccount.js +++ b/packages/backend/migration/1743558299182-RoleCopyOnMoveAccount.js @@ -7,12 +7,10 @@ export class RoleCopyOnMoveAccount1743558299182 { name = 'RoleCopyOnMoveAccount1743558299182' async up(queryRunner) { - await queryRunner.query(`ALTER TABLE "role" ADD "copyOnMoveAccount" boolean NOT NULL DEFAULT false`); - await queryRunner.query(`COMMENT ON COLUMN "role"."copyOnMoveAccount" IS 'If true, the role will be copied to moved to the new user on moving a user.'`); + await queryRunner.query(`ALTER TABLE "role" ADD "preserveAssignmentOnMoveAccount" boolean NOT NULL DEFAULT false`); } async down(queryRunner) { - await queryRunner.query(`COMMENT ON COLUMN "role"."copyOnMoveAccount" IS 'If true, the role will be copied to moved to the new user on moving a user.'`); - await queryRunner.query(`ALTER TABLE "role" DROP COLUMN "copyOnMoveAccount"`); + await queryRunner.query(`ALTER TABLE "role" DROP COLUMN "preserveAssignmentOnMoveAccount"`); } } diff --git a/packages/backend/src/core/RoleService.ts b/packages/backend/src/core/RoleService.ts index ef30360fd7..0a2659ee32 100644 --- a/packages/backend/src/core/RoleService.ts +++ b/packages/backend/src/core/RoleService.ts @@ -630,7 +630,7 @@ export class RoleService implements OnApplicationShutdown, OnModuleInit { isModerator: values.isModerator, isExplorable: values.isExplorable, asBadge: values.asBadge, - copyOnMoveAccount: values.copyOnMoveAccount, + preserveAssignmentOnMoveAccount: values.preserveAssignmentOnMoveAccount, canEditMembersByModerator: values.canEditMembersByModerator, displayOrder: values.displayOrder, policies: values.policies, diff --git a/packages/backend/src/core/entities/RoleEntityService.ts b/packages/backend/src/core/entities/RoleEntityService.ts index 0f19d63745..3fa38c9521 100644 --- a/packages/backend/src/core/entities/RoleEntityService.ts +++ b/packages/backend/src/core/entities/RoleEntityService.ts @@ -68,7 +68,7 @@ export class RoleEntityService { isModerator: role.isModerator, isExplorable: role.isExplorable, asBadge: role.asBadge, - copyOnMoveAccount: role.copyOnMoveAccount, + preserveAssignmentOnMoveAccount: role.preserveAssignmentOnMoveAccount, canEditMembersByModerator: role.canEditMembersByModerator, displayOrder: role.displayOrder, policies: policies, diff --git a/packages/backend/src/models/Role.ts b/packages/backend/src/models/Role.ts index 3eb34190dc..4c7da252bd 100644 --- a/packages/backend/src/models/Role.ts +++ b/packages/backend/src/models/Role.ts @@ -250,9 +250,8 @@ export class MiRole { @Column('boolean', { default: false, - comment: 'If true, the role will be copied to moved to the new user on moving a user.', }) - public copyOnMoveAccount: boolean; + public preserveAssignmentOnMoveAccount: boolean; @Column('boolean', { default: false, diff --git a/packages/backend/src/models/json-schema/role.ts b/packages/backend/src/models/json-schema/role.ts index cbf0d9f737..6f63dcef2e 100644 --- a/packages/backend/src/models/json-schema/role.ts +++ b/packages/backend/src/models/json-schema/role.ts @@ -389,9 +389,8 @@ export const packedRoleSchema = { optional: false, nullable: false, example: false, }, - copyOnMoveAccount: { + preserveAssignmentOnMoveAccount: { type: 'boolean', - description: 'True if the role is going to be copied to dest account on account move.', optional: false, nullable: false, example: false, }, diff --git a/packages/backend/src/server/api/endpoints/admin/roles/create.ts b/packages/backend/src/server/api/endpoints/admin/roles/create.ts index 195d1a509e..f92f7ebaeb 100644 --- a/packages/backend/src/server/api/endpoints/admin/roles/create.ts +++ b/packages/backend/src/server/api/endpoints/admin/roles/create.ts @@ -36,7 +36,7 @@ export const paramDef = { isAdministrator: { type: 'boolean' }, isExplorable: { type: 'boolean', default: false }, // optional for backward compatibility asBadge: { type: 'boolean' }, - copyOnMoveAccount: { type: 'boolean' }, + preserveAssignmentOnMoveAccount: { type: 'boolean' }, canEditMembersByModerator: { type: 'boolean' }, displayOrder: { type: 'number' }, policies: { diff --git a/packages/backend/src/server/api/endpoints/admin/roles/update.ts b/packages/backend/src/server/api/endpoints/admin/roles/update.ts index 1ad5afc919..175adcb63f 100644 --- a/packages/backend/src/server/api/endpoints/admin/roles/update.ts +++ b/packages/backend/src/server/api/endpoints/admin/roles/update.ts @@ -41,7 +41,7 @@ export const paramDef = { isAdministrator: { type: 'boolean' }, isExplorable: { type: 'boolean' }, asBadge: { type: 'boolean' }, - copyOnMoveAccount: { type: 'boolean' }, + preserveAssignmentOnMoveAccount: { type: 'boolean' }, canEditMembersByModerator: { type: 'boolean' }, displayOrder: { type: 'number' }, policies: { @@ -79,7 +79,7 @@ export default class extends Endpoint { // eslint- isAdministrator: ps.isAdministrator, isExplorable: ps.isExplorable, asBadge: ps.asBadge, - copyOnMoveAccount: ps.copyOnMoveAccount, + preserveAssignmentOnMoveAccount: ps.preserveAssignmentOnMoveAccount, canEditMembersByModerator: ps.canEditMembersByModerator, displayOrder: ps.displayOrder, policies: ps.policies, diff --git a/packages/frontend/src/pages/admin/roles.editor.vue b/packages/frontend/src/pages/admin/roles.editor.vue index 6ee2dc2f61..73119940c1 100644 --- a/packages/frontend/src/pages/admin/roles.editor.vue +++ b/packages/frontend/src/pages/admin/roles.editor.vue @@ -52,9 +52,9 @@ SPDX-License-Identifier: AGPL-3.0-only - - - + + + diff --git a/packages/misskey-js/src/autogen/types.ts b/packages/misskey-js/src/autogen/types.ts index c34fcaac55..6bbf1e3319 100644 --- a/packages/misskey-js/src/autogen/types.ts +++ b/packages/misskey-js/src/autogen/types.ts @@ -5134,11 +5134,8 @@ export type components = { isExplorable: boolean; /** @example false */ asBadge: boolean; - /** - * @description True if the role is going to be copied to dest account on account move. - * @example false - */ - copyOnMoveAccount: boolean; + /** @example false */ + preserveAssignmentOnMoveAccount: boolean; /** @example false */ canEditMembersByModerator: boolean; policies: { @@ -9397,7 +9394,7 @@ export type operations = { /** @default false */ isExplorable?: boolean; asBadge: boolean; - copyOnMoveAccount?: boolean; + preserveAssignmentOnMoveAccount?: boolean; canEditMembersByModerator: boolean; displayOrder: number; policies: Record; @@ -9673,7 +9670,7 @@ export type operations = { isAdministrator?: boolean; isExplorable?: boolean; asBadge?: boolean; - copyOnMoveAccount?: boolean; + preserveAssignmentOnMoveAccount?: boolean; canEditMembersByModerator?: boolean; displayOrder?: number; policies?: Record;