stuff
This commit is contained in:
parent
9c4d88c638
commit
4b0cc03995
|
@ -7670,9 +7670,10 @@ module.exports = (_ => {
|
||||||
wrap: false,
|
wrap: false,
|
||||||
renderPopout: instance => BDFDB.ReactUtils.createElement(InternalComponents.LibraryComponents.UserPopout, {
|
renderPopout: instance => BDFDB.ReactUtils.createElement(InternalComponents.LibraryComponents.UserPopout, {
|
||||||
userId: this.props.userId,
|
userId: this.props.userId,
|
||||||
user: LibraryModules.UserStore.getUser(this.props.userId)
|
channelId: this.props.channelId,
|
||||||
|
guildId: this.props.guildId
|
||||||
}),
|
}),
|
||||||
}), "userId"));
|
}), "userId", "channelId", "guildId"));
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -240,7 +240,6 @@
|
||||||
"UnreadDMs": {"class": "guildsscroller"},
|
"UnreadDMs": {"class": "guildsscroller"},
|
||||||
"Upload": {"class": "uploadmodal"},
|
"Upload": {"class": "uploadmodal"},
|
||||||
"UserHook": {"class": "auditloguserhook"},
|
"UserHook": {"class": "auditloguserhook"},
|
||||||
"UserPopout": {"class": "userpopout"},
|
|
||||||
"UserSettingsAppearance": {"class": "usersettingsappearancepreview"},
|
"UserSettingsAppearance": {"class": "usersettingsappearancepreview"},
|
||||||
"V2C_ContentColumn": {"class": "settingswindowcontentcolumn", "special": [{"path": "return.stateNode.props.title", "value": ["PLUGINS", "THEMES"]}]}
|
"V2C_ContentColumn": {"class": "settingswindowcontentcolumn", "special": [{"path": "return.stateNode.props.title", "value": ["PLUGINS", "THEMES"]}]}
|
||||||
},
|
},
|
||||||
|
|
|
@ -80,7 +80,6 @@ module.exports = (_ => {
|
||||||
this.patchedModules = {
|
this.patchedModules = {
|
||||||
before: {
|
before: {
|
||||||
MemberListItem: "render",
|
MemberListItem: "render",
|
||||||
UserPopout: "render",
|
|
||||||
ChannelMembers: "render"
|
ChannelMembers: "render"
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
@ -216,10 +215,6 @@ module.exports = (_ => {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
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) {
|
processChannelMembers (e) {
|
||||||
e.instance.props.groups = [].concat(e.instance.props.groups);
|
e.instance.props.groups = [].concat(e.instance.props.groups);
|
||||||
for (let i in e.instance.props.groups) if (e.instance.props.groups[i].type == "GROUP") {
|
for (let i in e.instance.props.groups) if (e.instance.props.groups[i].type == "GROUP") {
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
* @name EditUsers
|
* @name EditUsers
|
||||||
* @author DevilBro
|
* @author DevilBro
|
||||||
* @authorId 278543574059057154
|
* @authorId 278543574059057154
|
||||||
* @version 4.3.3
|
* @version 4.3.4
|
||||||
* @description Allows you to locally edit Users
|
* @description Allows you to locally edit Users
|
||||||
* @invite Jx3TjNS
|
* @invite Jx3TjNS
|
||||||
* @donate https://www.paypal.me/MircoWittrien
|
* @donate https://www.paypal.me/MircoWittrien
|
||||||
|
@ -17,12 +17,12 @@ module.exports = (_ => {
|
||||||
"info": {
|
"info": {
|
||||||
"name": "EditUsers",
|
"name": "EditUsers",
|
||||||
"author": "DevilBro",
|
"author": "DevilBro",
|
||||||
"version": "4.3.3",
|
"version": "4.3.4",
|
||||||
"description": "Allows you to locally edit Users"
|
"description": "Allows you to locally edit Users"
|
||||||
},
|
},
|
||||||
"changeLog": {
|
"changeLog": {
|
||||||
"improved": {
|
"fixed": {
|
||||||
"Custom Status": "You can now use nitro walled emojis in the local custom status changer"
|
"User Popout": "Fixing Stuff for the User Popout Update, thanks Discord"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
@ -115,7 +115,7 @@ module.exports = (_ => {
|
||||||
HeaderBarContainer: "render",
|
HeaderBarContainer: "render",
|
||||||
ChannelEditorContainer: "render",
|
ChannelEditorContainer: "render",
|
||||||
AutocompleteUserResult: "render",
|
AutocompleteUserResult: "render",
|
||||||
UserPopout: "render",
|
UserPopoutInfo: "UserPopoutInfo",
|
||||||
UserProfileModal: "default",
|
UserProfileModal: "default",
|
||||||
UserInfo: "default",
|
UserInfo: "default",
|
||||||
NowPlayingItem: "default",
|
NowPlayingItem: "default",
|
||||||
|
@ -149,7 +149,8 @@ module.exports = (_ => {
|
||||||
AutocompleteUserResult: "render",
|
AutocompleteUserResult: "render",
|
||||||
DiscordTag: "default",
|
DiscordTag: "default",
|
||||||
NameTag: "default",
|
NameTag: "default",
|
||||||
UserPopoutInfo: "default",
|
UserPopoutContainer: "type",
|
||||||
|
UserPopoutInfo: "UserPopoutInfo",
|
||||||
MutualFriends: "default",
|
MutualFriends: "default",
|
||||||
VoiceUser: "render",
|
VoiceUser: "render",
|
||||||
Account: "render",
|
Account: "render",
|
||||||
|
@ -263,8 +264,8 @@ module.exports = (_ => {
|
||||||
}});
|
}});
|
||||||
|
|
||||||
BDFDB.PatchUtils.patch(this, BDFDB.LibraryModules.StatusMetaUtils, "findActivity", {after: e => {
|
BDFDB.PatchUtils.patch(this, BDFDB.LibraryModules.StatusMetaUtils, "findActivity", {after: e => {
|
||||||
let data = e.returnValue && changedUsers[e.methodArguments[0]];
|
let data = 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]]);
|
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();
|
this.forceUpdateAll();
|
||||||
|
@ -491,24 +492,19 @@ module.exports = (_ => {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
processUserPopout (e) {
|
processUserPopoutContainer (e) {
|
||||||
if (e.instance.props.user && this.settings.places.userPopout) {
|
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);
|
||||||
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});
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
processUserPopoutInfo (e) {
|
processUserPopoutInfo (e) {
|
||||||
if (e.instance.props.user && this.settings.places.userPopout) {
|
if (e.instance.props.user && this.settings.places.userPopout) {
|
||||||
let data = changedUsers[e.instance.props.user.id];
|
let data = changedUsers[e.instance.props.user.id];
|
||||||
if (data && (data.color1 || data.color2 || data.tag)) {
|
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]]});
|
let [children, index] = BDFDB.ReactUtils.findParent(e.returnvalue, {props: [["className", BDFDB.disCN.userpopoutheadernickname]]});
|
||||||
if (index > -1) {
|
if (index > -1) {
|
||||||
this.changeUserColor(children[index], e.instance.props.user.id, {changeBackground: true});
|
this.changeUserColor(children[index], e.instance.props.user.id, {changeBackground: true});
|
||||||
|
@ -521,15 +517,12 @@ module.exports = (_ => {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
processUserProfileModal (e) {
|
processUserProfileModal (e) {
|
||||||
if (e.instance.props.user && this.settings.places.userProfile) e.instance.props.user = this.getUserData(e.instance.props.user.id);
|
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) {
|
processMutualFriends (e) {
|
||||||
if (this.settings.places.mutualFriends) {
|
if (this.settings.places.mutualFriends) {
|
||||||
let [children, index] = BDFDB.ReactUtils.findParent(e.returnvalue, {name: "FriendRow"});
|
let [children, index] = BDFDB.ReactUtils.findParent(e.returnvalue, {name: "FriendRow"});
|
||||||
|
|
|
@ -1072,6 +1072,19 @@ module.exports = (_ => {
|
||||||
header_pinneddms: "Закачени директни съобщения",
|
header_pinneddms: "Закачени директни съобщения",
|
||||||
modal_colorpicker1: "Категория цвят"
|
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
|
case "da": // Danish
|
||||||
return {
|
return {
|
||||||
context_addtonewcategory: "Føj til ny kategori",
|
context_addtonewcategory: "Føj til ny kategori",
|
||||||
|
@ -1150,6 +1163,19 @@ module.exports = (_ => {
|
||||||
header_pinneddms: "Messages privés épinglés",
|
header_pinneddms: "Messages privés épinglés",
|
||||||
modal_colorpicker1: "Couleur de la catégorie"
|
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
|
case "hr": // Croatian
|
||||||
return {
|
return {
|
||||||
context_addtonewcategory: "Dodaj u novu kategoriju",
|
context_addtonewcategory: "Dodaj u novu kategoriju",
|
||||||
|
|
|
@ -1874,7 +1874,7 @@ a.metadataName-14STf- {
|
||||||
.banner-2QYc2d[style*="background-color: hsl(237, "] {
|
.banner-2QYc2d[style*="background-color: hsl(237, "] {
|
||||||
background-color: rgb(var(--accentcolor)) !important;
|
background-color: rgb(var(--accentcolor)) !important;
|
||||||
}
|
}
|
||||||
.setIdentityLink-3lcnXW {
|
.setIdentityLink-1t8Ahd .colorLink-2vG20E {
|
||||||
color: rgb(var(--accentcolor));
|
color: rgb(var(--accentcolor));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue