| @@ -13,6 +13,13 @@ | ||||
| --> | ||||
|  | ||||
| ## 2023.9.3 | ||||
| ### General | ||||
| - Enhance: ノートの翻訳機能の利用可否をロールで設定可能に | ||||
|  | ||||
| ### Client | ||||
| - Enhance: モデレーションログ機能の強化 | ||||
| - Enhance: ローカリゼーションの更新 | ||||
|  | ||||
| ### Server | ||||
| - Fix: Redisに古いバージョンのキャッシュが残っている場合、キャッシュが消えるまでの間通知が届かなくなる問題を修正 | ||||
|  | ||||
|   | ||||
							
								
								
									
										1
									
								
								locales/index.d.ts
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										1
									
								
								locales/index.d.ts
									
									
									
									
										vendored
									
									
								
							| @@ -1562,6 +1562,7 @@ export interface Locale { | ||||
|             "descriptionOfRateLimitFactor": string; | ||||
|             "canHideAds": string; | ||||
|             "canSearchNotes": string; | ||||
|             "canUseTranslator": string; | ||||
|         }; | ||||
|         "_condition": { | ||||
|             "isLocal": string; | ||||
|   | ||||
| @@ -1482,7 +1482,8 @@ _role: | ||||
|     rateLimitFactor: "レートリミット" | ||||
|     descriptionOfRateLimitFactor: "小さいほど制限が緩和され、大きいほど制限が強化されます。" | ||||
|     canHideAds: "広告の非表示" | ||||
|     canSearchNotes: "ノート検索の利用可否" | ||||
|     canSearchNotes: "ノート検索の利用" | ||||
|     canUseTranslator: "翻訳機能の利用" | ||||
|   _condition: | ||||
|     isLocal: "ローカルユーザー" | ||||
|     isRemote: "リモートユーザー" | ||||
|   | ||||
| @@ -33,6 +33,7 @@ export type RolePolicies = { | ||||
| 	inviteExpirationTime: number; | ||||
| 	canManageCustomEmojis: boolean; | ||||
| 	canSearchNotes: boolean; | ||||
| 	canUseTranslator: boolean; | ||||
| 	canHideAds: boolean; | ||||
| 	driveCapacityMb: number; | ||||
| 	alwaysMarkNsfw: boolean; | ||||
| @@ -58,6 +59,7 @@ export const DEFAULT_POLICIES: RolePolicies = { | ||||
| 	inviteExpirationTime: 0, | ||||
| 	canManageCustomEmojis: false, | ||||
| 	canSearchNotes: false, | ||||
| 	canUseTranslator: true, | ||||
| 	canHideAds: false, | ||||
| 	driveCapacityMb: 100, | ||||
| 	alwaysMarkNsfw: false, | ||||
| @@ -303,6 +305,7 @@ export class RoleService implements OnApplicationShutdown { | ||||
| 			inviteExpirationTime: calc('inviteExpirationTime', vs => Math.max(...vs)), | ||||
| 			canManageCustomEmojis: calc('canManageCustomEmojis', 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)), | ||||
| 			driveCapacityMb: calc('driveCapacityMb', vs => Math.max(...vs)), | ||||
| 			alwaysMarkNsfw: calc('alwaysMarkNsfw', vs => vs.some(v => v === true)), | ||||
|   | ||||
| @@ -10,12 +10,13 @@ import { NoteEntityService } from '@/core/entities/NoteEntityService.js'; | ||||
| import { MetaService } from '@/core/MetaService.js'; | ||||
| import { HttpRequestService } from '@/core/HttpRequestService.js'; | ||||
| import { GetterService } from '@/server/api/GetterService.js'; | ||||
| import { RoleService } from '@/core/RoleService.js'; | ||||
| import { ApiError } from '../../error.js'; | ||||
|  | ||||
| export const meta = { | ||||
| 	tags: ['notes'], | ||||
|  | ||||
| 	requireCredential: false, | ||||
| 	requireCredential: true, | ||||
|  | ||||
| 	res: { | ||||
| 		type: 'object', | ||||
| @@ -23,6 +24,11 @@ export const meta = { | ||||
| 	}, | ||||
|  | ||||
| 	errors: { | ||||
| 		unavailable: { | ||||
| 			message: 'Translate of notes unavailable.', | ||||
| 			code: 'UNAVAILABLE', | ||||
| 			id: '50a70314-2d8a-431b-b433-efa5cc56444c', | ||||
| 		}, | ||||
| 		noSuchNote: { | ||||
| 			message: 'No such note.', | ||||
| 			code: 'NO_SUCH_NOTE', | ||||
| @@ -47,14 +53,20 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint- | ||||
| 		private getterService: GetterService, | ||||
| 		private metaService: MetaService, | ||||
| 		private httpRequestService: HttpRequestService, | ||||
| 		private roleService: RoleService, | ||||
| 	) { | ||||
| 		super(meta, paramDef, async (ps, me) => { | ||||
| 			const policies = await this.roleService.getUserPolicies(me.id); | ||||
| 			if (!policies.canUseTranslator) { | ||||
| 				throw new ApiError(meta.errors.unavailable); | ||||
| 			} | ||||
|  | ||||
| 			const note = await this.getterService.getNote(ps.noteId).catch(err => { | ||||
| 				if (err.id === '9725d0ce-ba28-4dde-95a7-2cbb2c15de24') throw new ApiError(meta.errors.noSuchNote); | ||||
| 				throw err; | ||||
| 			}); | ||||
|  | ||||
| 			if (!(await this.noteEntityService.isVisibleForMe(note, me ? me.id : null))) { | ||||
| 			if (!(await this.noteEntityService.isVisibleForMe(note, me.id))) { | ||||
| 				return 204; // TODO: 良い感じのエラー返す | ||||
| 			} | ||||
|  | ||||
|   | ||||
| @@ -68,6 +68,7 @@ export const ROLE_POLICIES = [ | ||||
| 	'inviteExpirationTime', | ||||
| 	'canManageCustomEmojis', | ||||
| 	'canSearchNotes', | ||||
| 	'canUseTranslator', | ||||
| 	'canHideAds', | ||||
| 	'driveCapacityMb', | ||||
| 	'alwaysMarkNsfw', | ||||
|   | ||||
| @@ -299,6 +299,26 @@ SPDX-License-Identifier: AGPL-3.0-only | ||||
| 				</div> | ||||
| 			</MkFolder> | ||||
|  | ||||
| 			<MkFolder v-if="matchQuery([i18n.ts._role._options.canUseTranslator, 'canUseTranslator'])"> | ||||
| 				<template #label>{{ i18n.ts._role._options.canUseTranslator }}</template> | ||||
| 				<template #suffix> | ||||
| 					<span v-if="role.policies.canUseTranslator.useDefault" :class="$style.useDefaultLabel">{{ i18n.ts._role.useBaseValue }}</span> | ||||
| 					<span v-else>{{ role.policies.canUseTranslator.value ? i18n.ts.yes : i18n.ts.no }}</span> | ||||
| 					<span :class="$style.priorityIndicator"><i :class="getPriorityIcon(role.policies.canUseTranslator)"></i></span> | ||||
| 				</template> | ||||
| 				<div class="_gaps"> | ||||
| 					<MkSwitch v-model="role.policies.canUseTranslator.useDefault" :readonly="readonly"> | ||||
| 						<template #label>{{ i18n.ts._role.useBaseValue }}</template> | ||||
| 					</MkSwitch> | ||||
| 					<MkSwitch v-model="role.policies.canUseTranslator.value" :disabled="role.policies.canUseTranslator.useDefault" :readonly="readonly"> | ||||
| 						<template #label>{{ i18n.ts.enable }}</template> | ||||
| 					</MkSwitch> | ||||
| 					<MkRange v-model="role.policies.canUseTranslator.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.driveCapacity, 'driveCapacityMb'])"> | ||||
| 				<template #label>{{ i18n.ts._role._options.driveCapacity }}</template> | ||||
| 				<template #suffix> | ||||
|   | ||||
| @@ -103,6 +103,14 @@ SPDX-License-Identifier: AGPL-3.0-only | ||||
| 							</MkSwitch> | ||||
| 						</MkFolder> | ||||
|  | ||||
| 						<MkFolder v-if="matchQuery([i18n.ts._role._options.canUseTranslator, 'canSearchNotes'])"> | ||||
| 							<template #label>{{ i18n.ts._role._options.canUseTranslator }}</template> | ||||
| 							<template #suffix>{{ policies.canUseTranslator ? i18n.ts.yes : i18n.ts.no }}</template> | ||||
| 							<MkSwitch v-model="policies.canUseTranslator"> | ||||
| 								<template #label>{{ i18n.ts.enable }}</template> | ||||
| 							</MkSwitch> | ||||
| 						</MkFolder> | ||||
|  | ||||
| 						<MkFolder v-if="matchQuery([i18n.ts._role._options.driveCapacity, 'driveCapacityMb'])"> | ||||
| 							<template #label>{{ i18n.ts._role._options.driveCapacity }}</template> | ||||
| 							<template #suffix>{{ policies.driveCapacityMb }}MB</template> | ||||
|   | ||||
| @@ -288,7 +288,7 @@ export function getNoteMenu(props: { | ||||
| 				text: i18n.ts.share, | ||||
| 				action: share, | ||||
| 			}, | ||||
| 			instance.translatorAvailable ? { | ||||
| 			$i && $i.policies.canUseTranslator && instance.translatorAvailable ? { | ||||
| 				icon: 'ti ti-language-hiragana', | ||||
| 				text: i18n.ts.translate, | ||||
| 				action: translate, | ||||
|   | ||||
		Reference in New Issue
	
	Block a user
	 syuilo
					syuilo