From 569425009fa37e1d9d5128011ad1284b387fbbf7 Mon Sep 17 00:00:00 2001 From: Mirco Wittrien Date: Fri, 27 Oct 2023 14:15:31 +0200 Subject: [PATCH] stuff --- Library/0BDFDB.plugin.js | 7 +++-- Library/_res/0BDFDB.data.json | 20 +++++++-------- Themes/BasicBackground/BasicBackground.css | 30 +++------------------- Themes/DiscordRecolor/DiscordRecolor.css | 9 +++---- 4 files changed, 20 insertions(+), 46 deletions(-) diff --git a/Library/0BDFDB.plugin.js b/Library/0BDFDB.plugin.js index b378e038c1..f7190e7a46 100644 --- a/Library/0BDFDB.plugin.js +++ b/Library/0BDFDB.plugin.js @@ -2,7 +2,7 @@ * @name BDFDB * @author DevilBro * @authorId 278543574059057154 - * @version 3.4.3 + * @version 3.4.4 * @description Required Library for DevilBro's Plugins * @invite Jx3TjNS * @donate https://www.paypal.me/MircoWittrien @@ -1283,7 +1283,7 @@ module.exports = (_ => { let all = typeof config.all != "boolean" ? false : config.all; const req = Internal.getWebModuleReq(); const found = []; - if (!onlySearchUnloaded) for (let i in req.c) if (req.c.hasOwnProperty(i)) { + if (!onlySearchUnloaded) for (let i in req.c) if (req.c.hasOwnProperty(i) && req.c[i].exports != window) { let m = req.c[i].exports, r = null; if (m && (typeof m == "object" || typeof m == "function")) { if (!!(r = filter(m))) { @@ -2462,9 +2462,8 @@ module.exports = (_ => { if (dataStorage[item]._originalModule[item2]) return dataStorage[item]._originalModule[item2]; if (dataStorage[item]._mappedItems[item2]) return dataStorage[item]._originalModule[dataStorage[item]._mappedItems[item2]]; if (!dataStorage[item].map[item2]) return dataStorage[item]._originalModule[item2]; - let foundFunc = Object.entries(dataStorage[item]._originalModule).find(n => { + let foundFunc = dataStorage[item].map[item2] && dataStorage[item].map[item2].length == 1 && dataStorage[item]._originalModule[dataStorage[item].map[item2][0]] ? [dataStorage[item].map[item2][0], dataStorage[item]._originalModule[dataStorage[item].map[item2][0]]] : Object.entries(dataStorage[item]._originalModule).find(n => { if (!n || !n[1]) return; - if (dataStorage[item].map[item2] && Object.keys(dataStorage[item].map[item2].length) == 1 && BDFDB.StringUtils.charIsUpperCase(dataStorage[item].map[item2][0]) && dataStorage[item].map[item2][0] == n[0]) return true; let funcString = typeof n[1] == "function" ? n[1].toString() : (_ => {try {return JSON.stringify(n[1])}catch(err){return n[1].toString()}})(); let renderFuncString = typeof n[1].render == "function" && n[1].render.toString() || ""; return [dataStorage[item].map[item2]].flat(10).filter(s => s && typeof s == "string").every(string => funcString && funcString.replace(/[\n\t\r]/g, "").indexOf(string) > -1 || renderFuncString && renderFuncString.replace(/[\n\t\r]/g, "").indexOf(string) > -1); diff --git a/Library/_res/0BDFDB.data.json b/Library/_res/0BDFDB.data.json index 78cede962f..5448c5f7e2 100644 --- a/Library/_res/0BDFDB.data.json +++ b/Library/_res/0BDFDB.data.json @@ -347,15 +347,15 @@ "Header": [".header", "heading"], "Popout": ["renderHeader", "renderEmptyState"] }}, - "ModalComponents": {"strings": [".renderModal,", "onCloseRequest"], "exported": false, "value": "exports", "map": { - "Modal": [".renderModal"], - "ModalCloseButton": ["closeWithCircle"], - "ModalContent": [".content,"], - "ModalFooter": [".footer,"], - "ModalHeader": [".headerId"], - "ModalListContent": [".scrollerRef"], - "ModalRoot": [".transitionState", ".size"], - "ModalSize": ["DYNAMIC", "SMALL"] + "ModalComponents": {"props": ["Modal", "ModalCloseButton"], "exported": false, "value": "exports", "map": { + "Modal": ["Modal"], + "ModalCloseButton": ["ModalCloseButton"], + "ModalContent": ["ModalContent"], + "ModalFooter": ["ModalFooter"], + "ModalHeader": ["ModalHeader"], + "ModalListContent": ["ModalListContent"], + "ModalRoot": ["ModalRoot"], + "ModalSize": ["ModalSize"] }}, "Paginator": {"strings": ["totalPageCount", "selectedPage"]}, "PanelButton": {"strings": ["Masks.PANEL_BUTTON"]}, @@ -378,7 +378,7 @@ "Types": ["\"online\"", "\"unknown\""] }}, "Text": {"strings": ["lineClamp:", ".selectable", ".defaultColor"]}, - "TextElement": {"strings": [".strong,", ".STANDARD"]}, + "TextElement": {"strings": [".strong]", ".STANDARD"]}, "Timeout": {"protos": ["start", "stop", "isStarted"]}, "UserBadgeComponents": {"strings": [".PROFILE_USER_BADGES", "SIZE_24"], "exported": false, "value": "exports", "map": { "UserBadges": [".PROFILE_USER_BADGES"], diff --git a/Themes/BasicBackground/BasicBackground.css b/Themes/BasicBackground/BasicBackground.css index 22e75a2db3..6d6255028a 100644 --- a/Themes/BasicBackground/BasicBackground.css +++ b/Themes/BasicBackground/BasicBackground.css @@ -2427,11 +2427,6 @@ button.button__4f306.enabled__470f0:hover svg { .accountProfileCard__22589 .avatar__6c108 { /* accountsettings container avatar */ background-color: transparent; border-color: transparent; -} -.profileBannerPreview-3mLIdO .avatarUploaderInner_c81617 { /* accountsettings preview avatar */ - background-color: transparent; - border: unset; - margin: 6px; } /* accountsettings container banner */ .accountProfileCard__22589 *:not(foreignObject) > .banner__6d414 { @@ -3213,12 +3208,6 @@ img[src="/assets/cef02719c12d8aaf38894c16dca7fbe6.svg"] { /* rolesettings addr #app-mount .zoomedCarouselModalRoot__1e2da { background: transparent !important; } -.header-1zd7se > .wrapper-1HSdhi:first-child { - flex: 1 0 auto; -} -#app-mount .separator-2lLxgC { - box-shadow: 0 1px 0 0 rgba(var(--transparencycolor), .3), 0 1px 2px 0 rgba(var(--transparencycolor), .3); -} #app-mount .modalTextContainer_ddfc28 { /* modal text file */ background-color: rgba(var(--transparencycolor), .5); border: none; @@ -3231,33 +3220,22 @@ img[src="/assets/cef02719c12d8aaf38894c16dca7fbe6.svg"] { /* rolesettings addr #app-mount .footerSeparator__57d95 { box-shadow: none; } -#app-mount .footer-3Zgy_M { /* modal footer info */ - background-color: rgba(var(--transparencycolor), .3); -} -.tabBarContainer-sCZC4w { /* modal tabbarcontainer */ +.tabBarContainer__63f55 { /* modal tabbarcontainer */ border-top-color: rgba(var(--transparencycolor), .3); } -#app-mount .modal-6GHvdM .tabBarContainer-sCZC4w { +#app-mount .modal_6GHvdM .tabBarContainer__63f55 { background: rgba(var(--transparencycolor), .2); box-shadow: 0 2px 3px 0 rgba(var(--transparencycolor), .1); } -#app-mount .separator-3TK_-B { +#app-mount .separator_ff09cd { box-shadow: 0 1px 0 0 rgba(var(--transparencycolor),.3), 0 1px 2px 0 rgba(var(--transparencycolor),.3); } -#app-mount .divider-3APUjw { +#app-mount .divider__1464c { border-color: var(--background-modifier-accent); } -#app-mount .subHeader-2z6h5Z { - color: var(--header-secondary); -} -#app-mount .sectionBody-7I2eAN, -#app-mount .subHeader-1mr1LG { - color: var(--header-secondary); -} - #app-mount .message-1F58Gs { color: var(--header-secondary); } diff --git a/Themes/DiscordRecolor/DiscordRecolor.css b/Themes/DiscordRecolor/DiscordRecolor.css index 98961b44f4..06c13edd2a 100644 --- a/Themes/DiscordRecolor/DiscordRecolor.css +++ b/Themes/DiscordRecolor/DiscordRecolor.css @@ -2738,9 +2738,6 @@ img[src='/assets/58957d928db6fb9d4658eb882f33d7bc.svg'] { #app-mount .zoomedCarouselModalRoot__1e2da { background: transparent !important; } -#app-mount .separator-2lLxgC { - box-shadow: 0 1px 0 0 rgba(var(--backgroundtertiary),.3), 0 1px 2px 0 rgba(var(--backgroundtertiary),.3); -} #app-mount .footer__89240, #app-mount .footer__09373 { background-color: var(--background-secondary); @@ -2754,15 +2751,15 @@ img[src='/assets/58957d928db6fb9d4658eb882f33d7bc.svg'] { flex: 1 0 auto; } -#app-mount .modal-6GHvdM .tabBarContainer-sCZC4w { +#app-mount .modal_6GHvdM .tabBarContainer__63f55 { background: rgba(0,0,0,.2); box-shadow: 0 2px 3px 0 rgba(0,0,0,.1); } -#app-mount .separator-3TK_-B { +#app-mount .separator_ff09cd { box-shadow: 0 1px 0 0 rgba(var(--backgroundfloating),.3), 0 1px 2px 0 rgba(var(--backgroundfloating),.3); } -#app-mount .divider-3APUjw { +#app-mount .divider__1464c { border-color: var(--background-secondary); }