worldcone/cherrypick
2
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

remove ctlAvailable

Browse source
This commit is contained in:
NoriDev 2023-11-21 16:17:25 +09:00
parent 75b94ef20b
commit 1b2455a27e
5 changed files with 4 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
CHANGELOG_CHERRYPICK.md
View file

@ -33,6 +33,9 @@ Misskey의 전체 변경 사항을 확인하려면, [CHANGELOG.md#2023xx](CHANGE
기반 Misskey 버전: 2023.x.x<br>
Misskey의 전체 변경 사항을 확인하려면, [CHANGELOG.md#2023xx](CHANGELOG.md#2023xx) 문서를 참고하십시오.
### Client
- Fix: 역할 설정에 내용을 알 수 없는 설정이 표시됨
### Server
- Fix: 일부 환경에서 아이콘 장식을 추가할 수 없음
- Fix: 리모트 유저의 프로필 미디어가 잘못된 URL로 표시될 수 있음

3
packages/backend/src/core/RoleService.ts
View file

@ -26,7 +26,6 @@ import type { OnApplicationShutdown } from '@nestjs/common';
export type RolePolicies = {
gtlAvailable: boolean;
ltlAvailable: boolean;
ctlAvailable: boolean;
canPublicNote: boolean;
canEditNote: boolean;
canInvite: boolean;
@ -54,7 +53,6 @@ export type RolePolicies = {
export const DEFAULT_POLICIES: RolePolicies = {
gtlAvailable: true,
ltlAvailable: true,
ctlAvailable: true,
canPublicNote: true,
canEditNote: true,
canInvite: false,
@ -306,7 +304,6 @@ export class RoleService implements OnApplicationShutdown {
return {
gtlAvailable: calc('gtlAvailable', vs => vs.some(v => v === true)),
ltlAvailable: calc('ltlAvailable', vs => vs.some(v => v === true)),
ctlAvailable: calc('ctlAvailable', vs => vs.some(v => v === true)),
canPublicNote: calc('canPublicNote', vs => vs.some(v => v === true)),
canEditNote: calc('canEditNote', vs => vs.some(v => v === true)),
canInvite: calc('canInvite', vs => vs.some(v => v === true)),

1
packages/frontend/src/const.ts
View file

@ -60,7 +60,6 @@ export const obsoleteNotificationTypes = ['pollVote'/*, 'groupInvited'*/] as con
export const ROLE_POLICIES = [
'gtlAvailable',
'ltlAvailable',
'ctlAvailable',
'canPublicNote',
'canEditNote',
'canInvite',

22
packages/frontend/src/pages/admin/roles.editor.vue
View file

@ -140,26 +140,6 @@ SPDX-License-Identifier: AGPL-3.0-only
</div>
</MkFolder>
<MkFolder v-if="matchQuery([i18n.ts._role._options.ctlAvailable, 'ctlAvailable'])">
<template #label>{{ i18n.ts._role._options.ctlAvailable }}</template>
<template #suffix>
<span v-if="role.policies.ctlAvailable.useDefault" :class="$style.useDefaultLabel">{{ i18n.ts._role.useBaseValue }}</span>
<span v-else>{{ role.policies.ctlAvailable.value ? i18n.ts.yes : i18n.ts.no }}</span>
<span :class="$style.priorityIndicator"><i :class="getPriorityIcon(role.policies.ctlAvailable)"></i></span>
</template>
<div class="_gaps">
<MkSwitch v-model="role.policies.ctlAvailable.useDefault" :readonly="readonly">
<template #label>{{ i18n.ts._role.useBaseValue }}</template>
</MkSwitch>
<MkSwitch v-model="role.policies.ctlAvailable.value" :disabled="role.policies.ctlAvailable.useDefault" :readonly="readonly">
<template #label>{{ i18n.ts.enable }}</template>
</MkSwitch>
<MkRange v-model="role.policies.ctlAvailable.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.canPublicNote, 'canPublicNote'])">
<template #label>{{ i18n.ts._role._options.canPublicNote }}</template>
<template #suffix>
@ -318,7 +298,7 @@ SPDX-License-Identifier: AGPL-3.0-only
</MkRange>
</div>
</MkFolder>
<MkFolder v-if="matchQuery([i18n.ts._role._options.canSearchNotes, 'canSearchNotes'])">
<template #label>{{ i18n.ts._role._options.canSearchNotes }}</template>
<template #suffix>

8
packages/frontend/src/pages/admin/roles.vue
View file

@ -40,14 +40,6 @@ SPDX-License-Identifier: AGPL-3.0-only
</MkSwitch>
</MkFolder>
<MkFolder v-if="matchQuery([i18n.ts._role._options.ctlAvailable, 'ctlAvailable'])">
<template #label>{{ i18n.ts._role._options.ctlAvailable }}</template>
<template #suffix>{{ policies.ctlAvailable ? i18n.ts.yes : i18n.ts.no }}</template>
<MkSwitch v-model="policies.ctlAvailable">
<template #label>{{ i18n.ts.enable }}</template>
</MkSwitch>
</MkFolder>
<MkFolder v-if="matchQuery([i18n.ts._role._options.canPublicNote, 'canPublicNote'])">
<template #label>{{ i18n.ts._role._options.canPublicNote }}</template>
<template #suffix>{{ policies.canPublicNote ? i18n.ts.yes : i18n.ts.no }}</template>