From 473f0fe328d5a431b78e03af8e11335777a6a05e Mon Sep 17 00:00:00 2001 From: Mirco Wittrien Date: Sat, 15 Apr 2023 17:56:20 +0200 Subject: [PATCH] stuff --- .../DisplayServersAsChannels.plugin.js | 44 ++++++++++++++++--- Plugins/ServerFolders/ServerFolders.plugin.js | 7 ++- 2 files changed, 44 insertions(+), 7 deletions(-) diff --git a/Plugins/DisplayServersAsChannels/DisplayServersAsChannels.plugin.js b/Plugins/DisplayServersAsChannels/DisplayServersAsChannels.plugin.js index a709d48814..acd89ced8e 100644 --- a/Plugins/DisplayServersAsChannels/DisplayServersAsChannels.plugin.js +++ b/Plugins/DisplayServersAsChannels/DisplayServersAsChannels.plugin.js @@ -2,7 +2,7 @@ * @name DisplayServersAsChannels * @author DevilBro * @authorId 278543574059057154 - * @version 1.6.7 + * @version 1.6.8 * @description Displays Servers in a similar way as Channels * @invite Jx3TjNS * @donate https://www.paypal.me/MircoWittrien @@ -14,7 +14,9 @@ module.exports = (_ => { const changeLog = { - + "fixed": { + "ServerFolders Compatibility": "Better works with ServerFolders Plugin now" + } }; return !window.BDFDB_Global || (!window.BDFDB_Global.loaded && !window.BDFDB_Global.started) ? class { @@ -235,12 +237,17 @@ module.exports = (_ => { e.returnvalue = this.removeMask(e.returnvalue, true); let folderColor = BDFDB.ColorUtils.convert(e.instance.props.folderNode.color, "HEX") || "var(--bdfdb-blurple)"; let folderSize = Math.round(this.settings.amounts.serverElementHeight * 0.725); - let [children, index] = BDFDB.ReactUtils.findParent(e.returnvalue, {name: "FolderIcon"}); - if (index > -1) children[index] = null; + let badge = null; + let [children, index] = BDFDB.ReactUtils.findParent(e.returnvalue, {props: [["className", BDFDB.disCN.guildfoldericonwrapper]]}); + if (index > -1 && children[index] && children[index].props && children[index].props.style && children[index].props.style.background) badge = children[index]; + else { + [children, index] = BDFDB.ReactUtils.findParent(e.returnvalue, {name: "FolderIcon"}); + if (index > -1) children[index] = null; + } this.addElementName(e.returnvalue, e.instance.props.folderNode.name || BDFDB.LanguageUtils.LanguageStrings.SERVER_FOLDER_PLACEHOLDER, { wrap: true, backgroundColor: e.instance.props.expanded && BDFDB.ColorUtils.setAlpha(folderColor, 0.2), - badges: BDFDB.ReactUtils.createElement(BDFDB.LibraryComponents.SvgIcon, { + badges: badge || BDFDB.ReactUtils.createElement(BDFDB.LibraryComponents.SvgIcon, { color: folderColor, width: folderSize, height: folderSize, @@ -487,9 +494,36 @@ module.exports = (_ => { width: auto; } ${BDFDB.dotCNS._displayserversaschannelsstyled + BDFDB.dotCNS.guildswrapper + BDFDB.dotCN.guildfolder} { + display: flex; + align-items: center; height: ${this.settings.amounts.serverElementHeight}px; width: ${this.settings.amounts.serverListWidth - 20}px; } + ${BDFDB.dotCNS._displayserversaschannelsstyled + BDFDB.dotCNS.guildswrapper + BDFDB.dotCN.guildfolder}[data-folder-name]::after { + content: attr(data-folder-name); + display: flex; + justify-content: flex-start; + align-items: center; + font-size: ${this.settings.amounts.serverElementHeight / 2}px; + font-weight: 500; + text-transform: capitalize; + padding-top: 1px; + padding-left: 3px; + } + ${BDFDB.dotCNS._displayserversaschannelsstyled + BDFDB.dotCNS.guildswrapper + BDFDB.dotCN.guildfoldericonwrapper}[style*="background"] { + margin-left: ${Math.round(this.settings.amounts.serverElementHeight * -0.15)}px; + background-position-x: ${Math.round(this.settings.amounts.serverElementHeight * 0.75) / 10}px !important; + } + ${BDFDB.dotCNS._displayserversaschannelsstyled + BDFDB.dotCNS.guildswrapper + BDFDB.dotCN.guildfolder} > ${BDFDB.dotCN.guildfoldericonwrapper} { + margin-left: 6px; + background-size: ${Math.round(this.settings.amounts.serverElementHeight * 0.85)}px ${Math.round(this.settings.amounts.serverElementHeight * 0.85)}px !important; + background-position: center center !important; + } + ${BDFDB.dotCNS._displayserversaschannelsstyled + BDFDB.dotCNS.guildswrapper + BDFDB.dotCN.guildfoldericonwrapper}, + ${BDFDB.dotCNS._displayserversaschannelsstyled + BDFDB.dotCNS.guildswrapper + BDFDB.dotCN.guildfoldericonwrapperexpanded} { + height: ${Math.round(this.settings.amounts.serverElementHeight * 0.85)}px; + width: ${Math.round(this.settings.amounts.serverElementHeight * 0.85)}px; + } ${BDFDB.dotCNS._displayserversaschannelsstyled + BDFDB.dotCNS.guildswrapper + BDFDB.dotCN.guildfolderexpandedbackground} { top: -2px; right: 2px; diff --git a/Plugins/ServerFolders/ServerFolders.plugin.js b/Plugins/ServerFolders/ServerFolders.plugin.js index 70dac89d82..46f3106a09 100644 --- a/Plugins/ServerFolders/ServerFolders.plugin.js +++ b/Plugins/ServerFolders/ServerFolders.plugin.js @@ -2,7 +2,7 @@ * @name ServerFolders * @author DevilBro * @authorId 278543574059057154 - * @version 7.1.4 + * @version 7.1.5 * @description Changes Discord's Folders, Servers open in a new Container, also adds extra Features to more easily organize, customize and manage your Folders * @invite Jx3TjNS * @donate https://www.paypal.me/MircoWittrien @@ -14,7 +14,9 @@ module.exports = (_ => { const changeLog = { - + "fixed": { + "DisplayServersAsChannels Compatibility": "Better works with DisplayServersAsChannels Plugin now" + } }; return !window.BDFDB_Global || (!window.BDFDB_Global.loaded && !window.BDFDB_Global.started) ? class { @@ -139,6 +141,7 @@ module.exports = (_ => { className: BDFDB.disCN.guildouter, children: BDFDB.ReactUtils.createElement("div", { className: BDFDB.disCN.guildfolder, + "data-folder-name": folder.folderName || BDFDB.LanguageUtils.LanguageStrings.SERVER_FOLDER_PLACEHOLDER, children: folderIcon }) }),