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-06-25 16:06:39 +02:00
parent 9c4d88c638
commit 4b0cc03995
6 changed files with 56 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Library/0BDFDB.plugin.js
View File

@ -7670,9 +7670,10 @@ module.exports = (_ => {
wrap: false,
renderPopout: instance => BDFDB.ReactUtils.createElement(InternalComponents.LibraryComponents.UserPopout, {
userId: this.props.userId,
user: LibraryModules.UserStore.getUser(this.props.userId)
channelId: this.props.channelId,
guildId: this.props.guildId
}),
}), "userId"));
}), "userId", "channelId", "guildId"));
}
};

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

@ -240,7 +240,6 @@
"UnreadDMs": {"class": "guildsscroller"},
"Upload": {"class": "uploadmodal"},
"UserHook": {"class": "auditloguserhook"},
"UserPopout": {"class": "userpopout"},
"UserSettingsAppearance": {"class": "usersettingsappearancepreview"},
"V2C_ContentColumn": {"class": "settingswindowcontentcolumn", "special": [{"path": "return.stateNode.props.title", "value": ["PLUGINS", "THEMES"]}]}
},

5
Plugins/EditRoles/EditRoles.plugin.js
View File

@ -80,7 +80,6 @@ module.exports = (_ => {
this.patchedModules = {
before: {
MemberListItem: "render",
UserPopout: "render",
ChannelMembers: "render"
}
};
@ -215,10 +214,6 @@ module.exports = (_ => {
if (member) e.instance.props.colorString = member.colorString;
}
}
processUserPopout (e) {
if (e.instance.props.user && e.instance.props.guild && e.instance.props.guildMember) e.instance.props.guild = this.changeRolesInGuild(e.instance.props.guild);
}
processChannelMembers (e) {
e.instance.props.groups = [].concat(e.instance.props.groups);

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

@ -2,7 +2,7 @@
* @name EditUsers
* @author DevilBro
* @authorId 278543574059057154
* @version 4.3.3
* @version 4.3.4
* @description Allows you to locally edit Users
* @invite Jx3TjNS
* @donate https://www.paypal.me/MircoWittrien
@ -17,12 +17,12 @@ module.exports = (_ => {
"info": {
"name": "EditUsers",
"author": "DevilBro",
"version": "4.3.3",
"version": "4.3.4",
"description": "Allows you to locally edit Users"
},
"changeLog": {
"improved": {
"Custom Status": "You can now use nitro walled emojis in the local custom status changer"
"fixed": {
"User Popout": "Fixing Stuff for the User Popout Update, thanks Discord"
}
}
};
@ -115,7 +115,7 @@ module.exports = (_ => {
HeaderBarContainer: "render",
ChannelEditorContainer: "render",
AutocompleteUserResult: "render",
UserPopout: "render",
UserPopoutInfo: "UserPopoutInfo",
UserProfileModal: "default",
UserInfo: "default",
NowPlayingItem: "default",
@ -149,7 +149,8 @@ module.exports = (_ => {
AutocompleteUserResult: "render",
DiscordTag: "default",
NameTag: "default",
UserPopoutInfo: "default",
UserPopoutContainer: "type",
UserPopoutInfo: "UserPopoutInfo",
MutualFriends: "default",
VoiceUser: "render",
Account: "render",
@ -263,8 +264,8 @@ module.exports = (_ => {
}});
BDFDB.PatchUtils.patch(this, BDFDB.LibraryModules.StatusMetaUtils, "findActivity", {after: e => {
let data = e.returnValue && changedUsers[e.methodArguments[0]];
if (data && (data.removeStatus || data.status || data.statusEmoji) && e.returnValue.type === BDFDB.DiscordConstants.ActivityTypes.CUSTOM_STATUS) return this.createCustomStatus(changedUsers[e.methodArguments[0]]);
let data = changedUsers[e.methodArguments[0]];
if (data && (data.removeStatus || data.status || data.statusEmoji) && (e.returnValue && e.returnValue.type === BDFDB.DiscordConstants.ActivityTypes.CUSTOM_STATUS || !e.returnValue && e.methodArguments[1] && e.methodArguments[1].toString().indexOf("type===") > -1 && e.methodArguments[1].toString().indexOf("CUSTOM_STATUS") > -1)) return this.createCustomStatus(changedUsers[e.methodArguments[0]]);
}});
this.forceUpdateAll();
@ -491,32 +492,28 @@ module.exports = (_ => {
}
}
processUserPopout (e) {
if (e.instance.props.user && this.settings.places.userPopout) {
let data = changedUsers[e.instance.props.user.id];
if (data) {
e.instance.props.user = this.getUserData(e.instance.props.user.id, true, true);
if (data.name && !(data.useServerNick && e.instance.props.nickname)) {
let name = [data.name, data.showServerNick && e.instance.props.nickname && `(${e.instance.props.nickname})`].filter(n => n).join(" ");
e.instance.props.nickname = name;
if (e.instance.props.guildMember) e.instance.props.guildMember = Object.assign({}, e.instance.props.guildMember, {nick: name});
}
}
}
processUserPopoutContainer (e) {
if (e.returnvalue.props.user && this.settings.places.userPopout && changedUsers[e.returnvalue.props.user.id]) e.returnvalue.props.user = this.getUserData(e.returnvalue.props.user.id, true, true);
}
processUserPopoutInfo (e) {
if (e.instance.props.user && this.settings.places.userPopout) {
let data = changedUsers[e.instance.props.user.id];
if (data && (data.color1 || data.color2 || 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, {changeBackground: true});
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.LibraryModules.LastGuildStore.getGuildId(), 2, {
tagClass: BDFDB.disCNS.userpopoutheaderbottag + BDFDB.disCN.bottagnametag,
inverted: typeof e.instance.getMode == "function" && e.instance.getMode() !== "Normal"
});
if (!data) return;
if (!e.returnvalue) {
if (data.name && !(data.useServerNick && e.instance.props.nickname)) e.instance.props.nickname = [data.name, data.showServerNick && e.instance.props.nickname && `(${e.instance.props.nickname})`].filter(n => n).join(" ");
}
else {
if (data.color1 || data.color2 || 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, {changeBackground: true});
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.LibraryModules.LastGuildStore.getGuildId(), 2, {
tagClass: BDFDB.disCNS.userpopoutheaderbottag + BDFDB.disCN.bottagnametag,
inverted: typeof e.instance.getMode == "function" && e.instance.getMode() !== "Normal"
});
}
}
}
}
@ -526,10 +523,6 @@ module.exports = (_ => {
if (e.instance.props.user && this.settings.places.userProfile) e.instance.props.user = this.getUserData(e.instance.props.user.id);
}
processCustomStatusActivity (e) {
console.log(e);
}
processMutualFriends (e) {
if (this.settings.places.mutualFriends) {
let [children, index] = BDFDB.ReactUtils.findParent(e.returnvalue, {name: "FriendRow"});

26
Plugins/PinDMs/PinDMs.plugin.js
View File

@ -1072,6 +1072,19 @@ module.exports = (_ => {
header_pinneddms: "Закачени директни съобщения",
modal_colorpicker1: "Категория цвят"
};
case "cs": // Czech
return {
context_addtonewcategory: "Přidat do nové kategorie",
context_disablepredefined: "Deaktivovat předdefinovanou kategorii",
context_inpredefined: "Připnuté v předdefinované katrgorii",
context_pinchannel: "Připnout do seznamu kanálů",
context_pindm: "Připnout do PZ",
context_pinguild: "Připnout do seznamu serverů",
context_unpinchannel: "Odepnout ze seznamu kanálů",
context_unpinguild: "Odepnout ze seznamu serverů",
header_pinneddms: "Připnuté přímé zprávy",
modal_colorpicker1: "Barva kategorie"
};
case "da": // Danish
return {
context_addtonewcategory: "Føj til ny kategori",
@ -1150,6 +1163,19 @@ module.exports = (_ => {
header_pinneddms: "Messages privés épinglés",
modal_colorpicker1: "Couleur de la catégorie"
};
case "hi": // Hindi
return {
context_addtonewcategory: "नई श्रेणी में जोड़ें",
context_disablepredefined: "पूर्वनिर्धारित श्रेणी को निष्क्रिय करें",
context_inpredefined: "एक पूर्वनिर्धारित श्रेणी में पिन किया गया",
context_pinchannel: "चैनल सूची में पिन करें",
context_pindm: "पिन डीएम",
context_pinguild: "सर्वर सूची में पिन करें",
context_unpinchannel: "चैनल सूची से अलग करें",
context_unpinguild: "सर्वर सूची से अलग करें",
header_pinneddms: "पिन किए गए सीधे संदेश",
modal_colorpicker1: "श्रेणी रंग"
};
case "hr": // Croatian
return {
context_addtonewcategory: "Dodaj u novu kategoriju",

2
Themes/BlurpleRecolor/BlurpleRecolor.css
View File

@ -1874,7 +1874,7 @@ a.metadataName-14STf- {
.banner-2QYc2d[style*="background-color: hsl(237, "] {
background-color: rgb(var(--accentcolor)) !important;
}
.setIdentityLink-3lcnXW {
.setIdentityLink-1t8Ahd .colorLink-2vG20E {
color: rgb(var(--accentcolor));
}