From 8090429e9af510a965d7bcc3532f3f9331c45406 Mon Sep 17 00:00:00 2001 From: syuilo <4439005+syuilo@users.noreply.github.com> Date: Sat, 31 May 2025 12:50:30 +0900 Subject: [PATCH] Update def.ts --- packages/frontend/src/preferences/def.ts | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/packages/frontend/src/preferences/def.ts b/packages/frontend/src/preferences/def.ts index 40e98fd928..8c66050c9c 100644 --- a/packages/frontend/src/preferences/def.ts +++ b/packages/frontend/src/preferences/def.ts @@ -374,6 +374,11 @@ export const PREF_DEF = { watermarkPresets: { accountDependent: true, default: [] as WatermarkPreset[], + mergeStrategy: (a, b) => { + const sameIdExists = a.some(x => b.some(y => x.id === y.id)); + if (sameIdExists) throw new Error(); + return a.concat(b); + }, }, defaultWatermarkPresetId: { accountDependent: true,