n1lsqn · n1lsqn · May 6, 2024 · May 6, 2024
diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
@@ -1712,6 +1712,7 @@ _role:
     canUseChannel: "チャンネルの利用"
     canUseHighlight: "ハイライトの利用"
     canUseRemoteIconDecorations: "リモートアイコンデコレーションの利用"
+    canEmojiDeletion: "絵文字の削除"
     driveCapacity: "ドライブ容量"
     alwaysMarkNsfw: "ファイルにNSFWを常に付与"
     pinMax: "ノートのピン留めの最大数"

diff --git a/packages/backend/src/core/RoleService.ts b/packages/backend/src/core/RoleService.ts
@@ -46,6 +46,7 @@ export type RolePolicies = {
 	canUseChannel: boolean;
 	canUseHighlight: boolean;
 	canUseRemoteIconDecorations: boolean;
+	canEmojiDeletion: boolean;
 	canSearchNotes: boolean;
 	canUseTranslator: boolean;
 	canHideAds: boolean;
@@ -78,6 +79,7 @@ export const DEFAULT_POLICIES: RolePolicies = {
 	canManageAvatarDecorations: false,
 	canUseChannel: false,
 	canUseRemoteIconDecorations: true,
+	canEmojiDeletion: false,
 	canUseHighlight: true,
 	canSearchNotes: false,
 	canUseTranslator: true,
@@ -385,6 +387,7 @@ export class RoleService implements OnApplicationShutdown, OnModuleInit {
 			canUseChannel: calc('canUseChannel', vs => vs.some(v => v === true)),
 			canUseHighlight: calc('canUseHighlight', vs => vs.some(v => v === true)),
 			canUseRemoteIconDecorations: calc('canUseRemoteIconDecorations', vs => vs.some(v => v === true)),
+			canEmojiDeletion: calc('canEmojiDeletion', vs => vs.some(v => v === true)),
 			canSearchNotes: calc('canSearchNotes', vs => vs.some(v => v === true)),
 			canUseTranslator: calc('canUseTranslator', vs => vs.some(v => v === true)),
 			canHideAds: calc('canHideAds', vs => vs.some(v => v === true)),

diff --git a/packages/backend/src/models/json-schema/role.ts b/packages/backend/src/models/json-schema/role.ts
@@ -224,6 +224,10 @@ export const packedRolePoliciesSchema = {
 			type: 'boolean',
 			optional: false, nullable: false,
 		},
+		canEmojiDeletion: {
+			type: 'boolean',
+			optional: false, nullable: false,
+		},
 		canSearchNotes: {
 			type: 'boolean',
 			optional: false, nullable: false,

diff --git a/packages/backend/src/server/api/endpoints/admin/emoji/delete-bulk.ts b/packages/backend/src/server/api/endpoints/admin/emoji/delete-bulk.ts
@@ -11,7 +11,7 @@ export const meta = {
 	tags: ['admin'],
 
 	requireCredential: true,
-	requireRolePolicy: 'canManageCustomEmojis',
+	requireRolePolicy: 'canEmojiDeletion',
 	kind: 'write:admin:emoji',
 } as const;
 

diff --git a/packages/backend/src/server/api/endpoints/admin/emoji/delete.ts b/packages/backend/src/server/api/endpoints/admin/emoji/delete.ts
@@ -11,7 +11,7 @@ export const meta = {
 	tags: ['admin'],
 
 	requireCredential: true,
-	requireRolePolicy: 'canManageCustomEmojis',
+	requireRolePolicy: 'canEmojiDeletion',
 	kind: 'write:admin:emoji',
 
 	errors: {

diff --git a/packages/backend/src/server/api/endpoints/admin/emoji/remove-aliases-bulk.ts b/packages/backend/src/server/api/endpoints/admin/emoji/remove-aliases-bulk.ts
@@ -11,7 +11,7 @@ export const meta = {
 	tags: ['admin'],
 
 	requireCredential: true,
-	requireRolePolicy: 'canManageCustomEmojis',
+	requireRolePolicy: 'canEmojiDeletion',
 	kind: 'write:admin:emoji',
 } as const;
 

diff --git a/packages/frontend/src/const.ts b/packages/frontend/src/const.ts
@@ -86,6 +86,7 @@ export const ROLE_POLICIES = [
 	'canUseChannel',
 	'canUseHighlight',
 	'canUseRemoteIconDecorations',
+	'canEmojiDeletion',
 	'canSearchNotes',
 	'canUseTranslator',
 	'canHideAds',

diff --git a/packages/frontend/src/pages/admin/roles.editor.vue b/packages/frontend/src/pages/admin/roles.editor.vue
@@ -178,7 +178,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 					</MkRange>
 				</div>
 			</MkFolder>
-			
+
 			<MkFolder v-if="matchQuery([i18n.ts._role._options.canScheduleNote, 'canScheduleNote'])">
 				<template #label>{{ i18n.ts._role._options.canScheduleNote }}</template>
 				<template #suffix>
@@ -378,6 +378,26 @@ SPDX-License-Identifier: AGPL-3.0-only
 				</div>
 			</MkFolder>
 
+			<MkFolder v-if="matchQuery([i18n.ts._role._options.canEmojiDeletion, 'canEmojiDeletion'])">
+				<template #label>{{ i18n.ts._role._options.canEmojiDeletion }}</template>
+				<template #suffix>
+					<span v-if="role.policies.canEmojiDeletion.useDefault" :class="$style.useDefaultLabel">{{ i18n.ts._role.useBaseValue }}</span>
+					<span v-else>{{ role.policies.canEmojiDeletion.value ? i18n.ts.yes : i18n.ts.no }}</span>
+					<span :class="$style.priorityIndicator"><i :class="getPriorityIcon(role.policies.canUseHighlight)"></i></span>
+				</template>
+				<div class="_gaps">
+					<MkSwitch v-model="role.policies.canEmojiDeletion.useDefault" :readonly="readonly">
+						<template #label>{{ i18n.ts._role.useBaseValue }}</template>
+					</MkSwitch>
+					<MkSwitch v-model="role.policies.canEmojiDeletion.value" :disabled="role.policies.canEmojiDeletion.useDefault" :readonly="readonly">
+						<template #label>{{ i18n.ts.enable }}</template>
+					</MkSwitch>
+					<MkRange v-model="role.policies.canEmojiDeletion.priority" :min="0" :max="2" :step="1" easing :textConverter="(v) => v === 0 ? i18n.ts._role._priority.low : v === 1 ? i18n.ts._role._priority.middle : v === 2 ? i18n.ts._role._priority.high : ''">
+						<template #label>{{ i18n.ts._role.priority }}</template>
+					</MkRange>
+				</div>
+			</MkFolder>
+
 			<MkFolder v-if="matchQuery([i18n.ts._role._options.remoteLocalTimelineAnyLimit, 'remoteLocalTimelineAnyLimit'])">
 				<template #label>{{ i18n.ts._role._options.remoteLocalTimelineAnyLimit }}</template>
 				<template #suffix>

diff --git a/packages/frontend/src/pages/admin/roles.vue b/packages/frontend/src/pages/admin/roles.vue
@@ -54,7 +54,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 							<MkInput v-model="policies.mentionLimit" type="number">
 							</MkInput>
 						</MkFolder>
-						
+
 						<MkFolder v-if="matchQuery([i18n.ts._role._options.canScheduleNote, 'canScheduleNote'])">
 							<template #label>{{ i18n.ts._role._options.canScheduleNote }}</template>
 							<template #suffix>{{ policies.canScheduleNote ? i18n.ts.yes : i18n.ts.no }}</template>
@@ -133,6 +133,14 @@ SPDX-License-Identifier: AGPL-3.0-only
 							</MkSwitch>
 						</MkFolder>
 
+						<MkFolder v-if="matchQuery([i18n.ts._role._options.canEmojiDeletion, 'canEmojiDeletion'])">
+							<template #label>{{ i18n.ts._role._options.canEmojiDeletion }}</template>
+							<template #suffix>{{ policies.canEmojiDeletion ? i18n.ts.yes : i18n.ts.no }}</template>
+							<MkSwitch v-model="policies.canEmojiDeletion">
+								<template #label>{{ i18n.ts.enable }}</template>
+							</MkSwitch>
+						</MkFolder>
+
 						<MkFolder v-if="matchQuery([i18n.ts._role._options.canManageCustomEmojis, 'canManageCustomEmojis'])">
 							<template #label>{{ i18n.ts._role._options.canManageCustomEmojis }}</template>
 							<template #suffix>{{ policies.canManageCustomEmojis ? i18n.ts.yes : i18n.ts.no }}</template>

diff --git a/packages/misskey-js/src/autogen/types.ts b/packages/misskey-js/src/autogen/types.ts
@@ -4723,6 +4723,7 @@ export type components = {
       canUseChannel: boolean;
       canUseHighlight: boolean;
       canUseRemoteIconDecorations: boolean;
+      canEmojiDeletion: boolean;
       canSearchNotes: boolean;
       canUseTranslator: boolean;
       canHideAds: boolean;