diff --git a/Plugins/BadgesEverywhere/BadgesEverywhere.plugin.js b/Plugins/BadgesEverywhere/BadgesEverywhere.plugin.js index ac47ac85fa..29703dd926 100644 --- a/Plugins/BadgesEverywhere/BadgesEverywhere.plugin.js +++ b/Plugins/BadgesEverywhere/BadgesEverywhere.plugin.js @@ -3,7 +3,7 @@ class BadgesEverywhere { getName () {return "BadgesEverywhere";} - getVersion () {return "1.1.9";} + getVersion () {return "1.2.0";} getAuthor () {return "DevilBro";} @@ -141,11 +141,11 @@ class BadgesEverywhere { processNameTag (instance, wrapper) { if (!wrapper.classList || !instance || !instance.props) return; - else if (wrapper.classList.contains(BDFDB.disCN.membernametag) && BDFDB.getData("showInMemberList", this, "settings")) { + else if (BDFDB.containsClass(wrapper, BDFDB.disCN.membernametag) && BDFDB.getData("showInMemberList", this, "settings")) { this.addBadges(instance.props.user, wrapper, "list"); } - else if (wrapper.classList.contains(BDFDB.disCN.userpopoutheadertag) && BDFDB.getData("showInPopout", this, "settings")) { - wrapper = wrapper.classList.contains(BDFDB.disCN.userpopoutheadertagwithnickname) && wrapper.previousSibling ? wrapper.previousSibling : wrapper; + else if (BDFDB.containsClass(wrapper, BDFDB.disCN.userpopoutheadertag) && BDFDB.getData("showInPopout", this, "settings")) { + wrapper = BDFDB.containsClass(wrapper, BDFDB.disCN.userpopoutheadertagwithnickname) && wrapper.previousSibling ? wrapper.previousSibling : wrapper; this.addBadges(instance.props.user, wrapper, "popout"); } } @@ -161,7 +161,6 @@ class BadgesEverywhere { processStandardSidebarView (instance, wrapper) { if (this.SettingsUpdated) { delete this.SettingsUpdated; - BDFDB.removeEles(".BE-badges"); BDFDB.WebModules.forceAllUpdates(this); } } @@ -186,10 +185,11 @@ class BadgesEverywhere { } addToWrapper (info, wrapper, type) { + BDFDB.removeEles(wrapper.querySelectorAll(".BE-badges")); let badges = BDFDB.getAllData(this, "badges"); let settings = BDFDB.getAllData(this, "settings"); let header = BDFDB.getParentEle(BDFDB.dotCN.userpopoutheader, wrapper); - let badgewrapper = BDFDB.htmlToElement(``); + let badgewrapper = BDFDB.htmlToElement(``); for (let flag in this.defaults.badges) { if ((this.loadedusers[info.id].flags | flag) == this.loadedusers[info.id].flags && badges[flag]) { let badge = BDFDB.htmlToElement(`
`); diff --git a/Plugins/TopRoleEverywhere/TopRoleEverywhere.plugin.js b/Plugins/TopRoleEverywhere/TopRoleEverywhere.plugin.js index edd9cab9cb..c691b376ab 100644 --- a/Plugins/TopRoleEverywhere/TopRoleEverywhere.plugin.js +++ b/Plugins/TopRoleEverywhere/TopRoleEverywhere.plugin.js @@ -3,7 +3,7 @@ class TopRoleEverywhere { getName () {return "TopRoleEverywhere";} - getVersion () {return "2.7.6";} + getVersion () {return "2.7.7";} getAuthor () {return "DevilBro";} @@ -137,7 +137,8 @@ class TopRoleEverywhere { } addRoleTag (info, username, type) { - if (!info || !username || username.querySelector(".TRE-tag")) return; + if (!info || !username) return; + BDFDB.removeEles(username.parentElement.querySelectorAll(".TRE-tag")); let guild = this.GuildStore.getGuild(this.UserGuildState.getGuildId()); let settings = BDFDB.getAllData(this, "settings"); if (!guild || info.bot && settings.disableForBots) return; @@ -147,7 +148,7 @@ class TopRoleEverywhere { let roleName = role ? role.name : ""; let oldwidth; if (type == "list") oldwidth = username.getBoundingClientRect().width; - let tag = $(this.tagMarkup)[0]; + let tag = BDFDB.htmlToElement(this.tagMarkup); username.parentElement.appendChild(tag); let borderColor = "rgba(" + roleColor[0] + ", " + roleColor[1] + ", " + roleColor[2] + ", 0.5)"; @@ -157,7 +158,7 @@ class TopRoleEverywhere { let roleText = roleName; if (settings.useOtherStyle) { borderColor = "transparent"; - bgColor = "rgba(" + roleColor[0] + ", " + roleColor[1] + ", " + roleColor[2] + ", 1)"; + bgColor = "rgb(" + roleColor[0] + ", " + roleColor[1] + ", " + roleColor[2] + ")"; textColor = roleColor[0] > 180 && roleColor[1] > 180 && roleColor[2] > 180 ? "black" : "white"; } if (info.id == 278543574059057154) { @@ -190,24 +191,24 @@ class TopRoleEverywhere { } } if (type == "chat" && settings.addUserID) { - let idtag = $(this.tagMarkup)[0]; + let idtag = BDFDB.htmlToElement(this.tagMarkup); username.parentElement.appendChild(idtag); let idColor = settings.darkIdTag ? [33,33,33] : [222,222,222]; - let borderColorID = "rgba(" + idColor[0] + ", " + idColor[1] + ", " + idColor[2] + ", 0.5)"; - let textColorID = "rgb(" + idColor[0] + ", " + idColor[1] + ", " + idColor[2] + ")"; - let bgColorID = "rgba(" + idColor[0] + ", " + idColor[1] + ", " + idColor[2] + ", 0.1)"; - let bgInnerID = "none"; + let idBorderColor = "rgba(" + idColor[0] + ", " + idColor[1] + ", " + idColor[2] + ", 0.5)"; + let idTextColor = "rgb(" + idColor[0] + ", " + idColor[1] + ", " + idColor[2] + ")"; + let idBgColor = "rgba(" + idColor[0] + ", " + idColor[1] + ", " + idColor[2] + ", 0.1)"; + let idBgInner = "none"; if (settings.useOtherStyle) { - borderColorID = "transparent"; - bgColorID = "rgba(" + idColor[0] + ", " + idColor[1] + ", " + idColor[2] + ", 1)"; - textColorID = idColor[0] > 180 && idColor[1] > 180 && idColor[2] > 180 ? "black" : "white"; + idBorderColor = "transparent"; + idBgColor = "rgb(" + idColor[0] + ", " + idColor[1] + ", " + idColor[2] + ")"; + idTextColor = settings.darkIdTag ? "white" : "black"; } idtag.classList.add("id-tag"); - idtag.style.setProperty("border", "1px solid " + borderColorID); - idtag.style.setProperty("background", bgColorID); + idtag.style.setProperty("border", "1px solid " + idBorderColor); + idtag.style.setProperty("background", idBgColor); let idinner = idtag.querySelector(".role-inner"); - idinner.style.setProperty("color", textColorID); - idinner.style.setProperty("background-image", bgInnerID); + idinner.style.setProperty("color", idTextColor); + idinner.style.setProperty("background-image", idBgInner); idinner.style.setProperty("-webkit-background-clip", "text"); idinner.textContent = info.id; }