From b213fe1d7f4aaf5d7f9b981e8fb16e07336b73d3 Mon Sep 17 00:00:00 2001 From: Mirco Wittrien Date: Thu, 20 Oct 2022 12:18:05 +0200 Subject: [PATCH] stuff --- Library/_res/0BDFDB.data.json | 5 + .../ShowConnections/ShowConnections.plugin.js | 255 +++++++----------- 2 files changed, 98 insertions(+), 162 deletions(-) diff --git a/Library/_res/0BDFDB.data.json b/Library/_res/0BDFDB.data.json index 951dd9ed90..1098269c53 100644 --- a/Library/_res/0BDFDB.data.json +++ b/Library/_res/0BDFDB.data.json @@ -356,6 +356,7 @@ "ChannelTextAreaEditor": {"strings": ["onHideAutocomplete", "onMaybeShowAutocomplete", "uploadPromptCharacterCount", "_focusBlurQueue"]}, "ChannelTextAreaForm": {"strings": ["renderApplicationCommandIcon", "handleTextareaChange", "handleSendMessage"]}, "ConnectedLazyImageZoomable": {"strings": ["{isWindowFocused", ",appContext:"]}, + "CustomStatusModal": {"protos": ["renderCustomStatusInput", "renderClearAfter", "getEmojiButtonRenderer"]}, "DirectMessage": {"strings": ["getRecipientId", "Controller", "handleContextMenu", ".DM"]}, "DiscordTag": {"strings": ["hidePersonalInformation", "isVerifiedBot", "botType"]}, "Embed": {"strings": ["gridContainer", "renderEmbedContent", "hasThumbnail"]}, @@ -384,6 +385,7 @@ "MessageSearchResultContextMenu": {"strings": ["MESSAGE_ACTIONS_MENU_LABEL", "navId:\"message"], "nonStrings": ["getGuildId"]}, "MessageToolbar": {"strings": ["Messages.MORE", "hasDeveloperMode", "openPopoutType"]}, "ModalCarousel": {"strings": [".gotoNext", "currentIndex", "gotoPrevThrottled"]}, + "ModalFooter": {"strings": [".footerSeparator", ".separator", "Direction.HORIZONTAL_REVERSE"]}, "NowPlayingHeader": {"strings": ["ACTIVITY_FEED_NOW_PLAYING_HEADER", "partiedMembers"]}, "NowPlayingItem": {"strings": [".wrapper", "padded:"]}, "PanelButton": {"strings": ["Masks.PANEL_BUTTON"]}, @@ -409,14 +411,17 @@ "UnreadDMs": {"strings": ["getMutablePrivateChannels", "selectedVoiceGuildId", ".selectedVoiceChannelId"]}, "UseCopyIdItem": {"strings": ["\"devmode-copy-id\""]}, "UserBanner": {"strings": [".bannerSrc", ".viewerPremiumOverride", ".SETTINGS"]}, + "UserBioSection": {"strings": [".isUsingGuildBio", "aboutMeGuildIcon", "GUILD_IDENTITY_BIO_TOAST"]}, "UserGenericContextMenu": {"strings": ["USER_ACTIONS_MENU_LABEL", "navId:\"user", ".USER_GENERIC_MENU"]}, "UserMemberContextMenu": {"strings": ["USER_ACTIONS_MENU_LABEL", "navId:\"user", ".GUILD_CHANNEL_USER_MENU"]}, "UsernameSection": {"strings": [".shouldCopyOnClick", ".userTagDiscriminatorNoNickname"]}, "UserPopoutAvatar": {"strings": ["isNonUserBot", "avatarHintInnerText", "avatarDecorationHint"]}, + "UserPopoutBody": {"strings": ["isNonUserBot", "customStatusActivity", "bodyInnerWrapper"]}, "UserPopoutInfo": {"strings": [".hasCustomStatus", ".premiumGuildSince", "openPremiumSettings"]}, "UserProfileModalHeader": {"strings": [".friendToken", ".additionalActionsIcon", "onMessage"]}, "UserSummaryItem": {"protos": ["renderMoreUsers", "renderUsers", "renderIcon"]}, "UserThemedBanner": {"strings": [".showPremiumBadgeUpsell", ".isPremiumAtLeast", ".SETTINGS"]}, + "UserThemedPopoutBody": {"strings": [".customStatusActivity", ".canDM", ".hidePersonalInformation"]}, "UserThemedPopoutHeader": {"strings": [".avatarPositionPremiumNoBanner", "syncProfileThemeWithUserTheme"]}, "VoiceUser": {"protos": ["renderPrioritySpeaker", "renderIcons", "renderAvatar"]}, "VoiceUsers": {"strings": ["hidePreview", "previewIsOpen", "previewUserIdAfterDelay"]} diff --git a/Plugins/ShowConnections/ShowConnections.plugin.js b/Plugins/ShowConnections/ShowConnections.plugin.js index ece868fb96..d1a706199a 100644 --- a/Plugins/ShowConnections/ShowConnections.plugin.js +++ b/Plugins/ShowConnections/ShowConnections.plugin.js @@ -2,7 +2,7 @@ * @name ShowConnections * @author DevilBro * @authorId 278543574059057154 - * @version 1.1.2 + * @version 1.1.3 * @description Shows the connected Accounts of a User in the UserPopout * @invite Jx3TjNS * @donate https://www.paypal.me/MircoWittrien @@ -59,6 +59,85 @@ module.exports = (_ => { var _this; var loadedUsers, requestedUsers, queuedInstances; + const UserConnectionsComponents = class UserConnections extends BdApi.React.Component { + render() { + if (!loadedUsers[this.props.user.id]) { + if (queuedInstances[this.props.user.id].indexOf(this) == -1) queuedInstances[this.props.user.id].push(this); + return null; + } + else { + let connections = loadedUsers[this.props.user.id].filter(c => _this.settings.connections[c.type]); + if (!connections.length) return null; + let isLightTheme = BDFDB.DiscordUtils.getTheme() == BDFDB.disCN.themelight; + let children = [ + BDFDB.ReactUtils.createElement(BDFDB.LibraryComponents.Heading, { + className: BDFDB.disCN.userpopoutsectiontitle, + variant: "eyebrow", + color: this.props.old ? "header-secondary" : null, + children: BDFDB.LanguageUtils.LanguageStrings.CONNECTIONS + }), + BDFDB.ReactUtils.createElement("div", { + className: BDFDB.disCN._showconnectionsconnections, + children: connections.map(c => { + let provider = BDFDB.LibraryModules.ConnectionProviderUtils.get(c.type); + let url = _this.settings.general.openWebpage && provider.getPlatformUserUrl && provider.getPlatformUserUrl(c); + return BDFDB.ReactUtils.createElement(BDFDB.LibraryComponents.TooltipContainer, { + text: `${provider.name}: ${c.name}`, + tooltipConfig: {backgroundColor: _this.settings.general.useColoredTooltips && BDFDB.ColorUtils.change(provider.color, -0.3), color: !_this.settings.general.useColoredTooltips || !provider.color ? "black" : null}, + children: BDFDB.ReactUtils.createElement(!url ? "div" : BDFDB.LibraryComponents.Anchor, Object.assign(!url ? {} : { + href: url + }, { + className: BDFDB.DOMUtils.formatClassName(BDFDB.disCN._showconnectionsconnection, url && BDFDB.disCN.cursorpointer), + onContextMenu: event => { + BDFDB.ContextMenuUtils.open(_this, event, BDFDB.ContextMenuUtils.createItem(BDFDB.LibraryComponents.MenuItems.MenuGroup, { + children: [ + BDFDB.ContextMenuUtils.createItem(BDFDB.LibraryComponents.MenuItems.MenuItem, { + label: BDFDB.LanguageUtils.LibraryStringsFormat("copy", BDFDB.LanguageUtils.LanguageStrings.USER_SETTINGS_LABEL_USERNAME), + id: BDFDB.ContextMenuUtils.createItemId(_this.name, "copy-name"), + action: _ => BDFDB.LibraryModules.WindowUtils.copy(c.name) + }), + url && BDFDB.ContextMenuUtils.createItem(BDFDB.LibraryComponents.MenuItems.MenuItem, { + label: BDFDB.LanguageUtils.LibraryStringsFormat("copy", BDFDB.LanguageUtils.LanguageStrings.SEARCH_ANSWER_HAS_LINK), + id: BDFDB.ContextMenuUtils.createItemId(_this.name, "copy-url"), + action: _ => BDFDB.LibraryModules.WindowUtils.copy(url) + }) + ] + })); + }, + children: [ + BDFDB.ReactUtils.createElement("img", { + className: BDFDB.disCN._showconnectionsicon, + alt: BDFDB.LanguageUtils.LanguageStringsFormat("IMG_ALT_LOGO", provider.name), + src: provider.icon[_this.settings.general.useColoredIcons ? (isLightTheme ? "lightSVG" : "darkSVG" ) : "whiteSVG"] + }), + _this.settings.general.showVerifiedBadge && c.verified && BDFDB.ReactUtils.createElement(BDFDB.LibraryComponents.TooltipContainer, { + text: BDFDB.LanguageUtils.LanguageStrings.CONNECTION_VERIFIED, + tooltipConfig: {color: "brand", type: "bottom"}, + children: BDFDB.ReactUtils.createElement(BDFDB.LibraryComponents.FlowerStar, { + className: BDFDB.disCN._showconnectionsverifiedbadge, + size: "50%", + color: isLightTheme ? BDFDB.DiscordConstants.Colors.STATUS_GREY_200 : BDFDB.DiscordConstants.Colors.PRIMARY_DARK, + children: BDFDB.ReactUtils.createElement(BDFDB.LibraryComponents.SvgIcon, { + name: BDFDB.LibraryComponents.SvgIcon.Names.CHECKMARK, + width: "70%", + height: "70%", + color: isLightTheme ? BDFDB.DiscordConstants.Colors.STATUS_GREY_500 : BDFDB.DiscordConstants.Colors.WHITE + }) + }) + }) + ] + })) + }); + }) + }) + ]; + return this.props.old ? children : BDFDB.ReactUtils.createElement(BDFDB.LibraryComponents.UserPopoutSection, { + children: children + }); + } + } + }; + return class ShowConnections extends Plugin { onLoad () { _this = this; @@ -66,11 +145,11 @@ module.exports = (_ => { requestedUsers = {}; queuedInstances = {}; - this.patchedModules = { - after: { - UserPopoutBodySection: "default", - UserPopoutBody: "default" - } + this.modulePatches = { + after: [ + "UserPopoutBody", + "UserThemedPopoutBody" + ] }; this.defaults = { @@ -121,13 +200,9 @@ module.exports = (_ => { delete queuedInstances[user.id]; } }}); - - BDFDB.PatchUtils.forceAllUpdates(this); } - onStop () { - BDFDB.PatchUtils.forceAllUpdates(this); - } + onStop () {} getSettingsPanel (collapseStates = {}) { let settingsPanel; @@ -164,89 +239,16 @@ module.exports = (_ => { }); } - processUserPopoutBodySection (e) { + processUserThemedPopoutBody (e) { if (!e.instance.props.user || e.instance.props.user.isNonUserBot()) return; if (!loadedUsers[e.instance.props.user.id] && !requestedUsers[e.instance.props.user.id]) { requestedUsers[e.instance.props.user.id] = true; queuedInstances[e.instance.props.user.id] = [].concat(queuedInstances[e.instance.props.user.id]).filter(n => n); BDFDB.LibraryModules.UserProfileUtils.fetchProfile(e.instance.props.user.id); } - let [children, index] = BDFDB.ReactUtils.findParent(e.returnvalue, {name: "BioSection"}); - if (index > -1) children.splice(this.settings.general.placeAtTop ? 1 : children.length - 2, 0, BDFDB.ReactUtils.createElement(class extends BDFDB.ReactUtils.Component { - render() { - if (!loadedUsers[e.instance.props.user.id]) { - if (queuedInstances[e.instance.props.user.id].indexOf(this) == -1) queuedInstances[e.instance.props.user.id].push(this); - return null; - } - else { - let connections = loadedUsers[e.instance.props.user.id].filter(c => _this.settings.connections[c.type]); - if (!connections.length) return null; - let isLightTheme = BDFDB.DiscordUtils.getTheme() == BDFDB.disCN.themelight; - return BDFDB.ReactUtils.createElement(BDFDB.LibraryComponents.UserPopoutSection, { - children: [ - BDFDB.ReactUtils.createElement(BDFDB.LibraryComponents.Heading, { - className: BDFDB.disCN.userpopoutsectiontitle, - variant: "eyebrow", - children: BDFDB.LanguageUtils.LanguageStrings.CONNECTIONS - }), - BDFDB.ReactUtils.createElement("div", { - className: BDFDB.disCN._showconnectionsconnections, - children: connections.map(c => { - let provider = BDFDB.LibraryModules.ConnectionProviderUtils.get(c.type); - let url = _this.settings.general.openWebpage && provider.getPlatformUserUrl && provider.getPlatformUserUrl(c); - return BDFDB.ReactUtils.createElement(BDFDB.LibraryComponents.TooltipContainer, { - text: `${provider.name}: ${c.name}`, - tooltipConfig: {backgroundColor: _this.settings.general.useColoredTooltips && BDFDB.ColorUtils.change(provider.color, -0.3), color: !_this.settings.general.useColoredTooltips || !provider.color ? "black" : null}, - children: BDFDB.ReactUtils.createElement(!url ? "div" : BDFDB.LibraryComponents.Anchor, Object.assign(!url ? {} : { - href: url - }, { - className: BDFDB.DOMUtils.formatClassName(BDFDB.disCN._showconnectionsconnection, url && BDFDB.disCN.cursorpointer), - onContextMenu: event => { - BDFDB.ContextMenuUtils.open(_this, event, BDFDB.ContextMenuUtils.createItem(BDFDB.LibraryComponents.MenuItems.MenuGroup, { - children: [ - BDFDB.ContextMenuUtils.createItem(BDFDB.LibraryComponents.MenuItems.MenuItem, { - label: BDFDB.LanguageUtils.LibraryStringsFormat("copy", BDFDB.LanguageUtils.LanguageStrings.USER_SETTINGS_LABEL_USERNAME), - id: BDFDB.ContextMenuUtils.createItemId(_this.name, "copy-name"), - action: _ => BDFDB.LibraryModules.WindowUtils.copy(c.name) - }), - url && BDFDB.ContextMenuUtils.createItem(BDFDB.LibraryComponents.MenuItems.MenuItem, { - label: BDFDB.LanguageUtils.LibraryStringsFormat("copy", BDFDB.LanguageUtils.LanguageStrings.SEARCH_ANSWER_HAS_LINK), - id: BDFDB.ContextMenuUtils.createItemId(_this.name, "copy-url"), - action: _ => BDFDB.LibraryModules.WindowUtils.copy(url) - }) - ] - })); - }, - children: [ - BDFDB.ReactUtils.createElement("img", { - className: BDFDB.disCN._showconnectionsicon, - alt: BDFDB.LanguageUtils.LanguageStringsFormat("IMG_ALT_LOGO", provider.name), - src: provider.icon[_this.settings.general.useColoredIcons ? (isLightTheme ? "lightSVG" : "darkSVG" ) : "whiteSVG"] - }), - _this.settings.general.showVerifiedBadge && c.verified && BDFDB.ReactUtils.createElement(BDFDB.LibraryComponents.TooltipContainer, { - text: BDFDB.LanguageUtils.LanguageStrings.CONNECTION_VERIFIED, - tooltipConfig: {color: "brand", type: "bottom"}, - children: BDFDB.ReactUtils.createElement(BDFDB.LibraryComponents.FlowerStar, { - className: BDFDB.disCN._showconnectionsverifiedbadge, - size: "50%", - color: isLightTheme ? BDFDB.DiscordConstants.Colors.STATUS_GREY_200 : BDFDB.DiscordConstants.Colors.PRIMARY_DARK, - children: BDFDB.ReactUtils.createElement(BDFDB.LibraryComponents.SvgIcon, { - name: BDFDB.LibraryComponents.SvgIcon.Names.CHECKMARK, - width: "70%", - height: "70%", - color: isLightTheme ? BDFDB.DiscordConstants.Colors.STATUS_GREY_500 : BDFDB.DiscordConstants.Colors.WHITE - }) - }) - }) - ] - })) - }); - }) - }) - ] - }); - } - } + let [children, index] = BDFDB.ReactUtils.findParent(e.returnvalue, {name: "UserBioSection"}); + if (index > -1) children.splice(this.settings.general.placeAtTop ? 1 : children.length - 2, 0, BDFDB.ReactUtils.createElement(UserConnectionsComponents, { + user: e.instance.props.user }, true)); } @@ -258,80 +260,9 @@ module.exports = (_ => { BDFDB.LibraryModules.UserProfileUtils.fetchProfile(e.instance.props.user.id); } let bodyInner = BDFDB.ReactUtils.findChild(e.returnvalue, {props: [["className", BDFDB.disCN.userpopoutbodyinnerwrapper]]}); - if (bodyInner) bodyInner.props.children.splice(this.settings.general.placeAtTop ? 1 : bodyInner.props.children.length - 2, 0, BDFDB.ReactUtils.createElement(class extends BDFDB.ReactUtils.Component { - render() { - if (!loadedUsers[e.instance.props.user.id]) { - if (queuedInstances[e.instance.props.user.id].indexOf(this) == -1) queuedInstances[e.instance.props.user.id].push(this); - return null; - } - else { - let connections = loadedUsers[e.instance.props.user.id].filter(c => _this.settings.connections[c.type]); - if (!connections.length) return null; - let isLightTheme = BDFDB.DiscordUtils.getTheme() == BDFDB.disCN.themelight; - return [ - BDFDB.ReactUtils.createElement(BDFDB.LibraryComponents.Heading, { - className: BDFDB.disCN.userpopoutbodytitle, - variant: "eyebrow", - color: "header-secondary", - children: BDFDB.LanguageUtils.LanguageStrings.CONNECTIONS - }), - BDFDB.ReactUtils.createElement("div", { - className: BDFDB.disCN._showconnectionsconnections, - children: connections.map(c => { - let provider = BDFDB.LibraryModules.ConnectionProviderUtils.get(c.type); - let url = _this.settings.general.openWebpage && provider.getPlatformUserUrl && provider.getPlatformUserUrl(c); - return BDFDB.ReactUtils.createElement(BDFDB.LibraryComponents.TooltipContainer, { - text: `${provider.name}: ${c.name}`, - tooltipConfig: {backgroundColor: _this.settings.general.useColoredTooltips && BDFDB.ColorUtils.change(provider.color, -0.3), color: !_this.settings.general.useColoredTooltips || !provider.color ? "black" : null}, - children: BDFDB.ReactUtils.createElement(!url ? "div" : BDFDB.LibraryComponents.Anchor, Object.assign(!url ? {} : { - href: url - }, { - className: BDFDB.DOMUtils.formatClassName(BDFDB.disCN._showconnectionsconnection, url && BDFDB.disCN.cursorpointer), - onContextMenu: event => { - BDFDB.ContextMenuUtils.open(_this, event, BDFDB.ContextMenuUtils.createItem(BDFDB.LibraryComponents.MenuItems.MenuGroup, { - children: [ - BDFDB.ContextMenuUtils.createItem(BDFDB.LibraryComponents.MenuItems.MenuItem, { - label: BDFDB.LanguageUtils.LibraryStringsFormat("copy", BDFDB.LanguageUtils.LanguageStrings.USER_SETTINGS_LABEL_USERNAME), - id: BDFDB.ContextMenuUtils.createItemId(_this.name, "copy-name"), - action: _ => BDFDB.LibraryModules.WindowUtils.copy(c.name) - }), - url && BDFDB.ContextMenuUtils.createItem(BDFDB.LibraryComponents.MenuItems.MenuItem, { - label: BDFDB.LanguageUtils.LibraryStringsFormat("copy", BDFDB.LanguageUtils.LanguageStrings.SEARCH_ANSWER_HAS_LINK), - id: BDFDB.ContextMenuUtils.createItemId(_this.name, "copy-url"), - action: _ => BDFDB.LibraryModules.WindowUtils.copy(url) - }) - ] - })); - }, - children: [ - BDFDB.ReactUtils.createElement("img", { - className: BDFDB.disCN._showconnectionsicon, - alt: BDFDB.LanguageUtils.LanguageStringsFormat("IMG_ALT_LOGO", provider.name), - src: provider.icon[_this.settings.general.useColoredIcons ? (isLightTheme ? "lightSVG" : "darkSVG" ) : "whiteSVG"] - }), - _this.settings.general.showVerifiedBadge && c.verified && BDFDB.ReactUtils.createElement(BDFDB.LibraryComponents.TooltipContainer, { - text: BDFDB.LanguageUtils.LanguageStrings.CONNECTION_VERIFIED, - tooltipConfig: {color: "brand", type: "bottom"}, - children: BDFDB.ReactUtils.createElement(BDFDB.LibraryComponents.FlowerStar, { - className: BDFDB.disCN._showconnectionsverifiedbadge, - size: "50%", - color: isLightTheme ? BDFDB.DiscordConstants.Colors.STATUS_GREY_200 : BDFDB.DiscordConstants.Colors.PRIMARY_DARK, - children: BDFDB.ReactUtils.createElement(BDFDB.LibraryComponents.SvgIcon, { - name: BDFDB.LibraryComponents.SvgIcon.Names.CHECKMARK, - width: "70%", - height: "70%", - color: isLightTheme ? BDFDB.DiscordConstants.Colors.STATUS_GREY_500 : BDFDB.DiscordConstants.Colors.WHITE - }) - }) - }) - ] - })) - }); - }) - }) - ]; - } - } + if (bodyInner) bodyInner.props.children.splice(this.settings.general.placeAtTop ? 1 : bodyInner.props.children.length - 2, 0, BDFDB.ReactUtils.createElement(UserConnectionsComponents, { + old: true, + user: e.instance.props.user }, true)); } };