diff --git a/src/components/settings/tabs/plugins/ContributorModal.css b/src/components/settings/tabs/plugins/ContributorModal.css index 0e453e2ed..e63579fa8 100644 --- a/src/components/settings/tabs/plugins/ContributorModal.css +++ b/src/components/settings/tabs/plugins/ContributorModal.css @@ -50,11 +50,6 @@ 0 2px 6px rgb(0 0 0 / 35%); } -div:has(.vc-author-modal-root) > [class*="actionBar"] { - padding: 8px 16px; - min-height: unset; -} - .vc-author-modal-links { display: flex; gap: 4px; @@ -67,4 +62,4 @@ div:has(.vc-author-modal-root) > [class*="actionBar"] { display: grid; gap: 0.5em; margin-top: 0.75em; -} +} \ No newline at end of file diff --git a/src/components/settings/tabs/plugins/PluginModal.css b/src/components/settings/tabs/plugins/PluginModal.css index 35774743a..2c0a76b75 100644 --- a/src/components/settings/tabs/plugins/PluginModal.css +++ b/src/components/settings/tabs/plugins/PluginModal.css @@ -58,10 +58,6 @@ padding-bottom: 24px; } -div:has(.vc-settings-modal-content) [class*="bodySpacerTop"] { - display: none; -} - .vc-plugin-modal-info { display: flex; gap: 1em; @@ -84,4 +80,4 @@ div:has(.vc-settings-modal-content) [class*="bodySpacerTop"] { justify-content: center; padding: 6px 12px; color: var(--text-default); -} +} \ No newline at end of file diff --git a/src/components/settings/tabs/plugins/PluginModal.tsx b/src/components/settings/tabs/plugins/PluginModal.tsx index 9587d68b5..16ffaabe0 100644 --- a/src/components/settings/tabs/plugins/PluginModal.tsx +++ b/src/components/settings/tabs/plugins/PluginModal.tsx @@ -223,6 +223,16 @@ export default function PluginModal({ plugin, onRestartNeeded, onClose, transiti + {!!plugin.settingsAboutComponent && ( +
+
+ + + +
+
+ )} +
Settings {renderSettings()} diff --git a/src/equicordplugins/hideMessages/index.tsx b/src/equicordplugins/hideMessages/index.tsx index c33cf2fdb..b06f3e932 100644 --- a/src/equicordplugins/hideMessages/index.tsx +++ b/src/equicordplugins/hideMessages/index.tsx @@ -5,9 +5,12 @@ */ import { findGroupChildrenByChildId, NavContextMenuPatchCallback } from "@api/ContextMenu"; +import { isPluginEnabled } from "@api/PluginManager"; import { definePluginSettings } from "@api/Settings"; import ErrorBoundary from "@components/ErrorBoundary"; import { EyeIcon } from "@components/Icons"; +import pinDms from "@plugins/pinDms"; +import { isPinned } from "@plugins/pinDms/data"; import { EquicordDevs } from "@utils/constants"; import definePlugin, { OptionType } from "@utils/types"; import { Channel, Message } from "@vencord/discord-types"; @@ -65,6 +68,7 @@ const messageCtxPatch: NavContextMenuPatchCallback = (children, { message }: { m const userCtxPatch: NavContextMenuPatchCallback = (children, { channel }: UserContextProps) => { if (!channel?.isDM()) return; + if (isPluginEnabled(pinDms.name) && isPinned(channel.id)) return; const group = findGroupChildrenByChildId("close-dm", children); if (!group) return; diff --git a/src/equicordplugins/messageLoggerEnhanced/styles.css b/src/equicordplugins/messageLoggerEnhanced/styles.css index 6420aaf05..95056a265 100644 --- a/src/equicordplugins/messageLoggerEnhanced/styles.css +++ b/src/equicordplugins/messageLoggerEnhanced/styles.css @@ -102,8 +102,4 @@ .vc-updater-modal-content { padding: 1rem 2rem; -} - -header:has(.vc-msg-logger-enhanced-modal-tab-bar) [class*="headerTrailing_"] { - margin-top: 0; } \ No newline at end of file diff --git a/src/equicordplugins/platformSpoofer/index.tsx b/src/equicordplugins/platformSpoofer/index.tsx index 0574db893..103573b5d 100644 --- a/src/equicordplugins/platformSpoofer/index.tsx +++ b/src/equicordplugins/platformSpoofer/index.tsx @@ -78,11 +78,7 @@ export default definePlugin({ find: '"2025-01-virtual-currency-rollout"', replacement: [ { - match: /(?<=\}\),)(\i)/, - replace: "$1=e=>({enabled:true}),_equicord_$1" - }, - { - match: /(?<=\.getConfig\(\i\)\.enabled\},)(\i)/, + match: /(?<=\}\),)(\i)/g, replace: "$1=e=>({enabled:true}),_equicord_$1" } ]