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

RemoveNicknames now uses patching instead of observing

This commit is contained in:
Mirco Wittrien 2019-01-02 12:52:40 +01:00
parent ace409df4b
commit 1d5460393e
3 changed files with 82 additions and 153 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Plugins/BDFDB.js
View File

File diff suppressed because one or more lines are too long

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

@ -289,7 +289,7 @@ class EditUsers {
onUserContextMenu (instance, menu) { onUserContextMenu (instance, menu) {
if (instance.props && instance.props.user && !menu.querySelector(".localusersettings-item")) { if (instance.props && instance.props.user && !menu.querySelector(".localusersettings-item")) {
$(menu).append(this.userContextEntryMarkup) $(menu).append(this.userContextEntryMarkup)
.on("mouseenter", ".localusersettings-item", (e) => { .on("mouseenter." + this.getName(), ".localusersettings-item", (e) => {
var userContextSubMenu = $(this.userContextSubMenuMarkup); var userContextSubMenu = $(this.userContextSubMenuMarkup);
userContextSubMenu userContextSubMenu
.on("click", ".usersettings-item", () => { .on("click", ".usersettings-item", () => {
@ -734,7 +734,8 @@ class EditUsers {
let data = this.getUserData(info.id, mention); let data = this.getUserData(info.id, mention);
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)); let name = BDFDB.isPluginEnabled("RemoveNicknames") ? bdplugins.RemoveNicknames.plugin.getNewName(info) : data.name || member.nick || info.username;
BDFDB.setInnerText(mention, "@" + name);
if (mention.EditUsersHovered) colorHover(); if (mention.EditUsersHovered) colorHover();
else colorDefault(); else colorDefault();
$(mention) $(mention)

226
Plugins/RemoveNicknames/RemoveNicknames.plugin.js
View File

@ -2,6 +2,14 @@
class RemoveNicknames { class RemoveNicknames {
initConstructor () { initConstructor () {
this.patchModules = {
"NameTag":"componentDidMount",
"FluxContainer(TypingUsers)":"componentDidUpdate",
"Popout":"componentDidMount",
"Clickable":"componentDidMount",
"StandardSidebarView":"componentWillUnmount"
};
this.defaults = { this.defaults = {
settings: { settings: {
replaceOwn: {value:false, description:"Replace your own name:"}, replaceOwn: {value:false, description:"Replace your own name:"},
@ -15,7 +23,7 @@ class RemoveNicknames {
getDescription () {return "Replace all nicknames with the actual accountnames.";} getDescription () {return "Replace all nicknames with the actual accountnames.";}
getVersion () {return "1.1.1";} getVersion () {return "1.1.2";}
getAuthor () {return "DevilBro";} getAuthor () {return "DevilBro";}
@ -59,73 +67,14 @@ class RemoveNicknames {
if (typeof BDFDB === "object") { if (typeof BDFDB === "object") {
BDFDB.loadMessage(this); BDFDB.loadMessage(this);
this.reseting = false;
this.UserStore = BDFDB.WebModules.findByProperties("getUsers", "getUser"); this.UserStore = BDFDB.WebModules.findByProperties("getUsers", "getUser");
this.MemberPerms = BDFDB.WebModules.findByProperties("getNicknames", "getNick"); this.LastGuildStore = BDFDB.WebModules.findByProperties("getLastSelectedGuildId");
this.LastChannelStore = BDFDB.WebModules.findByProperties("getLastSelectedChannelId");
this.MemberStore = BDFDB.WebModules.findByProperties("getNicknames", "getNick");
var observer = null; BDFDB.WebModules.forceAllUpdates(this);
observer = new MutationObserver((changes, _) => {
changes.forEach(
(change, i) => {
if (change.addedNodes) {
change.addedNodes.forEach((node) => {
if (node && node.tagName && node.querySelector(BDFDB.dotCN.voiceuserdefault)) {
this.loadUser(node.querySelector(BDFDB.dotCN.voiceuserdefault).parentElement, "voice", false);
}
});
}
}
);
});
BDFDB.addObserver(this, BDFDB.dotCN.channels, {name:"channelListObserver",instance:observer}, {childList: true, subtree: true});
observer = new MutationObserver((changes, _) => {
changes.forEach(
(change, i) => {
if (change.addedNodes) {
change.addedNodes.forEach((node) => {
if (node && node.tagName && node.querySelector(BDFDB.dotCN.memberusername)) {
this.loadUser(node, "list", false);
}
});
}
}
);
});
BDFDB.addObserver(this, BDFDB.dotCN.members, {name:"userListObserver",instance:observer}, {childList:true});
observer = new MutationObserver((changes, _) => {
changes.forEach(
(change, i) => {
if (change.addedNodes) {
change.addedNodes.forEach((node) => {
if (node && node.tagName && node.querySelector(BDFDB.dotCN.messageusername)) {
this.loadUser(node, "chat", BDFDB.getDiscordTheme() == "compact");
}
});
}
}
);
});
BDFDB.addObserver(this, BDFDB.dotCN.messages, {name:"chatWindowObserver",instance:observer}, {childList:true, subtree:true});
observer = new MutationObserver((changes, _) => {
changes.forEach(
(change, i) => {
if (change.removedNodes) {
change.removedNodes.forEach((node) => {
if (node && node.tagName && node.getAttribute("layer-id") == "user-settings") {
this.resetAllUsers();
this.loadAllUsers();
}
});
}
}
);
});
BDFDB.addObserver(this, BDFDB.dotCN.layers, {name:"settingsWindowObserver",instance:observer}, {childList:true});
this.loadAllUsers();
} }
else { else {
console.error(this.getName() + ": Fatal Error: Could not load BD functions!"); console.error(this.getName() + ": Fatal Error: Could not load BD functions!");
@ -135,20 +84,14 @@ class RemoveNicknames {
stop () { stop () {
if (typeof BDFDB === "object") { if (typeof BDFDB === "object") {
this.resetAllUsers(); this.reseting = true;
BDFDB.WebModules.forceAllUpdates(this);
BDFDB.unloadMessage(this); BDFDB.unloadMessage(this);
} }
} }
onSwitch () {
if (typeof BDFDB === "object") {
BDFDB.addObserver(this, BDFDB.dotCN.members, {name:"userListObserver"}, {childList:true});
BDFDB.addObserver(this, BDFDB.dotCN.messages, {name:"chatWindowObserver"}, {childList:true, subtree:true});
setImmediate(() => {this.loadAllUsers();});
}
}
// begin of own functions // begin of own functions
@ -157,90 +100,75 @@ class RemoveNicknames {
for (var input of settingspanel.querySelectorAll(BDFDB.dotCN.switchinner)) { for (var input of settingspanel.querySelectorAll(BDFDB.dotCN.switchinner)) {
settings[input.value] = input.checked; settings[input.value] = input.checked;
} }
this.updateUsers = true;
BDFDB.saveAllData(settings, this, "settings"); BDFDB.saveAllData(settings, this, "settings");
} }
loadAllUsers () { getNewName (info) {
for (let user of document.querySelectorAll(BDFDB.dotCN.member)) { if (!info) return null;
this.loadUser(user, "list", false); let EditUsersData = BDFDB.isPluginEnabled("EditUsers") ? BDFDB.loadData(info.id, "EditUsers", "users") : null;
} if (EditUsersData && EditUsersData.name) return EditUsersData.name;
for (let messagegroup of document.querySelectorAll(BDFDB.dotCN.messagegroupcozy)) { let settings = BDFDB.getAllData(this, "settings");
this.loadUser(messagegroup, "chat", false); let member = this.MemberStore.getMember(this.LastGuildStore.getGuildId(), info.id);
} if (!member || !member.nick || info.id == BDFDB.myData.id && !settings.replaceOwn) return info.username;
for (let messagegroup of document.querySelectorAll(BDFDB.dotCN.messagegroupcompact)) { if (this.reseting) return member.nick || info.username;
for (let message of messagegroup.querySelectorAll(BDFDB.dotCN.messagemarkup)) { return settings.addNickname ? (settings.swapPositions ? (member.nick + " (" + info.username + ")") : (info.username + " (" + member.nick + ")")) : info.username;
this.loadUser(message, "chat", true); }
}
} processNameTag (instance, wrapper) {
for (let user of document.querySelectorAll(BDFDB.dotCN.voiceuserdefault)) { let username = wrapper.parentElement.querySelector("." + (wrapper.classList && wrapper.classList.contains(BDFDB.disCN.userpopoutheadertagwithnickname) ? BDFDB.disCN.userpopoutheadernickname : instance.props.usernameClass).replace(/ /g, "."));
this.loadUser(user.parentElement, "voice", false); if (username) BDFDB.setInnerText(username, this.getNewName(instance.props.user));
}
processPopout (instance, wrapper) {
let fiber = instance._reactInternalFiber;
if (fiber.return && fiber.return.memoizedProps && fiber.return.memoizedProps.message) {
let username = wrapper.querySelector(BDFDB.dotCN.messageusername);
if (username) BDFDB.setInnerText(username, this.getNewName(fiber.return.memoizedProps.message.author));
} }
} }
loadUser (div, type, compact) { processFluxContainerTypingUsers (instance) {
if (!div || $(div).attr("removed-nickname") || !div.tagName) return; let users = !instance.state.typingUsers ? [] : Object.keys(instance.state.typingUsers).filter(id => id != BDFDB.myData.id).filter(id => !this.RelationshipUtils.isBlocked(id)).map(id => this.UserUtils.getUser(id)).filter(id => id != null);
document.querySelectorAll(BDFDB.dotCNS.typing + "strong").forEach((username, i) => {
let usernameWrapper = this.getNameWrapper(div); if (users[i]) if (username) BDFDB.setInnerText(username, this.getNewName(users[i]));
if (!usernameWrapper) return;
$(div).data("compact", compact);
var info = this.getUserInfo(compact ? $(BDFDB.dotCN.messagegroup).has(div)[0] : div);
if (!info) return;
var settings = BDFDB.getAllData(this, "settings");
if (info.id == BDFDB.myData.id && !settings.replaceOwn) return;
var serverObj = BDFDB.getSelectedServer();
if (!serverObj) return;
var member = this.MemberPerms.getMember(serverObj.id, info.id);
if (!member || !member.nick) return;
var newname = settings.addNickname ? (settings.swapPositions ? (member.nick + " (" + info.username + ")") : (info.username + " (" + member.nick + ")")) : info.username;
BDFDB.setInnerText(usernameWrapper, newname);
div.setAttribute("removed-nickname", true);
}
resetAllUsers () {
document.querySelectorAll("[removed-nickname]").forEach((div) => {
let usernameWrapper = this.getNameWrapper(div);
if (!usernameWrapper) return;
var info = this.getUserInfo($(div).data("compact") ? $(BDFDB.dotCN.messagegroup).has(div)[0] : div);
if (!info) return;
var serverObj = BDFDB.getSelectedServer();
if (!serverObj) return;
var member = this.MemberPerms.getMember(serverObj.id, info.id);
if (!member || !member.nick) return;
BDFDB.setInnerText(usernameWrapper, member.nick);
div.removeAttribute("removed-nickname");
}); });
} }
getNameWrapper (div) { processClickable (instance, wrapper) {
return div.querySelector(BDFDB.dotCNC.memberusername + BDFDB.dotCNC.voicenamedefault + BDFDB.dotCN.messageusername); if (!wrapper || !instance.props || !instance.props.className) return;
} if (instance.props.tag == "a" && instance.props.className.indexOf(BDFDB.disCN.anchorunderlineonhover) > -1) {
if (wrapper.parentElement.classList.contains(BDFDB.disCN.messagesystemcontent)) {
getUserInfo (div) { let message = BDFDB.getKeyInformation({node:wrapper.parentElement, key:"message", up:true});
var info = BDFDB.getKeyInformation({"node":div,"key":"user"}); if (message) BDFDB.setInnerText(wrapper, this.getNewName(message.author));
if (!info) {
info = BDFDB.getKeyInformation({"node":div,"key":"message"});
if (info) info = info.author;
else {
info = BDFDB.getKeyInformation({"node":div,"key":"channel"});
if (info) info = {"id":info.recipients[0]};
else {
info = BDFDB.getKeyInformation({"node":$(BDFDB.dotCN.messagegroup).has(div)[0],"key":"message"});
if (info) info = info.author;
}
} }
} }
return info && info.id ? this.UserStore.getUser(info.id) : null; else if (instance.props.tag == "span" && instance.props.className.indexOf(BDFDB.disCN.mention) > -1) {
let fiber = instance._reactInternalFiber;
if (fiber.return && fiber.return.return && fiber.return.return.stateNode && fiber.return.return.stateNode.props && typeof fiber.return.return.stateNode.props.render == "function") {
if (wrapper) BDFDB.setInnerText(wrapper, "@" + this.getNewName(fiber.return.return.stateNode.props.render().props.user));
}
}
else if (instance.props.tag == "div" && instance.props.className.indexOf(BDFDB.disCN.voiceuser) > -1) {
let fiber = instance._reactInternalFiber;
if (fiber.return && fiber.return.memoizedProps && fiber.return.memoizedProps.user) {
let username = wrapper.querySelector(BDFDB.dotCN.voicename);
if (username) BDFDB.setInnerText(username, this.getNewName(fiber.return.memoizedProps.user));
}
}
else if (instance.props.tag == "div" && instance.props.className.indexOf(BDFDB.disCN.autocompleterow) > -1) {
let fiber = instance._reactInternalFiber;
if (fiber.return && fiber.return.memoizedProps && fiber.return.memoizedProps.user) {
let username = wrapper.querySelector(BDFDB.dotCN.marginleft8);
if (username) BDFDB.setInnerText(username, this.getNewName(fiber.return.memoizedProps.user));
}
}
}
processStandardSidebarView (instance, wrapper) {
if (this.updateUsers) {
this.updateUsers = false;
BDFDB.WebModules.forceAllUpdates(this);
}
} }
} }