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-03-03 13:44:48 +01:00
parent ee073f1104
commit 2d6b26cd39
2 changed files with 0 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Library/0BDFDB.plugin.js
View File

@ -7364,13 +7364,7 @@ module.exports = (_ => {
let MessageHeaderExport = BDFDB.ModuleUtils.findByProperties("MessageTimestamp", false);
InternalBDFDB.processMessage = function (e) {
<<<<<<< HEAD
if (MessageHeaderExport && BDFDB.ObjectUtils.get(e, "instance.props.childrenHeader.type.type.name") && BDFDB.ObjectUtils.get(e, "instance.props.childrenHeader.props.message")) {
e.instance.props.childrenHeader.type = MessageHeaderExport.exports.default;
}
=======
if (MessageHeaderExport && BDFDB.ObjectUtils.get(e, "instance.props.childrenHeader.type.type.name") && BDFDB.ObjectUtils.get(e, "instance.props.childrenHeader.props.message")) e.instance.props.childrenHeader.type = MessageHeaderExport.exports.default;
>>>>>>> development
if (e.returnvalue && e.returnvalue.props && e.returnvalue.props.children && e.returnvalue.props.children.props) {
let message;
for (let key in e.instance.props) {

3
Library/_res/BDFDB.data.json
View File

@ -202,10 +202,7 @@
"InviteGuildName": {"props": ["GuildName", "GuildTemplateName"]},
"InviteCard": {"class": "guildsettingsinvitecard"},
"MemberCard": {"class": "guildsettingsmembercard"},
<<<<<<< HEAD
=======
"Message": {"strings": ["childrenMessageContent", "childrenRepliedMessage", "zalgo"]},
>>>>>>> development
"MessageHeader": {"props": ["MessageTimestamp"]},
"Messages": {"strings": ["group-spacing-", "canManageMessages"]},
"MessageUsername": {"strings": ["default.username", "colorString", "compact"]},