CloudSync: fix accidently applying stale settings (#915
* modify the cloud timestamp before importing * use util/native relaunch * lambda why * "should work!" - Vendicated, 15th April 2023
This commit is contained in:
parent
7a98f1dfcb
commit
ff3589d157
@ -27,14 +27,13 @@ export { PlainSettings, Settings };
|
||||
import "./utils/quickCss";
|
||||
import "./webpack/patchWebpack";
|
||||
|
||||
import { relaunch } from "@utils/native";
|
||||
|
||||
import { showNotification } from "./api/Notifications";
|
||||
import { PlainSettings, Settings } from "./api/settings";
|
||||
import { patches, PMLogger, startAllPlugins } from "./plugins";
|
||||
import { localStorage } from "./utils/localStorage";
|
||||
import { relaunch } from "./utils/native";
|
||||
import { getCloudSettings, putCloudSettings } from "./utils/settingsSync";
|
||||
import { checkForUpdates, rebuild, update,UpdateLogger } from "./utils/updater";
|
||||
import { checkForUpdates, rebuild, update, UpdateLogger } from "./utils/updater";
|
||||
import { onceReady } from "./webpack";
|
||||
import { SettingsRouter } from "./webpack/common";
|
||||
|
||||
@ -57,7 +56,7 @@ async function syncSettings() {
|
||||
title: "Cloud Settings",
|
||||
body: "Your settings have been updated! Click here to restart to fully apply changes!",
|
||||
color: "var(--green-360)",
|
||||
onClick: () => window.DiscordNative.app.relaunch()
|
||||
onClick: relaunch
|
||||
});
|
||||
}
|
||||
}
|
||||
|
@ -35,6 +35,7 @@ export async function importSettings(data: string) {
|
||||
}
|
||||
|
||||
if ("settings" in parsed && "quickCss" in parsed) {
|
||||
Object.assign(PlainSettings, parsed.settings);
|
||||
await VencordNative.ipc.invoke(IpcEvents.SET_SETTINGS, JSON.stringify(parsed.settings, null, 4));
|
||||
await VencordNative.ipc.invoke(IpcEvents.SET_QUICK_CSS, parsed.quickCss);
|
||||
} else
|
||||
|
Loading…
x
Reference in New Issue
Block a user