add content modal, fix old storage
This commit is contained in:
Zack Rauen
parent
9d1613466e
commit
5bab0b6674
17
css/main.css
17
css/main.css
|
|
@ -1,6 +1,9 @@
|
|||
/*New loader*/
|
||||
.bd-logo,
|
||||
.bd-loaderv2 {
|
||||
background-image: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9Im5vIj8+IDwhRE9DVFlQRSBzdmcgUFVCTElDICItLy9XM0MvL0RURCBTVkcgMS4xLy9FTiIgImh0dHA6Ly93d3cudzMub3JnL0dyYXBoaWNzL1NWRy8xLjEvRFREL3N2ZzExLmR0ZCI+PHN2ZyBoZWlnaHQ9IjEwMCUiIHN0eWxlPSJmaWxsLXJ1bGU6ZXZlbm9kZDtjbGlwLXJ1bGU6ZXZlbm9kZDtzdHJva2UtbGluZWNhcDpyb3VuZDtzdHJva2UtbGluZWpvaW46cm91bmQ7IiB4bWxuczp4bGluaz0iaHR0cDovL3d3dy53My5vcmcvMTk5OS94bGluayIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB4bWw6c3BhY2U9InByZXNlcnZlIiB3aWR0aD0iMTAwJSIgdmVyc2lvbj0iMS4xIiB2aWV3Qm94PSIwIDAgMjAwMCAyMDAwIj4gICAgPG1ldGFkYXRhIC8+ICAgIDxkZWZzPiAgICAgICAgPGZpbHRlciBpZD0ic2hhZG93MSI+ICAgICAgICA8ZmVEcm9wU2hhZG93IGR4PSIyMCIgZHk9IjAiIHN0ZERldmlhdGlvbj0iMjAiIGZsb29kLWNvbG9yPSJyZ2JhKDAsMCwwLDAuMzUpIi8+ICAgICAgICA8L2ZpbHRlcj4gICAgICAgIDxmaWx0ZXIgaWQ9InNoYWRvdzIiPiAgICAgICAgPGZlRHJvcFNoYWRvdyBkeD0iMTUiIGR5PSIwIiBzdGREZXZpYXRpb249IjIwIiBmbG9vZC1jb2xvcj0icmdiYSgyNTUsMjU1LDI1NSwwLjE1KSIvPiAgICAgICAgPC9maWx0ZXI+ICAgICAgICA8ZmlsdGVyIGlkPSJzaGFkb3czIj4gICAgICAgIDxmZURyb3BTaGFkb3cgZHg9IjEwIiBkeT0iMCIgc3RkRGV2aWF0aW9uPSIyMCIgZmxvb2QtY29sb3I9InJnYmEoMCwwLDAsMC4zNSkiLz4gICAgICAgIDwvZmlsdGVyPiAgICA8L2RlZnM+ICAgIDxnPiAgICAgICAgPHBhdGggc3R5bGU9ImZpbHRlcjogdXJsKCNzaGFkb3czKSIgZD0iTTExOTUuNDQrMTM1LjQ0MkwxMTk1LjQ0KzEzNS40NDJMOTk3LjYrMTM2LjQ0MkMxMDI0LjIrMTQ5Ljc0MisxMTcwLjM0KzE2My41NDIrMTE5My42NCsxNzkuNzQyQzEyNjQuMzQrMjI4Ljg0MisxMzE5Ljc0KzI5MS4yNDIrMTM1OC4yNCszNjUuMDQyQzEzOTguMTQrNDQxLjY0MisxNDE5Ljc0KzUzMC42NDIrMTQyMi41NCs2MjkuNjQyTDE0MjIuNTQrNjMwLjg0MkwxNDIyLjU0KzYzMi4wNDJDMTQyMi41NCs3NzMuMTQyKzE0MjIuNTQrMTIyOC4xNCsxNDIyLjU0KzEzNjkuMTRMMTQyMi41NCsxMzcwLjM0TDE0MjIuNTQrMTM3MS41NEMxNDE5Ljg0KzE0NzAuNTQrMTM5OC4yNCsxNTU5LjU0KzEzNTguMjQrMTYzNi4xNEMxMzE5Ljc0KzE3MDkuOTQrMTI2NC40NCsxNzcyLjM0KzExOTMuNjQrMTgyMS40NEMxMTcxLjA0KzE4MzcuMTQrMTAyNS43KzE4NTAuNTQrMTAwMCsxODYzLjU0TDExOTMuNTQrMTg2NC41NEMxNTM5Ljc0KzE4NjYuNDQrMTg2NC41NCsxNjkzLjM0KzE4NjQuNTQrMTI5Ni42NEwxODY0LjU0KzcxNi45NDJDMTg2Ni40NCszMTIuNDQyKzE1NDEuNjQrMTM1LjQ0MisxMTk1LjQ0KzEzNS40NDJaIiBmaWxsPSIjMTcxNzE3IiBvcGFjaXR5PSIxIi8+ICAgICAgICA8cGF0aCBzdHlsZT0iZmlsdGVyOiB1cmwoI3NoYWRvdzIpIiBkPSJNMTY5NS41NCs2MzEuNDQyQzE2ODUuODQrMjc4LjA0MisxNDA5LjM0KzEzNS40NDIrMTA1Mi45NCsxMzUuNDQyTDM2MS43NCsxMzYuNDQyTDgwMy43NCs0OTAuNDQyTDEwNjAuNzQrNDkwLjQ0MkMxMzM1LjI0KzQ5MC40NDIrMTMzNS4yNCs4MzUuMzQyKzEwNjAuNzQrODM1LjM0MkwxMDYwLjc0KzExNjQuODRDMTE1MC4yMisxMTY0Ljg0KzEyMTAuNTMrMTIwMS40OCsxMjQxLjY4KzEyNTAuODdDMTMwNi4wNysxMzUzKzEyNDUuNzYrMTUwOS42NCsxMDYwLjc0KzE1MDkuNjRMMzYxLjc0KzE4NjMuNTRMMTA1Mi45NCsxODY0LjU0QzE0MDkuMjQrMTg2NC41NCsxNjg1Ljc0KzE3MjEuOTQrMTY5NS41NCsxMzY4LjU0QzE2OTUuNTQrMTIwNS45NCsxNjUxLjA0KzEwODQuNDQrMTU3Mi42NCs5OTkuOTQyQzE2NTEuMDQrOTE1LjU0MisxNjk1LjU0Kzc5NC4wNDIrMTY5NS41NCs2MzEuNDQyWiIgZmlsbD0iIzNFODJFNSIgb3BhY2l0eT0iMSIvPiAgICAgICAgPHBhdGggc3R5bGU9ImZpbHRlcjogdXJsKCNzaGFkb3cxKSIgZD0iTTE0NjkuMjUrNjMxLjQ0MkMxNDU5LjU1KzI3OC4wNDIrMTE4My4wNSsxMzUuNDQyKzgyNi42NSsxMzUuNDQyTDEzNS40NSsxMzUuNDQyTDEzNS40NSsxMDA0QzEzNS40NSsxMDA0KzEzNS40MjcrMTI1NS4yMSszNTUuNjI2KzEyNTUuMjFDNTc1LjgyNSsxMjU1LjIxKzU3NS44NDgrMTAwNCs1NzUuODQ4KzEwMDRMNTc3LjQ1KzQ5MC40NDJMODM0LjQ1KzQ5MC40NDJDMTEwOC45NSs0OTAuNDQyKzExMDguOTUrODM1LjM0Mis4MzQuNDUrODM1LjM0Mkw2NjQuNjUrODM1LjM0Mkw2NjQuNjUrMTE2NC44NEw4MzQuNDUrMTE2NC44NEM5MjMuOTMyKzExNjQuODQrOTg0LjI0NCsxMjAxLjQ4KzEwMTUuMzkrMTI1MC44N0MxMDc5Ljc4KzEzNTMrMTAxOS40NysxNTA5LjY0KzgzNC40NSsxNTA5LjY0TDEzNS40NSsxNTA5LjY0TDEzNS40NSsxODY0LjU0TDgyNi42NSsxODY0LjU0QzExODIuOTUrMTg2NC41NCsxNDU5LjQ1KzE3MjEuOTQrMTQ2OS4yNSsxMzY4LjU0QzE0NjkuMjUrMTIwNS45NCsxNDI0Ljc1KzEwODQuNDQrMTM0Ni4zNSs5OTkuOTQyQzE0MjQuNzUrOTE1LjU0MisxNDY5LjI1Kzc5NC4wNDIrMTQ2OS4yNSs2MzEuNDQyWiIgZmlsbD0iI0ZGRkZGRiIgb3BhY2l0eT0iMSIvPiAgICA8L2c+PC9zdmc+);
|
||||
}
|
||||
.bd-loaderv2 {
|
||||
background-image: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz48IURPQ1RZUEUgc3ZnIFBVQkxJQyAiLS8vVzNDLy9EVEQgU1ZHIDEuMS8vRU4iICJodHRwOi8vd3d3LnczLm9yZy9HcmFwaGljcy9TVkcvMS4xL0RURC9zdmcxMS5kdGQiPjxzdmcgdmVyc2lvbj0iMS4xIiBpZD0iQ2FscXVlXzEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiIHg9IjBweCIgeT0iMHB4IiB2aWV3Qm94PSIwIDAgMjAwMCAyMDAwIiBlbmFibGUtYmFja2dyb3VuZD0ibmV3IDAgMCAyMDAwIDIwMDAiIHhtbDpzcGFjZT0icHJlc2VydmUiPjxnPjxwYXRoIGZpbGw9IiMzRTgyRTUiIGQ9Ik0xNDAyLjIsNjMxLjdjLTkuNy0zNTMuNC0yODYuMi00OTYtNjQyLjYtNDk2SDY4LjR2NzE0LjFsNDQyLDM5OFY0OTAuN2gyNTdjMjc0LjUsMCwyNzQuNSwzNDQuOSwwLDM0NC45ICAgSDU5Ny42djMyOS41aDE2OS44YzI3NC41LDAsMjc0LjUsMzQ0LjgsMCwzNDQuOGgtNjk5djM1NC45aDY5MS4yYzM1Ni4zLDAsNjMyLjgtMTQyLjYsNjQyLjYtNDk2YzAtMTYyLjYtNDQuNS0yODQuMS0xMjIuOS0zNjguNiAgIEMxMzU3LjcsOTE1LjgsMTQwMi4yLDc5NC4zLDE0MDIuMiw2MzEuN3oiLz48cGF0aCBmaWxsPSIjRkZGRkZGIiBkPSJNMTI2Mi41LDEzNS4yTDEyNjIuNSwxMzUuMmwtNzYuOCwwYzI2LjYsMTMuMyw1MS43LDI4LjEsNzUsNDQuM2M3MC43LDQ5LjEsMTI2LjEsMTExLjUsMTY0LjYsMTg1LjMgICBjMzkuOSw3Ni42LDYxLjUsMTY1LjYsNjQuMywyNjQuNmwwLDEuMnYxLjJjMCwxNDEuMSwwLDU5Ni4xLDAsNzM3LjF2MS4ybDAsMS4yYy0yLjcsOTktMjQuMywxODgtNjQuMywyNjQuNiAgIGMtMzguNSw3My44LTkzLjgsMTM2LjItMTY0LjYsMTg1LjNjLTIyLjYsMTUuNy00Ni45LDMwLjEtNzIuNiw0My4xaDcyLjVjMzQ2LjIsMS45LDY3MS0xNzEuMiw2NzEtNTY3LjlWNzE2LjcgICBDMTkzMy41LDMxMi4yLDE2MDguNywxMzUuMiwxMjYyLjUsMTM1LjJ6Ii8+PC9nPjwvc3ZnPg==);
|
||||
position: fixed;
|
||||
bottom:5px;
|
||||
right:5px;
|
||||
|
|
@ -9,10 +12,10 @@
|
|||
width: 20px;
|
||||
height: 20px;
|
||||
background-size: 100% 100%;
|
||||
-webkit-animation: bd-loaderv2-animation 1.5s ease-in-out infinite;
|
||||
animation: bd-loaderv2-animation 1.5s ease-in-out infinite;
|
||||
}
|
||||
|
||||
@-webkit-keyframes bd-loaderv2-animation {
|
||||
@keyframes bd-loaderv2-animation {
|
||||
0% { opacity: 0.05; }
|
||||
50% { opacity: 0.6; }
|
||||
100% { opacity: 0.05; }
|
||||
|
|
@ -2325,7 +2328,7 @@ margin-right: -30px;
|
|||
}
|
||||
|
||||
|
||||
/* New Startup Modal, New Alert */
|
||||
/* New Content Modal, New Alert */
|
||||
@keyframes bd-backdrop {
|
||||
to { opacity: 0.85; }
|
||||
}
|
||||
|
|
@ -2399,7 +2402,7 @@ margin-right: -30px;
|
|||
user-select: text;
|
||||
}
|
||||
|
||||
.bd-modal-wrapper .bd-startup-modal .bd-modal-inner {
|
||||
.bd-modal-wrapper .bd-content-modal .bd-modal-inner {
|
||||
height: 500px;
|
||||
width: 700px;
|
||||
}
|
||||
|
|
@ -2431,7 +2434,7 @@ margin-right: -30px;
|
|||
padding: 10px;
|
||||
}
|
||||
|
||||
.bd-modal-wrapper .bd-startup-modal .bd-modal-body {
|
||||
.bd-modal-wrapper .bd-content-modal .bd-modal-body {
|
||||
padding: 0;
|
||||
}
|
||||
|
||||
|
|
@ -2546,7 +2549,7 @@ margin-right: -30px;
|
|||
align-items: center;
|
||||
}
|
||||
|
||||
.bd-modal-wrapper .bd-startup-modal .scroller {
|
||||
.bd-modal-wrapper .bd-content-modal .scroller {
|
||||
padding-top: 0;
|
||||
}
|
||||
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
223
js/main.js
223
js/main.js
|
|
@ -62,7 +62,7 @@
|
|||
(() => {
|
||||
let v2Loader = document.createElement("div");
|
||||
v2Loader.className = "bd-loaderv2";
|
||||
v2Loader.title = "BetterDiscord is loading...";
|
||||
v2Loader.title = "BandagedBD is loading...";
|
||||
document.body.appendChild(v2Loader);
|
||||
})();
|
||||
|
||||
|
|
@ -139,6 +139,14 @@ var DataStore = (() => {
|
|||
};
|
||||
})();
|
||||
|
||||
var BDEvents = (() => {
|
||||
const EventEmitter = require("events");
|
||||
return new class BDEvents extends EventEmitter {
|
||||
dispatch(eventName, ...args) {this.emit(eventName, ...args);}
|
||||
off(eventName, eventAction) {this.removeListener(eventName, eventAction);}
|
||||
};
|
||||
})();
|
||||
|
||||
|
||||
|
||||
window.bdStorage = class bdPluginStorage {
|
||||
|
|
@ -161,7 +169,7 @@ window.bdPluginStorage = class bdPluginStorage {
|
|||
|
||||
static set(pluginName, key, data) {
|
||||
Utils.warn("[Deprecation Notice] Please use BdApi.saveData() or BdApi.setData(). bdPluginStorage may be removed in future versions.");
|
||||
if (typeof(value) === "undefined") return Utils.warn("Trying to set undefined value in plugin " + pluginName);
|
||||
if (typeof(data) === "undefined") return Utils.warn("Trying to set undefined value in plugin " + pluginName);
|
||||
DataStore.setPluginData(pluginName, key, data);
|
||||
}
|
||||
|
||||
|
|
@ -195,7 +203,7 @@ var settings = {
|
|||
"Developer Mode": {id: "bda-gs-8", info: "Developer Mode", implemented: true, hidden: false, cat: "core"},
|
||||
|
||||
|
||||
"Startup Error Modal": {id: "fork-ps-1", info: "Show a modal with plugin/theme errors on startup", implemented: true, hidden: false, cat: "fork"},
|
||||
"Content Error Modal": {id: "fork-ps-1", info: "Shows a modal with plugin/theme errors", implemented: true, hidden: false, cat: "fork"},
|
||||
"Show Toasts": {id: "fork-ps-2", info: "Shows a small notification for important information", implemented: true, hidden: false, cat: "fork"},
|
||||
"Scroll To Settings": {id: "fork-ps-3", info: "Auto-scrolls to a plugin's settings when the button is clicked (only if out of view)", implemented: true, hidden: false, cat: "fork"},
|
||||
"Animate On Hover": {id: "fork-es-2", info: "Only animate the emote modifiers on hover", implemented: true, hidden: false, cat: "fork"},
|
||||
|
|
@ -329,7 +337,7 @@ Core.prototype.init = async function() {
|
|||
// Show loading errors
|
||||
if (settingsCookie["fork-ps-1"]) {
|
||||
Utils.log("Collecting Startup Errors");
|
||||
this.showStartupErrors({plugins: bdpluginErrors, themes: bdthemeErrors});
|
||||
this.showContentErrors({plugins: bdpluginErrors, themes: bdthemeErrors});
|
||||
}
|
||||
|
||||
if (!DataStore.getBDData("RNMAnnouncement")) {
|
||||
|
|
@ -353,8 +361,9 @@ Core.prototype.checkForGuilds = function() {
|
|||
});
|
||||
};
|
||||
|
||||
Core.prototype.injectExternals = function() {
|
||||
Utils.injectJs("https://cdnjs.cloudflare.com/ajax/libs/ace/1.2.9/ace.js");
|
||||
Core.prototype.injectExternals = async function() {
|
||||
await Utils.injectJs("https://cdnjs.cloudflare.com/ajax/libs/ace/1.2.9/ace.js");
|
||||
if (require.original) window.require = require.original;
|
||||
};
|
||||
|
||||
Core.prototype.initSettings = function () {
|
||||
|
|
@ -483,14 +492,14 @@ Core.prototype.alert = function(title, content) {
|
|||
modal.appendTo("#app-mount");
|
||||
};
|
||||
|
||||
Core.prototype.showStartupErrors = function({plugins: pluginErrors, themes: themeErrors}) {
|
||||
Core.prototype.showContentErrors = function({plugins: pluginErrors = [], themes: themeErrors = []}) {
|
||||
if (!pluginErrors || !themeErrors) return;
|
||||
if (!pluginErrors.length && !themeErrors.length) return;
|
||||
let modal = $(`<div class="bd-modal-wrapper theme-dark">
|
||||
<div class="bd-backdrop backdrop-1wrmKB"></div>
|
||||
<div class="bd-modal bd-startup-modal modal-1UGdnR">
|
||||
<div class="bd-modal bd-content-modal modal-1UGdnR">
|
||||
<div class="bd-modal-inner inner-1JeGVc">
|
||||
<div class="header header-1R_AjF"><div class="title">Startup Errors</div></div>
|
||||
<div class="header header-1R_AjF"><div class="title">Content Errors</div></div>
|
||||
<div class="bd-modal-body">
|
||||
<div class="tab-bar-container">
|
||||
<div class="tab-bar TOP">
|
||||
|
|
@ -500,7 +509,7 @@ Core.prototype.showStartupErrors = function({plugins: pluginErrors, themes: them
|
|||
</div>
|
||||
<div class="table-header">
|
||||
<div class="table-column column-name">Name</div>
|
||||
<div class="table-column column-reason">Reason</div>
|
||||
<div class="table-column column-message">Message</div>
|
||||
<div class="table-column column-error">Error</div>
|
||||
</div>
|
||||
<div class="scroller-wrap fade">
|
||||
|
|
@ -521,7 +530,7 @@ Core.prototype.showStartupErrors = function({plugins: pluginErrors, themes: them
|
|||
for (let err of errors) {
|
||||
let error = $(`<div class="error">
|
||||
<div class="table-column column-name">${err.name ? err.name : err.file}</div>
|
||||
<div class="table-column column-reason">${err.reason}</div>
|
||||
<div class="table-column column-message">${err.message}</div>
|
||||
<div class="table-column column-error"><a class="error-link" href="">${err.error ? err.error.message : ""}</a></div>
|
||||
</div>`);
|
||||
container.append(error);
|
||||
|
|
@ -1170,10 +1179,13 @@ var Utils = class {
|
|||
}
|
||||
|
||||
static injectJs(uri) {
|
||||
$("<script/>", {
|
||||
type: "text/javascript",
|
||||
src: uri
|
||||
}).appendTo($("body"));
|
||||
return new Promise(resolve => {
|
||||
$("<script/>", {
|
||||
type: "text/javascript",
|
||||
src: uri,
|
||||
onload: resolve
|
||||
}).appendTo($("body"));
|
||||
});
|
||||
}
|
||||
|
||||
static escapeID(id) {
|
||||
|
|
@ -1181,15 +1193,15 @@ var Utils = class {
|
|||
}
|
||||
|
||||
static log(message) {
|
||||
console.log("%c[BetterDiscord] %c" + message + "", "color: #3a71c1; font-weight: 700;", "");
|
||||
console.log("%c[BandagedBD] %c" + message + "", "color: #3a71c1; font-weight: 700;", "");
|
||||
}
|
||||
|
||||
static warn(message) {
|
||||
console.warn("%c[BetterDiscord] %c" + message + "", "color: #E8A400; font-weight: 700;", "");
|
||||
console.warn("%c[BandagedBD] %c" + message + "", "color: #E8A400; font-weight: 700;", "");
|
||||
}
|
||||
|
||||
static err(message, error) {
|
||||
console.log("%c[BetterDiscord] %c" + message + "", "color: red; font-weight: 700;", "");
|
||||
console.log("%c[BandagedBD] %c" + message + "", "color: red; font-weight: 700;", "");
|
||||
if (error) {
|
||||
console.groupCollapsed("%cError: " + error.message, "color: red;");
|
||||
console.error(error.stack);
|
||||
|
|
@ -1324,7 +1336,7 @@ var ContentManager = (() => {
|
|||
this.name = "MetaError";
|
||||
}
|
||||
}
|
||||
const originalJSRequire = require("module").Module._extensions[".js"];
|
||||
const originalJSRequire = Module._extensions[".js"];
|
||||
const originalCSSRequire = Module._extensions[".css"] ? Module._extensions[".css"] : () => {return null;};
|
||||
|
||||
|
||||
|
|
@ -1353,8 +1365,8 @@ var ContentManager = (() => {
|
|||
catch (err) {
|
||||
if (err.code !== "ENOENT") return;
|
||||
delete this.timeCache[filename];
|
||||
if (isPlugin) return pluginModule.unloadPlugin(Object.values(bdplugins).find(p => p.filename == filename).plugin.getName());
|
||||
return themeModule.unloadTheme(Object.values(bdthemes).find(p => p.filename == filename).name);
|
||||
if (isPlugin) return pluginModule.unloadPlugin(filename);
|
||||
return themeModule.unloadTheme(filename);
|
||||
}
|
||||
if (!fs.statSync(path.resolve(baseFolder, filename)).isFile()) return;
|
||||
const stats = fs.statSync(path.resolve(baseFolder, filename));
|
||||
|
|
@ -1367,8 +1379,8 @@ var ContentManager = (() => {
|
|||
else themeModule.loadTheme(filename);
|
||||
}
|
||||
if (eventType == "change") {
|
||||
if (isPlugin) pluginModule.reloadPlugin(Object.values(bdplugins).find(p => p.filename == filename).plugin.getName());
|
||||
else themeModule.reloadTheme(Object.values(bdthemes).find(p => p.filename == filename).name);
|
||||
if (isPlugin) pluginModule.reloadPlugin(filename);
|
||||
else themeModule.reloadTheme(filename);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
|
@ -1434,7 +1446,7 @@ var ContentManager = (() => {
|
|||
const isPlugin = type === "plugin";
|
||||
const baseFolder = isPlugin ? this.pluginsFolder : this.themesFolder;
|
||||
try {require(path.resolve(baseFolder, filename));}
|
||||
catch (error) {return {name: filename, file: filename, reason: "Could not be compiled.", error: {message: error.message, stack: error.stack}};}
|
||||
catch (error) {return {name: filename, file: filename, message: "Could not be compiled.", error: {message: error.message, stack: error.stack}};}
|
||||
const content = require(path.resolve(baseFolder, filename));
|
||||
if (isPlugin) {
|
||||
if (!content.type) return;
|
||||
|
|
@ -1443,7 +1455,7 @@ var ContentManager = (() => {
|
|||
delete bdplugins[content.plugin.getName()];
|
||||
bdplugins[content.plugin.getName()] = content;
|
||||
}
|
||||
catch (error) {return {name: filename, file: filename, reason: "Could not be constructed.", error: {message: error.message, stack: error.stack}};}
|
||||
catch (error) {return {name: filename, file: filename, message: "Could not be constructed.", error: {message: error.message, stack: error.stack}};}
|
||||
}
|
||||
else {
|
||||
delete bdthemes[content.name];
|
||||
|
|
@ -1456,21 +1468,22 @@ var ContentManager = (() => {
|
|||
const isPlugin = type === "plugin";
|
||||
const baseFolder = isPlugin ? this.pluginsFolder : this.themesFolder;
|
||||
try {
|
||||
delete require.original.cache[require.original.resolve(path.resolve(baseFolder, filename))];
|
||||
delete require.cache[require.resolve(path.resolve(baseFolder, filename))];
|
||||
}
|
||||
catch (err) {return err;}
|
||||
catch (err) {return {name: filename, file: filename, message: "Could not be unloaded.", error: {message: err.message, stack: err.stack}};}
|
||||
}
|
||||
|
||||
isLoaded(filename, type) {
|
||||
const isPlugin = type === "plugin";
|
||||
const baseFolder = isPlugin ? this.pluginsFolder : this.themesFolder;
|
||||
try {require.original.cache[require.original.resolve(path.resolve(baseFolder, filename))];}
|
||||
try {require.cache[require.resolve(path.resolve(baseFolder, filename))];}
|
||||
catch (err) {return false;}
|
||||
return true;
|
||||
}
|
||||
|
||||
reloadContent(filename, type) {
|
||||
if (this.unloadContent(filename, type)) return;
|
||||
const cantUnload = this.unloadContent(filename, type);
|
||||
if (cantUnload) return cantUnload;
|
||||
return this.loadContent(filename, type);
|
||||
}
|
||||
|
||||
|
|
@ -1533,7 +1546,7 @@ PluginModule.prototype.loadPlugins = function () {
|
|||
catch (err) {
|
||||
pluginCookie[name] = false;
|
||||
Utils.err("Plugin " + name + " could not be loaded.", err);
|
||||
bdpluginErrors.push({name: name, file: bdplugins[plugins[i]].filename, reason: "load() could not be fired.", error: {message: err.message, stack: err.stack}});
|
||||
bdpluginErrors.push({name: name, file: bdplugins[plugins[i]].filename, message: "load() could not be fired.", error: {message: err.message, stack: err.stack}});
|
||||
continue;
|
||||
}
|
||||
|
||||
|
|
@ -1547,7 +1560,7 @@ PluginModule.prototype.loadPlugins = function () {
|
|||
catch (err) {
|
||||
pluginCookie[name] = false;
|
||||
Utils.err("Plugin " + name + " could not be started.", err);
|
||||
bdpluginErrors.push({name: name, file: bdplugins[plugins[i]].filename, reason: "start() could not be fired.", error: {message: err.message, stack: err.stack}});
|
||||
bdpluginErrors.push({name: name, file: bdplugins[plugins[i]].filename, message: "start() could not be fired.", error: {message: err.message, stack: err.stack}});
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1600,27 +1613,36 @@ PluginModule.prototype.togglePlugin = function (plugin) {
|
|||
|
||||
PluginModule.prototype.loadPlugin = function(filename) {
|
||||
const error = ContentManager.loadContent(filename, "plugin");
|
||||
if (error && settingsCookie["fork-ps-2"]) {
|
||||
Utils.err(`${filename} could not be loaded.`, error);
|
||||
return BdApi.showToast(`${filename} could not be loaded.`, {type: "error"});
|
||||
if (error) {
|
||||
if (settingsCookie["fork-ps-1"]) mainCore.showContentErrors({plugins: [error]});
|
||||
if (settingsCookie["fork-ps-2"]) BdApi.showToast(`${filename} could not be loaded.`, {type: "error"});
|
||||
return Utils.err(`${filename} could not be loaded.`, error);
|
||||
}
|
||||
|
||||
const plugin = Object.values(bdplugins).find(p => p.filename == filename).plugin;
|
||||
if (settingsCookie["fork-ps-2"]) BdApi.showToast(`${plugin.getName()} v${plugin.getVersion()} was loaded.`, {type: "success"});
|
||||
BDEvents.dispatch("plugin-loaded", plugin.getName());
|
||||
};
|
||||
|
||||
PluginModule.prototype.unloadPlugin = function(plugin) {
|
||||
PluginModule.prototype.unloadPlugin = function(filenameOrName) {
|
||||
const bdplugin = Object.values(bdplugins).find(p => p.filename == filenameOrName) || bdplugins[filenameOrName];
|
||||
if (!bdplugin) return;
|
||||
const plugin = bdplugin.plugin.getName();
|
||||
if (pluginCookie[plugin]) this.disablePlugin(plugin, true);
|
||||
const error = ContentManager.unloadContent(bdplugins[plugin].filename, "plugin");
|
||||
delete bdplugins[plugin];
|
||||
if (error && settingsCookie["fork-ps-2"]) {
|
||||
Utils.err(`${plugin} could not be unloaded. It may have not been loaded yet.`, error);
|
||||
return BdApi.showToast(`${plugin} could not be unloaded. It may have not been loaded yet.`, {type: "error"});
|
||||
if (error) {
|
||||
if (settingsCookie["fork-ps-1"]) mainCore.showContentErrors({plugins: [error]});
|
||||
if (settingsCookie["fork-ps-2"]) BdApi.showToast(`${plugin} could not be unloaded. It may have not been loaded yet.`, {type: "error"});
|
||||
return Utils.err(`${plugin} could not be unloaded. It may have not been loaded yet.`, error);
|
||||
}
|
||||
if (settingsCookie["fork-ps-2"]) BdApi.showToast(`${plugin} was unloaded.`, {type: "success"});
|
||||
BDEvents.dispatch("plugin-unloaded", plugin);
|
||||
};
|
||||
|
||||
PluginModule.prototype.reloadPlugin = function(plugin) {
|
||||
PluginModule.prototype.reloadPlugin = function(filenameOrName) {
|
||||
const bdplugin = Object.values(bdplugins).find(p => p.filename == filenameOrName) || bdplugins[filenameOrName];
|
||||
if (!bdplugin) return this.loadPlugin(filenameOrName);
|
||||
const plugin = bdplugin.plugin.getName();
|
||||
const enabled = pluginCookie[plugin];
|
||||
if (enabled) this.stopPlugin(plugin, true);
|
||||
const error = ContentManager.reloadContent(bdplugins[plugin].filename, "plugin");
|
||||
|
|
@ -1628,11 +1650,13 @@ PluginModule.prototype.reloadPlugin = function(plugin) {
|
|||
if (bdplugins[plugin].plugin.load && typeof(bdplugins[plugin].plugin.load) == "function") bdplugins[plugin].plugin.load();
|
||||
this.startPlugin(plugin, true);
|
||||
}
|
||||
if (error && settingsCookie["fork-ps-2"]) {
|
||||
Utils.err(`${plugin} could not be reloaded.`, error);
|
||||
return BdApi.showToast(`${plugin} could not be reloaded.`, {type: "error"});
|
||||
if (error) {
|
||||
if (settingsCookie["fork-ps-1"]) mainCore.showContentErrors({plugins: [error]});
|
||||
if (settingsCookie["fork-ps-2"]) BdApi.showToast(`${plugin} could not be reloaded.`, {type: "error"});
|
||||
return Utils.err(`${plugin} could not be reloaded.`, error);
|
||||
}
|
||||
if (settingsCookie["fork-ps-2"]) BdApi.showToast(`${plugin} v${bdplugins[plugin].plugin.getVersion()} was reloaded.`, {type: "success"});
|
||||
BDEvents.dispatch("plugin-reloaded", plugin);
|
||||
};
|
||||
|
||||
PluginModule.prototype.updatePluginList = function() {
|
||||
|
|
@ -1740,34 +1764,45 @@ ThemeModule.prototype.toggleTheme = function(theme) {
|
|||
|
||||
ThemeModule.prototype.loadTheme = function(filename) {
|
||||
const error = ContentManager.loadContent(filename, "theme");
|
||||
if (error && settingsCookie["fork-ps-2"]) {
|
||||
Utils.err(`${filename} could not be loaded.`, error);
|
||||
return BdApi.showToast(`${filename} could not be loaded. It may not have been loaded.`, {type: "error"});
|
||||
if (error) {
|
||||
if (settingsCookie["fork-ps-1"]) mainCore.showContentErrors({themes: [error]});
|
||||
if (settingsCookie["fork-ps-2"])BdApi.showToast(`${filename} could not be loaded. It may not have been loaded.`, {type: "error"});
|
||||
return Utils.err(`${filename} could not be loaded.`, error);
|
||||
}
|
||||
|
||||
const theme = Object.values(bdthemes).find(p => p.filename == filename);
|
||||
if (settingsCookie["fork-ps-2"]) BdApi.showToast(`${theme.name} v${theme.version} was loaded.`, {type: "success"});
|
||||
BDEvents.dispatch("theme-loaded", theme.name);
|
||||
};
|
||||
|
||||
ThemeModule.prototype.unloadTheme = function(theme) {
|
||||
ThemeModule.prototype.unloadTheme = function(filenameOrName) {
|
||||
const bdtheme = Object.values(bdthemes).find(p => p.filename == filenameOrName) || bdthemes[filenameOrName];
|
||||
if (!bdtheme) return;
|
||||
const theme = bdtheme.name;
|
||||
if (themeCookie[theme]) this.disableTheme(theme, true);
|
||||
const error = ContentManager.unloadContent(bdthemes[theme].filename, "theme");
|
||||
delete bdthemes[theme];
|
||||
if (error && settingsCookie["fork-ps-2"]) {
|
||||
Utils.err(`${theme} could not be unloaded. It may have not been loaded yet.`, error);
|
||||
return BdApi.showToast(`${theme} could not be unloaded. It may have not been loaded yet.`, {type: "error"});
|
||||
if (error) {
|
||||
if (settingsCookie["fork-ps-1"]) mainCore.showContentErrors({themes: [error]});
|
||||
if (settingsCookie["fork-ps-2"]) BdApi.showToast(`${theme} could not be unloaded. It may have not been loaded yet.`, {type: "error"});
|
||||
return Utils.err(`${theme} could not be unloaded. It may have not been loaded yet.`, error);
|
||||
}
|
||||
if (settingsCookie["fork-ps-2"]) BdApi.showToast(`${theme} was unloaded.`, {type: "success"});
|
||||
BDEvents.dispatch("theme-unloaded", theme);
|
||||
};
|
||||
|
||||
ThemeModule.prototype.reloadTheme = function(theme) {
|
||||
ThemeModule.prototype.reloadTheme = function(filenameOrName) {
|
||||
const bdtheme = Object.values(bdplugins).find(p => p.filename == filenameOrName) || bdthemes[filenameOrName];
|
||||
if (!bdtheme) return this.loadtheme(filenameOrName);
|
||||
const theme = bdtheme.name;
|
||||
const error = ContentManager.reloadContent(bdthemes[theme].filename, "theme");
|
||||
if (themeCookie[theme]) this.disableTheme(theme, true), this.enableTheme(theme, true);
|
||||
if (error && settingsCookie["fork-ps-2"]) {
|
||||
Utils.err(`${theme} could not be reloaded.`, error);
|
||||
return BdApi.showToast(`${theme} could not be reloaded.`, {type: "error"});
|
||||
if (error) {
|
||||
if (settingsCookie["fork-ps-1"]) mainCore.showContentErrors({themes: [error]});
|
||||
if (settingsCookie["fork-ps-2"]) BdApi.showToast(`${theme} could not be reloaded.`, {type: "error"});
|
||||
return Utils.err(`${theme} could not be reloaded.`, error);
|
||||
}
|
||||
if (settingsCookie["fork-ps-2"]) BdApi.showToast(`${theme} v${bdthemes[theme].version} was reloaded.`, {type: "success"});
|
||||
BDEvents.dispatch("theme-reloaded", theme);
|
||||
};
|
||||
|
||||
ThemeModule.prototype.updateThemeList = function() {
|
||||
|
|
@ -1828,7 +1863,7 @@ BdApi.setWindowPreference = function(key, value) {
|
|||
const fs = require("fs");
|
||||
const prefs = this.getAllWindowPreferences();
|
||||
prefs[key] = value;
|
||||
delete require.original.cache[this.WindowConfigFile];
|
||||
delete require.cache[this.WindowConfigFile];
|
||||
fs.writeFileSync(this.WindowConfigFile, JSON.stringify(prefs, null, 4));
|
||||
};
|
||||
|
||||
|
|
@ -1881,6 +1916,12 @@ BdApi.getCore = function () {
|
|||
|
||||
//Show modal alert
|
||||
BdApi.alert = function (title, content) {
|
||||
// const ModalStack = EDApi.findModuleByProps("push", "update", "pop", "popWithKey");
|
||||
// const AlertModal = EDApi.findModule(m => m.prototype && m.prototype.handleCancel && m.prototype.handleSubmit && m.prototype.handleMinorConfirm);
|
||||
// if (!ModalStack || !AlertModal) return window.alert(body);
|
||||
// ModalStack.push(function(props) {
|
||||
// return EDApi.React.createElement(AlertModal, Object.assign({title, body}, props));
|
||||
// });
|
||||
mainCore.alert(title, content);
|
||||
};
|
||||
|
||||
|
|
@ -3301,6 +3342,7 @@ class V2C_PluginCard extends BDV2.reactComponent {
|
|||
self.settingsPanel = "";
|
||||
|
||||
this.reload = this.reload.bind(this);
|
||||
this.onReload = this.onReload.bind(this);
|
||||
}
|
||||
|
||||
setInitialState() {
|
||||
|
|
@ -3311,6 +3353,19 @@ class V2C_PluginCard extends BDV2.reactComponent {
|
|||
};
|
||||
}
|
||||
|
||||
// componentDidMount() {
|
||||
// BDEvents.on("plugin-reloaded", this.onReload);
|
||||
// }
|
||||
|
||||
// componentWillUnmount() {
|
||||
// BDEvents.off("plugin-reloaded", this.onReload);
|
||||
// }
|
||||
|
||||
onReload(pluginName) {
|
||||
if (pluginName !== this.props.plugin.getName()) return;
|
||||
this.setState({reloads: this.state.reloads + 1});
|
||||
}
|
||||
|
||||
componentDidUpdate() {
|
||||
if (this.state.settings) {
|
||||
if (typeof this.settingsPanel === "object") {
|
||||
|
|
@ -3342,7 +3397,7 @@ class V2C_PluginCard extends BDV2.reactComponent {
|
|||
const plugin = this.props.plugin.getName();
|
||||
pluginModule.reloadPlugin(plugin);
|
||||
this.props.plugin = bdplugins[plugin].plugin;
|
||||
this.setState({reloads: this.state.reloads + 1});
|
||||
this.onReload(this.props.plugin.getName());
|
||||
}
|
||||
|
||||
render() {
|
||||
|
|
@ -3429,6 +3484,19 @@ class V2C_ThemeCard extends BDV2.reactComponent {
|
|||
};
|
||||
}
|
||||
|
||||
// componentDidMount() {
|
||||
// BDEvents.on("theme-reloaded", this.onReload);
|
||||
// }
|
||||
|
||||
// componentWillUnmount() {
|
||||
// BDEvents.off("theme-reloaded", this.onReload);
|
||||
// }
|
||||
|
||||
onReload(themeName) {
|
||||
if (themeName !== this.props.theme.name) return;
|
||||
this.setState({reloads: this.state.reloads + 1});
|
||||
}
|
||||
|
||||
reload() {
|
||||
const theme = this.props.theme.name;
|
||||
const error = themeModule.reloadTheme(theme);
|
||||
|
|
@ -3436,7 +3504,7 @@ class V2C_ThemeCard extends BDV2.reactComponent {
|
|||
else mainCore.showToast(`${bdthemes[theme].name} v${bdthemes[theme].version} has been reloaded.`, {type: "success"});
|
||||
// this.setState(this.state);
|
||||
this.props.theme = bdthemes[theme];
|
||||
this.setState({reloads: this.state.reloads + 1});
|
||||
this.onReload(this.props.theme.name);
|
||||
}
|
||||
|
||||
render() {
|
||||
|
|
@ -3623,7 +3691,7 @@ class V2_SettingsPanel_Sidebar {
|
|||
}
|
||||
|
||||
get items() {
|
||||
return [{text: "Core", id: "core"}, {text: "Zere's Fork", id: "fork"}, {text: "Emotes", id: "emotes"}, {text: "Custom CSS", id: "customcss"}, {text: "Plugins", id: "plugins"}, {text: "Themes", id: "themes"}];
|
||||
return [{text: "Core", id: "core"}, {text: "Bandages", id: "fork"}, {text: "Emotes", id: "emotes"}, {text: "Custom CSS", id: "customcss"}, {text: "Plugins", id: "plugins"}, {text: "Themes", id: "themes"}];
|
||||
}
|
||||
|
||||
get component() {
|
||||
|
|
@ -3888,7 +3956,7 @@ class V2_SettingsPanel {
|
|||
fade: true,
|
||||
dark: true,
|
||||
children: [
|
||||
BDV2.react.createElement(V2Components.SettingsPanel, {key: "fspanel", title: "Zere's Fork Settings", onChange: this.onChange, settings: this.forkSettings, button: {
|
||||
BDV2.react.createElement(V2Components.SettingsPanel, {key: "fspanel", title: "BandagedBD Settings", onChange: this.onChange, settings: this.forkSettings, button: {
|
||||
title: "Clear Emote Cache",
|
||||
onClick: () => { emoteModule.clearEmoteData(); emoteModule.init(); quickEmoteMenu.init(); }
|
||||
}}),
|
||||
|
|
@ -3906,6 +3974,37 @@ class V2_SettingsPanel {
|
|||
return BDV2.react.createElement(V2Components.Scroller, {contentColumn: true, fade: true, dark: true, children: [BDV2.react.createElement(V2Components.CssEditor, {key: "csseditor"}), BDV2.react.createElement(V2Components.Tools, {key: "tools"})]});
|
||||
}
|
||||
|
||||
contentComponent(type) {
|
||||
const componentElement = type == "plugins" ? this.pluginsComponent : this.themesComponent;
|
||||
const prefix = type.replace("s", "");
|
||||
const settingsList = this;
|
||||
class ContentList extends BDV2.react.Component {
|
||||
constructor(props) {
|
||||
super(props);
|
||||
this.onChange = this.onChange.bind(this);
|
||||
}
|
||||
|
||||
componentDidMount() {
|
||||
BDEvents.on(`${prefix}-reloaded`, this.onChange);
|
||||
BDEvents.on(`${prefix}-loaded`, this.onChange);
|
||||
BDEvents.on(`${prefix}-unloaded`, this.onChange);
|
||||
}
|
||||
|
||||
componentWillUnmount() {
|
||||
BDEvents.off(`${prefix}-reloaded`, this.onChange);
|
||||
BDEvents.off(`${prefix}-loaded`, this.onChange);
|
||||
BDEvents.off(`${prefix}-unloaded`, this.onChange);
|
||||
}
|
||||
|
||||
onChange() {
|
||||
settingsList.sideBarOnClick(type);
|
||||
}
|
||||
|
||||
render() {return componentElement;}
|
||||
}
|
||||
return BDV2.react.createElement(ContentList);
|
||||
}
|
||||
|
||||
get pluginsComponent() {
|
||||
let plugins = Object.keys(bdplugins).sort((a, b) => a.toLowerCase().localeCompare(b.toLowerCase())).reduce((arr, key) => {
|
||||
arr.push(BDV2.react.createElement(V2Components.PluginCard, {key: key, plugin: bdplugins[key].plugin}));return arr;
|
||||
|
|
@ -3976,7 +4075,7 @@ class V2_SettingsPanel {
|
|||
console.log("FAILED TO LOCATE ROOT: .layer-3QrUeG .standardSidebarView-3F1I7i");
|
||||
return;
|
||||
}
|
||||
BDV2.reactDom.render(this.pluginsComponent, root);
|
||||
BDV2.reactDom.render(this.contentComponent("plugins"), root);
|
||||
}
|
||||
|
||||
renderThemePane() {
|
||||
|
|
@ -3985,7 +4084,7 @@ class V2_SettingsPanel {
|
|||
console.log("FAILED TO LOCATE ROOT: .layer-3QrUeG .standardSidebarView-3F1I7i");
|
||||
return;
|
||||
}
|
||||
BDV2.reactDom.render(this.themesComponent, root);
|
||||
BDV2.reactDom.render(this.contentComponent("themes"), root);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
|
|
@ -28,4 +28,4 @@
|
|||
"gulp-csso": "^3.0.1",
|
||||
"gulp-rename": "^1.4.0"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue