From c7010169898e6b85a9094baa710429be95322a20 Mon Sep 17 00:00:00 2001
From: syuilo <4439005+syuilo@users.noreply.github.com>
Date: Tue, 3 Jun 2025 07:44:35 +0900
Subject: [PATCH] wip

---
 .../src/components/MkImageEffectorDialog.Layer.vue        | 1 -
 .../frontend/src/components/MkImageEffectorDialog.vue     | 4 ++--
 .../src/components/MkWatermarkEditorDialog.Layer.vue      | 1 -
 .../frontend/src/components/MkWatermarkEditorDialog.vue   | 8 ++++----
 4 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/packages/frontend/src/components/MkImageEffectorDialog.Layer.vue b/packages/frontend/src/components/MkImageEffectorDialog.Layer.vue
index 3d4f13dff9..1a4a2ac75d 100644
--- a/packages/frontend/src/components/MkImageEffectorDialog.Layer.vue
+++ b/packages/frontend/src/components/MkImageEffectorDialog.Layer.vue
@@ -38,7 +38,6 @@ SPDX-License-Identifier: AGPL-3.0-only
 
 <script setup lang="ts">
 import { ref, useTemplateRef, watch, onMounted, onUnmounted } from 'vue';
-import { v4 as uuid } from 'uuid';
 import type { ImageEffectorLayer } from '@/utility/image-effector/ImageEffector.js';
 import { i18n } from '@/i18n.js';
 import { ImageEffector } from '@/utility/image-effector/ImageEffector.js';
diff --git a/packages/frontend/src/components/MkImageEffectorDialog.vue b/packages/frontend/src/components/MkImageEffectorDialog.vue
index 5d8cfb67a8..997dd4d528 100644
--- a/packages/frontend/src/components/MkImageEffectorDialog.vue
+++ b/packages/frontend/src/components/MkImageEffectorDialog.vue
@@ -49,7 +49,6 @@ SPDX-License-Identifier: AGPL-3.0-only
 
 <script setup lang="ts">
 import { ref, useTemplateRef, watch, onMounted, onUnmounted, reactive, nextTick } from 'vue';
-import { v4 as uuid } from 'uuid';
 import type { ImageEffectorLayer } from '@/utility/image-effector/ImageEffector.js';
 import { i18n } from '@/i18n.js';
 import { ImageEffector } from '@/utility/image-effector/ImageEffector.js';
@@ -61,6 +60,7 @@ import XLayer from '@/components/MkImageEffectorDialog.Layer.vue';
 import * as os from '@/os.js';
 import { deepClone } from '@/utility/clone.js';
 import { FXS } from '@/utility/image-effector/fxs.js';
+import { genId } from '@/utility/id.js';
 
 const props = defineProps<{
 	image: File;
@@ -99,7 +99,7 @@ function addEffect(ev: MouseEvent) {
 		text: fx.name,
 		action: () => {
 			layers.push({
-				id: uuid(),
+				id: genId(),
 				fxId: fx.id,
 				params: Object.fromEntries(Object.entries(fx.params).map(([k, v]) => [k, v.default])),
 			});
diff --git a/packages/frontend/src/components/MkWatermarkEditorDialog.Layer.vue b/packages/frontend/src/components/MkWatermarkEditorDialog.Layer.vue
index bf67bbec9a..cd3b4f48cd 100644
--- a/packages/frontend/src/components/MkWatermarkEditorDialog.Layer.vue
+++ b/packages/frontend/src/components/MkWatermarkEditorDialog.Layer.vue
@@ -90,7 +90,6 @@ SPDX-License-Identifier: AGPL-3.0-only
 
 <script setup lang="ts">
 import { ref, useTemplateRef, watch, onMounted, onUnmounted } from 'vue';
-import { v4 as uuid } from 'uuid';
 import type { ImageEffectorLayer } from '@/utility/image-effector/ImageEffector.js';
 import type { WatermarkPreset } from '@/utility/watermark.js';
 import { i18n } from '@/i18n.js';
diff --git a/packages/frontend/src/components/MkWatermarkEditorDialog.vue b/packages/frontend/src/components/MkWatermarkEditorDialog.vue
index f11f7ced92..b86ffc8738 100644
--- a/packages/frontend/src/components/MkWatermarkEditorDialog.vue
+++ b/packages/frontend/src/components/MkWatermarkEditorDialog.vue
@@ -71,7 +71,6 @@ SPDX-License-Identifier: AGPL-3.0-only
 
 <script setup lang="ts">
 import { ref, useTemplateRef, watch, onMounted, onUnmounted, reactive, nextTick } from 'vue';
-import { v4 as uuid } from 'uuid';
 import type { WatermarkPreset } from '@/utility/watermark.js';
 import { WatermarkRenderer } from '@/utility/watermark.js';
 import { i18n } from '@/i18n.js';
@@ -83,12 +82,13 @@ import XLayer from '@/components/MkWatermarkEditorDialog.Layer.vue';
 import * as os from '@/os.js';
 import { deepClone } from '@/utility/clone.js';
 import { ensureSignin } from '@/i.js';
+import { genId } from '@/utility/id.js';
 
 const $i = ensureSignin();
 
 function createTextLayer(): WatermarkPreset['layers'][number] {
 	return {
-		id: uuid(),
+		id: genId(),
 		type: 'text',
 		text: `(c) @${$i.username}`,
 		align: { x: 'right', y: 'bottom' },
@@ -100,7 +100,7 @@ function createTextLayer(): WatermarkPreset['layers'][number] {
 
 function createImageLayer(): WatermarkPreset['layers'][number] {
 	return {
-		id: uuid(),
+		id: genId(),
 		type: 'image',
 		imageId: null,
 		imageUrl: null,
@@ -118,7 +118,7 @@ const props = defineProps<{
 }>();
 
 const preset = reactive<WatermarkPreset>(deepClone(props.preset) ?? {
-	id: uuid(),
+	id: genId(),
 	name: '',
 	layers: [createTextLayer()],
 });