lightcordwarez
/
BetterDiscordAddons
mirror of https://github.com/mwittrien/BetterDiscordAddons.git
1
0
Fork 0
Code Issues 24 Releases Wiki Activity

Fixed incompatibality bug with BetterRoleColors

This commit is contained in:
Mirco Wittrien 2018-12-26 09:04:41 +01:00
parent bbb750a8ce
commit ebc8ef5f4c
1 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
Plugins/EditUsers/EditUsers.plugin.js
View File

@ -146,7 +146,7 @@ class EditUsers {
getDescription () {return "Allows you to change the icon, name, tag and color of users. Does not work in compact mode.";} getDescription () {return "Allows you to change the icon, name, tag and color of users. Does not work in compact mode.";}
getVersion () {return "3.0.8";} getVersion () {return "3.0.9";}
getAuthor () {return "DevilBro";} getAuthor () {return "DevilBro";}
@ -539,7 +539,7 @@ class EditUsers {
} }
else if (instance.props.tag == "span" && instance.props.className.indexOf(BDFDB.disCN.mention) > -1) { else if (instance.props.tag == "span" && instance.props.className.indexOf(BDFDB.disCN.mention) > -1) {
let fiber = instance._reactInternalFiber; let fiber = instance._reactInternalFiber;
if (fiber.return && fiber.return.return && fiber.return.return.stateNode && fiber.return.return.stateNode.props && fiber.return.return.stateNode.props.render) { if (fiber.return && fiber.return.return && fiber.return.return.stateNode && fiber.return.return.stateNode.props && typeof fiber.return.return.stateNode.props.render == "function") {
this.changeMention(fiber.return.return.stateNode.props.render().props.user, wrapper); this.changeMention(fiber.return.return.stateNode.props.render().props.user, wrapper);
} }
} }
@ -705,23 +705,38 @@ class EditUsers {
changeMention (info, mention) { changeMention (info, mention) {
if (!info || !mention || !mention.parentElement) return; if (!info || !mention || !mention.parentElement) return;
if (mention.EditUsersChangeObserver && typeof mention.EditUsersChangeObserver.disconnect == "function") mention.EditUsersChangeObserver.disconnect();
console.log(info, mention);
let data = BDFDB.loadData(info.id, this, "users") || {}; let data = BDFDB.loadData(info.id, this, "users") || {};
let member = this.MemberUtils.getMember(this.LastGuildStore.getGuildId(), info.id) || {}; let member = this.MemberUtils.getMember(this.LastGuildStore.getGuildId(), info.id) || {};
let color1 = BDFDB.colorCONVERT(data.color1 || (BDFDB.isPluginEnabled("BetterRoleColors") ? member.colorString : null), "RGBCOMP"); let color1 = BDFDB.colorCONVERT(data.color1 || (BDFDB.isPluginEnabled("BetterRoleColors") ? member.colorString : null), "RGBCOMP");
BDFDB.setInnerText(mention, "@" + (data.name || member.nick || info.username)); BDFDB.setInnerText(mention, "@" + (data.name || member.nick || info.username));
mention.style.setProperty("color", color1 ? "rgb(" + color1[0] + "," + color1[1] + "," + color1[2] + ")" : null, "important"); if (mention.EditUsersHovered) colorHover();
mention.style.setProperty("background", color1 ? "rgba(" + color1[0] + "," + color1[1] + "," + color1[2] + ",.1)" : null, "important"); else colorDefault();
$(mention).off("mouseenter." + this.getName()).off("mouseleave." + this.getName()); $(mention).off("mouseenter." + this.getName()).off("mouseleave." + this.getName());
if (color1) { if (color1) {
$(mention) $(mention)
.on("mouseenter." + this.getName(), (e) => { .on("mouseenter." + this.getName(), (e) => {
mention.style.setProperty("color", "#FFFFFF", "important"); mention.EditUsersHovered = true;
mention.style.setProperty("background", "rgba(" + color1[0] + "," + color1[1] + "," + color1[2] + ",.7)", "important"); colorHover();
}) })
.on("mouseleave." + this.getName(), (e) => { .on("mouseleave." + this.getName(), (e) => {
mention.style.setProperty("color", "rgb(" + color1[0] + "," + color1[1] + "," + color1[2] + ")", "important"); mention.EditUsersHovered = false;
mention.style.setProperty("background", "rgba(" + color1[0] + "," + color1[1] + "," + color1[2] + ",.1)", "important"); colorDefault();
}); });
mention.EditUsersChangeObserver = new MutationObserver((changes, _) => {
mention.EditUsersChangeObserver.disconnect();
this.changeMention(info, mention);
});
mention.EditUsersChangeObserver.observe(mention, {attributes:true});
}
function colorDefault() {
mention.style.setProperty("color", color1 ? "rgb(" + color1[0] + "," + color1[1] + "," + color1[2] + ")" : null, "important");
mention.style.setProperty("background", color1 ? "rgba(" + color1[0] + "," + color1[1] + "," + color1[2] + ",.1)" : null, "important");
}
function colorHover() {
mention.style.setProperty("color", "#FFFFFF", "important");
mention.style.setProperty("background", "rgba(" + color1[0] + "," + color1[1] + "," + color1[2] + ",.7)", "important");
} }
} }