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-05-21 17:51:26 +02:00
parent fe64aa0a9a
commit a7bc144550
5 changed files with 46 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3020,6 +3020,7 @@
"userpopoutheadertext_old": ["UserPopoutWrapper", "headerText"],
"userpopoutheadertop_old": ["UserPopoutWrapper", "headerTop"],
"userpopoutheaderbottagwithnickname": ["UserPopout", "headerBotTagWithNickname"],
"userpopoutheadertagdiscriminatornonickname": ["UserPopout", "headerTagDiscriminatorNoNickname"],
"userpopoutheadername": ["UserPopout", "headerName"],
"userpopoutheadernamewrapper": ["UserPopout", "headerNameWrapper"],
"userpopoutheadernormal": ["UserPopout", "headerNormal"],

11
Library/_res/BDFDB.raw.css
View File

@ -459,6 +459,17 @@ img:not([src]), img[src=""], img[src="null"] {
text-overflow: ellipsis;
}
[REPLACE_CLASS_userpopoutheadernamewrapper_old],
[REPLACE_CLASS_userpopoutheadernamewrapper],
[REPLACE_CLASS_userpopoutheadertagnonickname] {
display: flex;
align-items: center;
line-height: unset;
}
[REPLACE_CLASS_userpopoutheadertagdiscriminatornonickname] {
position: relative;
top: 1px;
}
[REPLACE_CLASS_userinfodate] {
user-select: text;
margin-top: 8px;

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

@ -107,6 +107,7 @@ module.exports = (_ => {
ChannelEditorContainer: "render",
AutocompleteUserResult: "render",
UserPopout: "render",
UserPopoutHeader: "default",
UserProfile: "render",
UserInfo: "default",
NowPlayingHeader: "Header",
@ -140,6 +141,7 @@ module.exports = (_ => {
DiscordTag: "default",
NameTag: "default",
UserPopout: "render",
UserPopoutHeader: "default",
NowPlayingHeader: "Header",
VoiceUser: "render",
Account: "render",
@ -172,10 +174,6 @@ module.exports = (_ => {
${BDFDB.dotCN.voicedetailschannel}:hover > span[style*="color"] {
text-decoration: underline;
}
${BDFDB.dotCNS.userpopoutheadernamewrapper + BDFDB.dotCN.bottag} {
position: relative;
bottom: 1px;
}
${BDFDB.dotCNS.dmchannel + BDFDB.dotCN.bottag} {
display: inline;
margin-left: 4px;
@ -445,6 +443,7 @@ module.exports = (_ => {
let changeBackground = false;
let tagClass = "";
switch (e.instance.props.className) {
case BDFDB.disCN.userpopoutheadertagnonickname_old:
case BDFDB.disCN.userpopoutheadertagnonickname:
change = this.settings.places.userPopout;
guildId = BDFDB.LibraryModules.LastGuildStore.getGuildId();
@ -485,6 +484,14 @@ module.exports = (_ => {
}
processUserPopout (e) {
this.handleUserPopout(e);
}
processUserPopoutHeader (e) {
this.handleUserPopout(e);
}
handleUserPopout (e) {
if (e.instance.props.user && this.settings.places.userPopout) {
let data = changedUsers[e.instance.props.user.id];
if (!e.returnvalue) {
@ -499,7 +506,7 @@ module.exports = (_ => {
}
else {
if (data && (data.color1 || data.color2 || data.tag)) {
let [children, index] = BDFDB.ReactUtils.findParent(e.returnvalue, {props: [["className", BDFDB.disCN.userpopoutheadernickname]]});
let [children, index] = BDFDB.ReactUtils.findParent(e.returnvalue, {props: [["className", [BDFDB.disCN.userpopoutheadername_old, BDFDB.disCN.userpopoutheadername]]]});
if (index > -1) {
this.changeUserColor(children[index], e.instance.props.user.id, {changeBackground: true});
this.injectBadge(children, e.instance.props.user.id, BDFDB.LibraryModules.LastGuildStore.getGuildId(), 2, {

16
Plugins/StaffTag/StaffTag.plugin.js
View File

@ -80,7 +80,8 @@ module.exports = (_ => {
MessageUsername: "default",
VoiceUser: "render",
NameTag: "default",
UserPopout: "render"
UserPopout: "render",
UserPopoutHeader: "default"
}
};
@ -266,6 +267,7 @@ module.exports = (_ => {
if (userType) {
let inject = false, tagClass = "";
switch (e.instance.props.className) {
case BDFDB.disCN.userpopoutheadertagnonickname_old:
case BDFDB.disCN.userpopoutheadertagnonickname:
inject = this.settings.tagPlaces.userPopout;
tagClass = BDFDB.disCN.bottagnametag;
@ -285,12 +287,20 @@ module.exports = (_ => {
}
processUserPopout (e) {
this.handleUserPopout(e);
}
processUserPopoutHeader (e) {
this.handleUserPopout(e);
}
handleUserPopout (e) {
if (e.instance.props.user && this.settings.tagPlaces.userPopout) {
let userType = this.getUserType(e.instance.props.user, e.instance.props.channel && e.instance.props.channel.id);
if (userType) {
let [children, index] = BDFDB.ReactUtils.findParent(e.returnvalue, {props: [["className", BDFDB.disCN.userpopoutheadertagwithnickname]]});
let [children, index] = BDFDB.ReactUtils.findParent(e.returnvalue, {props: [["className", [BDFDB.disCN.userpopoutheadername_old, BDFDB.disCN.userpopoutheadername]]]});
if (index > -1) this.injectStaffTag(children, e.instance.props.user, userType, 2, {
tagClass: BDFDB.disCNS.userpopoutheaderbottagwithnickname + BDFDB.disCN.bottagnametag,
tagClass: BDFDB.disCNS.userpopoutheaderbottagwithnickname_old + BDFDB.disCNS.userpopoutheaderbottagwithnickname + BDFDB.disCN.bottagnametag,
inverted: typeof e.instance.getMode == "function" && e.instance.getMode() !== "Normal"
});
}

9
Themes/_res/UsrBgs.css
View File

@ -123,6 +123,15 @@
font-weight: 500;
line-height: 18px;
}
.userPopout-3XzG_A .headerTagNoNickname-ENx6no {
align-items: center;
line-height: unset;
}
.userPopout-3XzG_A .headerTagNoNickname-ENx6no > span:not([class]) {
position: relative;
top: 1px;
font-size: 14px;
}
.userPopout-3XzG_A .botTagInvert-18-95s {
background: var(--brand-experiment, #5865f2);
color: #fff;