From 16345818acda68df3363bf60abd679f9d35f0bf8 Mon Sep 17 00:00:00 2001 From: Mirco Wittrien Date: Wed, 7 Sep 2022 10:10:29 +0200 Subject: [PATCH] stuff --- Library/0BDFDB.plugin.js | 80 +++++++++---------- Library/_res/0BDFDB.data.json | 6 +- .../ShowConnections/ShowConnections.plugin.js | 11 ++- 3 files changed, 47 insertions(+), 50 deletions(-) diff --git a/Library/0BDFDB.plugin.js b/Library/0BDFDB.plugin.js index 6226f8879e..915a3a2c25 100644 --- a/Library/0BDFDB.plugin.js +++ b/Library/0BDFDB.plugin.js @@ -2,7 +2,7 @@ * @name BDFDB * @author DevilBro * @authorId 278543574059057154 - * @version 2.5.8 + * @version 2.5.9 * @description Required Library for DevilBro's Plugins * @invite Jx3TjNS * @donate https://www.paypal.me/MircoWittrien @@ -1176,14 +1176,14 @@ module.exports = (_ => { else return ""; }; - Internal.findModule = function (type, cacheString, filter, useExport, noWarnings = false) { + Internal.findModule = function (type, cacheString, filter, defaultExport, noWarnings = false) { if (!BDFDB.ObjectUtils.is(Cache.modules[type])) Cache.modules[type] = {module: {}, export: {}}; - if (useExport && Cache.modules[type].export[cacheString]) return Cache.modules[type].export[cacheString]; - else if (!useExport && Cache.modules[type].module[cacheString]) return Cache.modules[type].module[cacheString]; + if (defaultExport && Cache.modules[type].export[cacheString]) return Cache.modules[type].export[cacheString]; + else if (!defaultExport && Cache.modules[type].module[cacheString]) return Cache.modules[type].module[cacheString]; else { - let m = BDFDB.ModuleUtils.find(filter, {useExport: useExport}); + let m = BDFDB.ModuleUtils.find(filter, {defaultExport: defaultExport}); if (m) { - if (useExport) Cache.modules[type].export[cacheString] = m; + if (defaultExport) Cache.modules[type].export[cacheString] = m; else Cache.modules[type].module[cacheString] = m; return m; } @@ -1197,7 +1197,7 @@ module.exports = (_ => { }; Internal.getModuleString = function (module) { - const id = (BDFDB.ModuleUtils.find(m => m == module && m, {useExport: false}) || {}).id; + const id = (BDFDB.ModuleUtils.find(m => m == module && m, {defaultExport: false}) || {}).id; if (!id) return ""; const req = Internal.getWebModuleReq(); return (req.m[id] || "").toString(); @@ -1231,7 +1231,7 @@ module.exports = (_ => { BDFDB.ModuleUtils = {}; BDFDB.ModuleUtils.find = function (filter, config = {}) { - let useExport = typeof config.useExport != "boolean" ? true : config.useExport; + let defaultExport = typeof config.defaultExport != "boolean" ? true : config.defaultExport; let onlySearchUnloaded = typeof config.onlySearchUnloaded != "boolean" ? false : config.onlySearchUnloaded; let all = typeof config.all != "boolean" ? false : config.all; const req = Internal.getWebModuleReq(); @@ -1239,17 +1239,17 @@ module.exports = (_ => { if (!onlySearchUnloaded) for (let i in req.c) if (req.c.hasOwnProperty(i)) { let m = req.c[i].exports, r = null; if (m && (typeof m == "object" || typeof m == "function") && !!(r = filter(m))) { - if (all) found.push(useExport ? r : req.c[i]); - else return useExport ? r : req.c[i]; + if (all) found.push(defaultExport ? r : req.c[i]); + else return defaultExport ? r : req.c[i]; } if (m && m.__esModule && m.default && (typeof m.default == "object" || typeof m.default == "function")) { if (!!(r = filter(m.default))) { - if (all) found.push(useExport ? r : req.c[i]); - else return useExport ? r : req.c[i]; + if (all) found.push(defaultExport ? r : req.c[i]); + else return defaultExport ? r : req.c[i]; } else if (m.default.type && (typeof m.default.type == "object" || typeof m.default.type == "function") && !!(r = filter(m.default.type))) { - if (all) found.push(useExport ? r : req.c[i]); - else return useExport ? r : req.c[i]; + if (all) found.push(defaultExport ? r : req.c[i]); + else return defaultExport ? r : req.c[i]; } } } @@ -1257,15 +1257,15 @@ module.exports = (_ => { let m = req.m[i]; if (m && typeof m == "function") { if (req.c[i] && !onlySearchUnloaded && filter(m)) { - if (all) found.push(useExport ? req.c[i].exports : req.c[i]); - else return useExport ? req.c[i].exports : req.c[i]; + if (all) found.push(defaultExport ? req.c[i].exports : req.c[i]); + else return defaultExport ? req.c[i].exports : req.c[i]; } if (!req.c[i] && onlySearchUnloaded && filter(m)) { const resolved = {}, resolved2 = {}; m(resolved, resolved2, req); const trueResolved = resolved2 && BDFDB.ObjectUtils.isEmpty(resolved2) ? resolved : resolved2; - if (all) found.push(useExport ? trueResolved.exports : trueResolved); - else return useExport ? trueResolved.exports : trueResolved; + if (all) found.push(defaultExport ? trueResolved.exports : trueResolved); + else return defaultExport ? trueResolved.exports : trueResolved; } } } @@ -1275,64 +1275,64 @@ module.exports = (_ => { properties = properties.flat(10); let arg2 = properties.pop(); let arg1 = properties.pop(); - let useExport = true, noWarnings = false; + let defaultExport = true, noWarnings = false; if (typeof arg2 != "boolean") properties.push(...[arg1, arg2].filter(n => n)); else { if (typeof arg1 != "boolean") { if (arg1) properties.push(arg1); - useExport = arg2; + defaultExport = arg2; } else { - useExport = arg1; + defaultExport = arg1; noWarnings = arg2; } } return Internal.findModule("prop", JSON.stringify(properties), m => properties.every(prop => { const value = m[prop]; return value !== undefined && !(typeof value == "string" && !value); - }) && m, useExport, noWarnings); + }) && m, defaultExport, noWarnings); }; - BDFDB.ModuleUtils.findByName = function (name, useExport, noWarnings = false) { - return Internal.findModule("name", JSON.stringify(name), m => m.displayName === name && m || m.render && m.render.displayName === name && m || m.constructor && m.constructor.displayName === name && m || m[name] && m[name].displayName === name && m[name], typeof useExport != "boolean" ? true : useExport, noWarnings); + BDFDB.ModuleUtils.findByName = function (name, defaultExport, noWarnings = false) { + return Internal.findModule("name", JSON.stringify(name), m => m.displayName === name && m || m.render && m.render.displayName === name && m || m.constructor && m.constructor.displayName === name && m || m[name] && m[name].displayName === name && m[name] || typeof m.getName == "function" && m.getName() == name && m, typeof defaultExport != "boolean" ? true : defaultExport, noWarnings); }; BDFDB.ModuleUtils.findByString = function (...strings) { strings = strings.flat(10); let arg2 = strings.pop(); let arg1 = strings.pop(); - let useExport = true, noWarnings = false; + let defaultExport = true, noWarnings = false; if (typeof arg2 != "boolean") strings.push(...[arg1, arg2].filter(n => n)); else { if (typeof arg1 != "boolean") { if (arg1) strings.push(arg1); - useExport = arg2; + defaultExport = arg2; } else { - useExport = arg1; + defaultExport = arg1; noWarnings = arg2; } } - return Internal.findModule("string", JSON.stringify(strings), m => Internal.hasModuleStrings(m, strings) && m, useExport, noWarnings); + return Internal.findModule("string", JSON.stringify(strings), m => Internal.hasModuleStrings(m, strings) && m, defaultExport, noWarnings); }; BDFDB.ModuleUtils.findByPrototypes = function (...protoProps) { protoProps = protoProps.flat(10); let arg2 = protoProps.pop(); let arg1 = protoProps.pop(); - let useExport = true, noWarnings = false; + let defaultExport = true, noWarnings = false; if (typeof arg2 != "boolean") protoProps.push(...[arg1, arg2].filter(n => n)); else { if (typeof arg1 != "boolean") { if (arg1) protoProps.push(arg1); - useExport = arg2; + defaultExport = arg2; } else { - useExport = arg1; + defaultExport = arg1; noWarnings = arg2; } } return Internal.findModule("proto", JSON.stringify(protoProps), m => m.prototype && protoProps.every(prop => { const value = m.prototype[prop]; return value !== undefined && !(typeof value == "string" && !value); - }) && m, useExport, noWarnings); + }) && m, defaultExport, noWarnings); }; BDFDB.ModuleUtils.findStringObject = function (props, config = {}) { return BDFDB.ModuleUtils.find(m => { @@ -2203,7 +2203,7 @@ module.exports = (_ => { config.name = config.subComponent && config.subComponent.name || config.mappedType.split(" _ _ ")[0]; let component = InternalData.ModuleUtilsConfig.LoadedInComponents[type] && BDFDB.ObjectUtils.get(Internal, InternalData.ModuleUtilsConfig.LoadedInComponents[type]); - if (component) Internal.patchComponent(pluginData, config.nonRender ? (BDFDB.ModuleUtils.find(m => m == component && m, {useExport: config.exported}) || {}).exports : component, config); + if (component) Internal.patchComponent(pluginData, config.nonRender ? (BDFDB.ModuleUtils.find(m => m == component && m, {defaultExport: config.exported}) || {}).exports : component, config); else { if (config.mapped) for (let patchType in plugin.patchedModules) if (plugin.patchedModules[patchType][type]) { plugin.patchedModules[patchType][config.mappedType] = plugin.patchedModules[patchType][type]; @@ -2287,7 +2287,7 @@ module.exports = (_ => { let component = config.specialFilter(ins); if (component) { if (config.nonRender) { - let exports = (BDFDB.ModuleUtils.find(m => m == component && m, {useExport: false}) || {}).exports; + let exports = (BDFDB.ModuleUtils.find(m => m == component && m, {defaultExport: false}) || {}).exports; Internal.patchComponent(pluginDataObjs, Internal.isMemoOrForwardRef(exports) ? exports.default : exports, config); } else Internal.patchComponent(pluginDataObjs, component, config); @@ -2543,8 +2543,10 @@ module.exports = (_ => { get: function (_, item) { if (DiscordObjects[item]) return DiscordObjects[item]; if (!InternalData.DiscordObjects[item]) return (function () {}); - if (InternalData.DiscordObjects[item].props) DiscordObjects[item] = BDFDB.ModuleUtils.findByPrototypes(InternalData.DiscordObjects[item].props); - else if (InternalData.DiscordObjects[item].strings) DiscordObjects[item] = BDFDB.ModuleUtils.findByString(InternalData.DiscordObjects[item].strings); + let defaultExport = InternalData.DiscordObjects[item].exported == undefined ? true : InternalData.DiscordObjects[item].exported; + if (InternalData.DiscordObjects[item].name) DiscordObjects[item] = BDFDB.ModuleUtils.findByName(InternalData.DiscordObjects[item].name, defaultExport); + else if (InternalData.DiscordObjects[item].props) DiscordObjects[item] = BDFDB.ModuleUtils.findByPrototypes(InternalData.DiscordObjects[item].props, defaultExport); + else if (InternalData.DiscordObjects[item].strings) DiscordObjects[item] = BDFDB.ModuleUtils.findByString(InternalData.DiscordObjects[item].strings, defaultExport); if (InternalData.DiscordObjects[item].value) DiscordObjects[item] = (DiscordObjects[item] || {})[InternalData.DiscordObjects[item].value]; return DiscordObjects[item] ? DiscordObjects[item] : (function () {}); } @@ -8542,7 +8544,7 @@ module.exports = (_ => { } } }; - PluginStores.contextChunkObserver[type].modules = BDFDB.ModuleUtils.find(PluginStores.contextChunkObserver[type].filter, {useExport: false, all: true}).map(m => m.exports).filter(n => n); + PluginStores.contextChunkObserver[type].modules = BDFDB.ModuleUtils.find(PluginStores.contextChunkObserver[type].filter, {defaultExport: false, all: true}).map(m => m.exports).filter(n => n); } } @@ -8866,8 +8868,6 @@ module.exports = (_ => { window.BDFDB = BDFDB; } - window.BDFDB = BDFDB; - if (libraryCSS) BDFDB.DOMUtils.appendLocalStyle("BDFDB", libraryCSS.replace(/[\n\t\r]/g, "").replace(/\[REPLACE_CLASS_([A-z0-9_]+?)\]/g, (a, b) => BDFDB.dotCN[b])); BDFDB.LogUtils.log("Finished loading Library"); @@ -8895,7 +8895,7 @@ module.exports = (_ => { for (let name in InternalData.ForceLoadedComponents) { let parentModule; if (InternalData.ForceLoadedComponents[name].name) { - if (InternalData.ForceLoadedComponents[name].protos) parentModule = BDFDB.ModuleUtils.find(m => m && m.displayName == InternalData.ForceLoadedComponents[name].name && m.prototype && InternalData.ForceLoadedComponents[name].protos.every(proto => m.prototype[proto]) && m, {useExport: false}); + if (InternalData.ForceLoadedComponents[name].protos) parentModule = BDFDB.ModuleUtils.find(m => m && m.displayName == InternalData.ForceLoadedComponents[name].name && m.prototype && InternalData.ForceLoadedComponents[name].protos.every(proto => m.prototype[proto]) && m, {defaultExport: false}); else parentModule = BDFDB.ModuleUtils.findByName(InternalData.ForceLoadedComponents[name].name, false, true); } else if (InternalData.ForceLoadedComponents[name].props) parentModule = BDFDB.ModuleUtils.findByProperties(InternalData.ForceLoadedComponents[name].props, false, true); diff --git a/Library/_res/0BDFDB.data.json b/Library/_res/0BDFDB.data.json index 764ac264d9..0a6305a9a7 100644 --- a/Library/_res/0BDFDB.data.json +++ b/Library/_res/0BDFDB.data.json @@ -12,10 +12,9 @@ "Invite": {"props": ["getExpiresAt", "isExpired"]}, "Message": {"props": ["getReaction", "isEdited", "getChannelId"]}, "Messages": {"props": ["jumpToMessage", "hasAfterCached", "forEach"]}, - "Relationship": {"strings": ["status", "mutualGuilds", "nickname"], "value": "Row"}, + "Relationship": {"name": "FriendsStore", "exported": false, "value": "Row"}, "Timestamp": {"props": ["add", "dayOfYear", "hasAlignedHourOffset"]}, - "Upload": {"strings": [".reactNativeFileIndex", ".NOT_STARTED", ".loaded", ".size"], "value": "CloudFileUpload"}, - "User": {"strings": ["hasFlag", "isLocalBot", "isClaimed"], "value": "default"} + "User": {"strings": ["UserFlags", "hasFlag", "deserialize"]} }, "LibraryModules": { "AckUtils": {"props": ["localAck", "bulkAck"]}, @@ -318,7 +317,6 @@ "Upload": {"class": "uploadmodal"}, "UserMention": {"strings": ["inlinePreview", "getAvatarURL", "userId", "default.getName"]}, "UserPopoutAvatar": {"props": ["UserPopoutAvatar"]}, - "UserPopoutBody": {"strings": ["passportCaret", "setNote", "USER_POPOUT"]}, "UserPopoutBodySection": {"strings": [".customStatusActivity", ".canDM", ".hidePersonalInformation"]}, "UserProfileModal": {"lazyLoaded": true}, "UserProfileModalHeader": {"lazyLoaded": true}, diff --git a/Plugins/ShowConnections/ShowConnections.plugin.js b/Plugins/ShowConnections/ShowConnections.plugin.js index c67aaf11c4..42ae2610da 100644 --- a/Plugins/ShowConnections/ShowConnections.plugin.js +++ b/Plugins/ShowConnections/ShowConnections.plugin.js @@ -2,7 +2,7 @@ * @name ShowConnections * @author DevilBro * @authorId 278543574059057154 - * @version 1.1.1 + * @version 1.1.2 * @description Shows the connected Accounts of a User in the UserPopout * @invite Jx3TjNS * @donate https://www.paypal.me/MircoWittrien @@ -186,7 +186,7 @@ module.exports = (_ => { children: [ BDFDB.ReactUtils.createElement(BDFDB.LibraryComponents.Heading, { className: BDFDB.disCN.userpopoutsectiontitle, - variant: BDFDB.DiscordClassModules.Heading.eyebrow, + variant: "eyebrow", children: BDFDB.LanguageUtils.LanguageStrings.CONNECTIONS }), BDFDB.ReactUtils.createElement("div", { @@ -269,11 +269,10 @@ module.exports = (_ => { if (!connections.length) return null; let isLightTheme = BDFDB.DiscordUtils.getTheme() == BDFDB.disCN.themelight; return [ - BDFDB.ReactUtils.createElement(BDFDB.LibraryComponents.Header, { + BDFDB.ReactUtils.createElement(BDFDB.LibraryComponents.Heading, { className: BDFDB.disCN.userpopoutbodytitle, - size: BDFDB.LibraryComponents.Header.Sizes.SIZE_12, - muted: true, - uppercase: true, + variant: "eyebrow", + color: "header-secondary", children: BDFDB.LanguageUtils.LanguageStrings.CONNECTIONS }), BDFDB.ReactUtils.createElement("div", {