From 0a1a73a379c09e0c8ddb58aa53fe2590ae3f332d Mon Sep 17 00:00:00 2001 From: Mirco Wittrien Date: Sat, 3 Sep 2022 16:19:40 +0200 Subject: [PATCH] stuff --- Library/0BDFDB.plugin.js | 6 +----- Library/_res/0BDFDB.data.json | 4 ++-- Plugins/EditUsers/EditUsers.plugin.js | 17 +++++++++-------- 3 files changed, 12 insertions(+), 15 deletions(-) diff --git a/Library/0BDFDB.plugin.js b/Library/0BDFDB.plugin.js index 7ff8562865..a1b655e186 100644 --- a/Library/0BDFDB.plugin.js +++ b/Library/0BDFDB.plugin.js @@ -3193,16 +3193,12 @@ module.exports = (_ => { return user && user instanceof Internal.DiscordObjects.User; }; const myDataUser = Internal.LibraryModules.UserStore && Internal.LibraryModules.UserStore.getCurrentUser && Internal.LibraryModules.UserStore.getCurrentUser(); - if (myDataUser && BDFDB.UserUtils._id != myDataUser.id) { - document.body.setAttribute("data-current-user-id", myDataUser.id); - BDFDB.UserUtils._id = myDataUser.id; - } + if (myDataUser && BDFDB.UserUtils._id != myDataUser.id) BDFDB.UserUtils._id = myDataUser.id; BDFDB.UserUtils.me = new Proxy(myDataUser || {}, { get: function (list, item) { const user = Internal.LibraryModules.UserStore && Internal.LibraryModules.UserStore.getCurrentUser && Internal.LibraryModules.UserStore.getCurrentUser(); if (user && BDFDB.UserUtils._id != user.id) { Cache.data = {}; - document.body.setAttribute("data-current-user-id", user.id); BDFDB.UserUtils._id = user.id; } return user ? user[item] : null; diff --git a/Library/_res/0BDFDB.data.json b/Library/_res/0BDFDB.data.json index 9374f1e73f..932ef4a422 100644 --- a/Library/_res/0BDFDB.data.json +++ b/Library/_res/0BDFDB.data.json @@ -314,14 +314,14 @@ "TypingUsers": {"class": "typing"}, "UnavailableGuildsButton": {"strings": ["className", ".default.guildsError"]}, "Upload": {"class": "uploadmodal"}, - "UserHook": {"class": "auditloguserhook"}, "UserMention": {"strings": ["inlinePreview", "getAvatarURL", "userId", "default.getName"]}, "UserPopoutAvatar": {"props": ["UserPopoutAvatar"]}, "UserPopoutBody": {"strings": ["passportCaret", "setNote", "USER_POPOUT"]}, "UserPopoutBodySection": {"strings": [".customStatusActivity", ".canDM", ".hidePersonalInformation"]}, "UserProfileModal": {"lazyLoaded": true}, "UserProfileModalHeader": {"lazyLoaded": true}, - "UserSettingsAppearance": {"class": "usersettingsappearancepreview"} + "UserSettingsAppearance": {"class": "usersettingsappearancepreview"}, + "UserThemeBanner": {"strings": [".showPremiumBadgeUpsell", ".isPremiumAtLeast", "PremiumTypes"]} }, "LoadedInComponents": { "AutocompleteChannelResult": "LibraryComponents.AutocompleteItems.Channel", diff --git a/Plugins/EditUsers/EditUsers.plugin.js b/Plugins/EditUsers/EditUsers.plugin.js index d76d38be37..699e1551e3 100644 --- a/Plugins/EditUsers/EditUsers.plugin.js +++ b/Plugins/EditUsers/EditUsers.plugin.js @@ -2,7 +2,7 @@ * @name EditUsers * @author DevilBro * @authorId 278543574059057154 - * @version 4.6.5 + * @version 4.6.6 * @description Allows you to locally edit Users * @invite Jx3TjNS * @donate https://www.paypal.me/MircoWittrien @@ -98,6 +98,7 @@ module.exports = (_ => { HeaderBarContainer: "default", ChannelEditorContainer: "render", AutocompleteUserResult: "render", + UserThemeBanner: "default", UserBanner: "default", UserPopoutAvatar: "UserPopoutAvatar", UsernameSection: "default", @@ -156,7 +157,6 @@ module.exports = (_ => { RichUserMention: "UserMention", ChannelReply: "default", MemberListItem: "render", - UserHook: "render", InvitationCard: "render", InviteModalUserRow: "default", TypingUsers: "render", @@ -602,6 +602,13 @@ module.exports = (_ => { } } + processUserThemeBanner (e) { + if (e.instance.props.user && changedUsers[e.instance.props.user.id]) { + if (changedUsers[e.instance.props.user.id].removeBanner) e.instance.props.bannerSrc = null; + else if (changedUsers[e.instance.props.user.id].banner) e.instance.props.bannerSrc = changedUsers[e.instance.props.user.id].banner; + } + } + processUserBanner (e) { if (e.instance.props.user && changedUsers[e.instance.props.user.id]) { if (changedUsers[e.instance.props.user.id].removeBanner) e.instance.props.bannerSrc = null; @@ -1059,12 +1066,6 @@ module.exports = (_ => { } } - processUserHook (e) { - if (e.instance.props.user && this.settings.places.guildSettings) { - this.changeUserColor(e.returnvalue.props.children[0], e.instance.props.user.id); - } - } - processGuildSettingsEmoji (e) { if (BDFDB.ArrayUtils.is(e.instance.props.emojis) && this.settings.places.guildSettings) { e.instance.props.emojis = [].concat(e.instance.props.emojis);