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

Use Utils.compare for internal settings

This commit is contained in:
Samuel Elliott 2018-02-14 16:11:26 +00:00
parent 1dd01e186b
commit 41b7906612
No known key found for this signature in database
GPG Key ID: 8420C7CDE43DC4D6
2 changed files with 31 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
client/src/modules/settings.js
View File

@ -12,7 +12,7 @@ import defaultSettings from '../data/user.settings.default';
import Globals from './globals'; import Globals from './globals';
import CssEditor from './csseditor'; import CssEditor from './csseditor';
import Events from './events'; import Events from './events';
import { FileUtils, ClientLogger as Logger } from 'common'; import { Utils, FileUtils, ClientLogger as Logger } from 'common';
import { SettingUpdatedEvent } from 'structs'; import { SettingUpdatedEvent } from 'structs';
import path from 'path'; import path from 'path';
@ -113,6 +113,28 @@ export default class {
return setting ? setting.value : undefined; return setting ? setting.value : undefined;
} }
static saveSettings(set_id, newSettings, settingsUpdated) {
const set = this.getSet(set_id);
if (!set) return;
const updatedSettings = [];
for (let newCategory of newSettings) {
let category = set.settings.find(c => c.category === newCategory.category);
for (let newSetting of newCategory.settings) {
let setting = category.settings.find(s => s.id === newSetting.id);
if (Utils.compare(setting.value, newSetting.value)) continue;
let old_value = setting.value;
setting.value = newSetting.value;
updatedSettings.push({ set_id: set.id, category_id: category.category, setting_id: setting.id, value: setting.value, old_value });
this.settingUpdated(set.id, category.category, setting.id, setting.value, old_value);
}
}
return settingsUpdated ? settingsUpdated(updatedSettings) : updatedSettings;
}
static setSetting(set_id, category_id, setting_id, value) { static setSetting(set_id, category_id, setting_id, value) {
for (let set of this.getSettings) { for (let set of this.getSettings) {
if (set.id !== set_id) continue; if (set.id !== set_id) continue;
@ -122,7 +144,7 @@ export default class {
for (let setting of category.settings) { for (let setting of category.settings) {
if (setting.id !== setting_id) continue; if (setting.id !== setting_id) continue;
if (setting.value === value) return true; if (Utils.compare(setting.value, value)) return true;
let old_value = setting.value; let old_value = setting.value;
setting.value = value; setting.value = value;

8
client/src/ui/modals.js
View File

@ -9,7 +9,7 @@
*/ */
import { Utils, FileUtils } from 'common'; import { Utils, FileUtils } from 'common';
import { Events, PluginManager, ThemeManager } from 'modules'; import { Settings, Events, PluginManager, ThemeManager } from 'modules';
import BasicModal from './components/bd/modals/BasicModal.vue'; import BasicModal from './components/bd/modals/BasicModal.vue';
import ErrorModal from './components/bd/modals/ErrorModal.vue'; import ErrorModal from './components/bd/modals/ErrorModal.vue';
import SettingsModal from './components/bd/modals/SettingsModal.vue'; import SettingsModal from './components/bd/modals/SettingsModal.vue';
@ -102,6 +102,12 @@ export default class {
}, SettingsModal); }, SettingsModal);
} }
static internalSettings(set_id) {
const set = Settings.getSet(set_id);
if (!set) return;
return this.settings(set.headertext, set.settings, null, null, newSettings => Settings.saveSettings(set.id, newSettings));
}
static pluginSettings(plugin) { static pluginSettings(plugin) {
// return this.add({ headertext: plugin.name + ' Settings', settings: plugin.config, saveSettings: plugin.saveSettings }, SettingsModal); // return this.add({ headertext: plugin.name + ' Settings', settings: plugin.config, saveSettings: plugin.saveSettings }, SettingsModal);
return this.settings(plugin.name + ' Settings', plugin.config, null, null, plugin.saveSettings.bind(plugin)); return this.settings(plugin.name + ' Settings', plugin.config, null, null, plugin.saveSettings.bind(plugin));