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

SettingsSync: Fix Errors and Formatting

Browse source
This commit is contained in:
thororen1234 2025-12-17 12:48:07 -05:00
parent 576101ca0b
commit b5f13a0946
No known key found for this signature in database
2 changed files with 7 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -56,8 +56,8 @@ export async function importSettings(data: string, type: BackupType = "all", clo
switch (type) {
case "all": {
if (!cloud && (!("settings" in parsed) || !("quickCss" in parsed) || !("dataStore" in parsed)))
throw new Error("Invalid Settings. Missing one or more required keys.");
if (!cloud && (!("settings" in parsed)))
throw new Error("Invalid Settings. Plugin settings is required for this import try a different one.");
if (parsed.settings) {
Object.assign(PlainSettings, parsed.settings);
@ -68,10 +68,10 @@ export async function importSettings(data: string, type: BackupType = "all", clo
break;
}
case "plugins": {
if (!parsed.settings?.settings) throw new Error("Plugin settings missing");
if (!parsed.settings) throw new Error("Plugin settings missing");
Object.assign(PlainSettings, parsed.settings.settings);
await VencordNative.settings.set(parsed.settings.settings);
Object.assign(PlainSettings, parsed.settings);
await VencordNative.settings.set(parsed.settings);
break;
}
case "css": {
@ -99,7 +99,7 @@ export async function exportSettings({ syncDataStore = true, type = "all", minif
return JSON.stringify({ settings, quickCss, ...(syncDataStore && { dataStore }) }, null, minify ? undefined : 4);
}
case "plugins": {
return JSON.stringify({ settings: { settings } }, null, minify ? undefined : 4);
return JSON.stringify({ settings }, null, minify ? undefined : 4);
}
case "css": {
return JSON.stringify({ quickCss }, null, minify ? undefined : 4);
@ -110,21 +110,6 @@ export async function exportSettings({ syncDataStore = true, type = "all", minif
}
}
export async function exportPlugins({ minify }: { minify?: boolean; } = {}) {
const { plugins } = VencordNative.settings.get();
return JSON.stringify({ settings: { plugins } }, null, minify ? undefined : 4);
}
export async function exportCSS({ minify }: { minify?: boolean; } = {}) {
const quickCss = await VencordNative.quickCss.get();
return JSON.stringify({ quickCss }, null, minify ? undefined : 4);
}
export async function exportDataStores({ minify }: { minify?: boolean; } = {}) {
const dataStore = await DataStore.entries();
return JSON.stringify({ dataStore }, null, minify ? undefined : 4);
}
export async function downloadSettingsBackup(type: BackupType = "all", { minify }: { minify?: boolean; } = {}) {
const backup = await exportSettings({ minify, type });
const filename = `equicord-${type}-backup-${moment().format("YYYY-MM-DD")}.json`;
@ -141,7 +126,7 @@ export async function uploadSettingsBackup(type: BackupType = "all", showToast =
if (IS_DISCORD_DESKTOP) {
const [file] = await DiscordNative.fileManager.openFiles({
filters: [
{ name: "Vencord Settings Backup", extensions: ["json"] },
{ name: "Equicord Settings Backup", extensions: ["json"] },
{ name: "all", extensions: ["*"] }
]
});

1
src/equicordplugins/polishWording/index.ts
View file

@ -275,7 +275,6 @@ function capitalize(textInput: string): string {
}
}
// Stand-alone i's turn into I, unless there's the word 'is' after, cus then it's a vowel and not someone talking about themselves
result = result.replace(/\bi\b(?!\s+is\b)(?=['\s]|$)/g, "I");
return result;