lightcordwarez
/
BetterDiscordApp-v2
mirror of https://github.com/JsSucks/BetterDiscordApp
1
0
Fork 0
Code Issues 3 Releases Wiki Activity

Fixed merging user config into default config

This commit is contained in:
Samuel Elliott 2018-02-04 20:17:22 +00:00
parent a0fb11d591
commit 1a95a7db4b
No known key found for this signature in database
GPG Key ID: 8420C7CDE43DC4D6
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
client/src/modules/contentmanager.js
View File

@ -100,11 +100,22 @@ export default class {
const readUserConfig = await this.readUserConfig(contentPath); const readUserConfig = await this.readUserConfig(contentPath);
userConfig.enabled = readUserConfig.enabled || false; userConfig.enabled = readUserConfig.enabled || false;
userConfig.config = readConfig.defaultConfig.map(config => { userConfig.config = readConfig.defaultConfig.map(config => {
const userSet = readUserConfig.config.find(c => c.id === config.id); const userSet = readUserConfig.config.find(c => c.category === config.category);
return userSet || config; // return userSet || config;
if (!userSet) return config;
config.settings = config.settings.map(setting => {
const userSetting = userSet.settings.find(s => s.id === setting.id);
if (!userSetting) return setting;
setting.value = userSetting.value;
return setting;
});
return config;
}); });
// userConfig.config = readUserConfig.config;
} catch (err) { /*We don't care if this fails it either means that user config doesn't exist or there's something wrong with it so we revert to default config*/ } catch (err) { /*We don't care if this fails it either means that user config doesn't exist or there's something wrong with it so we revert to default config*/
} }
const configs = { const configs = {
@ -127,7 +138,7 @@ export default class {
throw err; throw err;
} }
} }
static async readConfig(configPath) { static async readConfig(configPath) {
configPath = path.resolve(configPath, 'config.json'); configPath = path.resolve(configPath, 'config.json');
return FileUtils.readJsonFromFile(configPath); return FileUtils.readJsonFromFile(configPath);