This commit is contained in:
Mirco Wittrien 2022-11-22 02:42:58 +01:00
parent f06b9cc05e
commit 676316ebad
2 changed files with 10 additions and 46 deletions

View File

@ -3292,19 +3292,16 @@
"userpopoutcustomstatusemoji": ["CustomStatus", "customStatusEmoji"],
"userpopoutcustomstatussoloemoji": ["CustomStatus", "customStatusSoloEmoji"],
"userpopoutcustomstatustext": ["CustomStatus", "customStatusText"],
"userpopoutheaderbottag": ["UserPopoutHeader", "headerBotTag"],
"userpopoutheaderbottagwithnickname": ["UserPopoutHeader", "headerBotTagWithNickname"],
"userpopoutheaderdiscriminatorbase": ["UserPopoutHeader", "discrimBase"],
"userpopoutheaderdiscriminatornonickname": ["UserPopoutHeader", "headerTagDiscriminatorNoNickname"],
"userpopoutheadernickname": ["UserPopoutHeader", "nickname"],
"userpopoutheadertag": ["UserPopoutHeader", "headerTag"],
"userpopoutheadertagnonickname": ["UserPopoutHeader", "headerTagNoNickname"],
"userpopoutheadertagusernamebase": ["UserPopoutHeader", "headerTagUsernameBase"],
"userpopoutheadertagusernamenonickname": ["UserPopoutHeader", "headerTagUsernameNoNickname"],
"userpopoutheadertagwithnickname": ["UserPopoutHeader", "headerTagWithNickname"],
"userpopoutheadertext": ["UserPopoutHeader", "headerText"],
"userpopoutheadertop": ["UserPopoutHeader", "headerTop"],
"userpopoutheadertopwithcustomstatus": ["UserPopoutHeader", "headerTopWithCustomStatus"],
"userpopoutheaderbottag": ["UserPopoutUsernameSection", "headerBotTag"],
"userpopoutheaderbottagwithnickname": ["UserPopoutUsernameSection", "headerBotTagWithNickname"],
"userpopoutheaderdiscriminatorbase": ["UserPopoutUsernameSection", "discrimBase"],
"userpopoutheadernickname": ["UserPopoutUsernameSection", "nickname"],
"userpopoutheadertag": ["UserPopoutUsernameSection", "userTag"],
"userpopoutheadertagnonickname": ["UserPopoutUsernameSection", "userTagNoNickname"],
"userpopoutheadertagusernamebase": ["UserPopoutUsernameSection", "userTagUsernameBase"],
"userpopoutheadertagusernamenonickname": ["UserPopoutUsernameSection", "userTagUsernameNoNickname"],
"userpopoutheadertagwithnickname": ["UserPopoutUsernameSection", "userTagWithNickname"],
"userpopoutheadertext": ["UserPopoutUsernameSection", "userText"],
"userpopoutinner": ["UserTheme", "userPopoutInner"],
"userpopoutmessageinputcontainer": ["UserPopoutFooter", "messageInputContainer"],
"userpopoutouter": ["UserTheme", "userPopoutOuter"],
@ -3312,14 +3309,6 @@
"userpopoutsectionbody": ["UserPopoutSectionTitle", "body"],
"userpopoutsectionlast": ["UserPopoutSection", "lastSection"],
"userpopoutsectiontitle": ["UserPopoutSectionTitle", "title"],
"userpopoutusernamebottag": ["UserPopoutUsernameSection", "headerBotTag"],
"userpopoutusernamebottagwithnickname": ["UserPopoutUsernameSection", "headerBotTagWithNickname"],
"userpopoutusernamenickname": ["UserPopoutUsernameSection", "nickname"],
"userpopoutusernametagnousername": ["UserPopoutUsernameSection", "userTagUsernameNoNickname"],
"userpopoutusernametagusername": ["UserPopoutUsernameSection", "userTagUsernameBase"],
"userpopoutusernametagnonickname": ["UserPopoutUsernameSection", "userTagNoNickname"],
"userpopoutusernametagwithnickname": ["UserPopoutUsernameSection", "userTagWithNickname"],
"userpopoutusernametext": ["UserPopoutUsernameSection", "userText"],
"userprofilebody": ["UserProfile", "body"],
"userprofileinfosection": ["UserProfileInfoSection", "userInfoSection"],
"userprofileinfosectionheader": ["UserProfileInfoSection", "userInfoSectionHeader"],

View File

@ -104,7 +104,6 @@ module.exports = (_ => {
UserPopoutAvatar: "UserPopoutAvatar",
UserThemePopoutHeader: "default",
UsernameSection: "default",
UserPopoutInfo: "UserPopoutInfo",
UserProfile: "default",
UserProfileHeader: "default",
UserInfo: "default",
@ -666,30 +665,6 @@ module.exports = (_ => {
}
}
}
processUserPopoutInfo (e) {
if (e.instance.props.user && this.settings.places.userPopout) {
let data = changedUsers[e.instance.props.user.id];
if (!data) return;
if (!e.returnvalue) {
let nickname = this.getUserNick(e.instance.props.user.id, e.instance.props.nickname);
e.instance.props.nickname = nickname ? nickname : null;
}
else {
if (data.color1 || data.tag) {
let [children, index] = BDFDB.ReactUtils.findParent(e.returnvalue, {props: [["className", BDFDB.disCN.userpopoutheadernickname]]});
if (index > -1) {
this.changeUserColor(children[index], e.instance.props.user.id);
if (!BDFDB.ArrayUtils.is(children[index].props.children)) children[index].props.children = [children[index].props.children].flat(10);
this.injectBadge(children[index].props.children, e.instance.props.user.id, BDFDB.LibraryStores.SelectedGuildStore.getGuildId(), 2, {
tagClass: BDFDB.disCNS.userpopoutheaderbottag + BDFDB.disCN.bottagnametag,
inverted: typeof e.instance.getMode == "function" && e.instance.getMode() !== "Normal"
});
}
}
}
}
}
processUserProfile (e) {
if (e.instance.props.user && this.settings.places.userProfile) e.instance.props.user = this.getUserData(e.instance.props.user.id);