diff --git a/lib/BetterDiscord.js b/lib/BetterDiscord.js index 8f17bac..4f7a881 100644 --- a/lib/BetterDiscord.js +++ b/lib/BetterDiscord.js @@ -44,6 +44,7 @@ function initStorage() { bdStorage.get = function(i, m, pn) { + if(m) return bdStorage.data[i] || ""; if(bdPluginStorage[pn] !== undefined) { @@ -55,6 +56,7 @@ bdStorage.get = function(i, m, pn) { return bdPluginStorage[pn][i] || undefined; } + return undefined; }; bdStorage.set = function(i, v, m, pn) { @@ -71,6 +73,7 @@ bdStorage.set = function(i, v, m, pn) { + function BetterDiscord(mainWindow) { _mainWindow = mainWindow; _cfg = _config.cfg; @@ -224,7 +227,7 @@ function updateExtData() { 'type': 'javascript', 'resource': 'Main JS', 'domain': _cfg.updater.CDN, - 'url': '//' + _cfg.updater.CDN + '/' + _cfg.repo + '/BetterDiscordApp/' + _cfg.hash + '/js/main.min.js', + 'url': '//' + _cfg.updater.CDN + '/' + _cfg.repo + '/BetterDiscordApp/' + _cfg.hash + '/js/main.js', 'localurl': _cfg.localServer + '/BetterDiscordApp/js/main.js?v=1.1', 'message': 'load-emoteData-twitchGlobal', 'cacheable': false, @@ -581,7 +584,7 @@ function ipcSyncMessage(event, arg) { break; case "pluginstorage": if(arg.cmd == "get") { - event.returnValue = bdStorage.get(arg.var, false, arg.pn); + event.returnValue = bdStorage.get(arg.var, false, arg.pn) || null; } if(arg.cmd == "set") { bdStorage.set(arg.var, arg.data, false, arg.pn); @@ -617,7 +620,6 @@ function ipcAsyncMessage(event, arg) { } if(arg.cmd == "get") { var get = bdStorage.get(arg.var); - console.log(get); event.sender.send('asynchronous-reply', get); break; }