From 3bc81522c65d724de121cbe6265c60e48a8f8ae7 Mon Sep 17 00:00:00 2001 From: syuilo <4439005+syuilo@users.noreply.github.com> Date: Tue, 3 Jun 2025 07:31:19 +0900 Subject: enhance(frontend): IDにUUIDを使うのをやめる (#16138) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * wip * Update flash-edit.vue --- packages/frontend/src/preferences/def.ts | 10 +++++----- packages/frontend/src/preferences/manager.ts | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'packages/frontend/src/preferences') diff --git a/packages/frontend/src/preferences/def.ts b/packages/frontend/src/preferences/def.ts index 2cbeea2883..5aadf835f2 100644 --- a/packages/frontend/src/preferences/def.ts +++ b/packages/frontend/src/preferences/def.ts @@ -5,13 +5,13 @@ import * as Misskey from 'misskey-js'; import { hemisphere } from '@@/js/intl-const.js'; -import { v4 as uuid } from 'uuid'; import { definePreferences } from './manager.js'; import type { Theme } from '@/theme.js'; import type { SoundType } from '@/utility/sound.js'; import type { Plugin } from '@/plugin.js'; import type { DeviceKind } from '@/utility/device-kind.js'; import type { DeckProfile } from '@/deck.js'; +import { genId } from '@/utility/id.js'; import { DEFAULT_DEVICE_KIND } from '@/utility/device-kind.js'; import { deepEqual } from '@/utility/deep-equal.js'; @@ -53,13 +53,13 @@ export const PREF_DEF = definePreferences({ accountDependent: true, default: () => [{ name: 'calendar', - id: uuid(), place: 'right', data: {}, + id: genId(), place: 'right', data: {}, }, { name: 'notifications', - id: uuid(), place: 'right', data: {}, + id: genId(), place: 'right', data: {}, }, { name: 'trends', - id: uuid(), place: 'right', data: {}, + id: genId(), place: 'right', data: {}, }] as { name: string; id: string; @@ -79,7 +79,7 @@ export const PREF_DEF = definePreferences({ emojiPalettes: { serverDependent: true, default: () => [{ - id: uuid(), + id: genId(), name: '', emojis: ['👍', '❤️', '😆', '🤔', '😮', '🎉', '💢', '😥', '😇', '🍮'], }] as { diff --git a/packages/frontend/src/preferences/manager.ts b/packages/frontend/src/preferences/manager.ts index 603aac851c..dad6f8b912 100644 --- a/packages/frontend/src/preferences/manager.ts +++ b/packages/frontend/src/preferences/manager.ts @@ -4,11 +4,11 @@ */ import { computed, onUnmounted, ref, watch } from 'vue'; -import { v4 as uuid } from 'uuid'; import { host, version } from '@@/js/config.js'; import { PREF_DEF } from './def.js'; import type { Ref, WritableComputedRef } from 'vue'; import type { MenuItem } from '@/types/menu.js'; +import { genId } from '@/utility/id.js'; import { $i } from '@/i.js'; import { copyToClipboard } from '@/utility/copy-to-clipboard.js'; import { i18n } from '@/i18n.js'; @@ -301,7 +301,7 @@ export class PreferencesManager { } } return { - id: uuid(), + id: genId(), version: version, type: 'main', modifiedAt: Date.now(), -- cgit v1.2.3-freya