lightcordwarez
/
BetterDiscordAddons
mirror of https://github.com/mwittrien/BetterDiscordAddons.git
1
0
Fork 0
Code Issues 24 Releases Wiki Activity

fixes

This commit is contained in:
Mirco Wittrien 2020-01-05 12:00:41 +01:00
parent 29dda4259e
commit ff205d35c5
2 changed files with 41 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
Plugins/BDFDB.js
View File

@ -882,9 +882,9 @@
}; };
BDFDB.ObjectUtils.deepAssign = function (obj, ...objs) { BDFDB.ObjectUtils.deepAssign = function (obj, ...objs) {
if (!objs.length) return obj; if (!objs.length) return obj;
var nextobj = objs.shift(); let nextobj = objs.shift();
if (BDFDB.ObjectUtils.is(obj) && BDFDB.ObjectUtils.is(nextobj)) { if (BDFDB.ObjectUtils.is(obj) && BDFDB.ObjectUtils.is(nextobj)) {
for (var key in nextobj) { for (let key in nextobj) {
if (BDFDB.ObjectUtils.is(nextobj[key])) { if (BDFDB.ObjectUtils.is(nextobj[key])) {
if (!obj[key]) Object.assign(obj, {[key]:{}}); if (!obj[key]) Object.assign(obj, {[key]:{}});
BDFDB.ObjectUtils.deepAssign(obj[key], nextobj[key]); BDFDB.ObjectUtils.deepAssign(obj[key], nextobj[key]);
@ -2271,90 +2271,96 @@
BDFDB.DataUtils = {}; BDFDB.DataUtils = {};
BDFDB.DataUtils.cached = {}; BDFDB.DataUtils.cached = {};
BDFDB.DataUtils.save = function (data, plugin, key, id) { BDFDB.DataUtils.save = function (data, plugin, key, id) {
var configpath, pluginname; let configpath, pluginname;
if (!BDFDB.BDUtils.isBDv2()) { if (!BDFDB.BDUtils.isBDv2()) {
pluginname = typeof plugin === "string" ? plugin : plugin.name; pluginname = typeof plugin === "string" ? plugin : plugin.name;
configpath = LibraryRequires.path.join(BDFDB.BDUtils.getPluginsFolder(), pluginname + ".config.json"); configpath = LibraryRequires.path.join(BDFDB.BDUtils.getPluginsFolder(), pluginname + ".config.json");
} }
else { else {
pluginname = typeof plugin === "string" ? plugin.toLowerCase() : null; pluginname = typeof plugin === "string" ? plugin.toLowerCase() : null;
var contentpath = pluginname ? BDFDB.Plugins[pluginname] ? BDFDB.Plugins[pluginname].contentPath : null : plugin.contentPath; let contentpath = pluginname ? BDFDB.Plugins[pluginname] ? BDFDB.Plugins[pluginname].contentPath : null : plugin.contentPath;
if (!contentpath) return; if (!contentpath) return;
configpath = LibraryRequires.path.join(contentpath, "settings.json"); configpath = LibraryRequires.path.join(contentpath, "settings.json");
} }
var exists = LibraryRequires.fs.existsSync(configpath); let config = BDFDB.DataUtils.cached[pluginname] !== undefined ? BDFDB.DataUtils.cached[pluginname] : (InternalBDFDB.readConfig(configpath) || {});
var config = !exists ? {} : typeof BDFDB.DataUtils.cached[pluginname] !== "undefined" ? BDFDB.DataUtils.cached[pluginname] : InternalBDFDB.readConfig(configpath);
if (id === undefined) config[key] = BDFDB.ObjectUtils.is(data) ? BDFDB.ObjectUtils.sort(data) : data; if (key === undefined) config = BDFDB.ObjectUtils.is(data) ? BDFDB.ObjectUtils.sort(data) : data;
else { else {
if (!BDFDB.ObjectUtils.is(config[key])) config[key] = {}; if (id === undefined) config[key] = BDFDB.ObjectUtils.is(data) ? BDFDB.ObjectUtils.sort(data) : data;
config[key][id] = BDFDB.ObjectUtils.is(data) ? BDFDB.ObjectUtils.sort(data) : data; else {
if (!BDFDB.ObjectUtils.is(config[key])) config[key] = {};
config[key][id] = BDFDB.ObjectUtils.is(data) ? BDFDB.ObjectUtils.sort(data) : data;
}
} }
if (BDFDB.ObjectUtils.isEmpty(config[key])) delete config[key]; let configIsObject = BDFDB.ObjectUtils.is(config);
if (key !== undefined && configIsObject && BDFDB.ObjectUtils.isEmpty(config[key])) delete config[key];
if (BDFDB.ObjectUtils.isEmpty(config)) { if (BDFDB.ObjectUtils.isEmpty(config)) {
delete BDFDB.DataUtils.cached[pluginname]; delete BDFDB.DataUtils.cached[pluginname];
if (exists) LibraryRequires.fs.unlinkSync(configpath); if (LibraryRequires.fs.existsSync(configpath)) LibraryRequires.fs.unlinkSync(configpath);
} }
else { else {
config = BDFDB.ObjectUtils.sort(config); if (configIsObject) config = BDFDB.ObjectUtils.sort(config);
BDFDB.DataUtils.cached[pluginname] = BDFDB.ObjectUtils.deepAssign({}, config); BDFDB.DataUtils.cached[pluginname] = configIsObject ? BDFDB.ObjectUtils.deepAssign({}, config) : config;
LibraryRequires.fs.writeFileSync(configpath, JSON.stringify(config, null, " ")); LibraryRequires.fs.writeFileSync(configpath, JSON.stringify(config, null, " "));
} }
}; };
BDFDB.DataUtils.load = function (plugin, key, id) { BDFDB.DataUtils.load = function (plugin, key, id) {
var configpath, pluginname; let configpath, pluginname;
if (!BDFDB.BDUtils.isBDv2()) { if (!BDFDB.BDUtils.isBDv2()) {
pluginname = typeof plugin === "string" ? plugin : plugin.name; pluginname = typeof plugin === "string" ? plugin : plugin.name;
configpath = LibraryRequires.path.join(BDFDB.BDUtils.getPluginsFolder(), pluginname + ".config.json"); configpath = LibraryRequires.path.join(BDFDB.BDUtils.getPluginsFolder(), pluginname + ".config.json");
} }
else { else {
pluginname = typeof plugin === "string" ? plugin.toLowerCase() : null; pluginname = typeof plugin === "string" ? plugin.toLowerCase() : null;
var contentpath = pluginname ? BDFDB.Plugins[pluginname] ? BDFDB.Plugins[pluginname].contentPath : null : plugin.contentPath; let contentpath = pluginname ? BDFDB.Plugins[pluginname] ? BDFDB.Plugins[pluginname].contentPath : null : plugin.contentPath;
if (!contentpath) return {}; if (!contentpath) return {};
configpath = LibraryRequires.path.join(contentpath, "settings.json"); configpath = LibraryRequires.path.join(contentpath, "settings.json");
} }
if (!LibraryRequires.fs.existsSync(configpath)) { let config = BDFDB.DataUtils.cached[pluginname] !== undefined ? BDFDB.DataUtils.cached[pluginname] : (InternalBDFDB.readConfig(configpath) || {});
delete BDFDB.DataUtils.cached[pluginname]; let configIsObject = BDFDB.ObjectUtils.is(config);
return {}; BDFDB.DataUtils.cached[pluginname] = configIsObject ? BDFDB.ObjectUtils.deepAssign({}, config) : config;
}
var config = typeof BDFDB.DataUtils.cached[pluginname] !== "undefined" && typeof BDFDB.DataUtils.cached[pluginname][key] !== "undefined" ? BDFDB.DataUtils.cached[pluginname] : InternalBDFDB.readConfig(configpath);
BDFDB.DataUtils.cached[pluginname] = BDFDB.ObjectUtils.deepAssign({}, config);
let keydata = BDFDB.ObjectUtils.deepAssign({}, config && typeof config[key] !== "undefined" ? config[key] : {}); if (key === undefined) return config;
if (id === undefined) return keydata; else {
else return keydata[id] === undefined ? null : keydata[id]; let keydata = configIsObject ? BDFDB.ObjectUtils.deepAssign({}, config[key] != undefined ? config[key] : {}) : null;
if (id === undefined) return keydata;
else return !BDFDB.ObjectUtils.is(keydata) || keydata[id] === undefined ? null : keydata[id];
}
}; };
BDFDB.DataUtils.remove = function (plugin, key, id) { BDFDB.DataUtils.remove = function (plugin, key, id) {
var configpath, pluginname; let configpath, pluginname;
if (!BDFDB.BDUtils.isBDv2()) { if (!BDFDB.BDUtils.isBDv2()) {
pluginname = typeof plugin === "string" ? plugin : plugin.name; pluginname = typeof plugin === "string" ? plugin : plugin.name;
configpath = LibraryRequires.path.join(BDFDB.BDUtils.getPluginsFolder(), pluginname + ".config.json"); configpath = LibraryRequires.path.join(BDFDB.BDUtils.getPluginsFolder(), pluginname + ".config.json");
} }
else { else {
pluginname = typeof plugin === "string" ? plugin.toLowerCase() : null; pluginname = typeof plugin === "string" ? plugin.toLowerCase() : null;
var contentpath = pluginname ? BDFDB.Plugins[pluginname] ? BDFDB.Plugins[pluginname].contentPath : null : plugin.contentPath; let contentpath = pluginname ? BDFDB.Plugins[pluginname] ? BDFDB.Plugins[pluginname].contentPath : null : plugin.contentPath;
if (!contentpath) return; if (!contentpath) return;
configpath = LibraryRequires.path.join(contentpath, "settings.json"); configpath = LibraryRequires.path.join(contentpath, "settings.json");
} }
var exists = LibraryRequires.fs.existsSync(configpath); let config = BDFDB.DataUtils.cached[pluginname] !== undefined ? BDFDB.DataUtils.cached[pluginname] : (InternalBDFDB.readConfig(configpath) || {});
var config = !exists ? {} : typeof BDFDB.DataUtils.cached[pluginname] !== "undefined" ? BDFDB.DataUtils.cached[pluginname] : InternalBDFDB.readConfig(configpath); let configIsObject = BDFDB.ObjectUtils.is(config);
if (id === undefined) delete config[key]; if (key === undefined || !configIsObject) config = {};
else if (BDFDB.ObjectUtils.is(config[key])) delete config[key][id]; else {
if (id === undefined) delete config[key];
else if (BDFDB.ObjectUtils.is(config[key])) delete config[key][id];
}
if (BDFDB.ObjectUtils.isEmpty(config[key])) delete config[key]; if (BDFDB.ObjectUtils.isEmpty(config[key])) delete config[key];
if (BDFDB.ObjectUtils.isEmpty(config)) { if (BDFDB.ObjectUtils.isEmpty(config)) {
delete BDFDB.DataUtils.cached[pluginname]; delete BDFDB.DataUtils.cached[pluginname];
if (exists) LibraryRequires.fs.unlinkSync(configpath); if (LibraryRequires.fs.existsSync(configpath)) LibraryRequires.fs.unlinkSync(configpath);
} }
else { else {
config = BDFDB.ObjectUtils.sort(config); if (configIsObject) config = BDFDB.ObjectUtils.sort(config);
BDFDB.DataUtils.cached[pluginname] = config; BDFDB.DataUtils.cached[pluginname] = configIsObject ? BDFDB.ObjectUtils.deepAssign({}, config) : config;
LibraryRequires.fs.writeFileSync(configpath, JSON.stringify(config, null, " ")); LibraryRequires.fs.writeFileSync(configpath, JSON.stringify(config, null, " "));
} }
}; };
@ -7794,9 +7800,7 @@
let marker = typeof value == "string" ? `"` : ``; let marker = typeof value == "string" ? `"` : ``;
newdata += (marker + value + marker) + "}".repeat(keys.length); newdata += (marker + value + marker) + "}".repeat(keys.length);
newdata = JSON.parse(newdata); newdata = JSON.parse(newdata);
if (BDFDB.ObjectUtils.is(newdata)) BDFDB.ObjectUtils.deepAssign(data, newdata); BDFDB.DataUtils.save(BDFDB.ObjectUtils.is(newdata) ? BDFDB.ObjectUtils.deepAssign({}, data, newdata) : newdata, this.props.plugin, option);
else data = newdata;
BDFDB.DataUtils.save(data, this.props.plugin, option);
this.props.plugin.SettingsUpdated = true; this.props.plugin.SettingsUpdated = true;
} }
if (typeof this.props.onChange == "function") this.props.onChange(value, this); if (typeof this.props.onChange == "function") this.props.onChange(value, this);

2
Plugins/BDFDB.min.js vendored
View File

File diff suppressed because one or more lines are too long