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

stuff

This commit is contained in:
Mirco Wittrien 2021-01-13 18:54:21 +01:00
parent 0ad55d3200
commit 60e73a07c5
4 changed files with 164 additions and 131 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Plugins/ChatAliases/ChatAliases.plugin.js
View File

@ -528,10 +528,11 @@ module.exports = (_ => {
click: modal => {
let configs = {};
for (let key in this.defaults.configs) {
let configinput = modal.querySelector(`.input-config${key} ${BDFDB.dotCN.switchinner}`);
if (configinput) configs[key] = configinput.checked;
let configInput = modal.querySelector(`.input-config${key} ${BDFDB.dotCN.switchinner}`);
if (configInput) configs[key] = configInput.checked;
}
this.saveWord(values.wordvalue, values.replacevalue, modal.querySelector(".input-replacevalue input[type='file']"), configs);
this.forceUpdateAll();
}
}]
});
@ -541,7 +542,7 @@ module.exports = (_ => {
return [
BDFDB.ReactUtils.createElement(BDFDB.LibraryComponents.FormComponents.FormItem, {
title: "Replace:",
className: "input-wordvalue",
className: BDFDB.disCN.marginbottom8,
children: BDFDB.ReactUtils.createElement(BDFDB.LibraryComponents.TextInput, {
value: values.wordvalue,
placeholder: values.wordvalue,
@ -561,7 +562,7 @@ module.exports = (_ => {
}),
BDFDB.ReactUtils.createElement(BDFDB.LibraryComponents.FormComponents.FormItem, {
title: "With:",
className: "input-replacevalue",
className: BDFDB.disCN.marginbottom8,
children: BDFDB.ReactUtils.createElement(BDFDB.LibraryComponents.TextInput, {
type: "file",
useFilePath: true,

131
Plugins/ChatFilter/ChatFilter.plugin.js
View File

@ -14,8 +14,13 @@ module.exports = (_ => {
"info": {
"name": "ChatFilter",
"author": "DevilBro",
"version": "3.4.4",
"version": "3.4.5",
"description": "Allow the user to censor words or block complete messages based on words in the chatwindow"
},
"changeLog": {
"fixed": {
"Embeds": "Now also checks the description of embeds for blocked/censored words"
}
}
};
@ -83,7 +88,8 @@ module.exports = (_ => {
after: {
Messages: "type",
Message: "default",
MessageContent: "type"
MessageContent: "type",
Embed: "render"
}
};
@ -295,39 +301,42 @@ module.exports = (_ => {
}
checkMessage (stream, message) {
let {blocked, censored, content} = this.parseMessage(message);
if (blocked) {
if (!oldBlockedMessages[message.id]) oldBlockedMessages[message.id] = new BDFDB.DiscordObjects.Message(message);
stream.content.content = content;
stream.content.embeds = [];
}
else if (oldBlockedMessages[message.id] && Object.keys(message).some(key => !BDFDB.equals(oldBlockedMessages[message.id][key], message[key]))) {
stream.content.content = oldBlockedMessages[message.id].content;
stream.content.embeds = oldBlockedMessages[message.id].embeds;
delete oldBlockedMessages[message.id];
}
if (censored) {
if (!oldCensoredMessages[message.id]) oldCensoredMessages[message.id] = new BDFDB.DiscordObjects.Message(message);
stream.content.content = content;
}
else if (oldCensoredMessages[message.id] && Object.keys(message).some(key => !BDFDB.equals(oldCensoredMessages[message.id][key], message[key]))) {
stream.content.content = oldCensoredMessages[message.id].content;
delete oldCensoredMessages[message.id];
}
let {blocked, censored, content, embeds} = this.parseMessage(message);
let changeMessage = (change, cache) => {
if (change) {
if (!cache[message.id]) cache[message.id] = new BDFDB.DiscordObjects.Message(message);
stream.content.content = content;
stream.content.embeds = embeds;
}
else if (cache[message.id] && Object.keys(message).some(key => !BDFDB.equals(cache[message.id][key], message[key]))) {
stream.content.content = cache[message.id].content;
stream.content.embeds = cache[message.id].embeds;
delete cache[message.id];
}
};
changeMessage(blocked, oldBlockedMessages);
changeMessage(censored, oldCensoredMessages);
}
processMessage (e) {
let message = BDFDB.ObjectUtils.get(e, "instance.props.childrenMessageContent.props.message");
if (message) {
if (oldBlockedMessages[message.id]) e.returnvalue.props.className = BDFDB.DOMUtils.formatClassName(e.returnvalue.props.className, BDFDB.disCN._chatfilterblocked);
else if (oldCensoredMessages[message.id]) e.returnvalue.props.className = BDFDB.DOMUtils.formatClassName(e.returnvalue.props.className, BDFDB.disCN._chatfiltercensored);
if (oldCensoredMessages[message.id] && message.content != oldCensoredMessages[message.id].content) e.returnvalue.props.className = BDFDB.DOMUtils.formatClassName(e.returnvalue.props.className, BDFDB.disCN._chatfiltercensored);
}
}
processMessageContent (e) {
if (e.instance.props.message) {
if (oldBlockedMessages[e.instance.props.message.id]) e.returnvalue.props.children.push(this.createStamp(oldBlockedMessages[e.instance.props.message.id].content, "blocked"));
else if (oldCensoredMessages[e.instance.props.message.id]) e.returnvalue.props.children.push(this.createStamp(oldCensoredMessages[e.instance.props.message.id].content, "censored"));
if (oldCensoredMessages[e.instance.props.message.id]) e.returnvalue.props.children.push(this.createStamp(oldCensoredMessages[e.instance.props.message.id].content, "censored"));
}
}
processEmbed (e) {
if (e.instance.props.embed && e.instance.props.embed.censored && oldCensoredMessages[e.instance.props.embed.message_id]) {
let [children, index] = BDFDB.ReactUtils.findParent(e.returnvalue, {props: [["className", BDFDB.disCN.embeddescription]]});
if (index > -1) children[index].props.children.push(this.createStamp(oldCensoredMessages[e.instance.props.embed.message_id].embeds[e.instance.props.embed.index].rawDescription, "censored"));
}
}
@ -343,16 +352,20 @@ module.exports = (_ => {
}
parseMessage (message) {
let blocked = false, censored = false, content = (oldBlockedMessages[message.id] || oldCensoredMessages[message.id] || {}).content || message.content;
if (content && typeof content == "string") {
let blocked = false, censored = false;
let content = (oldBlockedMessages[message.id] || oldCensoredMessages[message.id] || {}).content || message.content;
let embeds = [].concat((oldBlockedMessages[message.id] || oldCensoredMessages[message.id] || {}).embeds || message.embeds);
let isContent = content && typeof content == "string";
if (isContent || embeds.length) {
let blockedReplace;
for (let bWord in words.blocked) {
let compareContent = [isContent && content, embeds.map(e => e.rawDescription)].flat(10).filter(n => n).join(" ");
blockedReplace = words.blocked[bWord].empty ? "" : (words.blocked[bWord].replace || replaces.blocked);
let reg = this.createReg(bWord, words.blocked[bWord]);
if (words.blocked[bWord].regex || bWord.indexOf(" ") > -1) {
if (this.testWord(content, reg)) blocked = true;
if (isContent && this.testWord(compareContent, reg)) blocked = true;
}
else for (let word of content.replace(/([\n\t\r])/g, " $1 ").split(" ")) {
else for (let word of compareContent.replace(/([\n\t\r])/g, " $1 ").split(" ")) {
if (this.testWord(word, reg)) {
blocked = true;
break;
@ -360,33 +373,46 @@ module.exports = (_ => {
}
if (blocked) break;
}
if (blocked) return {blocked, censored, content: blockedReplace};
if (blocked) return {blocked, censored, content: blockedReplace, embeds: []};
else {
content = content.replace(/([\n\t\r])/g, " $1 ");
for (let cWord in words.censored) {
let censoredReplace = words.censored[cWord].empty ? "" : (words.censored[cWord].replace || replaces.censored);
let reg = this.createReg(cWord, words.censored[cWord]);
let newString = [];
if (words.censored[cWord].regex || cWord.indexOf(" ") > -1) {
if (this.testWord(content, reg)) {
censored = true;
newString = [content.replace(reg, censoredReplace)];
let checkCensor = string => {
let singleCensored = false;
string = string.replace(/([\n\t\r])/g, " $1 ");
for (let cWord in words.censored) {
let censoredReplace = words.censored[cWord].empty ? "" : (words.censored[cWord].replace || replaces.censored);
let reg = this.createReg(cWord, words.censored[cWord]);
let newString = [];
if (words.censored[cWord].regex || cWord.indexOf(" ") > -1) {
if (this.testWord(string, reg)) {
singleCensored = true;
censored = true;
newString = [string.replace(reg, censoredReplace)];
}
else newString = [string];
}
else newString = [content];
}
else for (let word of content.split(" ")) {
if (this.testWord(word, reg)) {
censored = true;
newString.push(censoredReplace);
else for (let word of string.split(" ")) {
if (this.testWord(word, reg)) {
singleCensored = true;
censored = true;
newString.push(censoredReplace);
}
else newString.push(word);
}
else newString.push(word);
string = newString.join(" ");
}
content = newString.join(" ");
return {parsedContent: string.replace(/ ([\n\t\r]) /g, "$1"), singleCensored: singleCensored};
};
if (isContent) {
let {parsedContent, singleCensored} = checkCensor(content);
if (singleCensored) content = parsedContent;
}
for (let i in embeds) if (embeds[i].rawDescription) {
let {parsedContent, singleCensored} = checkCensor(embeds[i].rawDescription);
if (singleCensored) embeds[i] = Object.assign({}, embeds[i], {rawDescription: parsedContent, index: i, message_id: message.id, censored: true});
}
content = content.replace(/ ([\n\t\r]) /g, "$1");
}
}
return {blocked, censored, content};
return {blocked, censored, content, embeds};
}
testWord (word, reg) {
@ -400,7 +426,7 @@ module.exports = (_ => {
}
regTest (word, reg) {
let wordWithoutSpecial = word.replace(/[\?\¿\!\¡\.\"]/g, "");
let wordWithoutSpecial = word.replace(/[\?\¿\!\¡\.\"\*\-\_\~]/g, "");
return word && reg.test(word) || wordWithoutSpecial && reg.test(wordWithoutSpecial);
}
@ -433,10 +459,11 @@ module.exports = (_ => {
click: modal => {
let newConfigs = {};
for (let key in this.defaults.configs) {
let configinput = modal.querySelector(`.input-config${key} ${BDFDB.dotCN.switchinner}`);
if (configinput) newConfigs[key] = configinput.checked;
let configInput = modal.querySelector(`.input-config${key} ${BDFDB.dotCN.switchinner}`);
if (configInput) newConfigs[key] = configInput.checked;
}
this.saveWord(values, newConfigs);
this.forceUpdateAll();
}
}]
});
@ -446,7 +473,7 @@ module.exports = (_ => {
return [
BDFDB.ReactUtils.createElement(BDFDB.LibraryComponents.FormComponents.FormItem, {
title: "Block/Censor:",
className: "input-wordvalue",
className: BDFDB.disCN.marginbottom8,
children: BDFDB.ReactUtils.createElement(BDFDB.LibraryComponents.TextInput, {
key: "WORDVALUE",
value: values.wordvalue,
@ -467,7 +494,7 @@ module.exports = (_ => {
}),
BDFDB.ReactUtils.createElement(BDFDB.LibraryComponents.FormComponents.FormItem, {
title: "With:",
className: "input-replacevalue",
className: BDFDB.disCN.marginbottom8,
children: BDFDB.ReactUtils.createElement(BDFDB.LibraryComponents.TextInput, {
value: values.replacevalue,
placeholder: values.replacevalue,

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

@ -14,12 +14,12 @@ module.exports = (_ => {
"info": {
"name": "EditUsers",
"author": "DevilBro",
"version": "4.0.9",
"version": "4.1.0",
"description": "Allow you to change the icon, name, tag and color of users"
},
"changeLog": {
"fixed": {
"Messages": "Works in messages again"
"improved": {
"Separate Servers and DMs": "You can now disable all changes in the chat window for servers or dms"
}
}
};
@ -64,36 +64,41 @@ module.exports = (_ => {
}
} : (([Plugin, BDFDB]) => {
var changedUsers = {}, settings = {};
const settingsHeaders = {
sub: "Change Users in:",
main: "Change Users in the Chat Window (Messages, Reactions, Mentions, etc.) in:"
};
return class EditUsers extends Plugin {
onLoad () {
this.defaults = {
settings: {
changeInContextMenu: {value: true, inner: true, description: "User ContextMenu"},
changeInChatTextarea: {value: true, inner: true, description: "Chat Textarea"},
changeInChatWindow: {value: true, inner: true, description: "Messages"},
changeInReactions: {value: true, inner: true, description: "Reactions"},
changeInMentions: {value: true, inner: true, description: "Mentions"},
changeInVoiceChat: {value: true, inner: true, description: "Voice Channels"},
changeInMemberList: {value: true, inner: true, description: "Member List"},
changeInRecentDms: {value: true, inner: true, description: "Direct Message Notifications"},
changeInDmsList: {value: true, inner: true, description: "Direct Message List"},
changeInDmHeader: {value: true, inner: true, description: "Direct Message Header"},
changeInDmCalls: {value: true, inner: true, description: "Calls/ScreenShares"},
changeInTyping: {value: true, inner: true, description: "Typing List"},
changeInFriendList: {value: true, inner: true, description: "Friend List"},
changeInInviteList: {value: true, inner: true, description: "Invite List"},
changeInActivity: {value: true, inner: true, description: "Activity Page"},
changeInUserPopout: {value: true, inner: true, description: "User Popouts"},
changeInUserProfile: {value: true, inner: true, description: "User Profile Modal"},
changeInAutoComplete: {value: true, inner: true, description: "Autocomplete Menu"},
changeInAuditLog: {value: true, inner: true, description: "Audit Log"},
changeInEmojiLog: {value: true, inner: true, description: "Emoji Upload Log"},
changeInMemberLog: {value: true, inner: true, description: "Member Log"},
changeInQuickSwitcher: {value: true, inner: true, description: "Quick Switcher"},
changeInSearchPopout: {value: true, inner: true, description: "Search Popout"},
changeInUserAccount: {value: true, inner: true, description: "Your Account Information"},
changeInAppTitle: {value: true, inner: true, description: "Discord App Title (DMs)"}
changeInServers: {value: true, category: "main", description: "Servers"},
changeInDms: {value: true, category: "main", description: "Direct Messages"},
changeInContextMenu: {value: true, category: "sub", description: "User ContextMenu"},
changeInChatTextarea: {value: true, category: "sub", description: "Chat Textarea"},
changeInChatWindow: {value: true, category: "sub", description: "Messages"},
changeInReactions: {value: true, category: "sub", description: "Reactions"},
changeInMentions: {value: true, category: "sub", description: "Mentions"},
changeInMemberList: {value: true, category: "sub", description: "Member List"},
changeInVoiceChat: {value: true, category: "sub", description: "Voice Channels"},
changeInRecentDms: {value: true, category: "sub", description: "Direct Message Notifications"},
changeInDmsList: {value: true, category: "sub", description: "Direct Message List"},
changeInDmHeader: {value: true, category: "sub", description: "Direct Message Header"},
changeInDmCalls: {value: true, category: "sub", description: "Calls/ScreenShares"},
changeInTyping: {value: true, category: "sub", description: "Typing List"},
changeInFriendList: {value: true, category: "sub", description: "Friend List"},
changeInInviteList: {value: true, category: "sub", description: "Invite List"},
changeInActivity: {value: true, category: "sub", description: "Activity Page"},
changeInUserPopout: {value: true, category: "sub", description: "User Popouts"},
changeInUserProfile: {value: true, category: "sub", description: "User Profile Modal"},
changeInAutoComplete: {value: true, category: "sub", description: "Autocomplete Menu"},
changeInGuildSettings: {value: true, category: "sub", description: "Server Settings"},
changeInQuickSwitcher: {value: true, category: "sub", description: "Quick Switcher"},
changeInSearchPopout: {value: true, category: "sub", description: "Search Popout"},
changeInUserAccount: {value: true, category: "sub", description: "Your Account Information"},
changeInAppTitle: {value: true, category: "sub", description: "Discord App Title (DMs)"}
}
};
@ -260,16 +265,10 @@ module.exports = (_ => {
getSettingsPanel (collapseStates = {}) {
let settingsPanel, settingsItems = [];
for (let key in settings) if (!this.defaults.settings[key].inner) settingsItems.push(BDFDB.ReactUtils.createElement(BDFDB.LibraryComponents.SettingsSaveItem, {
type: "Switch",
plugin: this,
keys: ["settings", key],
label: this.defaults.settings[key].description,
value: settings[key]
}));
settingsItems.push(BDFDB.ReactUtils.createElement(BDFDB.LibraryComponents.SettingsPanelList, {
title: "Change Users in:",
children: Object.keys(settings).map(key => this.defaults.settings[key].inner && BDFDB.ReactUtils.createElement(BDFDB.LibraryComponents.SettingsSaveItem, {
for (let cat in settingsHeaders) settingsItems.push(BDFDB.ReactUtils.createElement(BDFDB.LibraryComponents.SettingsPanelList, {
title: settingsHeaders[cat],
dividerBottom: true,
children: Object.keys(settings).filter(key => this.defaults.settings[key].category == cat).map(key => BDFDB.ReactUtils.createElement(BDFDB.LibraryComponents.SettingsSaveItem, {
type: "Switch",
plugin: this,
keys: ["settings", key],
@ -424,7 +423,7 @@ module.exports = (_ => {
tagClass = BDFDB.disCNS.userprofilebottag + BDFDB.disCN.bottagnametag;
break;
case BDFDB.disCN.guildsettingsinviteusername:
change = settings.changeInMemberLog;
change = settings.changeInGuildSettings;
break;
case BDFDB.disCN.userinfodiscordtag:
change = settings.changeInFriendList;
@ -574,7 +573,7 @@ module.exports = (_ => {
processMessage (e) {
if (settings.changeInChatWindow) {
let header = e.instance.props.childrenHeader;
if (header && header.props && header.props.message) {
if (header && header.props && header.props.message && this.shouldChangeInChat(header.props.message.channel_id)) {
let data = changedUsers[header.props.message.author.id];
if (data) {
let color1 = data.color1 && data.useRoleColor && (BDFDB.LibraryModules.MemberStore.getMember((BDFDB.LibraryModules.ChannelStore.getChannel(header.props.message.channel_id) || {}).guild_id, header.props.message.author.id) || {}).colorString || data.color1;
@ -584,7 +583,7 @@ module.exports = (_ => {
}
}
let content = e.instance.props.childrenMessageContent;
if (content && content.type && content.type.type) {
if (content && content.type && content.type.type && content.props.message && this.shouldChangeInChat(content.props.message.channel_id)) {
let data = changedUsers[content.props.message.author.id];
if (data) {
let messageColor = data.color5 || (BDFDB.BDUtils.getSettings(BDFDB.BDUtils.settingsIds.coloredText) && (data.color1 && data.useRoleColor && (BDFDB.LibraryModules.MemberStore.getMember((BDFDB.LibraryModules.ChannelStore.getChannel(content.props.message.channel_id) || {}).guild_id, content.props.message.author.id) || {}).colorString || data.color1));
@ -596,7 +595,7 @@ module.exports = (_ => {
}
}
let repliedMessage = e.instance.props.childrenRepliedMessage;
if (repliedMessage && repliedMessage.props && repliedMessage.props.children && repliedMessage.props.children.props && repliedMessage.props.children.props.referencedMessage && repliedMessage.props.children.props.referencedMessage.message) {
if (repliedMessage && repliedMessage.props && repliedMessage.props.children && repliedMessage.props.children.props && repliedMessage.props.children.props.referencedMessage && repliedMessage.props.children.props.referencedMessage.message && this.shouldChangeInChat(repliedMessage.props.children.props.referencedMessage.message.channel_id)) {
let referenceMessage = repliedMessage.props.children.props.referencedMessage.message;
let data = changedUsers[referenceMessage.author.id];
if (data) {
@ -610,7 +609,7 @@ module.exports = (_ => {
}
processMessageUsername (e) {
if (e.instance.props.message && settings.changeInChatWindow) {
if (e.instance.props.message && settings.changeInChatWindow && this.shouldChangeInChat(e.instance.props.message.channel_id)) {
let data = changedUsers[e.instance.props.message.author.id];
if (!e.returnvalue) {
let message = new BDFDB.DiscordObjects.Message(Object.assign({}, e.instance.props.message, {author: this.getUserData(e.instance.props.message.author.id, true, false, e.instance.props.message.author)}));
@ -644,7 +643,7 @@ module.exports = (_ => {
}
processMessageContent (e) {
if (e.instance.props.message && settings.changeInChatWindow) {
if (e.instance.props.message && settings.changeInChatWindow && this.shouldChangeInChat(e.instance.props.message.channel_id)) {
if (!e.returnvalue) {
if (e.instance.props.message.type != BDFDB.DiscordConstants.MessageTypes.DEFAULT) {
let message = new BDFDB.DiscordObjects.Message(Object.assign({}, e.instance.props.message, {author: this.getUserData(e.instance.props.message.author.id, true, false, e.instance.props.message.author)}));
@ -672,7 +671,7 @@ module.exports = (_ => {
}
processReaction (e) {
if (!settings.changeInReactions || !e.returnvalue) return;
if (!settings.changeInReactions || !e.returnvalue || !this.shouldChangeInChat(e.instance.props.message.channel_id)) return;
if (e.instance.props.reactions && e.instance.props.reactions.length) {
let channel = BDFDB.LibraryModules.ChannelStore.getChannel(e.instance.props.message.channel_id);
let guildId = null == channel || channel.isPrivate() ? null : channel.getGuildId();
@ -701,7 +700,7 @@ module.exports = (_ => {
}
processReactorsComponent (e) {
if (settings.changeInReactions && BDFDB.ArrayUtils.is(e.instance.props.reactors)) {
if (settings.changeInReactions && BDFDB.ArrayUtils.is(e.instance.props.reactors) && this.shouldChangeInChat(e.instance.props.channel.id)) {
if (!e.returnvalue) {
for (let i in e.instance.props.reactors) if (!BDFDB.LibraryModules.MemberStore.getNick(e.instance.props.guildId, e.instance.props.reactors[i].id)) e.instance.props.reactors[i] = this.getUserData(e.instance.props.reactors[i].id, true, false, e.instance.props.reactors[i]);
}
@ -728,31 +727,29 @@ module.exports = (_ => {
}
processMention (e) {
if (e.instance.props.userId && settings.changeInMentions && changedUsers[e.instance.props.userId]) {
if (e.instance.props.userId && settings.changeInMentions && changedUsers[e.instance.props.userId] && this.shouldChangeInChat()) {
this.changeMention(e.returnvalue, changedUsers[e.instance.props.userId]);
}
}
processUserMention (e) {
if (e.instance.props.id && settings.changeInMentions) {
if (e.instance.props.id && settings.changeInMentions && changedUsers[e.instance.props.id] && this.shouldChangeInChat()) {
let data = changedUsers[e.instance.props.id];
if (data) {
let tooltipChildren = BDFDB.ObjectUtils.get(e, "returnvalue.props.text.props.children");
if (tooltipChildren) {
if (tooltipChildren[0] && tooltipChildren[0].props && tooltipChildren[0].props.user) tooltipChildren[0].props.user = this.getUserData(tooltipChildren[0].props.user.id);
if (data.name && typeof tooltipChildren[1] == "string") tooltipChildren[1] = data.name;
}
if (data.name || data.color1) {
if (typeof e.returnvalue.props.children == "function") {
let renderChildren = e.returnvalue.props.children;
e.returnvalue.props.children = (...args) => {
let children = renderChildren(...args);
this.changeMention(children, data);
return children;
};
}
else this.changeMention(e.returnvalue, data);
let tooltipChildren = BDFDB.ObjectUtils.get(e, "returnvalue.props.text.props.children");
if (tooltipChildren) {
if (tooltipChildren[0] && tooltipChildren[0].props && tooltipChildren[0].props.user) tooltipChildren[0].props.user = this.getUserData(tooltipChildren[0].props.user.id);
if (data.name && typeof tooltipChildren[1] == "string") tooltipChildren[1] = data.name;
}
if (data.name || data.color1) {
if (typeof e.returnvalue.props.children == "function") {
let renderChildren = e.returnvalue.props.children;
e.returnvalue.props.children = (...args) => {
let children = renderChildren(...args);
this.changeMention(children, data);
return children;
};
}
else this.changeMention(e.returnvalue, data);
}
}
}
@ -790,7 +787,7 @@ module.exports = (_ => {
}
processChannelReply (e) {
if (e.instance.props.reply && e.instance.props.reply.message && settings.changeInChatWindow) {
if (e.instance.props.reply && e.instance.props.reply.message && settings.changeInChatWindow && this.shouldChangeInChat(e.instance.props.reply.message.channel_id)) {
if (!e.returnvalue) {
let message = new BDFDB.DiscordObjects.Message(Object.assign({}, e.instance.props.reply.message, {author: this.getUserData(e.instance.props.reply.message.author.id)}));
let data = changedUsers[e.instance.props.reply.message.author.id];
@ -808,7 +805,7 @@ module.exports = (_ => {
}
processMemberListItem (e) {
if (e.instance.props.user && settings.changeInMemberList) {
if (e.instance.props.user && settings.changeInMemberList && this.shouldChangeInChat()) {
if (!e.returnvalue) {
e.instance.props.user = this.getUserData(e.instance.props.user.id);
let data = changedUsers[e.instance.props.user.id];
@ -831,38 +828,38 @@ module.exports = (_ => {
}
processAuditLog (e) {
if (e.instance.props.log && settings.changeInAuditLog) {
if (e.instance.props.log && settings.changeInGuildSettings) {
if (e.instance.props.log.user) e.instance.props.log.user = this.getUserData(e.instance.props.log.user.id);
if (e.instance.props.log.target && e.instance.props.log.targetType == "USER") e.instance.props.log.target = this.getUserData(e.instance.props.log.target.id);
}
}
processUserHook (e) {
if (e.instance.props.user && settings.changeInAuditLog) {
if (e.instance.props.user && settings.changeInGuildSettings) {
this.changeUserColor(e.returnvalue.props.children[0], e.instance.props.user.id);
}
}
processGuildSettingsEmoji (e) {
if (BDFDB.ArrayUtils.is(e.instance.props.emojis) && settings.changeInEmojiLog) {
if (BDFDB.ArrayUtils.is(e.instance.props.emojis) && settings.changeInGuildSettings) {
e.instance.props.emojis = [].concat(e.instance.props.emojis);
for (let i in e.instance.props.emojis) e.instance.props.emojis[i] = Object.assign({}, e.instance.props.emojis[i], {user: this.getUserData(e.instance.props.emojis[i].user.id)});
}
}
processMemberCard (e) {
if (e.instance.props.user && settings.changeInMemberLog) e.instance.props.user = this.getUserData(e.instance.props.user.id);
if (e.instance.props.user && settings.changeInGuildSettings) e.instance.props.user = this.getUserData(e.instance.props.user.id);
}
processSettingsInvites (e) {
if (BDFDB.ObjectUtils.is(e.instance.props.invites) && settings.changeInMemberLog) {
if (BDFDB.ObjectUtils.is(e.instance.props.invites) && settings.changeInGuildSettings) {
e.instance.props.invites = Object.assign({}, e.instance.props.invites);
for (let id in e.instance.props.invites) e.instance.props.invites[id] = new BDFDB.DiscordObjects.Invite(Object.assign({}, e.instance.props.invites[id], {inviter: this.getUserData(e.instance.props.invites[id].inviter.id)}));
}
}
processGuildSettingsBans (e) {
if (BDFDB.ObjectUtils.is(e.instance.props.bans) && settings.changeInMemberLog) {
if (BDFDB.ObjectUtils.is(e.instance.props.bans) && settings.changeInGuildSettings) {
e.instance.props.bans = Object.assign({}, e.instance.props.bans);
for (let id in e.instance.props.bans) e.instance.props.bans[id] = Object.assign({}, e.instance.props.bans[id], {user: this.getUserData(e.instance.props.bans[id].user.id)});
}
@ -1050,6 +1047,14 @@ module.exports = (_ => {
}
}
shouldChangeInChat (channelId) {
if (settings.changeInServers && settings.changeInDms) return true;
let channel = BDFDB.LibraryModules.ChannelStore.getChannel(channelId || BDFDB.LibraryModules.LastChannelStore.getChannelId());
let isDm = channel && (channel.isDM() || channel.isGroupDM());
if (channel && (settings.changeInServers && !isDm || settings.changeInDms && isDm)) return true;
return false;
}
changeUserColor (child, userId, options = {}) {
if (BDFDB.ReactUtils.isValidElement(child)) {
let data = changedUsers[userId] || {};

6
Plugins/GoogleTranslateOption/GoogleTranslateOption.plugin.js
View File

@ -459,8 +459,8 @@ module.exports = (_ => {
}
processEmbed (e) {
if (e.instance.props.embed && e.instance.props.embed.messageId) {
let translation = translatedMessages[e.instance.props.embed.messageId];
if (e.instance.props.embed && e.instance.props.embed.message_id) {
let translation = translatedMessages[e.instance.props.embed.message_id];
if (translation) {
if (!e.returnvalue) e.instance.props.embed = Object.assign({}, e.instance.props.embed, {
rawDescription: translation.embeds[e.instance.props.embed.id],
@ -630,7 +630,7 @@ module.exports = (_ => {
let strings = translation.split("\n__________________ __________________ __________________\n");
let content = strings.shift().trim(), embeds = {};
for (let i in message.embeds) {
message.embeds[i].messageId = message.id;
message.embeds[i].message_id = message.id;
embeds[message.embeds[i].id] = (strings.shift() || message.embeds[i].rawDescription).trim();
}
translatedMessages[message.id] = {content, embeds, input, output};