This commit is contained in:
Mirco Wittrien 2020-09-10 23:58:03 +02:00
parent d0094bfa50
commit 681f417dbb
2 changed files with 13 additions and 10 deletions

View File

@ -15,7 +15,6 @@ module.exports = (_ => {
const InternalComponents = {NativeSubComponents: {}, LibraryComponents: {}}; const InternalComponents = {NativeSubComponents: {}, LibraryComponents: {}};
const Cache = {data: {}, modules: {}}; const Cache = {data: {}, modules: {}};
const myId = "278543574059057154", myGuildId = "410787888507256842";
var settings = {}; var settings = {};
if (window.BDFDB && window.BDFDB.PluginUtils && typeof window.BDFDB.PluginUtils.cleanUp == "function") window.BDFDB.PluginUtils.cleanUp(window.BDFDB); if (window.BDFDB && window.BDFDB.PluginUtils && typeof window.BDFDB.PluginUtils.cleanUp == "function") window.BDFDB.PluginUtils.cleanUp(window.BDFDB);
@ -134,9 +133,9 @@ module.exports = (_ => {
BDFDB.PluginUtils = {}; BDFDB.PluginUtils = {};
BDFDB.PluginUtils.buildPlugin = function (config) { BDFDB.PluginUtils.buildPlugin = function (config) {
return [Plugin(config), Object.assign({}, BDFDB)]; return [Plugin(config), BDFDB];
}; };
BDFDB.PluginUtils.load = function (plugin) { BDFDB.PluginUtils.load = function (plugin) {
if (!PluginStores.updateTimeout.includes(plugin.name)) { if (!PluginStores.updateTimeout.includes(plugin.name)) {
PluginStores.updateTimeout.push(plugin.name); PluginStores.updateTimeout.push(plugin.name);
let url = ["ImageZoom", "ImageGallery", "ReverseImageSearch", "ShowImageDetails"].includes(plugin.name) ? "https://mwittrien.github.io/BetterDiscordAddons/Plugins/ImageUtilities/ImageUtilities.plugin.js" : ["BetterFriendCount"].includes(plugin.name) ? "https://mwittrien.github.io/BetterDiscordAddons/Plugins/BetterFriendList/BetterFriendList.plugin.js" : (plugin.rawUrl ||`https://mwittrien.github.io/BetterDiscordAddons/Plugins/${plugin.name}/${plugin.name}.plugin.js`); let url = ["ImageZoom", "ImageGallery", "ReverseImageSearch", "ShowImageDetails"].includes(plugin.name) ? "https://mwittrien.github.io/BetterDiscordAddons/Plugins/ImageUtilities/ImageUtilities.plugin.js" : ["BetterFriendCount"].includes(plugin.name) ? "https://mwittrien.github.io/BetterDiscordAddons/Plugins/BetterFriendList/BetterFriendList.plugin.js" : (plugin.rawUrl ||`https://mwittrien.github.io/BetterDiscordAddons/Plugins/${plugin.name}/${plugin.name}.plugin.js`);
@ -165,7 +164,7 @@ module.exports = (_ => {
if (typeof plugin.css === "string") BDFDB.DOMUtils.appendLocalStyle(plugin.name, plugin.css); if (typeof plugin.css === "string") BDFDB.DOMUtils.appendLocalStyle(plugin.name, plugin.css);
InternalBDFDB.patchPlugin(plugin); InternalBDFDB.patchPlugin(plugin);
addSpecialListeners(plugin); InternalBDFDB.addSpecialListeners(plugin);
BDFDB.PluginUtils.translate(plugin); BDFDB.PluginUtils.translate(plugin);
@ -412,6 +411,7 @@ module.exports = (_ => {
loadingIconWrapper.appendChild(icon); loadingIconWrapper.appendChild(icon);
}; };
BDFDB.PluginUtils.createSettingsPanel = function (plugin, children) { BDFDB.PluginUtils.createSettingsPanel = function (plugin, children) {
plugin = plugin == BDFDB && InternalBDFDB || plugin;
if (!BDFDB.ObjectUtils.is(plugin) || !children || (!BDFDB.ReactUtils.isValidElement(children) && !BDFDB.ArrayUtils.is(children))) return; if (!BDFDB.ObjectUtils.is(plugin) || !children || (!BDFDB.ReactUtils.isValidElement(children) && !BDFDB.ArrayUtils.is(children))) return;
let settingsPanel = BDFDB.DOMUtils.create(`<div class="${plugin.name}-settings ${BDFDB.disCN.settingsPanel}"></div>`); let settingsPanel = BDFDB.DOMUtils.create(`<div class="${plugin.name}-settings ${BDFDB.disCN.settingsPanel}"></div>`);
BDFDB.ReactUtils.render(BDFDB.ReactUtils.createElement(InternalComponents.LibraryComponents.SettingsPanel, { BDFDB.ReactUtils.render(BDFDB.ReactUtils.createElement(InternalComponents.LibraryComponents.SettingsPanel, {
@ -439,7 +439,7 @@ module.exports = (_ => {
settingsPanel.parentElement.appendChild(plugin.getSettingsPanel(...args)); settingsPanel.parentElement.appendChild(plugin.getSettingsPanel(...args));
settingsPanel.remove(); settingsPanel.remove();
}; };
const addSpecialListeners = function (plugin) { InternalBDFDB.addSpecialListeners = function (plugin) {
plugin = plugin == BDFDB && InternalBDFDB || plugin; plugin = plugin == BDFDB && InternalBDFDB || plugin;
if (BDFDB.ObjectUtils.is(plugin)) { if (BDFDB.ObjectUtils.is(plugin)) {
if (typeof plugin.onSwitch === "function") { if (typeof plugin.onSwitch === "function") {
@ -6969,7 +6969,7 @@ module.exports = (_ => {
customBadge = addBadge && BDFDB_Patrons[user.id].t3 && BDFDB_Patrons[user.id].custom; customBadge = addBadge && BDFDB_Patrons[user.id].t3 && BDFDB_Patrons[user.id].custom;
className = BDFDB.DOMUtils.formatClassName(className, addBadge && BDFDB.disCN.bdfdbhasbadge, BDFDB.disCN.bdfdbbadgeavatar, BDFDB.disCN.bdfdbsupporter, customBadge && BDFDB.disCN.bdfdbsupportercustom); className = BDFDB.DOMUtils.formatClassName(className, addBadge && BDFDB.disCN.bdfdbhasbadge, BDFDB.disCN.bdfdbbadgeavatar, BDFDB.disCN.bdfdbsupporter, customBadge && BDFDB.disCN.bdfdbsupportercustom);
} }
if (user.id == myId) { if (user.id == InternalData.myId) {
addBadge = true; addBadge = true;
role = "Theme Developer"; role = "Theme Developer";
className = BDFDB.DOMUtils.formatClassName(className, BDFDB.disCN.bdfdbhasbadge, BDFDB.disCN.bdfdbbadgeavatar, BDFDB.disCN.bdfdbdev); className = BDFDB.DOMUtils.formatClassName(className, BDFDB.disCN.bdfdbhasbadge, BDFDB.disCN.bdfdbbadgeavatar, BDFDB.disCN.bdfdbdev);
@ -7007,7 +7007,7 @@ module.exports = (_ => {
customBadge = addBadge && BDFDB_Patrons[user.id].t3 && BDFDB_Patrons[user.id].custom; customBadge = addBadge && BDFDB_Patrons[user.id].t3 && BDFDB_Patrons[user.id].custom;
avatar.className = BDFDB.DOMUtils.formatClassName(avatar.className, addBadge && BDFDB.disCN.bdfdbhasbadge, BDFDB.disCN.bdfdbbadgeavatar, BDFDB.disCN.bdfdbsupporter, customBadge && BDFDB.disCN.bdfdbsupportercustom); avatar.className = BDFDB.DOMUtils.formatClassName(avatar.className, addBadge && BDFDB.disCN.bdfdbhasbadge, BDFDB.disCN.bdfdbbadgeavatar, BDFDB.disCN.bdfdbsupporter, customBadge && BDFDB.disCN.bdfdbsupportercustom);
} }
else if (user.id == myId) { else if (user.id == InternalData.myId) {
addBadge = true; addBadge = true;
role = "Theme Developer"; role = "Theme Developer";
avatar.className = BDFDB.DOMUtils.formatClassName(avatar.className, BDFDB.disCN.bdfdbhasbadge, BDFDB.disCN.bdfdbbadgeavatar, BDFDB.disCN.bdfdbdev); avatar.className = BDFDB.DOMUtils.formatClassName(avatar.className, BDFDB.disCN.bdfdbhasbadge, BDFDB.disCN.bdfdbbadgeavatar, BDFDB.disCN.bdfdbdev);
@ -7154,7 +7154,7 @@ module.exports = (_ => {
BDFDB.PatchUtils.forceAllUpdates(BDFDB); BDFDB.PatchUtils.forceAllUpdates(BDFDB);
}; };
addSpecialListeners(BDFDB); InternalBDFDB.addSpecialListeners(BDFDB);
let BasePopout = BDFDB.ModuleUtils.findByName("BasePopout"), ReferencePositionLayer = BDFDB.ModuleUtils.findByName("ReferencePositionLayer"); let BasePopout = BDFDB.ModuleUtils.findByName("BasePopout"), ReferencePositionLayer = BDFDB.ModuleUtils.findByName("ReferencePositionLayer");
if (BasePopout && ReferencePositionLayer) BDFDB.PatchUtils.patch(BDFDB, BasePopout.prototype, "renderLayer", {after: e => { if (BasePopout && ReferencePositionLayer) BDFDB.PatchUtils.patch(BDFDB, BasePopout.prototype, "renderLayer", {after: e => {
@ -7271,11 +7271,11 @@ module.exports = (_ => {
} }
BDFDB.PatchUtils.patch(BDFDB, LibraryModules.GuildStore, "getGuild", {after: e => { BDFDB.PatchUtils.patch(BDFDB, LibraryModules.GuildStore, "getGuild", {after: e => {
if (e.returnValue && e.methodArguments[0] == myGuildId) e.returnValue.banner = "https://mwittrien.github.io/BetterDiscordAddons/Library/_res/BDFDB.banner.png"; if (e.returnValue && e.methodArguments[0] == InternalData.myGuildId) e.returnValue.banner = "https://mwittrien.github.io/BetterDiscordAddons/Library/_res/BDFDB.banner.png";
}}); }});
BDFDB.PatchUtils.patch(BDFDB, LibraryModules.IconUtils, "getGuildBannerURL", {instead: e => { BDFDB.PatchUtils.patch(BDFDB, LibraryModules.IconUtils, "getGuildBannerURL", {instead: e => {
return e.methodArguments[0].id == myGuildId ? e.methodArguments[0].banner : e.callOriginalMethod(); return e.methodArguments[0].id == InternalData.myGuildId ? e.methodArguments[0].banner : e.callOriginalMethod();
}}); }});
InternalBDFDB.forceUpdateAll(); InternalBDFDB.forceUpdateAll();
@ -7407,6 +7407,7 @@ module.exports = (_ => {
cleanUp: BDFDB.PluginUtils.cleanUp cleanUp: BDFDB.PluginUtils.cleanUp
} }
}, config); }, config);
Object.freeze(BDFDB);
} }
for (let obj in DiscordObjects) if (!DiscordObjects[obj]) { for (let obj in DiscordObjects) if (!DiscordObjects[obj]) {
DiscordObjects[obj] = function () {}; DiscordObjects[obj] = function () {};

View File

@ -2492,6 +2492,8 @@
"wrap": ["Flex", "wrap"], "wrap": ["Flex", "wrap"],
"wrapreverse": ["Flex", "wrapReverse"] "wrapreverse": ["Flex", "wrapReverse"]
}, },
"myId": "278543574059057154",
"myGuildId": "410787888507256842",
"Languages": { "Languages": {
"$discord": {"name":"Discord (English))", "id":"en", "ownlang":"English"}, "$discord": {"name":"Discord (English))", "id":"en", "ownlang":"English"},
"af": {"name":"Afrikaans", "id":"af", "ownlang":"Afrikaans"}, "af": {"name":"Afrikaans", "id":"af", "ownlang":"Afrikaans"},