diff --git a/src/equicordplugins/_api/userArea.ts b/src/equicordplugins/_api/userArea.ts index 9510dab40..fdc214492 100644 --- a/src/equicordplugins/_api/userArea.ts +++ b/src/equicordplugins/_api/userArea.ts @@ -36,7 +36,7 @@ export default definePlugin({ renderButtons(props: { nameplate?: any; }) { return Vencord.Api.UserArea._renderButtons({ - nameplate: props.nameplate, + nameplate: !this.shouldHideNameplate() ? props.nameplate : null, iconForeground: accountClasses.iconForeground, hideTooltips: this.shouldHideTooltips() }); @@ -44,5 +44,9 @@ export default definePlugin({ shouldHideTooltips() { return isPluginEnabled(declutter.name) && declutter.settings.store.removeButtonTooltips; + }, + + shouldHideNameplate() { + return isPluginEnabled(declutter.name) && declutter.settings.store.removeNameplate; } }); diff --git a/src/equicordplugins/declutter/index.tsx b/src/equicordplugins/declutter/index.tsx index 1159dbc4e..a609775d4 100644 --- a/src/equicordplugins/declutter/index.tsx +++ b/src/equicordplugins/declutter/index.tsx @@ -171,13 +171,26 @@ export default definePlugin({ }, predicate: () => settings.store.removeAvatarDecoration && !isPluginEnabled(decor.name), }, + // User Area { find: ".DISPLAY_NAME_STYLES_COACHMARK)", - replacement: { - match: /((\i)=\i\?\.avatarDecoration,\i=)\(0,\i\.\i\)\(\2\)/, - replace: "$1null" - }, - predicate: () => settings.store.removeAvatarDecoration && !isPluginEnabled(decor.name), + replacement: [ + { + match: /((\i)=\i\?\.avatarDecoration,\i=)\(0,\i\.\i\)\(\2\)/, + replace: "$1null", + predicate: () => settings.store.removeAvatarDecoration && !isPluginEnabled(decor.name), + }, + { + match: /(iconForeground:null!=\i\?\i\.\i:void 0,nameplate:)\i/g, + replace: "$1null", + predicate: () => settings.store.removeNameplate, + }, + { + match: /let\{ref:\i,speaking:\i,voiceDb:/, + replace: "arguments[0].nameplate=null;$&", + predicate: () => settings.store.removeNameplate, + } + ], }, { // Nameplate