summaryrefslogtreecommitdiff
path: root/packages/frontend/src/pages/admin
diff options
context:
space:
mode:
authorsyuilo <4439005+syuilo@users.noreply.github.com>2025-06-03 07:31:19 +0900
committerGitHub <noreply@github.com>2025-06-03 07:31:19 +0900
commit3bc81522c65d724de121cbe6265c60e48a8f8ae7 (patch)
tree1d526c17f19ec0209d2a4b179cb6756e25b2b916 /packages/frontend/src/pages/admin
parent[skip ci] Update CHANGELOG.md (prepend template) (diff)
downloadmisskey-3bc81522c65d724de121cbe6265c60e48a8f8ae7.tar.gz
misskey-3bc81522c65d724de121cbe6265c60e48a8f8ae7.tar.bz2
misskey-3bc81522c65d724de121cbe6265c60e48a8f8ae7.zip
enhance(frontend): IDにUUIDを使うのをやめる (#16138)
* wip * Update flash-edit.vue
Diffstat (limited to 'packages/frontend/src/pages/admin')
-rw-r--r--packages/frontend/src/pages/admin/RolesEditorFormula.vue6
-rw-r--r--packages/frontend/src/pages/admin/roles.edit.vue4
2 files changed, 5 insertions, 5 deletions
diff --git a/packages/frontend/src/pages/admin/RolesEditorFormula.vue b/packages/frontend/src/pages/admin/RolesEditorFormula.vue
index 6c47e6397f..89ecc155b2 100644
--- a/packages/frontend/src/pages/admin/RolesEditorFormula.vue
+++ b/packages/frontend/src/pages/admin/RolesEditorFormula.vue
@@ -66,7 +66,7 @@ SPDX-License-Identifier: AGPL-3.0-only
<script lang="ts" setup>
import { computed, defineAsyncComponent, ref, watch } from 'vue';
-import { v4 as uuid } from 'uuid';
+import { genId } from '@/utility/id.js';
import MkInput from '@/components/MkInput.vue';
import MkSelect from '@/components/MkSelect.vue';
import MkButton from '@/components/MkButton.vue';
@@ -104,7 +104,7 @@ const type = computed({
set: (t) => {
if (t === 'and') v.value.values = [];
if (t === 'or') v.value.values = [];
- if (t === 'not') v.value.value = { id: uuid(), type: 'isRemote' };
+ if (t === 'not') v.value.value = { id: genId(), type: 'isRemote' };
if (t === 'roleAssignedTo') v.value.roleId = '';
if (t === 'createdLessThan') v.value.sec = 86400;
if (t === 'createdMoreThan') v.value.sec = 86400;
@@ -119,7 +119,7 @@ const type = computed({
});
function addValue() {
- v.value.values.push({ id: uuid(), type: 'isRemote' });
+ v.value.values.push({ id: genId(), type: 'isRemote' });
}
function valuesItemUpdated(item) {
diff --git a/packages/frontend/src/pages/admin/roles.edit.vue b/packages/frontend/src/pages/admin/roles.edit.vue
index 7790fe3925..1a903eedb9 100644
--- a/packages/frontend/src/pages/admin/roles.edit.vue
+++ b/packages/frontend/src/pages/admin/roles.edit.vue
@@ -21,7 +21,7 @@ SPDX-License-Identifier: AGPL-3.0-only
<script lang="ts" setup>
import { computed, ref } from 'vue';
import * as Misskey from 'misskey-js';
-import { v4 as uuid } from 'uuid';
+import { genId } from '@/utility/id.js';
import XEditor from './roles.editor.vue';
import * as os from '@/os.js';
import { misskeyApi } from '@/utility/misskey-api.js';
@@ -55,7 +55,7 @@ if (props.id) {
color: null,
iconUrl: null,
target: 'manual',
- condFormula: { id: uuid(), type: 'isRemote' },
+ condFormula: { id: genId(), type: 'isRemote' },
isPublic: false,
isExplorable: false,
asBadge: false,