SheWhoReignsSupreme/Equicord
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: incorrect settings merge on import (#708)

Browse source
This commit is contained in:
prism 2026-01-31 16:29:15 +01:00 • committed by GitHub
parent 63dcad499b
commit a342ee0c63
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 20 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/api/SettingsSync/offline.ts
View file

@ -28,6 +28,22 @@ const toastFailure = (err: any) =>
const logger = new Logger("SettingsSync:Offline", "#39b7e0");
function deepMerge<T extends object>(target: T, source: T): T {
for (const key in source) {
const sourceVal = source[key];
if (sourceVal !== null && typeof sourceVal === "object" && !Array.isArray(sourceVal)) {
if (target[key] === null || target[key] === undefined || typeof target[key] !== "object" || Array.isArray(target[key])) {
target[key] = {} as any;
}
deepMerge(target[key] as object, sourceVal as object);
} else {
target[key] = sourceVal;
}
}
return target;
}
function isSafeObject(obj: any) {
if (obj == null || typeof obj !== "object") return true;
@ -60,8 +76,8 @@ export async function importSettings(data: string, type: BackupType = "all", clo
throw new Error("Invalid Settings. Plugin settings is required for this import try a different one.");
if (parsed.settings) {
Object.assign(PlainSettings, parsed.settings);
await VencordNative.settings.set(parsed.settings);
deepMerge(PlainSettings, parsed.settings);
await VencordNative.settings.set(PlainSettings);
}
if (parsed.quickCss) await VencordNative.quickCss.set(parsed.quickCss);
if (parsed.dataStore) await DataStore.setMany(parsed.dataStore);
@ -70,8 +86,8 @@ export async function importSettings(data: string, type: BackupType = "all", clo
case "plugins": {
if (!parsed.settings) throw new Error("Plugin settings missing");
Object.assign(PlainSettings, parsed.settings);
await VencordNative.settings.set(parsed.settings);
deepMerge(PlainSettings, parsed.settings);
await VencordNative.settings.set(PlainSettings);
break;
}
case "css": {