diff options
| -rw-r--r-- | locales/index.d.ts | 14 | ||||
| -rw-r--r-- | packages/backend/src/core/RoleService.ts | 13 | ||||
| -rw-r--r-- | packages/backend/src/models/Role.ts | 10 | ||||
| -rw-r--r-- | packages/frontend/src/pages/admin/RolesEditorFormula.vue | 15 | ||||
| -rw-r--r-- | sharkey-locales/en-US.yml | 3 |
5 files changed, 54 insertions, 1 deletions
diff --git a/locales/index.d.ts b/locales/index.d.ts index 2c9e3e3890..9679cc3acf 100644 --- a/locales/index.d.ts +++ b/locales/index.d.ts @@ -7677,6 +7677,18 @@ export interface Locale extends ILocale { * ～ではない */ "not": string; + /** + * Is from a specific instance + */ + "isFromInstance": string; + /** + * Hostname (case-insensitive) + */ + "isFromInstanceHost": string; + /** + * Match subdomains + */ + "isFromInstanceSubdomains": string; }; }; "_sensitiveMediaDetection": { @@ -12949,7 +12961,7 @@ export interface Locale extends ILocale { "enableProxyAccountDescription": string; "_confirmPollEdit": { /** - * Are you sure you want to edit this poll? + * Are you sure you want to edit this poll */ "title": string; /** diff --git a/packages/backend/src/core/RoleService.ts b/packages/backend/src/core/RoleService.ts index 229781c079..d948325503 100644 --- a/packages/backend/src/core/RoleService.ts +++ b/packages/backend/src/core/RoleService.ts @@ -248,6 +248,19 @@ export class RoleService implements OnApplicationShutdown, OnModuleInit { case 'isRemote': { return this.userEntityService.isRemoteUser(user); } + // User is from a specific instance + case 'isFromInstance': { + if (user.host == null) { + return false; + } + if (value.subdomains) { + const userHost = '.' + user.host.toLowerCase(); + const targetHost = '.' + value.host.toLowerCase(); + return userHost.endsWith(targetHost); + } else { + return user.host.toLowerCase() === value.host.toLowerCase(); + } + } // サスペンド済みユーザである case 'isSuspended': { return user.isSuspended; diff --git a/packages/backend/src/models/Role.ts b/packages/backend/src/models/Role.ts index 4c7da252bd..d7ae8ed38c 100644 --- a/packages/backend/src/models/Role.ts +++ b/packages/backend/src/models/Role.ts @@ -48,6 +48,15 @@ type CondFormulaValueIsRemote = { }; /** + * User is from a specific instance + */ +type CondFormulaValueIsFromInstance = { + type: 'isFromInstance'; + host: string; + subdomains: boolean; +}; + +/** * 既に指定のマニュアルロールにアサインされている場合のみ成立とする */ type CondFormulaValueRoleAssignedTo = { @@ -160,6 +169,7 @@ export type RoleCondFormulaValue = { id: string } & ( CondFormulaValueNot | CondFormulaValueIsLocal | CondFormulaValueIsRemote | + CondFormulaValueIsFromInstance | CondFormulaValueIsSuspended | CondFormulaValueIsLocked | CondFormulaValueIsBot | diff --git a/packages/frontend/src/pages/admin/RolesEditorFormula.vue b/packages/frontend/src/pages/admin/RolesEditorFormula.vue index 6c47e6397f..53a4836caa 100644 --- a/packages/frontend/src/pages/admin/RolesEditorFormula.vue +++ b/packages/frontend/src/pages/admin/RolesEditorFormula.vue @@ -9,6 +9,7 @@ SPDX-License-Identifier: AGPL-3.0-only <MkSelect v-model="type" :class="$style.typeSelect"> <option value="isLocal">{{ i18n.ts._role._condition.isLocal }}</option> <option value="isRemote">{{ i18n.ts._role._condition.isRemote }}</option> + <option value="isFromInstance">{{ i18n.ts._role._condition.isFromInstance }}</option> <option value="isSuspended">{{ i18n.ts._role._condition.isSuspended }}</option> <option value="isLocked">{{ i18n.ts._role._condition.isLocked }}</option> <option value="isBot">{{ i18n.ts._role._condition.isBot }}</option> @@ -61,6 +62,14 @@ SPDX-License-Identifier: AGPL-3.0-only <MkSelect v-else-if="type === 'roleAssignedTo'" v-model="v.roleId"> <option v-for="role in roles.filter(r => r.target === 'manual')" :key="role.id" :value="role.id">{{ role.name }}</option> </MkSelect> + + <MkInput v-else-if="type === 'isFromInstance'" v-model="v.host" type="text"> + <template #label>{{ i18n.ts._role._condition.isFromInstanceHost }}</template> + </MkInput> + + <MkSwitch v-if="type === 'isFromInstance'" v-model="v.subdomains"> + <template #label>{{ i18n.ts._role._condition.isFromInstanceSubdomains }}</template> + </MkSwitch> </div> </template> @@ -73,6 +82,7 @@ import MkButton from '@/components/MkButton.vue'; import { i18n } from '@/i18n.js'; import { deepClone } from '@/utility/clone.js'; import { rolesCache } from '@/cache.js'; +import MkSwitch from '@/components/MkSwitch.vue'; const Sortable = defineAsyncComponent(() => import('vuedraggable').then(x => x.default)); @@ -102,6 +112,7 @@ watch(v, () => { const type = computed({ get: () => v.value.type, set: (t) => { + // TODO there's a bug here: switching types leaves extra properties in the JSON if (t === 'and') v.value.values = []; if (t === 'or') v.value.values = []; if (t === 'not') v.value.value = { id: uuid(), type: 'isRemote' }; @@ -114,6 +125,10 @@ const type = computed({ if (t === 'followingMoreThanOrEq') v.value.value = 10; if (t === 'notesLessThanOrEq') v.value.value = 10; if (t === 'notesMoreThanOrEq') v.value.value = 10; + if (t === 'isFromInstance') { + v.value.host = ''; + v.value.subdomains = true; + } v.value.type = t; }, }); diff --git a/sharkey-locales/en-US.yml b/sharkey-locales/en-US.yml index a5c3d5f892..034d995b01 100644 --- a/sharkey-locales/en-US.yml +++ b/sharkey-locales/en-US.yml @@ -242,6 +242,9 @@ _role: _condition: isLocked: "Private account" isExplorable: "Account is discoverable" + isFromInstance: "Is from a specific instance" + isFromInstanceHost: "Hostname (case-insensitive)" + isFromInstanceSubdomains: "Match subdomains" _emailUnavailable: banned: "This email address is banned" _signup: |