This commit is contained in:
Mirco Wittrien 2020-08-11 11:11:04 +02:00
parent b57e93a57d
commit cc50626d84
3 changed files with 24 additions and 17 deletions

View File

@ -7951,7 +7951,7 @@
InternalComponents.LibraryComponents.DiscordTag = BDFDB.ModuleUtils.findByName("DiscordTag");
InternalComponents.LibraryComponents.Emoji = BDFDB.ModuleUtils.findByName("Emoji");
InternalComponents.LibraryComponents.Emoji = (BDFDB.ModuleUtils.findByString("emojiName", "shouldAnimate", "jumboable") || {}).default;
InternalComponents.LibraryComponents.EmojiButton = BDFDB.ModuleUtils.findByName("EmojiButton");
@ -7977,7 +7977,8 @@
className: BDFDB.DOMUtils.formatClassName(this.props.className, BDFDB.disCN.emojiinputbutton),
renderButtonContents: this.props.emoji ? _ => BDFDB.ReactUtils.createElement(InternalComponents.LibraryComponents.Emoji, {
className: BDFDB.disCN.emoji,
emoji: this.props.emoji
emojiId: this.props.emoji.id,
emojiName: this.props.emoji.name
}) : null
}),
wrap: false,
@ -7988,12 +7989,13 @@
return BDFDB.ReactUtils.createElement(BDFDB.ModuleUtils.findByString("allowManagedEmojis", "EMOJI_PICKER_TAB_PANEL_ID", "diversitySelector"), {
closePopout: instance.close,
onSelectEmoji: this.handleEmojiChange.bind(this),
allowManagedEmojis: false
allowManagedEmojis: this.props.allowManagedEmojis
});
}
});
}
};
InternalBDFDB.setDefaultProps(InternalComponents.LibraryComponents.EmojiPickerButton, {allowManagedEmojis:false});
InternalComponents.LibraryComponents.FavButton = InternalBDFDB.loadPatchedComp("FavButton") || reactInitialized && class BDFDB_FavButton extends LibraryModules.React.Component {
handleClick() {

File diff suppressed because one or more lines are too long

View File

@ -6,13 +6,17 @@ var EditUsers = (_ => {
return class EditUsers {
getName () {return "EditUsers";}
getVersion () {return "3.9.3";}
getVersion () {return "3.9.4";}
getAuthor () {return "DevilBro";}
getDescription () {return "Allows you to change the icon, name, tag and color of users.";}
constructor () {
constructor () {
this.changelog = {
"improved":[["Local custom status","You can now also use custom emojis for local custom statuses"]]
};
this.patchedModules = {
before: {
HeaderBarContainer: "render",
@ -39,7 +43,6 @@ var EditUsers = (_ => {
PrivateChannelRecipientsInvitePopout: "render",
QuickSwitchUserResult: "render",
SearchPopoutComponent: "render",
IncomingCall: "render",
PrivateChannelCallParticipants: "render",
ChannelCall: "render",
PictureInPictureVideo: "default",
@ -69,7 +72,7 @@ var EditUsers = (_ => {
RTCConnection: "render",
PrivateChannel: "render",
QuickSwitchUserResult: "render",
IncomingCall: "render"
IncomingCallModal: "default"
}
};
}
@ -823,7 +826,8 @@ var EditUsers = (_ => {
}
}
processIncomingCall (e) {
processIncomingCallModal (e) {
console.log(e);
if (e.instance.props.channelId && settings.changeInDmCalls) {
let user = BDFDB.LibraryModules.UserStore.getUser(e.instance.props.channelId);
if (!user) {
@ -831,14 +835,14 @@ var EditUsers = (_ => {
if (channel && channel.type == BDFDB.DiscordConstants.ChannelTypes.DM) user = BDFDB.LibraryModules.UserStore.getUser(channel.recipients[0]);
}
if (user) {
if (!e.returnvalue) {
e.instance.props.channelName = this.getUserData(user.id).username;
e.instance.props.avatarUrl = this.getUserAvatar(user.id);
}
else {
let userName = BDFDB.ReactUtils.findChild(e.returnvalue, {props:[["className", BDFDB.disCN.callmembers]]});
if (userName) this.changeUserColor(userName, user.id);
let userName = BDFDB.ReactUtils.findChild(e.returnvalue, {props:[["className", BDFDB.disCN.callincomingtitle]]});
if (userName) {
let data = changedUsers[user.id];
if (data && data.name) userName.props.children = data.name;
this.changeUserColor(userName, user.id);
}
let avatar = BDFDB.ReactUtils.findChild(e.returnvalue, {props:[["className", BDFDB.disCN.callincomingicon]]});
if (avatar) avatar.props.src = this.getUserAvatar(user.id);
}
}
}
@ -1132,7 +1136,8 @@ var EditUsers = (_ => {
children: BDFDB.ReactUtils.createElement(BDFDB.LibraryComponents.EmojiPickerButton, {
className: "input-useremojistatus",
key: "USERSTATUSEMOJI",
emoji: data.statusEmoji
emoji: data.statusEmoji,
allowManagedEmojis: true
})
}),
BDFDB.ReactUtils.createElement(BDFDB.LibraryComponents.TextInput, {